Merge remote-tracking branch 'origin/V0.0.6-iot' into V0.0.6-iot

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDvrDisk.java

@@ -44,8 +44,8 @@ public class IotDvrDisk implements Serializable {
     private String orgPath;
 
     @ApiModelProperty(value = "监控主机唯一标识")
-    @TableField("equipment_code")
-    private String equipmentCode;
+    @TableField("host_code")
+    private String hostCode;
 
     @ApiModelProperty(value = "硬盘名称")
     @TableField("disk_name")

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDvrDiskLog.java

@@ -45,8 +45,8 @@ public class IotDvrDiskLog implements Serializable {
     private String orgPath;
 
     @ApiModelProperty(value = "监控主机唯一标识")
-    @TableField("equipment_code")
-    private String equipmentCode;
+    @TableField("host_code")
+    private String hostCode;
 
     @ApiModelProperty(value = "硬盘名称")
     @TableField("disk_name")

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/video/IotDvrHardDiskDetection.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDvrHardDiskDetection.java

@@ -1,4 +1,4 @@
-package com.xunmei.common.core.domain.video;
+package com.xunmei.common.core.domain.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/video/IotDvrHardDiskDetectionLog.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDvrHardDiskDetectionLog.java

@@ -1,4 +1,4 @@
-package com.xunmei.common.core.domain.video;
+package com.xunmei.common.core.domain.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/VideoRecorderHardDiskDetectionLogMapper.java

@@ -2,7 +2,7 @@ package com.xunmei.iot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.domain.video.IotDvrHardDiskDetectionLog;
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetectionLog;
 import com.xunmei.iot.dto.dvrDisk.DvrDiskAppPageDto;
 import com.xunmei.iot.vo.dvrDisk.DvrDiskDetectionPageVo;
 import org.apache.ibatis.annotations.Mapper;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/VideoRecorderHardDiskDetectionMapper.java

@@ -2,7 +2,7 @@ package com.xunmei.iot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetection;
 import com.xunmei.iot.dto.dvrDisk.DvrDiskAppPageDto;
 import com.xunmei.iot.vo.dvrDisk.DvrDiskDetectionPageVo;
 import org.apache.ibatis.annotations.Mapper;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/VideoRecorderHardDiskDetectionService.java

@@ -1,7 +1,7 @@
 package com.xunmei.iot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetection;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.iot.dto.dvrDisk.DvrDiskAppPageDto;
 import com.xunmei.iot.vo.dvrDisk.DvrDiskDetectionPageVo;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/VideoRecorderHardDiskDetectionServiceImpl.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.domain.IdName;
-import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetection;
 import com.xunmei.common.core.utils.bean.BeanUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.iot.dto.dvrDisk.DvrDiskAppPageDto;

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

@@ -15,30 +15,30 @@
         <collection property="diskInfos" column="equipmentCode=equipmentCode"
                     select="selectDiskInfo">
             <result column="id" property="id"/>
-            <result column="available" property="available"/>
-            <result column="diskSerialNum" property="diskSerialNum"/>
+            <result column="org_id" property="orgId"/>
+            <result column="host_code" property="hostCode"/>
+            <result column="disk_index" property="diskIndex"/>
+            <result column="disk_name" property="diskName"/>
             <result column="total" property="total"/>
-            <result column="hostCode" property="hostCode"/>
-            <result column="orgId" property="orgId"/>
+            <result column="available" property="available"/>
         </collection>
     </resultMap>
     <select id="selectHostPage" resultMap="alarmHostStatusMap">
         SELECT
         d.id,
-        d.guid AS equipmentCode,
-        d.NAME AS equipmentName,
+        d.equipment_code AS equipmentCode,
+        d.equipment_name AS equipmentName,
         d.net_address as ip,
-        d.org_id AS orgId,
         d.org_name AS orgName,
         d.producer as brand,
         dd.state as netState,
-        dhd.STATUS AS `status`,
+        dhd.state AS `status`,
         dhd.alarm_time AS alarmTime,
         dhd.detail_info as detailInfo
         FROM
         iot_device d
         left join  iot_device_detection  dd on d.equipment_code =dd.equipment_code
-        LEFT JOIN iot_dvr_harddisk_detection dhd ON d.guid = dd.equipment_code
+        LEFT JOIN iot_dvr_hard_disk_detection dhd ON d.equipment_code = dd.equipment_code
         WHERE
         d.category_id=#{pageDto.categoryId}
         <if test="pageDto.checkSub==true">
@@ -50,28 +50,28 @@
         <if test="pageDto.equipmentName!=null and pageDto.equipmentName!=''">
             and d.NAME like concat('%', #{pageDto.equipmentName},'%')
         </if>
-        <if test="pageDto.status !=null">
-            and dhd.`status` = #{pageDto.status}
-        </if>
-        <if test="pageDto.alarmStartTime !=null">
-            and dhd.alarm_time >= #{pageDto.alarmStartTime}
-        </if>
-        <if test="pageDto.alarmEndTime !=null">
-            and #{pageDto.alarmEndTime}>= dhd.`alarm_time`
-        </if>
+<!--        <if test="pageDto.status !=null">-->
+<!--            and dhd.`status` = #{pageDto.status}-->
+<!--        </if>-->
+<!--        <if test="pageDto.alarmStartTime !=null">-->
+<!--            and dhd.alarm_time >= #{pageDto.alarmStartTime}-->
+<!--        </if>-->
+<!--        <if test="pageDto.alarmEndTime !=null">-->
+<!--            and #{pageDto.alarmEndTime}>= dhd.`alarm_time`-->
+<!--        </if>-->
         and d.deleted=0
     </select>
 
     <select id="selectDiskInfo" resultType="com.xunmei.common.core.domain.iot.domain.IotDvrDisk">
         select id,
                available,
-               `disk_serial_num` as diskSerialNum,
-               `str_name`        as `strName`,
+               `disk_index`,
+               `disk_name`,
                `total`,
-               `host_code`       as `hostCode`,
-               `org_id`          as `orgId`
+               `host_code`,
+               `org_id`
         from iot_dvr_disk
-        where host_code = #{equipmentCode}
+        where equipment_code = #{equipmentCode}
     </select>
     <select id="getRecordAlarmHistoryList"
             resultType="com.xunmei.iot.vo.dvrDisk.DvrDiskAlarmHistoryPageVo">

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDvrHardDiskDetectionLogMapper.java

@@ -2,7 +2,7 @@ package com.xunmei.mediator.api.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.video.IotDvrHardDiskDetectionLog;
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetectionLog;
 
 /**
  * <p>

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDvrHardDiskDetectionMapper.java

@@ -2,7 +2,7 @@ package com.xunmei.mediator.api.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetection;
 
 /**
  * <p>

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotDvrHardDiskDetectionLogService.java

@@ -2,7 +2,7 @@ package com.xunmei.mediator.api.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.video.IotDvrHardDiskDetectionLog;
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetectionLog;
 
 /**
  * <p>

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotDvrHardDiskDetectionService.java

@@ -2,7 +2,7 @@ package com.xunmei.mediator.api.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetection;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.dto.protection.VideoRecorderHardDiskDetectionEditDto;
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDvrDiskServiceImpl.java

@@ -154,7 +154,7 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
                 IotDvrDisk dvrdisk = IotDvrDisk.builder()
                         .available(NumberUtil.parseInt(dto.getAvailable().substring(0, dto.getAvailable().length() - 2)))
                         .diskIndex(dto.getDiskSerialNum())
-                        .equipmentCode(pageDto.getEquipmentCode())
+                        .hostCode(pageDto.getEquipmentCode())
                         .diskName(dto.getName())
                         .id(IDHelper.id())
                         .total(NumberUtil.parseInt(dto.getTotal().substring(0, dto.getTotal().length() - 2)))

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDvrHardDiskDetectionLogServiceImpl.java

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.api.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.domain.video.IotDvrHardDiskDetectionLog;
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetectionLog;
 import com.xunmei.mediator.api.mapper.IotDvrHardDiskDetectionLogMapper;
 import com.xunmei.mediator.api.service.IotDvrHardDiskDetectionLogService;
 import org.springframework.stereotype.Service;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDvrHardDiskDetectionServiceImpl.java

@@ -8,8 +8,8 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.IotDevice;
 import com.xunmei.common.core.domain.mediator.domain.IotAlarmCode;
 import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;
-import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
-import com.xunmei.common.core.domain.video.IotDvrHardDiskDetectionLog;
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetection;
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetectionLog;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.IDHelper;