录像机硬盘调整

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/controller/DvrDiskController.java

@@ -58,9 +58,8 @@ class DvrDiskController {
         TableDataInfo<DvrDiskAlarmHistoryPageVo> page = dvrDiskService.getRecordAlarmHistoryList(request);
         return page;
     }
-
     @ApiOperation("分页")
-    @PostMapping({"/find"})
+    @PostMapping({"/app/find"})
     TableDataInfo<DvrDiskDetectionPageVo> page(@RequestBody final DvrDiskAppPageDto request) {
         TableDataInfo<DvrDiskDetectionPageVo> page = this.videoRecorderHardDiskDetectionService.page(request);
         return page;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/dvrDisk/DvrDiskPageVo.java

@@ -49,7 +49,7 @@ public class DvrDiskPageVo {
    private String ip;
 
    @ApiModelProperty("网络状态")
-   private NetStatus netState;
+   private Integer netState;
 
 //   @ApiModelProperty("报警状态")
 //   private AlarmStatus status;

soc-modules/soc-modules-iot/src/main/resources/mapper/DvrDiskMapper.xml

@@ -8,8 +8,9 @@
         <result column="ip" property="ip"/>
         <result column="orgId" property="orgId"/>
         <result column="orgName" property="orgName"/>
-        <result column="status" property="status"/>
-        <result column="alarmTime" property="alarmTime"/>
+        <result column="netState" property="netState"/>
+<!--        <result column="status" property="status"/>-->
+<!--        <result column="alarmTime" property="alarmTime"/>-->
         <result column="detailInfo" property="detailInfo"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <collection property="diskInfos" column="equipmentCode=equipmentCode"
@@ -32,8 +33,8 @@
         d.org_name AS orgName,
         d.producer as brand,
         dd.state as netState,
-        dhd.state AS `status`,
-        dhd.alarm_time AS alarmTime,
+<!--        dhd.check_status AS `status`,-->
+<!--        dhd.check_time AS alarmTime,-->
         dhd.detail_info as detailInfo
         FROM
         iot_device d