From 364b9ccc44bc6863280c5cc00aa8512cfff548d4 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 25 四月 2025 15:27:18 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/controller/CommandInfoController.java | 68 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CommandInfoController.java b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
index b949f51..88d5d98 100644
--- a/src/main/java/com/zy/asrs/controller/CommandInfoController.java
+++ b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
@@ -1,20 +1,20 @@
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;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.CommandInfo;
-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.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.CommandInfo;
+import com.zy.asrs.service.CommandInfoService;
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;
@@ -39,36 +39,40 @@
@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){
+ 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));}
+ 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,
- @RequestParam Map<String, Object> param){
+ public R listLog(@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));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(commandInfoService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -85,10 +89,10 @@
return R.ok();
}
- @RequestMapping(value = "/commandInfo/update/auth")
- @ManagerAuth
- public R update(CommandInfo commandInfo){
- if (Cools.isEmpty(commandInfo) || null==commandInfo.getId()){
+ @RequestMapping(value = "/commandInfo/update/auth")
+ @ManagerAuth
+ public R update(CommandInfo commandInfo) {
+ if (Cools.isEmpty(commandInfo) || null == commandInfo.getId()) {
return R.error();
}
commandInfoService.updateById(commandInfo);
@@ -97,8 +101,8 @@
@RequestMapping(value = "/commandInfo/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
commandInfoService.deleteById(id);
}
return R.ok();
@@ -106,7 +110,7 @@
@RequestMapping(value = "/commandInfo/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<CommandInfo> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("commandInfo"));
@@ -122,7 +126,7 @@
wrapper.like("id", condition);
Page<CommandInfo> page = commandInfoService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (CommandInfo commandInfo : page.getRecords()){
+ for (CommandInfo commandInfo : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", commandInfo.getId());
map.put("value", commandInfo.getId());
@@ -135,7 +139,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<CommandInfo> wrapper = new EntityWrapper<CommandInfo>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != commandInfoService.selectOne(wrapper)){
+ if (null != commandInfoService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(CommandInfo.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -149,7 +153,7 @@
return R.error("鎸囦护涓嶅瓨鍦�");
}
- commandInfo.setCommandStatus(2);//鎵ц鐘舵��
+ commandInfo.setCommandStatus(CommandStatusType.EXECUTE.id);//鎵ц鐘舵��
commandInfo.setExecuteTime(new Date());
if (commandInfoService.updateById(commandInfo)) {
//灏嗘寚浠よ繘琛屾姇閫�
@@ -162,11 +166,11 @@
switch (type) {
case Crn:
CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
- MessageQueue.offer(type, crnCommand.getCrnNo(), new Task(2, crnCommand));
+ 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(2, staProtocol));
+ MessageQueue.offer(type, staProtocol.getSiteId(), new Task(3, staProtocol));
break;
}
}
@@ -181,7 +185,7 @@
return R.error("鎸囦护涓嶅瓨鍦�");
}
- commandInfo.setCommandStatus(3);//瀹屾垚鐘舵��
+ commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//瀹屾垚鐘舵��
commandInfo.setCompleteTime(new Date());
commandInfoService.updateById(commandInfo);
return R.ok();
--
Gitblit v1.9.1