添加调度按钮，修改顶部国际化

2025-08-28 09:44:42 +08:00
parent 865be3278e
commit a5bda35055
10 changed files with 228 additions and 17 deletions
--- 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());
+    }
 }
--- 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<PlcRead> customThread;
@@ -34,16 +37,21 @@ public class ScheduleThread {
    public CustomThread<JsPickSsjTread> jsPickSsjThread;
    public CustomThread<SsjMonitorThread> 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<String,Boolean> getScheduleStatus() {
+        HashMap<String,Boolean> map = new HashMap<>();
+        map.put("isRun",isRun);
+        map.put("isRun2",isRun2);
+        return map;
+    }
 }
--- 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);
    }
--- 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);
                }
            }
        }
--- 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

 # 用户配置
--- a/ruoyi-ui/src/api/scheduleTask/task.js
+++ 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'
+  })
+}
+
--- 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',
  }
 }
--- 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:'取消',
  }
 }
--- 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:'取消',
  }
 }
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -7,19 +7,25 @@

    <div class="right-menu">
      <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
-
-        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
+        <el-tooltip :content="$t('top.read')" effect="dark" placement="bottom">
+          <el-button class="right-menu-item hover-effect" :type="plcReadStatus ? 'success' : 'info'" size="mini" @click="togglePlcRead">
+            {{ plcReadStatus ?  $t('top.stopRead')  : $t('top.startRead') }}
+          </el-button>
        </el-tooltip>

-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
+        <el-tooltip :content="$t('top.task')" effect="dark" placement="bottom">
+          <el-button class="right-menu-item hover-effect" :type="plcScheduleStatus ? 'success' : 'info'" size="mini" @click="togglePlcSchedule">
+            {{ plcScheduleStatus ? $t('top.stopTask') : $t('top.startTask') }}
+          </el-button>
+        </el-tooltip>
+
+
+        <search id="header-search" class="right-menu-item" />
+

        <screenfull id="screenfull" class="right-menu-item hover-effect" />

-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+        <el-tooltip :content="$t('top.layOut')" effect="dark" placement="bottom">
          <size-select id="size-select" class="right-menu-item hover-effect" />
        </el-tooltip>

@@ -32,10 +38,10 @@
        </div>
        <el-dropdown-menu slot="dropdown">
          <router-link to="/user/profile">
-            <el-dropdown-item>个人中心</el-dropdown-item>
+            <el-dropdown-item>{{ $t('top.personalCenter') }}</el-dropdown-item>
          </router-link>
          <el-dropdown-item divided @click.native="logout">
-            <span>退出登录</span>
+            <span>{{ $t('top.loginOut') }}</span>
          </el-dropdown-item>
        </el-dropdown-menu>
      </el-dropdown>
@@ -55,6 +61,7 @@ import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
+import { startReadPlc, stopReadPlc, startSchedule, stopSchedule ,getScheduleStatus} from '@/api/scheduleTask/task'
 // import RuoYiGit from '@/components/RuoYi/Git'
 // import RuoYiDoc from '@/components/RuoYi/Doc'

@@ -70,6 +77,12 @@ export default {
    // RuoYiGit,
    // RuoYiDoc
  },
+  data() {
+    return {
+      plcReadStatus: false,
+      plcScheduleStatus: false
+    }
+  },
  computed: {
    ...mapGetters([
      'sidebar',
@@ -88,6 +101,10 @@ export default {
      }
    }
  },
+  created() {
+    //获取调度状态
+    this.setScheduleStatus()
+  },
  methods: {
    toggleSideBar() {
      this.$store.dispatch('app/toggleSideBar')
@@ -95,10 +112,70 @@ export default {
    setLayout(event) {
      this.$emit('setLayout')
    },
+    setScheduleStatus() {
+      getScheduleStatus().then(
+        res => {
+          this.plcReadStatus = res.data.isRun
+          this.plcScheduleStatus = res.data.isRun2
+        }
+      )
+    },
+    async togglePlcRead() {
+      try {
+        console.log(this.plcReadStatus)
+        if (!this.plcReadStatus) {
+          await startReadPlc().then(
+            res => {
+              if (res.code === 200) {
+                this.setScheduleStatus()
+                this.$message.success(this.$t('top.startReadSuccess'))
+              }
+            }
+          )
+        } else {
+          await stopReadPlc().then(
+            res => {
+              if (res.code === 200) {
+                this.setScheduleStatus()
+                this.$message.success(this.$t('top.stopReadSuccess'))
+              }
+            }
+          )
+        }
+      } catch (error) {
+        this.$message.error(this.$t('top.error') + error.message)
+      }
+    },
+    async togglePlcSchedule() {
+      try {
+        console.log(this.plcScheduleStatus)
+        if (!this.plcScheduleStatus) {
+          await startSchedule().then(
+            res => {
+              if (res.code === 200) {
+                this.setScheduleStatus()
+                this.$message.success(this.$t('top.startTaskSuccess'))
+              }
+            }
+          )
+        } else {
+          await stopSchedule().then(
+            res => {
+              if (res.code === 200) {
+                this.setScheduleStatus()
+                this.$message.success(this.$t('top.stopTaskSuccess'))
+              }
+            }
+          )
+        }
+      } catch (error) {
+        this.$message.error(this.$t('top.error')  + error.message)
+      }
+    },
    logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(this.$t('top.logoutTip'), this.$t('top.logoutTitle'), {
+        confirmButtonText: this.$t('top.confirm') ,
+        cancelButtonText: this.$t('top.cancel') ,
        type: 'warning'
      }).then(() => {
        this.$store.dispatch('LogOut').then(() => {