阶段提交：iotm ,iots

src/main/java/com/yunfeiyun/agmp/iotm/web/controller/IotDeviceconfigController.java

@@ -0,0 +1,133 @@
+package com.yunfeiyun.agmp.iotm.web.controller;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.yunfeiyun.agmp.common.annotation.Log;
+import com.yunfeiyun.agmp.common.constant.ErrorCode;
+import com.yunfeiyun.agmp.common.core.controller.BaseController;
+import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
+import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
+import com.yunfeiyun.agmp.common.enums.BusinessType;
+import com.yunfeiyun.agmp.common.utils.StringUtils;
+import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
+import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconfig;
+import com.yunfeiyun.agmp.iot.common.util.tmn.CustomerIdUtil;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceconfigService;
+import org.apache.http.util.TextUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 设备配置Controller
+ *
+ * @author 杨晓辉
+ * @date 2024-01-04
+ */
+@RestController
+@RequestMapping("/iot/deviceconfig")
+public class IotDeviceconfigController extends BaseController {
+    @Autowired
+    private IIotDeviceconfigService iotDeviceconfigService;
+
+    /**
+     * 查询设备配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('iot:deviceconfig:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(IotDeviceconfig iotDeviceconfig) {
+        startPage();
+        List<IotDeviceconfig> list = iotDeviceconfigService.selectIotDeviceconfigList(iotDeviceconfig);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询设备配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('iot:deviceconfig:info')")
+    @GetMapping("/info")
+    public AjaxResult info(@RequestParam("devBid") String devBid) {
+        if (StringUtils.isBlank(devBid)) {
+            return error(ErrorCode.INVALID_PARAMETER.getCode(), ErrorCode.INVALID_PARAMETER.getMessage());
+        }
+        IotDeviceconfig iotDeviceconfig = new IotDeviceconfig();
+        iotDeviceconfig.setDevBid(devBid);
+        List<IotDeviceconfig> list = iotDeviceconfigService.selectIotDeviceconfigList(iotDeviceconfig);
+        if (list.isEmpty()) {
+            return success();
+        } else {
+            return success(JSONObject.parseObject(list.get(0).getDevcfgContext()));
+        }
+    }
+
+
+    /**
+     * 导出设备配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('iot:deviceconfig:export')")
+    @Log(title = "设备配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, IotDeviceconfig iotDeviceconfig) {
+        List<IotDeviceconfig> list = iotDeviceconfigService.selectIotDeviceconfigList(iotDeviceconfig);
+        ExcelUtil<IotDeviceconfig> util = new ExcelUtil<IotDeviceconfig>(IotDeviceconfig.class);
+        util.exportExcel(response, list, "设备配置数据");
+    }
+
+
+    /**
+     * 新增设备配置
+     */
+    @PreAuthorize("@ss.hasPermi('iot:deviceconfig:add')")
+    @Log(title = "设备配置", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody IotDeviceconfig iotDeviceconfig) {
+        return toAjax(iotDeviceconfigService.insertIotDeviceconfig(iotDeviceconfig));
+    }
+
+    /**
+     * 修改设备配置（新建也调此接口）
+     */
+    @PreAuthorize("@ss.hasPermi('iot:deviceconfig:edit')")
+    @Log(title = "设备配置", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody IotDeviceconfig iotDeviceconfig)
+    {
+
+        if(iotDeviceconfig==null ||TextUtils.isEmpty(iotDeviceconfig.getDevBid())){
+            return error(ErrorCode.INVALID_PARAMETER.getCode());
+        }
+
+        IotDeviceconfig findItem = iotDeviceconfigService.selectIotDeviceConfigByDevBid(iotDeviceconfig.getDevBid());
+        if(null == findItem){
+            // 如果配置为空，则新增配置
+            IotDeviceconfig newItem = new IotDeviceconfig();
+            newItem.setDevcfgBid(iotDeviceconfig.getUUId());
+            newItem.setTid(CustomerIdUtil.getCustomerId());
+            newItem.setDevBid(iotDeviceconfig.getDevBid());
+            newItem.setDevcfgContext(iotDeviceconfig.getDevcfgContext());
+            newItem.setDevcfgDelstatus("0");
+            iotDeviceconfigService.insertIotDeviceconfig(newItem);
+        }else {
+            // 如果配置不为空，则更新配置
+            findItem.setDevcfgContext(iotDeviceconfig.getDevcfgContext());
+            iotDeviceconfigService.updateIotDeviceconfig(findItem);
+        }
+
+        logger.debug("不真正发送指令！");
+        iotDeviceconfigService.sendConfig(iotDeviceconfig);
+
+        return toAjax(1);
+    }
+
+    /**
+     * 删除设备配置
+     */
+    @PreAuthorize("@ss.hasPermi('iot:deviceconfig:remove')")
+    @Log(title = "设备配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/delete")
+    public AjaxResult remove(@RequestParam("ids") Long[] ids) {
+        return toAjax(iotDeviceconfigService.deleteIotDeviceconfigByIds(ids));
+    }
+}

