关闭议题，回写事件；

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -563,6 +563,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             //1.2、更新服务记录,记录实际开始，实际结束时间
             serviceEntity.setServiceStartTime(formDTO.getServiceStartTime());
             serviceEntity.setServiceEndTime(formDTO.getServiceEndTime());
+            serviceEntity.setUpdatedTime(nowDate);
             demandServiceDao.updateById(serviceEntity);
             //1.3、修改主表状态为已完成
             entity.setStatus(UserDemandConstant.FINISHED);
@@ -604,6 +605,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             finishResultDTO.setRemark(String.format(UserDemandConstant.GRANT_POINT_REMARK,entity.getDemandUserName(),content));
             finishResultDTO.setFinishResult(StringUtils.isNotBlank(formDTO.getFinishResult())?formDTO.getFinishResult():UserDemandConstant.UN_RESOLVED);
         }
+        entity.setUpdatedTime(nowDate);
         baseDao.updateById(entity);
 
         // 5、如果是居民端用户提出的需求，发消息：您提出的需求已完成，请进行服务评价。
@@ -623,6 +625,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             dto.setType("demand");
             dto.setServiceParty(str);
             dto.setActualServiceTime(DateUtils.format(formDTO.getServiceStartTime(), DateUtils.DATE_TIME_PATTERN)+"至"+DateUtils.format(formDTO.getServiceEndTime(), DateUtils.DATE_TIME_PATTERN));
+            dto.setCloseCaseTime(nowDate);
             Result result = govProjectOpenFeignClient.closeProjectOrDemand(dto);
             if (!result.success()) {
                 throw new RenException("需求完成,修改事件管理数据失败...");

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CloseIssueFormDTO.java

@@ -17,11 +17,17 @@ public class CloseIssueFormDTO implements Serializable {
     @NotBlank(message = "议题Id不能为空")
     private String issueId;
 
+    /**
+     * resolved已解决
+     * unresolved未解决
+     */
     @NotBlank(message = "解决状态不能为空")
     private String resolveType;
 
     @NotBlank(message = "关闭理由不能为空")
     @Length(max=1000,message = "手机号不能超过1000位")
     private String closeReason;
+
+    private String currentUserId;
 }
 

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java

@@ -43,8 +43,9 @@ public class IssueManageController {
      * @Description 议题管理-关闭议题
      **/
     @PostMapping("closeissue")
-    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_CLOSE)
+    // @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_CLOSE)
     public Result closeIssue(@LoginUser TokenDto tokenDTO, @RequestBody CloseIssueFormDTO formDTO) {
+        formDTO.setCurrentUserId(tokenDTO.getUserId());
         ValidatorUtils.validateEntity(formDTO);
         issueService.closeIssue(formDTO);
         return new Result();

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

@@ -714,50 +714,37 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Transactional(rollbackFor = Exception.class)
     public void closeIssue(CloseIssueFormDTO formDTO) {
 		//公开回复内容审核
-		if (StringUtils.isNotBlank(formDTO.getCloseReason())) {
+        checkCloseReason(formDTO.getCloseReason());
-			TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
-			TextTaskDTO taskDTO = new TextTaskDTO();
-			taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
-			taskDTO.setContent(formDTO.getCloseReason());
-			textScanParamDTO.getTasks().add(taskDTO);
-			Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-			if (!textSyncScanResult.success()){
-				throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-			} else {
-				if (!textSyncScanResult.getData().isAllPass()) {
-					throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
-				}
-			}
-		}
 
-        Date date = new Date();
+        Date nowTime = new Date();
         //1:更新议题详情表数据
         IssueEntity entity = baseDao.selectById(formDTO.getIssueId());
         if (null == entity) {
-            throw new RenException(IssueConstant.SELECT_EXCEPTION);
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),IssueConstant.SELECT_EXCEPTION,"议题不存在");
         }
         if (IssueConstant.ISSUE_CLOSED.equals(entity.getIssueStatus())) {
-            throw new RenException(IssueConstant.OPERATION_EXCEPTION);
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),IssueConstant.OPERATION_EXCEPTION,"议题不存在");
         }
         entity.setIssueStatus(IssueConstant.ISSUE_CLOSED);
         entity.setCloseReason(formDTO.getCloseReason());
         entity.setResolveType(formDTO.getResolveType());
-        entity.setVotingDeadline(date);
+        entity.setVotingDeadline(nowTime);
-        entity.setClosedTime(date);
+        entity.setClosedTime(nowTime);
         if (baseDao.updateById(entity) < NumConstant.ONE) {
             throw new RenException(IssueConstant.UPPDATE_EXCEPTION);
         }
 
         //2:调用gov-org服务，查询组织网格名称
