add

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

@@ -599,6 +599,9 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
                 }
             }
         }
+
+        // 省市区街道不修改
+        /*
         if (!StringUtils.isEmpty(old.getSfen()) || !StringUtils.isEmpty(item.getSfen())){
             if (!StringUtils.isEmpty(old.getSfen()) && !StringUtils.isEmpty(item.getSfen())){
                 if (!old.getSfen().equals(item.getSfen())){
@@ -674,6 +677,10 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
                 }
             }
         }
+        */
+
+
+
         if ((item.getJingdu() !=null) && (old.getJingdu().compareTo(item.getJingdu()) !=0)){
             old.setJingdu(item.getJingdu());
             flag = Boolean.TRUE;

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

@@ -76,6 +76,8 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
     WorkerCertGreeService workerCertGreeService;
     @Autowired
     UploadWorkeCertificateService uploadWorkeCertificateService;
+    @Resource
+    BrandLbsRelateService brandLbsRelateService;
 
 
 
@@ -120,7 +122,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         recs = getWorkerUploads(0);
 
         // 测试用
-        // recs = getWorkerUploadstest();
+        recs = getWorkerUploadstest();
 
         for (OutWorkerUpload item:recs){
             try{
@@ -508,7 +510,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         }
     }
 
-    private boolean getaddres(OutWorkerUpload item, WorkUploadInfo req, @NotNull WorkerBrandAccount dot) {
+    private boolean getaddresbak(OutWorkerUpload item, WorkUploadInfo req, @NotNull WorkerBrandAccount dot) {
         WebsitWorker wwone = websitWorkerService.lambdaQuery()
                 .eq(WebsitWorker::getWebsitWorkerId, dot.getWebsitWorkerId()).one();
         if (StringUtils.isNotEmpty(wwone.getLng()) && StringUtils.isNotEmpty(wwone.getLat())){
@@ -557,6 +559,45 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         return Boolean.TRUE;
     }
 
+    private boolean getaddres(OutWorkerUpload item, WorkUploadInfo req, @NotNull WorkerBrandAccount dot) {
+        // 使用商户网点的位置 一般是存在的
+        BrandWebsit bw = brandWebsitService.lambdaQuery()
+                .eq(BrandWebsit::getBrandWebsitNumber, dot.getBrandWebsitId())
+                .last("limit 1").one();
+        if (bw == null){
+            return Boolean.TRUE;
+        }
+        if (!bw.getAddressSuccess().equals(1)){
+            updateWorkerUploadLag(item,"省市区街道信息有误,请及时维护");
+        }
+
+        if (StringUtils.isNotEmpty(bw.getSfen()) &&
+                StringUtils.isNotEmpty(bw.getCshi()) &&
+                StringUtils.isNotEmpty(bw.getXian()) &&
+                StringUtils.isNotEmpty(bw.getXzhen())){
+            req.setSfen(bw.getSfen());
+            req.setCshi(bw.getCshi());
+            req.setCounty(bw.getXian());
+            req.setXzhen(bw.getXzhen());
+            return Boolean.FALSE;
+        }
+
+        if (bw.getJingdu() !=null && bw.getWeidu() !=null){
+            Geographicallocation gs = publicService.getRegionByAddress(String.valueOf(bw.getJingdu()),String.valueOf(bw.getWeidu()));
+            if (gs != null){
+                req.setSfen(gs.getProvince());
+                req.setCshi(gs.getCity());
+                req.setCounty(gs.getArea());
+                req.setXzhen(gs.getStreet());
+                return Boolean.FALSE;
+            }
+        }
+
+        // 写入表备注信息
+        updateWorkerUploadLag(item,"省市区街道信息不存在,请及时维护");
+        return Boolean.TRUE;
+    }
+
 
     // 商户网点与平台网点存在一对多，确保正确，所有平台网点的图片都必须生成
     private boolean checkBXOutInsureCert(List<WorkerBrandAccount> workerBrandAccount) {
@@ -1394,6 +1435,15 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         } else {
             // 失败 修改同步状态
             updateWorkerUploadError(item, response);
+            if (response.getMsg().contains("获取不到乡镇信息")){
+                BrandWebsit bw = brandWebsitService.lambdaQuery()
+                        .eq(BrandWebsit::getBrandWebsitNumber, brandWebsitId)
+                        .last("limit 1").one();
+                if (bw !=null){
+                    bw.setAddressSuccess(0);
+                    bw.updateById();
+                }
+            }
         }
     }
 
@@ -2013,7 +2063,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
     private List<OutWorkerUpload> getWorkerUploadstest() {
         // 同步标志-synStatus(0:待同步;1:已同步;99:同步失败)
         List<OutWorkerUpload> recs = outWorkerUploadService.lambdaQuery()
-                .eq(OutWorkerUpload::getSynReqId,125).list();
+                .eq(OutWorkerUpload::getSynReqId,46).list();
         return recs;
     }
 }

src/main/resources/bootstrap-prdt.properties

@@ -298,7 +298,7 @@ SMSSelf_marketing_Rate=5000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
 workercertificatec=FALSE
-workerceruploadc=FALSE
+workerceruploadc=TRUE
 detaildownc=FALSE
 workercertbxc=FALSE
 workerrzc=FALSE
@@ -397,7 +397,7 @@ tmscc=FALSE
 azuploadyscc=FALSE
 azuploadscc=FALSE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
-wxuploadyscc=TRUE
+wxuploadyscc=FALSE
 wxuploadscc=FALSE
 #以旧换新 鉴定单、生成条码、条码上传
 yjhxjddc=FALSE