From d8e35ebfc35ec908bdf5db0591337a8e2c958ebc Mon Sep 17 00:00:00 2001 From: kerwincui <164770707@qq.com> Date: Tue, 7 Jun 2022 14:23:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AFTDengine=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/iot/mapper/ProductAuthorizeMapper.java | 10 ++++++++++ .../ruoyi/iot/service/impl/DeviceServiceImpl.java | 9 ++++++--- .../ruoyi/iot/service/impl/ProductServiceImpl.java | 6 ++++++ .../com/ruoyi/iot/tdengine/dao/TDDeviceLogDAO.java | 4 +++- .../ruoyi/iot/tdengine/init/ApplicationStarted.java | 1 - .../tdengine/service/factory/LogServiceFactory.java | 1 - .../tdengine/service/impl/MySqlLogServiceImpl.java | 13 ++++++++++++- .../service/impl/TdengineLogServiceImpl.java | 3 +-- .../main/resources/mapper/iot/DeviceUserMapper.xml | 2 +- .../resources/mapper/iot/ProductAuthorizeMapper.xml | 7 +++++++ .../resources/mapper/tdengine/TDDeviceLogMapper.xml | 10 ++++++++++ 11 files changed, 56 insertions(+), 10 deletions(-) diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductAuthorizeMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductAuthorizeMapper.java index 8f29e197..413e5712 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductAuthorizeMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductAuthorizeMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.iot.mapper; import java.util.List; import com.ruoyi.iot.domain.ProductAuthorize; +import org.springframework.stereotype.Repository; /** * 产品授权码Mapper接口 @@ -9,6 +10,7 @@ import com.ruoyi.iot.domain.ProductAuthorize; * @author kami * @date 2022-04-11 */ +@Repository public interface ProductAuthorizeMapper { /** @@ -59,6 +61,14 @@ public interface ProductAuthorizeMapper */ public int deleteProductAuthorizeByAuthorizeIds(Long[] authorizeIds); + /** + * 通过产品ID批量删除产品授权码 + * + * @param productIds 产品ID数组 + * @return 结果 + */ + public int deleteProductAuthorizeByProductIds(Long[] productIds); + /** * 批量新增产品授权码 * @param list diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java index 04be8778..f911b4d9 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java @@ -757,12 +757,15 @@ public class DeviceServiceImpl implements IDeviceService { public int deleteDeviceByDeviceIds(Long[] deviceIds) throws SchedulerException { // 删除设备分组 deviceMapper.deleteDeviceGroupByDeviceIds(deviceIds); - // 删除设备日志 + // TODO 删除设备日志 td里面删除 deviceLogMapper.deleteDeviceLogByDeviceIds(deviceIds); + // TODO 删除设备告警记录 + // 删除定时任务 deviceJobService.deleteJobByDeviceIds(deviceIds); - - // TODO 删除设备用户 + // 删除设备用户 + deviceUserMapper.deleteDeviceUserByDeviceIds(deviceIds); + // 删除设备 return deviceMapper.deleteDeviceByDeviceIds(deviceIds); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java index 38af2386..31e84ee4 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.iot.domain.Product; +import com.ruoyi.iot.mapper.ProductAuthorizeMapper; import com.ruoyi.iot.mapper.ProductMapper; import com.ruoyi.iot.model.ChangeProductStatusModel; import com.ruoyi.iot.model.IdAndName; @@ -32,6 +33,9 @@ public class ProductServiceImpl implements IProductService @Autowired private ProductMapper productMapper; + @Autowired + private ProductAuthorizeMapper productAuthorizeMapper; + @Autowired private RedisCache redisCache; @@ -185,6 +189,8 @@ public class ProductServiceImpl implements IProductService } // 删除产品物模型 productMapper.deleteProductThingsModelByProductIds(productIds); + // 删除产品的授权码 + productAuthorizeMapper.deleteProductAuthorizeByProductIds(productIds); // 删除产品 if(productMapper.deleteProductByProductIds(productIds)>0){ return AjaxResult.success("删除成功"); diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogDAO.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogDAO.java index b4907756..ac86a4de 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogDAO.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogDAO.java @@ -1,6 +1,7 @@ package com.ruoyi.iot.tdengine.dao; import com.ruoyi.iot.domain.DeviceLog; +import com.ruoyi.iot.model.DeviceStatistic; import com.ruoyi.iot.model.MonitorModel; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -11,7 +12,6 @@ import java.util.List; /** * @package com.ruoyi.mysql.mysql.tdengine * 类名: DatabaseMapper - * 描述: TODO * 时间: 2022/5/16,0016 1:27 * 开发人: wxy */ @@ -27,6 +27,8 @@ public interface TDDeviceLogDAO { int save(@Param("database") String database,@Param("device") DeviceLog deviceLog); + DeviceStatistic selectCategoryLogCount(@Param("database") String database); + List selectSTable(String database,DeviceLog deviceLog); int delete(String dbName, DeviceLog deviceLog); diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/init/ApplicationStarted.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/init/ApplicationStarted.java index 06f0362d..59cce2f3 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/init/ApplicationStarted.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/init/ApplicationStarted.java @@ -24,7 +24,6 @@ import java.util.Properties; /** * 类名: ApplicationStarted - * 描述: TODO * 时间: 2022/5/18,0018 1:41 * 开发人: wxy */ diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/factory/LogServiceFactory.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/factory/LogServiceFactory.java index 49500315..9736d9d0 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/factory/LogServiceFactory.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/factory/LogServiceFactory.java @@ -15,7 +15,6 @@ import org.springframework.stereotype.Component; /** * 类名: DeviceLogServiceImpl - * 描述: TODO * 时间: 2022/5/19,0019 18:09 * 开发人: wxy */ diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/MySqlLogServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/MySqlLogServiceImpl.java index 483aa0ce..2b93ca8a 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/MySqlLogServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/MySqlLogServiceImpl.java @@ -27,17 +27,28 @@ public class MySqlLogServiceImpl implements ILogService { return deviceLogMapper.insertDeviceLog(deviceLog); } - /** 设备属性、功能、事件和监测数据总数 **/ + /*** + * 设备属性、功能、事件和监测数据总数 + * @return + */ @Override public DeviceStatistic selectCategoryLogCount(){ return deviceLogMapper.selectCategoryLogCount(); } + /*** + * 日志列表 + * @return + */ @Override public List selectDeviceLogList(DeviceLog deviceLog) { return deviceLogMapper.selectDeviceLogList(deviceLog); } + /*** + * 监测数据列表 + * @return + */ @Override public List selectMonitorList(DeviceLog deviceLog) { return deviceLogMapper.selectMonitorList(deviceLog); diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java index fab8e8e3..42e08cbe 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java @@ -46,8 +46,7 @@ public class TdengineLogServiceImpl implements ILogService { /** 设备属性、功能、事件和监测数据总数 **/ @Override public DeviceStatistic selectCategoryLogCount(){ -// return tdDeviceLogDAO.save(dbName,new DeviceLog()); - return null; + return tdDeviceLogDAO.selectCategoryLogCount(dbName); } @Override diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceUserMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceUserMapper.xml index ca1a6904..ada6430e 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceUserMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceUserMapper.xml @@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from iot_device_user where is_owner !=1 and device_id in + delete from iot_device_user where device_id in #{deviceId} diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/ProductAuthorizeMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/ProductAuthorizeMapper.xml index 7624e39e..9cde6919 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/iot/ProductAuthorizeMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/iot/ProductAuthorizeMapper.xml @@ -120,4 +120,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{authorizeId} + + + delete from iot_product_authorize where product_id in + + #{productId} + + \ No newline at end of file diff --git a/springboot/wumei-iot/src/main/resources/mapper/tdengine/TDDeviceLogMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/tdengine/TDDeviceLogMapper.xml index 05f8770a..1ef05040 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/tdengine/TDDeviceLogMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/tdengine/TDDeviceLogMapper.xml @@ -76,6 +76,16 @@ order by ts desc + + INSERT INTO ${database}.device_${device.serialNumber} USING device_log TAGS (#{device.deviceId},#{device.deviceName},#{device.serialNumber})