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

+ 3 - 3
pom.xml

@@ -61,11 +61,11 @@
             <artifactId>aliyun-java-sdk-sts</artifactId>
             <version>3.0.0</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>5.2.5</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
@@ -333,7 +333,6 @@
         </profile>
     </profiles>
 
-
     <build>
         <plugins>
             <plugin>
@@ -352,6 +351,7 @@
         </plugins>
     </build>
 
+
     <repositories>
         <repository>
             <id>nexus</id>

+ 5 - 2
src/main/java/com/zfire/jiasm/syncdata/base/BaseService.java

@@ -2,6 +2,9 @@ package com.zfire.jiasm.syncdata.base;
 
 import com.zfire.jiasm.syncdata.plus.entity.Brand;
 import com.zfire.jiasm.syncdata.plus.service.BrandService;
+import com.zfire.jiasm.syncdata.plus.service.BrandWebsitService;
+import com.zfire.jiasm.syncdata.plus.service.CustomerInformationWebsitService;
+import com.zfire.jiasm.syncdata.plus.service.WebsitOrderSignService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -29,12 +32,13 @@ public class BaseService {
     @Resource
     BrandService brandService;
 
+
+
      public Brand getBrand() {
         Brand brand = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
         return brand;
     }
 
-
     public void saveToFile(String desUrl,String id){
         FileOutputStream fos = null;
         BufferedInputStream bis = null ;
@@ -107,5 +111,4 @@ public class BaseService {
     }
 
 
-
 }

+ 15 - 0
src/main/java/com/zfire/jiasm/syncdata/dao/mapper/AssignDownloadMapper.java

@@ -0,0 +1,15 @@
+package com.zfire.jiasm.syncdata.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zfire.jiasm.syncdata.parameter.OrderPar;
+import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignDownload;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 维修单表下载记录表 Mapper 接口
+ * @author yaozx
+ * @since 2023-03-10
+ */
+public interface AssignDownloadMapper extends BaseMapper<ItfTblAssignDownload> {
+    void updateStatus(@Param("request") OrderPar request);
+}

+ 1 - 0
src/main/java/com/zfire/jiasm/syncdata/dao/mapper/CodeOrderInstallDetailMapper.java

@@ -22,4 +22,5 @@ public interface CodeOrderInstallDetailMapper extends BaseMapper<OrderInstallDet
     ItfTblAzWgmxSyktTmmxLsUpload getSyCode(@Param("request") InstalDetailCode request);
     ItfTblAzWgmxQitaTmmxUpload getOtherCode(@Param("request") InstalDetailCode request);
     void updateCodePgguid(@Param("request") InstalDetailCode request);
+    void updateCodeOutId(@Param("request") InstalDetailCode request);
 }

+ 4 - 0
src/main/java/com/zfire/jiasm/syncdata/dao/mapper/DetailOrderInstallMapper.java

@@ -1,5 +1,6 @@
 package com.zfire.jiasm.syncdata.dao.mapper;
 
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zfire.jiasm.syncdata.parameter.InstallDetail;
 import com.zfire.jiasm.syncdata.plus.entity.ItfTblAzWgmxJyktUpload;