src/main/resources/mapper/IotDeviceMapper.xml

@@ -45,13 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="devOnlinedate"    column="devOnlinedate"    />
         <result property="devSubtype"    column="devSubtype"    />
         <result property="devOriginalid"    column="devOriginalid"    />
-        <result property="devHostingstatus"    column="devHostingstatus"    />
         <result property="extInfo"    column="extInfo"    />
-        <result property="cid"    column="cid"    />
     </resultMap>
 
     <sql id="selectIotDeviceVo">
-        SELECT d.* dt.devtypeName, dc.devclassName,dt.devtypePreview devPic
+        SELECT d.* ,dt.devtypeName, dc.devclassName,dt.devtypePreview devPic
         FROM IotDevice AS d
             LEFT JOIN TosDevicetype AS dt ON dt.devtypeBid = d.devtypeBid
             LEFT JOIN TosDeviceclass AS dc ON dc.devclassBid = d.devclassBid
@@ -98,7 +96,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devOriginalid != null  and devOriginalid != ''"> and d.devOriginalid = #{devOriginalid}</if>
             <if test="devHostingstatus != null  and devHostingstatus != ''"> and d.devHostingstatus = #{devHostingstatus}</if>
             <if test="extInfo != null  and extInfo != ''"> and d.extInfo = #{extInfo}</if>
-            <if test="cid != null  and cid != ''"> and d.cid = #{cid}</if>
         </where>
     </select>
 
@@ -150,7 +147,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devOriginalid != null  and devOriginalid != ''"> and d.devOriginalid = #{devOriginalid}</if>
             <if test="devHostingstatus != null  and devHostingstatus != ''"> and d.devHostingstatus = #{devHostingstatus}</if>
             <if test="extInfo != null  and extInfo != ''"> and d.extInfo = #{extInfo}</if>
-            <if test="cid != null  and cid != ''"> and d.cid = #{cid}</if>
             <if test="devVersion != null  and devVersion != ''"> and d.devVersion = #{devVersion}</if>
 
             <if test="devtypeBidList != null  and devtypeBidList.size() > 0">
@@ -206,7 +202,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devOriginalid != null">devOriginalid,</if>
             <if test="devHostingstatus != null">devHostingstatus,</if>
             <if test="extInfo != null">extInfo,</if>
-            <if test="cid != null">cid,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="devBid != null">#{devBid},</if>
@@ -249,7 +244,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devOriginalid != null">#{devOriginalid},</if>
             <if test="devHostingstatus != null">#{devHostingstatus},</if>
             <if test="extInfo != null">#{extInfo},</if>
-            <if test="cid != null">#{cid},</if>
          </trim>
     </insert>
 
@@ -259,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             devProvince, devCity, devDistrict, devLng, devLat, devPositionstatus, devPositiontype, devTag, devRecogtype,
             devNetworktype, devOfflinedate, devProvincealign, devCityalign, devDistrictalign, devLngalign, devLatalign,
             devContacts, devTel, devCreator, devModifier, devUpdateddate, devModifieddate, devCreateddate, devDelstatus,
-            devOnlinedate, devSubtype, devOriginalid, devHostingstatus, extInfo, cid
+            devOnlinedate, devSubtype, devOriginalid, devHostingstatus, extInfo
         )
         values
         <foreach collection="list" item="item" index="index" separator=",">
