bug

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/dos/mysql/KwsDeviceIntegration.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -33,7 +34,7 @@ public class KwsDeviceIntegration implements Serializable {
     /**
     * 状态
     */
-    private Byte status;
+    private Integer status;
 
     /**
     * 创建人
@@ -43,7 +44,7 @@ public class KwsDeviceIntegration implements Serializable {
     /**
     * 创建时间
     */
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
     * 修改人
@@ -53,7 +54,7 @@ public class KwsDeviceIntegration implements Serializable {
     /**
     * 修改时间
     */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
     * 删除标识

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/param/DeviceAdd.java

@@ -83,4 +83,9 @@ public class DeviceAdd {
      */
     private String interFace;
 
+    /**
+     * 集成ID
+     */
+    private String integrationId;
+
 }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/DeviceService.java

@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.model.enums.DeviceEnum;
 import com.sckw.core.model.enums.DictItemEnum;
 import com.sckw.core.model.page.PageRes;
+import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.slope.detection.dao.mysql.*;
@@ -147,6 +149,8 @@ public class DeviceService {
         KwsDevice device = new KwsDevice();
         BeanUtils.copyProperties(deviceAdd, device);
         LocalDateTime now = LocalDateTime.now();
+        long id = new IdWorker(NumberConstant.ONE).nextId();
+        device.setId(id);
         device.setCreateBy(Long.parseLong(headerData.getCreateBy()));
         device.setCreateTime(now);
         device.setStatus(DeviceEnum.IDENTIFYING.getCode());
@@ -154,7 +158,23 @@ public class DeviceService {
         device.setUpdateTime(now);
         device.setMountainId(headerData.getCompanyId());
         deviceMapper.insert(device);
-        //log.info("设备新增 add param:{}", JSONObject.toJSONString(a));
+        //新增到数据表kws_device_relation
+        KwsDeviceIntegration deIntergration = new KwsDeviceIntegration();
+        String[] temp;//接收分割后的数组
+        temp = deviceAdd.getIntegrationId().split(Global.COMMA);
+        for(int i=0;i<temp.length;i++){
+            long interId = new IdWorker(NumberConstant.ONE).nextId();
+            deIntergration.setId(interId);
+            deIntergration.setDeviceId(id);
+            deIntergration.setMountainId(headerData.getCompanyId());
+            deIntergration.setIntegrationId(Long.parseLong(temp[i]));
+            deIntergration.setCreateBy(Long.parseLong(headerData.getCreateBy()));
+            deIntergration.setCreateTime(now);
+            deIntergration.setStatus(NumberConstant.ZERO);
+            deIntergration.setUpdateBy(Long.parseLong(headerData.getUpdateBy()));
+            deIntergration.setUpdateTime(now);
+            deviceIntegrationMapper.insert(deIntergration);
+        }
         return HttpResult.ok();
     }
 

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsDeviceIntegrationMapper.xml

@@ -44,10 +44,10 @@
         <!--@mbg.generated-->
         insert into kws_device_integration (id, device_id, integration_id,
                                             `status`, create_by, create_time,
-                                            update_by, update_time, del_flag)
+                                            update_by, update_time, del_flag,mountain_id)
         values (#{id,jdbcType=BIGINT}, #{deviceId,jdbcType=BIGINT}, #{integrationId,jdbcType=BIGINT},
                 #{status,jdbcType=TINYINT}, #{createBy,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP},
-                #{updateBy,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=TINYINT})
+                #{updateBy,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=TINYINT}, #{mountainId,jdbcType=TINYINT})
     </insert>
     <insert id="insertSelective" parameterType="com.sckw.slope.detection.model.dos.mysql.KwsDeviceIntegration">
         <!--@mbg.generated-->

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsDeviceMapper.xml

@@ -66,7 +66,7 @@
               and attribute = #{deviceQuery.attribute,jdbcType=TINYINT}
           </if>
   </select>
-  <insert id="insert" parameterType="com.sckw.slope.detection.model.dos.mysql.KwsDevice">
+  <insert id="insert" parameterType="com.sckw.slope.detection.model.dos.mysql.KwsDevice" keyColumn="uuid" keyProperty="uuid">
     <!--@mbg.generated-->
     insert into kws_device (id, `attribute`, `name`, 
       `alias`, sn_code, model_id,