-        AgencyGridResultDTO agencyGridResultDTO = new AgencyGridResultDTO();
+        /*AgencyGridResultDTO agencyGridResultDTO = new AgencyGridResultDTO();
         agencyGridResultDTO.setAgencyId(entity.getOrgId());
         agencyGridResultDTO.setGridId(entity.getGridId());
         Result<AgencyGridResultDTO> resultDTO = govOrgFeignClient.getAgencyAndGrid(agencyGridResultDTO);
         if (!resultDTO.success() || null == resultDTO.getData()) {
             throw new RenException(IssueConstant.SELECT_GOV_ORG_EXCEPTION);
         }
-        agencyGridResultDTO = resultDTO.getData();
+        agencyGridResultDTO = resultDTO.getData();*/
-
+        //上面代码注释，改用缓存
+        GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(entity.getGridId());
         //3:议题进展记录表新增数据
         IssueProcessEntity processEntity = new IssueProcessEntity();
         processEntity.setIssueId(formDTO.getIssueId());
@@ -765,31 +752,27 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         processEntity.setOrgType(IssueConstant.ISSUE_GRID);
         processEntity.setOrgId(entity.getGridId());
         processEntity.setOperationExplain(formDTO.getCloseReason());
-        processEntity.setOrgName(agencyGridResultDTO.getAgencyName() + "-" + agencyGridResultDTO.getGridName());
+        // processEntity.setOrgName(agencyGridResultDTO.getAgencyName() + "-" + agencyGridResultDTO.getGridName());
+        processEntity.setOrgName(gridInfoCache.getGridNamePath());
+        processEntity.setCreatedTime(nowTime);
+        processEntity.setUpdatedTime(nowTime);
+        processEntity.setCustomerId(entity.getCustomerId());
         issueProcessDao.insert(processEntity);
 
         //4:调用epmet-message服务，给居民端话题创建人和议题发起人发送消息
         if (entity.getSourceType().equals(ModuleConstants.ISSUE_FROM_TOPIC)){
             //4.1:调用resi-group查询话题创建人数据(目前议题来源只有来自话题)
-            Result<ResiTopicDTO> resultTopicDTO = resiGroupFeignClient.getTopicById(entity.getSourceId());
+            sendToTopicAndShiftIssueResiUser(entity.getSourceId(),formDTO.getResolveType(),entity,formDTO.getCloseReason());
-            if (!resultTopicDTO.success() || null == resultTopicDTO.getData()) {
+        }else if(entity.getSourceType().equals("ic_event")){
-                throw new RenException(IssueConstant.SELECT_TOPIC_EXCEPTION);
+            ColseProjectOrDemandFormDTO colseProjectOrDemandFormDTO=new ColseProjectOrDemandFormDTO();
-            }
+            colseProjectOrDemandFormDTO.setCustomerId(entity.getCustomerId());
-            ResiTopicDTO topicDTO = resultTopicDTO.getData();
+            colseProjectOrDemandFormDTO.setIcEventId(entity.getSourceId());
-            //4.2:创建消息模板
+            colseProjectOrDemandFormDTO.setType("issue");
-            String messageContent = "";
+            colseProjectOrDemandFormDTO.setUserId(formDTO.getCurrentUserId());
-            if (IssueConstant.ISSUE_RESOLVED.equals(formDTO.getResolveType())) {
+            colseProjectOrDemandFormDTO.setCloseCaseTime(nowTime);
-                messageContent = String.format(UserMessageConstant.ISSUE_RESOLVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason());
+            Result result = govProjectOpenFeignClient.closeProjectOrDemand(colseProjectOrDemandFormDTO);
-            } else if (IssueConstant.ISSUE_UNRESOLVED.equals(formDTO.getResolveType())) {
+            if (!result.success()) {
-                messageContent = String.format(UserMessageConstant.ISSUE_UNRESOLVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason());
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"议题关闭异常，该议题来源于事件，回写事件信息失败","议题关闭异常:事件办结异常");
-            }
-            //4.3:调用服务，发送消息
-            if (!saveUserMessageList(topicDTO, messageContent, entity).success()) {
-                throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION);
-            }
-            //4.4:2020.10.26  添加推送微信订阅消息功能  sun
-            if (!saveWxmpMessageList(topicDTO, messageContent, entity).success()) {
-                logger.error("议题关闭，推送微信订阅消息失败！");
             }
         }
 
@@ -805,6 +788,50 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
     }
 
