From 99beb9e8323fd572b5f2196d1995c3497913785d Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期三, 14 五月 2025 18:44:45 +0800
Subject: [PATCH] 修改计划管理与查询周期配置查询关系
---
aps-modules/aps-job/src/main/java/com/aps/job/controller/SysJobController.java | 193 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 178 insertions(+), 15 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 f49c745..d508059 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,33 +1,37 @@
package com.aps.job.controller;
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
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;
+import com.aps.common.core.utils.uuid.Sequence;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
-import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.job.domain.SysJob;
-import com.aps.job.service.ISysJobService;
+import com.aps.job.param.ApsWorkOrderJobParam;
+import com.aps.job.service.*;
import com.aps.job.util.CronUtils;
import com.aps.job.util.ScheduleUtils;
+import com.aps.system.api.RemoteCoreService;
+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;
+import java.math.RoundingMode;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
/**
* 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊
@@ -40,6 +44,33 @@
{
@Autowired
private ISysJobService jobService;
+
+ @Autowired
+ private IApsWorkOrderProcessService apsWorkOrderProcessService;
+
+ @Autowired
+ private IApsWorkOrderJobService apsWorkOrderJobService;
+
+ @Autowired
+ private IApsBomHeaderJobService apsBomHeaderJobService;
+
+ @Autowired
+ private Sequence sequence;
+
+ @Autowired
+ private IApsMaterialStorageManagementJobService apsMaterialStorageManagementJobService;
+
+ @Autowired
+ private IApsStandardProcessRouteHeaderJobService apsStandardProcessRouteHeaderJobService;
+
+ @Autowired
+ private RemoteCoreService remoteCoreService;
+
+ @Autowired
+ public RedisTemplate redisTemplate;
+
+ @Autowired
+ private IApsMaterialManagementJobService apsMaterialManagementJobService;
/**
* 鏌ヨ瀹氭椂浠诲姟鍒楄〃
@@ -184,4 +215,136 @@
jobService.deleteJobByIds(jobIds);
return success();
}
+
+ @PostMapping("/refreshBomData")
+ public Boolean refreshBomData() throws SchedulerException, TaskException
+ {
+ return apsBomHeaderJobService.syncBomDataJob(1, 1000, "", "");
+ }
+
+ @PostMapping("/refreshProcessRouteData")
+ public Boolean refreshProcessRouteData() throws SchedulerException, TaskException
+ {
+ return apsStandardProcessRouteHeaderJobService.syncProcessRouteDataJob(1, 1000, "", "");
+ }
+
+ @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, "FORTUNA", "");
+ //鍚屾宸ヨ壓璺嚎鏁版嵁
+// apsStandardProcessRouteHeaderJobService.syncProcessRouteData(1, 1000, "", "");
+ //鑾峰彇Redis缂撳瓨涓殑BOM鏁版嵁
+// JSONArray jsonArray = (JSONArray)redisTemplate.opsForValue().get("BOM:BOM_FORTUNA_A6501-001080");
+ //灏咮OM鏁版嵁瀛樿繘Redis涓�
+// remoteCoreService.setBomDataToRedis(SecurityConstants.INNER);
+ //鍚屾鐗╂枡搴撳瓨鏁版嵁
+// apsMaterialStorageManagementJobService.syncApsMaterialStorageData(1, 1000, "", "");
+ //鍚屾BOM鏁版嵁
+// apsBomHeaderJobService.syncBomData(1, 1000, "FORTUNA", "");
+
+// System.out.println(sequence.nextId());
+// List<String> docNos = new ArrayList<>();
+// docNos.add("MO-240328010093");
+// apsWorkOrderProcessService.getWorkOrderProcessFromU9(docNos);
+// apsWorkOrderProcessService.syncWorkOrderProcessData("", 100);
+// apsWorkOrderJobService.syncPartOrderData();
+// apsWorkOrderJobService.syncPlateOrderData();
+// apsWorkOrderJobService.syncGasPipingData();
+// apsWorkOrderProcessService.syncProcessRouteData();
+ System.out.println("end");
+ //鐢熸垚鏁版嵁瀛楀吀
+// HikariConfig hikariConfig = new HikariConfig();
+// hikariConfig.setDriverClassName("org.postgresql.Driver");
+// hikariConfig.setJdbcUrl("jdbc:postgresql://192.168.50.160:5432/postgres?stringtype=unspecified");
+// hikariConfig.setUsername("postgres");
+// hikariConfig.setPassword("pwd@aps");
+// //璁剧疆鍙互鑾峰彇tables remarks淇℃伅
+// hikariConfig.addDataSourceProperty("useInformationSchema", "true");
+// hikariConfig.setMinimumIdle(2);
+// hikariConfig.setMaximumPoolSize(5);
+// DataSource dataSource = new HikariDataSource(hikariConfig);
+// //鐢熸垚閰嶇疆
+// EngineConfig engineConfig = EngineConfig.builder()
+// //鐢熸垚鏂囦欢璺緞
+// .fileOutputDir("D:\\projects\\aps\\鏂囨。")
+// //鎵撳紑鐩綍
+// .openOutputDir(true)
+// //鏂囦欢绫诲瀷
+// .fileType(EngineFileType.WORD)
+// //鐢熸垚妯℃澘瀹炵幇
+// .produceType(EngineTemplateType.freemarker)
+// //鑷畾涔夋枃浠跺悕绉�
+// .fileName("鑷畾涔夋枃浠跺悕绉�").build();
+//
+// //蹇界暐琛�
+// ArrayList<String> ignoreTableName = new ArrayList<>();
+// ignoreTableName.add("test_user");
+// ignoreTableName.add("test_group");
+// //蹇界暐琛ㄥ墠缂�
+// ArrayList<String> ignorePrefix = new ArrayList<>();
+// ignorePrefix.add("test_");
+// //蹇界暐琛ㄥ悗缂�
+// ArrayList<String> ignoreSuffix = new ArrayList<>();
+// ignoreSuffix.add("_test");
+// ProcessConfig processConfig = ProcessConfig.builder()
+// //鎸囧畾鐢熸垚閫昏緫銆佸綋瀛樺湪鎸囧畾琛ㄣ�佹寚瀹氳〃鍓嶇紑銆佹寚瀹氳〃鍚庣紑鏃讹紝灏嗙敓鎴愭寚瀹氳〃锛屽叾浣欒〃涓嶇敓鎴愩�佸苟璺宠繃蹇界暐琛ㄩ厤缃�
+// //鏍规嵁鍚嶇О鎸囧畾琛ㄧ敓鎴�
+// .designatedTableName(new ArrayList<>())
+// //鏍规嵁琛ㄥ墠缂�鐢熸垚
+// .designatedTablePrefix(new ArrayList<>())
+// //鏍规嵁琛ㄥ悗缂�鐢熸垚
+// .designatedTableSuffix(new ArrayList<>())
+// //蹇界暐琛ㄥ悕
+// .ignoreTableName(ignoreTableName)
+// //蹇界暐琛ㄥ墠缂�
+// .ignoreTablePrefix(ignorePrefix)
+// //蹇界暐琛ㄥ悗缂�
+// .ignoreTableSuffix(ignoreSuffix).build();
+// //閰嶇疆
+// Configuration config = Configuration.builder()
+// //鐗堟湰
+// .version("1.0.0")
+// //鎻忚堪
+// .description("鏁版嵁搴撹璁℃枃妗ｇ敓鎴�")
+// //鏁版嵁婧�
+// .dataSource(dataSource)
+// //鐢熸垚閰嶇疆
+// .engineConfig(engineConfig)
+// //鐢熸垚閰嶇疆
+// .produceConfig(processConfig)
+// .build();
+// //鎵ц鐢熸垚
+// new DocumentationExecute(config).execute();
+// System.out.println("end");
+ }
+
+ public static void main(String[] args) {
+ BigDecimal a = new BigDecimal("0.1234");
+ Double b = a.doubleValue()*60*60*1000;
+ LocalDateTime now = LocalDateTime.now();
+ //灏唍ow鎹㈡垚鎴愭绉� 鐒跺悗鍔犱笂a 鐒跺悗杞崲鎴怢ocalDateTime
+ //a杞崲鎴愭绉�
+ System.out.println(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ System.out.println(b/1000/60);
+ Long milliSecond = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+ milliSecond += b.longValue();
+ System.out.println(LocalDateTime.ofInstant(Instant.ofEpochMilli(milliSecond), ZoneId.systemDefault()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ System.out.println(new BigDecimal(585).divide(BigDecimal.valueOf(1232), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)));
+ new BigDecimal(585).divide(BigDecimal.valueOf(1232), 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ }
}
--
Gitblit v1.9.3