若依微服务2.0.4

修改金瑞铭以下问题：
同一场景下设备模型名称不能重复，包括新增和修改页面

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwDeviceController.java

@@ -230,6 +230,9 @@ public class HwDeviceController extends BaseController {
     }
 
 
+    /**
+     * 重新创建所有设备子表，对于已经创建的不再创建，只是创建没有在TDengine创建子表的设备进行重新创建
+     */
     @RequiresPermissions("business:device:rebuild")
     @Log(title = "设备信息", businessType = BusinessType.REBUILD)
     @GetMapping("/rebuildTdTables")

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwDeviceModeController.java

@@ -138,6 +138,9 @@ public class HwDeviceModeController extends BaseController {
         return success(hwSceneService.selectHwSceneList4Select(scene));
     }
 
+    /**
+     * 创建超级表，将所有设备模型中没有创建超级表的创建一下，已经创建过的不需要再创建
+     */
     @RequiresPermissions("business:deviceMode:rebuild")
     @Log(title = "设备模型", businessType = BusinessType.REBUILD)
     @GetMapping("/rebuildTdSuperTables")

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwDeviceModeMapper.java

@@ -7,15 +7,15 @@ import com.ruoyi.business.domain.HwDeviceModeParameter;
 
 /**
  * 设备模型Mapper接口
- * 
+ *
  * @author xins
  * @date 2023-09-04
  */
