Merge branches 'yantai_zhengwu_master' and 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master

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

@@ -122,4 +122,19 @@ public class IssueShiftedFromTopicFormDTO implements Serializable {
     private String groupId;
 
     private String issueId;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 地址
+     */
+    private String address;
 }

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

@@ -510,23 +510,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String audit(TokenDto token, IssueAuditionFormDTO param){
-
-        if (StringUtils.isNotBlank(param.getReason())) {
-            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
-            TextTaskDTO taskDTO = new TextTaskDTO();
-            taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
-            taskDTO.setContent(param.getReason());
-            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());
-                }
-            }
-        }
-
+        scanReason(param.getReason());
         Date unifiedDate = new Date();
 
         IssueApplicationDTO application = applicationService.get(param.getIssueApplicationId());
@@ -613,6 +597,24 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return app2update.getIssueId();
     }
 
+    private void scanReason(String reason) {
+        if (StringUtils.isNotBlank(reason)) {
+            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+            TextTaskDTO taskDTO = new TextTaskDTO();
+            taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+            taskDTO.setContent(reason);
+            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());
+                }
+            }
+        }
+    }
+
     /**
      * @Description 表决中列表
      * @param issueListForm

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/IssueShiftedFromTopicFormDTO.java

@@ -122,4 +122,19 @@ public class IssueShiftedFromTopicFormDTO implements Serializable {
     private String groupId;
 
     private String issueId;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 地址
+     */
+    private String address;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicAndGroupResultDTO.java

@@ -33,4 +33,19 @@ public class ResiTopicAndGroupResultDTO implements Serializable {
      * 客户Id
      * */
     private String customerId;
+
+    /**
+     * 定位地址
+     * */
+    private String locateAddress;
+
+    /**
+     * 定位经度
+     * */
+    private String locateLongitude;
+
+    /**
+     * 定位纬度
+     * */
+    private String locateDimension;
 }

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

@@ -1797,38 +1797,10 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         if(null == group) {
             throw new RenException(ModuleConstant.FAILURE_TO_TURN_ISSUE);
         }
-        TopicInfoFormDTO topicId = new TopicInfoFormDTO();
-        topicId.setTopicId(topicTurnIssueFromDTO.getTopicId());
-        Integer issueCount = govIssueFeignClient.checkTopicShiftIssue(topicId).getData();
-        if (issueCount != NumConstant.ZERO){
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), ModuleConstant.ALREADY_SHIFT_ISSUE, ModuleConstant.ALREADY_SHIFT_ISSUE);
-        }
-
+        // 是否已经转议题？
+        checkShiftedIssue(topicTurnIssueFromDTO.getTopicId());
         // 话题转议题审核：标题、建议
-        String issueTitle = topicTurnIssueFromDTO.getIssueTitle();
-        String suggestion = topicTurnIssueFromDTO.getSuggestion();
-        if (StringUtils.isNotBlank(issueTitle) || StringUtils.isNotBlank(suggestion)) {
-            TextScanParamDTO textScan = new TextScanParamDTO();
-            //标题
-            TextTaskDTO taskTitle = new TextTaskDTO();
-            taskTitle.setContent(issueTitle);
-            taskTitle.setDataId(UUID.randomUUID().toString().replace("-", ""));
-            textScan.getTasks().add(taskTitle);
-            //建议
-            TextTaskDTO taskSuggestion = new TextTaskDTO();
-            taskSuggestion.setDataId(UUID.randomUUID().toString().replace("-", ""));
-            taskSuggestion.setContent(suggestion);
-            textScan.getTasks().add(taskSuggestion);
-            Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScan);
-            if (!textSyncScanResult.success()) {
-                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-            } else {
-                if (!textSyncScanResult.getData().isAllPass()) {
-                    log.error(String.format(TopicConstant.SHIFT_ISSUE, issueTitle, suggestion));
-                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
-                }
-            }
-        }
+        scanIssueContent(topicTurnIssueFromDTO.getIssueTitle(),topicTurnIssueFromDTO.getSuggestion());
         FirstTopicShiftedToIssueApplicationResultDTO result = null;
 
         //1.统一时间(群组服务 -> 议题服务)
@@ -1856,6 +1828,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             issueInfo.setGroupName(null == groupCache ? ModuleConstant.EMPTY_STR : groupCache.getGroupName());
             issueInfo.setVotableCount(resiGroupMemberService.gridResiCount(group.getGridId()));
             issueInfo.setGroupId(group.getGroupId());
