lsy/FT577-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整设备监控页面

Browse Source
This commit is contained in:
lsymicc
2026-03-31 10:22:24 +08:00
parent 6600520344
commit a438e20bb1
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/device/ddj/controller/MsgDdjController.java
View File

@@ -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;

12
ruoyi-admin/src/main/java/com/ruoyi/device/ddj/domain/StackerStatus.java
View File

@@ -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 = "货叉状态")

2
ruoyi-admin/src/main/resources/mapper/device/DeviceSsjMapper.xml
View File

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDeviceSsjList" parameterType="DeviceSsj" resultMap="DeviceSsjResult">
<include refid="selectDeviceSsjVo"/>
<where>
<if test="deviceCode != null and deviceCode != ''"> and device_code = #{deviceCode}</if>
<if test="deviceCode != null and deviceCode != ''"> and device_code = #{deviceCode}</if>
<if test="name != null and name != ''"> and name = #{name}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="ipAddress != null and ipAddress != ''"> and ip_address = #{ipAddress}</if>