mqtt设备列表

ruoyi-admin/src/main/java/com/ruoyi/web/controller/manage/ChannelNumberController.java

@@ -3,10 +3,10 @@ package com.ruoyi.web.controller.manage;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.ChannelNumber;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.manage.domain.ChannelNumber;
 import com.ruoyi.manage.service.IChannelNumberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/manage/EquipmentManageController.java

@@ -44,7 +44,7 @@ public class EquipmentManageController extends BaseController {
     @PreAuthorize("@ss.hasPermi('manage:equipmentManage:listNoPage')")
     @GetMapping("/listNoPage")
     public TableDataInfo listNoPage(EquipmentManage equipmentManage) {
-        List<EquipmentManage> list = equipmentManageService.selectEquipmentManageList(equipmentManage);
+        List<EquipmentManage> list = equipmentManageService.selectEquipmentManageListTree(equipmentManage);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/manage/ParameterSetController.java

@@ -6,7 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.manage.domain.ParameterSet;
+import com.ruoyi.common.core.domain.entity.ParameterSet;
 import com.ruoyi.manage.service.IParameterSetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

ruoyi-admin/src/main/resources/application-druid.yml

@@ -17,7 +17,7 @@ ruoyi:
 # 开发环境配置
 server:
     # 服务器的HTTP端口，默认为8080
-    port: 8099
+    port: 8056
     servlet:
         # 应用的访问路径
         context-path: /

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java

@@ -1,14 +1,16 @@
 package com.ruoyi.common.core.domain;
 
-import java.io.Serializable;
-import java.util.List;
-import java.util.stream.Collectors;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.ChannelNumber;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.utils.StringUtils;
 
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * Treeselect树结构实体类
  * 
@@ -23,6 +25,10 @@ public class TreeSelect implements Serializable
 
     /** 节点名称 */
     private String label;
+    /**
+     * 多级节点名称
+     */
+    private String labelTwo;
 
     /** 节点禁用 */
     private boolean disabled = false;
@@ -51,6 +57,15 @@ public class TreeSelect implements Serializable
         this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
+    public TreeSelect(ChannelNumber channelNumber)
+    {
+        this.id = channelNumber.getChannelId();
+        this.label = channelNumber.getEquipmentName();
+        this.labelTwo = channelNumber.getChannelNum();
+        this.children = channelNumber.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+    }
+
+
     public Long getId()
     {
         return id;

ruoyi-system/src/main/java/com/ruoyi/manage/domain/ChannelNumber.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ChannelNumber.java

@@ -1,9 +1,11 @@
-package com.ruoyi.manage.domain;
+package com.ruoyi.common.core.domain.entity;
 
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 通道管理对象 channel_number
@@ -92,6 +94,18 @@ public class ChannelNumber extends BaseEntity {
      */
     private ParameterSet parameterSet;
 
+    /** 子菜单 */
+    private List<ChannelNumber> children = new ArrayList<ChannelNumber>();
+
+
+    public List<ChannelNumber> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<ChannelNumber> children) {
+        this.children = children;
+    }
+
     public String getPhotoAddress() {
         return photoAddress;
     }
@@ -239,6 +253,7 @@ public class ChannelNumber extends BaseEntity {
                 ", delFlag='" + delFlag + '\'' +
                 ", isChannel='" + isChannel + '\'' +
                 ", parameterSet=" + parameterSet +
+                ", children=" + children +
                 '}';
     }
 }

ruoyi-system/src/main/java/com/ruoyi/manage/domain/ParameterSet.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ParameterSet.java

@@ -1,4 +1,4 @@
-package com.ruoyi.manage.domain;
+package com.ruoyi.common.core.domain.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

ruoyi-system/src/main/java/com/ruoyi/manage/domain/ChannelNumberVo.java

@@ -2,6 +2,7 @@ package com.ruoyi.manage.domain;
 
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.domain.entity.ParameterSet;
 
 /**
  * 通道管理对象 channel_number

ruoyi-system/src/main/java/com/ruoyi/manage/domain/EquipmentManage.java

@@ -3,9 +3,12 @@ package com.ruoyi.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.domain.entity.ChannelNumber;
 
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 设备管理对象 equipment_manage
@@ -65,6 +68,18 @@ public class EquipmentManage extends BaseEntity
     /** 部门名称 */
     private String deptName;
 
+    /** 子菜单 */
+    private List<ChannelNumber> children = new ArrayList<ChannelNumber>();
+
+
+    public List<ChannelNumber> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<ChannelNumber> children) {
+        this.children = children;
+    }
+
     public Long getDeptId() {
         return deptId;
     }
@@ -205,6 +220,7 @@ public class EquipmentManage extends BaseEntity
                 ", delFlag='" + delFlag + '\'' +
                 ", deptId=" + deptId +
                 ", deptName='" + deptName + '\'' +
+                ", children=" + children +
                 '}';
     }
 }

ruoyi-system/src/main/java/com/ruoyi/manage/mapper/ChannelNumberMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.manage.mapper;
 
-import com.ruoyi.manage.domain.ChannelNumber;
+import com.ruoyi.common.core.domain.entity.ChannelNumber;
 import com.ruoyi.manage.domain.ChannelNumberVo;
 
 import java.util.List;

ruoyi-system/src/main/java/com/ruoyi/manage/mapper/EquipmentManageMapper.java

@@ -27,6 +27,7 @@ public interface EquipmentManageMapper
      * @return 设备管理集合
      */
     public List<EquipmentManage> selectEquipmentManageList(EquipmentManage equipmentManage);
