调试录像机硬盘

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

@@ -38,7 +38,7 @@
         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.guid = dd.equipment_code
         WHERE
         d.category_id=#{pageDto.categoryId}
         <if test="pageDto.checkSub==true">
@@ -50,15 +50,15 @@
         <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>
 

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

@@ -1,7 +1,6 @@
 package com.xunmei.mediator.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.mediator.domain.MediatorTimeTemplate;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;