yaozhixue 1 年之前
父节点
当前提交
a2564fa63a

+ 6 - 4
src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceDataUploadServiceImpl.java

@@ -152,9 +152,10 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
 
     @Override
     public void processProduce() {
-
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String cjOrWg = "";
+        List<OutJiasmToGreeUploadTaskType> ojtutts = new ArrayList<>();
+        List<OutJiasmToGreeUploadTaskList> ojtutls = new ArrayList<>();
 
         // 提取品牌信息
         Brand brand = baseService.getBrand();
@@ -174,7 +175,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
         log.info("开始生成需要上传的安装工单数据: \uF0B7{}",sdf.format(new Date()));
 
         // 数据准备类型定义表中提取所有数据
-        List<OutJiasmToGreeUploadTaskType> ojtutts = outJiasmToGreeUploadTaskTypeService.lambdaQuery()
+        ojtutts = outJiasmToGreeUploadTaskTypeService.lambdaQuery()
                 .orderByAsc(OutJiasmToGreeUploadTaskType::getId).list();
         try{
             for (OutJiasmToGreeUploadTaskType item:ojtutts){
@@ -182,9 +183,10 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                 int uploadTaskType = item.getUploadTaskType();
 
                 // 数据上传任务表提取对应的任务类型数据
-                List<OutJiasmToGreeUploadTaskList> ojtutls = outJiasmToGreeUploadTaskListService.lambdaQuery()
+                ojtutls = outJiasmToGreeUploadTaskListService.lambdaQuery()
                         .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
+                        .lt(OutJiasmToGreeUploadTaskList::getSynTimes,1000)
                         .orderByAsc(OutJiasmToGreeUploadTaskList::getSynReqId).list();
                 for (OutJiasmToGreeUploadTaskList ojtutl:ojtutls){
                     try{
@@ -241,7 +243,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                                 ojtutl.getId();
                         log.info(msg);
                         if (ex.getMessage() !=null){
-                            msg = ex.getMessage();
+                            msg = msg + ex.getMessage();
                         }
                         publicService.updateUploadTaskLisError(ojtutl,msg);
                         log.info("开始预处理生成需要上传的安装工单数据出错");

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

@@ -452,6 +452,8 @@ public class PublicServiceImpl implements PublicService {
     public void updateUploadTaskLisError(OutJiasmToGreeUploadTaskList ojtutl, String msg){
         ojtutl.setSynTime(new Date());
         ojtutl.setSynErrMsg("other");
+        ojtutl.setSynTimes(ojtutl.getSynTimes());
+
         if (msg!=null){
             if (msg.length()>255){
                 ojtutl.setSynErrMsg(msg.substring(0,255));