From 5ec8d62c24fc5844d1b88a91398178856ec76b12 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 08 五月 2025 15:46:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
index d94a318..fc2078b 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
@@ -1,31 +1,32 @@
package com.aps.job.service.impl;
+import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.aps.common.core.utils.DateUtils;
+import com.aps.job.domain.ApsWorkOrderJob;
+import com.aps.job.domain.ApsWorkOrderJobLog;
+import com.aps.job.mapper.ApsWorkOrderJobLogMapper;
+import com.aps.job.mapper.ApsWorkOrderJobMapper;
+import com.aps.job.param.ApsWorkOrderJobParam;
+import com.aps.job.service.IApsWorkOrderJobService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.aps.common.core.utils.DateUtils;
-import com.aps.job.domain.ApsWorkOrderJobLog;
-import com.aps.job.mapper.ApsWorkOrderJobLogMapper;
-import com.aps.job.param.ApsWorkOrderJobParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import com.aps.job.mapper.ApsWorkOrderJobMapper;
-import com.aps.job.domain.ApsWorkOrderJob;
-import com.aps.job.service.IApsWorkOrderJobService;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
/**
* 宸ュ崟鍚屾Service涓氬姟灞傚鐞�
@@ -158,7 +159,7 @@
param.setDocState(Arrays.asList(0,1,2,4));
param.setBeginDate(yesterdayMidnight.format(formatter));
param.setEndDate(today.format(formatter));
- param.setPageSize(1000);
+ param.setPageSize(100);
while (continueFlag){
param.setPageIndex(currentPage);
continueFlag= batchSaveByPager(param);
@@ -178,6 +179,7 @@
jobLog.setCreateTime(DateUtils.getNowDate());
jobLog.setBizType("work_order");
jobLogMapper.insertApsWorkOrderJobLog(jobLog);
+ log.info("work_order_request锛歿}", JSONObject.toJSONString(jobLog));
return requestOnePage(jobLog);
}
/**
@@ -292,13 +294,15 @@
}
ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class);
+ order.setId(IdUtil.getSnowflakeNextId());
order.setOrderId(jsonObject.getString("ID"));
order.setCreateTime(DateUtils.getNowDate());
order.setPageIndex(i);
order.setPageNum(pageNum);
order.setDelFlag("0");
order.setProcessStatus("0");
-
+ order.setOpStatus(jsonObject.getString("OpStatus"));
+ order.setNextOpName(jsonObject.getString("NextOpName"));
jobs.add(order);
orderIds.add(order.getOrderId());
} catch (Exception e) {
@@ -343,4 +347,15 @@
apsWorkOrderJobMapper.batchInsertPlatePlan();
}
+
+ /**
+ * 鍚屾閽ｉ噾宸ュ崟淇℃伅
+ * */
+ @Transactional
+ @Override
+ public void syncGasPipingData() {
+ apsWorkOrderJobMapper.deleteAllGasPiping();
+ apsWorkOrderJobMapper.batchInsertGasPiping();
+ }
+
}
--
Gitblit v1.9.3