diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml index bac9599..384707e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -44,7 +44,9 @@ c.start_time as startTime, c.end_time as endTime, d.route_name as routeName, - b.alarm_threshold as alarmThreshold + b.alarm_threshold as alarmThreshold, + c.task_type as taskType, + c.discern_type as discernType from alarm_record a inner join robot_info b on a.robot_id = b.id inner join task_info c on a.task_id = c.id diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml index bac9599..384707e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -44,7 +44,9 @@ c.start_time as startTime, c.end_time as endTime, d.route_name as routeName, - b.alarm_threshold as alarmThreshold + b.alarm_threshold as alarmThreshold, + c.task_type as taskType, + c.discern_type as discernType from alarm_record a inner join robot_info b on a.robot_id = b.id inner join task_info c on a.task_id = c.id diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index f5aa959..ebd4f4c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -111,6 +111,26 @@ @TableField(exist = false) private BigDecimal alarmThreshold; + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(taskType 1巡检任务)", dataType = "Integer") + @TableField(exist = false) + private Integer taskType; + @ApiModelProperty(value = "任务类型字典名称", dataType = "String") + @TableField(exist = false) + private String taskTypeName; + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(discernType 1中子源识别)", dataType = "Integer") + @TableField(exist = false) + private Integer discernType; + + @ApiModelProperty(value = "识别类型字典名称", dataType = "String") + @TableField(exist = false) + private String discernTypeName; + @Override public String toString() { return "AlarmRecord{" diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml index bac9599..384707e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -44,7 +44,9 @@ c.start_time as startTime, c.end_time as endTime, d.route_name as routeName, - b.alarm_threshold as alarmThreshold + b.alarm_threshold as alarmThreshold, + c.task_type as taskType, + c.discern_type as discernType from alarm_record a inner join robot_info b on a.robot_id = b.id inner join task_info c on a.task_id = c.id diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index f5aa959..ebd4f4c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -111,6 +111,26 @@ @TableField(exist = false) private BigDecimal alarmThreshold; + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(taskType 1巡检任务)", dataType = "Integer") + @TableField(exist = false) + private Integer taskType; + @ApiModelProperty(value = "任务类型字典名称", dataType = "String") + @TableField(exist = false) + private String taskTypeName; + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(discernType 1中子源识别)", dataType = "Integer") + @TableField(exist = false) + private Integer discernType; + + @ApiModelProperty(value = "识别类型字典名称", dataType = "String") + @TableField(exist = false) + private String discernTypeName; + @Override public String toString() { return "AlarmRecord{" diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java index 191dd22..ca6e51b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java @@ -1,11 +1,14 @@ package com.casic.missiles.modular.robot.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.core.base.json.DateDeserializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -17,7 +20,7 @@ */ @Data @TableName("robot_status_info") -public class RobotStatusInfo extends Model { +public class RobotStatusInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; /** @@ -30,6 +33,7 @@ /** * 创建时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; @@ -37,6 +41,7 @@ /** * 修改时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") private Date updateTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml index bac9599..384707e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -44,7 +44,9 @@ c.start_time as startTime, c.end_time as endTime, d.route_name as routeName, - b.alarm_threshold as alarmThreshold + b.alarm_threshold as alarmThreshold, + c.task_type as taskType, + c.discern_type as discernType from alarm_record a inner join robot_info b on a.robot_id = b.id inner join task_info c on a.task_id = c.id diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index f5aa959..ebd4f4c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -111,6 +111,26 @@ @TableField(exist = false) private BigDecimal alarmThreshold; + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(taskType 1巡检任务)", dataType = "Integer") + @TableField(exist = false) + private Integer taskType; + @ApiModelProperty(value = "任务类型字典名称", dataType = "String") + @TableField(exist = false) + private String taskTypeName; + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(discernType 1中子源识别)", dataType = "Integer") + @TableField(exist = false) + private Integer discernType; + + @ApiModelProperty(value = "识别类型字典名称", dataType = "String") + @TableField(exist = false) + private String discernTypeName; + @Override public String toString() { return "AlarmRecord{" diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java index 191dd22..ca6e51b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java @@ -1,11 +1,14 @@ package com.casic.missiles.modular.robot.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.core.base.json.DateDeserializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -17,7 +20,7 @@ */ @Data @TableName("robot_status_info") -public class RobotStatusInfo extends Model { +public class RobotStatusInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; /** @@ -30,6 +33,7 @@ /** * 创建时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; @@ -37,6 +41,7 @@ /** * 修改时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") private Date updateTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java index 26b17ab..e1f1fa1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java @@ -4,14 +4,10 @@ * 指令推送消息定义 */ public enum InstructStatusMsgEnums { - /** - * 建图进度推送消息 - */ PROCESS_MESSAGE("process_message", "建图进度推送消息"), - /** - * - */ - POSE_MESSAGE("pose_message", "实时定位推送消息"); + POSE_MESSAGE("pose_message", "实时定位推送消息"), + ALARM_RECORD("alarm_record", "告警推送消息"), + ROBOT_STATUS("robot_status", "机器人状态消息"); /** * 请求地址 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml index bac9599..384707e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -44,7 +44,9 @@ c.start_time as startTime, c.end_time as endTime, d.route_name as routeName, - b.alarm_threshold as alarmThreshold + b.alarm_threshold as alarmThreshold, + c.task_type as taskType, + c.discern_type as discernType from alarm_record a inner join robot_info b on a.robot_id = b.id inner join task_info c on a.task_id = c.id diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index f5aa959..ebd4f4c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -111,6 +111,26 @@ @TableField(exist = false) private BigDecimal alarmThreshold; + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(taskType 1巡检任务)", dataType = "Integer") + @TableField(exist = false) + private Integer taskType; + @ApiModelProperty(value = "任务类型字典名称", dataType = "String") + @TableField(exist = false) + private String taskTypeName; + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(discernType 1中子源识别)", dataType = "Integer") + @TableField(exist = false) + private Integer discernType; + + @ApiModelProperty(value = "识别类型字典名称", dataType = "String") + @TableField(exist = false) + private String discernTypeName; + @Override public String toString() { return "AlarmRecord{" diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java index 191dd22..ca6e51b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java @@ -1,11 +1,14 @@ package com.casic.missiles.modular.robot.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.core.base.json.DateDeserializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -17,7 +20,7 @@ */ @Data @TableName("robot_status_info") -public class RobotStatusInfo extends Model { +public class RobotStatusInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; /** @@ -30,6 +33,7 @@ /** * 创建时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; @@ -37,6 +41,7 @@ /** * 修改时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") private Date updateTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java index 26b17ab..e1f1fa1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java @@ -4,14 +4,10 @@ * 指令推送消息定义 */ public enum InstructStatusMsgEnums { - /** - * 建图进度推送消息 - */ PROCESS_MESSAGE("process_message", "建图进度推送消息"), - /** - * - */ - POSE_MESSAGE("pose_message", "实时定位推送消息"); + POSE_MESSAGE("pose_message", "实时定位推送消息"), + ALARM_RECORD("alarm_record", "告警推送消息"), + ROBOT_STATUS("robot_status", "机器人状态消息"); /** * 请求地址 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index 96ef561..98b58b6 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -30,19 +30,40 @@ * @param message 消息集合 */ protected void sendWebSocket(InstructStatusMsgEnums enums, String robotId, MqttMessage message) { - try { String json = new String(message.getPayload()); JSONObject jsonObject = JSON.parseObject(json); if (jsonObject.containsKey("msg")) { WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); - wsMsgBaseDTO.setData((JSONObject) jsonObject.get("msg")); - webSocket.sendOneMessage(robotId, JSON.toJSONString(wsMsgBaseDTO)); + wsMsgBaseDTO.setData(jsonObject.get("msg")); + String msg = JSON.toJSONString(wsMsgBaseDTO); + log.info("推送{}消息：{}", enums.getRemarks(), msg); + webSocket.sendOneMessage(robotId, msg); } } catch (Exception e) { log.error(e.getMessage()); } } + + /** + * websocket 消息推送 + * + * @param enums 推送消息枚举 + * @param robotId 机器人连接 + * @param message 消息集合 + */ + protected void sendWebSocket(InstructStatusMsgEnums enums, String robotId, T message) { + try { + WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); + wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); + wsMsgBaseDTO.setData(message); + String msg = JSON.toJSONString(wsMsgBaseDTO); + log.info("推送{}消息：{}", enums.getRemarks(), msg); + webSocket.sendOneMessage(robotId, msg); + } catch (Exception e) { + log.error(e.getMessage()); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml index bac9599..384707e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -44,7 +44,9 @@ c.start_time as startTime, c.end_time as endTime, d.route_name as routeName, - b.alarm_threshold as alarmThreshold + b.alarm_threshold as alarmThreshold, + c.task_type as taskType, + c.discern_type as discernType from alarm_record a inner join robot_info b on a.robot_id = b.id inner join task_info c on a.task_id = c.id diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index f5aa959..ebd4f4c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -111,6 +111,26 @@ @TableField(exist = false) private BigDecimal alarmThreshold; + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(taskType 1巡检任务)", dataType = "Integer") + @TableField(exist = false) + private Integer taskType; + @ApiModelProperty(value = "任务类型字典名称", dataType = "String") + @TableField(exist = false) + private String taskTypeName; + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(discernType 1中子源识别)", dataType = "Integer") + @TableField(exist = false) + private Integer discernType; + + @ApiModelProperty(value = "识别类型字典名称", dataType = "String") + @TableField(exist = false) + private String discernTypeName; + @Override public String toString() { return "AlarmRecord{" diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java index 191dd22..ca6e51b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java @@ -1,11 +1,14 @@ package com.casic.missiles.modular.robot.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.core.base.json.DateDeserializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -17,7 +20,7 @@ */ @Data @TableName("robot_status_info") -public class RobotStatusInfo extends Model { +public class RobotStatusInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; /** @@ -30,6 +33,7 @@ /** * 创建时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; @@ -37,6 +41,7 @@ /** * 修改时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") private Date updateTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java index 26b17ab..e1f1fa1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java @@ -4,14 +4,10 @@ * 指令推送消息定义 */ public enum InstructStatusMsgEnums { - /** - * 建图进度推送消息 - */ PROCESS_MESSAGE("process_message", "建图进度推送消息"), - /** - * - */ - POSE_MESSAGE("pose_message", "实时定位推送消息"); + POSE_MESSAGE("pose_message", "实时定位推送消息"), + ALARM_RECORD("alarm_record", "告警推送消息"), + ROBOT_STATUS("robot_status", "机器人状态消息"); /** * 请求地址 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index 96ef561..98b58b6 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -30,19 +30,40 @@ * @param message 消息集合 */ protected void sendWebSocket(InstructStatusMsgEnums enums, String robotId, MqttMessage message) { - try { String json = new String(message.getPayload()); JSONObject jsonObject = JSON.parseObject(json); if (jsonObject.containsKey("msg")) { WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); - wsMsgBaseDTO.setData((JSONObject) jsonObject.get("msg")); - webSocket.sendOneMessage(robotId, JSON.toJSONString(wsMsgBaseDTO)); + wsMsgBaseDTO.setData(jsonObject.get("msg")); + String msg = JSON.toJSONString(wsMsgBaseDTO); + log.info("推送{}消息：{}", enums.getRemarks(), msg); + webSocket.sendOneMessage(robotId, msg); } } catch (Exception e) { log.error(e.getMessage()); } } + + /** + * websocket 消息推送 + * + * @param enums 推送消息枚举 + * @param robotId 机器人连接 + * @param message 消息集合 + */ + protected void sendWebSocket(InstructStatusMsgEnums enums, String robotId, T message) { + try { + WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); + wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); + wsMsgBaseDTO.setData(message); + String msg = JSON.toJSONString(wsMsgBaseDTO); + log.info("推送{}消息：{}", enums.getRemarks(), msg); + webSocket.sendOneMessage(robotId, msg); + } catch (Exception e) { + log.error(e.getMessage()); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/SensorStatusMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/SensorStatusMsgHandler.java index da02b69..c66fdd8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/SensorStatusMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/SensorStatusMsgHandler.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.robot.opt.handler.msg; -import com.casic.missiles.modular.robot.opt.handler.IBaseMsgHandler; +import com.casic.missiles.modular.robot.model.RobotStatusInfo; +import com.casic.missiles.modular.robot.opt.enums.InstructStatusMsgEnums; +import com.casic.missiles.modular.robot.opt.handler.AbstractSocketHandler; import com.casic.missiles.modular.robot.service.IRobotStatusInfoService; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttMessage; @@ -14,7 +16,7 @@ */ @Slf4j @Component("/sensor_status") -public class SensorStatusMsgHandler implements IBaseMsgHandler { +public class SensorStatusMsgHandler extends AbstractSocketHandler { private final IRobotStatusInfoService statusInfoService; private static Map index = new ConcurrentHashMap<>(); @@ -28,13 +30,15 @@ @Override public void process(String robotId, String topic, MqttMessage message) { - log.info("主键：{},传感器状态topic:{},消息内容:{}", robotId, topic, message.toString()); Integer val = index.get("index") + 1; index.put("index", val); - if (val > 20) { + if (val > 30) { + log.info("主键：{},传感器状态topic:{},消息内容:{}", robotId, topic, message.toString()); index.put("index", 0); - statusInfoService.saveSensorStatus(robotId,message); + statusInfoService.saveSensorStatus(robotId, message); + RobotStatusInfo robotStatusInfo = statusInfoService.getStatusByRobotId(robotId); + sendWebSocket(InstructStatusMsgEnums.ROBOT_STATUS, robotId, robotStatusInfo); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml index bac9599..384707e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -44,7 +44,9 @@ c.start_time as startTime, c.end_time as endTime, d.route_name as routeName, - b.alarm_threshold as alarmThreshold + b.alarm_threshold as alarmThreshold, + c.task_type as taskType, + c.discern_type as discernType from alarm_record a inner join robot_info b on a.robot_id = b.id inner join task_info c on a.task_id = c.id diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index f5aa959..ebd4f4c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -111,6 +111,26 @@ @TableField(exist = false) private BigDecimal alarmThreshold; + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(taskType 1巡检任务)", dataType = "Integer") + @TableField(exist = false) + private Integer taskType; + @ApiModelProperty(value = "任务类型字典名称", dataType = "String") + @TableField(exist = false) + private String taskTypeName; + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(discernType 1中子源识别)", dataType = "Integer") + @TableField(exist = false) + private Integer discernType; + + @ApiModelProperty(value = "识别类型字典名称", dataType = "String") + @TableField(exist = false) + private String discernTypeName; + @Override public String toString() { return "AlarmRecord{" diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java index 191dd22..ca6e51b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java @@ -1,11 +1,14 @@ package com.casic.missiles.modular.robot.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.core.base.json.DateDeserializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -17,7 +20,7 @@ */ @Data @TableName("robot_status_info") -public class RobotStatusInfo extends Model { +public class RobotStatusInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; /** @@ -30,6 +33,7 @@ /** * 创建时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; @@ -37,6 +41,7 @@ /** * 修改时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") private Date updateTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java index 26b17ab..e1f1fa1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java @@ -4,14 +4,10 @@ * 指令推送消息定义 */ public enum InstructStatusMsgEnums { - /** - * 建图进度推送消息 - */ PROCESS_MESSAGE("process_message", "建图进度推送消息"), - /** - * - */ - POSE_MESSAGE("pose_message", "实时定位推送消息"); + POSE_MESSAGE("pose_message", "实时定位推送消息"), + ALARM_RECORD("alarm_record", "告警推送消息"), + ROBOT_STATUS("robot_status", "机器人状态消息"); /** * 请求地址 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index 96ef561..98b58b6 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -30,19 +30,40 @@ * @param message 消息集合 */ protected void sendWebSocket(InstructStatusMsgEnums enums, String robotId, MqttMessage message) { - try { String json = new String(message.getPayload()); JSONObject jsonObject = JSON.parseObject(json); if (jsonObject.containsKey("msg")) { WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); - wsMsgBaseDTO.setData((JSONObject) jsonObject.get("msg")); - webSocket.sendOneMessage(robotId, JSON.toJSONString(wsMsgBaseDTO)); + wsMsgBaseDTO.setData(jsonObject.get("msg")); + String msg = JSON.toJSONString(wsMsgBaseDTO); + log.info("推送{}消息：{}", enums.getRemarks(), msg); + webSocket.sendOneMessage(robotId, msg); } } catch (Exception e) { log.error(e.getMessage()); } } + + /** + * websocket 消息推送 + * + * @param enums 推送消息枚举 + * @param robotId 机器人连接 + * @param message 消息集合 + */ + protected void sendWebSocket(InstructStatusMsgEnums enums, String robotId, T message) { + try { + WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); + wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); + wsMsgBaseDTO.setData(message); + String msg = JSON.toJSONString(wsMsgBaseDTO); + log.info("推送{}消息：{}", enums.getRemarks(), msg); + webSocket.sendOneMessage(robotId, msg); + } catch (Exception e) { + log.error(e.getMessage()); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/SensorStatusMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/SensorStatusMsgHandler.java index da02b69..c66fdd8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/SensorStatusMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/SensorStatusMsgHandler.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.robot.opt.handler.msg; -import com.casic.missiles.modular.robot.opt.handler.IBaseMsgHandler; +import com.casic.missiles.modular.robot.model.RobotStatusInfo; +import com.casic.missiles.modular.robot.opt.enums.InstructStatusMsgEnums; +import com.casic.missiles.modular.robot.opt.handler.AbstractSocketHandler; import com.casic.missiles.modular.robot.service.IRobotStatusInfoService; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttMessage; @@ -14,7 +16,7 @@ */ @Slf4j @Component("/sensor_status") -public class SensorStatusMsgHandler implements IBaseMsgHandler { +public class SensorStatusMsgHandler extends AbstractSocketHandler { private final IRobotStatusInfoService statusInfoService; private static Map index = new ConcurrentHashMap<>(); @@ -28,13 +30,15 @@ @Override public void process(String robotId, String topic, MqttMessage message) { - log.info("主键：{},传感器状态topic:{},消息内容:{}", robotId, topic, message.toString()); Integer val = index.get("index") + 1; index.put("index", val); - if (val > 20) { + if (val > 30) { + log.info("主键：{},传感器状态topic:{},消息内容:{}", robotId, topic, message.toString()); index.put("index", 0); - statusInfoService.saveSensorStatus(robotId,message); + statusInfoService.saveSensorStatus(robotId, message); + RobotStatusInfo robotStatusInfo = statusInfoService.getStatusByRobotId(robotId); + sendWebSocket(InstructStatusMsgEnums.ROBOT_STATUS, robotId, robotStatusInfo); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/base/WsMsgBaseDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/base/WsMsgBaseDTO.java index 608af82..0400968 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/base/WsMsgBaseDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/base/WsMsgBaseDTO.java @@ -1,13 +1,12 @@ package com.casic.missiles.modular.robot.opt.instruct.base; -import com.alibaba.fastjson.JSONObject; import lombok.Data; /** * 消息推送指令传输对象 */ @Data -public class WsMsgBaseDTO { +public class WsMsgBaseDTO { private String msgKey; - private JSONObject data; + private T data; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml index bac9599..384707e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -44,7 +44,9 @@ c.start_time as startTime, c.end_time as endTime, d.route_name as routeName, - b.alarm_threshold as alarmThreshold + b.alarm_threshold as alarmThreshold, + c.task_type as taskType, + c.discern_type as discernType from alarm_record a inner join robot_info b on a.robot_id = b.id inner join task_info c on a.task_id = c.id diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index f5aa959..ebd4f4c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -111,6 +111,26 @@ @TableField(exist = false) private BigDecimal alarmThreshold; + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(taskType 1巡检任务)", dataType = "Integer") + @TableField(exist = false) + private Integer taskType; + @ApiModelProperty(value = "任务类型字典名称", dataType = "String") + @TableField(exist = false) + private String taskTypeName; + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(discernType 1中子源识别)", dataType = "Integer") + @TableField(exist = false) + private Integer discernType; + + @ApiModelProperty(value = "识别类型字典名称", dataType = "String") + @TableField(exist = false) + private String discernTypeName; + @Override public String toString() { return "AlarmRecord{" diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java index 191dd22..ca6e51b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java @@ -1,11 +1,14 @@ package com.casic.missiles.modular.robot.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.core.base.json.DateDeserializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -17,7 +20,7 @@ */ @Data @TableName("robot_status_info") -public class RobotStatusInfo extends Model { +public class RobotStatusInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; /** @@ -30,6 +33,7 @@ /** * 创建时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; @@ -37,6 +41,7 @@ /** * 修改时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") private Date updateTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java index 26b17ab..e1f1fa1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java @@ -4,14 +4,10 @@ * 指令推送消息定义 */ public enum InstructStatusMsgEnums { - /** - * 建图进度推送消息 - */ PROCESS_MESSAGE("process_message", "建图进度推送消息"), - /** - * - */ - POSE_MESSAGE("pose_message", "实时定位推送消息"); + POSE_MESSAGE("pose_message", "实时定位推送消息"), + ALARM_RECORD("alarm_record", "告警推送消息"), + ROBOT_STATUS("robot_status", "机器人状态消息"); /** * 请求地址 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index 96ef561..98b58b6 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -30,19 +30,40 @@ * @param message 消息集合 */ protected void sendWebSocket(InstructStatusMsgEnums enums, String robotId, MqttMessage message) { - try { String json = new String(message.getPayload()); JSONObject jsonObject = JSON.parseObject(json); if (jsonObject.containsKey("msg")) { WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); - wsMsgBaseDTO.setData((JSONObject) jsonObject.get("msg")); - webSocket.sendOneMessage(robotId, JSON.toJSONString(wsMsgBaseDTO)); + wsMsgBaseDTO.setData(jsonObject.get("msg")); + String msg = JSON.toJSONString(wsMsgBaseDTO); + log.info("推送{}消息：{}", enums.getRemarks(), msg); + webSocket.sendOneMessage(robotId, msg); } } catch (Exception e) { log.error(e.getMessage()); } } + + /** + * websocket 消息推送 + * + * @param enums 推送消息枚举 + * @param robotId 机器人连接 + * @param message 消息集合 + */ + protected void sendWebSocket(InstructStatusMsgEnums enums, String robotId, T message) { + try { + WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); + wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); + wsMsgBaseDTO.setData(message); + String msg = JSON.toJSONString(wsMsgBaseDTO); + log.info("推送{}消息：{}", enums.getRemarks(), msg); + webSocket.sendOneMessage(robotId, msg); + } catch (Exception e) { + log.error(e.getMessage()); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/SensorStatusMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/SensorStatusMsgHandler.java index da02b69..c66fdd8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/SensorStatusMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/SensorStatusMsgHandler.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.robot.opt.handler.msg; -import com.casic.missiles.modular.robot.opt.handler.IBaseMsgHandler; +import com.casic.missiles.modular.robot.model.RobotStatusInfo; +import com.casic.missiles.modular.robot.opt.enums.InstructStatusMsgEnums; +import com.casic.missiles.modular.robot.opt.handler.AbstractSocketHandler; import com.casic.missiles.modular.robot.service.IRobotStatusInfoService; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttMessage; @@ -14,7 +16,7 @@ */ @Slf4j @Component("/sensor_status") -public class SensorStatusMsgHandler implements IBaseMsgHandler { +public class SensorStatusMsgHandler extends AbstractSocketHandler { private final IRobotStatusInfoService statusInfoService; private static Map index = new ConcurrentHashMap<>(); @@ -28,13 +30,15 @@ @Override public void process(String robotId, String topic, MqttMessage message) { - log.info("主键：{},传感器状态topic:{},消息内容:{}", robotId, topic, message.toString()); Integer val = index.get("index") + 1; index.put("index", val); - if (val > 20) { + if (val > 30) { + log.info("主键：{},传感器状态topic:{},消息内容:{}", robotId, topic, message.toString()); index.put("index", 0); - statusInfoService.saveSensorStatus(robotId,message); + statusInfoService.saveSensorStatus(robotId, message); + RobotStatusInfo robotStatusInfo = statusInfoService.getStatusByRobotId(robotId); + sendWebSocket(InstructStatusMsgEnums.ROBOT_STATUS, robotId, robotStatusInfo); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/base/WsMsgBaseDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/base/WsMsgBaseDTO.java index 608af82..0400968 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/base/WsMsgBaseDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/base/WsMsgBaseDTO.java @@ -1,13 +1,12 @@ package com.casic.missiles.modular.robot.opt.instruct.base; -import com.alibaba.fastjson.JSONObject; import lombok.Data; /** * 消息推送指令传输对象 */ @Data -public class WsMsgBaseDTO { +public class WsMsgBaseDTO { private String msgKey; - private JSONObject data; + private T data; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java index 0463880..a0ec69d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java @@ -3,12 +3,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.modular.constants.RobotDictConstants; import com.casic.missiles.modular.robot.dao.AlarmRecordMapper; import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.model.RobotInfo; import com.casic.missiles.modular.robot.service.IAlarmRecordService; import com.casic.missiles.modular.robot.service.IRobotInfoService; -import com.casic.missiles.modular.robot.vo.AlarmRecordVO; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -27,9 +28,10 @@ @Service public class AlarmRecordServiceImpl extends ServiceImpl implements IAlarmRecordService { private final IRobotInfoService robotInfoService; - - public AlarmRecordServiceImpl(@Lazy IRobotInfoService robotInfoService) { + private final AbstractDictService dictService; + public AlarmRecordServiceImpl(@Lazy IRobotInfoService robotInfoService, AbstractDictService dictService) { this.robotInfoService = robotInfoService; + this.dictService = dictService; } @Override @@ -48,6 +50,9 @@ if (record.getAlarmThreshold().compareTo(record.getMonitorVal()) <= 0) { record.setMonitorValStatus("有"); } + + record.setDiscernTypeName(dictService.getDictNameByCode(RobotDictConstants.DISCERN_TYPE, record.getDiscernType() + "")); + record.setTaskTypeName(dictService.getDictNameByCode(RobotDictConstants.TASK_TYPE, record.getTaskType() + "")); } @Override @@ -62,5 +67,4 @@ Integer num = this.count(query); return num; } - -} +} \ No newline at end of file