no message

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

@@ -442,7 +442,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     public void extractedCert() {
 
         //测试用
-        List<String> workerIds = Arrays.asList("S13430387965","S18229336122");
+        //List<String> workerIds = Arrays.asList("S13430387965","S18229336122");
 
         List<WorkerCert> workerCertList = new ArrayList<>();
         List<WorkerCert> workerCertUpList = new ArrayList<>();
@@ -450,7 +450,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
         workerCertList = workerCertService.lambdaQuery()
                 .eq(WorkerCert::getOutZjljProcess,0)
-                .in(WorkerCert::getWorkerId,workerIds)
+                //.in(WorkerCert::getWorkerId,workerIds)
                 // .eq(WorkerCert::getWorkerId,"1696523821251751946")// 测试用
                 .isNotNull(WorkerCert::getOutZjlj)
                 .list();
@@ -502,7 +502,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     @Override
     public void extractedBx(){
         //测试用
-        List<String> workerIds = Arrays.asList("S13430387965","S18229336122");
+        //List<String> workerIds = Arrays.asList("S13430387965","S18229336122");
 
         List<WebsitWorker> websitWorkers = new ArrayList<>();
         List<WebsitWorker> websitWorkerUpList = new ArrayList<>();
@@ -510,7 +510,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         // 提取需要处理的证件照数据
         websitWorkers = websitWorkerService.lambdaQuery()
                 .eq(WebsitWorker::getOutZjljProcess,0)
-                .in(WebsitWorker::getWorkerId,workerIds)// 测试用
+        //        .in(WebsitWorker::getWorkerId,workerIds)// 测试用
                 .isNotNull(WebsitWorker::getOutZjlj).list();
 
         for (WebsitWorker item :websitWorkers){
@@ -2179,9 +2179,9 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
         //去重，判断是否存在
         List<WorkerServiceCategory> hasWorkerServiceCategory = wscList.stream().filter(v ->
-                org.apache.commons.lang3.StringUtils.equals(v.getWebsitWorkerId(), workerBrandAccount.getWebsitWorkerId())
-                        && org.apache.commons.lang3.StringUtils.equals(v.getFlag(), type)
-                        && org.apache.commons.lang3.StringUtils.equals(v.getType(), code)
+                StringUtils.equals(v.getWebsitWorkerId(), workerBrandAccount.getWebsitWorkerId())
+                        && StringUtils.equals(v.getFlag(), type)
+                        && StringUtils.equals(v.getType(), code)
         ).collect(Collectors.toList());
 
         WorkerServiceCategory wsc = null;
@@ -2201,21 +2201,29 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             wscList.add(wsc);
         }
 
-        // WorkerServiceCategoryDetail 新增
-        WorkerServiceCategoryDetail wscd = new WorkerServiceCategoryDetail();
-        wscd.setId(IdWorker.getIdStr());
-        wscd.setWorkerServiceCategoryId(wsc.getId());
-        wscd.setWorkerId(workerBrandAccount.getWorkerId());
-        wscd.setWebsitId(workerBrandAccount.getWebsitId());
-        wscd.setWebsitWorkerId(workerBrandAccount.getWebsitWorkerId());
-        wscd.setServiceCategoryId(sysDict.getDictCode());
-        wscd.setServiceCategoryName(sysDict.getDictValue());
-        wscd.setFlag(type);
-        wscd.setType(code);
-        wscd.setMainId(sysDictRef.getDictCode());
-        wscd.setMainName(sysDictRef.getDictValue());
-        wscd.setCreateTime(new Date());
-
-        wscdList.add(wscd);
+        //去重，判断是否存在
+        long count = wscdList.stream().filter(v ->
+                StringUtils.equals(v.getWebsitWorkerId(), workerBrandAccount.getWebsitWorkerId())
+                        && StringUtils.equals(v.getFlag(), type)
+                        && StringUtils.equals(v.getType(), code)
+                        && StringUtils.equals(v.getMainId(),sysDictRef.getDictCode())
+        ).count();
+        if(count == 0) {
+            // WorkerServiceCategoryDetail 新增
+            WorkerServiceCategoryDetail wscd = new WorkerServiceCategoryDetail();
+            wscd.setId(IdWorker.getIdStr());
+            wscd.setWorkerServiceCategoryId(wsc.getId());
+            wscd.setWorkerId(workerBrandAccount.getWorkerId());
+            wscd.setWebsitId(workerBrandAccount.getWebsitId());
+            wscd.setWebsitWorkerId(workerBrandAccount.getWebsitWorkerId());
+            wscd.setServiceCategoryId(sysDict.getDictCode());
+            wscd.setServiceCategoryName(sysDict.getDictValue());
+            wscd.setFlag(type);
+            wscd.setType(code);
+            wscd.setMainId(sysDictRef.getDictCode());
+            wscd.setMainName(sysDictRef.getDictValue());
+            wscd.setCreateTime(new Date());
+            wscdList.add(wscd);
+        }
     }
 }