新增 获取连接列表接口

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/IotDeviceconnController.java

@@ -7,6 +7,8 @@ import javax.validation.Valid;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
 import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnAddReqVo;
+import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnListReqVo;
+import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDeviceconnListRspVo;
 import com.yunfeiyun.agmp.iotm.device.service.IIotDeviceconnService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,10 +45,10 @@ public class IotDeviceconnController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('iot:deviceconn:list')")
     @GetMapping("/list")
-    public TableDataInfo list(IotDeviceconn iotDeviceconn)
+    public TableDataInfo list(IotDeviceconnListReqVo reqVo)
     {
         startPage();
-        List<IotDeviceconn> list = iotDeviceconnService.selectIotDeviceconnList(iotDeviceconn);
+        List<IotDeviceconnListRspVo> list = iotDeviceconnService.listDeviceconn(reqVo);
         return getDataTable(list);
     }
 

src/main/java/com/yunfeiyun/agmp/iotm/device/domain/reqvo/IotDeviceconnAddReqVo.java

@@ -1,5 +1,6 @@
 package com.yunfeiyun.agmp.iotm.device.domain.reqvo;
 
+import com.yunfeiyun.agmp.common.annotation.Excel;
 import lombok.Data;
 
 import javax.validation.constraints.*;
@@ -31,4 +32,7 @@ public class IotDeviceconnAddReqVo
 
     /** 连接配置JSON */
     private String devconnConfig;
+
+    /** 连接备注 */
+    private String devconnRemark;
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/domain/reqvo/IotDeviceconnListReqVo.java

@@ -0,0 +1,42 @@
+package com.yunfeiyun.agmp.iotm.device.domain.reqvo;
+
+import com.yunfeiyun.agmp.common.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 设备连接配置对象 IotDeviceconn
+ * 
+ * @author 杨晓辉
+ * @date 2024-11-06
+ */
+@Data
+public class IotDeviceconnListReqVo
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 设备类型代码 */
+    @Excel(name = "设备类型代码")
+    private String devclassCode;
+
+    /** 设备类型名称 */
+    @Excel(name = "设备类型名称")
+    private String devclassName;
+
+    /** 型号名称 */
+    @Excel(name = "型号名称")
+    private String devtypeName;
+
+    /** 型号代码 */
+    @Excel(name = "型号代码")
+    private String devtypeCode;
+
+    /** 连接名称 */
+    @Excel(name = "连接名称")
+    private String devconnName;
+
+    /** 连接类型 */
+    @Excel(name = "连接类型")
+    private String devconnType;
+
+    private String tid;
+}

src/main/java/com/yunfeiyun/agmp/iotm/device/domain/resvo/IotDeviceconnListRspVo.java

@@ -0,0 +1,55 @@
+package com.yunfeiyun.agmp.iotm.device.domain.resvo;
+
+import com.yunfeiyun.agmp.common.annotation.Excel;
+import com.yunfeiyun.agmp.iot.common.enums.IotDeviceconnTypeEnum;
+import lombok.Data;
+
+/**
+ * 设备连接配置对象 IotDeviceconn
+ * 
+ * @author 杨晓辉
+ * @date 2024-11-06
+ */
+@Data
+public class IotDeviceconnListRspVo
+{
+    private static final long serialVersionUID = 1L;
+
+    private String devconnBid;
+
+    /** 连接类型 */
+    private String devconnType;
+
+    /** 连接名称 */
+    private String devconnName;
+
+    private String devconnTypeName;
+
+    private String devconnRemark;
+
+    private String devclassBid;
+
+    public String getDevconnTypeName() {
+        String devconnTypeName = "未知";
+        IotDeviceconnTypeEnum devconnTypeEnum = IotDeviceconnTypeEnum.findEnumByCode(devconnType);
+        if (devconnTypeEnum != null) {
+            devconnTypeName = devconnTypeEnum.getName();
+        }
+        return devconnTypeName;
+    }
+
+    /** 设备类型代码 */
+    private String devclassCode;
+
+    /** 设备类型名称 */
+    private String devclassName;
+
+    private String devtypeBid;
+
+    /** 型号代码 */
+    private String devtypeCode;
+
+    /** 型号名称 */
+    private String devtypeName;
+
+}

src/main/java/com/yunfeiyun/agmp/iotm/device/mapper/IotDeviceconnMapper.java

@@ -1,6 +1,8 @@
 package com.yunfeiyun.agmp.iotm.device.mapper;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
+import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnListReqVo;
+import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDeviceconnListRspVo;
 
 import java.util.List;
 