@@ -15,8 +16,11 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface DetailOrderInstallMapper extends BaseMapper<OrderInstallDetail>  {
 
+    @SqlParser(filter = true)
     ItfTblAzWgmxJyktUpload getOrderInstallUpload(@Param("request") InstallDetail request);
+    @SqlParser(filter = true)
     ItfTblAzWgmxSyktUpload getSyOrderInstallUpload(@Param("request") InstallDetail request);
+    @SqlParser(filter = true)
     ItfTblAzWgmxQitaUpload getOtherOrderInstallUpload(@Param("request") InstallDetail request);
 
     void installUpdatePgguid(@Param("request") InstallDetail request);

+ 15 - 0
src/main/java/com/zfire/jiasm/syncdata/dao/mapper/DetailOrderRepairMapper.java

@@ -0,0 +1,15 @@
+package com.zfire.jiasm.syncdata.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zfire.jiasm.syncdata.parameter.OrderPar;
+import com.zfire.jiasm.syncdata.plus.entity.OrderRepairDetail;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 维修数据采集明细表 Mapper 接口
+ * @author yaozx
+ * @since 2023-03-09
+ */
+public interface DetailOrderRepairMapper extends BaseMapper<OrderRepairDetail> {
+    void updateWebsitMessage(@Param("request") OrderPar request);
+}

+ 7 - 3
src/main/java/com/zfire/jiasm/syncdata/dao/mapper/FileOrderDetailMapper.java

@@ -1,5 +1,6 @@
 package com.zfire.jiasm.syncdata.dao.mapper;
 
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zfire.jiasm.syncdata.parameter.InstallCJDetailFile;
 import com.zfire.jiasm.syncdata.plus.entity.ItfTblAzWgmxJyktFjUpload;
@@ -18,10 +19,13 @@ import java.util.List;
 public interface FileOrderDetailMapper extends BaseMapper<OrderDetailFile> {
 
     List<OrderDetailFile> getId(@Param("request") InstallCJDetailFile request);
-    ItfTblAzWgmxJyktFjUpload getFileUpload(@Param("request") InstallCJDetailFile request);
     void updateFilePgguid(@Param("request") InstallCJDetailFile request);
-    ItfTblAzWgmxSyktFjUpload getSyFileUpload(@Param("request") InstallCJDetailFile request);
-    ItfTblAzWgmxQitaFjUpload getOtherFileUpload(@Param("request") InstallCJDetailFile request);
 
 
+    @SqlParser(filter = true)
+    ItfTblAzWgmxJyktFjUpload getFileUpload(@Param("request") InstallCJDetailFile request);
+    @SqlParser(filter = true)
+    ItfTblAzWgmxSyktFjUpload getSyFileUpload(@Param("request") InstallCJDetailFile request);
+    @SqlParser(filter = true)
+    ItfTblAzWgmxQitaFjUpload getOtherFileUpload(@Param("request") InstallCJDetailFile request);
 }

+ 20 - 0
src/main/java/com/zfire/jiasm/syncdata/dao/mapper/OperatingLogOrderInstallMapper.java

@@ -0,0 +1,20 @@
+package com.zfire.jiasm.syncdata.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zfire.jiasm.syncdata.parameter.OperatingLog;
+import com.zfire.jiasm.syncdata.plus.entity.ItfTblAzAssignFkmxUpload;
+import com.zfire.jiasm.syncdata.plus.entity.OrderInstallOperatingLog;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 安装工单操作日志 Mapper 接口
+ * @author yaozx
+ * @since 2023-03-06
+ */
+public interface OperatingLogOrderInstallMapper extends BaseMapper<OrderInstallOperatingLog> {
+
+    ItfTblAzAssignFkmxUpload getOperatingLog(@Param("request") OperatingLog request);
+    void upLogfkid(@Param("request") OperatingLog request);
+    void upLogpgguid(@Param("request") OperatingLog request);
+
+}

+ 17 - 0
src/main/java/com/zfire/jiasm/syncdata/dao/mapper/ReAppointmentOrderMapper.java

@@ -0,0 +1,17 @@
+package com.zfire.jiasm.syncdata.dao.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zfire.jiasm.syncdata.parameter.ReAppointment;
+import com.zfire.jiasm.syncdata.plus.entity.ItfTblAzAssignAppointmentUpload;
+import com.zfire.jiasm.syncdata.plus.entity.OrderReAppointment;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 安装工单改约 Mapper 接口
+ * @author yaozx
+ * @since 2023-03-07
+ */
+public interface ReAppointmentOrderMapper extends BaseMapper<OrderReAppointment> {
+    ItfTblAzAssignAppointmentUpload getReAppointment(@Param("request") ReAppointment request);
+}

+ 19 - 0
src/main/java/com/zfire/jiasm/syncdata/dao/mapper/RepairDownloadMapper.java

@@ -0,0 +1,19 @@
+package com.zfire.jiasm.syncdata.dao.mapper;
+
+import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zfire.jiasm.syncdata.parameter.OrderPar;
+import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignDownload;
+import com.zfire.jiasm.syncdata.plus.entity.OrderBase;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 维修单表下载记录  Mapper 接口
+ * @author yaozx
+ * @since 2023-03-08
+ */
+public interface RepairDownloadMapper extends BaseMapper<ItfTblAssignDownload> {
+
+    @SqlParser(filter = true)
+    OrderBase getOrderBase(@Param("request") OrderPar request);
+}

+ 11 - 146
src/main/java/com/zfire/jiasm/syncdata/download/order/AnzhuangGongDanBusiness.java → src/main/java/com/zfire/jiasm/syncdata/download/order/install/InstallBusiness.java

@@ -1,4 +1,4 @@
-package com.zfire.jiasm.syncdata.download.order;
+package com.zfire.jiasm.syncdata.download.order.install;
 
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -12,6 +12,7 @@ import com.zfire.jiasm.syncdata.dao.mapper.AZGDLcLsDownloadMapper;
 import com.zfire.jiasm.syncdata.parameter.OrderPar;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
+import com.zfire.jiasm.syncdata.service.OrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
@@ -31,10 +32,10 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Component
-public class AnzhuangGongDanBusiness {
+public class InstallBusiness {
 
     @Resource
-    AnzhuangGongDanBusiness anzhuangGongDanBusiness;
+    InstallBusiness installBusiness;
     @Resource
     ItfTblAzAssignLcLsDownloadService itfTblAzAssignLcLsDownloadService;
     @Resource
@@ -44,12 +45,6 @@ public class AnzhuangGongDanBusiness {
     @Resource
     BaseService baseService;
     @Resource
-    StreetService streetService;
-    @Resource
-    BrandLbsRelateService brandLbsRelateService;
-    @Resource
-    AreaService areaService;
-    @Resource
     WebsitOrderSignService websitOrderSignService;
     @Resource
     CustomerInformationWebsitService customerInformationWebsitService;
@@ -83,6 +78,8 @@ public class AnzhuangGongDanBusiness {
     WebsitService websitService;
     @Resource
     OrderAppraiseService orderAppraiseService;
+    @Resource
+    OrderService orderService;
 
 
 
@@ -135,16 +132,16 @@ public class AnzhuangGongDanBusiness {
                 .in(OrderBase::getPgguid,lclslist).list();
         orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgguid).collect(Collectors.toList());
 
-        // 按单处理  这里是直接生成新单到本地表,并没判断是否已存在,
+
         // 按任务号download_task_no,按单来处理
         for (ItfTblAzAssignLcLsDownload item: lcls) {
             try{
                 if (orderBaselist.contains(item.getPgguid())){
                     // 修改
-                    anzhuangGongDanBusiness.orderUpdate(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item);
+                    installBusiness.orderUpdate(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item);
                 } else {
                     // 新增
-                    anzhuangGongDanBusiness.orderAdd(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item);
+                    installBusiness.orderAdd(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item);
                     orderBaselist.add(item.getPgguid());
                 }
             } catch (Exception ex) {
@@ -1243,7 +1240,7 @@ public class AnzhuangGongDanBusiness {
 
         // 生成工单基础表 对象
         orderBase = azGDLcLsDownloadMapper.getOrderBase(orderPar);
-        // 总部下来的工单统一为待接收状态
+        // 总部下来的工单新增时统一为待接收状态
         orderBase.setDispatchStatus("DJS");
         //  预派工订单标识
         if (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1100.getCode()) ||
@@ -1253,141 +1250,9 @@ public class AnzhuangGongDanBusiness {
         }
 
         // 重置部分数据
-        setPar(item, orderBase, brand);
+        orderService.setPar(item, orderBase, brand);
 
         return orderBase;
     }
 
-    private void setPar(ItfTblAzAssignLcLsDownload item, OrderBase orderBase, Brand brand) {
-        // 品牌信息
-        orderBase.setBrandId(brand.getBrandId());
-        orderBase.setBrandName(brand.getBrand());
-
-        // 判断安装网点编号是否为空或者为公司,如果为空或为公司,就写入接收派工网点
-        if (StringUtils.isEmpty(item.getAzwdno()) || item.getAzwdno().equals("S9219801") || item.getAzwdno().equals("S9219807")){
-            if (orderBase.getReceWebsitId() !=null){
-                orderBase.setWebsitId(orderBase.getReceWebsitId());
-                orderBase.setWebsitName(orderBase.getReceWebsitName());
-            }
-        }
-
-        // 省市区单独处理
-        getPCAS(orderBase);
-        // 派工方式,新创建订单时 azren 名称不为空时为手动派工  (dispatch_flag派工方式 A=自动派工 B=手动派工)
-        if (StringUtils.isNotEmpty(orderBase.getDispatchFlag())){
-            orderBase.setDispatchFlag("B");
-        } else {
-            orderBase.setDispatchFlag("A");
-        }
-
-        // create_sys - 创建网点系统  cjwdno
-        // last_operator_websit:最近操作网点 创建单时也是创建网点 可能是销售网点,也可能是售后网点  zjczwd
-        // sys_websit_number 系统网点编号 zjczwd 同上
-
-        // 先从销售网点查
-        CustomerInformationWebsit ciw = customerInformationWebsitService.lambdaQuery()
-                .eq(CustomerInformationWebsit::getRefWebsitId, orderBase.getCreateSys())
-                .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
-                .one();
-        if (ciw !=null){
-            orderBase.setCreateSys(ciw.getWebsitId());
-        } else {
-            WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
-                    .eq(WebsitOrderSign::getBrandWebsitId, orderBase.getCreateSys())
-                    .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
-                    .one();
-            if (wos != null){
-                orderBase.setCreateSys(wos.getWebsitId());
-            } else {
-                orderBase.setCreateSys("");
-            }
-        }
-
-        // 先从销售网点查
-        CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
-                .eq(CustomerInformationWebsit::getRefWebsitId, orderBase.getLastOperatorWebsit())
-                .eq(CustomerInformationWebsit::getBrandId, brand.getBrandId())
-                .one();
-        if (ciwx !=null){
-            orderBase.setLastOperatorWebsit(ciwx.getWebsitId());
-            orderBase.setSysWebsitNumber(ciwx.getWebsitId());
-        } else {
-            WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
-                    .eq(WebsitOrderSign::getBrandWebsitId, orderBase.getLastOperatorWebsit())
-                    .eq(WebsitOrderSign::getBrandId, brand.getBrandId())
-                    .one();
-            if (wos != null){
-                orderBase.setLastOperatorWebsit(wos.getWebsitId());
-                orderBase.setSysWebsitNumber(wos.getWebsitId());
-            } else {
-                orderBase.setLastOperatorWebsit("");
-                orderBase.setSysWebsitNumber("");
-            }
-        }
-    }
-
-    private void getPCAS(OrderBase orderBase) {
-        List<BrandLbsRelate> br;
-        if (StringUtils.isNotEmpty(orderBase.getStreet())){
-            Street street = streetService.lambdaQuery()
-                    .eq(Street::getProvince, orderBase.getProvince())
-                    .eq(Street::getCity, orderBase.getCity())
-                    .eq(Street::getArea, orderBase.getArea())
-                    .eq(Street::getStreet, orderBase.getStreet()).one();
-            getPCA(orderBase, street);
-            //街道
-            br = brandLbsRelateService.lambdaQuery()
-                    .eq(BrandLbsRelate::getStreetId,street.getStreetId())
-                    .isNotNull(BrandLbsRelate::getLbsDistrictId).list();
-            if (br !=null && br.size()>0){
-                orderBase.setStreetId(br.get(0).getLbsStreetId());
-                orderBase.setStreet(br.get(0).getLbsStreetName());
-            }
-        } else {
-            // 总部区必选
-            Area area = areaService.lambdaQuery()
-                    .eq(Area::getArea, orderBase.getArea()).one();
-            Street st = new Street();
-            if (area !=null){
-                BeanUtils.copyProperties(area,st);
-                getPCA(orderBase, st);
-                orderBase.setStreet("");
-            } else {
-                orderBase.setProvinceId("");
-                orderBase.setCity("");
-                orderBase.setArea("");
-                orderBase.setStreet("");
-            }
-        }
-    }
-
-    private void getPCA(OrderBase orderBase, Street street) {
-        List<BrandLbsRelate> br;
-        //省
-        br = brandLbsRelateService.lambdaQuery()
-                .eq(BrandLbsRelate::getProvinceId, street.getProvinceId())
-                .isNotNull(BrandLbsRelate::getLbsProvinceId).list();
-        if (br !=null && br.size()>0){
-            orderBase.setProvinceId(br.get(0).getLbsProvinceId());
-            orderBase.setProvince(br.get(0).getLbsProvinceName());
-        }
-        //市
-        br = brandLbsRelateService.lambdaQuery()
-                .eq(BrandLbsRelate::getCityId, street.getCityId())
-                .isNotNull(BrandLbsRelate::getLbsCityId).list();
-        if (br !=null && br.size()>0){
-            orderBase.setCityId(br.get(0).getLbsCityId());
-            orderBase.setProvince(br.get(0).getLbsCityName());
-        }
-        //区
-        br = brandLbsRelateService.lambdaQuery()
-                .eq(BrandLbsRelate::getAreaId, street.getAreaId())
-                .isNotNull(BrandLbsRelate::getLbsDistrictId).list();
-        if (br !=null && br.size()>0){
-            orderBase.setAreaId(br.get(0).getLbsDistrictId());
-            orderBase.setArea(br.get(0).getLbsDistrictName());
-        }
-    }
-
-
 }

+ 6 - 7
src/main/java/com/zfire/jiasm/syncdata/download/order/AnzhuangGongDanDownload.java → src/main/java/com/zfire/jiasm/syncdata/download/order/install/InstallDownload.java

@@ -1,4 +1,4 @@
-package com.zfire.jiasm.syncdata.download.order;
+package com.zfire.jiasm.syncdata.download.order.install;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -30,17 +30,17 @@ import java.util.*;
  * 批量下载记录表、主表、明细表、反馈明细表、费用清单表、
  * 用户预约改约表、安装辅助人员表、客户评价表、三方平台订单信息表
  * 1:先放本地download表
- * 2:与总部同下载状态
+ * 2:与总部同下载状态
  * 3:AnzhuangGongDanBusiness 类处理,数据落本地数所表
  */
 @Slf4j
 @Component
-public class AnzhuangGongDanDownload {
+public class InstallDownload {
     @Value("${baseurl}")
     private String baseurl = "";
 
     @Resource
-    AnzhuangGongDanDownload anzhuangGongDanDownload;
+    InstallDownload installDownload;
     @Autowired
     private TokenCenter tokenCenter;
     @Resource
@@ -81,11 +81,10 @@ public class AnzhuangGongDanDownload {
 
     // 1:下载安装工单数据
     @Scheduled(fixedDelay = 1 * 10 * 1000)
-    public void process() throws Exception {
+    public void download() throws Exception {
         if (1 == 1) {
             return;
         }
-
         List<ItfInstallBatchDownloadRec> rec = new ArrayList<>();
         Boolean flag = Boolean.FALSE;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -121,7 +120,7 @@ public class AnzhuangGongDanDownload {
                             ESInstallEnum.SALES_WEBSIT_NUMBER.getCode());
                     // 历史下载记录中无数据时数据落表,有数据时不再下载
                     if (flag){
-                        anzhuangGongDanDownload.parseData(sheet, downloadTaskNo, downloadBatchNo, rec);
+                        installDownload.parseData(sheet, downloadTaskNo, downloadBatchNo, rec);
                     }
                 } else {
                     log.info("安装工单找不到主表数据不做处理 mainTableData:{}" ,mainTableData);

+ 192 - 0
src/main/java/com/zfire/jiasm/syncdata/download/order/repair/RepairBusiness.java

@@ -0,0 +1,192 @@
+package com.zfire.jiasm.syncdata.download.order.repair;
+
+import com.zfire.jiasm.syncdata.base.BaseService;
+import com.zfire.jiasm.syncdata.dao.mapper.AssignDownloadMapper;
+import com.zfire.jiasm.syncdata.dao.mapper.DetailOrderRepairMapper;
+import com.zfire.jiasm.syncdata.dao.mapper.RepairDownloadMapper;
+import com.zfire.jiasm.syncdata.parameter.OrderPar;
+import com.zfire.jiasm.syncdata.plus.entity.Brand;
+import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignDownload;
+import com.zfire.jiasm.syncdata.plus.entity.OrderApplyDispatch;
+import com.zfire.jiasm.syncdata.plus.entity.OrderBase;
+import com.zfire.jiasm.syncdata.plus.service.ItfTblAssignDownloadService;
+import com.zfire.jiasm.syncdata.plus.service.OrderApplyDispatchService;
+import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
+import com.zfire.jiasm.syncdata.service.OrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 格力品牌维修工单下载后落本地数据表
+ * 1:落业务表
+ * 2:修改下载主表处理结果
+ */
+@Slf4j
+@Component
+public class RepairBusiness {
+
+    @Resource
+    RepairBusiness repairBusiness;
+    @Resource
+    ItfTblAssignDownloadService itfTblAssignDownloadService;
+    @Resource
+    RepairDownloadMapper repairDownloadMapper;
+    @Resource
+    BaseService baseService;
+    @Resource
+    OrderBaseService orderBaseService;
+    @Resource
+    OrderService orderService;
+    @Resource
+    DetailOrderRepairMapper detailOrderRepairMapper;
+    @Resource
+    OrderApplyDispatchService orderApplyDispatchService;
+    @Resource
+    AssignDownloadMapper assignDownloadMapper;
+
+
+    // 1:工单落入本地表
+    @Scheduled(fixedDelay = 1 * 10 * 1000)
+    public void inputOrder() {
+        /*if (1 == 1) {
+            return;
+        }*/
+
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<ItfTblAssignDownload> repairRec = new ArrayList<>();
+
+        // 提取品牌信息
+        Brand brand = baseService.getBrand();
+        if (brand == null) {
+            return;
+        }
+
+        // 提取待落本地表的数据
+        repairRec = itfTblAssignDownloadService.lambdaQuery()
+                .eq(ItfTblAssignDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAssignDownload::getSynReqId)
+                .list();
+
+        if (repairRec.size()<1){
+            log.info("暂无待处理的维修工单: {}",sdf.format(new Date()));
+            return;
+        }
+
+        log.info("维修工单落本地表开始处理: {}",sdf.format(new Date()));
+
+        // 按任务号download_task_no,按单来处理
+        for (ItfTblAssignDownload item: repairRec){
+
+            // 新增
+            repairBusiness.addOrder(brand, item);
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public  void addOrder(Brand brand, ItfTblAssignDownload item) {
+        // 新增 TL_SynDataFrom_tbl_assign_batch
+        // TL_SynDataFrom_tbl_assign 主单的 syn_req_id
+        // 生成维修工单主表数据
+        OrderBase order = saveOrderBase(brand, item);
+
+        // 更新 修改时更新 新增时无需此操作 可以先放进来,是修改不到数据的
+        // 维修工单产品信息 (维修网点、维修网点名称) websit_id,websit_name
+        // order_product 无维修网点信息,所以不用做
+
+        // 采集表需要做上面的操作 order_repair_detail  新增时也无需操作,加上也不会出错
+        OrderPar request = new OrderPar();
+        request.setOrderNo(order.getId());
+        detailOrderRepairMapper.updateWebsitMessage(request);
+
+
+        // 新增或是修改都要加  新增是一定要做的
+        // 总部维修单为待审批改派时 若本地表无改派数据则生成改派数据
+        if (order.getOrderStatus().equals("B5")){
+            generateDispatch(order);
+        }
+
+        // 原 本地维修单表状态为5 待审批  同步过来的工单状态不是待审批时
+        // 修改接品自动审核  新增时条件不成立的
+
+        // 增加判断是否有未处理的待改派,如果广佛有待改派但总部工单不是待改派,直接更新改派标志
+        // 新增时了样不用操作
+
+        // 增加处理采集数据下载 新增不用操作
+            /*if ((order.getOrderStatus().equals("B41") || order.getOrderStatus().equals("B102"))){
+
+            }*/
+        // 如果是家用的工单,且工单状态是待中心派工或待网点派工时,写入派嘉讯茂  不做
+
+        // 修改同步状态
+        upItfTblAssignDownloadStatus(item, order);
+    }
+
+    private OrderBase saveOrderBase(Brand brand, ItfTblAssignDownload item) {
+        // 获取维修工单主表数据
+        OrderPar orderPar = new OrderPar();
+        orderPar.setSynReqId(item.getSynReqId());
+        orderPar.setBrandId(brand.getBrandId());
+        OrderBase order = repairDownloadMapper.getOrderBase(orderPar);
+        // 部分属性值重置
+        orderService.setParame(brand, order);
+        // 新增
+        orderBaseService.save(order);
+        return order;
+    }
+
+    public void upItfTblAssignDownloadStatus(ItfTblAssignDownload item, OrderBase order){
+        ItfTblAssignDownload up = new ItfTblAssignDownload();
+        up.setSynReqId(item.getSynReqId());
+        up.setSynStatus(1);
+        up.setSynTime(new Date());
+        up.setSynErrMsg("成功");
+        itfTblAssignDownloadService.updateById(up);
+
+        OrderPar prepar = new OrderPar();
+        prepar.setSynReqId(item.getSynReqId());
+        prepar.setPgid(order.getPgid());
+        assignDownloadMapper.updateStatus(prepar);
+    }
+
+    private void generateDispatch(OrderBase order) {
+        List<String> parame = new ArrayList<>();
+        parame.add(order.getWebsitId());
+        parame.add(order.getReceWebsitId());
+        // 改派表中查看是否有待审的数据
+        List<OrderApplyDispatch> rec = orderApplyDispatchService.lambdaQuery()
+                .eq(OrderApplyDispatch::getOrderBaseId, order.getId())
+                .eq(OrderApplyDispatch::getExamineStatus,"WAIT")
+                .in(OrderApplyDispatch::getWebsitId,parame).list();
+        if (rec.size()<1){
+            // 生成改派数据 从维修工单表中读取数据
+            OrderApplyDispatch addn = new OrderApplyDispatch();
+            addn.setOrderBaseId(order.getId());
+            addn.setPgid(order.getPgid());
+            addn.setType("REPAIR");
+            addn.setWebsitId(order.getWebsitId());
+            addn.setWebsitName(order.getWebsitName());
+            addn.setApplyContent("申请改派");
+            addn.setExamineStatus("WAIT");
+            addn.setUserName(order.getUserName());
+            addn.setUserMobile(order.getUserMobile());
+            addn.setReserveTime(order.getAppointmentTime());
+            addn.setReservePeriod(String.valueOf(order.getAppointmentTime()));
+            addn.setMainId(Integer.valueOf(order.getMainId()));
+            addn.setMainName(order.getMainName());
+            addn.setCreateTime(order.getCreateTime());
+            addn.setUpdateTime(order.getUpdateTime());
+            orderApplyDispatchService.save(addn);
+        }
+    }
+
+
+}

+ 367 - 0
src/main/java/com/zfire/jiasm/syncdata/download/order/repair/RepairDownload.java

@@ -0,0 +1,367 @@
+package com.zfire.jiasm.syncdata.download.order.repair;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.zfire.jiasm.syncdata.data.Token;
+import com.zfire.jiasm.syncdata.plus.entity.ItfGreeToFaRepairSynRule;
+import com.zfire.jiasm.syncdata.plus.service.ItfGreeToFaRepairSynRuleService;
+import com.zfire.jiasm.syncdata.utils.DataUtil;
+import com.zfire.jiasm.syncdata.utils.HttpUtil;
+import com.zfire.jiasm.syncdata.utils.JSONResult;
+import com.zfire.jiasm.syncdata.utils.TokenCenter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+/**
+ * 格力品牌维修工单下载
+ */
+@Slf4j
+@Component
+public class RepairDownload {
+    @Value("${baseurl}")
+    private String baseurl = "";
+    @Value("${nullCols}")
+    private String nullCols;
+
+    @Resource
+    RepairDownload repairDownload;
+    @Autowired
+    TokenCenter tokenCenter;
+    @Resource
+    ItfGreeToFaRepairSynRuleService itfGreeToFaRepairSynRuleService;
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+    private Set<String> nullDateCols;
+
+    // 下载维修工单数据
+    @Scheduled(fixedDelay = 1 * 10 * 1000)
+    public void download() throws Exception {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        if (1 == 1) {
+            return;
+        }
+
+
+        try {
+            ItfGreeToFaRepairSynRule synRule = itfGreeToFaRepairSynRuleService.lambdaQuery()
+                    .orderByAsc(ItfGreeToFaRepairSynRule::getId).one();
+            if (synRule==null){
+                return;
+            }
+
+            log.info("开始下载维修工单: {}",sdf.format(new Date()));
+
+            // 数据源表名
+            String srcTabNames = synRule.getSrcTabName();
+            String[] srcTabnameArray = srcTabNames.trim().split("\\Q|\\E");
+
+            // 数据源表列
+            String srcTabColLists = synRule.getSrcTabColList();
+            String[] srcTabColListArray = srcTabColLists.trim().split("\\Q|\\E");
+
+            // 数据目的表名
+            String destTabNames = synRule.getDestTabName();
+            String[] destTabNameArray = destTabNames.trim().split("\\Q|\\E");
+
+            // 数据目的表列
+            String destTabColLists = synRule.getDestTabColList();
+            String[] destTabColListArray = destTabColLists.trim().split("\\Q|\\E");
+
+            // 销售公司编码
+            String salesWebsitNumber = synRule.getSalesWebsitNumber();
+            String downloadBatchNo = UUID.randomUUID().toString();
+            // 获取数据
+            JSONArray datas = downloadData(downloadBatchNo, salesWebsitNumber);
+
+            log.info("维修工单下载了{}条数据",datas.size());
+
+            for (int i = 0; i < datas.size(); i++) {
+
+                JSONObject sheet = datas.getJSONObject(i);
+
+                // 维修工单主表必须存在
+                JSONObject mainTableData = sheet.getJSONObject("tblAssign");
+                if (mainTableData != null) {
+                    String downloadTaskNo = UUID.randomUUID().toString();
+                    DataUtil.initLastModifiedDate(mainTableData,"last_modified_date");
+                    repairDownload.addRepairData(mainTableData, downloadBatchNo, downloadTaskNo, sheet,
+                            srcTabnameArray, srcTabColListArray, destTabNameArray, destTabColListArray,
+                            salesWebsitNumber);
+                } else {
+                    log.error("维修工单找不到主表数据,downloadBatchNo[" + downloadBatchNo + "]");
+                }
+            }
+
+            log.info("维修工单同步下载状态");
+            // 与总部同步下载状态,修改本地下载记录表状态 gree_stat_syn_status =1
+            updateStatus();
+
+            log.info("维修工单下载完成");
+        } catch (Exception ex) {
+            log.error("从总部取维修工单失败", ex);
+        }
+
+    }
+
+    private void updateStatus() {
+        try {
+            List<Map<String, Object>> result = getNeedUpdateTaskData("itf_repair_batch_download_rec");
+            Token token = tokenCenter.getCurrentToken();
+            String url = baseurl + "tblAssign" + "/updateExtjson5";
+            for (Map<String, Object> row : result) {
+                Long synReqId = (Long) row.get("syn_req_id");
+
+                try {
+                    String pgid = row.get("pgid").toString();
+                    Date lastModifiedDate = (Date) row.get("last_modified_date");
+
+                    Map<String, Object> paramMap = new HashMap<String, Object>();
+                    paramMap.put("pgid", pgid);
+                    paramMap.put("lastModifiedDate", lastModifiedDate);
+
+                    JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST",
+                            JSON.toJSONStringWithDateFormat(paramMap, "yyyy-MM-dd HH:mm:ss"), token);
+
+                    if (jsonResult.isOK()) {
+                        updateSuccess(synReqId, "itf_repair_batch_download_rec");
+                    } else {
+                        updateError(synReqId, jsonResult.getMsg(), "itf_repair_batch_download_rec");
+                    }
+                } catch (Exception ex) {
+                    log.error("ES更新维修主表下载状态失败syn_req_id=" + synReqId, ex);
+                    updateError(synReqId, ex.getMessage(), "itf_repair_batch_download_rec");
+                }
+            }
+        } catch (Exception ex) {
+            log.error("ES更新维修主表下载状态失败", ex);
+        }
+    }
+
+    public void updateError(Long synReqId, String errorMessage, String tabName) {
+        jdbcTemplate.update(
+                "update " + tabName + " set gree_stat_syn_status=99,gree_stat_syn_err_msg=? where syn_req_id=?",
+                new Object[] { errorMessage, synReqId });
+    }
+
+    public void updateSuccess(Long synReqId, String tabName) {
+        jdbcTemplate.update("update " + tabName + " set gree_stat_syn_status=1,gree_stat_syn_time=? where syn_req_id=?",
+                new Object[] { new Date(System.currentTimeMillis()), synReqId });
+    }
+
+    public List<Map<String, Object>> getNeedUpdateTaskData(String tabName) {
+        List<Map<String, Object>> result = jdbcTemplate
+                .queryForList("SELECT * from " + tabName + " where gree_stat_syn_status=0 order by syn_req_id ");
+        return result;
+    }
+
+    private JSONArray downloadData(String downloadBatchNo, String salesWebsitNumber) throws Exception {
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + "api/repair/batchsearch/repairorders?ssxsgs=" + salesWebsitNumber;
+        log.info("url[" + url + "],downloadBatchNo[" + downloadBatchNo + "],send[]");
+        JSONObject jsonResult = HttpUtil.httpRequestGetPgid(url, "GET", token, downloadBatchNo,null);
+
+        String statusCode = jsonResult.getString("statusCode");
+        if ("200".equals(statusCode)) {
+            JSONArray datas = jsonResult.getJSONArray("data");
+            return datas;
+        } else {
+            String errorMessage = jsonResult.getString("message");
+            if (errorMessage == null || errorMessage.trim().length() == 0) {
+                errorMessage = "失败";
+            }
+            throw new Exception(errorMessage);
+        }
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void addRepairData(JSONObject mainTableData, String downloadBatchNo, String downloadTaskNo, JSONObject sheet,
+                              String[] srcTabnameArray, String[] srcTabColListArray, String[] destTabNameArray,
+                              String[] destTabColListArray, String salesWebsitNumber) throws Exception {
+        // 查看同一时间同一工单是否存在下载记录表 存在不再保存本次的同步数据
+        if (insertRepairRecData(mainTableData, downloadBatchNo, downloadTaskNo, salesWebsitNumber)) {
+            parseData(sheet, srcTabnameArray, srcTabColListArray, destTabNameArray, destTabColListArray, downloadTaskNo,
+                    false, downloadBatchNo);
+        }
+    }
+
+    private boolean insertRepairRecData(JSONObject aData, String downloadBatchNo, String downloadTaskNo,
+                                        String salesWebsitNumber) throws Exception {
+
+        // 查看 相同时间同一单数据
+        List<Map<String, Object>> rec = isRepairDuplicate(aData);
+
+
+        boolean duplicate = (rec.size() > 0);
+
+        String sql = "insert into itf_repair_batch_download_rec (sales_websit_number,download_batch_no,download_task_no,"
+                + "created_by,created_date,last_modified_by,last_modified_date,pgid,"
+                + "extjson1,extjson2,extjson3,extjson4,extjson5" + (duplicate ? ",gree_stat_syn_err_msg" : "")
+                + ") values (" + "?,?,?,?,?,?,?,?,?,?,?,?,?" + (duplicate ? ",?" : "") + ") ";
+
+        // 存在 说明重复获取,不再保存数据
+        if (duplicate) {
+            if (!recHasNoUploadStatus(rec)) {
+                jdbcTemplate.update(sql,
+                        new Object[] { salesWebsitNumber, downloadBatchNo, downloadTaskNo,
+                                aData.getString("created_by"), aData.getString("created_date"),
+                                aData.getString("last_modified_by"), aData.getString("last_modified_date"),
+                                aData.getString("pgid"), aData.getString("extjson1"), aData.getString("extjson2"),
+                                aData.getString("extjson3"), aData.getString("extjson4"), aData.getString("extjson5"),
+                                "任务已经存在,不再产生下载数据" });
+            }
+            return false;
+        } else {
+            jdbcTemplate.update(sql,
+                    new Object[] { salesWebsitNumber, downloadBatchNo, downloadTaskNo, aData.getString("created_by"),
+                            aData.getString("created_date"), aData.getString("last_modified_by"),
+                            aData.getString("last_modified_date"), aData.getString("pgid"), aData.getString("extjson1"),
+                            aData.getString("extjson2"), aData.getString("extjson3"), aData.getString("extjson4"),
+                            aData.getString("extjson5") });
+            return true;
+        }
+
+    }
+
+    private List<Map<String, Object>> isRepairDuplicate(JSONObject aData) throws DataAccessException, ParseException {
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<Map<String, Object>> result = jdbcTemplate.queryForList(
+                "select * from itf_repair_batch_download_rec where pgid=? and last_modified_date=?",
+                new Object[] { aData.getString("pgid"), sdf.parse(aData.getString("last_modified_date")) });
+
+        return result;
+    }
+
+    private boolean recHasNoUploadStatus(List<Map<String, Object>> rec) {
+        for (Map<String, Object> data : rec) {
+            int greeStatSynStatus = (Integer) data.get("gree_stat_syn_status");
+            if (greeStatSynStatus == 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void parseData(JSONObject sheet, String[] srcTabnameArray, String[] srcTabColListArray,
+                           String[] destTabNameArray, String[] destTabColListArray, String downloadTaskNo, boolean isInstall,
+                           String downloadBatchNo) throws Exception {
+
+        for (int i = 0; i < srcTabnameArray.length; i++) {
+
+            String srcTabname = srcTabnameArray[i];
+            String srcTabColList = srcTabColListArray[i];
+            String destTabName = destTabNameArray[i];
+            String destTabColList = destTabColListArray[i];
+
+            String[] arySrcTabCol = srcTabColList.split("\\Q,\\E");
+
+            JSONArray tableData = new JSONArray();
+
+            if (isInstall) {
+                tableData = sheet.getJSONArray(srcTabname.toUpperCase());
+            } else {
+                if ("tblAssign".equalsIgnoreCase(DataUtil.fromDbName2ServiceName(srcTabname))) {
+                    tableData = new JSONArray();
+                    tableData.add(sheet.getJSONObject("tblAssign"));
+                } else {
+                    tableData = sheet.getJSONArray(DataUtil.fromDbName2ServiceName(srcTabname));
+                }
+
+            }
+
+            if (tableData == null){
+                continue;
+            }
+
+            for (int j = 0; j < tableData.size(); j++) {
+                parseAData(isInstall, downloadBatchNo, downloadTaskNo, destTabName, destTabColList, arySrcTabCol,
+                        tableData.getJSONObject(j));
+            }
+        }
+    }
+
+    private void parseAData(boolean isInstall, String downloadBatchNo, String downloadTaskNo, String destTabName,
+                            String destTabColList, String[] arySrcTabCol, JSONObject aData) throws Exception {
+        String table = "itf_tbl_az_assign_platform_download";
+
+        String[] arySrcTabColValue = new String[arySrcTabCol.length];
+
+        for (int j = 0; j < arySrcTabCol.length; j++) {
+            if (isInstall) {
+                if (destTabName.equals(table) && (j==2 || j== 4 || j==9)){
+                    if (StringUtils.isEmpty(DataUtil.findValue(DataUtil.fromDbName2ServiceName(arySrcTabCol[j].trim()),aData))){
+                        arySrcTabColValue[j] = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                        continue;
+                    }
+                }
+                arySrcTabColValue[j] = DataUtil.findValue(DataUtil.fromDbName2ServiceName(arySrcTabCol[j].trim()),
+                        aData);
+            } else {
+                String colName = arySrcTabCol[j].trim();
+                arySrcTabColValue[j] = DataUtil.findValue(colName, aData);
+                if (getNullColSet().contains(colName)) {
+                    if ("".equals(arySrcTabColValue[j])) {
+                        arySrcTabColValue[j] = null;
+                    }
+                }
+            }
+        }
+
+        insertAData(downloadBatchNo, downloadTaskNo, destTabName, destTabColList, arySrcTabColValue);
+    }
+
+    private void insertAData(String downloadBatchNo, String downloadTaskNo, String destTabName, String destTabColList,
+                             Object[] arySrcTabColValue) throws Exception {
+
+        StringBuffer mark = new StringBuffer();
+        for (int i = 0; i < arySrcTabColValue.length; i++) {
+            if (mark.length() > 0) {
+                mark.append(",");
+            }
+            mark.append("?");
+        }
+
+        String sql = "insert into " + destTabName + " (download_batch_no,download_task_no," + destTabColList
+                + ") values (?,?," + mark + ") ";
+
+        Object[] insertValue = new Object[arySrcTabColValue.length + 2];
+        insertValue[0] = downloadBatchNo;
+        insertValue[1] = downloadTaskNo;
+        System.arraycopy(arySrcTabColValue, 0, insertValue, 2, arySrcTabColValue.length);
+
+        jdbcTemplate.update(sql, insertValue);
+
+    }
+
+    private synchronized Set<String> getNullColSet(){
+        if(nullDateCols==null) {
+            nullDateCols=new HashSet<String>();
+            String[] nullColArray=nullCols.split("\\Q,\\E");
+            for(String value:nullColArray) {
+                nullDateCols.add(value);
+            }
+        }
+        return nullDateCols;
+    }
+
+
+}

+ 26 - 0
src/main/java/com/zfire/jiasm/syncdata/parameter/OperatingLog.java

@@ -0,0 +1,26 @@
+package com.zfire.jiasm.syncdata.parameter;
+
+import lombok.Data;
+
+/**
+ * @author yaozx
+ * @version 1.0
+ * @description 介绍
+ * @date 2023-03-06
+ */
+@Data
+public class OperatingLog {
+
+    // 工单号
+    private String orderNo;
+
+    // id
+    private String id;
+
+    // fkid
+    private String fkid;
+
+    // pgguid
+    private String pgguid;
+
+}

+ 1 - 2
src/main/java/com/zfire/jiasm/syncdata/parameter/OrderPar.java

@@ -21,6 +21,5 @@ public class OrderPar {
     // 工单号
     private String orderNo;
 
-
-
+    private String pgid;
 }

+ 18 - 0
src/main/java/com/zfire/jiasm/syncdata/parameter/ReAppointment.java

@@ -0,0 +1,18 @@
+package com.zfire.jiasm.syncdata.parameter;
+
+import lombok.Data;
+
+/**
+ * @author yaozx
+ * @version 1.0
+ * @description 介绍
+ * @date 2023-03-07
+ */
+@Data
+public class ReAppointment {
+    // 工单号
+    private String orderNo;
+
+    // id
+    private String id;
+}

+ 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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @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-03-03
+ * @since 2023-03-10
  */
 @Controller
 @RequestMapping("/plus/websit-enclosure-file")

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