yaozhixue vor 1 Jahr
Ursprung
Commit
927b5fbd53

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

@@ -35,7 +35,8 @@ public class BaseService {
 
 
      public Brand getBrand() {
-        Brand brand = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+         String brands="格力";
+        Brand brand = brandService.lambdaQuery().eq(Brand::getBrand,brands).one();
         return brand;
     }
 

+ 15 - 0
src/main/java/com/zfire/jiasm/syncdata/constant/SynStatusEnum.java

@@ -0,0 +1,15 @@
+package com.zfire.jiasm.syncdata.constant;
+
+import lombok.Getter;
+
+@Getter
+public enum SynStatusEnum {
+    UN_SYN(0), //未同步
+    SYN(1), //已同步
+    FAIL(99); //"同步失败"
+
+    private Integer code;
+    private SynStatusEnum(Integer code) {
+        this.code = code;
+    }
+}

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/download/basedata/MasterDownloadTask.java

@@ -73,7 +73,7 @@ public class MasterDownloadTask {
 
             List<ItfGreeToFaSynTaskList> recs =  itfGreeToFaSynTaskListService.lambdaQuery()
                     .eq(ItfGreeToFaSynTaskList::getSynTaskType,9002)
-                    .eq(ItfGreeToFaSynTaskList::getSynStatus,0).list();
+                    .eq(ItfGreeToFaSynTaskList::getSynStatus,SynStatusEnum.UN_SYN.getCode()).list();
 
             // 数据落本地表
             for (ItfGreeToFaSynTaskList item : recs) {

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
+import com.zfire.jiasm.syncdata.constant.SynStatusEnum;
 import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.ItfTblAzAssignLcLsDownloadService;
@@ -76,7 +77,7 @@ public class InstallBusiness {
 
         // 提取待落本地表的数据
         lcls = itfTblAzAssignLcLsDownloadService.lambdaQuery()
-                .eq(ItfTblAzAssignLcLsDownload::getSynStatus,0)
+                .eq(ItfTblAzAssignLcLsDownload::getSynStatus, SynStatusEnum.UN_SYN.getCode())
                 .orderByAsc(ItfTblAzAssignLcLsDownload::getSynReqId)
                 .list();
 

+ 2 - 1
src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusinessApi.java

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.order;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
+import com.zfire.jiasm.syncdata.constant.SynStatusEnum;
 import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.ItfTblAzAssignLcLsDownloadService;
@@ -76,7 +77,7 @@ public class InstallBusinessApi {
 
         // 提取待落本地表的数据
         lcls = itfTblAzAssignLcLsDownloadService.lambdaQuery()
-                .eq(ItfTblAzAssignLcLsDownload::getSynStatus,0)
+                .eq(ItfTblAzAssignLcLsDownload::getSynStatus, SynStatusEnum.UN_SYN.getCode())
                 // .eq(ItfTblAzAssignLcLsDownload::getSynReqId,3803)
                 .orderByAsc(ItfTblAzAssignLcLsDownload::getSynReqId)
                 .list();

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

@@ -1,6 +1,7 @@
 package com.zfire.jiasm.syncdata.download.order;
 
 import com.zfire.jiasm.syncdata.base.BaseService;
+import com.zfire.jiasm.syncdata.constant.SynStatusEnum;
 import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.plus.entity.Brand;
 import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignDownload;
@@ -81,7 +82,7 @@ public class RepairBusiness {
 
         // 提取待落本地表的数据
         repairRec = itfTblAssignDownloadService.lambdaQuery()
-                .eq(ItfTblAssignDownload::getSynStatus,0)
+                .eq(ItfTblAssignDownload::getSynStatus, SynStatusEnum.UN_SYN.getCode())
                 .orderByAsc(ItfTblAssignDownload::getSynReqId)
                 .list();
 

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusinessApi.java

@@ -84,7 +84,7 @@ public class RepairBusinessApi {
 
         // 提取待落本地表的数据
         repairRec = itfTblAssignDownloadService.lambdaQuery()
-                .eq(ItfTblAssignDownload::getSynStatus,0)
+                .eq(ItfTblAssignDownload::getSynStatus, SynStatusEnum.UN_SYN.getCode())
                 .orderByAsc(ItfTblAssignDownload::getSynReqId)
                 .list();
 

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/service/impl/AddInstallBusinessImpl.java

@@ -112,7 +112,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
         List<ItfTblAzAssignMxDownload> orderMx = itfTblAzAssignMxDownloadService.lambdaQuery()
                 .eq(ItfTblAzAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .eq(ItfTblAzAssignMxDownload::getSynStatus,0)
+                .eq(ItfTblAzAssignMxDownload::getSynStatus, SynStatusEnum.UN_SYN.getCode())
                 .orderByAsc(ItfTblAzAssignMxDownload::getSynReqId)
                 .list();
         synReqIds = orderMx.stream().map(ItfTblAzAssignMxDownload::getSynReqId).collect(Collectors.toList());

+ 2 - 8
src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceUploadListServiceImpl.java

@@ -2,6 +2,7 @@ package com.zfire.jiasm.syncdata.service.impl;
 
 import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
+import com.zfire.jiasm.syncdata.constant.SynStatusEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import com.zfire.jiasm.syncdata.service.InstallProduceUploadListService;
@@ -50,18 +51,11 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
     public void processUploadList() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<OutJiasmToGreeUploadTaskList> ojtgutls = new ArrayList<>();
-
         log.info("开始预处理需要上传的工单数据: \uF0B7{}",sdf.format(new Date()));
 
         // 从需要上传的订单数据表中提取数据
         List<OutJiasmToGreeUploadnotifylist> taskResults = outJiasmToGreeUploadnotifylistService.lambdaQuery()
-                .eq(OutJiasmToGreeUploadnotifylist::getSynStatus,0)
-
-                // .eq(OutJiasmToGreeUploadnotifylist::getOrderNo,"A1685935035558223873")
-                // .eq(OutJiasmToGreeUploadnotifylist::getOrderType,"INSTALL")
-                // .eq(OutJiasmToGreeUploadnotifylist::getTableName,"order_re_appointment")
-
-
+                .eq(OutJiasmToGreeUploadnotifylist::getSynStatus, SynStatusEnum.UN_SYN.getCode())
                 .orderByAsc(OutJiasmToGreeUploadnotifylist::getSynReqId).list();
 
         try {