diff --git a/ruoyi-admin/src/main/java/com/ruoyi/device/ddj/controller/MsgDdjController.java b/ruoyi-admin/src/main/java/com/ruoyi/device/ddj/controller/MsgDdjController.java index 25812e3..ae4f17e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/device/ddj/controller/MsgDdjController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/device/ddj/controller/MsgDdjController.java @@ -107,7 +107,7 @@ public class MsgDdjController extends BaseController @GetMapping("/getStackerStatus/{id}") public StackerStatus getStackerStatus(@PathVariable Long id){ - //返回堆垛机状态映射 + //返回堆垛机部分参数的状态映射 if (id == 1) { MsgDdj msg = msgDdjService.selectMsgDdjById(id); StackerStatus status = new StackerStatus(); @@ -122,6 +122,7 @@ public class MsgDdjController extends BaseController status.setCurrentRow(msg.getCurrentRow()); status.setCurrentColumn(msg.getCurrentColumn()); status.setCurrentFloor(msg.getCurrentFloor()); +// status.setCurrentRoad(msg.getId()); status.setCurrentPosition(msg.getCurrentRow() + "排" + msg.getCurrentColumn() + "列" + msg.getCurrentFloor() + "层"); return status; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/device/ddj/domain/StackerStatus.java b/ruoyi-admin/src/main/java/com/ruoyi/device/ddj/domain/StackerStatus.java index f600cde..328f18e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/device/ddj/domain/StackerStatus.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/device/ddj/domain/StackerStatus.java @@ -73,15 +73,11 @@ public class StackerStatus { @JsonProperty("当前位置") private String currentPosition; - /** 心跳信号 */ - @Excel(name = "心跳信号") - private Integer xtxh; - /** 当前巷道 */ - @Excel(name = "当前巷道") - @JsonProperty("当前巷道") - @JsonIgnore - private Integer currentRoad; +// @Excel(name = "当前巷道") +// @JsonProperty("当前巷道") +// @JsonIgnore +// private Integer currentRoad; /** 货叉状态 */ @Excel(name = "货叉状态") diff --git a/ruoyi-admin/src/main/resources/mapper/device/DeviceSsjMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/DeviceSsjMapper.xml index 216cb33..dca006e 100644 --- a/ruoyi-admin/src/main/resources/mapper/device/DeviceSsjMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/device/DeviceSsjMapper.xml @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"