From 15ad2e8add262f3af8792bafb6ffd931db631a36 Mon Sep 17 00:00:00 2001
From: Zhu Zhonghua <zhonghua@qq.com>
Date: 星期四, 22 五月 2025 17:04:18 +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/controller/SysJobController.java |   66 ++++++++++++++++++++++++++++++---
 1 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/controller/SysJobController.java b/aps-modules/aps-job/src/main/java/com/aps/job/controller/SysJobController.java
index 46c1747..7f76358 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/controller/SysJobController.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/controller/SysJobController.java
@@ -1,7 +1,6 @@
 package com.aps.job.controller;
 
 import com.aps.common.core.constant.Constants;
-import com.aps.common.core.constant.SecurityConstants;
 import com.aps.common.core.exception.job.TaskException;
 import com.aps.common.core.utils.StringUtils;
 import com.aps.common.core.utils.poi.ExcelUtil;
@@ -20,6 +19,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -59,7 +59,17 @@
     private IApsMaterialStorageManagementJobService apsMaterialStorageManagementJobService;
 
     @Autowired
+    private IApsStandardProcessRouteHeaderJobService apsStandardProcessRouteHeaderJobService;
+
+    @Autowired
     private RemoteCoreService remoteCoreService;
+
+    @Autowired
+    public RedisTemplate redisTemplate;
+
+    @Autowired
+    private IApsMaterialManagementJobService apsMaterialManagementJobService;
+
     /**
      * 鏌ヨ瀹氭椂浠诲姟鍒楄〃
      */
@@ -205,21 +215,65 @@
     }
 
     @PostMapping("/refreshBomData")
-    public Boolean refreshBomData() throws SchedulerException, TaskException
+    public AjaxResult refreshBomData() throws SchedulerException, TaskException
     {
-        return apsBomHeaderJobService.syncBomDataJob(1, 1000, "", "");
+        try {
+            boolean res = apsBomHeaderJobService.syncBomDataJob(1, 1000, "", "");
+            if(res){
+                return success();
+            }else {
+                return error();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return error();
+        }
+    }
+
+    @PostMapping("/refreshProcessRouteData")
+    public AjaxResult refreshProcessRouteData() throws SchedulerException, TaskException
+    {
+        try {
+            boolean res = apsStandardProcessRouteHeaderJobService.syncProcessRouteDataJob(1, 1000, "", "");
+            if(res){
+                return success();
+            }else {
+                return error();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return error();
+        }
     }
 
     @PutMapping("/test")
     public void test(@RequestBody SysJob job) throws Exception
     {
         System.out.println("start");
+        //鍚屾宸ュ崟鏁版嵁
+//        boolean continueFlag = true;
+//        Integer currentPage = 1;
+//        ApsWorkOrderJobParam param=new ApsWorkOrderJobParam();
+//        param.setPageIndex(currentPage);
+//        param.setDocState(Arrays.asList(0,1,2,4));
+//        param.setPageSize(500);
+//        while (continueFlag){
+//            param.setPageIndex(currentPage);
+//            continueFlag= apsWorkOrderJobService.batchSaveByPager(param);
+//            currentPage++;
+//        }
+        //鍚屾鐗╂枡鏁版嵁
+//        apsMaterialManagementJobService.syncApsMaterialData(1, 1000, "", "");
+        //鍚屾宸ヨ壓璺嚎鏁版嵁
+//        apsStandardProcessRouteHeaderJobService.syncProcessRouteData(1, 1000, "", "");
+        //鑾峰彇Redis缂撳瓨涓殑BOM鏁版嵁
+//        JSONArray jsonArray = (JSONArray)redisTemplate.opsForValue().get("BOM:BOM_FORTUNA_A6501-001080");
         //灏咮OM鏁版嵁瀛樿繘Redis涓�
-        remoteCoreService.setBomDataToRedis(SecurityConstants.INNER);
+//        remoteCoreService.setBomDataToRedis(SecurityConstants.INNER);
         //鍚屾鐗╂枡搴撳瓨鏁版嵁
-//        apsMaterialStorageManagementJobService.syncApsMaterialStorageData(1, 1000, "", "");
+        apsMaterialStorageManagementJobService.syncApsMaterialStorageData(1, 1000, "", "");
         //鍚屾BOM鏁版嵁
-//        apsBomHeaderJobService.syncBomData(1, 1000,  "FORTUNA", "");
+//        apsBomHeaderJobService.syncBomData(1, 1000,  "", "");
 
 //        System.out.println(sequence.nextId());
 //        List<String> docNos = new ArrayList<>();

--
Gitblit v1.9.3