设备

zoniot-water/zoniot-water-core/src/main/java/com/zcxk/water/core/dao/AlarmTypeDetailMapper.java

@@ -6,6 +6,7 @@ import com.zcxk.water.api.dto.AlarmDetailsDto;
 import com.zcxk.water.api.dto.AlarmTypeDetailsDto;
 import com.zcxk.water.api.vo.AlarmTypeDetailsEntityVo;
 import com.zcxk.water.core.entity.AlarmDetailsEntity;
+import com.zcxk.water.core.entity.AlarmTypeDetailsEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -27,14 +28,14 @@ public interface AlarmTypeDetailMapper {
     * @param alarmDetailsEntity:
     * @return java.lang.Integer
     **/
-    Integer insert(AlarmDetailsEntity alarmDetailsEntity);
+    Integer insert(AlarmTypeDetailsEntity alarmDetailsEntity);
 
     /**
      * 批量插入设备报警信息
      * @param alarmDetails
      * @return
      */
-    Integer batchInsert(@Param("alarmDetails") List<AlarmDetailsEntity> alarmDetails);
+    Integer batchInsert(@Param("alarmDetails") List<AlarmTypeDetailsEntity> alarmDetails);
 
     /**
     * 分页查询
@@ -45,7 +46,7 @@ public interface AlarmTypeDetailMapper {
     * @param condition:
     * @return com.baomidou.mybatisplus.core.metadata.IPage<com.zcxk.water.api.vo.AlarmDetailsEntityVo>
     **/
-    IPage<AlarmTypeDetailsEntityVo> selectPage(@Param("page") IPage<AlarmDetailsDto> page, @Param("alarmDetailsDto") AlarmTypeDetailsDto alarmDetailsDto, @Param("userCondition") UserCondition condition);
+    IPage<AlarmTypeDetailsEntityVo> selectPage(@Param("page") IPage<AlarmTypeDetailsDto> page, @Param("alarmDetailsDto") AlarmTypeDetailsDto alarmDetailsDto, @Param("userCondition") UserCondition condition);
 
 
     /**

zoniot-water/zoniot-water-core/src/main/java/com/zcxk/water/core/entity/AlarmDetailsEntity.java

@@ -22,29 +22,70 @@ public class AlarmDetailsEntity implements Serializable {
 
     @ApiModelProperty(value = "主键id")
     private Long id;
+    @ApiModelProperty(value = "租户标识")
+    private String tenantId;
 
-    @ApiModelProperty(value = "告警ID")
-    private Long alarmId;
+    @ApiModelProperty("一级场景信息")
+    private Integer parentSceneId;
 
-    @ApiModelProperty("场景ID: 父场景-子场景")
-    private String sceneId;
+    @ApiModelProperty("一级场景名称")
+    private String parentSceneName;
 
-    @ApiModelProperty("场景名称: 父场景-子场景")
+    @ApiModelProperty("场景信息")
+    private Integer sceneId;
+
+    @ApiModelProperty("场景名称")
     private String sceneName;
 
+    @ApiModelProperty(value = "设备信息")
+    private Integer deviceId;
+
+    @ApiModelProperty(value = "所属公司")
+    private Integer companyOrgId;
+
+    @ApiModelProperty(value = "所属部门")
+    private Integer deptOrgId;
+
+    @ApiModelProperty(value = "报警参数设置id")
+    private Integer alarmSettingId;
+
+
+    @ApiModelProperty(value = "报警类型")
+    private String alarmType;
+    @ApiModelProperty(value = "报警参数ID")
+    private Integer attributeId;
+    @ApiModelProperty(value = "当前数值")
+    private Double alarmValue;
+    @ApiModelProperty(value = "最小告警数值")
+    private Double minValue;
+    @ApiModelProperty(value = "最大告警数值")
+    private Double maxValue;
+    @ApiModelProperty(value = "报警详情")
+    private String alarmContent;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     @ApiModelProperty(value = "报警开始时间",example = "2020-12-12 12:12:12")
     private Date alarmStartTime;
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     @ApiModelProperty(value = "报警结束时间",example = "2020-12-12 12:12:12")
     private Date alarmEndTime;
-
     @ApiModelProperty(value = "报警状态:1 实时报警 0 历史报警")
     private Integer state;
+    @ApiModelProperty(value = "处理状态:1 正常 0 挂起")
+    private Integer opState;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    @ApiModelProperty(value = "数据删除标识")
+    private Integer status;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     @ApiModelProperty(value = "创建时间",example = "2020-12-12 12:12:12")
-    private Date createDate;
+    private Date dateCreate;
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ApiModelProperty(value = "更新时间",example = "2020-12-12 12:12:12")
+    private Date dateUpdate;
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
 
 }

zoniot-water/zoniot-water-core/src/main/java/com/zcxk/water/core/entity/AlarmTypeDetailsEntity.java

@@ -0,0 +1,50 @@
+package com.zcxk.water.core.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @description 报警详情信息实体类（uims_tenant）
+ * @author  wangli
+ * @data 2020-11-16 10:47
+ */
+@Data
+@ApiModel("报警详情信息")
+public class AlarmTypeDetailsEntity implements Serializable {
+
+    private static final long serialVersionUID = 6916916266193290481L;
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "告警ID")
+    private Long alarmId;
+
+    @ApiModelProperty("场景ID: 父场景-子场景")
+    private String sceneId;
+
+    @ApiModelProperty("场景名称: 父场景-子场景")
+    private String sceneName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ApiModelProperty(value = "报警开始时间",example = "2020-12-12 12:12:12")
+    private Date alarmStartTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ApiModelProperty(value = "报警结束时间",example = "2020-12-12 12:12:12")
+    private Date alarmEndTime;
+
+    @ApiModelProperty(value = "报警状态:1 实时报警 0 历史报警")
+    private Integer state;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间",example = "2020-12-12 12:12:12")
+    private Date createDate;
+
+}

