物联功能调整

soc-modules/soc-modules-core/src/main/resources/mapper/device/ProtectionMapper.xml

@@ -40,7 +40,7 @@
             and a.name like concat('%',#{request.key},'%')
         </if>
         <if test="request.startTime!=null and request.endTime!=null">
-            and a.status_update_time >= #{request.startTime} and a.status_update_time&lt;=#{request.endTime}
+            and a.status_change_time >= #{request.startTime} and a.status_change_time&lt;=#{request.endTime}
         </if>
         order by a.org_Id asc,a.name,a.id desc
     </select>

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

@@ -159,7 +159,7 @@ public class IotCommonSensorServiceImpl extends ServiceImpl<IotCommonSensorMappe
 
         SensorAppVo vo = new SensorAppVo();
         BeanUtils.copyProperties(sensor, vo);
-        vo.setDeviceTypeText(DictUtils.getDictLabel(DictConstants.SENSOR_DEVICE_TYPE, Integer.parseInt(vo.getDeviceType())));
+        vo.setDeviceTypeText(DictUtils.getDictLabel(DictConstants.APP_SENSOR_DEVICE_TYPE, Integer.parseInt(vo.getDeviceType())));
         vo.setStateText(DictUtils.getDictLabel(DictConstants.SENSOR_ALARM_STATUS, vo.getState()));
 
         return vo;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/videoDiagnosis/VideoDiagnosisAppPageChannelVo.java

@@ -6,5 +6,6 @@ import lombok.Data;
 public class VideoDiagnosisAppPageChannelVo {
     private String channelCode;
 
+    private String channelName;
     private Integer state;
 }

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

@@ -191,6 +191,7 @@
             <if test="pageDto.checkSub==false">
                 and org_id = #{pageDto.orgId}
             </if>
+            group by host_code
             )
         </if>
         <if test="pageDto.state==2">

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

@@ -40,6 +40,7 @@
                     column="equipmentCode=equipment_code,state=state"
                     select="selectAppChannels">
             <result column="channel_code" property="channelCode"></result>
+            <result column="channel_name" property="channelName"></result>
             <result column="state" property="state"></result>
         </collection>
     </resultMap>
@@ -130,6 +131,7 @@
 
     <select id="selectAppChannels" resultType="com.xunmei.iot.vo.videoDiagnosis.VideoDiagnosisAppPageChannelVo">
         select dc.channel_code,
+        dc.channel_name,
         if(vdc.status=0 and vic.status=0 and vdr.is_alarm=0,0,if(vdc.status =1 or vic.status>0 or vdr.is_alarm=1,1,2))
         as state
         FROM iot_dvr_channel dc