yaozhixue 2 years ago
parent
commit
9919331cce
100 changed files with 586 additions and 147 deletions
  1. 2 0
      src/main/java/com/zfire/jiasm/syncdata/dao/mapper/GDOrderBaseMapper.java
  2. 50 0
      src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGFWebsit.java
  3. 15 15
      src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusiness.java
  4. 9 0
      src/main/java/com/zfire/jiasm/syncdata/download/order/RecycleDownload.java
  5. 31 31
      src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusiness.java
  6. 385 7
      src/main/java/com/zfire/jiasm/syncdata/gree/recycle/RecycleAssignLogic.java
  7. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFastEntryPlusTempController.java
  8. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFieldPlusTempController.java
  9. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModuleFavoritesPlusTempController.java
  10. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModulePlusTempController.java
  11. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminRolePlusTempController.java
  12. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserModuleRelaPlusTempController.java
  13. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserPlusTempController.java
  14. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserRoleRelaPlusTempController.java
  15. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitPlusTempController.java
  16. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitProductTypeRelaPlusTempController.java
  17. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitSlavePlusTempController.java
  18. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AreaPlusTempController.java
  19. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandLbsRelatePlusTempController.java
  20. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandPlusTempController.java
  21. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandWebsitPlusTempController.java
  22. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CityPlusTempController.java
  23. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailLogPlusTempController.java
  24. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailPlusTempController.java
  25. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComListPlusTempController.java
  26. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CommonFilePlusTempController.java
  27. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyCaAuthPlusTempController.java
  28. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyRecordManagePlusTempController.java
  29. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ContractTemplatePlusTempController.java
  30. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationCategoryPlusTempController.java
  31. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationPlusTempController.java
  32. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationWebsitPlusTempController.java
  33. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ImgCarouselManagePlusTempController.java
  34. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InstallChargeConfigPlusTempController.java
  35. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureAgreePlusTempController.java
  36. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailPlusTempController.java
  37. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailRecordPlusTempController.java
  38. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsurePlusTempController.java
  39. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureRangePlusTempController.java
  40. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialFilePlusTempController.java
  41. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialPlusTempController.java
  42. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerRecordPlusTempController.java
  43. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralDoublePlusTempController.java
  44. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeConfigurePlusTempController.java
  45. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeExplainPlusTempController.java
  46. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeSkillPlusTempController.java
  47. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralOffsetPlusTempController.java
  48. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralScorePlusTempController.java
  49. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralSkillLabelPlusTempController.java
  50. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralWorkerApplyPlusTempController.java
  51. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignGzdmDowloadPlusTempController.java
  52. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXqxlDowloadPlusTempController.java
  53. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlbDowloadPlusTempController.java
  54. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlyDowloadPlusTempController.java
  55. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxqdDowloadPlusTempController.java
  56. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignYhsxWxDowloadPlusTempController.java
  57. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAzAssignXslxDowloadPlusTempController.java
  58. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityDownloadPlusTempController.java
  59. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityJdxzDownloadPlusTempController.java
  60. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCountyDownloadPlusTempController.java
  61. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblProvinceDownloadPlusTempController.java
  62. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbDaleiDownloadPlusTempController.java
  63. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbJixinDownloadPlusTempController.java
  64. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXiaoleiDownloadPlusTempController.java
  65. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXilieDownloadPlusTempController.java
  66. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblWangdianWxgDownloadPlusTempController.java
  67. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblXinWangdianDownloadPlusTempController.java
  68. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblYhsxViprankDowloadPlusTempController.java
  69. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelCurrencyPlusTempController.java
  70. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelPlusTempController.java
  71. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/LbsAmapPlusTempController.java
  72. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticePlusTempController.java
  73. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticeRecordPlusTempController.java
  74. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/OperationLogPlusTempController.java
  75. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductPlusTempController.java
  76. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductSeriesPlusTempController.java
  77. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProvincePlusTempController.java
  78. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/QualificationsManagePlusTempController.java
  79. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairBugPlusTempController.java
  80. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairProjectPlusTempController.java
  81. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SmsRecordPlusTempController.java
  82. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/StreetPlusTempController.java
  83. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictPlusTempController.java
  84. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictRefPlusTempController.java
  85. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictTypePlusTempController.java
  86. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ToolPlusTempController.java
  87. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/UserFeedbackPlusTempController.java
  88. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/UserPlusTempController.java
  89. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitEnclosureFilePlusTempController.java
  90. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitExamineRecordPlusTempController.java
  91. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitFilePlusTempController.java
  92. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitMainInfoChangeDataPlusTempController.java
  93. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitMainInfoChangePlusTempController.java
  94. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitOrderSignPlusTempController.java
  95. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitPlusTempController.java
  96. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitServiceCategoryDetailPlusTempController.java
  97. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitServiceCategoryPlusTempController.java
  98. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerBrandAccountPlusTempController.java
  99. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerCertPlusTempController.java
  100. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerChangeIntegralRecordPlusTempController.java

+ 2 - 0
src/main/java/com/zfire/jiasm/syncdata/dao/mapper/GDOrderBaseMapper.java

