消息模板移动位置，政府端查看话题bug修复

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java

@@ -35,6 +35,7 @@ public class ResiTopicController {
      **/
     @PostMapping("hiddenlist")
     Result<List<ResiTopicInfoResultDTO>> hiddenList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){
+        topicPageFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(topicPageFormDTO);
         return resiTopicService.hiddenList(topicPageFormDTO);
     }
@@ -49,6 +50,7 @@ public class ResiTopicController {
      **/
     @PostMapping("alltopics")
     Result<List<ResiTopicInfoResultDTO>> allTopics(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicPageFormDTO topicPageFormDTO){
+        topicPageFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(topicPageFormDTO);
         return resiTopicService.allTopics(topicPageFormDTO);
     }

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

@@ -31,5 +31,29 @@ public interface UserMessageConstant {
      */
     String SLIENT_IN_GROUP = "您已被禁言，禁言时间%s";
 
+    /**
+     * 建组审核驳回时消息模板
+     * */
+    String DISAGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s小组，由于不符合%s条件的原因，已被驳回。";
+
+    /**
+     * 建组审核同意时消息模板
+     * */
+    String AGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s小组，已审核通过。";
+
+    /**
+     * 审核建组申请消息名称
+     * */
+    String AUDITED_GROUP_APPLYING_TITLE = "您有一条建组审核消息";
+
+    /**
+     * 申请建组消息名称
+     * */
+    String CREATE_GROUP_APPLYING_MSG_TITLE = "您有一条建组申请消息";
+
+    /**
+     * 申请组时的消息模板
+     */
+    String CREATION_OF_GROUP_MESSAGE_TEMPLATE = "%s%s申请创建小组【%s】，请审核。";
 
 }

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

@@ -33,6 +33,7 @@ import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetMessageFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
@@ -67,7 +68,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import sun.security.pkcs11.Secmod;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -343,7 +343,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
                     + (StringUtils.isBlank(resiResult.getData().getName()) ? "" :resiResult.getData().getName());
         }
 		userName = StringUtils.isBlank(userName) ? ModuleConstant.UNKNOWN : userName;
-        String msg = String.format(ModuleConstant.CREATION_OF_GROUP_MESSAGE_TEMPLATE,roleName,userName,applyCreateGroupFormDTO.getGroupName());
+        String msg = String.format(UserMessageConstant.CREATION_OF_GROUP_MESSAGE_TEMPLATE,roleName,userName,applyCreateGroupFormDTO.getGroupName());
 		//3.2、插入一条待审核的操作记录
 		ResiGroupOperationDTO resiGroupOperation = new ResiGroupOperationDTO();
 		resiGroupOperation.setResiGroupId(resiGroupEntity.getId());
@@ -391,7 +391,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 		resiGroupStatisticalService.save(resiGroupStatisticalDTO);
 		//发送消息：创建小组
-		sendMsgResi2Gov(ModuleConstant.CREATE_GROUP_APPLYING_MSG_TITLE,msg,applyCreateGroupFormDTO.getGridId(),applyCreateGroupFormDTO.getUserId(),applyCreateGroupFormDTO.getCustomerId());
+		sendMsgResi2Gov(UserMessageConstant.CREATE_GROUP_APPLYING_MSG_TITLE,msg,applyCreateGroupFormDTO.getGridId(),applyCreateGroupFormDTO.getUserId(),applyCreateGroupFormDTO.getCustomerId());
 		return new Result();
 	}
 
@@ -550,9 +550,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userMessageFormDTO.setApp(ModuleConstant.APP_RESI);
 		userMessageFormDTO.setGridId(resiGroupDTO.getGridId());
 		userMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
-		userMessageFormDTO.setMessageContent(String.format(ModuleConstant.AGREE_CREATING_GROUP_MSG,resiGroupDTO.getGroupName()));
+		userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName()));
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
-			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(ModuleConstant.AGREE_CREATING_GROUP_MSG,resiGroupDTO.getGroupName())));
+			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName())));
 		}
 
 		return new Result();
@@ -594,9 +594,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userMessageFormDTO.setApp(ModuleConstant.APP_RESI);
 		userMessageFormDTO.setGridId(resiGroupDTO.getGridId());
 		userMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
-		userMessageFormDTO.setMessageContent(String.format(ModuleConstant.DISAGREE_CREATING_GROUP_MSG,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason()));
+		userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.DISAGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason()));
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
-			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(ModuleConstant.DISAGREE_CREATING_GROUP_MSG,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason())));
+			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(UserMessageConstant.DISAGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason())));
 		}
 
 		return new Result();
@@ -785,7 +785,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		return new Result<ApplyingGroupDetailResultDTO>().ok(detail);
 	}
 	/**
-	 * @Description 给加入此网格的管理员发送消息
+	 * @Description 给加入此网格的网格长发送消息
 	 * @param msg
 	 * @param gridId
 	 * @param userId
@@ -804,7 +804,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			RolesUsersListFormDTO rolesUsersListFormDTO = new RolesUsersListFormDTO();
 			rolesUsersListFormDTO.setCustomerId(customerId);
 			List<String> roleKeys = new ArrayList<String>();
-			roleKeys.add(ModuleConstant.STAFF_ROLE_MANAGER);
+			roleKeys.add(ModuleConstant.STAFF_ROLE_GRID_MANAGER);
 			rolesUsersListFormDTO.setRoleKeys(roleKeys);
 			rolesUsersListFormDTO.setUserIds(gridstaffs.getData());
 			Result<List<String>> staffRoles =

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

@@ -317,12 +317,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      **/
     @Override
     public Result<List<ResiTopicInfoResultDTO>> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) {
-        if (null == tokenDto) {
-            logger.error(ModuleConstant.USER_NOT_NULL);
-            throw new RenException(ModuleConstant.USER_NOT_NULL);
-        }
-
-        //1.查询历史话题列表
+     //1.查询历史话题列表
 
         topicPageFormDTO.setUserId(tokenDto.getUserId());
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@@ -240,6 +240,11 @@ public interface ModuleConstant extends Constant {
 	 * */
 	String STAFF_ROLE_MANAGER = "manager";
 
+	/**
+	 * 工作人员角色key：网格长
+	 * */
+	String STAFF_ROLE_GRID_MANAGER = "grid_manager";
+
 	/**
 	 * 消息发送失败
 	 */

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java

@@ -97,7 +97,7 @@ public class StaffRoleController {
      * @date 2020.04.29 23:49
     **/
     @PostMapping("specificrolesstaffs")
-    public Result<List<String>> specificRolesStaffs(RolesUsersListFormDTO rolesUsersListFormDTO){
+    public Result<List<String>> specificRolesStaffs(@RequestBody RolesUsersListFormDTO rolesUsersListFormDTO){
         return staffRoleService.getSpecificRolesStaffs(rolesUsersListFormDTO);
     }
 }