update dms设备模型图片上传

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;

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;
+
 
 }

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;
 }

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;
 }

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;
     }
 

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;