Merge branch 'dev_bugfix_ljj' into dev

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

@@ -52,6 +52,10 @@ public class ShiftProjectFormDTO implements Serializable {
      * 议题标签
      */
     private List<IssueTagsDTO> tagList;
+    /**
+     * token中客户Id
+     */
+    private String customerId;
 
 }
 

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

@@ -181,9 +181,9 @@ public class IssueManageController {
     @PostMapping("shiftproject-v2")
     public Result shiftProjectV2(@LoginUser TokenDto tokenDTO, @RequestBody ShiftProjectFormDTO formDTO) {
         formDTO.setStaffId(tokenDTO.getUserId());
+        formDTO.setCustomerId(tokenDTO.getCustomerId());
         ValidatorUtils.validateEntity(formDTO);
-        issueService.shiftProjectV2(formDTO);
+        return issueService.shiftProjectV2(formDTO);
-        return new Result();
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IssueDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -219,7 +220,7 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @param formDTO
      * @return void
      */
-    void shiftProjectV2(ShiftProjectFormDTO formDTO);
+    Result shiftProjectV2(ShiftProjectFormDTO formDTO);
 
     /**
      * @Description 已关闭列表 政府端

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

@@ -9,7 +9,9 @@ import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -41,7 +43,6 @@ import com.epmet.entity.IssueEntity;
 import com.epmet.entity.IssueProcessEntity;
 import com.epmet.entity.IssueProjectRelationEntity;
 import com.epmet.feign.*;
-import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.redis.GovIssueRedis;
 import com.epmet.redis.IssueVoteDetailRedis;
 import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;
@@ -62,6 +63,7 @@ import com.epmet.utils.ModuleConstants;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections4.CollectionUtils;
+import org.redisson.api.RLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -136,6 +138,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     private GovProjectOpenFeignClient govProjectOpenFeignClient;
     @Autowired
     private IssueVoteDetailService issueVoteDetailService;
+    @Autowired
+    private DistributedLock distributedLock;
 
 
 	@Value("${openapi.scan.server.url}")
@@ -957,24 +961,28 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
      * @date 2020/12/9 10:01
      */
     @Override
-    public void shiftProjectV2(ShiftProjectFormDTO formDTO) {
+    public Result shiftProjectV2(ShiftProjectFormDTO formDTO) {
+        RLock lock = null;
+        try {
+            //获取锁，判断当前议题是否已处理
+            lock = distributedLock.tryLock(formDTO.getCustomerId() + formDTO.getIssueId());
             //1:查询议题数据
             IssueEntity entity = baseDao.selectById(formDTO.getIssueId());
             if (null == entity) {
-            throw new RenException(IssueConstant.SELECT_EXCEPTION);
+                throw new EpmetException(9999,IssueConstant.SELECT_EXCEPTION,IssueConstant.SELECT_EXCEPTION);
             }
             if (IssueConstant.ISSUE_SHIFT_PROJECT.equals(entity.getIssueStatus())) {
-            throw new RenException(IssueConstant.ISSUE_SHIFT_PROJECT_EXCEPTION);
+                throw new EpmetException(9999,IssueConstant.ISSUE_SHIFT_PROJECT_EXCEPTION,IssueConstant.ISSUE_SHIFT_PROJECT_EXCEPTION);
             }
             if (!IssueConstant.ISSUE_VOTING.equals(entity.getIssueStatus())) {
-            throw new RenException(IssueConstant.ISSUE_VOTING_EXCEPTION);
+                throw new EpmetException(9999,IssueConstant.ISSUE_VOTING_EXCEPTION,IssueConstant.ISSUE_VOTING_EXCEPTION);
             }
             formDTO.setIssueDTO(ConvertUtils.sourceToTarget(entity, IssueDTO.class));
 
             //获取议题分类
             List<IssueCategoryDTO> categoryList = issueCategoryService.getCategoryByIssue(formDTO.getIssueId());
             if (CollectionUtils.isEmpty(categoryList)) {
-            throw new RenException(EpmetErrorCode.CATEGORY_IS_NULL.getCode());
+                throw new EpmetException(EpmetErrorCode.CATEGORY_IS_NULL.getCode(),EpmetErrorCode.CATEGORY_IS_NULL.getMsg(),EpmetErrorCode.CATEGORY_IS_NULL.getMsg());
             }
 
             //公开回复内容审核
@@ -986,10 +994,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 textScanParamDTO.getTasks().add(taskDTO);
                 Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
                 if (!textSyncScanResult.success()) {
-                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+                    throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(),EpmetErrorCode.SERVER_ERROR.getMsg(),EpmetErrorCode.SERVER_ERROR.getMsg());
                 } else {
                     if (!textSyncScanResult.getData().isAllPass()) {
-                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+                        throw new EpmetException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(),EpmetErrorCode.TEXT_SCAN_FAILED.getMsg(),EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
                     }
                 }
             }
@@ -999,7 +1007,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             //2:调用resi-group查询话题创建人数据(目前议题来源只有来自话题),为了到项目服务初始数据以及发送消息使用
             Result<ResiTopicDTO> resultTopicDTO = resiGroupFeignClient.getTopicById(entity.getSourceId());
             if (!resultTopicDTO.success() || null == resultTopicDTO.getData()) {
-            throw new RenException(IssueConstant.SELECT_TOPIC_EXCEPTION);
+                throw new EpmetException(9999,IssueConstant.SELECT_TOPIC_EXCEPTION,IssueConstant.SELECT_TOPIC_EXCEPTION);
             }
             ResiTopicDTO topicDTO = resultTopicDTO.getData();
             formDTO.setTopicDTO(topicDTO);
@@ -1011,7 +1019,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             Result<IssueProjectResultDTO> resultDTO = govProjectFeignClient.issueShiftProject(formDTO);
             if (!resultDTO.success() || null == resultDTO.getData()) {
                 logger.error(resultDTO.getInternalMsg());
-            throw new RenException(IssueConstant.GOV_PRJECT_EXCEPTION);
+                throw new EpmetException(9999,IssueConstant.GOV_PRJECT_EXCEPTION,IssueConstant.GOV_PRJECT_EXCEPTION);
             }
             IssueProjectResultDTO issueProjectResultDTO = resultDTO.getData();
             //更新项目对标签的引用次数
@@ -1046,7 +1054,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
             //5:调用epmet-message服务，给居民端话题创建人、议题发起人以及政府端工作人员发送消息
             if (!shiftProjectMessage(issueProjectResultDTO, formDTO, entity).success()) {
-            throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION);
+                throw new EpmetException(9999,IssueConstant.SAVE_MSG_EXCEPTION,IssueConstant.SAVE_MSG_EXCEPTION);
             }
             //5-1:2020.10.26  添加给居民端话题创建人、议题发起人以及政府端工作人员推送微信订阅消息功能  sun
             if (!wxmpShiftProjectMessage(issueProjectResultDTO, formDTO, entity).success()) {
@@ -1078,6 +1086,13 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
             //8.记录日志
             //SendMqMsgUtil.build().openFeignClient(messageOpenFeignClient).sendProjectChangedMqMsg();
+            return new Result();
+        } catch (Exception e) {
+            return new Result().error(e.getMessage());
+        } finally {
+            distributedLock.unLock(lock);
+        }
+
     }
 
     /**