zoniot-water/zoniot-water-web/src/main/java/com/zcxk/water/web/controller/AlarmDetailsController.java

@@ -43,7 +43,7 @@ public class AlarmDetailsController {
     @RequestMapping(value="selectPage" , method = RequestMethod.POST)
     @ApiOperation(value = "分页查询报警详情信息")
     public AjaxMessage selectPage(@RequestBody @Valid AlarmTypeDetailsDto dto){
-        IPage<AlarmDetailsDto> iPage = new Page<>(dto.getPageNum(), dto.getPageSize());
+        IPage<AlarmTypeDetailsDto> iPage = new Page<>(dto.getPageNum(), dto.getPageSize());
         return AjaxMessage.success(new Pagination<>(alarmTypeDetailsService.selectPage(iPage, dto)));
     }
 

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

@@ -44,7 +44,7 @@ public interface AlarmTypeDetailsService {
     * @param alarmDetailsDto:
     * @return com.baomidou.mybatisplus.core.metadata.IPage<AlarmDetailsEntityVo>
     **/
-    IPage<AlarmTypeDetailsEntityVo> selectPage(IPage<AlarmDetailsDto> page, AlarmTypeDetailsDto alarmDetailsDto);
+    IPage<AlarmTypeDetailsEntityVo> selectPage(IPage<AlarmTypeDetailsDto> page, AlarmTypeDetailsDto alarmDetailsDto);
 
     /**
     * 修改报警状态

zoniot-water/zoniot-water-web/src/main/java/com/zcxk/water/web/service/impl/AlarmTypeDetailsServiceImpl.java

@@ -12,6 +12,7 @@ import com.zcxk.water.api.vo.DeviceSceneVo;
 import com.zcxk.water.core.dao.AlarmTypeDetailMapper;
 import com.zcxk.water.core.dao.DeviceSceneMapper;
 import com.zcxk.water.core.entity.AlarmDetailsEntity;
+import com.zcxk.water.core.entity.AlarmTypeDetailsEntity;
 import com.zcxk.water.web.service.AlarmTypeDetailsService;
 import com.zcxk.water.web.service.AlarmTypeService;
 import lombok.extern.log4j.Log4j2;
@@ -43,7 +44,7 @@ public class AlarmTypeDetailsServiceImpl implements AlarmTypeDetailsService {
 
     @Override
     public Integer insert(AlarmDetailsAddDto dto) {
-        List<AlarmDetailsEntity> entities = this.convert(dto);
+        List<AlarmTypeDetailsEntity> entities = this.convert(dto);
         if (entities == null) {
             return 0;
         }
@@ -52,7 +53,7 @@ public class AlarmTypeDetailsServiceImpl implements AlarmTypeDetailsService {
 
     @Override
     public Integer batchInsert(List<AlarmDetailsAddDto> alarmDetails) {
-        List<AlarmDetailsEntity> entities = this.convert(alarmDetails);
+        List<AlarmTypeDetailsEntity> entities = this.convert(alarmDetails);
         if (entities == null) {
             return 0;
         }
@@ -60,7 +61,7 @@ public class AlarmTypeDetailsServiceImpl implements AlarmTypeDetailsService {
     }
 
     @Override
-    public IPage<AlarmTypeDetailsEntityVo> selectPage(IPage<AlarmDetailsDto> page, AlarmTypeDetailsDto alarmDetailsDto) {
+    public IPage<AlarmTypeDetailsEntityVo> selectPage(IPage<AlarmTypeDetailsDto> page, AlarmTypeDetailsDto alarmDetailsDto) {
         return alarmTypeDetailMapper.selectPage(page, alarmDetailsDto, UserUtil.getCurrentUser().getUserCondition());
     }
 
@@ -77,13 +78,13 @@ public class AlarmTypeDetailsServiceImpl implements AlarmTypeDetailsService {
     * @param dto:
     * @return java.util.List<com.zcxk.water.core.entity.AlarmDetailsEntity>
     **/
-    private List<AlarmDetailsEntity> convert(List<AlarmDetailsAddDto> dto){
+    private List<AlarmTypeDetailsEntity> convert(List<AlarmDetailsAddDto> dto){
         if (CollectionUtils.isEmpty(dto)){
             return null;
         }
-        List<AlarmDetailsEntity> list = new ArrayList<>();
+        List<AlarmTypeDetailsEntity> list = new ArrayList<>();
         for (AlarmDetailsAddDto alarmDetailsAddDto : dto) {
-            List<AlarmDetailsEntity> entities = convert(alarmDetailsAddDto);
+            List<AlarmTypeDetailsEntity> entities = this.convert(alarmDetailsAddDto);
             if (entities != null) {
                 list.addAll(convert(alarmDetailsAddDto));
             }
@@ -99,8 +100,8 @@ public class AlarmTypeDetailsServiceImpl implements AlarmTypeDetailsService {
     * @param dto:
     * @return java.util.List<com.zcxk.water.core.entity.AlarmDetailsEntity>
     **/
-    private List<AlarmDetailsEntity> convert(AlarmDetailsAddDto dto){
-        List<AlarmDetailsEntity> result;
+    private List<AlarmTypeDetailsEntity> convert(AlarmDetailsAddDto dto){
+        List<AlarmTypeDetailsEntity> result;
         Long deviceId = alarmTypeService.findDeviceIdByIotAlarmId(dto.getAlarmId());
         if (deviceId == null || deviceId == 0) {
             return null;
@@ -108,7 +109,7 @@ public class AlarmTypeDetailsServiceImpl implements AlarmTypeDetailsService {
         result = new ArrayList<>();
         List<DeviceSceneVo> sceneVos = deviceSceneMapper.findSceneByDeviceId(deviceId);
         for (DeviceSceneVo sceneVo : sceneVos) {
-            AlarmDetailsEntity alarmDetailsEntity = BeanCopyUtils.copy(dto, AlarmDetailsEntity.class);
+            AlarmTypeDetailsEntity alarmDetailsEntity = BeanCopyUtils.copy(dto, AlarmTypeDetailsEntity.class);
             alarmDetailsEntity.setCreateDate(new Date());
             alarmDetailsEntity.setState(AlarmStateEnum.REALTIME_ALARM.getCode());
             if (sceneVo.getSceneId().equals(sceneVo.getParentSceneId())){