From 8bcf258496e7c6cdaa3921acec4db1d4f77fe6f2 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 24 四月 2025 13:34:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 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 e7ef207..6778319 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,31 @@
package com.aps.job.service.impl;
+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涓氬姟灞傚鐞�
@@ -291,7 +291,7 @@
continue; // 璺宠繃鏃犳晥鏁版嵁
}
- ApsWorkOrderJob order = new ApsWorkOrderJob();
+ ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class);
order.setOrderId(jsonObject.getString("ID"));
order.setCreateTime(DateUtils.getNowDate());
order.setPageIndex(i);
@@ -333,4 +333,14 @@
apsWorkOrderJobMapper.batchInsertPartPlan();
}
+ /**
+ * 鍚屾閽ｉ噾宸ュ崟淇℃伅
+ * */
+ @Transactional
+ @Override
+ public void syncPlateOrderData() {
+ apsWorkOrderJobMapper.deleteAllPlatePlan();
+ apsWorkOrderJobMapper.batchInsertPlatePlan();
+ }
+
}
--
Gitblit v1.9.3