add

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGFWebsitWorkerServiceImpl.java

@@ -88,19 +88,19 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
 
     @Override
     public void inputData(){
-        Map<Long,ItfTblWangdianWxgDownload> uprecs = new HashMap<>();
         // 新增师傅数据 只新增不修改
-        inputDataWorker(uprecs);
+        inputDataWorker();
 
         // 添加网点师傅数据及平台与商户网点师傅数据  worker_brand_account(师傅网点对应品牌网点信息表) + websit_worker(网点师傅信息表))
-        inputDataWebsitWorker(uprecs);
+        inputDataWebsitWorker();
 
     }
 
-    void inputDataWebsitWorker(Map<Long,ItfTblWangdianWxgDownload> uprecs){
+    void inputDataWebsitWorker(){
         List<String> sfzs = new ArrayList<>();
         List<String> recouts = new ArrayList<>();
         List<ItfTblWangdianWxgDownload> recs = new ArrayList<>();
+        Map<Long,ItfTblWangdianWxgDownload> uprecs = new HashMap<>();
 
 
         // 提取所有的数据  身份证作为唯一 (有效与无效的只要有效的)
@@ -109,7 +109,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         // 先同步有效的数据
         if (CollectionUtils.isNotEmpty(sfzs)){
             recs = itfTblWangdianWxgDownloadService.lambdaQuery()
-                    .eq(ItfTblWangdianWxgDownload::getSynStatus,0)
+                    .eq(ItfTblWangdianWxgDownload::getWebsitWorkerStatus,0)
                     .in(ItfTblWangdianWxgDownload::getSfzen,sfzs).list();
             // 新增网点师傅 websit_worker(商户网点师傅信息) 存在修改，不存在新增
             // 只做新增，不做修改动作
@@ -120,7 +120,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         // 同步无效的数据
         if (CollectionUtils.isNotEmpty(recouts)){
             recs = itfTblWangdianWxgDownloadService.lambdaQuery()
-                    .eq(ItfTblWangdianWxgDownload::getSynStatus,0)
+                    .eq(ItfTblWangdianWxgDownload::getWebsitWorkerStatus,0)
                     .in(ItfTblWangdianWxgDownload::getSfzen,recouts).list();
             addWebsitWorkerBrandAccountsInfo(recs, uprecs);
         }
@@ -135,12 +135,13 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
 
     }
 
-    void inputDataWorker(Map<Long,ItfTblWangdianWxgDownload> uprecs){
+    void inputDataWorker(){
         List<String> sfzs = new ArrayList<>();
         List<String> recouts = new ArrayList<>();
         List<ItfTblWangdianWxgDownload> recs = new ArrayList<>();
-        extracted(sfzs, recouts);
+        Map<Long,ItfTblWangdianWxgDownload> uprecs = new HashMap<>();
 
+        extracted(sfzs, recouts);
 
         // 先同步有效的数据
         if (CollectionUtils.isNotEmpty(sfzs)){
@@ -160,6 +161,14 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
             addInOutWorker(recs,Boolean.FALSE,uprecs);
         }
 
+        if (uprecs.size()>0){
+            List<ItfTblWangdianWxgDownload> wxgs = new ArrayList<>();
+            uprecs.entrySet().stream()
+                    .forEach(entry -> wxgs.add(entry.getValue()));
+            itfTblWangdianWxgDownloadService.updateBatchById(wxgs);
+            wxgs.clear();
+        }
+
     }
 
     private void extracted(List<String> sfzs, List<String> recouts) {
@@ -276,7 +285,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         List<String> WebsitWorkers = new ArrayList<>();
 
         for (ItfTblWangdianWxgDownload m : addRec){
-            m.setSynStatus(1);
+            m.setWebsitWorkerStatus(1);
             uprecs.put(m.getSynReqId(),m);
             // 只有存在网点对应关系才可以新增师傅到网点信息中来 存在品牌网点对应平台多网点
             if (!websitOrderSignMap.containsKey(m.getWdno())){
@@ -1089,6 +1098,8 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
             oldRec.stream().forEach(event->{
                 oldRecMap.put(event.getWxgid(),event);
             });
+
+            oldRec.clear();
         }
 
         for (int i = 0; i < jsonArray.size(); i++) {
@@ -1157,6 +1168,9 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
             log.info("网点维修工基础资料信息同步更新修改了{}条数据", update.size());
             update.clear();
         }
+
+        oldRecMap.clear();
+        oldRecWxgId.clear();
     }
 
 }

src/main/resources/bootstrap-prd.properties

@@ -205,7 +205,7 @@ netfss=600000
 netgzx=600000
 netgzs=600000
 #网点维修工 佛山销售|售后、广州销售|售后
-fsxwxg=600000
+fsxwxg=60000
 fsswxg=600000
 gzxwxg=600000
 gzswxg=600000