接口调整

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/domain/vo/IotDeviceVo.java

@@ -22,6 +22,7 @@ public class IotDeviceVo extends BaseVO {
      * 所属产品
      */
     private Long productId;
+    private Long deviceId;
     /**
      * 产品名称
      */

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/entity/IotProjectDevice.java

@@ -29,6 +29,11 @@ public class IotProjectDevice extends BaseDO {
      */
     @TableField(value = "project_id")
     private Long projectId;
+    /**
+     * 产品id
+     */
+    @TableField(value = "product_id")
+    private Long productId;
 
     /**
      * 设备id

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/service/IotProjectDeviceService.java

@@ -80,11 +80,14 @@ public class IotProjectDeviceService extends ServiceImpl<IotProjectDeviceMapper,
         }
         //校验项目
         iotProjectService.check(iotProjectDevicePara.getProjectId());
-        //设备校验
-        for (Long deviceId : iotProjectDevicePara.getDeviceIds()) {
-            check(deviceId);
-        }
+
         iotProjectDevicePara.getDeviceIds().forEach(e -> {
+            //设备校验
+            IotDevice iotDevice = iotDeviceMapper.selectById(e);
+            if (Objects.isNull(iotDevice) || Global.DEL == iotDevice.getDelFlag()) {
+                throw new BusinessException(iotDevice.getId() + ":设备不存在");
+            }
+            //绑定校验
             IotProjectDevice iotProjectDevice = iotProjectDeviceMapper.selectOne(new LambdaQueryWrapper<IotProjectDevice>()
                     .eq(IotProjectDevice::getDeviceId, e)
                     .eq(IotProjectDevice::getDelFlag, Global.UN_DEL)
@@ -95,6 +98,7 @@ public class IotProjectDeviceService extends ServiceImpl<IotProjectDeviceMapper,
             } else {
                 //没有则新增
                 IotProjectDevice iotProjectDeviceA = new IotProjectDevice();
+                iotProjectDeviceA.setProductId(iotDevice.getProductId());
                 iotProjectDeviceA.setProjectId(iotProjectDevicePara.getProjectId());
                 iotProjectDeviceA.setDeviceId(e);
                 iotProjectDeviceMapper.insert(iotProjectDeviceA);

iot-module/iot-module-manage/iot-module-manage-biz/src/main/resources/mapper/IotProjectDeviceMapper.xml

@@ -6,6 +6,7 @@
         <!--@Table iot_project_device-->
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="project_id" jdbcType="BIGINT" property="projectId"/>
+        <result column="product_id" jdbcType="BIGINT" property="productId"/>
         <result column="device_id" jdbcType="BIGINT" property="deviceId"/>
         <result column="create_by" jdbcType="BIGINT" property="createBy"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
@@ -18,6 +19,7 @@
         <!--@mbg.generated-->
         id,
         project_id,
+        product_id,
         device_id,
         create_by,
         update_time,
@@ -47,7 +49,24 @@
 
 
     <select id="pageQuery" resultType="com.middle.platform.manage.biz.domain.vo.IotDeviceVo">
-        select ide.*
+        select ipd.id,
+               ide.id as deviceId,
+               ide.product_id,
+               ide.name,
+               ide.sn,
+               ide.guid,
+               ide.subtitle,
+               ide.lon,
+               ide.lat,
+               ide.address,
+               ide.online_time,
+               ide.status,
+               ide.enable_flag,
+               ide.remark,
+               ide.create_by,
+               ide.create_time,
+               ide.update_by,
+               ide.update_time
         from iot_project_device ipd
                  left join iot_device ide on ide.id = ipd.device_id
         <where>