磁盘查询bug处理

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/websocket/handler/SocWebSocketHandler.java

@@ -129,8 +129,8 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
     @Override
     protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
         // 从WebSocket会话中获取登录用户信息
-        String token = WebSocketSessionHolder.updateToken(session);
-        //String token = "de672e88-c120-41d8-8f5e-4a882d13b894";
+        //String token = WebSocketSessionHolder.updateToken(session);
+        String token = "01d2253b-b20b-4756-bdc8-4ec79db08026";
         if (StringUtils.isEmpty(token)) {
             LogUtils.WEBSOCKET_MSG.error("会话消息不存在,ip:{}", WebSocketUtils.getIp(session));
             return;

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

@@ -1,5 +1,6 @@
 package com.xunmei.iot.vo.dvrDisk;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -32,8 +33,9 @@ public class DvrDiskPageVo {
    private String id;
 
 //   @ApiModelProperty("所属机构")
-//   @JsonSerialize(using = ToStringSerializer.class)
-//   private Long orgId;
+   @JsonSerialize(using = ToStringSerializer.class)
+   @ExcelIgnore
+   private Long orgId;
 
    @ApiModelProperty("地区")
    @ExcelProperty(value="地区",index = 2)

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

@@ -15,7 +15,7 @@
         <!--        <result column="alarmTime" property="alarmTime"/>-->
         <!--        <result column="detailInfo" property="detailInfo"-->
         <!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>-->
-        <collection property="diskInfos" column="equipmentCode=equipmentCode"
+        <collection property="diskInfos" column="equipmentCode=equipmentCode,,orgId=orgId"
                     select="selectDiskInfo">
             <result column="id" property="id"/>
             <result column="org_id" property="orgId"/>
@@ -99,14 +99,14 @@
         o.affiliated_area,
         o.affiliated_bank,
         d.device_product as brand,
-        dd.state as netState
+        d.net_status as netState,
+        d.org_id as orgId
 
         FROM
         iot_device_info 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.device_code =dd.equipment_code
         left join iot_device_info_extend ie on d.id =ie.device_id
-        WHERE d.device_type=1
+        WHERE d.device_type=1 and d.deleted=0
 
         <if test="pageDto.checkSub==true">
             and d.org_path like concat(#{orgPath},"%")
@@ -118,7 +118,7 @@
             and d.device_name like concat('%', #{pageDto.hostName},'%')
         </if>
         <if test="pageDto.netState!=null">
-            and dd.state=#{pageDto.netState}
+            and d.net_status=#{pageDto.netState}
         </if>
         <!--        <if test="pageDto.status !=null">-->
         <!--            and dhd.`status` = #{pageDto.status}-->
@@ -142,7 +142,7 @@
         `org_id`,
         state
         from iot_dvr_disk
-        where host_code = #{equipmentCode}
+        where host_code = #{equipmentCode} and org_id =#{orgId}
         and deleted=0
         <if test="state==0 or state==1">
             and state=#{state}
@@ -212,8 +212,17 @@
         SUM(dd.count) AS diskTotal,
         SUM(dd.exceptionCount) as diskExceptionCount
         FROM iot_device_info d
-        LEFT JOIN (SELECT host_code,count(0) as count,SUM(if(state=1,1,0)) as exceptionCount from iot_dvr_disk WHERE
-        deleted=0 group by host_code) dd on dd.host_code =d.device_code
+        LEFT JOIN
+        (SELECT host_code,count(0) as count,SUM(if(state=1,1,0)) as exceptionCount from iot_dvr_disk WHERE
+        deleted=0
+        <if test="pageDto.checkSub==true">
+            and org_path like concat(#{orgPath},"%")
+        </if>
+        <if test="pageDto.checkSub==false">
+            and org_id = #{pageDto.orgId}
+        </if>
+
+        group by host_code) dd on dd.host_code =d.device_code
         where d.deleted=0 and d.device_type=1
         <if test="pageDto.checkSub==true">
             and d.org_path like concat(#{orgPath},"%")