Browse Source

提交在线巡检分页返回代码

hjc 5 months ago
parent
commit
3906bee4d4

+ 2 - 1
unis-plugin/unis-plugin-biz/src/main/java/com/unis/equipmentOnlineRateAssessment/modular/monitorCamera/mapper/mapping/MonitorCameraMapper.xml

@@ -24,7 +24,8 @@
24
         mc.id,
24
         mc.id,
25
         mc.`name`,
25
         mc.`name`,
26
         mc.`status`,
26
         mc.`status`,
27
-        mc.warn_time
27
+        mc.warn_time,
28
+        mc.`type`
28
         FROM
29
         FROM
29
         depot_qh.org_info oi
30
         depot_qh.org_info oi
30
         LEFT JOIN province_all.biz_unit_info bui ON oi.unit_info_id = bui.id
31
         LEFT JOIN province_all.biz_unit_info bui ON oi.unit_info_id = bui.id

+ 6 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/equipmentOnlineRateAssessment/modular/monitorCamera/vo/OnlineInspectionPageVO.java

@@ -43,8 +43,14 @@ public class OnlineInspectionPageVO {
43
     @ApiModelProperty(value = "在线状态(0-未知,1-在线,2-离线)", position = 27)
43
     @ApiModelProperty(value = "在线状态(0-未知,1-在线,2-离线)", position = 27)
44
     private Integer status;
44
     private Integer status;
45
 
45
 
46
+    /** 设备类型 2枪机 1球机 */
47
+    @ApiModelProperty(value = "设备类型 2枪机 1球机", position = 11)
48
+    private String type;
49
+
46
     /** 预警时间 */
50
     /** 预警时间 */
47
     @ApiModelProperty(value = "设备非在线状态(status!=1)的更新时间。", position = 29)
51
     @ApiModelProperty(value = "设备非在线状态(status!=1)的更新时间。", position = 29)
48
     private Date warnTime;
52
     private Date warnTime;
49
 
53
 
54
+
55
+
50
 }
56
 }