From 41dc7239db3cd2021db7d44f9872df9573d2f255 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 21 四月 2025 17:27:17 +0800
Subject: [PATCH] 工单同步功能：增加根据日志重试接口,日志查看接口
---
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java | 172 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 132 insertions(+), 40 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 8f1ad5b..e7ef207 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
@@ -169,68 +169,159 @@
@Transactional
@Override
public boolean batchSaveByPager(ApsWorkOrderJobParam param) {
- HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.APPLICATION_JSON);
- /*璁剧疆褰撳墠椤甸潰*/
- ApsWorkOrderJobLog jobLog = new ApsWorkOrderJobLog();
+
String requestString = JSONObject.toJSONString(param);
- HttpEntity<String> request = new HttpEntity<>(requestString, headers);
- ResponseEntity<String> response = restTemplate.postForEntity(getWorkOrderUrl, request, String.class);
+ ApsWorkOrderJobLog jobLog = new ApsWorkOrderJobLog();
jobLog.setRequestData(requestString);
jobLog.setPageNum(Long.valueOf(param.getPageIndex()));
jobLog.setPageCount(Long.valueOf(param.getPageSize()));
jobLog.setCreateTime(DateUtils.getNowDate());
jobLog.setBizType("work_order");
jobLogMapper.insertApsWorkOrderJobLog(jobLog);
- if (response.getStatusCode().is2xxSuccessful()) {
- JSONObject responseBodyJson = JSONObject.parseObject(response.getBody());
- if ("200".equals(responseBodyJson.getString("status"))) {
- JSONArray result = responseBodyJson.getJSONArray("data");
- if (result != null&& !result.isEmpty()) {
- int ct= batchInsertApsWorkOrderJob(param, result);
- jobLog.setResult("ok save "+ct);
- jobLogMapper.updateApsWorkOrderJobLog(jobLog);
- return true;
- }else {
- jobLog.setResult("ok receive 0");
- jobLogMapper.updateApsWorkOrderJobLog(jobLog);
- return false;
- }
- } else {
- jobLog.setResponseData(response.getBody());
+ return requestOnePage(jobLog);
+ }
+ /**
+ * 璇锋眰涓�椤垫暟鎹繘琛屼繚瀛�
+ * */
+ @Transactional
+ @Override
+ public boolean requestOnePage(ApsWorkOrderJobLog jobLog) {
+ // 瀹氫箟甯搁噺锛岄伩鍏嶇‖缂栫爜
+ final String STATUS_KEY = "status";
+ final String DATA_KEY = "data";
+ final String SUCCESS_STATUS = "200";
+ /*璁剧疆鏃ュ織鏇存柊鏃堕棿锛孯etry鍚庝笌鍒涘缓鏃堕棿涓嶅悓*/
+ jobLog.setUpdateTime(DateUtils.getNowDate());
+ try {
+ // 璁剧疆璇锋眰澶�
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ HttpEntity<String> request = new HttpEntity<>(jobLog.getRequestData(), headers);
+
+ // 鍙戣捣HTTP璇锋眰
+ ResponseEntity<String> response;
+ try {
+ response = restTemplate.postForEntity(getWorkOrderUrl, request, String.class);
+ } catch (Exception e) {
+ // 鎹曡幏缃戠粶寮傚父鎴栧叾浠栧紓甯�
+ String msg = String.format("Error occurred while making HTTP request: {}", e.getMessage());
+ log.error(msg);
+ jobLog.setResponseData(msg);
+ jobLog.setResult("fail:"+e.getMessage());
+ jobLogMapper.updateApsWorkOrderJobLog(jobLog);
+ return false;
+ }
+ // 瑙ｆ瀽鍝嶅簲浣�
+ String responseBody = response.getBody();
+ // 妫�鏌ュ搷搴旂姸鎬佺爜
+ if (!response.getStatusCode().is2xxSuccessful()) {
+ String msg = String.format("Non-2xx response received: {}", response.getStatusCode());
+ log.warn(msg);
+ jobLog.setResponseData(responseBody);
jobLog.setResult("fail");
jobLogMapper.updateApsWorkOrderJobLog(jobLog);
return false;
}
- } else {
- jobLog.setResponseData(response.getBody());
+ if (responseBody == null) {
+ String responseBodyIsNull = "Response body is null";
+ log.warn(responseBodyIsNull);
+ jobLog.setResponseData(responseBodyIsNull);
+ jobLog.setResult("fail");
+ jobLogMapper.updateApsWorkOrderJobLog(jobLog);
+ return false;
+ }
+
+ JSONObject responseBodyJson = JSONObject.parseObject(responseBody);
+ String status = responseBodyJson.getString(STATUS_KEY);
+ if (!SUCCESS_STATUS.equals(status)) {
+
+ log.warn("Unexpected status in response: {}", status);
+ jobLog.setResponseData(responseBody);
+ jobLog.setResult("fail");
+ jobLogMapper.updateApsWorkOrderJobLog(jobLog);
+ return false;
+ }
+
+ // 澶勭悊鏁版嵁
+ JSONArray result = responseBodyJson.getJSONArray(DATA_KEY);
+ if (result == null || result.isEmpty()) {
+ jobLog.setResult("ok receive 0");
+ jobLogMapper.updateApsWorkOrderJobLog(jobLog);
+ return false;
+ }
+
+ int ct = batchInsertApsWorkOrderJob(jobLog.getPageNum().intValue(), result);
+ jobLog.setResult("ok save " + ct);
+ jobLogMapper.updateApsWorkOrderJobLog(jobLog);
+ return true;
+
+ } catch (Exception e) {
+ // 鎹曡幏鎵�鏈夊紓甯稿苟璁板綍鏃ュ織
+ log.error("An unexpected error occurred: {}", e.getMessage(), e);
+ jobLog.setResponseData(null);
jobLog.setResult("fail");
jobLogMapper.updateApsWorkOrderJobLog(jobLog);
- log.info(JSONObject.toJSONString(jobLog));
return false;
}
-
}
- @Transactional
- public int batchInsertApsWorkOrderJob(ApsWorkOrderJobParam param, JSONArray result) {
+
+
+ @Transactional(rollbackFor = Exception.class)
+ public int batchInsertApsWorkOrderJob(Integer pageNum, JSONArray result) {
+ // 杈圭晫鏉′欢妫�鏌�
+ if (result == null || result.isEmpty()) {
+ log.warn("Result is empty or null, no data to process.");
+ return 0;
+ }
+ if (pageNum == null) {
+ log.warn("PageNum is null, setting default value to 1.");
+ pageNum = 1;
+ }
+
List<ApsWorkOrderJob> jobs = new ArrayList<>();
List<String> orderIds = new ArrayList<>();
+
for (int i = 0; i < result.size(); i++) {
- ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class);
- JSONObject jsonObject = result.getJSONObject(i);
- order.setOrderId(jsonObject.get("ID").toString());
- order.setCreateTime(DateUtils.getNowDate());
- order.setPageIndex(i);
- order.setPageNum(param.getPageIndex());
- order.setDelFlag("0");
- order.setProcessStatus("0");
- jobs.add(order);
- orderIds.add(order.getOrderId());
+ try {
+ JSONObject jsonObject = result.getJSONObject(i);
+ // 鏍￠獙蹇呰瀛楁鏄惁瀛樺湪
+ if (!jsonObject.containsKey("ID")) {
+ log.error("Missing 'ID' field in result at index: {}", i);
+ continue; // 璺宠繃鏃犳晥鏁版嵁
+ }
+
+ ApsWorkOrderJob order = new ApsWorkOrderJob();
+ order.setOrderId(jsonObject.getString("ID"));
+ order.setCreateTime(DateUtils.getNowDate());
+ order.setPageIndex(i);
+ order.setPageNum(pageNum);
+ order.setDelFlag("0");
+ order.setProcessStatus("0");
+
+ jobs.add(order);
+ orderIds.add(order.getOrderId());
+ } catch (Exception e) {
+ log.error("Error processing result at index {}: {}", i, e.getMessage(), e);
+ // 缁х画澶勭悊鍏朵粬鏁版嵁
+ }
}
- apsWorkOrderJobMapper.deleteWorkOrderJobByOrderIds(orderIds);
- return apsWorkOrderJobMapper.batchInsertApsWorkOrderJob(jobs);
+
+ if (!orderIds.isEmpty()) {
+ // 鍒犻櫎鏃ф暟鎹�
+ apsWorkOrderJobMapper.deleteWorkOrderJobByOrderIds(orderIds);
+ }
+
+ // 鎵归噺鎻掑叆鏂版暟鎹�
+ int affectedRows = apsWorkOrderJobMapper.batchInsertApsWorkOrderJob(jobs);
+
+ if (affectedRows != jobs.size()) {
+ log.warn("Not all records were inserted successfully. Expected: {}, Actual: {}", jobs.size(), affectedRows);
+ }
+
+ return affectedRows;
}
+
/**
* 鍚屾闆朵欢宸ュ崟淇℃伅
@@ -241,4 +332,5 @@
apsWorkOrderJobMapper.deleteAllPartPlan();
apsWorkOrderJobMapper.batchInsertPartPlan();
}
+
}
--
Gitblit v1.9.3