From 0cfa6b0e4a0b43552e3a39df929d01e02a5d4d04 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 16 五月 2024 10:47:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/CommandInfoController.java |   81 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 81 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/CommandInfoController.java b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
index 9101e77..60d0a64 100644
--- a/src/main/java/com/zy/asrs/controller/CommandInfoController.java
+++ b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -7,12 +8,21 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.core.common.DateUtils;
 import com.zy.asrs.entity.CommandInfo;
+import com.zy.asrs.entity.TaskWrk;
 import com.zy.asrs.service.CommandInfoService;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
 import com.core.common.R;
+import com.zy.asrs.service.TaskWrkService;
 import com.zy.common.web.BaseController;
+import com.zy.core.cache.MessageQueue;
+import com.zy.core.enums.CommandStatusType;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.Task;
+import com.zy.core.model.command.CommandPackage;
+import com.zy.core.model.command.CrnCommand;
+import com.zy.core.model.protocol.StaProtocol;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,6 +34,9 @@
     @Autowired
     private CommandInfoService commandInfoService;
 
+    @Autowired
+    private TaskWrkService taskWrkService;
+
     @RequestMapping(value = "/commandInfo/{id}/auth")
     @ManagerAuth
     public R get(@PathVariable("id") String id) {
@@ -33,6 +46,20 @@
     @RequestMapping(value = "/commandInfo/list/auth")
     @ManagerAuth
     public R list(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam Map<String, Object> param){
+        EntityWrapper<CommandInfo> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(commandInfoService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+    @RequestMapping(value = "/commandInfo/listLog/auth")
+    @ManagerAuth
+    public R listLog(@RequestParam(defaultValue = "1")Integer curr,
                   @RequestParam(defaultValue = "10")Integer limit,
                   @RequestParam(required = false)String orderByField,
                   @RequestParam(required = false)String orderByType,
@@ -120,4 +147,58 @@
         return R.ok();
     }
 
+    @PostMapping(value = "/commandInfo/executeCommand")
+    @ManagerAuth
+    public R executeCommand(@RequestParam("id") Integer id) {
+        CommandInfo commandInfo = commandInfoService.selectById(id);
+        if (commandInfo == null) {
+            return R.error("鎸囦护涓嶅瓨鍦�");
+        }
+
+        TaskWrk taskWrk = taskWrkService.selectByWrkNo(commandInfo.getWrkNo());
+        if (Cools.isEmpty(taskWrk)){
+            return R.error("浠诲姟涓嶅瓨鍦�");
+        }
+        if (taskWrk.getWrkSts() !=3 && taskWrk.getWrkSts() !=12 ){
+            return R.error("浠诲姟鏈浜庢墽琛岀姸鎬�");
+        }
+
+        commandInfo.setCommandStatus(CommandStatusType.EXECUTE.id);//鎵ц鐘舵��
+        commandInfo.setExecuteTime(new Date());
+        if (commandInfoService.updateById(commandInfo)) {
+            //灏嗘寚浠よ繘琛屾姇閫�
+            CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);
+            SlaveType type = SlaveType.findInstance(commandInfo.getDevice());
+            if (type == null) {
+                return R.error("鏈煡璁惧");
+            }
+
+            switch (type) {
+                case Crn:
+                    CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
+                    MessageQueue.offer(type, crnCommand.getCrnNo(), new Task(5, crnCommand));
+                    break;
+                case Devp:
+                    StaProtocol staProtocol = JSON.parseObject(commandPackage.getCommand().toString(), StaProtocol.class);
+                    MessageQueue.offer(type, staProtocol.getSiteId(), new Task(3, staProtocol));
+                    break;
+            }
+        }
+        return R.ok();
+    }
+
+    @PostMapping(value = "/commandInfo/completeCommand")
+    @ManagerAuth
+    public R completeCommand(@RequestParam("id") Integer id) {
+        CommandInfo commandInfo = commandInfoService.selectById(id);
+        if (commandInfo == null) {
+            return R.error("鎸囦护涓嶅瓨鍦�");
+        }
+
+        commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//瀹屾垚鐘舵��
+        commandInfo.setCompleteTime(new Date());
+        commandInfoService.updateById(commandInfo);
+        return R.ok();
+    }
+
 }

--
Gitblit v1.9.1