From 52709bc7b5fc230184f82bf7ee00ccc2a8b8fff7 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 10 一月 2024 17:27:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 9 ++++++++-
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 24 ++++++++++++------------
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 3 +++
src/main/resources/application.yml | 2 +-
4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 79283e4..b840b52 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.handler.BareBoardHandler;
import com.zy.asrs.task.handler.WorkMastHandler;
@@ -26,12 +28,17 @@
private BareBoardHandler bareBoardHandler;
@Autowired
private ConfigService configService;
+ @Autowired
+ private BasDevpService basDevpService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){//鑷姩璋冪┖鏉垮嚭搴�
Config config = configService.selectById(10468);
if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
- bareBoardHandler.start();
+ BasDevp basDevp = basDevpService.selectById(213);
+ if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
+ bareBoardHandler.start();
+ }
}
}
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index fcda87d..c66a103 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -46,6 +46,9 @@
BasDevp basDevp = basDevpService.selectById(staNo);
if (basDevp.getWrkNo()!=0){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if(Cools.isEmpty(wrkMast)){
+ continue;
+ }
if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
continue;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
index fa510cc..d13466b 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -37,32 +37,32 @@
case 13://鍑� 3锛氬彇鏀�
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 0:1); //绫诲瀷 0:闈炵┖ 1:绌烘澘
- wrkMastSta1.setWrkType(3); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�
+ wrkMastSta1.setType(fullKM(wrkMast)? 1:2); //绫诲瀷 1:闈炵┖ 2:绌烘澘
+ wrkMastSta1.setWrkType(3); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
wrkMastStaService.insert(wrkMastSta1);
}
break;
case 21://1:鍙栵紙鍙犵洏锛�
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
+ wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
wrkMastSta1.setWrkType(1);
wrkMastStaService.insert(wrkMastSta1);
}
case 22://2锛氭斁
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
- wrkMastSta1.setWrkType(2);
+ wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
+ wrkMastSta1.setWrkType(5);
wrkMastStaService.insert(wrkMastSta1);
}
- case 23://3锛氬彇鏀�
- if (Cools.isEmpty(wrkMastSta)){
- WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
- wrkMastSta1.setWrkType(3);
- wrkMastStaService.insert(wrkMastSta1);
- }
+// case 23://3锛氬彇鏀�
+// if (Cools.isEmpty(wrkMastSta)){
+// WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
+// wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
+// wrkMastSta1.setWrkType(3);
+// wrkMastStaService.insert(wrkMastSta1);
+// }
default:
return FAIL;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d88b5cd..20649bf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=srjtasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1