lhq/FT541-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

现场调度问题修改

Browse Source
This commit is contained in:
liuhanqing
2026-01-18 08:41:35 +08:00
parent ca65da7690
commit 7bbf25373e
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java
View File

@@ -162,8 +162,14 @@ public class ScheduleThread {
*/ */
public void startAllThread() { public void startAllThread() {
plcSsjReadCustomThread.getThread().start(); plcSsjReadCustomThread.getThread().start();
plcDdj1ReadCustomThread.getThread().start(); if (plcDdj1ReadCustomThread!=null){
plcDdj4ReadCustomThread.getThread().start(); plcDdj1ReadCustomThread.getThread().start();
}
if (plcDdj4ReadCustomThread!=null){
plcDdj4ReadCustomThread.getThread().start();
}
/*plcDdj2ReadCustomThread.getThread().start(); /*plcDdj2ReadCustomThread.getThread().start();
plcDdj3ReadCustomThread.getThread().start(); plcDdj3ReadCustomThread.getThread().start();
plcDdj4ReadCustomThread.getThread().start(); plcDdj4ReadCustomThread.getThread().start();
@@ -177,8 +183,14 @@ public class ScheduleThread {
*/ */
public void startAllThread2() { public void startAllThread2() {
monitoringCustomThread.thread.start(); monitoringCustomThread.thread.start();
ddj1CustomThread.thread.start(); if (ddj1CustomThread!=null){
ddj4CustomThread.thread.start(); ddj1CustomThread.thread.start();
}
if (ddj4CustomThread!=null){
ddj4CustomThread.thread.start();
}
/*ddj2CustomThread.thread.start(); /*ddj2CustomThread.thread.start();
ddj3CustomThread.thread.start(); ddj3CustomThread.thread.start();
ddj4CustomThread.thread.start(); ddj4CustomThread.thread.start();

3
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java
View File

@@ -198,6 +198,7 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
ddjDeviceExecutionQueue.setMlfs(5); ddjDeviceExecutionQueue.setMlfs(5);
ddjDeviceExecutionQueue.setScsj(DateUtil.formatDateTime(DateUtil.date())); ddjDeviceExecutionQueue.setScsj(DateUtil.formatDateTime(DateUtil.date()));
ddjDeviceExecutionQueue.setRwlx(DDJ_RWLX_3); ddjDeviceExecutionQueue.setRwlx(DDJ_RWLX_3);
ddjDeviceExecutionQueue.setSpare2(outSsj);
ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue); ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
outJob.setStatus("3"); outJob.setStatus("3");
outJob.setStartTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); outJob.setStartTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
@@ -355,6 +356,7 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
ddjDeviceExecutionQueue.setMlfs(5); ddjDeviceExecutionQueue.setMlfs(5);
ddjDeviceExecutionQueue.setScsj(DateUtil.formatDateTime(DateUtil.date())); ddjDeviceExecutionQueue.setScsj(DateUtil.formatDateTime(DateUtil.date()));
ddjDeviceExecutionQueue.setRwlx(DDJ_RWLX_4); ddjDeviceExecutionQueue.setRwlx(DDJ_RWLX_4);
ddjDeviceExecutionQueue.setSpare2(road);
ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue); ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
} }
} }
@@ -400,7 +402,6 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
ddjDeviceExecutionQueue.setScsj(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); ddjDeviceExecutionQueue.setScsj(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
ddjDeviceExecutionQueue.setMlfs(3); ddjDeviceExecutionQueue.setMlfs(3);
ddjDeviceExecutionQueue.setSpare1("0"); ddjDeviceExecutionQueue.setSpare1("0");
//ddjDeviceExecutionQueue.setSpare2(Convert.toStr(ddj.getHeight()));
ddjDeviceExecutionQueue.setSpare3(Convert.toStr(weight)); ddjDeviceExecutionQueue.setSpare3(Convert.toStr(weight));
ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue); ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
} }

2
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj1Thread.java
View File

@@ -65,7 +65,7 @@ public class Ddj1Thread extends BaseDdjThread {
roadwayRollback.put("L2007", 82); roadwayRollback.put("L2007", 82);
roadwayRollback.put("L2008", 83); roadwayRollback.put("L2008", 83);
//初始化称重设备连接ip port //初始化称重设备连接ip port
czRoadwayMap.put("L2001", "172.19.50.72:4001"); czRoadwayMap.put("L2001", "172.19.50.71:4001");
czRoadwayMap.put("L2002", "172.19.50.72:4001"); czRoadwayMap.put("L2002", "172.19.50.72:4001");
czRoadwayMap.put("L2007", "172.19.50.73:4001"); czRoadwayMap.put("L2007", "172.19.50.73:4001");
czRoadwayMap.put("L2008", "172.19.50.74:4001"); czRoadwayMap.put("L2008", "172.19.50.74:4001");

2
ruoyi-admin/src/main/resources/application-druid.yml
View File

@@ -6,7 +6,7 @@ spring:
druid: druid:
#主数据信息 #主数据信息
master: master:
url: jdbc:sqlserver://172.19.1.119:1433;databaseName=FT541-wcs; url: jdbc:sqlserver://172.19.1.119:1433;databaseName=FT541-wcs-2;
username: sa username: sa
password: Flrd0914. password: Flrd0914.
# 从库数据源 # 从库数据源