yaozhixue 1 year ago
parent
commit
5f828f8a55

+ 6 - 2
src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallDownloadServiceImpl.java

@@ -15,6 +15,7 @@ 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.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -92,8 +93,12 @@ public class InstallDownloadServiceImpl implements InstallDownloadService {
             }
         }
 
+        datas.clear();
         log.info("安装工单下载完成 \uF0B7{}",sdf.format(new Date()));
+
+        log.info("与总部同步安装工单下载状态");
         updateStatus();
+        log.info("与总部同步安装工单下载状态完成");
     }
 
 
@@ -125,7 +130,7 @@ public class InstallDownloadServiceImpl implements InstallDownloadService {
                     .orderByAsc(ItfInstallBatchDownloadRec::getSynReqId);
             recs = itfInstallBatchDownloadRecService.list(queryWrapper);
 
-            if (recs.size()>0){
+            if (CollectionUtils.isNotEmpty(recs)){
                 log.info("需要与总部同步安装工单下载状态记录数: {}",recs.size());
                 Token token = tokenCenter.getCurrentToken();
                 String url = baseurl + "tblAzAssignLcLs" + "/updateExtendfiled5";
@@ -142,7 +147,6 @@ public class InstallDownloadServiceImpl implements InstallDownloadService {
                     syncStatus(item, jsonResult);
                 }
             }
-            log.info("与总部同步安装工单下载状态完成");
         } catch (Exception ex) {
             log.error("与总部同步更新安装工单下载状态失败", ex);
         }

+ 2 - 0
src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairDownloadServiceImpl.java

@@ -109,6 +109,8 @@ public class RepairDownloadServiceImpl implements RepairDownloadService {
 
             }
 
+            datas.clear();
+
             log.info("维修工单同步下载状态");
             // 与总部同步下载状态,修改本地下载记录表状态 gree_stat_syn_status =1
             updateStatus();