From 4742236a7c80b2ab0f06728e336d013c4ea1ce28 Mon Sep 17 00:00:00 2001 From: yanps Date: Mon, 15 Jan 2024 19:40:03 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardStackerDeviceDriver.java | 63 ++++++----- .../org/nl/acs/task/service/TaskService.java | 7 ++ .../task/service/impl/TaskServiceImpl.java | 14 +++ .../service/quartz/task/CreateDDJInst.java | 6 +- .../acs/history/deviceErrorInfo/index.vue | 1 + acs/nladmin-ui/src/views/acs/task/index.vue | 107 +++++++++++++++++- acs/nladmin-ui/src/views/system/dict/dict.js | 2 +- 7 files changed, 163 insertions(+), 37 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 0f8581b..673ef69 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -66,7 +66,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme @Autowired DeviceErrorLogService errorLogServer = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class); - /** + /** * 心跳 */ Integer heartbeat = 0; @@ -76,17 +76,17 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme */ Integer item_deviceCode = 0; Integer last_item_deviceCode = 0; - /** + /** * 工作模式 */ Integer mode = 0; Integer last_mode = 0; /** - *作业状态 + * 作业状态 */ Integer command = 0; Integer last_command = 0; - /** + /** * 任务号 */ Integer task = 0; @@ -111,7 +111,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme */ Integer y = 0; Integer last_y = 0; - /** + /** * 行走开关信号 */ Float move = 0F; @@ -121,12 +121,12 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme */ Float cargoMove = 0F; Float last_cargoMove = 0F; - /** + /** * 行走动作信号 */ Float action = 0F; Float last_action = 0F; - /** + /** * 行走激光数值 */ Integer distancex = 0; @@ -137,41 +137,41 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme Integer distancey = 0; Integer last_distancey = 0; /** - *载货台超限信号 + * 载货台超限信号 */ Float cargoError = 0F; Float last_cargoError = 0F; /** - *货叉探货信号 + * 货叉探货信号 */ Float forkCargo = 0F; Float last_forkCargo = 0F; /** - *货叉位置信号 + * 货叉位置信号 */ Float forkLocation = 0F; Float last_forkLocation = 0F; /** - *货叉动作信号 + * 货叉动作信号 */ Float forkAction = 0F; Float last_forkAction = 0F; - /** + /** * 特殊开关量1 */ Float special1 = 0F; Float last_special1 = 0F; - /** + /** * 特殊开关量2 */ Float special2 = 0F; Float last_special2 = 0F; /** - *托盘条码 + * 托盘条码 */ int[] trayCode; int[] last_trayCode; - /** + /** * 水箱和消防缓存位有无货 */ Float storage_cache = 0F; @@ -181,58 +181,58 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme */ Integer stacker_rpm = 0; Integer last_stacker_rpm = 0; - /** + /** * 电流 */ Integer stacker_electricCurrent = 0; Integer last_stacker_electricCurrent = 0; - /** + /** * 轴运行次数 */ Integer stacker_runing_time = 0; Integer last_stacker_runing_time = 0; - /** + /** * 轴工作时间（小时） */ Integer stacker_workingHours = 0; Integer last_stacker_workingHours = 0; /** - *载货台速度（转/分钟） + * 载货台速度（转/分钟） */ Integer cargo_rpm = 0; Integer last_cargo_rpm = 0; /** - *载货台电流 + * 载货台电流 */ Integer cargo_electric_Current = 0; Integer last_cargo_electric_Current = 0; /** - *载货台轴工作小时数 + * 载货台轴工作小时数 */ Integer cargo_workingHour = 0; Integer last_cargo_workingHour = 0; /** - *载货台轴运行次数 + * 载货台轴运行次数 */ Integer cargo_runingTimes = 0; Integer last_cargo_runingTimes = 0; /** - *货叉速度（转/分钟 + * 货叉速度（转/分钟 */ Integer fork_rpm = 0; Integer last_fork_rpm = 0; /** - *货叉电流 + * 货叉电流 */ Integer fork_electric_Current = 0; Integer last_fork_electric_Current = 0; /** - *货叉轴工作时间（小时 + * 货叉轴工作时间（小时 */ Integer fork_workingHours = 0; Integer last_fork_workingHours = 0; /** - *货叉轴运行次数 + * 货叉轴运行次数 */ Integer fork_runingTimes = 0; Integer last_fork_runingTimes = 0; @@ -250,7 +250,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme List getDeviceCodeList = null; List putDeviceCodeList = null; - /** + /** * 请求成功标记 */ Boolean requireSucess = false; @@ -459,7 +459,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme //更改指令状态 if (task > 0) { Instruction inst = checkInst(); - if (inst != null) { + if (ObjectUtil.isNotEmpty(inst)) { if (StrUtil.equals(inst.getInstruction_status(), "0")) { inst.setInstruction_status(CommonFinalParam.ONE); inst.setExecute_device_code(this.device_code); @@ -730,7 +730,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } map.put("to_x", inst.getFrom_y()); } - if(ObjectUtil.isNotEmpty(map)){ + if (ObjectUtil.isNotEmpty(map)) { list.add(map); this.writing(list); } @@ -828,7 +828,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme if (command == 8) { map.put("to_command", 8); } - if(ObjectUtil.isNotEmpty(map)){ + if (ObjectUtil.isNotEmpty(map)) { list.add(map); this.writing(list); } @@ -873,6 +873,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } } + /** * 完成指令 * @@ -926,7 +927,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } - /** + /** * 将扩展表中的字符串数据转换成集合 */ @Override diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java index a95bbde..fa78c94 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java @@ -176,6 +176,13 @@ public interface TaskService extends CommonService { */ List queryByStauts(String task_status); + /** + * 根绝状态查询缓存 + * @param task_status + * @return + */ + List findByTaskStatus(String task_status); + /** * 根据编码查询 * diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index af77d4a..6784b08 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -456,7 +456,21 @@ public class TaskServiceImpl extends CommonServiceImpl impleme return ConvertUtil.convertList(taskList, TaskDto.class); } + @Override + public List findByTaskStatus(String status) { + List taskDtoList = new ArrayList<>(); + Iterator iterator = tasks.iterator(); + if (iterator.hasNext()) { + TaskDto task = iterator.next(); + if(StrUtil.equals(task.getTask_status(), status)){ + taskDtoList.add(task); + } + } + return taskDtoList; + } + + public void create(TaskDto dto) throws Exception { dto = foramte(dto); if (!StrUtil.isEmpty(dto.getVehicle_code())) { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java index 6437c1f..2e1bf6b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java @@ -45,8 +45,7 @@ public class CreateDDJInst { InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - DeviceExtraService deviceExtra = SpringContextHolder.getBean(DeviceExtraServiceImpl.class); - List taskDtos = taskserver.queryByStauts("0"); + List taskDtos = taskserver.findByTaskStatus("0"); List taskDtoList = new ArrayList<>(); if (CollUtil.isEmpty(taskDtos) || taskDtos.size() < 1) { } else { @@ -69,7 +68,7 @@ public class CreateDDJInst { if (ObjectUtils.isEmpty(list)) { throw new BadRequestException("路由不通"); } - RouteLineDto routeLineDto = (RouteLineDto) list.get(0); + RouteLineDto routeLineDto = list.get(0); String[] path = routeLineDto.getPath().split("->"); List pathlist = Arrays.asList(path); String deviceType = appService.findDeviceByCode(pathlist.get(1)).getDevice_type(); @@ -137,7 +136,6 @@ public class CreateDDJInst { RouteLineDto routeLineDto1 = shortPathsList.get(0); String path1 = routeLineDto1.getPath(); - String type1 = routeLineDto1.getType(); String[] str = path1.split("->"); List pathlist1 = Arrays.asList(str); diff --git a/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue b/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue index 316bcaf..42a5a7d 100644 --- a/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue @@ -32,6 +32,7 @@ + +
+ 请选择 +
+ @@ -348,6 +353,58 @@ {{ $t('task.select.Confirm') }} + + + + 添加新行 + + + + + + + + + + + + + + + + + +
+ 取消 + + 确认 +
+ + @@ -459,7 +516,7 @@ import i18n from '@/i18n' export default { name: 'Task', components: { pagination, crudOperation }, - dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type'], + dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan'], mixins: [presenter(), header(), crud()], cruds() { return CRUD({ title: i18n.t('task.txt_box.Task'), url: 'api/task', idField: 'task_id', sort: 'task_id,desc', @@ -536,6 +593,7 @@ export default { edit: ['admin', 'task:edit'], del: ['admin', 'task:del'] }, + showAddRowButton: true, form: { task_id: null, vehicle_code: null, @@ -561,6 +619,11 @@ export default { to_z: null, agv_system_type: '1' }, + extension: [{ + name: '', + value: '' + }], + dialogVisible: false, rules: { start_point_code: [ { required: true, message: '起点不能为空', trigger: 'change' } @@ -595,12 +658,48 @@ export default { }) }, methods: { + addNewRow() { + this.extension.push({ + name: '', + value: '' + }) + }, + deleteField(index) { // 添加字段的时候删除一条数据 + if (this.extension.length > 1) { + this.extension.splice(index, 1) + } + }, + cancelForm() { + // 清空表单数据 + this.extension = [{ + name: '', + value: '' }] + this.dialogVisible = false + }, + saveForm() { + // 保存表单数据 + // 你可以在这里处理保存逻辑，并发送请求保存表单数据 + this.extension.reduce((form, item) => { + form[item.name] = item.value + return form + }, this.form) + this.dialogVisible = false + }, saveBtn() { crudTask.add(this.form).then(res => { this.crud.toQuery() this.formDia = false this.isDisabled = true }) + this.extension = [{ + name: '', + value: '' }] + }, + openDialog() { + this.dialogVisible = true + }, + closeDialog() { + this.dialogVisible = false }, // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { @@ -766,4 +865,10 @@ export default { .el-icon-arrow-down { font-size: 12px; } + +.button-container { + display: flex; + justify-content: flex-end; + align-items: flex-end; +} diff --git a/acs/nladmin-ui/src/views/system/dict/dict.js b/acs/nladmin-ui/src/views/system/dict/dict.js index 99170f7..d109d49 100644 --- a/acs/nladmin-ui/src/views/system/dict/dict.js +++ b/acs/nladmin-ui/src/views/system/dict/dict.js @@ -31,4 +31,4 @@ export function edit(data) { }) } -export default { add, edit, del } +export default { getDicts, add, edit, del }