+    public List<EquipmentManage> selectEquipmentManageListTree(EquipmentManage equipmentManage);
     public EquipmentManage selectEquipmentManageByEquipmentIp(EquipmentManage equipmentManage);
 
     /**

ruoyi-system/src/main/java/com/ruoyi/manage/mapper/ParameterSetMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.manage.mapper;
 
-import com.ruoyi.manage.domain.ParameterSet;
+import com.ruoyi.common.core.domain.entity.ParameterSet;
 
 import java.util.List;
 

ruoyi-system/src/main/java/com/ruoyi/manage/service/IChannelNumberService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.manage.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.manage.domain.ChannelNumber;
+import com.ruoyi.common.core.domain.entity.ChannelNumber;
 
 import java.util.List;
 

ruoyi-system/src/main/java/com/ruoyi/manage/service/IEquipmentManageService.java

@@ -28,6 +28,7 @@ public interface IEquipmentManageService
      * @return 设备管理集合
      */
     public List<EquipmentManage> selectEquipmentManageList(EquipmentManage equipmentManage);
+    public List<EquipmentManage> selectEquipmentManageListTree(EquipmentManage equipmentManage);
 
     /**
      * 新增设备管理

ruoyi-system/src/main/java/com/ruoyi/manage/service/IParameterSetService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.manage.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.manage.domain.ParameterSet;
+import com.ruoyi.common.core.domain.entity.ParameterSet;
 
 import java.util.List;
 

ruoyi-system/src/main/java/com/ruoyi/manage/service/impl/ChannelNumberServiceImpl.java

@@ -1,12 +1,12 @@
 package com.ruoyi.manage.service.impl;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.ChannelNumber;
+import com.ruoyi.common.core.domain.entity.ParameterSet;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.manage.domain.ChannelNumber;
 import com.ruoyi.manage.domain.ChannelNumberVo;
 import com.ruoyi.manage.domain.EquipmentManage;
-import com.ruoyi.manage.domain.ParameterSet;
 import com.ruoyi.manage.mapper.ChannelNumberMapper;
 import com.ruoyi.manage.mapper.EquipmentManageMapper;
 import com.ruoyi.manage.mapper.ParameterSetMapper;

ruoyi-system/src/main/java/com/ruoyi/manage/service/impl/EquipmentManageServiceImpl.java

@@ -43,6 +43,11 @@ public class EquipmentManageServiceImpl implements IEquipmentManageService {
         return equipmentManageMapper.selectEquipmentManageList(equipmentManage);
     }
 
+    @Override
+    public List<EquipmentManage> selectEquipmentManageListTree(EquipmentManage equipmentManage) {
+        return equipmentManageMapper.selectEquipmentManageListTree(equipmentManage);
+    }
+
     /**
      * 新增设备管理
      *

ruoyi-system/src/main/java/com/ruoyi/manage/service/impl/ParameterSetServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.manage.service.impl;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.manage.domain.ParameterSet;
+import com.ruoyi.common.core.domain.entity.ParameterSet;
 import com.ruoyi.manage.mapper.ParameterSetMapper;
 import com.ruoyi.manage.service.IParameterSetService;
 import com.ruoyi.mqtt.service.MqttService;

ruoyi-system/src/main/resources/mapper/manage/EquipmentManageMapper.xml

@@ -23,6 +23,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <collection  property="children"   javaType="java.util.List"  resultMap="ChannelNumberResult" />
+    </resultMap>
+
+    <resultMap type="ChannelNumber" id="ChannelNumberResult">
+        <result property="channelId"    column="channel_id"    />
+        <result property="equipmentId"    column="c_equipment_id"    />
+        <result property="equipmentNum"    column="c_equipment_num"    />
+        <result property="equipmentName"    column="c_equipment_name"    />
+        <result property="channelNum"    column="channel_num"    />
+        <result property="port"    column="port"    />
+        <result property="videoAddress"    column="video_address"    />
+        <result property="photoAddress"    column="photo_address"    />
+        <result property="account"    column="account"    />
+        <result property="password"    column="password"    />
+        <result property="protocolType"    column="protocol_type"    />
+        <result property="channelDetails"    column="channel_details"    />
     </resultMap>
 
     <sql id="selectEquipmentManageVo">
@@ -65,6 +81,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time DESC
     </select>
 
+
+    <select id="selectEquipmentManageListTree" parameterType="EquipmentManage" resultMap="EquipmentManageResult">
+        select e.equipment_id,
+        e.equipment_ip,
+        e.equipment_num,
+        e.equipment_name,
+        e.equipment_type,
+        e.equipment_address,
+        e.equipment_region,
+        e.equipment_time,
+        e.equipment_image,
+        e.run_state,
+        e.dept_id,
+        e.dept_name,
+        e.del_flag,
+        e.create_by,
+        e.create_time,
+        e.update_by,
+        e.update_time,
+        e.remark,
+        c.channel_id, c.channel_num, c.video_address,c.photo_address,port,
+        c.account,c.password,c.protocol_type, c.channel_details
+        from equipment_manage e left join channel_number c on e.equipment_id = c.equipment_id
+        <where>
+                e.del_flag = '0' and c.del_flag = '0'
+            <if test="equipmentName != null  and equipmentName != ''">and e.equipment_name like concat('%',
+                #{equipmentName}, '%')
+            </if>
+        </where>
+    </select>
+
     <select id="selectEquipmentManageByEquipmentIp" parameterType="EquipmentManage" resultMap="EquipmentManageResult">
         <include refid="selectEquipmentManageVo"/>
         <where>