add

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

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.worker;
 
 import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.service.GLPPWXGQueryAddService;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -35,106 +36,135 @@ public class GLPPWXGQueryAdd {
     private String zjzxxc = "";
     @Value("${wxgwztc}")
     private String wxgwztc = "";
+    @Value("${zjzbxc}")
+    private String zjzbxc = "";
+
+
+
+
 
     @Resource
     GLPPWXGQueryAddService glppwxgQueryAddService;
+    @Resource
+    PublicService publicService;
 
 
+    /**
+     * 从格力总部同步师傅的证件照
+     * 只做新增(王总的要求)
+     * 这里只同步证件照数据，不生成平台图片信息
+     *
+     * 师傅所在网点无效状态不同步
+     * 师傅在平台中不存在不同步
+     * 已同步过的不再同步
+     */
     @Scheduled(fixedDelayString = "${zjzxx}")
     public void process() throws Exception {
-        // 从格力总部同步师傅的证件照
-        // 只做新增(王总的要求)
-        // 这里只同步证件照数据，不生成平台图片信息
-        wxgQueryAddCertInfo();
+        if (zjzxxc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
 
-        // 新增 师傅服务类目信息
-        // wxgQueryAddCategory();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        // 新增格力网点维修工数据
-        wxgQueryAddWXGInfo();
+        log.info("开始同步获取网点师傅证件信息: \uF0B7{}",sdf.format(new Date()));
+        try {
+            glppwxgQueryAddService.extractedCertInfo();
+            log.info("同步获取网点师傅证件信息结束: \uF0B7{}",sdf.format(new Date()));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.info("同步获取网点师傅证件信息失败: \uF0B7{}",sdf.format(new Date()));
+        }
     }
 
-    // 从格力总部同步师傅的证件照数据生成平台的证件图信息
+    // 从格力总部同步师傅的证件数据生成平台的证件图信息
     @Scheduled(fixedDelayString = "${zjzxx}")
-    public void processCert() throws Exception {
-       if (zjzxxc.equals(TaskConfigEnum.FALSE.getCode())){
+    public void processCert(){
+        if (zjzxxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
-       // 创建目录
-        SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
-        File file =new File(sdfs.format(new Date()));
-        if  (!file .exists()  && !file .isDirectory()){
-            file .mkdir();
-        }
-
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        log.info("开始生成网点师傅证件照信息: \uF0B7{}",sdf.format(new Date()));
+        // 创建目录
+        publicService.creatMkdir();
+
+        log.info("开始生成网点师傅平台证件信息: \uF0B7{}",sdf.format(new Date()));
 
         glppwxgQueryAddService.extractedCert();
 
-        log.info("生成网点师傅证件照信息结束: \uF0B7{}",sdf.format(new Date()));
+        log.info("生成网点师傅平台证件信息结束: \uF0B7{}",sdf.format(new Date()));
     }
 
 
+    // 从格力总部同步师傅的保险证件数据生成平台的证件信息
+    @Scheduled(fixedDelayString = "${zjzbx}")
+    public void processBX(){
+        if (zjzbxc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
 
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
+        // 创建目录
+        publicService.creatMkdir();
 
+        log.info("开始生成网点师傅保险证件信息: \uF0B7{}",sdf.format(new Date()));
 
-    @Scheduled(fixedDelayString = "${lmxx}")
-    public void processLM() throws Exception {
-        if (lmxxc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
+        glppwxgQueryAddService.extractedBx();
 
-        // 新增 师傅服务类目信息
-        wxgQueryAddCategory();
+        log.info("生成网点师傅保险证件信息结束: \uF0B7{}",sdf.format(new Date()));
     }
 
-
-    /**
-     * 从格力总部同步师傅的证件照 只用来新增
-     * 师傅状态离职不同步
-     * 师傅在平台中不存在不同步
-     * 已同步过的不再同步
-     */
-    public void wxgQueryAddCertInfo() throws Exception {
-        if (zjzxxc.equals(TaskConfigEnum.FALSE.getCode())){
+    // 新增 师傅服务类目信息
+    // 新增 师傅服务类目信息 这里只做新增(只新增从格力总部过来的师傅服务的类目信息)
+    @Scheduled(fixedDelayString = "${lmxx}")
+    public void processLM() throws Exception {
+        if (lmxxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        log.info("开始同步获取网点师傅证件照信息: \uF0B7{}",sdf.format(new Date()));
+        log.info("开始同步网点师傅服务类目信息: \uF0B7{}",sdf.format(new Date()));
         try {
-            glppwxgQueryAddService.extractedCertInfo();
-            log.info("同步获取网点师傅证件照信息结束: \uF0B7{}",sdf.format(new Date()));
+            glppwxgQueryAddService.extractedAddCategory();
+            log.info("同步网点师傅服务类目信息结束: \uF0B7{}",sdf.format(new Date()));
         } catch (Exception ex) {
-        ex.printStackTrace();
-        log.info("同步获取网点师傅证件照信息失败: \uF0B7{}",sdf.format(new Date()));
+            ex.printStackTrace();
+            log.info("同步网点师傅服务类目信息失败: \uF0B7{}",sdf.format(new Date()));
         }
-
     }
 
-    /**
-     * 新增 师傅服务类目信息 这里只做新增(只新增从格力总部过来的师傅服务的类目信息)
-     */
-    public void wxgQueryAddCategory() throws Exception {
+    // 新增格力网点维修工数据
+    // 放在了 ItfTblWangdianPositionDownload 表但未使用
+    @Scheduled(fixedDelayString = "${wdwxgt}")
+    public void processWxgT(){
+        if (wxgwztc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        log.info("开始同步网点师傅服务类目信息: \uF0B7{}",sdf.format(new Date()));
+        log.info("开始同步网点维修工数据信息: \uF0B7{}",sdf.format(new Date()));
+
         try {
-            glppwxgQueryAddService.extractedAddCategory();
-            log.info("同步网点师傅服务类目信息结束: \uF0B7{}",sdf.format(new Date()));
+            glppwxgQueryAddService.extracteWxgQueryAddWXGInfo();
+            log.info("同步网点维修工数据信息结束: \uF0B7{}",sdf.format(new Date()));
         } catch (Exception ex) {
             ex.printStackTrace();
-            log.info("同步网点师傅服务类目信息失败: \uF0B7{}",sdf.format(new Date()));
+            log.info("同步网点维修工数据信息失败: \uF0B7{}",sdf.format(new Date()));
         }
+    }
+
+
+
+
+
+
+
 
 
 
-    }
 
 
     /**
@@ -155,26 +185,4 @@ public class GLPPWXGQueryAdd {
     }
 
 
-    /**
-     * 新增格力网点维修工数据
-     */
-    public void wxgQueryAddWXGInfo() throws Exception {
-        if (wxgwztc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        log.info("开始同步网点维修工数据信息: \uF0B7{}",sdf.format(new Date()));
-
-        try {
-            glppwxgQueryAddService.extracteWxgQueryAddWXGInfo();
-            log.info("同步网点维修工数据信息结束: \uF0B7{}",sdf.format(new Date()));
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            log.info("同步网点维修工数据信息失败: \uF0B7{}",sdf.format(new Date()));
-        }
-
-    }
-
 }

src/main/java/com/zfire/jiasm/syncdata/service/GLPPWXGQueryAddService.java

@@ -10,6 +10,7 @@ public interface GLPPWXGQueryAddService {
 
     void extracteWxgQueryAddWXGInfo() throws Exception;
 
-    void extractedCert() throws Exception;
+    void extractedCert();
+    void extractedBx();
 
 }

src/main/java/com/zfire/jiasm/syncdata/service/PublicService.java

@@ -129,5 +129,7 @@ public interface PublicService {
     // 获取平台商用保险合同 保险类型
     Insure getWebsitWorkerByWorkerAndWebsit(String type);
 
+    void creatMkdir();
+
 
 }

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

@@ -75,7 +75,8 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
     public void inputData(){
         // 新增师傅数据
         inputDataWorker();
-        // worker_brand_account(师傅网点对应品牌网点信息表) + websit_worker(网点师傅信息表))
+
+        // 添加网点师傅数据及平台与商户网点师傅数据  worker_brand_account(师傅网点对应品牌网点信息表) + websit_worker(网点师傅信息表))
         inputDataWebsitWorker();
     }
 

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

@@ -89,7 +89,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
 
     @Override
-    public void extractedCertInfo() throws Exception {
+    public void extractedCertInfo(){
         WangdianWxgVos wvos = new WangdianWxgVos();
         List<WorkerCert> addList = new ArrayList<>();
         Map<String,Object> req = new HashMap<>();
@@ -98,10 +98,10 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         Map<String,List<WorkerCert>> WorkerCertWorkerIdMaps = new HashMap<>();
         List<ItfTblWangdianWxgDownload> wxgDownladRecs = new ArrayList<>();
         List<WebsitWorker> websitWorkerUp = new ArrayList<>();
-        Map<String,List<WebsitWorker>> websitWorkerWorkerIdMap = new HashMap<>();
         List<String> workerIdandNames = new ArrayList<>();
         List<InsureWorkerCommercial> insurecs = new ArrayList<>();
         List<InsureWorkerCommercialFile> insurefiles = new ArrayList<>();
+        List<String> insureworkeridandWebsitids = new ArrayList<>();
 
         // 提取品牌信息
         Brand brand = baseService.getBrand();
@@ -117,10 +117,15 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             oldWorkerRec.clear();
         }
 
-        List<WebsitWorker> wws = websitWorkerService.lambdaQuery().list();
-        if (CollectionUtils.isNotEmpty(wws)){
-            websitWorkerWorkerIdMap = wws.stream().collect(Collectors.groupingBy(WebsitWorker::getWorkerId));
-            wws.clear();
+        // 提取师傅所有的保险(有效的) 防重复添加
+        List<InsureWorkerCommercial> iwcs = insureWorkerCommercialService.lambdaQuery()
+                .eq(InsureWorkerCommercial::getStatus,"ON").list();
+        if (CollectionUtils.isNotEmpty(iwcs)){
+            iwcs.stream().forEach(event->{
+                insureworkeridandWebsitids.add(event.getWorkerId()+event.getWebsitId());
+            });
+
+            iwcs.clear();
         }
 
         // 提取格力现有的网点师傅数据信息
@@ -181,12 +186,11 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
                     log.info("总部获取的工程师证件照信息wvos:{}", JSONObject.toJSONString(wvos));
                     // 同步-新增证件信息
-                    getCertInfo(wvos, addList, workerId, WorkerCertWorkerIdMaps, websitWorkerUp,wxg.getWdno(),
-                            websitWorkerWorkerIdMap,workerIdandNames, workerWorkeridMap,insurecs,insurefiles);
+                    getCertInfo(wvos, addList, workerId, WorkerCertWorkerIdMaps,wxg.getWdno(),workerIdandNames,
+                            workerWorkeridMap,insurecs,insurefiles, insureworkeridandWebsitids);
                     // 新增或修改(证件)
                     addDataCert(addList);
                     // 修改保险信息
-                    upWebsitWorker(websitWorkerUp);
                     addBxInfo(insurecs, insurefiles);
 
                     log.info("工程师证件照信息同步成功-师傅证件信息:{}", wxg.getSfzen());
@@ -219,7 +223,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
 
     @Override
-    public void extractedCert() throws Exception{
+    public void extractedCert() {
         List<WorkerCert> workerCertList = new ArrayList<>();
         List<WorkerCert> workerCertUpList = new ArrayList<>();
         // 提取需要处理的证件照数据
@@ -246,6 +250,34 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         updateWorkerCertInfo(workerCertUpList, 0);
     }
 
+    @Override
+    public void extractedBx(){
+        List<InsureWorkerCommercialFile> iwcfiles = new ArrayList<>();
+        List<InsureWorkerCommercialFile> iwcfilesUpList = new ArrayList<>();
+        // 提取需要处理的证件照数据
+
+        iwcfiles = insureWorkerCommercialFileService.lambdaQuery()
+                .eq(InsureWorkerCommercialFile::getOutZjljProcess,0)
+                .eq(InsureWorkerCommercialFile::getId,"1696523624660529527")// 测试用
+                .isNotNull(InsureWorkerCommercialFile::getOutZjlj).list();
+
+        for (InsureWorkerCommercialFile item :iwcfiles){
+            try{
+                // 生成图片
+                processBxInfo(item);
+                iwcfilesUpList.add(item);
+
+                updateBxInfo(iwcfilesUpList, 100);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                updateBxInfo(iwcfilesUpList, 0);
+                log.info("生成师傅证件照信息失败worker_cert.id= {}",item.getId());
+            }
+        }
+
+        updateBxInfo(iwcfilesUpList, 0);
+    }
+
     private void updateWorkerCertInfo(List<WorkerCert> workerCertUpList, int i) {
         if (workerCertUpList.size() > i) {
             workerCertService.updateBatchById(workerCertUpList);
@@ -253,6 +285,13 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         }
     }
 
+    private void updateBxInfo(List<InsureWorkerCommercialFile> iwcfilesUpList, int i) {
+        if (iwcfilesUpList.size() > i) {
+            insureWorkerCommercialFileService.updateBatchById(iwcfilesUpList);
+            iwcfilesUpList.clear();
+        }
+    }
+
     private void upWebsitWorker(List<WebsitWorker> websitWorkerUp) {
         if (websitWorkerUp.size()>0){
             websitWorkerService.saveOrUpdateBatch(websitWorkerUp);
@@ -549,7 +588,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 }
 
                 // 师傅不存在不处理
-
                 if (!oldWorkers.contains(wxg.getSfzen())) {
                     continue;
                 }
@@ -707,7 +745,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         }
     }
 
-    private String putCert(String image) throws Exception {
+    private String putCert(String image){
         SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
         String fileId = "";
         String id = sdfs.format(new Date())+IdWorker.getIdStr();
@@ -820,6 +858,16 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         }
     }
 
+    private void processBxInfo(InsureWorkerCommercialFile iwcfile){
+        String id = putCert(iwcfile.getOutZjlj());
+        if (StringUtils.isNotEmpty(id)){
+            iwcfile.setFileUrl(id);
+            iwcfile.setFileUrl(iwcfile.getOutZjlj());
+            iwcfile.setOutZjljProcess(1);
+            new File(id).delete();
+        }
+    }
+
     private void setAdd(WangdianWxgVos wvos, String workerId, String workerName, ZJInfo zj, WorkerCert add) throws ParseException {
         add.setId(UUID.randomUUID().toString());
         add.setWorkerId(workerId);
@@ -878,65 +926,89 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
     private void getCertInfo(WangdianWxgVos wvos, List<WorkerCert> addList, String workerId,
                              Map<String,List<WorkerCert>> WorkerCertWorkerIdMaps,
-                             List<WebsitWorker> websitWorkerUp,String wdno,
-                             Map<String,List<WebsitWorker>> websitWorkerWorkerIdMap,
-                             List<String> workerIdandNames,Map<String,List<Worker>> workerWorkeridMap,
-                             List<InsureWorkerCommercial> insurecs,List<InsureWorkerCommercialFile> insurefiles) throws Exception {
+                             String wdno, List<String> workerIdandNames,Map<String,List<Worker>> workerWorkeridMap,
+                             List<InsureWorkerCommercial> insurecs,
+                             List<InsureWorkerCommercialFile> insurefiles,
+                             List<String> insureworkeridandWebsitids) throws ParseException {
         // 同步-新增证件信息
         for (ZJInfo zj: wvos.getZjInfoList()){
-            Boolean addFlag = Boolean.FALSE;
-            // 保险证单独处理 只有修改无需新增操作
-            // websit.category_type决定保险类型 自建+不为商用(家用)其他商用
-            // 家用 insure_worker_record
-            // 商用 insure_worker_commercial 商用才操作，最有效期最后的那个
-            // websit_worker
-            // 统一入商用保险，有多少份入多少份
-
-            // 保除证先跳过
+            // 保除证
             if (zj.getZjmc().trim().equals("保险证")){
-                // 提取商户售后网点对应的平台售后网点信息 存在一对多的关系 无对应关系退出不处理
-                List<WebsitOrderSign> wos = publicService.shShwdToptshwdByBrandWebsitNo(wdno);
-                if (CollectionUtils.isEmpty(wos)){
+                if (produceBXInfo(workerId, wdno, workerWorkeridMap, insurecs, insurefiles, insureworkeridandWebsitids, zj)){
                     continue;
                 }
+            }
+
+            // 生成其他证件信息
+            produceCert(wvos, addList, workerId, WorkerCertWorkerIdMaps, workerIdandNames, workerWorkeridMap, zj);
+        }
+    }
 
-                // 生成商用保险对像 网点多对1时每个网点放一份
-                for (WebsitOrderSign item : wos){
-                    // 生成商用保险对像
-                    InsureWorkerCommercial a = getInsureWorkerCommercial(workerId, workerWorkeridMap, insurecs, zj, item);
+    private void produceCert(WangdianWxgVos wvos, List<WorkerCert> addList, String workerId, Map<String,
+            List<WorkerCert>> WorkerCertWorkerIdMaps, List<String> workerIdandNames,
+                             Map<String, List<Worker>> workerWorkeridMap, ZJInfo zj) throws ParseException {
+        Boolean addFlag = Boolean.FALSE;
 
-                    // 生成附件对像
-                    getInsureWorkerCommercialFile(insurefiles, zj, a);
+        // workerid+证件名称锁定不重复
+        if (workerIdandNames.contains(workerId + zj.getZjmc().trim())){
+            return;
+        }
+
+        // 历史数据存在不新增
+        if (WorkerCertWorkerIdMaps.containsKey(workerId)){
+            for (WorkerCert item: WorkerCertWorkerIdMaps.get(workerId)){
+                // 名称相同 即表中已存在，不新增
+                if (item.getCertName().equals(zj.getZjmc().trim())){
+                    addFlag = Boolean.TRUE;
+                    break;
                 }
-                continue;
             }
+        }
+        if (addFlag){
+            return;
+        }
+        // 新增
+        addNewWorkerCert(wvos, addList, workerId, workerWorkeridMap.get(workerId).get(0).getWorkerName(), workerIdandNames, zj);
+    }
 
+    /**
+     * 保险证单独处理 只有修改无需新增操作
+     * websit.category_type决定保险类型 自建+不为商用(家用)其他商用
+     * 家用 insure_worker_record
+     * 商用 insure_worker_commercial 商用才操作，最有效期最后的那个
+     * websit_worker
+     *
+     * 统一入商用保险，有多少份入多少份
+     */
+    private boolean produceBXInfo(String workerId, String wdno, Map<String, List<Worker>> workerWorkeridMap,
+                                  List<InsureWorkerCommercial> insurecs, List<InsureWorkerCommercialFile> insurefiles,
+                                  List<String> insureworkeridandWebsitids, ZJInfo zj) throws ParseException {
+        // 提取商户售后网点对应的平台售后网点信息 存在一对多的关系 无对应关系退出不处理
+        List<WebsitOrderSign> wos = publicService.shShwdToptshwdByBrandWebsitNo(wdno);
+        if (CollectionUtils.isEmpty(wos)){
+            return true;
+        }
 
-            // workerid+证件名称锁定不重复
-            if (workerIdandNames.contains(workerId+zj.getZjmc().trim())){
+        // 生成商用保险对像 网点多对1时每个网点放一份
+        for (WebsitOrderSign item : wos){
+            // 防重
+            if (insureworkeridandWebsitids.contains(workerId +item.getWebsitId())){
                 continue;
             }
+            // 生成商用保险对像
+            InsureWorkerCommercial a = getInsureWorkerCommercial(workerId, workerWorkeridMap, insurecs, zj, item);
 
-            // 历史数据存在不新增
-            if (WorkerCertWorkerIdMaps.containsKey(workerId)){
-                for (WorkerCert item:WorkerCertWorkerIdMaps.get(workerId)){
-                    // 名称相同 即表中已存在，不新增
-                    if (item.getCertName().equals(zj.getZjmc().trim())){
-                        addFlag = Boolean.TRUE;
-                        break;
-                    }
-                }
-            }
-            if (addFlag){
-                continue;
-            }
-            // 新增
-            addNewWorkerCert(wvos, addList, workerId, workerWorkeridMap.get(workerId).get(0).getWorkerName(), workerIdandNames, zj);
+            // 生成附件对像
+            getInsureWorkerCommercialFile(insurefiles, zj, a);
+
+            insureworkeridandWebsitids.add(workerId +item.getWebsitId());
         }
+        return false;
     }
 
     @NotNull
-    private InsureWorkerCommercial getInsureWorkerCommercial(String workerId, Map<String, List<Worker>> workerWorkeridMap, List<InsureWorkerCommercial> insurecs, ZJInfo zj, WebsitOrderSign item) throws ParseException {
+    private InsureWorkerCommercial getInsureWorkerCommercial(String workerId, Map<String, List<Worker>> workerWorkeridMap,
+                                                             List<InsureWorkerCommercial> insurecs, ZJInfo zj, WebsitOrderSign item) throws ParseException {
         InsureWorkerCommercial a = new InsureWorkerCommercial();
         a.setId(IdWorker.getIdStr());
         a.setWorkerId(workerId);
@@ -987,7 +1059,8 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         }
     }
 
-    private void addNewWorkerCert(WangdianWxgVos wvos, List<WorkerCert> addList, String workerId, String workerName, List<String> workerIdandNames, ZJInfo zj) throws ParseException {
+    private void addNewWorkerCert(WangdianWxgVos wvos, List<WorkerCert> addList, String workerId, String workerName,
+                                  List<String> workerIdandNames, ZJInfo zj) throws ParseException {
         WorkerCert add = new WorkerCert();
         add.setId(UUID.randomUUID().toString());
         add.setWorkerId(workerId);

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

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -1441,6 +1442,15 @@ public class PublicServiceImpl implements PublicService {
         return insure;
     }
 
+    @Override
+    public void creatMkdir(){
+        SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
+        File file =new File(sdfs.format(new Date()));
+        if  (!file .exists()  && !file .isDirectory()){
+            file .mkdir();
+        }
+    }
+
     private void setLocationByAddress(OrderBase orderBase) {
         if (StringUtils.isEmpty(orderBase.getLng()) || StringUtils.isEmpty(orderBase.getLat())) {
             String add = "";

src/main/resources/bootstrap-dev.properties

@@ -250,12 +250,14 @@ ththhgx=60000
 #维修转结算、维修转结算查询最终结果
 wxzjs=60000
 wxzjscx=60000
-#网点维修工 证件照，服务类目，位置、新增同步到本地、修改
+#网点维修工 证件照，服务类目，位置、新增同步到本地、修改、保险
 zjzxx=60000
 lmxx=60000
 wxgwz=60000
 wxgxg=60000
 wxgwzt=60000
+wdwxgt=600000
+zjzbx=600000
 #京东商城 预约改约、指派改派网点、作废取消、报完工、指派改派人员
 jdyygy=30000
 jdzpgpwd=30000
@@ -362,12 +364,13 @@ ththhgxc=FALSE
 #维修转结算、维修转结算查询最终结果
 wxzjsc=FALSE
 wxzjscxc=FALSE
-#网点维修工 证件照，服务类目，位置、新增同步到本地、修改
+#网点维修工 证件照，服务类目，位置、新增同步到本地、修改、保险
 zjzxxc=FALSE
 lmxxc=FALSE
 wxgwzc=FALSE
 wxgxgc=FALSE
 wxgwztc=FALSE
+zjzbxc=FALSE
 #京东商城 预约改约、指派改派网点、作废取消、报完工、指派改派人员
 jdyygyc=FALSE
 jdzpgpwdc=FALSE

src/main/resources/bootstrap-prd.properties

@@ -247,12 +247,14 @@ ththhgx=60000
 #维修转结算、维修转结算查询最终结果
 wxzjs=60000
 wxzjscx=60000
-#网点维修工 证件照，服务类目，位置、新增同步到本地、修改
+#网点维修工 证件照，服务类目，位置、新增同步到本地、修改、保险
 zjzxx=600000
 lmxx=600000
 wxgwz=600000
 wxgxg=600000
 wxgwzt=600000
+wdwxgt=600000
+zjzbx=600000
 #京东商城 预约改约、指派改派网点、作废取消、报完工、指派改派人员
 jdyygy=30000
 jdzpgpwd=30000
@@ -360,12 +362,13 @@ ththhgxc=TRUE
 #维修转结算、维修转结算查询最终结果
 wxzjsc=TRUE
 wxzjscxc=TRUE
-#网点维修工 证件照，服务类目，位置、新增同步到本地、修改
+#网点维修工 证件照，服务类目，位置、新增同步到本地、修改、保险
 zjzxxc=TRUE
 lmxxc=TRUE
 wxgwzc=FALSE
 wxgxgc=TRUE
-wxgwztc=TRUE
+wxgwztc=FALSE
+zjzbxc=TRUE
 #京东商城 预约改约、指派改派网点、作废取消、报完工、指派改派人员
 jdyygyc=TRUE
 jdzpgpwdc=TRUE

src/main/resources/bootstrap-test.properties

@@ -215,6 +215,7 @@ lbdl=300000
 lbxl=300000
 lbxlt=300000
 lbjx=300000
+gfwww=300000
 #销售类型
 azxslx=7200000
 #需求类别 需求大类、小类
@@ -250,13 +251,14 @@ ththhgx=7200000
 #维修转结算、维修转结算查询最终结果
 wxzjs=7200000
 wxzjscx=7200000
-#网点维修工 证件照，服务类目，位置、新增同步到本地、修改
-zjzxx=60000
-lmxx=60000
-wxgwz=60000
+#网点维修工 证件照，服务类目，位置、新增同步到本地、修改、保险
+zjzxx=600000
+lmxx=600000
+wxgwz=600000
 wxgxg=60000
-gfwww=300000
-wxgwzt=60000
+wxgwzt=600000
+wdwxgt=600000
+zjzbx=600000
 #京东商城 预约改约、指派改派网点、作废取消、报完工、指派改派人员
 jdyygy=30000
 jdzpgpwd=30000
@@ -363,12 +365,13 @@ ththhgxc=FALSE
 #维修转结算、维修转结算查询最终结果
 wxzjsc=FALSE
 wxzjscxc=FALSE
-#网点维修工 证件照，服务类目，位置、新增同步到本地、修改
+#网点维修工 证件照，服务类目，位置、新增同步到本地、修改、保险
 zjzxxc=TRUE
 lmxxc=TRUE
 wxgwzc=TRUE
 wxgxgc=TRUE
 wxgwztc=TRUE
+zjzbxc=TRUE
 #京东商城 预约改约、指派改派网点、作废取消、报完工、指派改派人员
 jdyygyc=TRUE
 jdzpgpwdc=TRUE