fix

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ImGroupController.java

@@ -88,12 +88,11 @@ public class ImGroupController extends BaseController {
     }
 
 
-
     @GetMapping(value = "/syncImHistoryMessageTask")
     // 融云同步即时通讯聊天记录
     public void syncImHistoryMessageTask(String date) throws Exception {
-        if(date == null){
-            date = DateUtil.format(DateUtil.addHours(new Date(),-2), DateUtil.YEAR_MONTH_DAY_HOUR);
+        if (date == null) {
+            date = DateUtil.format(DateUtil.addHours(new Date(), -2), DateUtil.YEAR_MONTH_DAY_HOUR);
         }
         // 获取输入日期
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHH");
@@ -112,12 +111,11 @@ public class ImGroupController extends BaseController {
         calendar.setTime(currentDate);
 
         //按照小时递减
-        while (currentDate.after(tommorow))
-        {
-            String d = DateUtil.format(DateUtil.addHours(currentDate,0), DateUtil.YEAR_MONTH_DAY_HOUR);
+        while (currentDate.after(tommorow)) {
+            String d = DateUtil.format(DateUtil.addHours(currentDate, 0), DateUtil.YEAR_MONTH_DAY_HOUR);
             Object o = imGroupService.historyGet(d);
             JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(o));
-            if(jsonObject.get("code").equals(200)){
+            if (jsonObject.get("code").equals(200)) {
                 /*Boolean success = redisCache.getRedisTemplate().opsForValue().setIfAbsent("syncImHistoryMessage" + d,d);
                 if(!success){
                     return;
@@ -126,15 +124,15 @@ public class ImGroupController extends BaseController {
                 /*if(StringUtils.isEmpty(url)){
                     return;
                 }*/
-                if (!StringUtils.isEmpty(url)){
+                if (!StringUtils.isEmpty(url)) {
                     File file = new File(FileUtils.getTempDirectoryPath() + url.substring(url.lastIndexOf("/")));
                     URL url1 = new URL(url);
-                    FileUtils.copyURLToFile(url1,file);
+                    FileUtils.copyURLToFile(url1, file);
                     imGroupService.saveImHistoryMessage(new File(file.getAbsolutePath()));
                 }
 
             }
-            calendar.add(Calendar.HOUR,-1);
+            calendar.add(Calendar.HOUR, -1);
             currentDate = calendar.getTime();
         }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

@@ -670,13 +670,13 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
                 //根据发送者分场景讨论
                 String id = i.getFromUserId();
                 String imUserId;
-                if (id.contains(":student")){
+                if (id.contains(":student")) {
                     String[] split = id.split(":");
                     String userId = split[0];
                     String clientType = split[1];
-                    imUserId = getImUserId(userId,clientType);
+                    imUserId = getImUserId(userId, clientType);
                 } else {
-                    imUserId = getImUserId(id,"teacher");
+                    imUserId = getImUserId(id, "teacher");
                 }
 
                 privateImportMessage.setFromAccount(imUserId);
@@ -687,7 +687,7 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
 
                 //设置发送时间
                 String time = i.getDateTime();
-                SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 try {
                     Date date = df.parse(time);
                     long dateTime = date.getTime();
@@ -701,10 +701,10 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
                 TencentRequest.MessageBody body = new TencentRequest.MessageBody();
                 List<TencentRequest.MessageBody> list = new ArrayList<>();
 
-                if (i.getClassname().equals("RC:TxtMsg")){
+                if (i.getClassname().equals("RC:TxtMsg")) {
                     TencentRequest.MessageBody body1 = CustomerServiceBatchSendingServiceImpl.getTimTextElem(i.getContent());
                     list.add(body1);
-                } else if (i.getClassname().equals("RC:ImgMsg")){
+                } else if (i.getClassname().equals("RC:ImgMsg")) {
                     JSONObject jsonObject = JSONObject.parseObject(i.getContent());
                     TencentRequest.MessageBody body1 = CustomerServiceBatchSendingServiceImpl.getTimImageElem(jsonObject.getJSONObject("user").getString("portraitUri"));
                     list.add(body1);
@@ -718,7 +718,7 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
                     item.setMsgContent(i.getContent());
                     item.setMsgType(i.getClassname());
                 });*/
-                if (list.stream().map(TencentRequest.MessageBody::getMsgType).collect(Collectors.toList()).get(0).equals("RC:TxtMsg")){
+                if (list.stream().map(TencentRequest.MessageBody::getMsgType).collect(Collectors.toList()).get(0).equals("RC:TxtMsg")) {
                     //文本对象
                     list.stream().forEach(item -> item.setMsgType("TIMTextElem"));
                 } else if (list.stream().map(TencentRequest.MessageBody::getMsgType).collect(Collectors.toList()).get(0).equals("RC:ImgMsg")) {
@@ -744,13 +744,13 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
                 String imUserId;
                 String id = i.getFromUserId();
                 //根据发送者分场景讨论
-                if (id.contains(":student")){
+                if (id.contains(":student")) {
                     String[] split = id.split(":");
                     String userId = split[0];
                     String clientType = split[1];
-                    imUserId = getImUserId(userId,clientType);
+                    imUserId = getImUserId(userId, clientType);
                 } else {
-                    imUserId = getImUserId(id,"teacher");
+                    imUserId = getImUserId(id, "teacher");
                 }
 
 
@@ -760,7 +760,7 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
                 //设置发送时间
 
                 String time = i.getDateTime();
-                SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 try {
                     Date date = df.parse(time);
                     long dateTime = date.getTime();
@@ -773,10 +773,10 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
                             item.setMsgContent(i.getContent());
                             item.setMsgType(i.getClassname());
                         });*/
-                if (i.getClassname().equals("RC:TxtMsg")){
+                if (i.getClassname().equals("RC:TxtMsg")) {
                     TencentRequest.MessageBody body1 = CustomerServiceBatchSendingServiceImpl.getTimTextElem(i.getContent());
                     bodyList.add(body1);
-                } else if (i.getClassname().equals("RC:ImgMsg")){
+                } else if (i.getClassname().equals("RC:ImgMsg")) {
                     JSONObject jsonObject = JSONObject.parseObject(i.getContent());
                     TencentRequest.MessageBody body1 = CustomerServiceBatchSendingServiceImpl.getTimImageElem(jsonObject.getJSONObject("user").getString("portraitUri"));
                     bodyList.add(body1);
@@ -785,7 +785,7 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
                 body.setMsgType(i.getClassname());*/
 
                 //文本对象
-                if (bodyList.stream().map(TencentRequest.MessageBody::getMsgType).collect(Collectors.toList()).get(0).equals("RC:TxtMsg")){
+                if (bodyList.stream().map(TencentRequest.MessageBody::getMsgType).collect(Collectors.toList()).get(0).equals("RC:TxtMsg")) {
                     bodyList.stream().forEach(item -> item.setMsgType("TIMTextElem"));
                 } else if (bodyList.stream().map(TencentRequest.MessageBody::getMsgType).collect(Collectors.toList()).get(0).equals("RC:ImgMsg")) {
                     //暂未支持图文对象