@@ -271,7 +265,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item.devCityalign}, #{item.devDistrictalign}, #{item.devLngalign}, #{item.devLatalign}, #{item.devContacts},
                 #{item.devTel}, #{item.devCreator}, #{item.devModifier}, #{item.devUpdateddate}, #{item.devModifieddate},
                 #{item.devCreateddate}, #{item.devDelstatus}, #{item.devOnlinedate}, #{item.devSubtype}, #{item.devOriginalid},
-                #{item.devHostingstatus}, #{item.extInfo}, #{item.cid}
+                #{item.devHostingstatus}, #{item.extInfo},
             )
         </foreach>
     </insert>
@@ -317,7 +311,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devOriginalid != null">devOriginalid = #{devOriginalid},</if>
             <if test="devHostingstatus != null">devHostingstatus = #{devHostingstatus},</if>
             <if test="extInfo != null">extInfo = #{extInfo},</if>
-            <if test="cid != null">cid = #{cid},</if>
 
         </trim>
         where devBid = #{devBid}

src/main/resources/mapper/IotDeviceconfigMapper.xml

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="IotDeviceconfig" id="IotDeviceconfigResult">
         <result property="id"    column="id"    />
         <result property="devcfgBid"    column="devcfgBid"    />
-        <result property="cId"    column="cId"    />
+        <result property="tid"    column="tid"    />
         <result property="devBid"    column="devBid"    />
         <result property="devcfgCmd"    column="devcfgCmd"    />
         <result property="devcfgContext"    column="devcfgContext"    />
@@ -19,14 +19,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectIotDeviceconfigVo">
-        select id, devcfgBid, cId, devBid, devcfgCmd, devcfgContext, devcfgCreator, devcfgModifier, devcfgModifieddate, devcfgCreateddate, devcfgDelstatus from IotDeviceconfig
+        select id, devcfgBid, tid, devBid, devcfgCmd, devcfgContext, devcfgCreator, devcfgModifier, devcfgModifieddate, devcfgCreateddate, devcfgDelstatus from IotDeviceconfig
     </sql>
 
     <select id="selectIotDeviceconfigList" parameterType="IotDeviceconfig" resultMap="IotDeviceconfigResult">
         <include refid="selectIotDeviceconfigVo"/>
         <where>
             <if test="devcfgBid != null  and devcfgBid != ''"> and devcfgBid = #{devcfgBid}</if>
-            <if test="cId != null  and cId != ''"> and cId = #{cId}</if>
+            <if test="tid != null  and tid != ''"> and tid = #{tid}</if>
             <if test="devBid != null  and devBid != ''"> and devBid = #{devBid}</if>
             <if test="devcfgCmd != null  and devcfgCmd != ''"> and devcfgCmd = #{devcfgCmd}</if>
             <if test="devcfgContext != null  and devcfgContext != ''"> and devcfgContext = #{devcfgContext}</if>
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into IotDeviceconfig
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="devcfgBid != null">devcfgBid,</if>
-            <if test="cId != null">cId,</if>
+            <if test="tid != null">tid,</if>
             <if test="devBid != null">devBid,</if>
             <if test="devcfgCmd != null">devcfgCmd,</if>
             <if test="devcfgContext != null">devcfgContext,</if>
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="devcfgBid != null">#{devcfgBid},</if>
-            <if test="cId != null">#{cId},</if>
+            <if test="tid != null">#{tid},</if>
             <if test="devBid != null">#{devBid},</if>
             <if test="devcfgCmd != null">#{devcfgCmd},</if>
             <if test="devcfgContext != null">#{devcfgContext},</if>
@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update IotDeviceconfig
         <trim prefix="SET" suffixOverrides=",">
             <if test="devcfgBid != null">devcfgBid = #{devcfgBid},</if>
-            <if test="cId != null">cId = #{cId},</if>
+            <if test="tid != null">tid = #{tid},</if>
             <if test="devBid != null">devBid = #{devBid},</if>
             <if test="devcfgCmd != null">devcfgCmd = #{devcfgCmd},</if>
             <if test="devcfgContext != null">devcfgContext = #{devcfgContext},</if>