添加告警参数属性

zoniot-water/zoniot-water-api/src/main/java/com/bz/zoneiot/water/api/dto/AlarmTypeDTO.java

@@ -3,6 +3,7 @@ package com.bz.zoneiot.water.api.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -16,27 +17,34 @@ public class AlarmTypeDTO {
     @ApiModelProperty(value="ID")
     private Integer id;
 
+    @NotNull
     @ApiModelProperty(value="产品ID")
     private Integer productId;
 
+    @NotNull
     @ApiModelProperty(value="设备ID")
     private Long deviceId;
 
+    @NotNull
     @ApiModelProperty(value="属性ID")
     private Long attributeId;
 
+    @NotNull
     @ApiModelProperty(value="属性标识符")
     private String identifier;
 
+    @NotNull
     @ApiModelProperty(value="物联网产品ID")
     private Integer iotProductId;
 
+    @NotNull
     @ApiModelProperty(value="物联网设备ID")
     private Long iotDeviceId;
 
     @ApiModelProperty(value="场景类型SceneTypeEnum：1.水源 2.水厂 3.泵站 4.管网 5.水原水厂")
     private Integer sceneType;
 
+    @NotNull
     @ApiModelProperty(value="名称")
     private String name;
 

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/mapper/AlarmTypeMapper.xml

@@ -238,7 +238,7 @@
 
   <select id="findAlarmProductInfoById" resultType="com.bz.zoneiot.water.api.vo.AlarmTypeVo">
     select
-    sat.id,sat.iot_alarm_id,sat.device_id,sat.product_id,sat.name as alarmName,sat.attribute_id,sat.`desc`,sat.days,sat.times,
+    sat.id,sat.iot_alarm_id,sat.device_id,sat.product_id,sat.name as alarmName,sat.attribute_id,sat.`desc`, sat.days, sat.times,
     CONCAT(sp.MANUFACTURER_NAME,"/",sp.DEVICE_TYPE,"/",sp.DEVICE_MODE) as productName,
     sd.device_name,sat.alarm_rule_num
     from sms_alarm_type sat
@@ -252,8 +252,6 @@
     select device_id  from sms_alarm_type where  iot_alarm_id = #{id} and status = 1
   </select>
 
-
-
   <select id="getAlarmTypeList" resultType="com.bz.zoneiot.water.api.vo.AlarmTypeVo">
     select
     sat.id,

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/AppDataController.java

@@ -18,7 +18,7 @@ import java.util.List;
 
 /**
  * App数据
- * @author yjy
+ * @author Andy
  * @since 2020-11-17
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/AppPageReportController.java

@@ -19,7 +19,7 @@ import java.util.Map;
 
 /**
  * @description
- * @author  wangbo
+ * @author  Andy
  * @data 2021/3/18 10:50
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/AppReportMonitorController.java

@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2021/2/24 9:09
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/CameraManageController.java

@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * (CameraManage)控制层
- * @author makejava
+ * @author Andy
  * @since 2020-11-26 10:25:12
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/ComDisplayController.java

@@ -28,7 +28,7 @@ import java.util.List;
 
 
 /**
- * @author makejava
+ * @author Andy
  */
 @RestController
 @RequestMapping("/comDisplay")

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/ComdisplayMapController.java

@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * 综合展示图片页面控制器
- * @author wyy
+ * @author Andy
  * @date 2021-02-24 09:23
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/ComdisplayMapLocationController.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * 地图坐标页面控制器
- * @author WYY
+ * @author Andy
  * @date 2021-02-24 09:58
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/DeviceController.java

@@ -28,7 +28,7 @@ import java.util.List;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2020-11-16 11:05
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/DeviceParmController.java

@@ -18,7 +18,7 @@ import java.util.List;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2020-11-17 11:17
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/DeviceTypeController.java

@@ -25,7 +25,7 @@ import java.util.List;
 
 /**
  * 设备型号页面控制器
- * @author WYY
+ * @author Andy
  * @date 2020-11-18 08:21
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/HomePageReportController.java

@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2021/2/24 9:09
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/MonitorInfoController.java

@@ -28,7 +28,7 @@ import java.util.*;
 
 /**
  * 标签信息页面控制器
- * @author WYY
+ * @author Andy
  * @date 2020-12-02 09:29
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/ParmSettingController.java

@@ -18,7 +18,7 @@ import java.util.List;
 
 /**
  * 参数设置页面控制器
- * @author WYY
+ * @author Andy
  * @date 2021-05-11 10:30
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/RevenueController.java

@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
 /**
  * 营收控制层
  *
- * @author yjy
+ * @author Andy
  * @since 2021-2-24
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/SceneTypeController.java

@@ -17,7 +17,7 @@ import java.util.*;
 
 /**
  * 场景类型页面控制器
- * @author WYY
+ * @author Andy
  * @date 2020-11-17 19:31
  */
 @Controller

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/SystemSettingController.java

@@ -23,7 +23,7 @@ import java.util.List;
 
 /**
  * 系统设置控制层
- * @author yjy
+ * @author Andy
  * @since 2020-11-16
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/ThingSettingController.java

@@ -19,7 +19,7 @@ import java.util.Map;
 
 /**
  * 物品设置页面控制器
- * @author WYY
+ * @author Andy
  * @date 2020-12-28 15:18
  */
 @Controller

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/ThingyearSettingController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * 物品年代设置页面控制器
- * @author WYY
+ * @author Andy
  * @date 2020-12-28 15:18
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/WaterPropertyController.java

@@ -16,7 +16,7 @@ import java.util.List;
 
 /**
  * 用水性质控制层
- * @author yjy
+ * @author Andy
  * @since 2021-5-31
  */
 @RestController

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/AlarmDetailsService.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2020-11-17 15:43
  */
 public interface AlarmDetailsService {

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/AlarmTypeDetailsService.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2020-11-17 15:43
  */
 public interface AlarmTypeDetailsService {

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/AppReportMonitorService.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2021/3/19 11:28
  */
 public interface AppReportMonitorService {

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/CameraManageService.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * (CameraManage)表服务接口
- * @author makejava
+ * @author Andy
  * @since 2020-11-26 10:25:13
  */
 public interface CameraManageService {

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/DeviceParmService.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 /**
  * @description 设备参数
- * @author  wangli
+ * @author  Andy
  * @data 2020-11-17 11:01
  */
 public interface DeviceParmService {

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/DeviceService.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2020-11-16 11:26
  */
 public interface DeviceService {

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/HomePageReportService.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2021/2/24 10:42
  */
 public interface HomePageReportService {

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/MonitorDataReportService.java

@@ -19,7 +19,7 @@ import java.util.Map;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2020/12/7 20:22
  */
 public interface MonitorDataReportService {

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/MonitorDataService.java

@@ -5,7 +5,7 @@ import com.bz.zoneiot.water.core.entity.MonitorDataEntity;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2020-12-01 10:14
  */
 public interface MonitorDataService {

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/OnlineMonitorService.java

@@ -9,7 +9,7 @@ import java.util.Map;
 
 /**
  * @description
- * @author  yjy
+ * @author  Andy
  * @data 2020-12-2
  */
 public interface OnlineMonitorService {

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/RevenueService.java

@@ -10,7 +10,7 @@ import com.bz.zoneiot.water.core.entity.MonthSellwaterEntity;
 import java.util.List;
 
 /**
- * @author yjy
+ * @author Andy
  * @description
  * @data 2021-2-24
  */

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/AlarmDetailsServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.List;
 
 /**
  * @description
- * @author wangli
+ * @author Andy
  * @data 2020-11-17 15:48
  */
 @Service

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/AppPageReportServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.Map;
 
 /**
  * @description
- * @author  wangbo
+ * @author  Andy
  * @data 2021/3/18 11:00
  */
 @Service
@@ -137,7 +137,7 @@ public class AppPageReportServiceImpl implements AppPageReportService {
     }
 
     /**
-     * @Author wangbo
+     * @Author Andy
      * @Description 计算产销差
      * @param makingWaterList 制水量数据
      * @param sellerWaterList 售水量数据

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/AppReportMonitorServiceImpl.java

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2021/3/19 11:29
  */
 @Service

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/CameraManageServiceImpl.java

@@ -32,7 +32,7 @@ import static com.google.common.collect.Lists.newArrayList;
 /**
  * (CameraManage表)服务实现类
  *
- * @author makejava
+ * @author Andy
  * @since 2020-11-26 10:25:14
  */
 @Service("cameraManageService")

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/DeviceParmServiceImpl.java

@@ -22,7 +22,7 @@ import java.util.*;
 
 /**
  * @description 设备参数
- * @author 青雲   wangli
+ * @author 青雲   Andy
  * @data 2020-11-17 11:02
  */
 @Service

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/DeviceServiceImpl.java

@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2020-11-16 11:26
  */
 @Service

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/GisSettingService.java

@@ -16,7 +16,7 @@ import java.util.List;
 /**
  * Gis设置服务接口
  *
- * @author yjy
+ * @author Andy
  * @since 2020-11-16
  */
 @Service

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/HomePageReportServiceImpl.java

@@ -36,7 +36,7 @@ import java.util.stream.Stream;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2021/2/24 10:42
  */
 @Service

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/MonitorDataServiceImpl.java

@@ -17,7 +17,7 @@ import java.util.stream.Collectors;
 
 /**
  * @description
- * @author  wangli
+ * @author  Andy
  * @data 2020-12-01 11:09
  */
 @Service

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/OnlineMonitorImpl.java

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
 
 /**
  * @description
- * @author  yjy
+ * @author  Andy
  * @data 2020-12-2
  */
 @Service

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/ParmSettingService.java

@@ -16,7 +16,7 @@ import java.util.List;
 /**
  * 参数设置Service接口
  *
- * @author: WYY
+ * @author: Andy
  * @date 2021-05-11 10:30
  */
 @Service

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/RevenueServiceImpl.java

@@ -26,7 +26,7 @@ import java.util.List;
 
 /**
  * @description
- * @author yjy
+ * @author Andy
  * @data 2021-2-24
  */
 @Service

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/SystemSettingService.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 /**
  * 系统设置服务接口
  *
- * @author yjy
+ * @author Andy
  * @since 2020-11-16
  */
 @Service