@@ -22,6 +22,8 @@ public interface GDOrderBaseMapper extends BaseMapper<OrderBase> {
     @SqlParser(filter = true)
     ItfMessagehuifangentity getAZItfMessagehuifangentity(@Param("request") OrderPar request);
     @SqlParser(filter = true)
+    ItfMessagehuifangentity getAZItfMessagehuifangentityT(@Param("request") OrderPar request);
+    @SqlParser(filter = true)
     ItfMessagehuifangentity getItfMessagehuifangentityT(@Param("request") OrderPar request);
 
     @SqlParser(filter = true)

+ 50 - 0
src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGFWebsit.java

@@ -103,6 +103,8 @@ public class GLPPGFWebsit {
 
             // 初始化特殊网点 99999999
             insertTSWDInfo(record);
+            // 初始化特殊网点 X9920000
+            insertTSWDInfoTM(record);
 
 
             log.info("佛山销售网点基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
@@ -323,6 +325,54 @@ public class GLPPGFWebsit {
         }
     }
 
+    private void insertTSWDInfoTM(Brand record) {
+        BrandWebsit oldWebsitRec =  brandWebsitService.lambdaQuery()
+                .eq(BrandWebsit::getBrandWebsitNumber,"X9920000")
+                .eq(BrandWebsit::getType,InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode()).one();
+        if (oldWebsitRec == null){
+            BrandWebsit v = new BrandWebsit();
+
+            v.setId(UUID.randomUUID().toString());
+            v.setBrandPkId(UUID.randomUUID().toString());
+            v.setBelongCompanyId(0);
+            v.setBelongCompany("X9920000");
+            v.setType(InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode());
+            v.setBrandWebsitNumber("X9920000");
+            v.setBrandWebsitName("天猫旗舰店");
+            v.setFzren("/");
+            v.setYddh("4008365315");
+            v.setDhhm("4008365315");
+            v.setSfdlfr("否");
+            v.setLxren("/");
+            v.setFzrsfz("");
+            v.setShao("");
+            v.setKhyh("");
+            v.setHanghao("");
+            v.setYhzh("");
+            v.setSplb("");
+            v.setSplbmc("");
+            v.setFwlm("");
+            v.setWdjb("");
+            v.setSfdsqy("");
+            v.setFwrx("");
+            v.setStat("TOW");
+            v.setSfen("广东省");
+            v.setCshi("珠海市");
+            v.setXian("/");
+            v.setXzhen("/");
+            v.setDizi("珠海");
+            v.setBeiz("特殊网点");
+            v.setGroupCompanyId(record.getBrandId());
+            v.setGroupCompanyName(record.getBrand());
+            v.setCreateBy("system");
+            v.setUpdateBy("system");
+            v.setCreateTime(new Date());
+            v.setUpdateTime(new Date());
+
+            brandWebsitService.save(v);
+        }
+    }
+
     private void extractedFSXSWDLocalAddOrUpdate(List<ItfTblXinWangdianDownload> addRec, List<ItfTblXinWangdianDownload> updateRec,
                                                  Brand record, String type) {
         Boolean flag;

+ 15 - 15
src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusiness.java

@@ -1021,11 +1021,11 @@ public class InstallBusiness {
             o.setRvisitNickName(s.getHfren());
             // 回访人网点信息
             // 售后网点处理
-            websitFWS = publicService.shshwdToptshwd(s.getHfwdno(), orderBase.getMainId());
-            if (StringUtils.isEmpty(websitFWS.getWdId())){
-                websitFWS = publicService.shxswdToptxswd(s.getHfwdno(), orderBase.getMainId());
+            websitFWS = publicService.shshwdToptshwd(s.getHfwdno(), orderBase);
+            if (StringUtils.isEmpty(websitFWS.getWebsitId())){
+                websitFWS = publicService.shxswdToptxswd(s.getHfwdno(), orderBase);
             }
-            o.setRvisitWebsitId(websitFWS.getWdId());
+            o.setRvisitWebsitId(websitFWS.getWebsitId());
             o.setRvisitWebsitName(websitFWS.getWdmc());
 
             o.setRvisitTime(s.getHfsj());
@@ -1077,13 +1077,13 @@ public class InstallBusiness {
 
             orderInstall = azGDFYQDDownloadMapper.getOrderFYQD(request);
             // 创建网点信息
-            websitFWS = publicService.shxswdToptxswd(item.getCjwdno(),orderBase.getMainId());
-            if (StringUtils.isNotEmpty(websitFWS.getWdId())){
-                orderInstall.setShopNo(websitFWS.getWdId());
+            websitFWS = publicService.shxswdToptxswd(item.getCjwdno(),orderBase);
+            if (StringUtils.isNotEmpty(websitFWS.getWebsitId())){
+                orderInstall.setShopNo(websitFWS.getWebsitId());
                 orderInstall.setShopName(websitFWS.getWdmc());
             } else {
-                websitFWS = publicService.shshwdToptshwd(item.getCjwdno(),orderBase.getMainId());
-                orderInstall.setShopNo(websitFWS.getWdId());
+                websitFWS = publicService.shshwdToptshwd(item.getCjwdno(),orderBase);
+                orderInstall.setShopNo(websitFWS.getWebsitId());
                 orderInstall.setShopName(websitFWS.getWdmc());
             }
 
@@ -1107,11 +1107,11 @@ public class InstallBusiness {
             OrderInstallOperatingLog oiol = azGDFkMxDownloadMapper.getOrderFkMx(orderPar);
 
             // 反馈网点处理,先从售后网点查看
-            websitFWS = publicService.shshwdToptshwd(oiol.getWebsitNumber(),orderBase.getMainId());
-            if (StringUtils.isEmpty(websitFWS.getWdId())){
-                websitFWS = publicService.shxswdToptxswd(oiol.getWebsitNumber(),orderBase.getMainId());
+            websitFWS = publicService.shshwdToptshwd(oiol.getWebsitNumber(),orderBase);
+            if (StringUtils.isEmpty(websitFWS.getWebsitId())){
+                websitFWS = publicService.shxswdToptxswd(oiol.getWebsitNumber(),orderBase);
             }
-            oiol.setOperateWebsit(websitFWS.getWdId());
+            oiol.setOperateWebsit(websitFWS.getWebsitId());
             oiol.setWebsitNumber(websitFWS.getWdmc());
 
             // 工单号码
@@ -1123,9 +1123,9 @@ public class InstallBusiness {
             oiol.setUploadNotifyFlag(0);
             // websit_number及operate_websit 可能为空,需从销售网点再次查询
             if (StringUtils.isNotEmpty(fkmx.getWdno()) && StringUtils.isEmpty(oiol.getWebsitNumber())){
-                websitFWS = publicService.shxswdToptxswd(oiol.getWebsitNumber(),orderBase.getMainId());
+                websitFWS = publicService.shxswdToptxswd(oiol.getWebsitNumber(),orderBase);
                 if (websitFWS !=null){
-                    oiol.setOperateWebsit(websitFWS.getWdId());// 为售后网点
+                    oiol.setOperateWebsit(websitFWS.getWebsitId());// 为售后网点
                     oiol.setWebsitNumber(websitFWS.getWdmc());// 为操作人员所属网点
                 }
             }

+ 9 - 0
src/main/java/com/zfire/jiasm/syncdata/download/order/RecycleDownload.java

@@ -104,6 +104,15 @@ public class RecycleDownload {
         recycleAssignLogic.statusUpload();
     }
 
+    /**
+     * 同步采集数据到总部任务
+     * @throws Exception
+     */
+    @Scheduled(fixedDelay = 10 * 1000)
+    private void acquisitionUpload() {
+        recycleAcquisitionLogic.acquisitionUpload();
+    }
+
 
 
 

+ 31 - 31
src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusiness.java

@@ -241,7 +241,7 @@ public class RepairBusiness {
         }
         // 基础表数据同步 总部的修改时间必须晚于本地系统时间才可以修改
         if (item.getLastModifiedDate().compareTo(oldOrder.getUpdateTime())>0){
-            upOrderBase(brand, item, oldOrder.getId(), oldOrder.getMainId());
+            upOrderBase(brand, item, oldOrder.getId(), oldOrder);
             oldOrder = orderBaseService.lambdaQuery()
                     .eq(OrderBase::getPgid, item.getPgid())
                     .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
@@ -468,14 +468,14 @@ public class RepairBusiness {
         } else {
             wdno = item.getWxwdno();
         }
-        WebsitFWS resultData = publicService.shshwdToptshwd(wdno, upOrder.getMainId());
-        upOrder.setWebsitId(resultData.getWdId());
+        WebsitFWS resultData = publicService.shshwdToptshwd(wdno, upOrder);
+        upOrder.setWebsitId(resultData.getWebsitId());
         upOrder.setWebsitName(resultData.getWdmc());
 
 
         if (StringUtils.isNotEmpty(item.getXjwdno())){
-            WebsitFWS res = publicService.shshwdToptshwd(item.getXjwdno(), upOrder.getMainId());
-            upOrder.setReceWebsitId(res.getWdId());
+            WebsitFWS res = publicService.shshwdToptshwd(item.getXjwdno(), upOrder);
+            upOrder.setReceWebsitId(res.getWebsitId());
             upOrder.setReceWebsitName(res.getWdmc());
         } else {
             upOrder.setReceWebsitId("");
@@ -485,9 +485,9 @@ public class RepairBusiness {
         // 结算主体
         // (wxwdno、xjwdno)维修网点与派下级网点同时为空时  (cjwdno、xswdno)创建网点与销售网点都有值
         if (StringUtils.isNotEmpty(upOrder.getWebsitId())){
-            websitFWS = publicService.shshwdToptshwd(wdno,upOrder.getMainId());
+            websitFWS = publicService.shshwdToptshwd(wdno,upOrder);
         } else {
-            websitFWS = publicService.shxswdToptxswd(item.getXswdno(),upOrder.getMainId());
+            websitFWS = publicService.shxswdToptxswd(item.getXswdno(),upOrder);
         }
         upOrder.setBrandId(websitFWS.getBrandId());
         upOrder.setBrandName(websitFWS.getBrandName());
@@ -521,16 +521,16 @@ public class RepairBusiness {
         return flag;
     }
 
-    private void upOrderBase(Brand brand, ItfTblAssignDownload item, String id, String mainId) {
+    private void upOrderBase(Brand brand, ItfTblAssignDownload item, String id, OrderBase oldOrder) {
         // 获取维修工单主表要修改的数据
-        OrderBase upOrder = getUpOrderBase(brand, item, id,mainId);
+        OrderBase upOrder = getUpOrderBase(brand, item, id,oldOrder);
         // 省市区单独处理
         orderService.shPositionTopt(upOrder);
         orderBaseService.updateById(upOrder);
     }
 
     @NotNull
-    private OrderBase getUpOrderBase(Brand brand, ItfTblAssignDownload item, String id,String mainId) {
+    private OrderBase getUpOrderBase(Brand brand, ItfTblAssignDownload item, String id,OrderBase oldOrder) {
         WebsitFWS websitFWS = new WebsitFWS();
         OrderPar orderPar = new OrderPar();
 
@@ -542,8 +542,8 @@ public class RepairBusiness {
         upOrder.setOutUpdateSynReqTime(new Date());
 
         // 销售网点处理
-        websitFWS = publicService.shxswdToptxswd(upOrder.getSaleWebsitId(),mainId);
-        upOrder.setSaleWebsitId(websitFWS.getWdId());
+        websitFWS = publicService.shxswdToptxswd(upOrder.getSaleWebsitId(),oldOrder);
+        upOrder.setSaleWebsitId(websitFWS.getWebsitId());
         upOrder.setSaleWebsitName(websitFWS.getWdmc());
         // 这里为商户的系统网点编号
         upOrder.setSaleWebsitSysNumber(websitFWS.getBrandSysWebsitNumber());
@@ -717,8 +717,8 @@ public class RepairBusiness {
         up.setReadStatus(yd.getYdbz());
         up.setReadTime(yd.getYdsj());
         up.setReadName(yd.getYdrmc());
-        WebsitFWS websitFWS = publicService.shshwdToptshwd(yd.getWdno(), order.getMainId());
-        up.setWebsitId(websitFWS.getWdId());
+        WebsitFWS websitFWS = publicService.shshwdToptshwd(yd.getWdno(), order);
+        up.setWebsitId(websitFWS.getWebsitId());
         up.setWebsitName(websitFWS.getWdmc());
         oilistUp.add(up);
     }
@@ -736,8 +736,8 @@ public class RepairBusiness {
         add.setReadStatus(yd.getYdbz());
         add.setReadName(yd.getYdrmc());
         add.setReadTime(yd.getYdsj());
-        WebsitFWS websitFWS = publicService.shshwdToptshwd(yd.getWdno(), order.getMainId());
-        add.setWebsitId(websitFWS.getWdId());
+        WebsitFWS websitFWS = publicService.shshwdToptshwd(yd.getWdno(), order);
+        add.setWebsitId(websitFWS.getWebsitId());
         add.setWebsitName(websitFWS.getWdmc());
         oilist.add(add);
     }
@@ -903,11 +903,11 @@ public class RepairBusiness {
         OrderAppraise add = assignSatisfactionDownloadMapper.getOrderAppraise(rq);
 
         // rvisit_websit_id 单独处理
-        websitFWS = publicService.shshwdToptshwd(s.getHfwdno(), order.getMainId());
-        if (StringUtils.isEmpty(websitFWS.getWdId())){
-            websitFWS = publicService.shxswdToptxswd(s.getHfwdno(), order.getMainId());
+        websitFWS = publicService.shshwdToptshwd(s.getHfwdno(), order);
+        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
+            websitFWS = publicService.shxswdToptxswd(s.getHfwdno(), order);
         }
-        add.setRvisitWebsitId(websitFWS.getWdId());
+        add.setRvisitWebsitId(websitFWS.getWebsitId());
         add.setRvisitWebsitName(websitFWS.getWdmc());
         // splb 商品大类  单独处理
         add.setMainId(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictCode());
@@ -1033,9 +1033,9 @@ public class RepairBusiness {
         add.setFeedback(fkmx.getFkjg());
         add.setOperator(fkmx.getFkren());
         add.setOperatorNumber(fkmx.getFkrenmc());
-        websitFWS = publicService.shshwdToptshwd(fkmx.getFkwdno(), order.getMainId());
-        if (StringUtils.isEmpty(websitFWS.getWdId())){
-            websitFWS = publicService.shxswdToptxswd(fkmx.getFkwdno(), order.getMainId());
+        websitFWS = publicService.shshwdToptshwd(fkmx.getFkwdno(), order);
+        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
+            websitFWS = publicService.shxswdToptxswd(fkmx.getFkwdno(), order);
         }
         add.setOperateWebsit(websitFWS.getWdmc());
         add.setWebsitPhone(websitFWS.getWdlxdh());
@@ -1134,12 +1134,12 @@ public class RepairBusiness {
             mxreq.setBrandId(brand.getBrandId());
             OrderProduct op = repairMxDownloadMapper.getMx(mxreq);
             // 销售单位处理 sale_websit
-            websitFWS = publicService.shxswdToptxswd(op.getSaleWebsit(),order.getMainId());
-            op.setSaleWebsit(websitFWS.getWdId());
+            websitFWS = publicService.shxswdToptxswd(op.getSaleWebsit(),order);
+            op.setSaleWebsit(websitFWS.getWebsitId());
 
             // 服务单位处理 service_websit
-            websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order.getMainId());
-            op.setServiceWebsit(websitFWS.getWdId());
+            websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order);
+            op.setServiceWebsit(websitFWS.getWebsitId());
 
             // 其他部分参数赋值
             op.setOrderBaseId(order.getId());
@@ -1266,11 +1266,11 @@ public class RepairBusiness {
 
         // 其他部分参数赋值
         // 销售单位处理 sale_websit
-        websitFWS = publicService.shxswdToptxswd(op.getSaleWebsit(),order.getMainId());
-        op.setSaleWebsit(websitFWS.getWdId());
+        websitFWS = publicService.shxswdToptxswd(op.getSaleWebsit(),order);
+        op.setSaleWebsit(websitFWS.getWebsitId());
         // 服务单位处理 service_websit
-        websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order.getMainId());
-        op.setServiceWebsit(websitFWS.getWdId());
+        websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order);
+        op.setServiceWebsit(websitFWS.getWebsitId());
 
         op.setOrderBaseId(order.getId());
         op.setPgguid(item.getPgguid());

+ 385 - 7
src/main/java/com/zfire/jiasm/syncdata/gree/recycle/RecycleAssignLogic.java

@@ -1,5 +1,6 @@
 package com.zfire.jiasm.syncdata.gree.recycle;
 
+import com.aliyun.oss.common.utils.StringUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -13,6 +14,7 @@ import com.zfire.jiasm.syncdata.plus.service.*;
 import io.jsonwebtoken.lang.Collections;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -49,15 +51,21 @@ public class RecycleAssignLogic {
 	ItfTblRecycleHsptJjcjFjDownloadService recycleHsptJjcjFjDownloadService;
 	@Autowired
 	ItfTblRecycleHsptJjcjTmmxDownloadService recycleHsptJjcjTmmxDownloadService;
-
-
-	/*
 	@Autowired
-	FaOrderRecycleAssignFkmxService orderRecycleAssignFkmxService;
+	OrderRecycleAssignFkmxService orderRecycleAssignFkmxService;
 	@Autowired
 	OrderRecycleAssignService orderRecycleAssignService;
 	@Autowired
+	OrderRecycleAssignCollectionService orderRecycleAssignCollectionService;
+	@Autowired
+	OrderRecycleAssignAnnexService orderRecycleAssignAnnexService;
+	@Autowired
 	OrderRecycleAssignMxService orderRecycleAssignMxService;
+
+	/*
+
+
+
 	@Autowired
 	OrderWebsitItemService orderWebsitItemService;
 	@Autowired
@@ -66,8 +74,7 @@ public class RecycleAssignLogic {
 	OrderRecycleAssignWorkerService orderRecycleAssignWorkerService;
 	@Autowired
 	OrderRecycleAssignExpandService orderRecycleAssignExpandService;
-	@Autowired
-	OrderRecycleAssignCollectionService orderRecycleAssignCollectionService;*/
+	*/
 	@Autowired
 	AreaService areaService;
 	@Autowired
@@ -1111,7 +1118,7 @@ public class RecycleAssignLogic {
 							String xjwdmc = "";
 
 							// 反馈明细数据
-							OrderRecycleUploadEvent event =  eventMap.get(feedback.getId()).get(0);
+							FaOrderRecycleUploadEvent event =  eventMap.get(feedback.getId()).get(0);
 							// 组装请求参数
 							RecycleAssignFeedbackUploadBean feedbackUploadBean = mapper.readValue(mapper.writeValueAsString(feedback), RecycleAssignFeedbackUploadBean.class);
 							feedbackUploadBean.setBatchNo(batchNo);
@@ -1137,6 +1144,377 @@ public class RecycleAssignLogic {
 			}
 		}
 	}
+
+
+	/**
+	 * 批量上传采集信息
+	 */
+	public void acquisitionUpload() {
+		List<OrderRecycleUploadEvent> collectionEventList = orderRecycleUploadEventService.lambdaQuery()
+				.eq(OrderRecycleUploadEvent::getSynStatus, Constant.SynStatus.UN_SYN.getCode())
+				.eq(OrderRecycleUploadEvent::getOrderType, Constant.RecycleOrderType.RECYCLE_ASSGIN_COLLECTION)
+				.list();
+		if(null != collectionEventList && !collectionEventList.isEmpty()) {
+			List<OrderRecycleUploadEvent> annexEventList = orderRecycleUploadEventService.lambdaQuery()
+					.eq(OrderRecycleUploadEvent::getSynStatus, Constant.SynStatus.UN_SYN.getCode())
+					.eq(OrderRecycleUploadEvent::getOrderType, Constant.RecycleOrderType.RECYCLE_ASSIGN_ANNEX)
+					.list();
+			String batchNo = java.util.UUID.randomUUID().toString();
+			final Map<Integer, List<OrderRecycleUploadEvent>> collectionEventMap = collectionEventList.stream().collect(Collectors.groupingBy(OrderRecycleUploadEvent::getId));
+			final Map<Integer, List<OrderRecycleUploadEvent>> annexEventMap = (null == annexEventList || annexEventList.isEmpty()) ? null : annexEventList.stream().collect(Collectors.groupingBy(OrderRecycleUploadEvent::getId));
+			LinkedHashSet<Integer> ids = new LinkedHashSet<>();
+			LinkedHashSet<Integer> annexIds = new LinkedHashSet<>();
+			collectionEventList.stream().forEach(event->{
+				ids.add(event.getId());
+			});
+			if(null != annexEventList && !annexEventList.isEmpty()) {
+				annexEventList.stream().forEach(annexEvent->{
+					annexIds.add(annexEvent.getId());
+				});
+			}
+			if(!ids.isEmpty()) {
+				List<OrderRecycleAssignCollection> collectionList = orderRecycleAssignCollectionService.lambdaQuery()
+						.in(OrderRecycleAssignCollection::getId, ids).list();
+				if( null != collectionList && !collectionList.isEmpty()) {
+					final List<OrderRecycleAssignAnnex> annexList = annexIds.isEmpty() ? null :
+							orderRecycleAssignAnnexService.lambdaQuery().in(OrderRecycleAssignAnnex::getId, annexIds).list();
+					//条码表分组gr
+					final Map<Integer, List<OrderRecycleAssignAnnex>> annexMap = (null == annexList || annexList.isEmpty()) ? null :  annexList.stream().collect(Collectors.groupingBy(OrderRecycleAssignAnnex::getCollectionId));
+					LinkedHashSet<Integer> orderIds = new LinkedHashSet<>();
+					LinkedHashSet<Integer> mxIds = new LinkedHashSet<>();
+					collectionList.stream().forEach(collection->{
+						orderIds.add(collection.getOrderId());
+						mxIds.add(collection.getMxId());
+					});
+
+					List<OrderRecycleAssign> recycleList = orderRecycleAssignService.lambdaQuery().in(OrderRecycleAssign::getId, orderIds).list();
+					final Map<Integer, List<OrderRecycleAssign>> recycleMap = (null == recycleList || recycleList.isEmpty()) ? null : recycleList.stream().collect(Collectors.groupingBy(OrderRecycleAssign::getId));
+					List<OrderRecycleAssignMx> mxList = orderRecycleAssignMxService.lambdaQuery()
+							.in(OrderRecycleAssignMx::getId, mxIds).list();
+					collectionList.stream().forEach(collection->{
+						List<OrderRecycleUploadEvent> eventList = new ArrayList<>();
+						final List<OrderRecycleUploadEvent> collectionEventGroupList =  collectionEventMap.get(collection.getId());
+						eventList.addAll(collectionEventGroupList);
+//						OrderRecycleUploadEvent event =  collectionEventMap.get(collection.getId()).get(0);
+//						eventList.add(event);
+						RecycleAcquisitionUploadBean bean = new RecycleAcquisitionUploadBean();
+//							RecycleHsptJjcjUploadBean feedbackUploadBean = mapper.readValue(mapper.writeValueAsString(collection), RecycleHsptJjcjUploadBean.class);
+						RecycleHsptJjcjUploadBean feedbackUploadBean = new RecycleHsptJjcjUploadBean();
+						//完工和报废状态才上传
+						if(null != recycleMap && recycleMap.containsKey(collection.getOrderId())
+								&& null != recycleMap.get(collection.getOrderId())
+								&& !recycleMap.get(collection.getOrderId()).isEmpty()) {
+							if(null != recycleMap.get(collection.getOrderId()).get(0).getOrderState()
+									&& 6 != recycleMap.get(collection.getOrderId()).get(0).getOrderState().intValue()
+									&& 7 != recycleMap.get(collection.getOrderId()).get(0).getOrderState().intValue()
+							) {
+								return;
+							}
+						}
+
+						feedbackUploadBean.setPgguid(recycleList.stream().filter(recycle->recycle.getId().intValue() ==collection.getOrderId().intValue() ).collect(Collectors.toList()).get(0).getPgguid());
+						feedbackUploadBean.setPgmxid(mxList.stream().filter(mx->mx.getId().intValue() == collection.getMxId()).collect(Collectors.toList()).get(0).getPgmxid());
+						//总部和广佛两边鉴定结果刚好相反
+						feedbackUploadBean.setJdjg( (null == collection.getIdentificationResult()) ? null :(  0 == collection.getIdentificationResult().intValue() ? 1 : 0));
+						feedbackUploadBean.setSfcj(collection.getDismantle());
+						feedbackUploadBean.setLceng(collection.getFloor());
+						feedbackUploadBean.setCcun(collection.getMachineSize());
+						feedbackUploadBean.setJjpp(collection.getMachineBrand());
+						feedbackUploadBean.setJjlx(collection.getMachineType());
+						feedbackUploadBean.setJjqsqk(collection.getMachineDefectData());
+						feedbackUploadBean.setPshu(collection.getMachineLmx());
+//							feedbackUploadBean.setJjrj(jjrj);
+						feedbackUploadBean.setSpid(mxList.stream().filter(mx->mx.getId().intValue() == collection.getMxId()).collect(Collectors.toList()).get(0).getSpid());
+						feedbackUploadBean.setSpmc(mxList.stream().filter(mx->mx.getId().intValue() == collection.getMxId()).collect(Collectors.toList()).get(0).getSpmc());
+						//gps经纬度
+						feedbackUploadBean.setGps((!StringUtils.isNullOrEmpty(collection.getLat()) && !StringUtils.isNullOrEmpty(collection.getLng()) ) ? (collection.getLat()+","+collection.getLng()) : "");
+						feedbackUploadBean.setSjcjsfen(collection.getProvince());
+						feedbackUploadBean.setSjcjcshi(collection.getCity());
+						feedbackUploadBean.setSjcjxian(collection.getArea());
+						feedbackUploadBean.setGpsdizi(collection.getGpsAddress());
+						//工程师编号,工程师名称,工程师电话
+						WebsitWorker websitWorker = null;
+						if( null != collection.getMainResponsibleId() ) {
+							websitWorker = websitWorkerService.getById(collection.getMainResponsibleId());
+						}
+						if( null != websitWorker ) {
+							feedbackUploadBean.setAzrenno(websitWorker.getNumber());
+							feedbackUploadBean.setAzren(websitWorker.getName());
+							feedbackUploadBean.setAzrenyddh(websitWorker.getPhone());
+						}
+						//网点编号,网点名称
+						Websit websit = null;
+						OrderRecycleAssign orderRecycleAssign = recycleMap.get(collection.getOrderId()).get(0);
+						if(null != orderRecycleAssign.getAfterWebsitId()) {
+							websit = websitService.getById(orderRecycleAssign.getAfterWebsitId());
+						}
+						if( null != websit) {
+							feedbackUploadBean.setWdno(websit.getWebsitNumber());
+							feedbackUploadBean.setWdmc(websit.getName());
+						}
+						bean.setTblHsptJjcjVO(feedbackUploadBean);
+						bean.setBatchNo(batchNo);
+						bean.setTaskNo(java.util.UUID.randomUUID().toString());
+//							附件
+						List<RecycleHsptJjcjFjUploadBean> tblHsptJjcjFjVO = new ArrayList<>();
+						//条码
+						List<RecycleHsptJjcjTmmxUploadBean> tblHsptJjcjTmmxVO = new ArrayList<>();
+
+						if(!StringUtils.isNullOrEmpty(collection.getInsideTempCode())) {
+							if(null != annexMap && annexMap.containsKey(collection.getId())
+									&& null != annexMap.get(collection.getId()) && !annexMap.get(collection.getId()).isEmpty()) {
+								List<OrderRecycleAssignAnnex> subAnnexList = annexMap.get(collection.getId());
+								if( null != subAnnexList && !subAnnexList.isEmpty() ) {
+									subAnnexList.stream().forEach(o->{
+										if(null != o.getType() && 1 == o.getType().intValue()) {//内机条码
+											RecycleHsptJjcjTmmxUploadBean tmmxBean = new RecycleHsptJjcjTmmxUploadBean();
+											tmmxBean.setTmlx(0);
+											tmmxBean.setJqtm(collection.getInsideTempCode());
+											tmmxBean.setFjserverpath(o.getGreeImageId());
+											tblHsptJjcjTmmxVO.add(tmmxBean);
+
+											//图片id不为空才上传
+											if( !StringUtils.isEmpty(o.getGreeImageId()) ) {
+												RecycleHsptJjcjFjUploadBean fjBean = new RecycleHsptJjcjFjUploadBean();
+												fjBean.setType(1);
+												fjBean.setFjindex(1);
+												fjBean.setFjname("内机条码图");
+												fjBean.setFjserverpath(o.getGreeImageId());
+												tblHsptJjcjFjVO.add(fjBean);
+											}
+
+											if(null != annexEventMap
+													&& annexEventMap.containsKey(o.getId())
+													&& null != annexEventMap.get(o.getId())
+											) {
+												List<OrderRecycleUploadEvent> annexEventGroupList = annexEventMap.get(o.getId());
+												eventList.addAll(annexEventGroupList);
+											}
+										}else if(null != o.getType() && 2 == o.getType().intValue()) {//外机条码
+											RecycleHsptJjcjTmmxUploadBean tmmxBean = new RecycleHsptJjcjTmmxUploadBean();
+											tmmxBean.setTmlx(1);
+											tmmxBean.setJqtm(collection.getOutTempCode());
+											tmmxBean.setFjserverpath(o.getGreeImageId());
+											tblHsptJjcjTmmxVO.add(tmmxBean);
+//													图片id不为空才上传
+											if(!StringUtils.isEmpty(o.getGreeImageId())) {
+												RecycleHsptJjcjFjUploadBean fjBean = new RecycleHsptJjcjFjUploadBean();
+												fjBean.setType(2);
+												fjBean.setFjindex(2);
+												fjBean.setFjname("外机条码图");
+												fjBean.setFjserverpath(o.getGreeImageId());
+												tblHsptJjcjFjVO.add(fjBean);
+											}
+
+											if(null != annexEventMap
+													&& annexEventMap.containsKey(o.getId())
+													&& null != annexEventMap.get(o.getId())
+											) {
+												List<OrderRecycleUploadEvent> annexEventGroupList = annexEventMap.get(o.getId());
+												eventList.addAll(annexEventGroupList);
+											}
+										}
+									});
+								}
+							}
+						}
+						//外机条码
+						if(!StringUtils.isNullOrEmpty(collection.getOutTempCode())) {
+							if(null != annexMap && annexMap.containsKey(collection.getId())
+									&& null != annexMap.get(collection.getId()) && !annexMap.get(collection.getId()).isEmpty()) {
+								if(annexMap.get(collection.getId()).stream().filter(annex->annex.getType().intValue()==2).findAny().isPresent()) {
+									List<OrderRecycleAssignAnnex> outAnnex = annexMap.get(collection.getId()).stream().filter(annex->annex.getType().intValue()==2).collect(Collectors.toList());
+								}
+							}
+						}
+						bean.setTblHsptJjcjFjVO(tblHsptJjcjFjVO);
+						bean.setTblHsptJjcjTmmxVO(tblHsptJjcjTmmxVO);
+						GreeResponseHelper response = acquisitionUploadReq(bean, eventList);
+					});
+				}
+			}
+		}
+	}
+
+	//采集信息上传接口
+	@Transactional
+	public GreeResponseHelper acquisitionUploadReq(
+			RecycleAcquisitionUploadBean acquisitionUploadBean,
+			List<OrderRecycleUploadEvent> eventList
+	) {
+		if(null != acquisitionUploadBean) {
+			final String apiPath = Constant.GreeApiPath.RECYCLE_ACQUISITION_UPLOAD;
+			//采集主表
+			RecycleHsptJjcjUploadBean jjcjBean = acquisitionUploadBean.getTblHsptJjcjVO();
+			//附件表
+			List<RecycleHsptJjcjFjUploadBean> fjBeanList = acquisitionUploadBean.getTblHsptJjcjFjVO();
+			//条码明细表
+			List<RecycleHsptJjcjTmmxUploadBean> tmmxBeanList = acquisitionUploadBean.getTblHsptJjcjTmmxVO();
+			Map<String,Object> map = new HashMap<>();
+			map.put("tblHsptJjcjVO", jjcjBean);
+			map.put("tblHsptJjcjFjVO", fjBeanList);
+			map.put("tblHsptJjcjTmmxVO", tmmxBeanList);
+			RecycleHsptJjcjUpload jjcjUpload = new RecycleHsptJjcjUpload();
+			List<RecycleHsptJjcjFjUpload> fjlist = new ArrayList<>();
+			List<RecycleHsptJjcjTmmxUpload> tmmxlist = new ArrayList<>();
+			try {
+				jjcjUpload = mapper.readValue(mapper.writeValueAsString(jjcjBean), RecycleHsptJjcjUpload.class);
+				jjcjUpload.setSynStatus(Constant.SynStatus.SYN.getCode());
+				jjcjUpload.setSynTime(new Date());
+				jjcjUpload.setCreatedDate(new Date());
+				jjcjUpload.setLastModifiedDate(new Date());
+				jjcjUpload.setUploadBatchNo(acquisitionUploadBean.getBatchNo());
+//				jjcjUpload.setUploadTaskNo(java.util.UUID.randomUUID().toString());
+				jjcjUpload.setUploadTaskNo(acquisitionUploadBean.getTaskNo());
+//				recycleHsptJjcjUploadService.saveOrUpdate(jjcjUpload);
+				if(null != fjBeanList && !fjBeanList.isEmpty()) {
+					fjBeanList.stream().forEach(fjBean->{
+						RecycleHsptJjcjFjUpload fjUpload = new RecycleHsptJjcjFjUpload();
+						try {
+							fjUpload = mapper.readValue(mapper.writeValueAsString(fjBean), RecycleHsptJjcjFjUpload.class);
+							fjUpload.setSynStatus(Constant.SynStatus.SYN.getCode());
+							fjUpload.setSynTime(new Date());
+							fjUpload.setCreatedDate(new Date());
+							fjUpload.setLastModifiedDate(new Date());
+							fjUpload.setUploadBatchNo(acquisitionUploadBean.getBatchNo());
+							fjUpload.setUploadTaskNo(acquisitionUploadBean.getTaskNo());
+							fjlist.add(fjUpload);
+						} catch (JsonProcessingException e) {
+							fjUpload.setSynStatus(Constant.SynStatus.FAIL.getCode());
+							fjUpload.setSynTime(new Date());
+							fjUpload.setCreatedDate(new Date());
+							fjUpload.setLastModifiedDate(new Date());
+							fjUpload.setUploadBatchNo(acquisitionUploadBean.getBatchNo());
+							fjUpload.setUploadTaskNo(acquisitionUploadBean.getTaskNo());
+							fjlist.add(fjUpload);
+						}
+					});
+				}
+				if(null != tmmxBeanList && !tmmxBeanList.isEmpty()) {
+					tmmxBeanList.stream().forEach(tmmxBean->{
+						RecycleHsptJjcjTmmxUpload tmmxUpload = new RecycleHsptJjcjTmmxUpload();
+						try {
+							tmmxUpload = mapper.readValue(mapper.writeValueAsString(tmmxBean), RecycleHsptJjcjTmmxUpload.class);
+							tmmxUpload.setSynStatus(Constant.SynStatus.SYN.getCode());
+							tmmxUpload.setSynTime(new Date());
+							tmmxUpload.setCreatedDate(new Date());
+							tmmxUpload.setLastModifiedDate(new Date());
+							tmmxUpload.setUploadBatchNo(acquisitionUploadBean.getBatchNo());
+							tmmxUpload.setUploadTaskNo(acquisitionUploadBean.getTaskNo());
+							tmmxlist.add(tmmxUpload);
+						} catch (JsonProcessingException e) {
+							tmmxUpload.setSynStatus(Constant.SynStatus.FAIL.getCode());
+							tmmxUpload.setSynTime(new Date());
+							tmmxUpload.setCreatedDate(new Date());
+							tmmxUpload.setLastModifiedDate(new Date());
+							tmmxUpload.setUploadBatchNo(acquisitionUploadBean.getBatchNo());
+							tmmxUpload.setUploadTaskNo(acquisitionUploadBean.getTaskNo());
+							tmmxlist.add(tmmxUpload);
+						}
+					});
+				}
+				GreeResponseHelper response = greeLogic.greePost(apiPath, map, 1);
+				if( 200 == response.getStatus()) {
+					jjcjUpload.setGreeStatSynStatus(Constant.SynStatus.SYN.getCode());
+					jjcjUpload.setGreeStatSynTime(new Date());
+					if( null != eventList && !eventList.isEmpty() ) {
+//						eventList.stream().peek(event->event.setSynStatus(Constant.SynStatus.SYN.getCode()))
+//							.peek(event->event.setSynTime(new Date()));
+						eventList.stream().forEach(event->{
+							event.setSynStatus(Constant.SynStatus.SYN.getCode());
+							event.setSynTime(new Date());
+						});
+					}
+					if(null != fjlist && !fjlist.isEmpty()) {
+						fjlist.stream().forEach(fj->{
+							fj.setGreeStatSynStatus(Constant.SynStatus.SYN.getCode());
+							fj.setGreeStatSynTime(new Date());
+						});
+					}
+					if(null != tmmxlist && !tmmxlist.isEmpty()) {
+						tmmxlist.stream().forEach(tmmx->{
+							tmmx.setGreeStatSynStatus(Constant.SynStatus.SYN.getCode());
+							tmmx.setGreeStatSynTime(new Date());
+						});
+					}
+				}else {
+					jjcjUpload.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
+					jjcjUpload.setGreeStatSynErrMsg(response.getMsg());
+					jjcjUpload.setGreeStatSynTime(new Date());
+					if( null != eventList && !eventList.isEmpty() ) {
+						eventList.stream().forEach(event->{
+							event.setSynStatus(Constant.SynStatus.FAIL.getCode());
+							event.setSynTime(new Date());
+							event.setSynErrMsg(response.getMsg());
+						});
+					}
+					if(null != fjlist && !fjlist.isEmpty()) {
+						fjlist.stream().forEach(fj->{
+							fj.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
+							fj.setGreeStatSynTime(new Date());
+							fj.setSynErrMsg(response.getMsg());
+						});
+					}
+					if(null != tmmxlist && !tmmxlist.isEmpty()) {
+						tmmxlist.stream().forEach(tmmx->{
+							tmmx.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
+							tmmx.setGreeStatSynTime(new Date());
+							tmmx.setSynErrMsg(response.getMsg());
+						});
+					}
+				}
+				recycleHsptJjcjUploadService.saveOrUpdate(jjcjUpload);
+				if( null != eventList && !eventList.isEmpty()) {
+					orderRecycleUploadEventService.saveOrUpdateBatch(eventList);
+				}
+				if(null != fjlist && !fjlist.isEmpty()) {
+					recycleHsptJjcjFjUploadService.saveOrUpdateBatch(fjlist);
+				}
+				if(null != tmmxlist && !tmmxlist.isEmpty()) {
+					recycleHsptJjcjTmmxUploadService.saveOrUpdateBatch(tmmxlist);
+				}
+				return response;
+			}catch(Exception e) {
+				jjcjUpload.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
+				jjcjUpload.setGreeStatSynTime(new Date());
+				if( null != eventList && !eventList.isEmpty() ) {
+					eventList.stream().forEach(event->{
+						event.setSynStatus(Constant.SynStatus.FAIL.getCode());
+						event.setSynTime(new Date());
+					});
+				}
+				if(null != fjlist && !fjlist.isEmpty()) {
+//					fjlist.stream().peek(fj->fj.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode())).
+//						peek(fj->fj.setGreeStatSynTime(new Date()));
+					fjlist.stream().forEach(fj->{
+						fj.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
+						fj.setGreeStatSynTime(new Date());
+					});
+				}
+				if(null != tmmxlist && !tmmxlist.isEmpty()) {
+//					tmmxlist.stream().peek(tmmx->tmmx.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode())).
+//						peek(tmmx->tmmx.setGreeStatSynTime(new Date()));
+					tmmxlist.stream().forEach(tmmx->{
+						tmmx.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
+						tmmx.setGreeStatSynTime(new Date());
+					});
+				}
+				recycleHsptJjcjUploadService.saveOrUpdate(jjcjUpload);
+//				orderRecycleUploadEventService.saveOrUpdate(event);
+				if( null != eventList && !eventList.isEmpty()) {
+					orderRecycleUploadEventService.saveOrUpdateBatch(eventList);
+				}
+				if(null != fjlist && !fjlist.isEmpty()) {
+					recycleHsptJjcjFjUploadService.saveOrUpdateBatch(fjlist);
+				}
+				if(null != tmmxlist && !tmmxlist.isEmpty()) {
+					recycleHsptJjcjTmmxUploadService.saveOrUpdateBatch(tmmxlist);
+				}
+			}
+		}
+		return null;
+	}
+
 	
 	@Transactional
 	public GreeResponseHelper status(RecycleAssignFeedbackUploadBean feedbackUploadBean, FaOrderRecycleUploadEvent event,

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFastEntryPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/admin-fast-entry")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFieldPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/admin-field")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModuleFavoritesPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/admin-module-favorites")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModulePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/admin-module")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminRolePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/admin-role")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserModuleRelaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/admin-user-module-rela")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/admin-user")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserRoleRelaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/admin-user-role-rela")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/admin-websit")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitProductTypeRelaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/admin-websit-product-type-rela")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitSlavePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/admin-websit-slave")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AreaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/area")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandLbsRelatePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/brand-lbs-relate")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/brand")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandWebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/brand-websit")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CityPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/city")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailLogPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/com-detail-log")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/com-detail")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComListPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/com-list")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CommonFilePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/common-file")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyCaAuthPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/company-ca-auth")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyRecordManagePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/company-record-manage")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ContractTemplatePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/contract-template")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationCategoryPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/customer-information-category")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/customer-information")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationWebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/customer-information-websit")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ImgCarouselManagePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/img-carousel-manage")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InstallChargeConfigPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/install-charge-config")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureAgreePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/insure-agree")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/insure-email")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/insure-email-record")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsurePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/insure")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureRangePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/insure-range")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialFilePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/insure-worker-commercial-file")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/insure-worker-commercial")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/insure-worker-record")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralDoublePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/integral-double")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeConfigurePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/integral-grade-configure")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeExplainPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/integral-grade-explain")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeSkillPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/integral-grade-skill")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralOffsetPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/integral-offset")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralScorePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/integral-score")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralSkillLabelPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/integral-skill-label")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralWorkerApplyPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/integral-worker-apply")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignGzdmDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-gzdm-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXqxlDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xqxl-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlbDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxlb-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlyDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxly-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxqdDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxqd-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignYhsxWxDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-yhsx-wx-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAzAssignXslxDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-az-assign-xslx-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-city-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityJdxzDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-city-jdxz-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCountyDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-county-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblProvinceDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-province-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbDaleiDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-dalei-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbJixinDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-jixin-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXiaoleiDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-xiaolei-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXilieDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-xilie-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblWangdianWxgDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-wangdian-wxg-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblXinWangdianDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-xin-wangdian-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblYhsxViprankDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-yhsx-viprank-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelCurrencyPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/label-currency")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/label")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/LbsAmapPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/lbs-amap")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/notice")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticeRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/notice-record")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/OperationLogPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/operation-log")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/product")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductSeriesPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/product-series")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProvincePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/province")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/QualificationsManagePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/qualifications-manage")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairBugPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/repair-bug")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairProjectPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/repair-project")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/SmsRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/sms-record")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/StreetPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/street")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/sys-dict")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictRefPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/sys-dict-ref")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictTypePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/sys-dict-type")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ToolPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/tool")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/UserFeedbackPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/user-feedback")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/UserPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/user")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitEnclosureFilePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/websit-enclosure-file")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitExamineRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/websit-examine-record")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitFilePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/websit-file")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitMainInfoChangeDataPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/websit-main-info-change-data")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitMainInfoChangePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/websit-main-info-change")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitOrderSignPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/websit-order-sign")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/websit")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitServiceCategoryDetailPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/websit-service-category-detail")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitServiceCategoryPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/websit-service-category")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerBrandAccountPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/worker-brand-account")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerCertPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/worker-cert")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerChangeIntegralRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-05-25
+ * @since 2023-05-26
  */
 @Controller
 @RequestMapping("/plus/worker-change-integral-record")

Some files were not shown because too many files changed in this diff