+    /**
+     * 议题关闭时，填写的关闭理由，走内容审核
+     * @param closeReason
+     */
+    private void checkCloseReason(String closeReason) {
+        if (StringUtils.isNotBlank(closeReason)) {
+            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+            TextTaskDTO taskDTO = new TextTaskDTO();
+            taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+            taskDTO.setContent(closeReason);
+            textScanParamDTO.getTasks().add(taskDTO);
+            Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+            if (!textSyncScanResult.success()) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!textSyncScanResult.getData().isAllPass()) {
+                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+                }
+            }
+        }
+    }
+
+    private void sendToTopicAndShiftIssueResiUser(String topicId,String resolveType,IssueEntity issueEntity,String closeReason) {
+        Result<ResiTopicDTO> resultTopicDTO = resiGroupFeignClient.getTopicById(topicId);
+        if (resultTopicDTO.success() &&null != resultTopicDTO.getData()) {
+            ResiTopicDTO topicDTO = resultTopicDTO.getData();
+            //4.2:创建消息模板
+            String messageContent = "";
+            if (IssueConstant.ISSUE_RESOLVED.equals(resolveType)) {
+                messageContent = String.format(UserMessageConstant.ISSUE_RESOLVED_MSG, topicDTO.getTopicContent(), closeReason);
+            } else if (IssueConstant.ISSUE_UNRESOLVED.equals(resolveType)) {
+                messageContent = String.format(UserMessageConstant.ISSUE_UNRESOLVED_MSG, topicDTO.getTopicContent(), closeReason);
+            }
+            //4.3:调用服务，发送消息
+            if (!saveUserMessageList(topicDTO, messageContent, issueEntity).success()) {
+                throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION);
+            }
+            //4.4:2020.10.26  添加推送微信订阅消息功能  sun
+            if (!saveWxmpMessageList(topicDTO, messageContent, issueEntity).success()) {
+                logger.warn("议题关闭，推送微信订阅消息失败！");
+            }
+        }
+    }
+
     /**
      * @Description 关闭议题时给话题创建人和议题发起人发送消息
      * @author sun

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ColseProjectOrDemandFormDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -13,7 +14,7 @@ public class ColseProjectOrDemandFormDTO implements Serializable {
     private static final long serialVersionUID = -590440160577071133L;
     //事件管理Id
     private String icEventId;
-    //类型  需求：demand   项目:project
+    //类型  需求：demand   项目:project 议题：issue
     private String type;
     //服务方【事件被转需求，需求在办结时的服务方名称】
     private String serviceParty;
@@ -22,4 +23,11 @@ public class ColseProjectOrDemandFormDTO implements Serializable {
 
     private String customerId;
     private String userId;
+
+    /**
+     * 项目的结案时间
+     * 需求的完成时间
+     * 议题的关闭时间
+     */
+    private Date closeCaseTime;
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java

