获取附件数据优化

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/SupplyController.java

@@ -313,10 +313,6 @@ public class SupplyController extends BaseController {
     }
 
 
-
-
-
-
     /**
      *
      * 根据时间范围查询土地供应统计报表数据
@@ -335,12 +331,6 @@ public class SupplyController extends BaseController {
 
 
 
-
-
-
-
-
-
     @PostMapping("/purpose/export")
     public void exportPurposeReport(HttpServletResponse response, @RequestParam String startYear, @RequestParam String endYear) {
         try {

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/third/impl/TakeDataServiceImpl.java

@@ -231,7 +231,6 @@ public class TakeDataServiceImpl implements TakeDataService {
     }
 
 
-
     /**
      * 远程获取国有建设用地使用权首次登记数据
      * 并且入库
@@ -282,10 +281,7 @@ public class TakeDataServiceImpl implements TakeDataService {
                     needUpdateNodeId = existsNode.getId();
                 }
                 String addNodeId = addOrUpdateLandFirstRegistration(body,projectId,needUpdateNodeId);
-                //这里保存附件信息
-                if(Objects.nonNull(body.getAttachment()) && !body.getAttachment().isEmpty()){
-                    nodeAttachmentService.getThirdAttachment(projectId,addNodeId,AloneWorkFlowEnum.NODE_3.getName(),body.getAttachment());
-                }
+                retMap.put("projectId",projectId);
                 retMap.put("nodeId",addNodeId);
             }
         } catch (Exception e) {
@@ -293,11 +289,34 @@ public class TakeDataServiceImpl implements TakeDataService {
             e.printStackTrace();
             throw new RuntimeException(e);
         }
+
+        //第二部分获取附件数据
+        try {
+            if(MapUtils.isNotEmpty(retMap)){
+                String projectId = retMap.get("projectId").toString();
+                String nodeId = retMap.get("nodeId").toString();
+                Map<String,Object> paramMap = new LinkedHashMap<>();
+                paramMap.put("ywbh",ywh);
+                String remoteResult = ServiceUtil.getRemoteDataByHttpClient("query.ywFiles.datas",paramMap);
+                JSONObject root = JSON.parseObject(remoteResult);
+                JSONObject innerData = root.getJSONObject("data").getJSONObject("data");
+                LandFirstParamVo body = JSON.parseObject(innerData.toString(), LandFirstParamVo.class);
+                //这里保存附件信息
+                if(Objects.nonNull(body) && Objects.nonNull(body.getAttachment()) && !body.getAttachment().isEmpty()){
+                    nodeAttachmentService.getThirdAttachment(projectId,nodeId,AloneWorkFlowEnum.NODE_3.getName(),body.getAttachment());
+                }
+            }
+        } catch (Exception e) {
+            log.error("调用不动产获取附件信息错误,业务号：{}: ", ywh);
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
         return retMap;
     }
 
 
 
+
     public String  addOrUpdateLandFirstRegistration(LandFirstParamVo body,String projectId,String needUpdateNodeId) {
         String addNodeId = "";
         if (StringUtils.isNotBlank(needUpdateNodeId)) {