完善物联功能

project_data/sql/0.0.6-iot/soc/soc.sql

@@ -120,6 +120,8 @@ ALTER TABLE `iot_alarm_subsystem`
 MODIFY COLUMN `status` int NULL DEFAULT NULL COMMENT '布防状态，0：撤防，1：布防,2:未知（未登记过或离线）' AFTER `name`;
 update iot_alarm_subsystem set `status`=2 WHERE status is null;
 update iot_alarm_subsystem_log set `status`=2 WHERE status is null;
+UPDATE iot_alarm_subsystem set status_change_time =status_update_time WHERE status_change_time is null;
+UPDATE iot_alarm_subsystem_log set status_change_time =status_update_time WHERE status_change_time is null;
 
 
 drop table if exists mediator_video_days_check;
@@ -804,5 +806,5 @@ INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `co
 
 
 
-update sys_menu set component ='iot/subSystem/index',parent_id=1747911340288892930 WHERE menu_name='布撤防情况跟踪' and platform_type=1;
+update sys_menu set component ='iot/subSystem/index' WHERE menu_name='布撤防情况跟踪' and platform_type=1;
 UPDATE sys_menu set path='/iot/subsystem' WHERE path='/protection' and platform_type=0;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/protection/ProtectionLogPageVo.java

@@ -33,9 +33,9 @@ public class ProtectionLogPageVo {
 //    @ApiModelProperty("所属机构")
 //    private String orgName;
 
-    @ApiModelProperty("更新时间")
+    @ApiModelProperty("布撤防")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    private Date updateTime;
+    private Date statusChangeTime;
 
     @ApiModelProperty("防区状态")
     private String status;

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

@@ -5,7 +5,7 @@
         select a.id,
         a.name,
         a.status ,
-        a.status_update_time as updateTime,
+        a.status_change_time as statusChangeTime,
         a.status_updator_name as statusUpdatorName
         from iot_alarm_subsystem_log a
         where a.protection_id=#{request.protectionId}

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/dto/dvrDisk/DvrDiskPageDto.java

@@ -23,71 +23,12 @@ import java.util.Date;
         description = "录像机硬盘检测查询"
 )
 public class DvrDiskPageDto extends PageDto {
-    @ApiModelProperty("录像机的唯一标识")
-//    @Query(
-//            type = QueryConditionType.equal
-//    )
-    private String equipmentCode;
-
     @ApiModelProperty("监控主机的名称")
-//    @Query(
-//            type = QueryConditionType.like
-//    )
     private String hostName;
-//    @ApiModelProperty("报警状态")
-//    @Query(
-//            type = QueryConditionType.equal
-//    )
-//    private AlarmStatus status;
-//    @ApiModelProperty("报警/恢复时间")
-////    @Query(
-////            type = QueryConditionType.equalDate
-////    )
-//    private Date alarmTime;
-
-//    @ApiModelProperty("报警/恢复开始-结束日期")
-//    private Date[] range;
-
-//    /**
-//     * 与alarmTime互斥，alarmTime优先
-//     */
-//    @ApiModelProperty("报警/恢复开始日期")
-////    @Query(
-////            type = QueryConditionType.geDate,column = "alarmTime"
-////    )
-//    @JsonIgnore
-//    private Date alarmStartTime;
-//
-//    /**
-//     * 与alarmTime互斥，alarmTime优先
-//     */
-//    @ApiModelProperty("报警/恢复结束日期")
-////    @Query(
-////            type = QueryConditionType.leDate,column = "alarmTime"
-////    )
-//    @JsonIgnore
-//    private Date alarmEndTime;
-
-
-    @ApiModelProperty("所属机构")
-//    @Query(
-//            type = QueryConditionType.equal
-//    )
-    private Long orgId;
-
-//    @ApiModelProperty("上级银行")
-////    @Query(type = QueryConditionType.org, column = "orgId")
-//    private Long parentId;
-
-    @ApiModelProperty("包含下级")
-    private Boolean checkSub = false;
 
     @JsonIgnore
     private Long categoryId;
 
-//    @ApiModelProperty("id")
-////    @Query(
-////            type = QueryConditionType.equal
-////    )
-//    private String id;
+    @ApiModelProperty("网络状态")
+    private Integer netState;
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/dto/videoDiagnosis/VideoDiagnosisAppPageDto.java

@@ -1,25 +1,15 @@
 package com.xunmei.iot.dto.videoDiagnosis;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xunmei.common.core.web.domain.PageDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class VideoDiagnosisAppPageDto extends PageDto {
-    //    @ApiModelProperty(value = "监控主机")
-//    private String hostName;
-//
-//    @ApiModelProperty(value = "通道")
-//    private String channelName;
-//
-//    @ApiModelProperty(value = "录像完整性状态")
-//    private Integer integrityState;
-//
-//    @ApiModelProperty(value = "录像存储天数状态")
-//    private Integer daysState;
-//
-//    @ApiModelProperty(value = "视频诊断状态")
-//    private Integer diagnosisState;
     @ApiModelProperty(value = "0:正常，1：异常，2：未知")
     private Integer state;
+
+    @JsonIgnore
+    private Long categoryId;
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/dto/videoDiagnosis/VideoDiagnosisWebPageDto.java

@@ -1,5 +1,6 @@
 package com.xunmei.iot.dto.videoDiagnosis;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xunmei.common.core.web.domain.PageDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,4 +21,7 @@ public class VideoDiagnosisWebPageDto extends PageDto {
 
     @ApiModelProperty(value = "视频诊断状态")
     private Integer diagnosisState;
+
+    @JsonIgnore
+    private Long categoryId;
 }

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.IotDvrChannel;
 import com.xunmei.common.core.domain.video.MediatorVideoIntegrityCheck;
+import com.xunmei.common.core.enums.CategoryDataEnum;
 import com.xunmei.common.core.enums.iot.VideoIntegrityStatus;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.iot.dto.videoDiagnosis.VideoDiagnosisAppPageDto;
@@ -46,6 +47,7 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
             SysOrg org = orgService.selectOrgById(request.getOrgId(), SecurityConstants.INNER);
             orgPath = org.getPath();
         }
+        request.setCategoryId(CategoryDataEnum.MONITOR_HOST_DEVICE.getId());
         Page<VideoDiagnosisWebPageVo> page = request.toPage();
         page = baseMapper.selectPage(page, request, orgPath);
 
@@ -62,6 +64,7 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
 
         Page<VideoDiagnosisAppPageVo> page = request.toPage();
 
+        request.setCategoryId(CategoryDataEnum.MONITOR_HOST_DEVICE.getId());
         page = baseMapper.selectAppPage(page, request, orgPath);
         page.getRecords().forEach(r -> {
             if (ObjectUtil.isEmpty(r.getChannels())) {
@@ -92,7 +95,7 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
             LambdaQueryWrapper<MediatorVideoIntegrityCheck> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(MediatorVideoIntegrityCheck::getEquipmentCode, hostCode)
                     .eq(MediatorVideoIntegrityCheck::getChannelCode, channelCode)
-                    .le(MediatorVideoIntegrityCheck::getRecordDate, vo.getStorage().getEarliestTime())
+                    .ge(MediatorVideoIntegrityCheck::getRecordDate, vo.getStorage().getEarliestTime())
                     .select(MediatorVideoIntegrityCheck::getRecordDate, MediatorVideoIntegrityCheck::getStatus);
             Map<Integer, List<MediatorVideoIntegrityCheck>> days = videoIntegrityCheckMapper.selectList(wrapper)
                     .stream().collect(Collectors.groupingBy(d -> d.getStatus()));

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

@@ -39,6 +39,7 @@
             <result column="disk_name" property="diskName"/>
             <result column="total" property="total"/>
             <result column="available" property="available"/>
+            <result column="state" property="state"/>
         </collection>
     </resultMap>
     <select id="selectHostPage" resultMap="selectHostPageMap">
@@ -68,6 +69,9 @@
         <if test="pageDto.hostName!=null and pageDto.hostName!=''">
             and d.equipment_name like concat('%', #{pageDto.hostName},'%')
         </if>
+        <if test="pageDto.netState!=null">
+            and dd.state=#{pageDto.netState}
+        </if>
         <!--        <if test="pageDto.status !=null">-->
         <!--            and dhd.`status` = #{pageDto.status}-->
         <!--        </if>-->
@@ -87,7 +91,8 @@
         `disk_name`,
         `total`,
         `host_code`,
-        `org_id`
+        `org_id`,
+        state
         from iot_dvr_disk
         where host_code = #{equipmentCode}
         and deleted=0

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

@@ -154,7 +154,7 @@
         org_name,
         #{pageDto.state} as state
         from iot_device
-        WHERE category_id = 1
+        WHERE category_id = #{pageDto.categoryId}
         <if test="pageDto.checkSub==true">
             and org_path like concat(#{orgPath}, '%')
         </if>