From aa527f732cff65689e82b660389be4ece3825ae3 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期五, 09 五月 2025 18:00:15 +0800
Subject: [PATCH] 【UPDATE】1.新增同步标准工艺路线定时任务代码 2.从redis中获取BOM数据 3.将工艺路线数据存入redis中 4.从redis中获取工艺路线数据

---
 aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java
index c307d96..b3133b2 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java
@@ -5,6 +5,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.aps.common.core.utils.DateUtils;
 import com.aps.common.core.utils.StringUtils;
+import com.aps.common.core.utils.uuid.IdUtils;
 import com.aps.job.domain.ApsBomHeaderJob;
 import com.aps.job.domain.ApsBomLineJob;
 import com.aps.job.domain.ApsWorkOrderJobLog;
@@ -125,14 +126,19 @@
 
     @Override
     public boolean syncBomData(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList) {
+        JSONObject requestBody = new JSONObject();
+        ResponseEntity<String> response = null;
+        ApsWorkOrderJobLog jobLog = new ApsWorkOrderJobLog();
+        String batchNum = "";
         try {
             // 璁剧疆璇锋眰澶�
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);
             // 璁剧疆璇锋眰浣�
             while (true) {
-                ApsWorkOrderJobLog jobLog = new ApsWorkOrderJobLog();
-                JSONObject requestBody = new JSONObject();
+                batchNum = IdUtils.fastSimpleUUID();
+                jobLog = new ApsWorkOrderJobLog();
+                requestBody = new JSONObject();
                 requestBody.put("PageIndex", pageIndex);
                 requestBody.put("PageSize", pageSize);
                 if(!StringUtils.isEmpty(orgCode)){
@@ -141,7 +147,7 @@
                 // 鍒涘缓HttpEntity瀵硅薄
                 HttpEntity<String> request = new HttpEntity<>(requestBody.toJSONString(), headers);
                 // 鍙戦�丳OST璇锋眰
-                ResponseEntity<String> response = restTemplate.postForEntity(getBomUrl, request, String.class);
+                response = restTemplate.postForEntity(getBomUrl, request, String.class);
                 JSONObject responseBodyJson = JSONObject.parseObject(response.getBody());
                 if (response.getStatusCode().is2xxSuccessful() && "200".equals(responseBodyJson.getString("status"))) {
                     JSONArray jsonArray = responseBodyJson.getJSONArray("data");
@@ -160,6 +166,7 @@
                             insertBomHeader.setStartDate(DateUtils.parseDate(bomHeader.getString("HEffectiveDate")));
                             insertBomHeader.setEndDate(DateUtils.parseDate(bomHeader.getString("HDisableDate")));
                             insertBomHeader.setOrgCode(bomHeader.getString("HOrgName").contains("娌堥槼")?"FORTUNE":bomHeader.getString("HOrgName").contains("鍗楅��")?"FORTUNA":bomHeader.getString("HOrgName").contains("鍖椾含")?"FORTUBE":bomHeader.getString("HOrgName"));
+                            insertBomHeader.setCreateBy(batchNum);
                             headerList.add(insertBomHeader);
                             for(Object line : bomLines){
                                 JSONObject lineJson = (JSONObject) line;
@@ -173,6 +180,7 @@
                                 bomLine.setStartDate(DateUtils.parseDate(lineJson.getString("LEffectiveDate")));
                                 bomLine.setEndDate(DateUtils.parseDate(lineJson.getString("LDisableDate")));
                                 bomLine.setOrgCode(lineJson.getString("LOrgName").contains("娌堥槼")?"FORTUNE":lineJson.getString("LOrgName").contains("鍗楅��")?"FORTUNA":lineJson.getString("LOrgName").contains("鍖椾含")?"FORTUBE":lineJson.getString("LOrgName"));
+                                bomLine.setCreateBy(batchNum);
                                 lineList.add(bomLine);
                             }
                         }
@@ -198,6 +206,7 @@
                         jobLog.setCreateTime(DateUtils.getNowDate());
                         jobLog.setBizType("bom");
                         jobLog.setResult("header:"+headerList.size() + " line:"+lineList.size());
+                        jobLog.setCreateBy(batchNum);
                         jobLogMapper.insertApsWorkOrderJobLog(jobLog);
                         pageIndex++;
                     }else{
@@ -211,12 +220,22 @@
                     jobLog.setCreateTime(DateUtils.getNowDate());
                     jobLog.setBizType("bom");
                     jobLog.setResult("error");
+                    jobLog.setCreateBy(batchNum);
                     jobLogMapper.insertApsWorkOrderJobLog(jobLog);
                     break;
                 }
             }
         }catch (Exception e){
             e.printStackTrace();
+            jobLog.setRequestData(requestBody.toJSONString());
+            jobLog.setResponseData(response.getBody());
+            jobLog.setPageNum(Long.valueOf(pageIndex));
+            jobLog.setPageCount(Long.valueOf(pageSize));
+            jobLog.setCreateTime(DateUtils.getNowDate());
+            jobLog.setBizType("bom");
+            jobLog.setResult("error");
+            jobLog.setCreateBy(batchNum);
+            jobLogMapper.insertApsWorkOrderJobLog(jobLog);
             return false;
         }
         return true;

--
Gitblit v1.9.3