@@ -171,6 +171,7 @@ public interface GovProjectOpenFeignClient {
 
 	/**
 	 * Desc: 需求完成/项目结案时 修改事件数据
+	 * 议题关闭时，如果议题来源于事件，也会调用此方法
 	 * @author sun
 	 */
 	@PostMapping("gov/project/icEvent/closeprojectordemand")

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -364,6 +364,7 @@ public class IcEventController {
     /**
      * @Author sun
      * @Description  需求完成/项目结案时 修改事件数据
+     * 议题关闭时，如果议题来源于事件，也会调用此方法
      **/
     @PostMapping("closeprojectordemand")
     public Result closeProjectOrDemand(@RequestBody ColseProjectOrDemandFormDTO formDTO) {

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java

@@ -172,6 +172,7 @@ public interface IcEventService extends BaseService<IcEventEntity> {
     /**
      * @Author sun
      * @Description  需求完成/项目结案时 修改事件数据
+     * 议题关闭时，如果议题来源于事件，也会调用此方法
      **/
     void closeProjectOrDemand(ColseProjectOrDemandFormDTO formDTO);
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -1300,20 +1300,21 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     /**
      * @Author sun
      * @Description  需求完成/项目结案时 修改事件数据
+     * 议题关闭时，如果议题来源于事件，也会调用此方法
      **/
     @Override
     public void closeProjectOrDemand(ColseProjectOrDemandFormDTO formDTO) {
         //1.查询事件数据
         IcEventEntity entity = baseDao.selectById(formDTO.getIcEventId());
         if (null == entity || "closed_case".equals(entity.getStatus())) {
-            logger.error(String.format("事件不存在或已办结不允许修改,事件Id->%s", formDTO.getIcEventId()));
+            logger.warn(String.format("事件不存在或已办结不允许修改,事件Id->%s", formDTO.getIcEventId()));
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "事件不存在或已办结不允许修改");
         }
 
         //2.修改事件数据
         entity.setStatus("closed_case");
-        entity.setCloseCaseTime(new Date());
+        entity.setCloseCaseTime(formDTO.getCloseCaseTime());
-        entity.setLatestOperatedTime(new Date());
+        entity.setLatestOperatedTime(formDTO.getCloseCaseTime());
         entity.setDifficultPoint("0");
         baseDao.updateById(entity);
 
@@ -1325,7 +1326,31 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             logEntity.setUserId(formDTO.getUserId());
             logEntity.setUserIdentity("staff");
             logEntity.setActionCode("close_demand");
-            logEntity.setActionDesc("close_demand");
+            logEntity.setActionDesc("需求完成");
+            logEntity.setOperateTime(new Date());
+            logEntity.setServiceParty(formDTO.getServiceParty());
+            logEntity.setActualServiceTime(formDTO.getActualServiceTime());
+            icEventOperationLogService.insert(logEntity);
+        }else if("project".equals(formDTO.getType())){
+            IcEventOperationLogEntity logEntity = new IcEventOperationLogEntity();
+            logEntity.setIcEventId(formDTO.getIcEventId());
+            logEntity.setCustomerId(formDTO.getCustomerId());
+            logEntity.setUserId(formDTO.getUserId());
+            logEntity.setUserIdentity("staff");
+            logEntity.setActionCode("project_closed");
+            logEntity.setActionDesc("项目结案");
+            logEntity.setOperateTime(new Date());
+            logEntity.setServiceParty(formDTO.getServiceParty());
+            logEntity.setActualServiceTime(formDTO.getActualServiceTime());
+            icEventOperationLogService.insert(logEntity);
+        }else if("issue".equals(formDTO.getType())){
+            IcEventOperationLogEntity logEntity = new IcEventOperationLogEntity();
+            logEntity.setIcEventId(formDTO.getIcEventId());
+            logEntity.setCustomerId(formDTO.getCustomerId());
+            logEntity.setUserId(formDTO.getUserId());
+            logEntity.setUserIdentity("staff");
+            logEntity.setActionCode("close_issue");
+            logEntity.setActionDesc("议题关闭");
             logEntity.setOperateTime(new Date());
             logEntity.setServiceParty(formDTO.getServiceParty());
             logEntity.setActualServiceTime(formDTO.getActualServiceTime());

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -868,6 +868,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			dto.setUserId(fromDTO.getUserId());
 			dto.setIcEventId(projectEntity.getOriginId());
 			dto.setType("project");
+			dto.setCloseCaseTime(projectProcessEntity.getCreatedTime());
 			icEventService.closeProjectOrDemand(dto);
 		}
 		//2022-5-19 sun  end

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.27__icevent_to_issue.sql

@@ -1,6 +1,6 @@
 ALTER TABLE ic_event MODIFY COLUMN `OPERATION_TYPE` CHAR ( 1 ) DEFAULT NULL COMMENT '0:已回复 1:已转项目  2:已转需求3:转议题';
 ALTER TABLE ic_event MODIFY COLUMN `OPERATION_ID` VARCHAR ( 32 ) DEFAULT NULL COMMENT '项目、需求ID、议题id';
 
-alter TABLE ic_event_operation_log MODIFY COLUMN `ACTION_CODE` varchar(32) NOT NULL COMMENT '1、发布事件：add\r\n2、复：reply；3、立项：shift_project；4、转需求：shift_demand5、办结：close_case;6、需求办结：close_demand;转议题：shift_to_issue';
+alter TABLE ic_event_operation_log MODIFY COLUMN `ACTION_CODE` varchar(32) NOT NULL COMMENT '1、发布事件：add\r\n2、复：reply；3、立项：shift_project；4、转需求：shift_demand5、办结：close_case;6、需求办结：close_demand;转议题：shift_to_issue;项目结案：project_closed；议题关闭：close_issue';
 
-alter TABLE ic_event_operation_log MODIFY COLUMN `ACTION_DESC` varchar(32) NOT NULL COMMENT '1、发布事件：publish；2、撤回事件：recall；n3、复：reply；n4、立项：shift_project；5、转需求: shift_demand；6、办结：close_case;7、需求办结：close_demand;8、选择是否已解决：choose_resolve;9、首次查看阅读事件：read_first：人大代表未读=>已读；工作人员待处理=>处理中；转议题：shift_to_issue';
+alter TABLE ic_event_operation_log MODIFY COLUMN `ACTION_DESC` varchar(32) NOT NULL COMMENT '1、发布事件：publish；2、撤回事件：recall；n3、复：reply；n4、立项：shift_project；5、转需求: shift_demand；6、办结：close_case;7、需求办结：close_demand;8、选择是否已解决：choose_resolve;9、首次查看阅读事件：read_first：人大代表未读=>已读；工作人员待处理=>处理中；转议题：shift_to_issue；项目结案：project_closed；议题关闭：close_issue';