合并

CODE/smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml

@@ -343,7 +343,7 @@
     WHERE
         t.uuid_type = 1
         AND t.community_id = #{communityId,jdbcType=INTEGER}
-        AND t.uuid = #{userId,jdbcType=INTEGER}
+        AND (t.uuid = #{userId,jdbcType=INTEGER} or t.uuid= -1)
         AND t.STATUS = 1
         AND t.advice_type = 1
         AND t.uuid_type = 1

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -160,24 +160,32 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
         } else {
 
                 // 草稿时插入消息
+                Message activityMessage = new Message();
+            activityMessage.setCommunityId(userElement.getCommunityId());
+            activityMessage.setMessageType("8");
+            activityMessage.setAdviceType("4");
+            activityMessage.setModelType("2");
+            activityMessage.setUuid(userElement.getId());
+            activityMessage.setUuidType("2");
+            activityMessage.setSource("2");
+            activityMessage.setMessageContent("活动“{" + tpActivity.getActivityTitle() + "}”还未发布，点击发布");
+            activityMessage.setStatus("1");
+            activityMessage.setActivityId(tpActivity.getId());
+            activityMessage.setCreateDate(LocalDateTime.now());
+            activityMessage.setCreateUser(userElement.getId());
+                //为草稿时
                 if ("2".equals(tpActivity.getStatus())) {
-                    Message message = new Message();
-                    message.setCommunityId(userElement.getCommunityId());
-                    message.setMessageType("8");
-                    message.setAdviceType("4");
-                    message.setModelType("2");
-                    message.setUuid(userElement.getId());
-                    message.setUuidType("2");
-                    message.setSource("2");
-                    message.setMessageContent("活动“{" + tpActivity.getActivityTitle() + "}”还未发布，点击发布");
-                    message.setStatus("1");
-                    message.setActivityId(tpActivity.getId());
-                    message.setCreateDate(LocalDateTime.now());
-                    message.setCreateUser(userElement.getId());
-
-                    messageMapper.insert(message);
+                    messageMapper.insert(activityMessage);
                 }
-
+            activityMessage.setModelType("1");
+            activityMessage.setAdviceType("1");
+            activityMessage.setUuid(-1);
+            activityMessage.setSource("1");
+            activityMessage.setUuidType("1");
+            activityMessage.setMessageContent(tpActivity.getActivityTitle());
+            if("1".equals(tpActivity.getStatus())) {
+                messageMapper.insert(activityMessage);
+                 }
                 // 发布时消息为无效
                 if ("1".equals(tpActivity.getStatus())) {
                     QueryWrapper<Message> queryWrapper = new QueryWrapper<>();

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java

@@ -117,23 +117,33 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
         }
         tpAnnouncementMapper.insert(tpAnnouncement);
         //根据1.5需求维护tp_message
+            Message message = new Message();
+            message.setCommunityId(communityId);
+            message.setMessageType("5");
+            message.setModelType("2");
+            message.setAdviceType("4");
+            message.setUuid(userId);
+            message.setUuidType("2");
+            message.setSource("2");
+            message.setMessageContent("公告“" + tpAnnouncement.getAnnouncementTitle() + "”还未发布，查看详情");
+            message.setStatus("1");
+            message.setReadStatus("0");
+            message.setCreateUser(userId);
+            message.setCreateDate(LocalDateTime.now());
+            message.setAnnouncementId(tpAnnouncement.getId());
+            //为草稿的时
             if ("2".equals(tpAnnouncement.getStatus())) {
-                Message message = new Message();
-                message.setCommunityId(communityId);
-                message.setMessageType("5");
-                message.setModelType("2");
-                message.setAdviceType("4");
-                message.setUuid(userId);
-                message.setUuidType("2");
-                message.setSource("2");
-                message.setMessageContent("公告“" + tpAnnouncement.getAnnouncementTitle() + "”还未发布，查看详情");
-                message.setStatus("1");
-                message.setReadStatus("0");
-                message.setCreateUser(userId);
-                message.setCreateDate(LocalDateTime.now());
-                message.setAnnouncementId(tpAnnouncement.getId());
                 messageMapper.insert(message);
             }
+            message.setModelType("1");
+            message.setAdviceType("1");
+            message.setUuid(-1);
+            message.setSource("1");
+            message.setUuidType("1");
+            message.setMessageContent(tpAnnouncement.getAnnouncementTitle());
+        if ("1".equals(tpAnnouncement.getStatus())) {
+            messageMapper.insert(message);
+        }
         for (String img : contentImgArray) {
             TdImages tdImages = new TdImages();
             tdImages.setImageUrl(img);