硬盘录像机调试

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

@@ -21,6 +21,7 @@ public interface IotDvrDiskMapper extends BaseMapper<IotDvrDisk> {
     Page<DvrDiskAlarmHistoryPageVo> getRecordAlarmHistoryList(@Param("mePage") Page<DvrDiskAlarmHistoryPageVo> mePage,
                                                               @Param("pageDto") DvrDiskAlarmHistoryPageDto pageDto);
 
-    Page<DvrDiskPageVo>  selectAlarmHostStatus(@Param("mePage") Page<DvrDiskPageVo> mePage,
-                                                 @Param("pageDto") DvrDiskPageDto pageDto);
+    Page<DvrDiskPageVo>  selectHostPage(@Param("mePage") Page<DvrDiskPageVo> mePage,
+                                                 @Param("pageDto") DvrDiskPageDto pageDto,
+                                               @Param("orgPath") String orgPath);
 }

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

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.IotDvrDisk;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.iot.dto.dvrDisk.DvrDiskAlarmHistoryPageDto;
@@ -17,6 +18,7 @@ import com.xunmei.iot.vo.dvrDisk.DvrDiskPageVo;
 import com.xunmei.iot.vo.dvrDisk.DetailVo;
 import com.xunmei.iot.vo.dvrDisk.DvrDiskAlarmHistoryPageVo;
 import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,8 +67,13 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
     @Override
     public TableDataInfo<DvrDiskPageVo>  selectAlarmHostStatus(@Param("pageDto") DvrDiskPageDto pageDto){
 
+        String orgPath="";
+        if(pageDto.getCheckSub()){
+            SysOrg org= orgService.selectOrgById(pageDto.getOrgId(), SecurityConstants.INNER);
+            orgPath=org.getPath();
+        }
         Page<DvrDiskPageVo> page =pageDto.toPage();
-        page=baseMapper.selectAlarmHostStatus(page,pageDto);
+        page=baseMapper.selectHostPage(page,pageDto,orgPath);
 
         return TableDataInfo.success(page);
     }

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

@@ -0,0 +1,4 @@
+package com.xunmei.iot.vo.dvrDisk;
+
+public class Dvr {
+}

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

@@ -31,6 +31,8 @@ public class DvrDiskPageVo {
    private String equipmentCode;
    @ApiModelProperty("录像机的名称")
    private String equipmentName;
+   @ApiModelProperty("IP地址")
+   private String ip;
    @ApiModelProperty("报警状态")
    private AlarmStatus status;
    @ApiModelProperty("报警/恢复时间")

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

@@ -5,7 +5,7 @@
         <result column="id" property="id"/>
         <result column="equipmentCode" property="equipmentCode"/>
         <result column="equipmentName" property="equipmentName"/>
-        <result column="equipmentCode" property="equipmentCode"/>
+        <result column="ip" property="ip"/>
         <result column="orgId" property="orgId"/>
         <result column="orgName" property="orgName"/>
         <result column="status" property="status"/>
@@ -22,23 +22,24 @@
             <result column="orgId" property="orgId"/>
         </collection>
     </resultMap>
-    <select id="selectAlarmHostStatus" resultMap="alarmHostStatusMap">
+    <select id="selectHostPage" resultMap="alarmHostStatusMap">
         SELECT
         d.id,
         d.guid AS equipmentCode,
         d.NAME AS equipmentName,
+        d.net_address as ip,
         d.org_id AS orgId,
         d.org_name AS orgName,
         dd.STATUS AS `status`,
         dd.alarm_time AS alarmTime,
         dd.detail_info as detailInfo
         FROM
-        t_device d
-        LEFT JOIN mediator_video_recorder_hard_disk_detection dd ON d.guid = dd.equipment_code
+        iot_device d
+        LEFT JOIN iot_dvr_harddisk_detection dd ON d.guid = dd.equipment_code
         WHERE
         d.category_id=3713671510851584
         <if test="pageDto.checkSub==true">
-            and d.org_path like concat((select path from t_org where id=#{pageDto.orgId}),"%")
+            and d.org_path like concat(#{orgPath},"%")
         </if>
         <if test="pageDto.checkSub==false">
             and d.org_id = #{pageDto.orgId}
@@ -58,7 +59,7 @@
         and d.deleted=0
     </select>
 
-    <select id="selectDiskInfo" resultType="com.xunmei.iot.domain.DvrDisk">
+    <select id="selectDiskInfo" resultType="com.xunmei.common.core.domain.iot.domain.IotDvrDisk">
         select id,
                available,
                `disk_serial_num` as diskSerialNum,
@@ -66,7 +67,7 @@
                `total`,
                `host_code`       as `hostCode`,
                `org_id`          as `orgId`
-        from mediator_dvrdisk
+        from iot_dvr_disk
         where host_code = #{equipmentCode}
     </select>
     <select id="getRecordAlarmHistoryList"

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

@@ -205,7 +205,7 @@
         </foreach>
     </select>
 
-    <select id="queryVideoDiagnosis" resultType="com.xunmei.common.core.domain.iot.domain.VideoDiagnosisRecord">
+    <select id="queryVideoDiagnosis" resultType="com.xunmei.common.core.domain.video.MediatorVideoDiagnosisRecord">
         select * from mediator_video_diagnosis_record
         <where>
             <if test="channelList != null and channelList.size >0">
@@ -220,7 +220,7 @@
             </foreach>
         </where>
     </select>
-    <select id="getVideoDiagnosisCheckAlarmNum" resultType="com.xunmei.common.core.domain.iot.domain.VideoDiagnosisRecord">
+    <select id="getVideoDiagnosisCheckAlarmNum" resultType="com.xunmei.common.core.domain.video.MediatorVideoDiagnosisRecord">
         select r.*
         from sys_org o
                  inner join mediator_video_diagnosis_record r on o.id = r.org_id and o.deleted = 0
@@ -242,7 +242,7 @@
             and d.asset_status != 8) or d.asset_status IS NULL)
     </select>
 
-    <select id="queryVideoDiagnosisByDate" resultType="com.xunmei.iot.domain.VideoDiagnosisRecord">
+    <select id="queryVideoDiagnosisByDate" resultType="com.xunmei.common.core.domain.video.MediatorVideoDiagnosisRecord">
         select * from mediator_video_diagnosis_log
         <where>
             `org_id` = #{request.orgId}
@@ -254,7 +254,7 @@
             </if>
         </where>
     </select>
-    <select id="findVideoDiagnosisLog" resultType="com.xunmei.iot.domain.VideoDiagnosisLog">
+    <select id="findVideoDiagnosisLog" resultType="com.xunmei.common.core.domain.video.MediatorVideoDiagnosisLog">
         select * from mediator_video_diagnosis_log where date(alarm_time) between #{dates[0]} and #{dates[1]}
         and org_id in
         <foreach collection="orgIds" item="item" open="(" separator="," close=")">