From c372044e2081581bcf7df4969ea33552ad3bd9d8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 12 六月 2024 11:12:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/properties/SystemProperties.java | 3 +
src/main/java/com/zy/common/task/ActivateScheduler.java | 4 +-
src/main/java/com/zy/asrs/utils/Utils.java | 47 ++++++++++-------------
src/main/java/com/zy/common/config/AdminInterceptor.java | 14 +++---
src/main/java/com/zy/common/service/CommonService.java | 2
src/main/java/com/zy/common/CodeBuilder.java | 4 +-
6 files changed, 34 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 2109368..34b1dc7 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -279,30 +279,31 @@
//搴撲綅鎺掑彿鍒嗛厤
public static int[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) {
+ RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
switch (whsType){
case 1://缁忓吀鍙屼几搴撲綅
- return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠�
+ return LocNecessaryParametersDoubleExtension(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 2://缁忓吀鍗曚几搴撲綅锛�2鎺掕揣鏋讹級
- return LocNecessaryParametersDoubleExtension2(whsType, curRow, crnNumber); //宸插畬鍠�
+ return LocNecessaryParametersDoubleExtension2(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 3://缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
- return LocNecessaryParametersDoubleExtension3(whsType, curRow, crnNumber); //鏈畬鍠�
+ return LocNecessaryParametersDoubleExtension3(rowLastno, curRow, crnNumber); //鏈畬鍠�
case 4://缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟)
- return LocNecessaryParametersDoubleExtension4(whsType, curRow, crnNumber); //鏈畬鍠�
+ return LocNecessaryParametersDoubleExtension4(rowLastno, curRow, crnNumber); //鏈畬鍠�
case 5://鍙屽伐浣嶅崟浼稿簱浣�(4鎺掕揣鏋�)
- return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //宸插畬鍠�
+ return LocNecessaryParametersDoubleExtension5(rowLastno, curRow, crnNumber); //宸插畬鍠�
default:
- return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
+ return LocNecessaryParametersMove(rowLastno, curRow, crnNumber);//moveCrnNo
}
}
//缁忓吀鍙屼几搴撲綅
- public static int[] LocNecessaryParametersDoubleExtension(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
+
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
+ if (BooleanWhsTypeSta(rowLastno.getWhsType())) {
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
if (curRow.equals(crnNumber * 4 + sRow - 1)) {
@@ -335,7 +336,7 @@
}
//缁忓吀鍙屼几搴撲綅绉诲簱
- public static int[] LocNecessaryParametersMove(Integer whsType, Integer curRow, Integer moveCrnNo) {
+ public static int[] LocNecessaryParametersMove(RowLastno rowLastno, Integer curRow, Integer moveCrnNo) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
necessaryParameters[0] = 2; // 杞娆℃暟
if (curRow.equals(moveCrnNo*4-2)){
@@ -351,13 +352,11 @@
}
//缁忓吀鍗曚几搴撲綅
- public static int[] LocNecessaryParametersDoubleExtension2(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension2(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
+ if (BooleanWhsTypeSta(rowLastno.getWhsType())) {
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
if (curRow.equals(crnNumber * 2 + sRow - 1)) {
@@ -390,13 +389,11 @@
}
//缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
- public static int[] LocNecessaryParametersDoubleExtension3(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension3(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
+ if (BooleanWhsTypeSta(rowLastno.getWhsType())) {
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
if (curRow.equals(crnNumber * 3 + sRow - 1)) {
@@ -429,13 +426,11 @@
}
//缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟)
- public static int[] LocNecessaryParametersDoubleExtension4(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension4(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
+ if (BooleanWhsTypeSta(rowLastno.getWhsType())) {
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
if (curRow.equals(crnNumber * 3 + sRow - 1)) {
@@ -468,13 +463,11 @@
}
//鍙屽伐浣嶅崟浼稿簱浣�
- public static int[] LocNecessaryParametersDoubleExtension5(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension5(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
+ if (BooleanWhsTypeSta(rowLastno.getWhsType())) {
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
if (curRow.equals(crnNumber * 4 + sRow - 1)) {
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 99dada9..47f63a4 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="192.168.4.15:1433;databasename=gdykasrs";
+ generator.url="192.168.4.15:1433;databasename=source";
generator.username="sa";
generator.password="sa@123";
- generator.table="man_auto_move";
+ generator.table="asr_row_lastno_type";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 1bc1838..547ba96 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -141,13 +141,13 @@
Http.response(response, BaseRes.NO_ACTIVATION);
return false;
}
- // 璁板綍鎿嶄綔鏃ュ織
- OperateLog operateLog = new OperateLog();
- operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
- operateLog.setIp(request.getRemoteAddr());
- operateLog.setUserId(user.getId());
- operateLog.setRequest(JSON.toJSONString(request.getParameterMap()));
- request.setAttribute("operateLog", operateLog);
+// // 璁板綍鎿嶄綔鏃ュ織
+// OperateLog operateLog = new OperateLog();
+// operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
+// operateLog.setIp(request.getRemoteAddr());
+// operateLog.setUserId(user.getId());
+// operateLog.setRequest(JSON.toJSONString(request.getParameterMap()));
+// request.setAttribute("operateLog", operateLog);
}
return true;
} catch (Exception e){
diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index ba6350b..b693d42 100644
--- a/src/main/java/com/zy/common/properties/SystemProperties.java
+++ b/src/main/java/com/zy/common/properties/SystemProperties.java
@@ -15,7 +15,8 @@
public static final String SALT = "123456789qwertyu";
// 绯荤粺婵�娲荤姸鎬� (榛樿鏈縺娲�)
- public static boolean SYSTEM_ACTIVATION = Boolean.FALSE;
+// public static boolean SYSTEM_ACTIVATION = Boolean.FALSE;
+ public static boolean SYSTEM_ACTIVATION = Boolean.TRUE;
public static String getActivationCode(String fileName){
StringBuilder activationCode = new StringBuilder();
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index eb95817..cbc3cbe 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -137,7 +137,7 @@
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
}
- if (Cools.isEmpty(batch)) { //绠卞彿
+ if (Cools.isEmpty(batch)) { //鎵规
batch = "";
}
if (Cools.isEmpty(grade)) { //澶囩敤
diff --git a/src/main/java/com/zy/common/task/ActivateScheduler.java b/src/main/java/com/zy/common/task/ActivateScheduler.java
index 4b96119..22b0ff0 100644
--- a/src/main/java/com/zy/common/task/ActivateScheduler.java
+++ b/src/main/java/com/zy/common/task/ActivateScheduler.java
@@ -18,8 +18,8 @@
public class ActivateScheduler {
// @Scheduled(cron = "0/1 * 8 * * ? ") // 姣忓ぉ8鐐�
- @Scheduled(cron = "* 0/1 * * * ? ") // 姣忓垎閽�
- @PostConstruct
+// @Scheduled(cron = "* 0/1 * * * ? ") // 姣忓垎閽�
+// @PostConstruct
private void execute(){
// 鑾峰彇婵�娲荤爜
String activationCode = SystemProperties.getActivationCode(OSinfo.getOSname().getActivationCodePath());
--
Gitblit v1.9.1