add

src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryAdd.java

@@ -1,7 +1,6 @@
 package com.zfire.jiasm.syncdata.download.worker;
 
 
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.service.GLPPWXGQueryAddService;
 import lombok.extern.slf4j.Slf4j;
@@ -11,7 +10,6 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.io.File;
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 

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

@@ -74,9 +74,51 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
     @Override
     public void inputData(){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        // 提取所有的数据
+        // 提取所有的数据  身份证作为唯一 (有效与无效的只要有效的)
+        List<String> recouts = new ArrayList<>();
+        List<String> recins = new ArrayList<>();
+        List<String> sfzs = new ArrayList<>();
         List<ItfTblWangdianWxgDownload> recs = new ArrayList<>();
-        recs = itfTblWangdianWxgDownloadService.lambdaQuery().list();
+
+        // 有效
+        recs = itfTblWangdianWxgDownloadService.lambdaQuery()
+                .select(ItfTblWangdianWxgDownload::getSfzen)
+                .ne(ItfTblWangdianWxgDownload::getFlag,"无效").list();
+        recs.stream().forEach(wba->{
+            recins.add(wba.getSfzen());
+        });
+        // 去重
+        dupRemoval(recins);
+
+        //无效
+        recs = itfTblWangdianWxgDownloadService.lambdaQuery()
+                .select(ItfTblWangdianWxgDownload::getSfzen)
+                .eq(ItfTblWangdianWxgDownload::getFlag,"无效").list();
+        recs.stream().forEach(wba->{
+            recins.add(wba.getSfzen());
+        });
+        recs.stream().forEach(wba->{
+            recouts.add(wba.getSfzen());
+        });
+        // 去重
+        dupRemoval(recouts);
+        // 有效的
+        sfzs.addAll(recins);
+        //交
+        recins.retainAll(recouts);
+        //差 无效的
+        recouts.removeAll(recins);
+
+        log.info("有效 {}",sfzs.size());
+        log.info("无效 {}",recouts.size());
+
+        if (1==1){
+            return;
+        }
+
+
+
+
 
         Long startTime = System.currentTimeMillis();
         log.info("同步师傅数据到到本地库: \uF0B7{}",sdf.format(new Date()));
@@ -92,6 +134,13 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         recs.clear();
     }
 
+    private void dupRemoval(List<String> recins) {
+        Set set = new HashSet();
+        set.addAll(recins);
+        recins.clear();
+        recins.addAll(set);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void addWebsitWorkerBrandAccountsInfo(List<ItfTblWangdianWxgDownload> addRec) {
         // 新增网点师傅 websit_worker+(商户网点师傅信息) 存在修改，不存在新增
@@ -873,7 +922,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
     }
 
     private void extractedWorkerAddNew(List<ItfTblWangdianWxgDownload> addRec, List<Worker> addWorkerRec) {
-        // 身份证 + 姓名 + 手机号
+        // 身份证 作为唯一 (有效与无效的只要有效)
         List<String> sfzens = new ArrayList<>();
         Map<String, String> workerIdcardMap = new HashMap<>();
         // 提取原有的信息

src/main/java/com/zfire/jiasm/syncdata/test.java

@@ -119,6 +119,35 @@ public class test {
         System.out.println("无");
 
 
+        List<String> roleIds = new ArrayList<>();
+        List<String> tt = new ArrayList<>();
+
+        List<String> xx = new ArrayList<>();
+
+        roleIds.add("1");
+        roleIds.add("3");
+        roleIds.add("2");
+
+        tt.add("3");
+        tt.add("4");
+
+        xx.addAll(roleIds);
+
+        System.out.println("交");
+        roleIds.retainAll(tt);
+
+        tt.removeAll(roleIds);
+
+        xx.addAll(tt);
+
+        System.out.println(xx);
+
+
+
+
+        System.out.println(roleIds);
+
+
     }