@@ -59,4 +61,13 @@ public interface IotDeviceconnMapper
      * @return 结果
      */
     public int deleteIotDeviceconnByIds(Long[] ids);
+
+
+    /**
+     * 查询设备连接配置列表
+     *
+     * @param reqVo 设备连接配置
+     * @return 设备连接配置集合
+     */
+    public List<IotDeviceconnListRspVo> listDeviceconn(IotDeviceconnListReqVo reqVo);
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/service/IIotDeviceconnService.java

@@ -2,6 +2,8 @@ package com.yunfeiyun.agmp.iotm.device.service;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
 import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnAddReqVo;
+import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnListReqVo;
+import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDeviceconnListRspVo;
 
 import java.util.List;
 
@@ -62,4 +64,12 @@ public interface IIotDeviceconnService
     public int deleteIotDeviceconnById(Long id);
 
     public int addDeviceconn(IotDeviceconnAddReqVo reqVo);
+
+    /**
+     * 查询设备连接配置列表
+     *
+     * @param iotDeviceconn 设备连接配置
+     * @return 设备连接配置集合
+     */
+    public List<IotDeviceconnListRspVo> listDeviceconn(IotDeviceconnListReqVo reqVo);
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/service/impl/IotDeviceconnServiceImpl.java

@@ -12,6 +12,8 @@ import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
 import com.yunfeiyun.agmp.iot.common.enums.IotDeviceconnTypeEnum;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnAddReqVo;
+import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnListReqVo;
+import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDeviceconnListRspVo;
 import com.yunfeiyun.agmp.iotm.device.mapper.IotDeviceconnMapper;
 import com.yunfeiyun.agmp.iotm.device.service.IIotDeviceconnService;
 import com.yunfeiyun.agmp.iotm.device.service.ITosDevicetypeService;
@@ -54,6 +56,7 @@ public class IotDeviceconnServiceImpl implements IIotDeviceconnService
     @Override
     public List<IotDeviceconn> selectIotDeviceconnList(IotDeviceconn iotDeviceconn)
     {
+        iotDeviceconn.setTid(SecurityUtils.getTid());
         return iotDeviceconnMapper.selectIotDeviceconnList(iotDeviceconn);
     }
 
@@ -140,6 +143,7 @@ public class IotDeviceconnServiceImpl implements IIotDeviceconnService
         iotDeviceconn.setDevconnType(devconnType);
         iotDeviceconn.setDevconnName(devconnName);
         iotDeviceconn.setDevconnConfig(devconnConfig);
+        iotDeviceconn.setDevconnRemark(reqVo.getDevconnRemark());
         iotDeviceconn.setDevconnCreator(SecurityUtils.getUserId());
         iotDeviceconn.setDevconnCreateddate(DateUtils.dateTimeNow());
         int status = insertIotDeviceconn(iotDeviceconn);
@@ -147,4 +151,16 @@ public class IotDeviceconnServiceImpl implements IIotDeviceconnService
         // Todo 发送消息，创建设备连接
         return status;
     }
+
+    /**
+     * 查询设备连接配置列表
+     *
+     * @param reqVo@return 设备连接配置集合
+     */
+    @Override
+    public List<IotDeviceconnListRspVo> listDeviceconn(IotDeviceconnListReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
+        List<IotDeviceconnListRspVo> iotDeviceconnListRspVoList = iotDeviceconnMapper.listDeviceconn(reqVo);
+        return iotDeviceconnListRspVoList;
+    }
 }

src/main/resources/mapper/IotDeviceconnMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="devconnType"    column="devconnType"    />
         <result property="devconnName"    column="devconnName"    />
         <result property="devconnConfig"    column="devconnConfig"    />
+        <result property="devconnRemark"    column="devconnRemark"    />
         <result property="devconnCreator"    column="devconnCreator"    />
         <result property="devconnModifier"    column="devconnModifier"    />
         <result property="devconnModifieddate"    column="devconnModifieddate"    />
@@ -19,22 +20,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectIotDeviceconnVo">
-        select id, devconnBid, devtypeBid, devconnType, devconnName, devconnConfig, devconnCreator, devconnModifier, devconnModifieddate, devconnCreateddate, tid from IotDeviceconn
+        select id, devconnBid, devtypeBid, devconnType, devconnName, devconnConfig, devconnRemark, devconnCreator,
+            devconnModifier, devconnModifieddate, devconnCreateddate, tid from IotDeviceconn
     </sql>
 
     <select id="selectIotDeviceconnList" parameterType="IotDeviceconn" resultMap="IotDeviceconnResult">
         <include refid="selectIotDeviceconnVo"/>
