录像诊断、硬盘诊断增加地区、行社

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

@@ -1,5 +1,7 @@
 package com.xunmei.iot.vo.dvrDisk;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -33,6 +35,16 @@ public class DvrDiskPageVo {
 //   @JsonSerialize(using = ToStringSerializer.class)
 //   private Long orgId;
 
+   @ApiModelProperty("地区")
+   @ExcelProperty(value="地区",index = 2)
+   @ColumnWidth(20)
+   private String affiliatedArea;
+
+   @ApiModelProperty("行社名称")
+   @ExcelProperty(value="行社名称",index = 3)
+   @ColumnWidth(20)
+   private String affiliatedBank;
+
    @ApiModelProperty("所属机构")
    private String orgName;
 

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

@@ -1,5 +1,7 @@
 package com.xunmei.iot.vo.videoDiagnosis;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,6 +13,16 @@ public class VideoDiagnosisWebPageVo {
     @ApiModelProperty("通道code")
     private String channelCode;
 
+    @ApiModelProperty("地区")
+    @ExcelProperty(value="地区",index = 2)
+    @ColumnWidth(20)
+    private String affiliatedArea;
+
+    @ApiModelProperty("行社名称")
+    @ExcelProperty(value="行社名称",index = 3)
+    @ColumnWidth(20)
+    private String affiliatedBank;
+
     @ApiModelProperty("组织机构")
     private String orgName;
 

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

@@ -8,6 +8,8 @@
         <result column="ip" property="ip"/>
         <result column="orgId" property="orgId"/>
         <result column="orgName" property="orgName"/>
+        <result column="affiliated_area" property="affiliatedArea"/>
+        <result column="affiliated_bank" property="affiliatedBank"/>
         <result column="netState" property="netState"/>
         <!--        <result column="status" property="status"/>-->
         <!--        <result column="alarmTime" property="alarmTime"/>-->
@@ -49,6 +51,8 @@
         d.equipment_name AS equipmentName,
         d.net_address as ip,
         d.org_name AS orgName,
+        o.affiliated_area,
+        o.affiliated_bank,
         d.producer as brand,
         dd.state as netState
         <!--        dhd.check_status AS `status`,-->
@@ -56,6 +60,7 @@
         <!--        dhd.detail_info as detailInfo-->
         FROM
         iot_device d
+        inner  join sys_org o on d.org_id =o.id and o.deleted=0 and o.is_lock='0'
         left join iot_device_detection dd on d.equipment_code =dd.equipment_code
 <!--        LEFT JOIN iot_dvr_hard_disk_detection dhd ON d.equipment_code = dhd.equipment_code-->
         WHERE

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

@@ -49,6 +49,8 @@
         c.host_code,
         c.channel_code,
         c.org_name,
+        o.affiliated_area,
+        o.affiliated_bank,
         c.channel_name,
         c.channel_addr as channelIP,
         vic.lose_duration,
@@ -61,6 +63,7 @@
         as quality
         from iot_dvr_channel c
         INNER JOIN iot_device d on c.host_code=d.equipment_code
+        inner  join sys_org o on c.org_id =o.id and o.deleted=0 and o.is_lock='0'
         left JOIN mediator_video_days_check vdc on c.host_code=vdc.equipment_code and c.channel_code=vdc.channel_code
         left JOIN mediator_video_integrity_check vic on c.host_code=vic.equipment_code and
         c.channel_code=vic.channel_code