diff --git a/fastbee-service/fastbee-iot-service/pom.xml b/fastbee-service/fastbee-iot-service/pom.xml index f4e4828..6c7ce57 100644 --- a/fastbee-service/fastbee-iot-service/pom.xml +++ b/fastbee-service/fastbee-iot-service/pom.xml @@ -166,6 +166,18 @@ 3.8.5 compile + + com.fastbee + fastbee-project-service + 3.8.5 + compile + + + com.fastbee + fastbee-project-service + 3.8.5 + compile + diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/DeviceMapper.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/DeviceMapper.java index 1a5a710..3a936ae 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/DeviceMapper.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/DeviceMapper.java @@ -1,5 +1,6 @@ package com.fastbee.iot.mapper; +import cn.hutool.core.date.DateTime; import com.fastbee.common.core.device.DeviceAndProtocol; import com.fastbee.common.core.thingsModel.ThingsModelValuesInput; import com.fastbee.iot.domain.Device; @@ -8,6 +9,7 @@ import com.fastbee.iot.model.*; import com.fastbee.iot.model.ThingsModels.ThingsModelValuesOutput; import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Param; +import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Repository; import java.util.List; @@ -364,4 +366,13 @@ public interface DeviceMapper extends MPJBaseMapper */ List listDeviceGroupByGroupIds(List groupIds); + /** + * 更新设备激活信息 + * @param serialNumber + * @param activationTime + * @return + */ + int updateDeviceActivationStatus(@Param("serialNumber") String serialNumber, @Param("activationTime")DateTime activationTime,@Param("tenantId")Long tenantId,@Param("tenantName")String tenantName,@Param("longitude")double longitude,@Param("latitude")double latitude,@Param("imgUrl")String imgUrl); + + } diff --git a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml index 1cbaccf..404a85b 100644 --- a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml +++ b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml @@ -1006,4 +1006,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + update iot_device + set status = 3, + active_time=#{activationTime}, + update_time=#{activationTime}, + tenant_id=#{tenantId}, + tenant_name=#{tenantName}, + longitude=#{longitude}, + latitude=#{latitude}, + img_url=#{imgUrl} + where serial_number = #{serialNumber} + +