告警设置

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/IotDeviceController.java

@@ -176,6 +176,13 @@ public class IotDeviceController {
         return success(iotDeviceRespVO);
     }
 
+    @GetMapping("/all/params")
+    @Operation(summary = "获得设备台账信息")
+    @PreAuthorize("@ss.hasPermission('rq:iot-device:query')")
+    public CommonResult<List<IotDeviceDO>> getIotDeviceAllParams(@Valid IotDevicePageReqVO pageReqVO) {
+        return success(iotDeviceService.getAllDevices(pageReqVO));
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得设备台账分页")
     @PreAuthorize("@ss.hasPermission('rq:iot-device:query')")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/alarm/IotAlarmSettingController.java

@@ -47,6 +47,14 @@ public class IotAlarmSettingController {
         return success(iotAlarmSettingService.createIotAlarmSetting(createReqVO));
     }
 
+    @PostMapping("/batch/update")
+    @Operation(summary = "创建告警设置")
+    @PreAuthorize("@ss.hasPermission('rq:iot-alarm-setting:create')")
+    public CommonResult<String> batchUpdateIotAlarmSetting(@Valid @RequestBody List<IotAlarmSettingSaveReqVO> alarms) {
+        alarms.forEach(alarm -> iotAlarmSettingService.updateIotAlarmSetting(alarm));
+        return success("完成");
+    }
+
     @PutMapping("/update")
     @Operation(summary = "更新告警设置")
     @PreAuthorize("@ss.hasPermission('rq:iot-alarm-setting:update')")
@@ -73,11 +81,11 @@ public class IotAlarmSettingController {
         return success(BeanUtils.toBean(iotAlarmSetting, IotAlarmSettingRespVO.class));
     }
 
-    @GetMapping("/page")
+    @GetMapping("/page/{if}")
     @Operation(summary = "获得告警设置分页")
     @PreAuthorize("@ss.hasPermission('rq:iot-alarm-setting:query')")
-    public CommonResult<PageResult<IotAlarmSettingRespVO>> getIotAlarmSettingPage(@Valid IotAlarmSettingPageReqVO pageReqVO) {
-        PageResult<IotAlarmSettingDO> pageResult = iotAlarmSettingService.getIotAlarmSettingPage(pageReqVO);
+    public CommonResult<PageResult<IotAlarmSettingRespVO>> getIotAlarmSettingPage(@Valid IotAlarmSettingPageReqVO pageReqVO, @PathVariable("if") String ifDevice) {
+        PageResult<IotAlarmSettingDO> pageResult = iotAlarmSettingService.getIotAlarmSettingPage(pageReqVO, ifDevice);
         return success(BeanUtils.toBean(pageResult, IotAlarmSettingRespVO.class));
     }
 
@@ -88,7 +96,7 @@ public class IotAlarmSettingController {
     public void exportIotAlarmSettingExcel(@Valid IotAlarmSettingPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<IotAlarmSettingDO> list = iotAlarmSettingService.getIotAlarmSettingPage(pageReqVO).getList();
+        List<IotAlarmSettingDO> list = iotAlarmSettingService.getIotAlarmSettingPage(pageReqVO,"1").getList();
         // 导出 Excel
         ExcelUtils.write(response, "告警设置.xls", "数据", IotAlarmSettingRespVO.class,
                         BeanUtils.toBean(list, IotAlarmSettingRespVO.class));

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/alarm/IotAlarmSettingMapper.java

@@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IotAlarmSettingMapper extends BaseMapperX<IotAlarmSettingDO> {
 
-    default PageResult<IotAlarmSettingDO> selectPage(IotAlarmSettingPageReqVO reqVO) {
+    default PageResult<IotAlarmSettingDO> selectPageDevice(IotAlarmSettingPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotAlarmSettingDO>()
                 .eqIfPresent(IotAlarmSettingDO::getClassifyId, reqVO.getClassifyId())
                 .likeIfPresent(IotAlarmSettingDO::getClassifyName, reqVO.getClassifyName())
@@ -27,6 +27,20 @@ public interface IotAlarmSettingMapper extends BaseMapperX<IotAlarmSettingDO> {
                 .eqIfPresent(IotAlarmSettingDO::getMinValue, reqVO.getMinValue())
                 .betweenIfPresent(IotAlarmSettingDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(IotAlarmSettingDO::getAlarmProperty, reqVO.getAlarmProperty())
+                .isNotNull(IotAlarmSettingDO::getDeviceId)
+                .orderByDesc(IotAlarmSettingDO::getId));
+    }
+
+    default PageResult<IotAlarmSettingDO> selectPageNoDevice(IotAlarmSettingPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotAlarmSettingDO>()
+                .eqIfPresent(IotAlarmSettingDO::getClassifyId, reqVO.getClassifyId())
+                .likeIfPresent(IotAlarmSettingDO::getClassifyName, reqVO.getClassifyName())
+                .likeIfPresent(IotAlarmSettingDO::getDeviceName, reqVO.getDeviceName())
+                .eqIfPresent(IotAlarmSettingDO::getMaxValue, reqVO.getMaxValue())
+                .eqIfPresent(IotAlarmSettingDO::getMinValue, reqVO.getMinValue())
+                .betweenIfPresent(IotAlarmSettingDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(IotAlarmSettingDO::getAlarmProperty, reqVO.getAlarmProperty())
+                .isNull(IotAlarmSettingDO::getDeviceId)
                 .orderByDesc(IotAlarmSettingDO::getId));
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/IotDeviceService.java

@@ -22,6 +22,7 @@ import java.util.Map;
  * @author 芋道源码
  */
 public interface IotDeviceService {
+    List<IotDeviceDO> getAllDevices(IotDevicePageReqVO pageReqVO);
     void templateChange(String categoryId, List<IotDeviceProperty> properties);
     void importDevice(List<DeviceImportExcelVO> list);
     List<IotDeviceDO> getMapDevice(IotDevicePageReqVO pageReqVO);

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/IotDeviceServiceImpl.java

@@ -750,4 +750,8 @@ public class IotDeviceServiceImpl implements IotDeviceService {
         List<IotDeviceDO> devices = iotDeviceMapper.selectBatchIds(ids);
         return BeanUtils.toBean(devices, IotDeviceRespVO.class);
     }
+
+    public List<IotDeviceDO> getAllDevices(IotDevicePageReqVO pageReqVO) {
+        return iotDeviceMapper.selectList(pageReqVO);
+    }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/alarm/IotAlarmSettingService.java

@@ -51,6 +51,6 @@ public interface IotAlarmSettingService {
      * @param pageReqVO 分页查询
      * @return 告警设置分页
      */
-    PageResult<IotAlarmSettingDO> getIotAlarmSettingPage(IotAlarmSettingPageReqVO pageReqVO);
+    PageResult<IotAlarmSettingDO> getIotAlarmSettingPage(IotAlarmSettingPageReqVO pageReqVO, String ifDevice);
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/alarm/IotAlarmSettingServiceImpl.java

@@ -69,8 +69,15 @@ public class IotAlarmSettingServiceImpl implements IotAlarmSettingService {
     }
 
     @Override
-    public PageResult<IotAlarmSettingDO> getIotAlarmSettingPage(IotAlarmSettingPageReqVO pageReqVO) {
-        return iotAlarmSettingMapper.selectPage(pageReqVO);
+    public PageResult<IotAlarmSettingDO> getIotAlarmSettingPage(IotAlarmSettingPageReqVO pageReqVO, String ifDevice) {
+        if ("1".equals(ifDevice)) {
+            //如果是分类的话
+            return iotAlarmSettingMapper.selectPageNoDevice(pageReqVO);
+        } else {
+            //如果是设备的话
+            return iotAlarmSettingMapper.selectPageDevice(pageReqVO);
+        }
+
     }
 
 }