-        <where>  
+        <where>
+            tid = #{tid}
             <if test="devconnBid != null  and devconnBid != ''"> and devconnBid = #{devconnBid}</if>
             <if test="devtypeBid != null  and devtypeBid != ''"> and devtypeBid = #{devtypeBid}</if>
             <if test="devconnType != null  and devconnType != ''"> and devconnType = #{devconnType}</if>
             <if test="devconnName != null  and devconnName != ''"> and devconnName like concat('%', #{devconnName}, '%')</if>
             <if test="devconnConfig != null  and devconnConfig != ''"> and devconnConfig = #{devconnConfig}</if>
+            <if test="devconnRemark != null  and devconnRemark != ''"> and devconnRemark = #{devconnRemark}</if>
             <if test="devconnCreator != null  and devconnCreator != ''"> and devconnCreator = #{devconnCreator}</if>
             <if test="devconnModifier != null  and devconnModifier != ''"> and devconnModifier = #{devconnModifier}</if>
             <if test="devconnModifieddate != null  and devconnModifieddate != ''"> and devconnModifieddate = #{devconnModifieddate}</if>
             <if test="devconnCreateddate != null  and devconnCreateddate != ''"> and devconnCreateddate = #{devconnCreateddate}</if>
-            <if test="tid != null  and tid != ''"> and tid = #{tid}</if>
         </where>
     </select>
     
@@ -42,7 +45,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectIotDeviceconnVo"/>
         where id = #{id}
     </select>
-        
+
+    <select id="listDeviceconn"
+            parameterType="com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnListReqVo"
+            resultType="com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDeviceconnListRspVo">
+        SELECT dcn.devconnBid, dcn.devconnType, dcn.devconnName, dcn.devconnRemark, dc.devclassBid, dc.devclassCode,
+            dc.devclassName, dt.devtypeBid, dt.devtypeCode, dt.devtypeName
+        FROM IotDeviceconn AS dcn
+            LEFT JOIN TosDevicetype AS dt ON dt.devtypeBid = dcn.devtypeBid
+            LEFT JOIN TosDeviceclass AS dc ON dc.devclassBid = dt.devclassBid
+        <where>
+            dcn.tid = #{tid}
+            <if test="devclassCode != null  and devclassCode != ''"> and dc.devclassCode like concat('%', #{devclassCode}, '%')</if>
+            <if test="devclassName != null  and devclassName != ''"> and dc.devclassName like concat('%', #{devclassName}, '%')</if>
+            <if test="devtypeName != null  and devtypeName != ''"> and dt.devtypeName like concat('%', #{devtypeName}, '%')</if>
+            <if test="devtypeCode != null  and devtypeCode != ''"> and dt.devtypeCode like concat('%', #{devtypeCode}, '%')</if>
+            <if test="devconnName != null  and devconnName != ''"> and dcn.devconnName like concat('%', #{devconnName}, '%')</if>
+            <if test="devconnType != null  and devconnType != ''"> and devconnType = #{devconnType}</if>
+        </where>
+    </select>
+
     <insert id="insertIotDeviceconn" parameterType="IotDeviceconn" useGeneratedKeys="true" keyProperty="id">
         insert into IotDeviceconn
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -51,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devconnType != null">devconnType,</if>
             <if test="devconnName != null">devconnName,</if>
             <if test="devconnConfig != null">devconnConfig,</if>
+            <if test="devconnRemark != null">devconnRemark,</if>
             <if test="devconnCreator != null">devconnCreator,</if>
             <if test="devconnModifier != null">devconnModifier,</if>
             <if test="devconnModifieddate != null">devconnModifieddate,</if>
@@ -63,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devconnType != null">#{devconnType},</if>
             <if test="devconnName != null">#{devconnName},</if>
             <if test="devconnConfig != null">#{devconnConfig},</if>
+            <if test="devconnRemark != null">#{devconnRemark},</if>
             <if test="devconnCreator != null">#{devconnCreator},</if>
             <if test="devconnModifier != null">#{devconnModifier},</if>
             <if test="devconnModifieddate != null">#{devconnModifieddate},</if>
@@ -79,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devconnType != null">devconnType = #{devconnType},</if>
             <if test="devconnName != null">devconnName = #{devconnName},</if>
             <if test="devconnConfig != null">devconnConfig = #{devconnConfig},</if>
+            <if test="devconnRemark != null">devconnRemark = #{devconnRemark},</if>
             <if test="devconnCreator != null">devconnCreator = #{devconnCreator},</if>
             <if test="devconnModifier != null">devconnModifier = #{devconnModifier},</if>
             <if test="devconnModifieddate != null">devconnModifieddate = #{devconnModifieddate},</if>