-public interface HwDeviceModeMapper 
+public interface HwDeviceModeMapper
 {
     /**
      * 查询设备模型
-     * 
+     *
      * @param deviceModeId 设备模型主键
      * @return 设备模型
      */
@@ -23,7 +23,7 @@ public interface HwDeviceModeMapper
 
     /**
      * 查询设备模型列表
-     * 
+     *
      * @param hwDeviceMode 设备模型
      * @return 设备模型集合
      */
@@ -31,7 +31,7 @@ public interface HwDeviceModeMapper
 
     /**
      * 新增设备模型
-     * 
+     *
      * @param hwDeviceMode 设备模型
      * @return 结果
      */
@@ -39,7 +39,7 @@ public interface HwDeviceModeMapper
 
     /**
      * 修改设备模型
-     * 
+     *
      * @param hwDeviceMode 设备模型
      * @return 结果
      */
@@ -47,7 +47,7 @@ public interface HwDeviceModeMapper
 
     /**
      * 删除设备模型
-     * 
+     *
      * @param deviceModeId 设备模型主键
      * @return 结果
      */
@@ -55,7 +55,7 @@ public interface HwDeviceModeMapper
 
     /**
      * 批量删除设备模型
-     * 
+     *
      * @param deviceModeIds 需要删除的数据主键集合
      * @return 结果
      */
@@ -63,24 +63,24 @@ public interface HwDeviceModeMapper
 
     /**
      * 批量删除设备模型功能
-     * 
+     *
      * @param deviceModeIds 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteHwDeviceModeFunctionByDeviceModeIds(Long[] deviceModeIds);
-    
+
     /**
      * 批量新增设备模型功能
-     * 
+     *
      * @param hwDeviceModeFunctionList 设备模型功能列表
      * @return 结果
      */
     public int batchHwDeviceModeFunction(List<HwDeviceModeFunction> hwDeviceModeFunctionList);
-    
+
 
     /**
      * 通过设备模型主键删除设备模型功能信息
-     * 
+     *
      * @param deviceModeId 设备模型ID
      * @return 结果
      */
@@ -121,7 +121,7 @@ public interface HwDeviceModeMapper
     /**
      * 通过设备模型功能主键删除设备模型功能参数信息
      *
-     * @param deviceModeId 设备模型功能ID
+     * @param modeFunctionId 设备模型功能ID
      * @return 结果
      */
     public int deleteHwDeviceModeParameterByModeFunctionId(Long modeFunctionId);

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceModeServiceImpl.java

@@ -88,6 +88,17 @@ public class HwDeviceModeServiceImpl implements IHwDeviceModeService {
     @Transactional
     @Override
     public int insertHwDeviceMode(HwDeviceMode hwDeviceMode) {
+        //判断同一场景下模型名称是否重复
+        String deviceModeName = hwDeviceMode.getDeviceModeName();
+        Long sceneId = hwDeviceMode.getSceneId();
+        HwDeviceMode queryDeviceMode = new HwDeviceMode();
+        queryDeviceMode.setDeviceModeName(deviceModeName);
+        queryDeviceMode.setSceneId(sceneId);
+        List<HwDeviceMode> deviceModes = hwDeviceModeMapper.selectHwDeviceModeList(queryDeviceMode);
+        if (deviceModes != null && !deviceModes.isEmpty()) {
+            throw new ServiceException("此场景下设备模型名称重复");
+        }
+
         //先判断是否有重复的标识符
         List<HwDeviceModeFunction> hwDeviceModeFunctionList = hwDeviceMode.getHwDeviceModeFunctionList();
 
@@ -135,6 +146,22 @@ public class HwDeviceModeServiceImpl implements IHwDeviceModeService {
     @Transactional
     @Override
     public int updateHwDeviceMode(HwDeviceMode hwDeviceMode) {
+        String deviceModeName = hwDeviceMode.getDeviceModeName();
+        Long sceneId = hwDeviceMode.getSceneId();
+        HwDeviceMode queryDeviceMode = new HwDeviceMode();
+        queryDeviceMode.setDeviceModeName(deviceModeName);
+        queryDeviceMode.setSceneId(sceneId);
+        List<HwDeviceMode> deviceModes = hwDeviceModeMapper.selectHwDeviceModeList(queryDeviceMode);
+
+        if (deviceModes != null && !deviceModes.isEmpty()) {
+            List<HwDeviceMode> filterDeviceModes = deviceModes.stream().filter(hwDm -> !hwDm.getDeviceModeId().equals(hwDeviceMode.getDeviceModeId())
+                    && hwDm.getDeviceModeName().equals(hwDeviceMode.getDeviceModeName())).collect(Collectors.toList());
+            if (filterDeviceModes != null && !filterDeviceModes.isEmpty()) {
+                throw new ServiceException("此场景下设备模型名称重复");
+            }
+        }
+
+
         hwDeviceMode.setUpdateBy(SecurityUtils.getUsername());
         hwDeviceMode.setUpdateTime(DateUtils.getNowDate());
 //        hwDeviceModeMapper.deleteHwDeviceModeFunctionByDeviceModeId(hwDeviceMode.getDeviceModeId());
@@ -364,7 +391,7 @@ public class HwDeviceModeServiceImpl implements IHwDeviceModeService {
     }
 
     /**
-     * 重建所有设备模型的超级表
+     * 重建所有设备模型的超级表(创建超级表，将所有设备模型中没有创建超级表的创建一下，已经创建过的不需要再创建)
      *
      * @description
      * @author xins
@@ -397,7 +424,7 @@ public class HwDeviceModeServiceImpl implements IHwDeviceModeService {
         //过滤只有数值的属性才可以定义报警规则.或过滤出服务可以添加关联设备
         List<HwDeviceModeFunction> filterDeviceModeFunctions = deviceModeFunctions.stream()
                 .filter(deviceModeFunction -> (deviceModeFunction.getFunctionMode().equals(HwDictConstants.FUNCTION_MODE_ATTRIBUTE) &&
-                        deviceModeFunction.getDataType()!=null && (String.valueOf(deviceModeFunction.getDataType()).equals(String.valueOf(DataTypeEnums.INT.getDataCode()))
+                        deviceModeFunction.getDataType() != null && (String.valueOf(deviceModeFunction.getDataType()).equals(String.valueOf(DataTypeEnums.INT.getDataCode()))
                         || String.valueOf(deviceModeFunction.getDataType()).equals(String.valueOf(DataTypeEnums.FLOAT.getDataCode()))
                         || String.valueOf(deviceModeFunction.getDataType()).equals(String.valueOf(DataTypeEnums.DOUBLE.getDataCode()))))
                         || (deviceModeFunction.getFunctionMode().equals(HwDictConstants.FUNCTION_MODE_SERVICE)))

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceServiceImpl.java

@@ -830,7 +830,7 @@ public class HwDeviceServiceImpl implements IHwDeviceService {
     }
 
     /**
-     * @description 重建tdengine所有设备表
+     * @description 重建tdengine所有设备表(重新创建所有设备子表，对于已经创建的不再创建，只是创建没有在TDengine创建子表的设备进行重新创建)
      * @author xins
      * @date 2023-10-10 20:05
      */