+            issueInfo.setLatitude(group.getLocateDimension());
+            issueInfo.setLongitude(group.getLocateLongitude());
+            issueInfo.setAddress(group.getLocateAddress());
             //4.调用gov-issue新增议题
             Result<FirstTopicShiftedToIssueApplicationResultDTO> issueResult = issueOpenFeignClient.topicShiftedToIssueV2(issueInfo);
             if (issueResult == null || !issueResult.success() || null == issueResult.getData()) {
@@ -1994,6 +1969,53 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 
     }
 
+    /**
+     * 话题已转议题，请勿重复操作
+     * @param topicId
+     */
+    private void checkShiftedIssue(String topicId) {
+        TopicInfoFormDTO topicInfoFormDTO = new TopicInfoFormDTO();
+        topicInfoFormDTO.setTopicId(topicId);
+        Result<Integer> result = govIssueFeignClient.checkTopicShiftIssue(topicInfoFormDTO);
+        if (result.success()) {
+            Integer issueCount = result.getData();
+            if (issueCount != NumConstant.ZERO) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), ModuleConstant.ALREADY_SHIFT_ISSUE, ModuleConstant.ALREADY_SHIFT_ISSUE);
+            }
+        }
+    }
+
+    /**
+     * 审核提出来
+     * @param issueTitle
+     * @param suggestion
+     */
+    private void scanIssueContent(String issueTitle, String suggestion) {
+        //话题转议题审核：标题、建议
+        if (StringUtils.isNotBlank(issueTitle) || StringUtils.isNotBlank(suggestion)) {
+            TextScanParamDTO textScan = new TextScanParamDTO();
+            //标题
+            TextTaskDTO taskTitle = new TextTaskDTO();
+            taskTitle.setContent(issueTitle);
+            taskTitle.setDataId(UUID.randomUUID().toString().replace("-", ""));
+            textScan.getTasks().add(taskTitle);
+            //建议
+            TextTaskDTO taskSuggestion = new TextTaskDTO();
+            taskSuggestion.setDataId(UUID.randomUUID().toString().replace("-", ""));
+            taskSuggestion.setContent(suggestion);
+            textScan.getTasks().add(taskSuggestion);
+            Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScan);
+            if (!textSyncScanResult.success()) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!textSyncScanResult.getData().isAllPass()) {
+                    log.error(String.format(TopicConstant.SHIFT_ISSUE, issueTitle, suggestion));
+                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+                }
+            }
+        }
+    }
+
     /**
      * @Description 工作端审核议题通过时获取一些议题相关信息
      * @param param
@@ -2019,7 +2041,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         }
 
         IssueShiftedFromTopicFormDTO issueInfo = ConvertUtils.sourceToTarget(param, IssueShiftedFromTopicFormDTO.class);
-
+        issueInfo.setAddress(group.getLocateAddress());
+        issueInfo.setLongitude(group.getLocateLongitude());
+        issueInfo.setLatitude(group.getLocateDimension());
         issueInfo.setCreatedTime(param.getUnifiedDate());
         issueInfo.setGridId(group.getGridId());
         issueInfo.setCustomerId(group.getCustomerId());

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

@@ -400,7 +400,10 @@
             groupp.ID AS groupId,
             IFNULL(groupp.GRID_ID,'') AS gridId,
             IFNULL(groupp.CUSTOMER_ID,'') AS customerId,
-            topic.CREATED_BY AS topicAuthorId
+            topic.CREATED_BY AS topicAuthorId,
+            topic.LOCATE_ADDRESS as locateAddress,
+            topic.LOCATE_LONGITUDE as locateLongitude,
+            topic.LOCATE_DIMENSION as locateDimension
         FROM
             RESI_TOPIC topic
             INNER JOIN RESI_GROUP groupp ON topic.GROUP_ID = groupp.ID

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -575,11 +575,15 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             result.setRegFlag(false);
         } else {
             //更新下user_Base_info信息
+            if(StringUtils.isNotBlank(formDTO.getNick())){
                 baseInfo.setRealName(formDTO.getNick());
                 baseInfo.setSurname(NameUtils.getSurNameComplex(formDTO.getNick()));
                 baseInfo.setName(NameUtils.getNameComplex(formDTO.getNick()));
                 baseInfo.setNickname(formDTO.getNick());
+            }
+            if(StringUtils.isNotBlank(formDTO.getAvatarUrl())){
                 baseInfo.setHeadImgUrl(formDTO.getAvatarUrl());
+            }
             baseDao.updateById(baseInfo);
 
             result.setEpmetUserId(baseInfo.getUserId());