From e7ff97763ce798d6f55cc4ca5b1d54b29a98a93d Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 26 Mar 2025 11:24:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20dms=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/dromara/dms/domain/BaseAlarmRuleLink.java | 3 +--
 .../src/main/java/org/dromara/dms/domain/DmsDeviceMode.java | 5 +++++
 .../java/org/dromara/dms/domain/bo/DmsDeviceModeBo.java     | 5 ++++-
 .../java/org/dromara/dms/domain/vo/DmsDeviceModeVo.java     | 6 +++++-
 .../dms/service/impl/BaseAlarmRuleLinkServiceImpl.java      | 2 +-
 .../dromara/dms/service/impl/DmsDeviceModeServiceImpl.java  | 6 +++---
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmRuleLink.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmRuleLink.java
index 7273b87..ce03f15 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmRuleLink.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmRuleLink.java
@@ -14,9 +14,8 @@ import java.io.Serial;
  * @date 2025-03-17
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("base_alarm_rule_link")
-public class BaseAlarmRuleLink extends BaseEntity {
+public class BaseAlarmRuleLink {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceMode.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceMode.java
index 1ed27f8..88b73e7 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceMode.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceMode.java
@@ -48,5 +48,10 @@ public class DmsDeviceMode extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 文件名
+     */
+    private String ossId;
+
 
 }
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeBo.java
index ebc170e..9de3ebd 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeBo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeBo.java
@@ -46,5 +46,8 @@ public class DmsDeviceModeBo extends BaseEntity {
      */
     private String remark;
 
-
+    /**
+     * 对象存储ID
+     */
+    private String ossId;
 }
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeVo.java
index e036b9e..37e1617 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeVo.java
@@ -59,5 +59,9 @@ public class DmsDeviceModeVo implements Serializable {
     @ExcelProperty(value = "场景描述")
     private String remark;
 
-
+    /**
+     * 对象存储ID
+     */
+    @ExcelProperty(value = "对象存储ID")
+    private String ossId;
 }
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmRuleLinkServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmRuleLinkServiceImpl.java
index fae2e9b..e4d91f8 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmRuleLinkServiceImpl.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmRuleLinkServiceImpl.java
@@ -81,7 +81,7 @@ public class BaseAlarmRuleLinkServiceImpl implements IBaseAlarmRuleLinkService {
         .eq(bo.getLinkDeviceFunctionId() != null, BaseAlarmRuleLink::getLinkDeviceFunctionId, bo.getLinkDeviceFunctionId())
         .eq(StringUtils.isNotBlank(bo.getLinkDeviceFunctionIdentifier()), BaseAlarmRuleLink::getLinkDeviceFunctionIdentifier, bo.getLinkDeviceFunctionIdentifier())
         .eq(StringUtils.isNotBlank(bo.getLinkDeviceFunctionData()), BaseAlarmRuleLink::getLinkDeviceFunctionData, bo.getLinkDeviceFunctionData())
-        .orderByDesc(BaseAlarmRuleLink::getCreateTime);
+        .orderByDesc(BaseAlarmRuleLink::getRuleLinkId);
         return lqw;
     }
 
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsDeviceModeServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsDeviceModeServiceImpl.java
index c861d07..3fdec03 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsDeviceModeServiceImpl.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsDeviceModeServiceImpl.java
@@ -39,7 +39,7 @@ public class DmsDeviceModeServiceImpl implements IDmsDeviceModeService {
      * @return 设备模型
      */
     @Override
-    public DmsDeviceModeVo queryById(Long deviceModeId){
+    public DmsDeviceModeVo queryById(Long deviceModeId) {
         return baseMapper.selectVoById(deviceModeId);
     }
 
@@ -114,7 +114,7 @@ public class DmsDeviceModeServiceImpl implements IDmsDeviceModeService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(DmsDeviceMode entity){
+    private void validEntityBeforeSave(DmsDeviceMode entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -127,7 +127,7 @@ public class DmsDeviceModeServiceImpl implements IDmsDeviceModeService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;