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

+ 423 - 0
src/main/java/com/zfire/jiasm/syncdata/common/DataUploadLogic.java

@@ -0,0 +1,423 @@
+package com.zfire.jiasm.syncdata.common;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.zfire.jiasm.syncdata.constant.Constant;
+import com.zfire.jiasm.syncdata.constant.UploadTableEnum;
+import com.zfire.jiasm.syncdata.data.Token;
+import com.zfire.jiasm.syncdata.plus.entity.OutJiasmToGreeSynRule;
+import com.zfire.jiasm.syncdata.service.CommonService;
+import com.zfire.jiasm.syncdata.service.UploadService;
+import com.zfire.jiasm.syncdata.upload.order.DataUploadNew;
+import com.zfire.jiasm.syncdata.utils.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 工单数据同步到格力总部
+ * 1:需要生成上传任务清单列表   ProduceUploadList处理
+ * 2:生成需要上传的数据   ProduceDataUploadList处理
+ * <p>
+ * out_jiasm_to_gree_syn_rule 数据同步记录表提取数据
+ * 根据源数据表名提取对应的数据
+ * 组装参数进行数据同步
+ * 修改同步表的同步状态
+ */
+
+@Slf4j
+@Service
+public class DataUploadLogic {
+    @Value("${baseurl}")
+    private String baseurl;
+    @Autowired
+    private TokenCenter tokenCenter;
+    @Resource
+    private UploadService uploadService;
+    @Autowired
+    private CommonService commonService;
+    @Autowired
+    RedisUtil redis;
+
+    private Map<Integer, Boolean> map = new ConcurrentHashMap<Integer, Boolean>();
+
+
+    public void uploaditftblazassignappointment() throws Exception {
+        // 数据同步记录表中提取数据 out_jiasm_to_gree_syn_rule
+        // 用户预约改约
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_ASSIGN_APPOINTMENT_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazwgmxjyktfj() throws Exception {
+        // 家用空调数据采集附件
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_WGMX_JYKT_FJ_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazwgmxsyktfj() throws Exception {
+        // 商用空调数据采集附件
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_WGMX_SYKT_FJ_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazwgmxqitafj() throws Exception {
+        // 其他数据采集附件
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_WGMX_QITA_FJ_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazwgmxjykttmmx() throws Exception {
+        // 家用空调条码明细
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_WGMX_JYKT_TMMX_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazwgmxsykttmmxls() throws Exception {
+        // 商用完工明细数据采集条码明细
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_WGMX_SYKT_TMMX_LS_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazwgmxqitatmmx() throws Exception {
+        // 其他完工明细数据采集条码明细
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_WGMX_QITA_TMMX_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazassignfkmx() throws Exception {
+        // 安装反馈明细
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_ASSIGN_FKMX_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazassignfee() throws Exception {
+        // 空调安装费用清单
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_ASSIGN_FEE_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazassignlcls() throws Exception {
+        // 安装主表
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_ASSIGN_LC_LS_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazwgmxqita() throws Exception {
+        // 完工明细(其他)
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_WGMX_QITA_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazwgmxjykt() throws Exception {
+        // 完工明细(家用空调)
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_WGMX_JYKT_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazwgmxsykt() throws Exception {
+        // 完工明细(商用空调)
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_WGMX_SYKT_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazassignmx() throws Exception {
+        // 安装工单明细
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_ASSIGN_MX_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblwxjspjmxjykt() throws Exception {
+        // 配件表
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.WXJS_PJMX_JYKT_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblwxjswxxmjykt() throws Exception {
+        // 维修项目
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.WXJS_WXXM_JYKT_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblwxjsxxyyjykt() throws Exception {
+        // 维修现象
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.WXJS_XXYY_JYKT_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblwxjsfjjykt() throws Exception {
+        // 维修附件表
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.WXJS_FJ_JYKT_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblassignfee() throws Exception {
+        // 维修费用表
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.ASSIGN_FEE_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblassignxzyd() throws Exception {
+        // 新增阅读记录维护表
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.ASSIGN_XZYD_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblwxjsjykt() throws Exception {
+        // 维修结算表
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.WXJS_JYKT_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblassign() throws Exception {
+        // 维修单表
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.ASSIGN_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblassignmx() throws Exception {
+        // 维修单明细
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.ASSIGN_MX_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblassignappointment() throws Exception {
+        // 维修单预约改约信息
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.ASSIGN_APPOINTMENT_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblassignfkmx() throws Exception {
+        // 维修工单反馈信息
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.ASSIGN_FKMX_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+    public void uploaditftblazassignxzyd() throws Exception {
+        // 新增安装阅读记录维护表
+        getAccessToken();
+        List<Map<String, Object>> result = uploadService.getTaskData(UploadTableEnum.AZ_ASSIGN_XZYD_UPLOAD.getCode());
+        uploadData(result);
+    }
+
+
+    private void uploadData(List<Map<String, Object>> result) {
+        for (Map<String, Object> row : result) {
+            Runnable runnable = new Runnable() {
+                @Override
+                public void run() {
+                    int taskId = (Integer) row.get("id");
+                    synchronized (map) {
+                        if (map.get(taskId) != null && map.get(taskId) == Boolean.TRUE) {
+                            return;
+                        }
+                        map.put(taskId, Boolean.TRUE);
+                    }
+
+                    try {
+                        String synMode = (String) row.get("syn_mode");
+                        String srcTabName = (String) row.get("src_tab_name");
+
+                        // 从需要上传的具体表中提取数据
+                        List<Map<String, Object>> sourceDatas = uploadService.getSourceData(srcTabName);
+                        log.info("准备上传[src_tab_name=" + srcTabName + ",总记录数=" + sourceDatas.size() + "]");
+                        for (Map<String, Object> sourceData : sourceDatas) {
+                            long synReqId = (Long) sourceData.get("syn_req_id");
+                            long startTime = System.currentTimeMillis();
+                            log.info("开始上传[src_tab_name=" + srcTabName + ",syn_req_id=" + synReqId + "]");
+
+                            // 接口方式与数据表方式
+                            if ("interface".equalsIgnoreCase(synMode)) {
+                                uploadInterfaceMode(DataUploadNew.accessToken, taskId, srcTabName, row, sourceData);
+                            } else {
+                                // token,记录表id,数据源表,记录表中记录,需同步的数据
+                                uploadTableMode(DataUploadNew.accessToken, taskId, srcTabName, row, sourceData);
+                            }
+                            log.info("结束上传[src_tab_name=" + srcTabName + ",syn_req_id=" + synReqId + ",用时="
+                                    + (System.currentTimeMillis() - startTime) + "毫秒]");
+                        }
+                    } catch (Exception ex) {
+                        log.info("执行上传任务[" + taskId + "]发生错误", ex);
+                    } finally {
+                        synchronized (map) {
+                            map.put(taskId, Boolean.FALSE);
+                        }
+                    }
+                }
+            };
+            (new Thread(runnable)).start();
+        }
+    }
+
+    private Map<String, Object> genDataMap(String keyList, Map<String, Object> sourceData) {
+        Map<String, Object> paramMap = new HashMap<String, Object>();
+        String[] keys = keyList.split("\\Q,\\E");
+        for (String key : keys) {
+            Object value = sourceData.get(key.trim());
+            paramMap.put(DataUtil.fromDbName2ServiceName(key.trim()), value);
+        }
+
+        return paramMap;
+    }
+
+
+    private void uploadInterfaceMode(String accessToken, int taskId, String srcTabName, Map<String, Object> row,
+                                     Map<String, Object> sourceData) throws Exception {
+
+        long synReqId = (Long) sourceData.get("syn_req_id");
+        Integer synTimes = (Integer) sourceData.get("syn_times");
+        Integer segFlag = (Integer) row.get("seq_flag");
+        String interfaceUrl = (String) row.get("dest_tab_name");
+        String insCoList = (String) row.get("ins_col_list");
+
+        try {
+            JSONObject jsonResult = HttpUtil.httpRequestGetPgidt(interfaceUrl, "POST", accessToken, Long.toString(synReqId),
+                    JSON.toJSONStringWithDateFormat(genDataMap(insCoList, sourceData), "yyyy-MM-dd HH:mm:ss"));
+
+            String statusCode = jsonResult.getString("status");
+            if ("200".equals(statusCode)) {
+                uploadService.updateSuccess(srcTabName, synReqId);
+            } else {
+                String errorMessage = jsonResult.getString("message");
+                if (errorMessage == null || errorMessage.trim().length() == 0) {
+                    errorMessage = "失败";
+                }
+                throw new Exception(errorMessage);
+            }
+        } catch (Exception ex) {
+            log.error("执行上传任务[taskId=" + taskId + ",syn_req_id=" + synReqId + ",seqFlag=" + segFlag + "]发生错误:"
+                    + ex.getMessage());
+            try {
+                String errMessage = ex.getMessage();
+                if (errMessage == null || errMessage.trim().length() == 0) {
+                    errMessage = ex.getClass().getName();
+                }
+                commonService.updateError(srcTabName, synReqId, synTimes, errMessage);
+            } catch (Exception e) {
+                log.error("发生错误", e);
+            }
+            if (segFlag == 1) {
+                throw ex;
+            }
+        }
+    }
+
+    // token,记录表id,数据源表,记录表中记录,需同步的数据
+    private void uploadTableMode(String accessToken, int taskId, String srcTabName, Map<String, Object> row,
+                                 Map<String, Object> sourceData) throws Exception {
+
+        long synReqId = (Long) sourceData.get("syn_req_id");
+        Integer synTimes = (Integer) sourceData.get("syn_times");
+
+        String desTabName = (String) row.get("dest_tab_name");
+        String insCoList = (String) row.get("ins_col_list");
+        String updColList = (String) row.get("upd_col_list");
+        String keyList = (String) row.get("key_list");
+        Integer segFlag = (Integer) row.get("seq_flag");
+
+        String serviceName = DataUtil.fromDbName2ServiceName(desTabName);
+        String isNewDataUrl = baseurl + serviceName + "/isNewData";
+        String addDataUrl = baseurl + serviceName + "/add";
+        String updateUrl = baseurl + serviceName + "/update";
+        String queryUrl = baseurl + serviceName + "/querylist";
+
+        try {
+            JSONResult jsonResult = HttpUtil.httpRequestWithTokenT(isNewDataUrl, "POST",
+                    JSON.toJSONStringWithDateFormat(genDataMap(keyList, sourceData), "yyyy-MM-dd HH:mm:ss"), accessToken);
+            if (jsonResult.isOK()) {
+                // 总部有数据进行修改
+                if (!jsonResult.getData().equals("")) {
+                    // 未设置更新的列时表示不更新
+                    if (updColList == null || updColList.trim().length() == 0) {
+                        uploadService.updateSuccess(srcTabName, synReqId);
+                    } else {
+                        // 组装列参数,进行修改
+                        JSONResult updateResult = HttpUtil.httpRequestWithTokenT(updateUrl, "POST", JSON
+                                        .toJSONStringWithDateFormat(genDataMap(updColList, sourceData), "yyyy-MM-dd HH:mm:ss"),
+                                accessToken);
+                        if (updateResult.isOK()) {
+                            uploadService.updateSuccess(srcTabName, synReqId);
+                        } else {
+                            uploadService.updateError(srcTabName, synReqId, updateResult.getMsg());
+                            throw new Exception("更新数据失败[" + synReqId + "],[" + updateResult.getMsg() + "]");
+                        }
+                    }
+                } else {
+                    // 总部无数据进行新增
+                    JSONResult addResult = HttpUtil.httpRequestWithTokenT(addDataUrl, "POST",
+                            JSON.toJSONStringWithDateFormat(genDataMap(insCoList, sourceData), "yyyy-MM-dd HH:mm:ss"),
+                            accessToken);
+                    if (addResult.isOK()) {
+                        uploadService.updateSuccess(srcTabName, synReqId);
+                    } else {
+                        throw new Exception("新增数据失败[" + synReqId + "],[" + addResult.getMsg() + "]");
+                    }
+                }
+            } else {
+                throw new Exception("检查是否新增失败[" + synReqId + "],[" + jsonResult.getMsg() + "]");
+            }
+        } catch (Exception ex) {
+            log.error("执行上传任务[taskId=" + taskId + ",syn_req_id=" + synReqId + ",seqFlag=" + segFlag + "]发生错误:"
+                    + ex.getMessage());
+            try {
+                String errMessage = ex.getMessage();
+                if (errMessage == null || errMessage.trim().length() == 0) {
+                    errMessage = ex.getClass().getName();
+                }
+                commonService.updateError(srcTabName, synReqId, synTimes, errMessage);
+            } catch (Exception e) {
+                log.error("发生错误", e);
+            }
+            if (segFlag == 1) {
+                throw ex;
+            }
+        }
+    }
+
+    private String getAccessToken() throws Exception {
+        String redisKey = Constant.RedisPrefix.TOKEN_GREE_UPLOAD;
+        DataUploadNew.accessToken = (String)redis.get(redisKey);
+        if(StringUtil.isEmpty(DataUploadNew.accessToken)){
+            DataUploadNew.accessToken = tokenCenter.getCurrentToken().getAccessToken();
+            //写入缓存
+            redis.set(Constant.RedisPrefix.TOKEN_GREE_UPLOAD, DataUploadNew.accessToken,5 * 60);
+        }
+        return DataUploadNew.accessToken;
+    }
+}

+ 105 - 4
src/main/java/com/zfire/jiasm/syncdata/common/OldForNewUploadLogic.java

@@ -75,6 +75,8 @@ public class OldForNewUploadLogic {
 	ItfTblYjhxJddFjUploadService itfTblYjhxJddFjUploadService;
 	@Autowired
 	OSSUtil ossUtil;
+	@Autowired
+	ItfTblTradeNewForOldRejectJddDownloadService itfTblTradeNewForOldRejectJddDownloadService;
 
 	private ObjectMapper mapper;
 
@@ -388,6 +390,8 @@ public class OldForNewUploadLogic {
 				yjhxJddUpload.setWdmc(bean.getWdmc());
 				// 这里的ID来自于总部
 				jdd.setGreeId(reponseData.getId());
+				// 上传时自生成了ID,上传成后需使用总部的ID 这样再次从总部获取时,进行了修改,不会再存在两条以上的数据了
+				jdd.setHxjddid(reponseData.getId());
 				//鉴定结果业务表回写状态为0(无需上传)
 				jdd.setUploadNotifyFlag(0);
 				if( null != reponseData.getJddfj() && !reponseData.getJddfj().isEmpty()) {
@@ -714,15 +718,15 @@ public class OldForNewUploadLogic {
 		try {
 			JSONObject response = greeLogic.getPubV3(url, null);
 			if( 200 == response.getInteger("status").intValue()) {
-				List<OutJiasmToGreeUploadnotifylist> tradeNewForOldRejectJddDownloadList = JSONArray.parseArray(this.mapper.writeValueAsString(response.get("data")),
-						OutJiasmToGreeUploadnotifylist.class);
+				List<ItfTblTradeNewForOldRejectJddDownload> tradeNewForOldRejectJddDownloadList = JSONArray.parseArray(this.mapper.writeValueAsString(response.get("data")),
+						ItfTblTradeNewForOldRejectJddDownload.class);
 				if(CollectionUtils.isNotEmpty(tradeNewForOldRejectJddDownloadList)) {
 					tradeNewForOldRejectJddDownloadList.stream().forEach(reject->{
 						reject.setSynReqTime(new Date());
 						reject.setSynStatus(Constant.SynStatus.UN_SYN.getCode());
 						reject.setSynTimes(1);
 					});
-					outJiasmToGreeUploadnotifylistService.saveOrUpdateBatch(tradeNewForOldRejectJddDownloadList);
+					itfTblTradeNewForOldRejectJddDownloadService.saveOrUpdateBatch(tradeNewForOldRejectJddDownloadList);
 				}else {
 					log.info("TradeOldForNewLogic.queryRejectJdd接口返回记录数为空");
 				}
@@ -737,6 +741,103 @@ public class OldForNewUploadLogic {
 			log.error("TradeOldForNewLogic.queryRejectJdd接口异常333: {}", e.getMessage());
 		}
 		return "";
-    } 
+    }
+
+    // 修改鉴定单状态为驳回状态
+	public String processBusiness() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+		// 提取待同步的被驳回的以旧换新鉴定单数据
+		List<ItfTblTradeNewForOldRejectJddDownload > tradeNewForOldRejectJddDownloadList = itfTblTradeNewForOldRejectJddDownloadService.lambdaQuery()
+				.eq(ItfTblTradeNewForOldRejectJddDownload::getSynStatus, Constant.SynStatus.UN_SYN.getCode())
+				.orderByAsc(ItfTblTradeNewForOldRejectJddDownload::getSynReqId).list();
+
+		if(CollectionUtils.isNotEmpty(tradeNewForOldRejectJddDownloadList)) {
+			try {
+				LinkedHashSet<String> pgguids = new LinkedHashSet<>();
+				tradeNewForOldRejectJddDownloadList.stream().forEach(reject->{
+					pgguids.add(reject.getPgguid());
+				});
+
+				List<OrderBase> orderBaseList = orderBaseService.lambdaQuery()
+						.in(OrderBase::getPgguid, pgguids).list();
+				final Map<String, List<OrderBase>> orderBaseMap = (null == orderBaseList || orderBaseList.isEmpty()) ?
+						null :  orderBaseList.stream().collect(Collectors.groupingBy(OrderBase::getPgguid));
+
+				LinkedHashSet<String> orderBaseIds = new LinkedHashSet<>();
+				orderBaseList.stream().forEach(OrderBase->{
+					orderBaseIds.add(OrderBase.getId());
+				});
+
+				List<YjhxJdd> jddList = new ArrayList<>();
+				List<YjhxJdd> newAddJddList = new ArrayList<>();
+				if(!orderBaseIds.isEmpty()) {
+					jddList =  yjhxJddService.lambdaQuery()
+							.in(YjhxJdd::getOrderBaseId, orderBaseIds).list();
+				}
+
+				final Map<String, List<YjhxJdd>> jddMap = jddList.isEmpty() ?
+						null : jddList.stream().collect(Collectors.groupingBy(YjhxJdd::getOrderBaseId));
+
+				for (ItfTblTradeNewForOldRejectJddDownload item:tradeNewForOldRejectJddDownloadList){
+					if( null != orderBaseMap && orderBaseMap.containsKey(item.getPgguid()) &&
+							null != orderBaseMap.get(item.getPgguid()) &&
+							!orderBaseMap.get(item.getPgguid()).isEmpty()) {
+						// 提取工单
+						OrderBase orderBase = orderBaseMap.get(item.getPgguid()).get(0);
+						if( null != jddMap && jddMap.containsKey(orderBase.getId())
+								&& null != jddMap.get(orderBase.getId())
+								&& !jddMap.get(orderBase.getId()) .isEmpty()) {
+							// 提取鉴定单
+							YjhxJdd jdd = jddMap.get(orderBase.getId()) .get(0);
+							// 查看最后更新日期
+							if( null != jdd.getLastModifiedDate()) {
+								//广佛系统最后更新时间在总部下载的时间前才可以更新
+								if(jdd.getLastModifiedDate().before(item.getLastModifiedDate())) {
+									// 设状态为驳回状态
+									jdd.setStat("3");
+									jdd.setLastModifiedDate(item.getLastModifiedDate());
+									newAddJddList.add(jdd);
+									item.setSynStatus(Constant.SynStatus.SYN.getCode());
+									item .setSynReqTime(new Date());
+								} else {
+									log.info("TradeOldForNewLogic.queryRejectJdd: 广佛系统最后更新时间晚于总部下载的时间,不更驳回状态, 最近更新时间: 广佛:{},总部: {} ",
+											sdf.format(jdd.getLastModifiedDate()), sdf.format(item.getLastModifiedDate()));
+									item.setSynStatus(Constant.SynStatus.FAIL.getCode());
+									item .setSynReqTime(new Date());
+									item.setSynErrMsg("TradeOldForNewLogic.queryRejectJdd: 广佛系统最后更新时间比总部下载的时间后,不更驳回状态, 最近更新时间: 广佛:"+
+											sdf.format(jdd.getLastModifiedDate())+",总部:  "+
+											sdf.format(item.getLastModifiedDate()));
+								}
+							}else {
+								item.setSynStatus(Constant.SynStatus.FAIL.getCode());
+								item .setSynReqTime(new Date());
+								item.setSynErrMsg("jdd.getLastModifiedDate为空, pgguid="+ jdd.getPgguid());
+							}
+
+						}else {
+							item.setSynStatus(Constant.SynStatus.FAIL.getCode());
+							item .setSynReqTime(new Date());
+							item.setSynErrMsg("YjhxJdd为空, workerOrderNo="+ orderBase.getId());
+						}
+					}else {
+						item.setSynStatus(Constant.SynStatus.FAIL.getCode());
+						item .setSynReqTime(new Date());
+						item.setSynErrMsg("OrderInstall为空, pgguid="+ item.getPgguid());
+					}
+				}
+
+				if(newAddJddList.size()>0) {
+					yjhxJddService.saveOrUpdateBatch(newAddJddList);
+					newAddJddList.clear();
+				}
+
+				itfTblTradeNewForOldRejectJddDownloadService.saveOrUpdateBatch(tradeNewForOldRejectJddDownloadList);
+			}catch(Exception e) {
+				log.error("TradeOldForNewLogic.processBusiness处理异常: {}", e.getMessage());
+			}
+		}
+		return "";
+	}
 
 }

+ 1 - 68
src/main/java/com/zfire/jiasm/syncdata/constant/Constant.java

@@ -58,95 +58,28 @@ public class Constant {
 
 
     public class RedisPrefix{
-
-        public final static String TOKEN = "SETTLE:TOKEN";
         public final static String TOKEN_GREE ="SETTLE:TOKEN:GREE";
-        public final static String TOKEN_GREE_FILE ="SETTLE:TOKEN:FILE";
-        public final static String TOKEN_GREE_IMAGE ="SETTLE:TOKEN:GREE:IMAGE";
         public final static String TOKEN_GREE_V3 ="SETTLE:TOKEN:GREE:V3";
-        public final static String LOCK_PRE = "SETTLE:LOCK:PRE";
-        public final static String WORK_TOKEN = "SETTLE:WORK:TOKEN";
-        public final static String LOCK_BILL = "SETTLE:LOCK:BILL";
-        public final static String SIGN = "SETTLE:MALL:";
-        public final static String TOKEN_ADMIN_ID = "gz:java:admin:cookieMapId:";
-        public final static String LOCK_INVOLVE_CHECK = "SETTLE:lock:involve:check";
-        public final static String LOCK_EQUIPMENT_CHECK = "SETTLE:lock:equipment:check";
-        public final static String LOCK_SATISFACTION_CHECK = "SETTLE:lock:satisfaction:check";
-        public final static String LOCK_DIRECTOR_CHECK = "SETTLE:lock:director:check";
-        public final static String LOCK_CODE_CHECK = "SETTLE:lock:CODE:check";
-        public final static String LOCK_EQUIPMENT_ADD_CHECK = "SETTLE:lock:equipment:add:check";
-        //维修日结汇总
-        public final static String LOCK_DAILY_SUMMARY = "SETTLE:LOCK:DAILY:SUMMARY";
-        public final static String CACHE_AREA = "SETTLE:CACHE:AREA";
-        public final static String BALANCE_SEL_MOBILE_SMS = "SETTLE:BALANCE:SMS";
-        public final static String ISSUE_SAL_MOBILE_SMS = "SETTLE:ISSUE:SMS";
-        public final static String SMS = "SENDMSG:SMS";
-
-        public final static String LOCK_SUMMARY_ISSUE = "SETTLE:lock:issue:summary";
-
-        //同步辅材商品
-        public final static String CACHE_GOODS = "SETTLE:CACHE:GOODS";
-
-        //同步辅材分类
-        public final static String CACHE_CATEGORY = "SETTLE:CACHE:CATEGORY";
-
-        public final static String TOKEN_EQUIPMENT_CODE = "SETTLE:token:equipment:code";
-
-        public final static String TOKEN_GONGDAN = "SETTLE:TOKEN_GONGDAN:TOKEN";
-
-        public final static String  ORDER_NUM = "SETTLE:ORDER_NUM:GEN";
+        public final static String TOKEN_GREE_UPLOAD ="SETTLE:TOKEN:GREE:UPLOAD";
     }
 
     public class GreeApiPath{
-        //根据条码查询机型
-        public final static String JIXIN = "/outapp/installAccounts/az/wgmx/jixin";
-        //校验内外机条码是否为一套条码
-        public final static String MATCH = "/outapp/installAccounts/az/wgmx/barcode/match";
         //旧机回收工单推送接口
         public final static String RECYCLE_ASSIGN = "/outapp/recycle/assign";
         //旧机回收工单采集信息获取接口
         public final static String RECYCLE_ACQUISITION = "/outapp/recycle/acquisition";
         //采集信息上传接口
         public final static String RECYCLE_ACQUISITION_UPLOAD = "/outapp/recycle/acquisitionUpload";
-        //旧机出入库信息回传接口
-        public final static String OLD_MACHINE_MESSAGE = "/outapp/recycle/oldMachineMessage";
         //回收工单状态回传接口
         public final static String RECYCLE_STATUS = "/outapp/recycle/status";
-        //回收工单状态接口
-        public final static String RECYCLE_STATUS_ACT = "/outapp/recycle/statusAct";
         //回收工单详情获取接口
         public final static String RECYCLE_ASSIGN_DETAIL = "/outapp/recycle/assignDetail";
-        //查询未同步的退换货工单接口
-        public final static String REFUND_JYKT_UNSYN_LIST = "/outapp/thh/jykt/unsyn/list";
-        //销司同步退换货工单接口
-        public final static String REFUND_JYKT_SYN = "/outapp/thh/jykt/syn";
-        //获取退换货工单详情接口
-        public final static String REFUND_JYKT_DETAIL = "/outapp/thh/jykt/detail";
-        //旧机出入库信息回传接口
-        public final static String RECYCLE_STOCK_GETSTOCK = "/outapp/recycle/stock/getStock";
-        //入库操作
-        public final static String RECYCLE_STOCK_STOCKIN = "/outapp/recycle/stock/stockIn";
-        //出库操作
-        public final static String RECYCLE_STOCK_STOCKOUT = "/outapp/recycle/stock/stockOut";
-        //获取机型码对应信息
-        public final static String ACCESSORIES_GETMATERIALBYBARCODE = "/getmaterialbybarcode";
-        //根据物料代码获取物料信息详情
-        public final static String ACCESSORIES_GETACCESSORIESDETAIL = "/getaccessoriesdetail";
         //批量新增待入库单
         public final static String RECYCLE_STOCK_STOCKINFOS = "/outapp/recycle/stock/stockInfos";
-        //确认入库
-        public final static String RECYCLE_STOCK_STOCKINCONFIRM = "/outapp/recycle/stock/stockInConfirm";
-        //批量新增待入库单(与回收工单共用同一个接口)
-        public final static String TRADE_NEW_FOR_OLD_STOCK_STOCKINFOS = "/outapp/recycle/stock/stockInfos";
-        //总部app扫描入库后同步库存状态到广佛
-        public final static String RECYCLE_STOCK_UPDATEFLAG = "/outapp/recycle/stock/updateFlag";
-        //确认出库
-        public final static String RECYCLE_STOCK_STOCKOUTCONFIRM = "/outapp/recycle/stock/stockOutConfirm";
     }
 
     @Getter
     public enum SynStatus{
-
         UN_SYN(0, "未同步"),
         SYN(1, "已同步"),
         SYN_FEEDBACK(44, "已同步反馈明细"),

+ 80 - 0
src/main/java/com/zfire/jiasm/syncdata/constant/UploadTableEnum.java

@@ -0,0 +1,80 @@
+package com.zfire.jiasm.syncdata.constant;
+
+import lombok.Getter;
+
+/**
+ * 同步上传记录表
+ * @author yaozx
+ * @version 1.0
+ * @date 2023-06-01
+ */
+@Getter
+public enum UploadTableEnum {
+    AZ_ASSIGN_APPOINTMENT_UPLOAD("itf_tbl_az_assign_appointment_upload","用户预约改约"),
+    AZ_WGMX_JYKT_FJ_UPLOAD("itf_tbl_az_wgmx_jykt_fj_upload","家用空调数据采集附件"),
+    AZ_WGMX_SYKT_FJ_UPLOAD("itf_tbl_az_wgmx_sykt_fj_upload","商用空调数据采集附件"),
+    AZ_WGMX_QITA_FJ_UPLOAD("itf_tbl_az_wgmx_qita_fj_upload","其他数据采集附件"),
+    AZ_WGMX_JYKT_TMMX_UPLOAD("itf_tbl_az_wgmx_jykt_tmmx_upload","家用空调条码明细"),
+    AZ_WGMX_SYKT_TMMX_LS_UPLOAD("itf_tbl_az_wgmx_sykt_tmmx_ls_upload","商用完工明细数据采集条码明细"),
+    AZ_WGMX_QITA_TMMX_UPLOAD("itf_tbl_az_wgmx_qita_tmmx_upload","其他完工明细数据采集条码明细"),
+    AZ_ASSIGN_FKMX_UPLOAD("itf_tbl_az_assign_fkmx_upload","安装反馈明细"),
+    AZ_ASSIGN_FEE_UPLOAD("itf_tbl_az_assign_fee_upload","空调安装费用清单"),
+    AZ_ASSIGN_LC_LS_UPLOAD("itf_tbl_az_assign_lc_ls_upload","安装主表"),
+    AZ_WGMX_QITA_UPLOAD("itf_tbl_az_wgmx_qita_upload","完工明细(其他)"),
+    AZ_WGMX_JYKT_UPLOAD("itf_tbl_az_wgmx_jykt_upload","完工明细(家用空调)"),
+    AZ_WGMX_SYKT_UPLOAD("itf_tbl_az_wgmx_sykt_upload","完工明细(商用空调)"),
+    AZ_ASSIGN_MX_UPLOAD("itf_tbl_az_assign_mx_upload","安装工单明细"),
+    WXJS_PJMX_JYKT_UPLOAD("itf_tbl_wxjs_pjmx_jykt_upload","配件表"),
+    WXJS_WXXM_JYKT_UPLOAD("itf_tbl_wxjs_wxxm_jykt_upload","维修项目"),
+    WXJS_XXYY_JYKT_UPLOAD("itf_tbl_wxjs_xxyy_jykt_upload","维修现象"),
+    WXJS_FJ_JYKT_UPLOAD("itf_tbl_wxjs_fj_jykt_upload","维修附件表"),
+    ASSIGN_FEE_UPLOAD("itf_tbl_assign_fee_upload","维修费用表"),
+    ASSIGN_XZYD_UPLOAD("itf_tbl_assign_xzyd_upload","新增阅读记录维护表"),
+    WXJS_JYKT_UPLOAD("itf_tbl_wxjs_jykt_upload","维修结算表"),
+    ASSIGN_UPLOAD("itf_tbl_assign_upload","维修单表"),
+    ASSIGN_MX_UPLOAD("itf_tbl_assign_mx_upload","维修单明细"),
+    ASSIGN_APPOINTMENT_UPLOAD("itf_tbl_assign_appointment_upload","维修单预约改约信息"),
+    ASSIGN_FKMX_UPLOAD("itf_tbl_assign_fkmx_upload","维修工单反馈信息"),
+    AZ_ASSIGN_XZYD_UPLOAD("itf_tbl_az_assign_xzyd_upload","新增安装阅读记录维护表"),
+
+
+
+    ;
+
+
+
+
+    /**
+     * 编码
+     */
+    private final String code;
+
+
+    private final String text;
+
+    UploadTableEnum(String code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+
+    public static UploadTableEnum getByCode(String code) {
+        for (UploadTableEnum item : values()) {
+            if (code.equals(item.getCode())) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+
+    public static String getMessageByCode(String code) {
+        String result = null;
+        for (UploadTableEnum item : values()) {
+            if (code.equals(item.getCode())) {
+                result = item.getText();
+                break;
+            }
+        }
+        return result;
+    }
+}

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

@@ -15,4 +15,6 @@ import org.apache.ibatis.annotations.Param;
 public interface AZGDLcLsDownloadMapper extends BaseMapper<ItfTblAzAssignLcLsDownload> {
     @SqlParser(filter = true)
     OrderBase getOrderBase(@Param("request") OrderPar request);
+    @SqlParser(filter = true)
+    OrderBase getOrderBaseUp(@Param("request") OrderPar request);
 }

+ 2 - 0
src/main/java/com/zfire/jiasm/syncdata/data/Token.java

@@ -1,5 +1,7 @@
 package com.zfire.jiasm.syncdata.data;
 
+import lombok.Data;
+
 public class Token {
 
 	private String accessToken;

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

@@ -193,12 +193,11 @@ public class InstallBusiness {
         newLCLS.setDispatchStatus(old.getDispatchStatus());
 
         // 获取工单主表要同步的数据
-        OrderBase upInfo = getOrderBaseUp(old, item, newLCLS);
+        OrderBase upInfo = getOrderBaseUp(old, item, newLCLS, brand);
 
         // 以旧换新数据下载同步表
         getOldForNewProductt(item, newLCLS,its,old);
 
-
         // 获取工单师傅信息来自于工单主表数据只有修改的情况
         OrderWorker own =getOrderWorkerUpdate(old.getId(), upInfo, newLCLS);
 
@@ -654,10 +653,10 @@ public class InstallBusiness {
     }
 
     @NotNull
-    private OrderBase getOrderBaseUp(OrderBase old, ItfTblAzAssignLcLsDownload item, OrderBase newLCLS) {
+    private OrderBase getOrderBaseUp(OrderBase old, ItfTblAzAssignLcLsDownload item, OrderBase newLCLS,Brand brand) {
         OrderBase upInfo = new OrderBase();
 
-        // 本地订单已关闭 且总部的最后修改时间晚于本地数据修改时间 不可修改
+        // 本地订单已关闭 且总部的最后修改时间在本地数据修改时间之前 不可修改
         if (old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode()) &&
                 item.getLastModifiedDate().compareTo(old.getUpdateTime())<0){
             synItfTblAzAssignLcLsDownload(item.getSynReqId(), 99, "本地工单已关闭或作废忽略更新");
@@ -668,6 +667,11 @@ public class InstallBusiness {
         // 1.安装工单主表基础信息更新
         if (item.getLastModifiedDate().compareTo(old.getUpdateTime())>0){
             BeanUtils.copyProperties(newLCLS,upInfo);
+            // upInfo = getAddOrderBaseUp(item, brand);
+            //  未完成数量 取小
+            if (upInfo.getUndoneNum()>old.getUndoneNum()){
+                upInfo.setUndoneNum(old.getUndoneNum());
+            }
         }
         // 2:网点信息修改 已待服务人员处理,不允更新网点   6,7,10 少6
         if (old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode()) ||
@@ -708,6 +712,10 @@ public class InstallBusiness {
             upInfo.setOrderStatus(newLCLS.getOrderStatus());
             upInfo.setOrderStatus(newLCLS.getOrderStatus());
             upInfo.setOrderStatus(newLCLS.getOrderStatus());
+
+
+
+            // upInfo.setDispatchStatus("DJS");
         }
 
         upInfo.setId(old.getId());
@@ -1525,5 +1533,4 @@ public class InstallBusiness {
 
         return orderBase;
     }
-
 }

+ 11 - 0
src/main/java/com/zfire/jiasm/syncdata/download/order/OldForNewDownload.java

@@ -20,6 +20,17 @@ public class OldForNewDownload {
 	 */
 	@Scheduled(fixedDelay = 20 * 60 * 1000)
 	public void queryRejectJdd() {
+		// 下载驳回的鉴定单
 		oldForNewUploadLogic.queryRejectJdd();
 	}
+
+	/**
+	 * 以旧换新 - 修改鉴定单状态为驳回状态
+	 */
+	@Scheduled(fixedDelay = 20 * 60 * 1000)
+	public void processBusiness() {
+		// 修改鉴定单状态 及 同步驳回鉴定单的处理状态
+		oldForNewUploadLogic.processBusiness();
+	}
+
 }

+ 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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @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-31
+ * @since 2023-06-01
  */
 @Controller
 @RequestMapping("/plus/worker-brand-account")

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