From be5c66378d80d356bcc695e62e23990c6c6be4b6 Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Thu, 27 Mar 2025 19:50:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor(iot):=20=E9=87=8D=E6=9E=84=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=92=8C=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 Attachment 类的冗余导入- 删除 DeviceMapper.xml 中的冗余关联映射 - 更新 DeviceStatusVo 和 DeviceVo 中的字段 - 移除 RecordDataRepository 中的告警统计相关方法- 更新 RecordDataServiceImpl 中的 recordDataStatus 方法 - 删除 RecordDataStatusVo 中的告警统计字段 --- .../modules/attachment/entity/Attachment.java | 1 + .../modules/iot/device/vo/DeviceStatusVo.java | 9 +++++++++ .../edu/gateway/modules/iot/device/vo/DeviceVo.java | 10 ---------- .../iot/record/entity/RecordDataStatusVo.java | 9 --------- .../iot/record/repo/RecordDataRepository.java | 8 -------- .../record/service/impl/RecordDataServiceImpl.java | 4 ---- src/main/resources/mappers/iot/DeviceMapper.xml | 12 ------------ 7 files changed, 10 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/zsc/edu/gateway/modules/attachment/entity/Attachment.java b/src/main/java/com/zsc/edu/gateway/modules/attachment/entity/Attachment.java index f6aef75..f9f08a4 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/attachment/entity/Attachment.java +++ b/src/main/java/com/zsc/edu/gateway/modules/attachment/entity/Attachment.java @@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.Objects; /** * 附件 diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/vo/DeviceStatusVo.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/vo/DeviceStatusVo.java index 955eae4..60b91ed 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/vo/DeviceStatusVo.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/vo/DeviceStatusVo.java @@ -59,4 +59,13 @@ public class DeviceStatusVo { */ public Long gatewaySubCount; + /** + * 报警数 + */ + public Long warningCount; + + /** + * 今日新增 + */ + public Long todayWarningCount; } diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/vo/DeviceVo.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/vo/DeviceVo.java index 094bafa..dfbcb4e 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/vo/DeviceVo.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/vo/DeviceVo.java @@ -110,22 +110,12 @@ public class DeviceVo { */ public String iconId; - /** - * 设备图标附件 - */ - public Attachment icon; - /** * 设备预览图附件ID */ public String previewId; - /** - * 设备预览图附件 - */ - public Attachment preview; - /** * 所属产品ID */ diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/record/entity/RecordDataStatusVo.java b/src/main/java/com/zsc/edu/gateway/modules/iot/record/entity/RecordDataStatusVo.java index 1b90770..d5598ec 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/record/entity/RecordDataStatusVo.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/record/entity/RecordDataStatusVo.java @@ -19,13 +19,4 @@ public class RecordDataStatusVo { */ public Long dataCount; - /** - * 告警总数 - */ - private Long warningCount; - - /** - * 今日新增 - */ - private Long todayWarningCount; } diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/record/repo/RecordDataRepository.java b/src/main/java/com/zsc/edu/gateway/modules/iot/record/repo/RecordDataRepository.java index 4bde8f7..f6add90 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/record/repo/RecordDataRepository.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/record/repo/RecordDataRepository.java @@ -12,14 +12,6 @@ import java.util.List; * @author zhuang */ public interface RecordDataRepository extends BaseMapper { - @Select("SELECT COUNT(*) FROM iot_record_data WHERE content::jsonb->>'warning' IS NOT NULL AND (content::jsonb->>'warning')::int & 1 = 0 AND ((content::jsonb->>'warning')::int & ~1) > 0") - long countWarnings(); - - @Select("SELECT COUNT(*) FROM iot_record_data WHERE content::jsonb->>'warning' IS NOT NULL AND ((content::jsonb->>'warning')::int & 1 = 0) AND ((content::jsonb->>'warning')::int & ~1) > 0 AND record_time >= #{todayStart}") - long countTodayWarnings(@Param("todayStart") LocalDateTime todayStart); - - @Select("SELECT COUNT(*) FROM iot_record_data WHERE content::jsonb->>'warning' IS NOT NULL AND (content::jsonb->>'warning')::int & #{bitPosition} = #{bitPosition}") - long countWarningsByBit(@Param("bitPosition") int bitPosition); List selectByClientId(@Param("clientId") String clientId); } diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java index 640e1f8..6547de5 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java @@ -72,11 +72,7 @@ public class RecordDataServiceImpl extends ServiceImpl())) .dataCount(baseMapper.selectCount(new LambdaQueryWrapper().isNotNull(RecordData::getContent))) .build(); diff --git a/src/main/resources/mappers/iot/DeviceMapper.xml b/src/main/resources/mappers/iot/DeviceMapper.xml index d16c7d0..0436c3f 100644 --- a/src/main/resources/mappers/iot/DeviceMapper.xml +++ b/src/main/resources/mappers/iot/DeviceMapper.xml @@ -36,18 +36,6 @@ - - - - - - - -