议题审核通过

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){
-
+        scanReason(param.getReason());
-        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());
-                }
-            }
-        }
-
         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-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -2041,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());