数据验证修改

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/zrzysite/ZrzysiteConstructController.java

@@ -3,6 +3,8 @@ package com.siwei.apply.controller.zrzysite;
 import com.siwei.apply.domain.zrzysite.ZrzysiteConstruct;
 import com.siwei.apply.domain.vo.zrzysite.ZrzysiteConstructFilterVo;
 import com.siwei.apply.service.zrzysite.IZrzysiteCommonService;
+import com.siwei.apply.service.zrzysite.IZrzysiteGhhsService;
+import com.siwei.apply.service.zrzysite.IZrzysiteLandService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
 import com.siwei.common.core.web.page.TableDataInfo;
@@ -18,6 +20,17 @@ public class ZrzysiteConstructController extends BaseController {
     @Autowired
     private IZrzysiteCommonService zrzysiteConstructService;
 
+
+    @Autowired
+    private IZrzysiteLandService zrzysiteLandService;
+
+
+    @Autowired
+    private IZrzysiteGhhsService zrzysiteGhhsService;
+
+
+
+
     @GetMapping("/list")
     public TableDataInfo list(ZrzysiteConstructFilterVo filterVo) {
         startPage();
@@ -41,10 +54,11 @@ public class ZrzysiteConstructController extends BaseController {
 
 
 
-
     @GetMapping("/dingshi")
     public R<String> dingshi() {
-        zrzysiteConstructService.syncConstructInfo("");
+        //zrzysiteLandService.syncLandInfo();
+        zrzysiteGhhsService.syncGhhsInfo();
+        //zrzysiteConstructService.syncConstructInfo("");
         return R.ok("success1");
     }
 
@@ -52,7 +66,4 @@ public class ZrzysiteConstructController extends BaseController {
 
 
 
-
-
-
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/zrzysite/IZrzysiteGhhsService.java

@@ -6,7 +6,7 @@ public interface IZrzysiteGhhsService {
 
 
 
-    void syncConstructInfo();
+    void syncGhhsInfo();
 
 
     void syncCurrentNodeInfo(String projectId,String nodeTableName);

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/zrzysite/IZrzysiteLandService.java

@@ -6,12 +6,11 @@ public interface IZrzysiteLandService {
 
 
 
-    void syncConstructInfo();
+    void syncLandInfo();
 
 
     void syncCurrentNodeInfo(String projectId,String nodeTableName);
 
 
 
-
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/zrzysite/impl/ZrzysiteGhhsServiceImpl.java

@@ -46,7 +46,7 @@ public class ZrzysiteGhhsServiceImpl implements IZrzysiteGhhsService {
     private final SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.YYYY_MM_DD);
 
     @Override
-    public void syncConstructInfo() {
+    public void syncGhhsInfo() {
         List<Project> ghhsProjectList = projectMapper.getZrzysiteProjectList("t_tdhyhs");
         if (!ghhsProjectList.isEmpty()) {
             List<String> projectCodes = ghhsProjectList.stream()
@@ -62,7 +62,13 @@ public class ZrzysiteGhhsServiceImpl implements IZrzysiteGhhsService {
             LinkedHashMap<Project, List<ZrzysiteGhhs>> zrzysiteGhhsMap = new LinkedHashMap<>();
             for (Project project : ghhsProjectList) {
                 List<ZrzysiteGhhs> items = codeToGhhsMap.getOrDefault(project.getCode(), new ArrayList<>());
-                zrzysiteGhhsMap.put(project, items);
+
+                //zrzysiteGhhsMap.put(project, items);
+                //todo 测试可以删除
+                if(!items.isEmpty() && (project.getCode().equals("2017-360199-70-03-021315")||project.getCode().equals("2204-360090-04-01-518552"))){
+                    zrzysiteGhhsMap.put(project, items);
+                }
+
             }
             addGhhsInfoToDataBase(zrzysiteGhhsMap);
         }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/zrzysite/impl/ZrzysiteLandServiceImpl.java

@@ -46,7 +46,7 @@ public class ZrzysiteLandServiceImpl implements IZrzysiteLandService {
     private final SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.YYYY_MM_DD);
 
     @Override
-    public void syncConstructInfo() {
+    public void syncLandInfo() {
         List<Project> landProjectList = projectMapper.getZrzysiteProjectList("t_jsydghxk");
         if (!landProjectList.isEmpty()) {
             List<String> projectCodes = landProjectList.stream()
@@ -62,7 +62,12 @@ public class ZrzysiteLandServiceImpl implements IZrzysiteLandService {
             LinkedHashMap<Project, List<ZrzysiteLand>> zrzysiteLandMap = new LinkedHashMap<>();
             for (Project project : landProjectList) {
                 List<ZrzysiteLand> items = codeToLandMap.getOrDefault(project.getCode(), new ArrayList<>());
-                zrzysiteLandMap.put(project, items);
+                ///zrzysiteLandMap.put(project, items);
+                //todo 测试可以删除
+                if(!items.isEmpty() && (project.getCode().equals("2201-360090-04-01-550464")||project.getCode().equals("2204-360090-04-01-711923"))){
+                    zrzysiteLandMap.put(project, items);
+                }
+
             }
             addLandInfoToDataBase(zrzysiteLandMap);
         }