diff --git a/ruoyi-admin/src/main/java/com/ruoyi/device/operation/controller/ThreadOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/device/operation/controller/ThreadOperationController.java index 0c7da3f..781cc4d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/device/operation/controller/ThreadOperationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/device/operation/controller/ThreadOperationController.java @@ -63,4 +63,13 @@ public class ThreadOperationController { scheduleThread.stopAllThread2(); return AjaxResult.success(); } + + /** + * 获取调度状态 + * @return + */ + @RequestMapping("/getScheduleStatus") + public AjaxResult getScheduleStatus() { + return AjaxResult.success(scheduleThread.getScheduleStatus()); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java index 1599c80..cc93569 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java @@ -12,14 +12,17 @@ import com.ruoyi.schedule.scheduleTask.ssj.js.JsInSsjThread; import com.ruoyi.schedule.scheduleTask.ssj.js.JsOutSsjThread; import com.ruoyi.schedule.scheduleTask.ssj.js.JsPickSsjTread; import com.ruoyi.schedule.scheduleTask.ssj.monitor.SsjMonitorThread; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; +import java.util.HashMap; import java.util.List; import java.util.concurrent.ConcurrentHashMap; @Component +@Slf4j public class ScheduleThread { public CustomThread customThread; @@ -34,16 +37,21 @@ public class ScheduleThread { public CustomThread jsPickSsjThread; public CustomThread ssjMonitorThread; + + private boolean isRun = false; + private boolean isRun2 = false; + /** * 项目初始化启动 */ @PostConstruct public void init() { + log.info("初始化调度服务"); //读取信息初始化 plcReadInit(); - //调度初始化 scheduleInit(); + log.info("调度服务执行成功"); } /** @@ -92,6 +100,7 @@ public class ScheduleThread { */ public void startAllThread() { customThread.getThread().start(); + isRun = true; } /** @@ -113,6 +122,8 @@ public class ScheduleThread { //jsPickSsjThread.getThread().start(); //监控输送机 //ssjMonitorThread.getThread().start(); + + isRun2 = true; } /** @@ -121,6 +132,7 @@ public class ScheduleThread { public void stopAllThread() { customThread.runnable.isRun = false; plcReadInit(); + isRun = false; } /** @@ -134,7 +146,16 @@ public class ScheduleThread { bsPickSsjThread.runnable.isRun = false; jsPickSsjThread.runnable.isRun = false; scheduleInit(); + isRun2 = false; } - + /** + * 获取调度状态 + */ + public HashMap getScheduleStatus() { + HashMap map = new HashMap<>(); + map.put("isRun",isRun); + map.put("isRun2",isRun2); + return map; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcRead.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcRead.java index c5c22c1..c82e531 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcRead.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcRead.java @@ -194,7 +194,7 @@ public class PlcRead implements Runnable { void closeServer() { if (readWriteNet != null) { - siemensS7Net.ConnectClose(); + readWriteNet.ConnectClose(); } setIsConnect(false); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsOutSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsOutSsjThread.java index feeac34..01643f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsOutSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsOutSsjThread.java @@ -108,6 +108,8 @@ public class BsOutSsjThread implements Runnable { if (CollUtil.isNotEmpty(agvQueueList)){ for (AgvQueue queue : agvQueueList) { apiService.requestAgvQueue(queue); + agvQueue.setStatus("1"); + agvQueueService.updateAgvQueue(queue); } } } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 1d39035..cc6e3c0 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -34,7 +34,7 @@ server: # 日志配置 logging: level: - com.ruoyi: error + com.ruoyi: debug org.springframework: warn # 用户配置 diff --git a/ruoyi-ui/src/api/scheduleTask/task.js b/ruoyi-ui/src/api/scheduleTask/task.js new file mode 100644 index 0000000..45c48f2 --- /dev/null +++ b/ruoyi-ui/src/api/scheduleTask/task.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +// 开启plc读取线程 +export function startReadPlc() { + return request({ + url: '/device/operation/startAllThread', + method: 'get', + }) +} + +// 停止plc读取线程 +export function stopReadPlc() { + return request({ + url: '/device/operation/stopAllThread', + method: 'get' + }) +} + +// 开启plc调度线程 +export function startSchedule() { + return request({ + url: '/device/operation/startAllThread2', + method: 'get' + }) +} + +// 关闭plc调度线程 +export function stopSchedule() { + return request({ + url: '/device/operation/stopAllThread2', + method: 'get' + }) +} + +// 关闭plc调度线程 +export function getScheduleStatus() { + return request({ + url: '/device/operation/getScheduleStatus', + method: 'get' + }) +} + diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index b466955..d724890 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -1627,5 +1627,25 @@ export default { a3:'Inbound Conveyor', // 入库输送机 a4:'Other Conveyor' // 其它输送机 } + }, + top:{ + read:'read', + startRead:'startRead', + stopRead:'stopRead', + task:'task', + stopTask:'stopTask', + startTask:'startTask', + layOut:'layOut', + personalCenter:'personalCenter', + loginOut:'loginOut', + startReadSuccess:'startReadSuccess', + stopReadSuccess:'stopReadSuccess', + startTaskSuccess:'startTaskSuccess', + stopTaskSuccess:'stopTaskSuccess', + error:'error', + logoutTip:'logoutTip?', + logoutTitle:'logoutTitle', + confirm:'confirm', + cancel:'cancel', } } diff --git a/ruoyi-ui/src/lang/hu.js b/ruoyi-ui/src/lang/hu.js index 35c691f..d4118fc 100644 --- a/ruoyi-ui/src/lang/hu.js +++ b/ruoyi-ui/src/lang/hu.js @@ -1628,5 +1628,25 @@ export default { a3:'Beraktározási szállítószalag', // 入库输送机 a4:'Egyéb szállítószalag' // 其它输送机 } + }, + top:{ + read:'PLC读取', + startRead:'读取PLC', + stopRead:'停止读取', + task:'调度任务', + stopTask:'停止调度', + startTask:'开始调度', + layOut:'布局大小', + personalCenter:'个人中心', + loginOut:'退出登录', + startReadSuccess:'开始读取PLC成功', + stopReadSuccess:'停止读取PLC成功', + startTaskSuccess:'开始调度成功', + stopTaskSuccess:'停止调度成功', + error:'操作错误', + logoutTip:'确定退出登录吗?', + logoutTitle:'提示', + confirm:'确定', + cancel:'取消', } } diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 0ec0d0b..73c6238 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -1628,5 +1628,25 @@ export default { a3:'入库输送机', a4:'其它输送机' } + }, + top:{ + read:'PLC读取', + startRead:'读取PLC', + stopRead:'停止读取', + task:'调度任务', + stopTask:'停止调度', + startTask:'开始调度', + layOut:'布局大小', + personalCenter:'个人中心', + loginOut:'退出登录', + startReadSuccess:'开始读取PLC成功', + stopReadSuccess:'停止读取PLC成功', + startTaskSuccess:'开始调度成功', + stopTaskSuccess:'停止调度成功', + error:'操作错误', + logoutTip:'确定退出登录吗?', + logoutTitle:'提示', + confirm:'确定', + cancel:'取消', } } diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index 01b961b..5646eac 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -7,19 +7,25 @@