Merge remote-tracking branch 'origin/dev' into dev

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java

@@ -22,9 +22,9 @@ public class LatestIssueListResultDTO implements Serializable {
      */
     private String issueTitle = "";
     /**
-     * 话题内容
+     * 话题转议题组长输入的建议
      */
-    private String topicContent = "";
+    private String suggestion = "";
     /**
      * 用户头像
      */

epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-issue-server:
     container_name: gov-issue-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.35
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.36
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络

epmet-module/gov-issue/gov-issue-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.35</version>
+    <version>0.3.36</version>
     <parent>
         <artifactId>gov-issue</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java

@@ -66,7 +66,6 @@ public interface IssueConstant {
     String REDIS_KEY = "epmet:issue:";
 
     String SELECT_ISSUEPROJECTRELATION_EXCEPTION = "获取议题项目关系数据失败";
-    String SELECT_RESI_GROUP_EXCEPTION = "获取话题数据失败";
 
     /**
      * 议题表决缓存属性值 supportAmount

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java

@@ -62,14 +62,6 @@ public interface ResiGroupFeignClient {
     @PostMapping("/resi/group/topic/checktopicpublisher")
     Result<CheckTopicPublisherResultDTO> checkTopicPublisher(@RequestBody CheckTopicPublisherFormDTO formDTO);
 
-    /**
-     * @param topicIdList
-     * @Author sun
-     * @Description 批量查询话题信息
-     **/
-    @PostMapping("/resi/group/topic/gettopiclist/{topicIdList}")
-    Result<List<ResiTopicDTO>> getTopicList(@PathVariable("topicIdList") List<String> topicIdList);
-
     /**
      * @Description 得到一个网格下的应表数
      * @param gridIdFormDTO

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java

@@ -45,11 +45,6 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "checkTopicPublisher", formDTO);
     }
 
-    @Override
-    public Result<List<ResiTopicDTO>> getTopicList(List<String> topicIdList) {
-        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicList", topicIdList);
-    }
-
     @Override
     public Result<Integer> votableCount(CommonGridIdFormDTO gridIdFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "votableCount", gridIdFormDTO);

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -659,19 +659,12 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
         List<UserResiInfoResultDTO> userInfoList = listResult.getData();
 
-        //3:调用resi-group服务，批量查询话题内容
+        //3:遍历组装对象
-        List<String> topicIdList = entityList.stream().map(IssueEntity::getSourceId).collect(Collectors.toList());
-        Result<List<ResiTopicDTO>> resultTopicList = resiGroupFeignClient.getTopicList(topicIdList);
-        if (!resultTopicList.success() || null == resultTopicList.getData()) {
-            throw new RenException(IssueConstant.SELECT_RESI_GROUP_EXCEPTION);
-        }
-        List<ResiTopicDTO> topicList = resultTopicList.getData();
-
-        //4:遍历组装对象
         entityList.forEach(issue -> {
             LatestIssueListResultDTO resultDTO = new LatestIssueListResultDTO();
             resultDTO.setIssueId(issue.getId());
             resultDTO.setIssueTitle(issue.getIssueTitle());
+            resultDTO.setSuggestion(issue.getSuggestion());
             resultDTO.setCreateIssueTime(issue.getCreatedTime().getTime()/1000);
             userInfoList.forEach(user -> {
                 if (issue.getCreatedBy().equals(user.getUserId())) {
@@ -680,12 +673,6 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                     resultDTO.setIssuePublisherName(user.getShowName());
                 }
             });
-            topicList.forEach(topic -> {
-                if (issue.getSourceId().equals(topic.getId())) {
-                    //话题内容
-                    resultDTO.setTopicContent(topic.getTopicContent());
-                }
-            });
             returnList.add(resultDTO);
         });
 

epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.43
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.45
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

epmet-module/resi-group/resi-group-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.43</version>
+    <version>0.3.45</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java

@@ -10,7 +10,10 @@ public interface UserMessageConstant {
      * 消息标题
      */
     String GROUP_TITLE = "您有一条小组消息";
-
+    /**
+     * 居民申请入群，组长收到的消息通知内容如下：
+     */
+    String APPLY_JOIN_GROUP="居民%s申请加入小组【%s】，请审核";
     /**
      * 组长同意入群申请，用户会收到：您有一条小组消息。  您加入的【组名】已通过审核，请查看。
      */

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -17,6 +17,7 @@
 
 package com.epmet.modules.member.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -38,6 +39,7 @@ import com.epmet.feign.MessageFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
+import com.epmet.modules.group.dao.ResiGroupDao;
 import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.group.redis.ResiGroupRedis;
 import com.epmet.modules.group.service.ResiGroupService;
@@ -114,6 +116,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 
 	@Autowired
 	private ResiGroupRedis resiGroupRedis;
+	@Autowired
+	private ResiGroupDao resiGroupDao;
 
 	@Override
 	public PageData<ResiGroupMemberDTO> page(Map<String, Object> params) {
@@ -232,8 +236,46 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		groupMemeberOperation.setCreatedBy(applyJoinGroupFormDTO.getUserId());
 		groupMemeberOperation.setOperateUserId(applyJoinGroupFormDTO.getUserId());
 		groupMemeberOperationService.save(groupMemeberOperation);
+		//给组长发送消息，有人申请入群
+		this.sendMessageToGroupLeader(resiGroupDTO,applyJoinGroupFormDTO.getUserId());
+
 	}
 
+	//给组长发送消息，有人申请入群
+	private void sendMessageToGroupLeader(ResiGroupDTO resiGroupDTO, String currentUserId) {
+		try {
+			ResiGroupMemberDTO groupLeader = resiGroupDao.selectGroupLeader(resiGroupDTO.getId());
+			if (null == groupLeader) {
+				logger.error(String.format("居民申请入群，给组长发送消息通知异常，查询组长信息为空groupId%s", resiGroupDTO.getId()));
+				return;
+			}
+			UserMessageFormDTO userMessage = new UserMessageFormDTO();
+			userMessage.setApp(AppClientConstant.APP_RESI);
+			userMessage.setCustomerId(resiGroupDTO.getCustomerId());
+			userMessage.setGridId(resiGroupDTO.getGridId());
+			//查询当前申请用户的基本信息（显示名称山东路168号-尹女士）
+			String currentUserName = "";
+			UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
+			userResiInfoFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
+			userResiInfoFormDTO.setUserId(currentUserId);
+			Result<UserResiInfoResultDTO> resultUserInfo = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
+			if (!resultUserInfo.success() || null == resultUserInfo.getData()) {
+				logger.error(String.format("居民申请入群，给组长发送消息通知错误，调用%s服务查询申请用户名称失败,入参%s", ServiceConstant.EPMET_USER_SERVER, JSON.toJSONString(userResiInfoFormDTO)));
+			} else {
+				currentUserName = resultUserInfo.getData().getShowName();
+			}
+			String messageContent = String.format(UserMessageConstant.APPLY_JOIN_GROUP, currentUserName, resiGroupDTO.getGroupName());
+			userMessage.setMessageContent(messageContent);
+			userMessage.setReadFlag(ReadFlagConstant.UN_READ);
+			userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
+			//通知群主
+			userMessage.setUserId(groupLeader.getCustomerUserId());
+			messageFeignClient.saveUserMessage(userMessage);
+		} catch (Exception e) {
+			logger.error("居民申请入群，给组长发送消息通知异常");
+			e.printStackTrace();
+		}
+	}
 	/**
 	 * @param groupMemberListFormDTO
 	 * @return com.epmet.commons.tools.utils.Result

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java

@@ -259,15 +259,4 @@ public class ResiTopicController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<CheckTopicPublisherResultDTO>().ok(topicService.checkTopicPublisher(formDTO));
     }
-
-    /**
-     * @param topicIdList
-     * @return
-     * @Author sun
-     * @Description 批量查询话题信息
-     **/
-    @PostMapping(value = "gettopiclist/{topicIdList}")
-    public Result<List<ResiTopicDTO>> getTopicList(@PathVariable("topicIdList") List<String> topicIdList){
-        return new Result<List<ResiTopicDTO>>().ok(topicService.getTopicList(topicIdList));
-    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java

@@ -153,11 +153,4 @@ public interface ResiTopicDao extends BaseDao<ResiTopicEntity> {
      */
     CheckTopicPublisherResultDTO checkTopicPublisher(CheckTopicPublisherFormDTO formDTO);
 
-    /**
-     * @param topicIdList
-     * @return
-     * @Author sun
-     * @Description 批量查询话题信息
-     **/
-    List<ResiTopicDTO> selectTopicListById(@Param("topicIdList") List<String> topicIdList);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java

@@ -264,11 +264,4 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      */
     CheckTopicPublisherResultDTO checkTopicPublisher(CheckTopicPublisherFormDTO formDTO);
 
-    /**
-     * @param topicIdList
-     * @return
-     * @Author sun
-     * @Description 批量查询话题信息
-     **/
-    List<ResiTopicDTO> getTopicList(List<String> topicIdList);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1167,17 +1167,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         return resiTopicDao.checkTopicPublisher(formDTO);
     }
 
-    /**
-     * @param topicIdList
-     * @return
-     * @Author sun
-     * @Description 批量查询话题信息
-     **/
-    @Override
-    public List<ResiTopicDTO> getTopicList(List<String> topicIdList) {
-        return baseDao.selectTopicListById(topicIdList);
-    }
-
 }
 
 

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -446,17 +446,5 @@
             AND created_by = #{createdBy}
             AND id = #{topicId}
     </select>
-
-    <select id="selectTopicListById" resultType="com.epmet.resi.group.dto.topic.ResiTopicDTO">
-        SELECT
-            *
-        FROM
-            resi_topic
-        WHERE
-            del_flag = '0'
-        <foreach item="topicId" collection="topicIdList" separator="OR" open="AND (" close=")" index="">
-            id = #{topicId}
-        </foreach>
-    </select>
 </mapper>
 

epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-home-server:
     container_name: resi-home-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.10
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.11
     ports:
       - "8104:8104"
     network_mode: host # 使用现有网络

epmet-module/resi-home/resi-home-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.10</version>
+    <version>0.3.11</version>
 
     <parent>
         <artifactId>resi-home</artifactId>