From f306557dbcfc1583a45e26d86fdfe0aa4b446fb4 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期三, 14 五月 2025 18:45:04 +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 | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 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 d508059..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
@@ -12,7 +12,6 @@
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.job.domain.SysJob;
-import com.aps.job.param.ApsWorkOrderJobParam;
import com.aps.job.service.*;
import com.aps.job.util.CronUtils;
import com.aps.job.util.ScheduleUtils;
@@ -30,7 +29,6 @@
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
import java.util.List;
/**
@@ -217,15 +215,35 @@
}
@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 Boolean refreshProcessRouteData() throws SchedulerException, TaskException
+ public AjaxResult refreshProcessRouteData() throws SchedulerException, TaskException
{
- return apsStandardProcessRouteHeaderJobService.syncProcessRouteDataJob(1, 1000, "", "");
+ try {
+ boolean res = apsStandardProcessRouteHeaderJobService.syncProcessRouteDataJob(1, 1000, "", "");
+ if(res){
+ return success();
+ }else {
+ return error();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error();
+ }
}
@PutMapping("/test")
@@ -233,19 +251,19 @@
{
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++;
- }
+// 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, "FORTUNA", "");
+// apsMaterialManagementJobService.syncApsMaterialData(1, 1000, "", "");
//鍚屾宸ヨ壓璺嚎鏁版嵁
// apsStandardProcessRouteHeaderJobService.syncProcessRouteData(1, 1000, "", "");
//鑾峰彇Redis缂撳瓨涓殑BOM鏁版嵁
@@ -253,9 +271,9 @@
//灏咮OM鏁版嵁瀛樿繘Redis涓�
// 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