合并

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

@@ -10,13 +10,11 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.utils.BeanTools;
 import com.community.huiju.dao.MessageMapper;
+import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TdImagesMapper;
 import com.community.huiju.dao.TpActivityMapper;
 import com.community.huiju.exception.WisdomException;
-import com.community.huiju.model.Message;
-import com.community.huiju.model.TdImages;
-import com.community.huiju.model.TpActivity;
-import com.community.huiju.model.User;
+import com.community.huiju.model.*;
 import com.community.huiju.service.ITdImagesService;
 import com.community.huiju.service.ITpActivityService;
 import com.community.huiju.service.IUserService;
@@ -60,6 +58,8 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
     @Autowired
     private MessageMapper messageMapper;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
     @Override
     public ResponseBean listQuery(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
@@ -173,19 +173,27 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
             activityMessage.setActivityId(tpActivity.getId());
             activityMessage.setCreateDate(LocalDateTime.now());
             activityMessage.setCreateUser(userElement.getId());
+            activityMessage.setReadStatus("0");
                 //为草稿时
                 if ("2".equals(tpActivity.getStatus())) {
                     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);
-                 }
+                QueryWrapper<TaUser> queryWrapperTaUser = new QueryWrapper<>();
+                queryWrapperTaUser.eq("community_id",userElement.getCommunityId());
+                List<TaUser> userList= taUserMapper.selectList(queryWrapperTaUser);
+                for (TaUser taUser:userList){
+                    activityMessage.setUuid(taUser.getId());
+                    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

@@ -7,14 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.dao.MessageMapper;
-import com.community.huiju.dao.TdImagesMapper;
-import com.community.huiju.dao.TpAnnouncementMapper;
-import com.community.huiju.dao.UserMapper;
-import com.community.huiju.model.Message;
-import com.community.huiju.model.TdImages;
-import com.community.huiju.model.TpAnnouncement;
-import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.TpAnnouncementService;
 import com.community.huiju.vo.AnnouncementTable;
 import com.google.common.collect.Maps;
@@ -53,7 +47,8 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
     @Autowired
     private MessageMapper messageMapper;
 
-
+    @Autowired
+    private TaUserMapper taUserMapper;
     @Override
     public ResponseBean tpAnnouncemenList(String paramets, Integer CommunityId) {
         ResponseBean responseBean = new ResponseBean();
@@ -137,12 +132,18 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             }
             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);
+            QueryWrapper<TaUser> queryWrapperTaUser = new QueryWrapper<>();
+            queryWrapperTaUser.eq("community_id",communityId);
+            List<TaUser> userList= taUserMapper.selectList(queryWrapperTaUser);
+            for (TaUser taUser:userList) {
+                message.setUuid(taUser.getId());
+                messageMapper.insert(message);
+            }
         }
         for (String img : contentImgArray) {
             TdImages tdImages = new TdImages();