修改交付物消息

tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java

@@ -249,13 +249,13 @@ public class TaskDeliverService implements ITaskDeliverService {
                     userIdList.addAll(userService.selectUserIdByRoleId(postLogCheckerId));
                 }
             }
-            Set<String> userIdSet = new HashSet<>();
+//            Set<String> userIdSet = new HashSet<>();
             if (CollectionUtil.isNotEmpty(userIdList)) {
                 HashSet<Long> h = new HashSet<>(userIdList);
                 userIdList.clear();
                 userIdList.addAll(h);
                 for (Long userId : userIdList) {
-                    userIdSet.add(userId.toString());
+//                    userIdSet.add(userId.toString());
                     messageUser = new BaseMessageDto.MessageUser();
                     messageUser.setUserId(userId);
                     messageUserList.add(messageUser);
@@ -276,8 +276,10 @@ public class TaskDeliverService implements ITaskDeliverService {
             uploadMessageData.setUploadTime(System.currentTimeMillis());
             uploadMessageData.setFile(uploadDeliver.getFileInfo());
             uploadMessage.setData(uploadMessageData);
+            uploadMessage.setReceivers(messageUserList);
             rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME,
                     JacksonUtil.beanToJson(uploadMessage));
+
 //            MessageRule messageRule = MessageRule.defaultRule(MessageConstant.DomainType.User);
 //            String s = JacksonUtil.beanToJson(uploadMessage);
 //            InMessage inMessage = InMessage.newToUserMessage(currentUserId.toString(),userIdSet,null,messageRule,s);
@@ -558,6 +560,15 @@ public class TaskDeliverService implements ITaskDeliverService {
         checkerDtoData.setCheckTime(checkTime);
         checkerDtoData.setIsChecker(checkDeliver.getCheckStatus());
         checkerDto.setData(checkerDtoData);
+        //接收者
+        if(CollectionUtil.isNotEmpty(userIdSet)) {
+            for (String userId : userIdSet) {
+                messageUser = new BaseMessageDto.MessageUser();
+                messageUser.setUserId(Long.valueOf(userId));
+                messageUserList.add(messageUser);
+            }
+        }
+        checkerDto.setReceivers(messageUserList);
         rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME,
                 JacksonUtil.beanToJson(checkerDto));
 //        MessageRule messageRule = MessageRule.defaultRule(MessageConstant.DomainType.User);
@@ -724,13 +735,13 @@ public class TaskDeliverService implements ITaskDeliverService {
             ProTaskDetail task = taskDetailDao.selectByPrimaryKey(deliver.getTaskDetailId());
             ProRole role = proRoleDao.selectByPrimaryKey(task.getExecutorRole());
             //发送消息
-            Set<String> userIdSet = new HashSet<>();
+//            Set<String> userIdSet = new HashSet<>();
             if (CollectionUtil.isNotEmpty(userIdList)) {
                 HashSet<Long> h = new HashSet<>(userIdList);
                 userIdList.clear();
                 userIdList.addAll(h);
                 for (Long userId : userIdList) {
-                    userIdSet.add(userId.toString());
+//                    userIdSet.add(userId.toString());
                     messageUser = new BaseMessageDto.MessageUser();
                     messageUser.setUserId(userId);
                     messageUserList.add(messageUser);
@@ -749,6 +760,7 @@ public class TaskDeliverService implements ITaskDeliverService {
             deleteMessageData.setDeleteTime(deleteTime);
             deleteMessageData.setUserId(currentUserId);
             deleteMessage.setData(deleteMessageData);
+            deleteMessage.setReceivers(messageUserList);
             rabbitTemplate.convertAndSend(RabbitMQConfig.RabbitMQ_QUEUE_NAME,
                     JacksonUtil.beanToJson(deleteMessage));
 //            MessageRule messageRule = MessageRule.defaultRule(MessageConstant.DomainType.User);

tall/src/main/resources/application-test.yml

@@ -32,7 +32,7 @@ swagger:
   enable: true
 eureka:
   instance:
-    ip-address: 192.168.0.99
-#    ip-address: 49.233.89.188
+#    ip-address: 192.168.0.99
+    ip-address: 49.233.89.188
 gatewayUrl: http://192.168.0.99/gateway/
 notGatewayUrl: http://192.168.0.99/

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: test
+    include: util-test,common

tall/src/main/resources/druid-test.yml

@@ -15,8 +15,8 @@ spring:
       maxWait: 60000
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
-#      password:
-      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
+      password:
+#      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -28,8 +28,8 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-#      url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8
-      url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8
+#      url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL