设备管理代码提交

project_data/sql/0.1.1/soc/soc.sql

@@ -922,6 +922,10 @@ INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, quer
 delete from sys_role_menu where sys_role_menu.menu_id = 1810216137011572738;
 insert into sys_role_menu select  id,1810216137011572738 from sys_role where org_type in (1,2,3,4);
 
+-- 新增设备管理菜单
+delete from sys_menu where id in ('01815673314170544129');
+INSERT INTO sys_menu(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01815673314170544129, '设备管理', 1747911340288892930, 8, 'deviceInfo', 'iot/deviceInfo/index', NULL, 1, 0, 'C', '0', '0', 'iot:deviceInfo:list', '1', 'client', NULL, '超级管理员', '2024-07-23 17:00:26', '超级管理员', '2024-07-23 17:01:21', '');
+
 
 -- 部署中心字典
 delete from sys_dict_type where dict_type='deploy_upgrade_status';

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/websocket/enums/DeviceTypeEnum.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/iot/DeviceTypeEnum.java

@@ -1,10 +1,14 @@
-package com.xunmei.mediator.websocket.enums;
+package com.xunmei.common.core.enums.iot;
 
+import com.xunmei.common.core.utils.StringUtils;
 import io.netty.util.internal.StringUtil;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
@@ -48,4 +52,20 @@ public enum DeviceTypeEnum {
         return obj.toString();
     }
 
+    /**
+     * 所有枚举
+     */
+    private static final Map<String, DeviceTypeEnum> enumMap = new LinkedHashMap<>();
+
+    static {
+        for (DeviceTypeEnum enumNode : DeviceTypeEnum.values()) {
+            enumMap.put(enumNode.getCode(), enumNode);
+        }
+    }
+
+    public static String getDescByCode(String code) {
+        DeviceTypeEnum e = enumMap.get(code);
+        return e != null ? e.getDesc() : "";
+    }
+
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/controller/IotDeviceInfoController.java

@@ -0,0 +1,32 @@
+package com.xunmei.iot.controller;
+
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.iot.dto.deviceInfo.IotDeviceInfoPageDto;
+import com.xunmei.iot.service.IIotDeviceInfoService;
+import com.xunmei.iot.vo.deviceInfo.IotDeviceInfoPageVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+
+@RestController
+@RequestMapping("/deviceInfo")
+public class IotDeviceInfoController {
+
+    @Resource
+    private IIotDeviceInfoService deviceInfoService;
+    @ApiOperation("iot设备列表")
+    @GetMapping({"/page"})
+    TableDataInfo<IotDeviceInfoPageVo> webPage(IotDeviceInfoPageDto req) {
+        return deviceInfoService.deviceInfoPage(req);
+    }
+
+    @ApiOperation("iot设备详情")
+    @GetMapping({"/detail/{id}"})
+    AjaxResult detail(@PathVariable Serializable id) {
+        return AjaxResult.success(deviceInfoService.getDetail(id));
+    }
+
+}

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/dto/deviceInfo/IotDeviceInfoPageDto.java

@@ -0,0 +1,24 @@
+package com.xunmei.iot.dto.deviceInfo;
+
+import com.xunmei.common.core.web.domain.PageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class IotDeviceInfoPageDto extends PageRequest {
+
+    @ApiModelProperty(value = "设备类型 1.监控主机 4.报警主机 5.动环主机")
+    private String deviceType;
+
+    @ApiModelProperty(value = "设备类型 1.监控主机 4.报警主机 5.动环主机")
+    private List<String> deviceTypeList;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "网络状态 0:未知,1:在线,2:离线,3:异常")
+    private String netStatus;
+
+}

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/IotDeviceInfoMapper.java

@@ -1,9 +1,23 @@
 package com.xunmei.iot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.iot.dto.deviceInfo.IotDeviceInfoPageDto;
+import com.xunmei.iot.vo.deviceInfo.DeviceDetailInfoVo;
+import com.xunmei.iot.vo.deviceInfo.IotDeviceInfoPageVo;
 import com.xunmei.system.api.domain.iot.IotDeviceInfo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;
+import java.util.List;
 
 @Mapper
 public interface IotDeviceInfoMapper extends BaseMapper<IotDeviceInfo> {
+
+    Page<IotDeviceInfoPageVo> selectDeviceInfoPage(Page<IotDeviceInfoPageVo> pageRequest, @Param("req") IotDeviceInfoPageDto req);
+
+    DeviceDetailInfoVo getDetailById(@Param("id") Serializable id);
+
+    List<DeviceDetailInfoVo> getChildrenInfoList(@Param("deviceProduct") String deviceProduct,@Param("iotToken") String iotToken,@Param("hostCode") String hostCode);
 }

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

@@ -0,0 +1,17 @@
+package com.xunmei.iot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.iot.dto.deviceInfo.IotDeviceInfoPageDto;
+import com.xunmei.iot.vo.deviceInfo.DeviceDetailInfoVo;
+import com.xunmei.iot.vo.deviceInfo.IotDeviceInfoPageVo;
+import com.xunmei.system.api.domain.iot.IotDeviceInfo;
+
+import java.io.Serializable;
+
+public interface IIotDeviceInfoService extends IService<IotDeviceInfo> {
+
+    TableDataInfo<IotDeviceInfoPageVo> deviceInfoPage(IotDeviceInfoPageDto request);
+
+    DeviceDetailInfoVo getDetail(Serializable id);
+}

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

@@ -0,0 +1,68 @@
+package com.xunmei.iot.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.enums.iot.DeviceTypeEnum;
+import com.xunmei.common.core.utils.StringUtils;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.iot.dto.deviceInfo.IotDeviceInfoPageDto;
+import com.xunmei.iot.mapper.IotDeviceInfoMapper;
+import com.xunmei.iot.service.IIotDeviceInfoService;
+import com.xunmei.iot.vo.deviceInfo.DeviceDetailInfoVo;
+import com.xunmei.iot.vo.deviceInfo.IotDeviceInfoPageVo;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
+import com.xunmei.system.api.domain.iot.IotDeviceInfo;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+@Service
+public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, IotDeviceInfo> implements IIotDeviceInfoService {
+    @Resource
+    RemoteOrgService orgService;
+
+    @Override
+    public TableDataInfo<IotDeviceInfoPageVo> deviceInfoPage(IotDeviceInfoPageDto request) {
+        if (request.getCheckSub()) {
+            SysOrg sysOrg = orgService.selectOrgById(request.getOrgId(), SecurityConstants.INNER);
+            request.setOrgPath(sysOrg.getPath());
+        }
+        if (StringUtils.isNotEmpty(request.getDeviceType())){
+            request.setDeviceTypeList(null);
+        }
+        Page<IotDeviceInfoPageVo> page = baseMapper.selectDeviceInfoPage(request.getPageRequest(), request);
+        List<IotDeviceInfoPageVo> records = page.getRecords();
+        if (records != null && records.size() > 0){
+            for (IotDeviceInfoPageVo record : records) {
+                record.setDeviceTypeName(DeviceTypeEnum.getDescByCode(record.getDeviceType()));
+            }
+        }
+        return TableDataInfo.build(page);
+    }
+
+    @Override
+    public DeviceDetailInfoVo getDetail(Serializable id) {
+        DeviceDetailInfoVo detailInfoVo = baseMapper.getDetailById(id);
+        if (detailInfoVo != null){
+            detailInfoVo.setDeviceTypeName(DeviceTypeEnum.getDescByCode(detailInfoVo.getDeviceType()));
+            String deviceProduct = null;
+            //监控主机需要查询deviceProduct
+            if (ObjectUtil.equal(DeviceTypeEnum.DVS.getCode(),detailInfoVo.getDeviceType())){
+                deviceProduct = detailInfoVo.getDeviceProduct();
+            }
+            List<DeviceDetailInfoVo> infoList = baseMapper.getChildrenInfoList(deviceProduct, detailInfoVo.getIotToken(), detailInfoVo.getDeviceCode());
+            if (infoList !=null && infoList.size() > 0){
+                for (DeviceDetailInfoVo infoVo : infoList) {
+                    infoVo.setDeviceTypeName(DeviceTypeEnum.getDescByCode(infoVo.getDeviceType()));
+                }
+            }
+            detailInfoVo.setChildrenInfos(infoList);
+        }
+
+        return detailInfoVo;
+    }
+}

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/deviceInfo/DeviceDetailInfoVo.java

@@ -0,0 +1,21 @@
+package com.xunmei.iot.vo.deviceInfo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class DeviceDetailInfoVo extends IotDeviceInfoPageVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String parentName;
+
+    private String hostCode;
+
+    private String iotToken;
+
+    //子设备
+    private List<DeviceDetailInfoVo> childrenInfos;
+}

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/deviceInfo/IotDeviceInfoPageVo.java

@@ -0,0 +1,49 @@
+package com.xunmei.iot.vo.deviceInfo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class IotDeviceInfoPageVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private long id;
+
+    @ApiModelProperty(value = "地区")
+    private String firstOrgName;
+
+    @ApiModelProperty(value = "行社名称")
+    private String secondOrgName;
+
+    @ApiModelProperty(value = "所属机构")
+    private String orgName;
+
+    @ApiModelProperty(value = "设备类型 1.监控主机 4.报警主机 5.动环主机")
+    private String deviceType;
+
+    @ApiModelProperty(value = "设备类型 1.监控主机 4.报警主机 5.动环主机")
+    private String deviceTypeName;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "网络状态 0:未知,1:在线,2:离线,3:异常")
+    private String netStatus;
+
+    @ApiModelProperty(value = "产品")
+    private String deviceProduct;
+
+    @ApiModelProperty(value = "涉设备")
+    private String deviceCode;
+
+    @ApiModelProperty(value = "产品型号")
+    private String deviceModel;
+
+    @ApiModelProperty(value = "ip")
+    private String deviceAddress;
+
+    @ApiModelProperty(value = "端口")
+    private Integer devicePort;
+}

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

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.iot.mapper.IotDeviceInfoMapper">
+    <select id="selectDeviceInfoPage" resultType="com.xunmei.iot.vo.deviceInfo.IotDeviceInfoPageVo">
+        SELECT
+            d.*,
+            o.affiliated_area AS firstOrgName,
+            o.affiliated_bank AS secondOrgName,
+            o.short_name AS orgName
+        FROM
+            iot_device_info d
+            LEFT JOIN sys_org o ON o.id = d.org_id
+        where d.deleted = 0
+            <if test="req.deviceName !=null and req.deviceName !=''">
+                and d.device_name like concat('%',#{req.deviceName},'%')
+            </if>
+            <if test="req.deviceType !=null and req.deviceType !=''">
+                and d.device_type = #{req.deviceType}
+            </if>
+            <if test="req.deviceTypeList != null and req.deviceTypeList.size > 0">
+                and d.device_type in
+                <foreach collection="req.deviceTypeList" item="deviceType" open="(" separator="," close=")">
+                    #{deviceType}
+                </foreach>
+            </if>
+            <if test="req.netStatus !=null and req.netStatus !=''">
+                and d.net_status = #{req.netStatus}
+            </if>
+            <choose>
+                <when test="req.checkSub == false">
+                    and d.org_id=#{req.orgId}
+                </when>
+                <otherwise>
+                    and d.org_path like concat(#{req.orgPath},'%')
+                </otherwise>
+            </choose>
+        order by d.device_type asc
+
+    </select>
+    <select id="getDetailById" resultType="com.xunmei.iot.vo.deviceInfo.DeviceDetailInfoVo">
+        SELECT
+            d.*,
+            (select device_name from iot_device_info i where i.device_code = d.host_code and i.iot_token = d.iot_token) as parentName,
+            o.affiliated_area AS firstOrgName,
+            o.affiliated_bank AS secondOrgName,
+            o.short_name AS orgName,
+            e.net_address AS deviceAddress,
+            e.`port` AS devicePort
+        FROM
+            iot_device_info d
+            LEFT JOIN sys_org o ON o.id = d.org_id
+            LEFT JOIN iot_device_info_extend e ON d.id = e.device_id
+        where d.deleted = 0 and d.id = #{id}
+    </select>
+    <select id="getChildrenInfoList" resultType="com.xunmei.iot.vo.deviceInfo.DeviceDetailInfoVo">
+        SELECT
+            d.*,
+            o.affiliated_area AS firstOrgName,
+            o.affiliated_bank AS secondOrgName,
+            o.short_name AS orgName
+        FROM
+            iot_device_info d
+            LEFT JOIN sys_org o ON o.id = d.org_id
+        where d.deleted = 0
+            and d.iot_token = #{iotToken}
+            and d.host_code = #{hostCode}
+            <if test="deviceProduct !=null and deviceProduct !=''">
+                and d.device_product = #{deviceProduct}
+            </if>
+    </select>
+</mapper>

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/service/impl/IotAlarmSubSystemServiceImpl.java

@@ -2,7 +2,6 @@ package com.xunmei.mediator.api.protection.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,10 +28,8 @@ import com.xunmei.mediator.api.north.service.impl.NorthStatisticsSyncService;
 import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.mediator.util.RedisCheckRepeatDataUtil;
 import com.xunmei.mediator.websocket.enums.DeviceCacheEnum;
-import com.xunmei.mediator.websocket.enums.DeviceTypeEnum;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.api.domain.iot.IotDeviceInfo;
 import com.xunmei.system.api.domain.north.NorthError;
 import com.xunmei.system.api.dto.DataPageDto;
 import com.xunmei.system.api.dto.protection.DefenceAreaDto;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/video/service/impl/IotDvrHardDiskDetectionServiceImpl.java

@@ -23,7 +23,7 @@ import com.xunmei.mediator.iot.service.IIotDeviceInfoService;
 import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.mediator.websocket.constant.WebSocketConstants;
 import com.xunmei.mediator.websocket.dto.WebsocketExecuteReq;
-import com.xunmei.mediator.websocket.enums.DeviceTypeEnum;
+import com.xunmei.common.core.enums.iot.DeviceTypeEnum;
 import com.xunmei.mediator.websocket.enums.ProductEnums;
 import com.xunmei.mediator.websocket.service.RouterService;
 import com.xunmei.system.api.RemoteOrgService;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/video/service/impl/VideoDiagnosisRecordServiceImpl.java

@@ -23,7 +23,7 @@ import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.mediator.util.RedisUtil;
 import com.xunmei.mediator.websocket.constant.WebSocketConstants;
 import com.xunmei.mediator.websocket.dto.WebsocketExecuteReq;
-import com.xunmei.mediator.websocket.enums.DeviceTypeEnum;
+import com.xunmei.common.core.enums.iot.DeviceTypeEnum;
 import com.xunmei.mediator.websocket.enums.ProductEnums;
 import com.xunmei.mediator.websocket.service.RouterService;
 import com.xunmei.system.api.RemoteOrgService;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/video/service/impl/VideoIntegrityCheckServiceImpl.java

@@ -27,7 +27,7 @@ import com.xunmei.mediator.iot.service.IIotDeviceInfoService;
 import com.xunmei.mediator.websocket.constant.WebSocketConstants;
 import com.xunmei.mediator.websocket.dto.WebsocketExecuteReq;
 import com.xunmei.mediator.websocket.dto.WebsocketResult;
-import com.xunmei.mediator.websocket.enums.DeviceTypeEnum;
+import com.xunmei.common.core.enums.iot.DeviceTypeEnum;
 import com.xunmei.mediator.websocket.enums.ProductEnums;
 import com.xunmei.mediator.websocket.enums.TopicTypeEnums;
 import com.xunmei.mediator.websocket.holder.WebSocketSessionHolder;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/iot/service/IIotDeviceInfoService.java

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.iot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.mediator.websocket.enums.DeviceTypeEnum;
+import com.xunmei.common.core.enums.iot.DeviceTypeEnum;
 import com.xunmei.system.api.domain.iot.IotDeviceInfo;
 
 import java.util.List;
@@ -10,7 +10,7 @@ public interface IIotDeviceInfoService extends IService<IotDeviceInfo> {
 
     /**
      * 根据设备类型和设备编码，获取设备信息
-     * @param type
+     * @param
      * @param code
      * @return
      */

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

@@ -9,7 +9,7 @@ import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.mediator.iot.mapper.IotDeviceInfoMapper;
 import com.xunmei.mediator.iot.service.IIotDeviceInfoService;
 import com.xunmei.mediator.websocket.enums.DeviceCacheEnum;
-import com.xunmei.mediator.websocket.enums.DeviceTypeEnum;
+import com.xunmei.common.core.enums.iot.DeviceTypeEnum;
 import com.xunmei.system.api.domain.iot.IotDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -17,7 +17,7 @@ import com.xunmei.mediator.iot.service.IIotDeviceInfoService;
 import com.xunmei.mediator.iot.service.IotDeviceStatusService;
 import com.xunmei.mediator.websocket.dto.WebsocketExecuteReq;
 import com.xunmei.mediator.websocket.dto.WebsocketResult;
-import com.xunmei.mediator.websocket.enums.DeviceTypeEnum;
+import com.xunmei.common.core.enums.iot.DeviceTypeEnum;
 import com.xunmei.system.api.domain.iot.IotDeviceInfo;
 import com.xunmei.system.api.domain.iot.IotDeviceStatus;
 import com.xunmei.system.api.enums.ElectricityMeterAttributes;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/websocket/service/impl/WebsocketServiceImpl.java

@@ -29,7 +29,7 @@ import com.xunmei.mediator.websocket.dto.dvs.ChannelInfo;
 import com.xunmei.mediator.websocket.dto.dvs.DiskInfo;
 import com.xunmei.mediator.websocket.dto.dvs.DvsBaseInfo;
 import com.xunmei.mediator.websocket.dto.dvs.DvsInfo;
-import com.xunmei.mediator.websocket.enums.DeviceTypeEnum;
+import com.xunmei.common.core.enums.iot.DeviceTypeEnum;
 import com.xunmei.mediator.websocket.enums.ProductEnums;
 import com.xunmei.mediator.websocket.redis.WebsocketPublisher;
 import com.xunmei.mediator.websocket.service.RouterService;