diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java index b66bb85..818c9aa 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.BizAlarmLevel; +import com.casic.missiles.modular.system.model.BizSensor; import com.casic.missiles.modular.system.service.IBizAlarmLevelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -41,9 +42,9 @@ @RequestMapping(value = "/list") @ResponseBody public Object list(String condition) { - EntityWrapper levelQuery = new EntityWrapper<>(); - levelQuery.orderBy("alarm_level"); - return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery)); + EntityWrapper levelQuery = new EntityWrapper<>(); + levelQuery.orderBy("sensor"); + return ResponseData.success( bizAlarmLevelService.selectSensorList(levelQuery)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java index b66bb85..818c9aa 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.BizAlarmLevel; +import com.casic.missiles.modular.system.model.BizSensor; import com.casic.missiles.modular.system.service.IBizAlarmLevelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -41,9 +42,9 @@ @RequestMapping(value = "/list") @ResponseBody public Object list(String condition) { - EntityWrapper levelQuery = new EntityWrapper<>(); - levelQuery.orderBy("alarm_level"); - return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery)); + EntityWrapper levelQuery = new EntityWrapper<>(); + levelQuery.orderBy("sensor"); + return ResponseData.success( bizAlarmLevelService.selectSensorList(levelQuery)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java index e0aa067..889862a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java @@ -8,9 +8,7 @@ import com.casic.missiles.modular.system.model.vo.AlarmRecordVO; import com.casic.missiles.modular.system.service.IBizAlarmRecordsService; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -56,7 +54,7 @@ /** * 新增 */ - @RequestMapping(value = "/add") + @PostMapping(value = "/add") @ResponseBody public Object add(BizAlarmRecords bizAlarmRecords) { bizAlarmRecordsService.insert(bizAlarmRecords); @@ -64,9 +62,32 @@ } /** + * 单个报警记录消警 + */ + @PostMapping(value = "/cancel") + @ResponseBody + public Object cancel(Long id) { + if (id == null) { + return ResponseData.error("必须选中一条记录"); + } + bizAlarmRecordsService.cancelAlarmRecords(id); + return ResponseData.success(); + } + + /** + * 全部消警 + */ + @PostMapping(value = "/batchCancel") + @ResponseBody + public Object batchCancel() { + bizAlarmRecordsService.cancelAlarmRecords(null); + return ResponseData.success(); + } + + /** * 删除 */ - @RequestMapping(value = "/delete") + @GetMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String bizAlarmRecordsId) { bizAlarmRecordsService.deleteById(bizAlarmRecordsId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java index b66bb85..818c9aa 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.BizAlarmLevel; +import com.casic.missiles.modular.system.model.BizSensor; import com.casic.missiles.modular.system.service.IBizAlarmLevelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -41,9 +42,9 @@ @RequestMapping(value = "/list") @ResponseBody public Object list(String condition) { - EntityWrapper levelQuery = new EntityWrapper<>(); - levelQuery.orderBy("alarm_level"); - return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery)); + EntityWrapper levelQuery = new EntityWrapper<>(); + levelQuery.orderBy("sensor"); + return ResponseData.success( bizAlarmLevelService.selectSensorList(levelQuery)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java index e0aa067..889862a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java @@ -8,9 +8,7 @@ import com.casic.missiles.modular.system.model.vo.AlarmRecordVO; import com.casic.missiles.modular.system.service.IBizAlarmRecordsService; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -56,7 +54,7 @@ /** * 新增 */ - @RequestMapping(value = "/add") + @PostMapping(value = "/add") @ResponseBody public Object add(BizAlarmRecords bizAlarmRecords) { bizAlarmRecordsService.insert(bizAlarmRecords); @@ -64,9 +62,32 @@ } /** + * 单个报警记录消警 + */ + @PostMapping(value = "/cancel") + @ResponseBody + public Object cancel(Long id) { + if (id == null) { + return ResponseData.error("必须选中一条记录"); + } + bizAlarmRecordsService.cancelAlarmRecords(id); + return ResponseData.success(); + } + + /** + * 全部消警 + */ + @PostMapping(value = "/batchCancel") + @ResponseBody + public Object batchCancel() { + bizAlarmRecordsService.cancelAlarmRecords(null); + return ResponseData.success(); + } + + /** * 删除 */ - @RequestMapping(value = "/delete") + @GetMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String bizAlarmRecordsId) { bizAlarmRecordsService.deleteById(bizAlarmRecordsId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java index 5db7716..1cf2ed0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java @@ -34,7 +34,7 @@ */ @GetMapping(value = "/listByDevice") public Object listByDevice(AlarmRuleVO vo) { - return bizAlarmRuleService.selectListByDevice(vo); + return ResponseData.success(bizAlarmRuleService.selectListByDevice(vo)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java index b66bb85..818c9aa 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.BizAlarmLevel; +import com.casic.missiles.modular.system.model.BizSensor; import com.casic.missiles.modular.system.service.IBizAlarmLevelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -41,9 +42,9 @@ @RequestMapping(value = "/list") @ResponseBody public Object list(String condition) { - EntityWrapper levelQuery = new EntityWrapper<>(); - levelQuery.orderBy("alarm_level"); - return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery)); + EntityWrapper levelQuery = new EntityWrapper<>(); + levelQuery.orderBy("sensor"); + return ResponseData.success( bizAlarmLevelService.selectSensorList(levelQuery)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java index e0aa067..889862a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java @@ -8,9 +8,7 @@ import com.casic.missiles.modular.system.model.vo.AlarmRecordVO; import com.casic.missiles.modular.system.service.IBizAlarmRecordsService; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -56,7 +54,7 @@ /** * 新增 */ - @RequestMapping(value = "/add") + @PostMapping(value = "/add") @ResponseBody public Object add(BizAlarmRecords bizAlarmRecords) { bizAlarmRecordsService.insert(bizAlarmRecords); @@ -64,9 +62,32 @@ } /** + * 单个报警记录消警 + */ + @PostMapping(value = "/cancel") + @ResponseBody + public Object cancel(Long id) { + if (id == null) { + return ResponseData.error("必须选中一条记录"); + } + bizAlarmRecordsService.cancelAlarmRecords(id); + return ResponseData.success(); + } + + /** + * 全部消警 + */ + @PostMapping(value = "/batchCancel") + @ResponseBody + public Object batchCancel() { + bizAlarmRecordsService.cancelAlarmRecords(null); + return ResponseData.success(); + } + + /** * 删除 */ - @RequestMapping(value = "/delete") + @GetMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String bizAlarmRecordsId) { bizAlarmRecordsService.deleteById(bizAlarmRecordsId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java index 5db7716..1cf2ed0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java @@ -34,7 +34,7 @@ */ @GetMapping(value = "/listByDevice") public Object listByDevice(AlarmRuleVO vo) { - return bizAlarmRuleService.selectListByDevice(vo); + return ResponseData.success(bizAlarmRuleService.selectListByDevice(vo)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java index e160686..d319cb3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java @@ -26,4 +26,11 @@ * @return 结果集 */ List selectRecordsPage(@Param("page") Page page, @Param("ew") EntityWrapper query); + + /** + * 取消告警信息 + * + * @param id 告警主键 不填则取消全部告警 + */ + void cancelAlarmRecords(@Param("id") Long id); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java index b66bb85..818c9aa 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.BizAlarmLevel; +import com.casic.missiles.modular.system.model.BizSensor; import com.casic.missiles.modular.system.service.IBizAlarmLevelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -41,9 +42,9 @@ @RequestMapping(value = "/list") @ResponseBody public Object list(String condition) { - EntityWrapper levelQuery = new EntityWrapper<>(); - levelQuery.orderBy("alarm_level"); - return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery)); + EntityWrapper levelQuery = new EntityWrapper<>(); + levelQuery.orderBy("sensor"); + return ResponseData.success( bizAlarmLevelService.selectSensorList(levelQuery)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java index e0aa067..889862a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java @@ -8,9 +8,7 @@ import com.casic.missiles.modular.system.model.vo.AlarmRecordVO; import com.casic.missiles.modular.system.service.IBizAlarmRecordsService; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -56,7 +54,7 @@ /** * 新增 */ - @RequestMapping(value = "/add") + @PostMapping(value = "/add") @ResponseBody public Object add(BizAlarmRecords bizAlarmRecords) { bizAlarmRecordsService.insert(bizAlarmRecords); @@ -64,9 +62,32 @@ } /** + * 单个报警记录消警 + */ + @PostMapping(value = "/cancel") + @ResponseBody + public Object cancel(Long id) { + if (id == null) { + return ResponseData.error("必须选中一条记录"); + } + bizAlarmRecordsService.cancelAlarmRecords(id); + return ResponseData.success(); + } + + /** + * 全部消警 + */ + @PostMapping(value = "/batchCancel") + @ResponseBody + public Object batchCancel() { + bizAlarmRecordsService.cancelAlarmRecords(null); + return ResponseData.success(); + } + + /** * 删除 */ - @RequestMapping(value = "/delete") + @GetMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String bizAlarmRecordsId) { bizAlarmRecordsService.deleteById(bizAlarmRecordsId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java index 5db7716..1cf2ed0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java @@ -34,7 +34,7 @@ */ @GetMapping(value = "/listByDevice") public Object listByDevice(AlarmRuleVO vo) { - return bizAlarmRuleService.selectListByDevice(vo); + return ResponseData.success(bizAlarmRuleService.selectListByDevice(vo)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java index e160686..d319cb3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java @@ -26,4 +26,11 @@ * @return 结果集 */ List selectRecordsPage(@Param("page") Page page, @Param("ew") EntityWrapper query); + + /** + * 取消告警信息 + * + * @param id 告警主键 不填则取消全部告警 + */ + void cancelAlarmRecords(@Param("id") Long id); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml index e8e3c04..0cfd214 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml @@ -20,6 +20,14 @@ id , device_no AS deviceNo, alarm_type AS alarmType, alarm_level AS alarmLevel, alarm_content AS alarmContent, alarm_value AS alarmValue, status, alarm_time AS alarmTime, cancel_time AS cancelTime + + update ${enviromentDataBaseName}.biz_alarm_records set status = 2 + + + id = #{id} + + + select diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java index c5e9aed..5093572 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java @@ -1,18 +1,16 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import com.baomidou.mybatisplus.enums.IdType; - -import java.util.Date; - -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import com.casic.missiles.core.base.json.DateDeserializer; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** *

@@ -65,11 +63,13 @@ /** * 报警时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @TableField("alarm_time") private Date alarmTime; /** * 消警时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @TableField("cancel_time") private Date cancelTime; @@ -77,6 +77,10 @@ private String alarmTypeName; @TableField(exist = false) private String alarmLevelName; + @TableField(exist = false) + private String position; + @TableField(exist = false) + private String deviceName; @Override protected Serializable pkVal() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java index b66bb85..818c9aa 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.BizAlarmLevel; +import com.casic.missiles.modular.system.model.BizSensor; import com.casic.missiles.modular.system.service.IBizAlarmLevelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -41,9 +42,9 @@ @RequestMapping(value = "/list") @ResponseBody public Object list(String condition) { - EntityWrapper levelQuery = new EntityWrapper<>(); - levelQuery.orderBy("alarm_level"); - return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery)); + EntityWrapper levelQuery = new EntityWrapper<>(); + levelQuery.orderBy("sensor"); + return ResponseData.success( bizAlarmLevelService.selectSensorList(levelQuery)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java index e0aa067..889862a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java @@ -8,9 +8,7 @@ import com.casic.missiles.modular.system.model.vo.AlarmRecordVO; import com.casic.missiles.modular.system.service.IBizAlarmRecordsService; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -56,7 +54,7 @@ /** * 新增 */ - @RequestMapping(value = "/add") + @PostMapping(value = "/add") @ResponseBody public Object add(BizAlarmRecords bizAlarmRecords) { bizAlarmRecordsService.insert(bizAlarmRecords); @@ -64,9 +62,32 @@ } /** + * 单个报警记录消警 + */ + @PostMapping(value = "/cancel") + @ResponseBody + public Object cancel(Long id) { + if (id == null) { + return ResponseData.error("必须选中一条记录"); + } + bizAlarmRecordsService.cancelAlarmRecords(id); + return ResponseData.success(); + } + + /** + * 全部消警 + */ + @PostMapping(value = "/batchCancel") + @ResponseBody + public Object batchCancel() { + bizAlarmRecordsService.cancelAlarmRecords(null); + return ResponseData.success(); + } + + /** * 删除 */ - @RequestMapping(value = "/delete") + @GetMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String bizAlarmRecordsId) { bizAlarmRecordsService.deleteById(bizAlarmRecordsId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java index 5db7716..1cf2ed0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java @@ -34,7 +34,7 @@ */ @GetMapping(value = "/listByDevice") public Object listByDevice(AlarmRuleVO vo) { - return bizAlarmRuleService.selectListByDevice(vo); + return ResponseData.success(bizAlarmRuleService.selectListByDevice(vo)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java index e160686..d319cb3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java @@ -26,4 +26,11 @@ * @return 结果集 */ List selectRecordsPage(@Param("page") Page page, @Param("ew") EntityWrapper query); + + /** + * 取消告警信息 + * + * @param id 告警主键 不填则取消全部告警 + */ + void cancelAlarmRecords(@Param("id") Long id); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml index e8e3c04..0cfd214 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml @@ -20,6 +20,14 @@ id , device_no AS deviceNo, alarm_type AS alarmType, alarm_level AS alarmLevel, alarm_content AS alarmContent, alarm_value AS alarmValue, status, alarm_time AS alarmTime, cancel_time AS cancelTime + + update ${enviromentDataBaseName}.biz_alarm_records set status = 2 + + + id = #{id} + + + select diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java index c5e9aed..5093572 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java @@ -1,18 +1,16 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import com.baomidou.mybatisplus.enums.IdType; - -import java.util.Date; - -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import com.casic.missiles.core.base.json.DateDeserializer; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** *

@@ -65,11 +63,13 @@ /** * 报警时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @TableField("alarm_time") private Date alarmTime; /** * 消警时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @TableField("cancel_time") private Date cancelTime; @@ -77,6 +77,10 @@ private String alarmTypeName; @TableField(exist = false) private String alarmLevelName; + @TableField(exist = false) + private String position; + @TableField(exist = false) + private String deviceName; @Override protected Serializable pkVal() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizSensor.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizSensor.java index ac49d42..f0f7ca9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizSensor.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizSensor.java @@ -47,7 +47,11 @@ */ @TableField("data_attr") private String dataAttr; - + /** + * 是否设置报警等级,是返回true,否返回false + */ + @TableField(exist = false) + private Boolean hasAlarmLevel; @Override protected Serializable pkVal() { return this.id; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/dto/AlarmRuleDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/dto/AlarmRuleDTO.java index 324a880..a35eb51 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/dto/AlarmRuleDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/dto/AlarmRuleDTO.java @@ -61,4 +61,5 @@ * 单位 */ private String unit; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java index b66bb85..818c9aa 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.BizAlarmLevel; +import com.casic.missiles.modular.system.model.BizSensor; import com.casic.missiles.modular.system.service.IBizAlarmLevelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -41,9 +42,9 @@ @RequestMapping(value = "/list") @ResponseBody public Object list(String condition) { - EntityWrapper levelQuery = new EntityWrapper<>(); - levelQuery.orderBy("alarm_level"); - return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery)); + EntityWrapper levelQuery = new EntityWrapper<>(); + levelQuery.orderBy("sensor"); + return ResponseData.success( bizAlarmLevelService.selectSensorList(levelQuery)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java index e0aa067..889862a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java @@ -8,9 +8,7 @@ import com.casic.missiles.modular.system.model.vo.AlarmRecordVO; import com.casic.missiles.modular.system.service.IBizAlarmRecordsService; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -56,7 +54,7 @@ /** * 新增 */ - @RequestMapping(value = "/add") + @PostMapping(value = "/add") @ResponseBody public Object add(BizAlarmRecords bizAlarmRecords) { bizAlarmRecordsService.insert(bizAlarmRecords); @@ -64,9 +62,32 @@ } /** + * 单个报警记录消警 + */ + @PostMapping(value = "/cancel") + @ResponseBody + public Object cancel(Long id) { + if (id == null) { + return ResponseData.error("必须选中一条记录"); + } + bizAlarmRecordsService.cancelAlarmRecords(id); + return ResponseData.success(); + } + + /** + * 全部消警 + */ + @PostMapping(value = "/batchCancel") + @ResponseBody + public Object batchCancel() { + bizAlarmRecordsService.cancelAlarmRecords(null); + return ResponseData.success(); + } + + /** * 删除 */ - @RequestMapping(value = "/delete") + @GetMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String bizAlarmRecordsId) { bizAlarmRecordsService.deleteById(bizAlarmRecordsId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java index 5db7716..1cf2ed0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java @@ -34,7 +34,7 @@ */ @GetMapping(value = "/listByDevice") public Object listByDevice(AlarmRuleVO vo) { - return bizAlarmRuleService.selectListByDevice(vo); + return ResponseData.success(bizAlarmRuleService.selectListByDevice(vo)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java index e160686..d319cb3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java @@ -26,4 +26,11 @@ * @return 结果集 */ List selectRecordsPage(@Param("page") Page page, @Param("ew") EntityWrapper query); + + /** + * 取消告警信息 + * + * @param id 告警主键 不填则取消全部告警 + */ + void cancelAlarmRecords(@Param("id") Long id); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml index e8e3c04..0cfd214 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml @@ -20,6 +20,14 @@ id , device_no AS deviceNo, alarm_type AS alarmType, alarm_level AS alarmLevel, alarm_content AS alarmContent, alarm_value AS alarmValue, status, alarm_time AS alarmTime, cancel_time AS cancelTime + + update ${enviromentDataBaseName}.biz_alarm_records set status = 2 + + + id = #{id} + + + select diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java index c5e9aed..5093572 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java @@ -1,18 +1,16 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import com.baomidou.mybatisplus.enums.IdType; - -import java.util.Date; - -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import com.casic.missiles.core.base.json.DateDeserializer; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** *

@@ -65,11 +63,13 @@ /** * 报警时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @TableField("alarm_time") private Date alarmTime; /** * 消警时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @TableField("cancel_time") private Date cancelTime; @@ -77,6 +77,10 @@ private String alarmTypeName; @TableField(exist = false) private String alarmLevelName; + @TableField(exist = false) + private String position; + @TableField(exist = false) + private String deviceName; @Override protected Serializable pkVal() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizSensor.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizSensor.java index ac49d42..f0f7ca9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizSensor.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizSensor.java @@ -47,7 +47,11 @@ */ @TableField("data_attr") private String dataAttr; - + /** + * 是否设置报警等级,是返回true,否返回false + */ + @TableField(exist = false) + private Boolean hasAlarmLevel; @Override protected Serializable pkVal() { return this.id; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/dto/AlarmRuleDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/dto/AlarmRuleDTO.java index 324a880..a35eb51 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/dto/AlarmRuleDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/dto/AlarmRuleDTO.java @@ -61,4 +61,5 @@ * 单位 */ private String unit; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmLevelService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmLevelService.java index 3817ff1..fc0650b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmLevelService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.system.model.BizAlarmLevel; +import com.casic.missiles.modular.system.model.BizSensor; import java.util.List; @@ -16,5 +17,5 @@ */ public interface IBizAlarmLevelService extends IService { - List selectLevelList(EntityWrapper query); + List selectSensorList(EntityWrapper query); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmRecordsService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmRecordsService.java index 3e653f4..ed5faf6 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmRecordsService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmRecordsService.java @@ -2,8 +2,8 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.modular.system.model.BizAlarmRecords; import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.system.model.BizAlarmRecords; import java.util.List; @@ -25,4 +25,11 @@ * @return 分页列表 */ List selectRecordsPage(Page page, EntityWrapper query); + + /** + * 取消告警信息 + * + * @param id 告警主键 + */ + void cancelAlarmRecords(Long id); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java index b66bb85..818c9aa 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.BizAlarmLevel; +import com.casic.missiles.modular.system.model.BizSensor; import com.casic.missiles.modular.system.service.IBizAlarmLevelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -41,9 +42,9 @@ @RequestMapping(value = "/list") @ResponseBody public Object list(String condition) { - EntityWrapper levelQuery = new EntityWrapper<>(); - levelQuery.orderBy("alarm_level"); - return ResponseData.success( bizAlarmLevelService.selectLevelList(levelQuery)); + EntityWrapper levelQuery = new EntityWrapper<>(); + levelQuery.orderBy("sensor"); + return ResponseData.success( bizAlarmLevelService.selectSensorList(levelQuery)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java index e0aa067..889862a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRecordsController.java @@ -8,9 +8,7 @@ import com.casic.missiles.modular.system.model.vo.AlarmRecordVO; import com.casic.missiles.modular.system.service.IBizAlarmRecordsService; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -56,7 +54,7 @@ /** * 新增 */ - @RequestMapping(value = "/add") + @PostMapping(value = "/add") @ResponseBody public Object add(BizAlarmRecords bizAlarmRecords) { bizAlarmRecordsService.insert(bizAlarmRecords); @@ -64,9 +62,32 @@ } /** + * 单个报警记录消警 + */ + @PostMapping(value = "/cancel") + @ResponseBody + public Object cancel(Long id) { + if (id == null) { + return ResponseData.error("必须选中一条记录"); + } + bizAlarmRecordsService.cancelAlarmRecords(id); + return ResponseData.success(); + } + + /** + * 全部消警 + */ + @PostMapping(value = "/batchCancel") + @ResponseBody + public Object batchCancel() { + bizAlarmRecordsService.cancelAlarmRecords(null); + return ResponseData.success(); + } + + /** * 删除 */ - @RequestMapping(value = "/delete") + @GetMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String bizAlarmRecordsId) { bizAlarmRecordsService.deleteById(bizAlarmRecordsId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java index 5db7716..1cf2ed0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmRuleController.java @@ -34,7 +34,7 @@ */ @GetMapping(value = "/listByDevice") public Object listByDevice(AlarmRuleVO vo) { - return bizAlarmRuleService.selectListByDevice(vo); + return ResponseData.success(bizAlarmRuleService.selectListByDevice(vo)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java index e160686..d319cb3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizAlarmRecordsMapper.java @@ -26,4 +26,11 @@ * @return 结果集 */ List selectRecordsPage(@Param("page") Page page, @Param("ew") EntityWrapper query); + + /** + * 取消告警信息 + * + * @param id 告警主键 不填则取消全部告警 + */ + void cancelAlarmRecords(@Param("id") Long id); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml index e8e3c04..0cfd214 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BizAlarmRecordsMapper.xml @@ -20,6 +20,14 @@ id , device_no AS deviceNo, alarm_type AS alarmType, alarm_level AS alarmLevel, alarm_content AS alarmContent, alarm_value AS alarmValue, status, alarm_time AS alarmTime, cancel_time AS cancelTime + + update ${enviromentDataBaseName}.biz_alarm_records set status = 2 + + + id = #{id} + + + select diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java index c5e9aed..5093572 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmRecords.java @@ -1,18 +1,16 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import com.baomidou.mybatisplus.enums.IdType; - -import java.util.Date; - -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import com.casic.missiles.core.base.json.DateDeserializer; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** *

@@ -65,11 +63,13 @@ /** * 报警时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @TableField("alarm_time") private Date alarmTime; /** * 消警时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @TableField("cancel_time") private Date cancelTime; @@ -77,6 +77,10 @@ private String alarmTypeName; @TableField(exist = false) private String alarmLevelName; + @TableField(exist = false) + private String position; + @TableField(exist = false) + private String deviceName; @Override protected Serializable pkVal() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizSensor.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizSensor.java index ac49d42..f0f7ca9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizSensor.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizSensor.java @@ -47,7 +47,11 @@ */ @TableField("data_attr") private String dataAttr; - + /** + * 是否设置报警等级,是返回true,否返回false + */ + @TableField(exist = false) + private Boolean hasAlarmLevel; @Override protected Serializable pkVal() { return this.id; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/dto/AlarmRuleDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/dto/AlarmRuleDTO.java index 324a880..a35eb51 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/dto/AlarmRuleDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/dto/AlarmRuleDTO.java @@ -61,4 +61,5 @@ * 单位 */ private String unit; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmLevelService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmLevelService.java index 3817ff1..fc0650b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmLevelService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.system.model.BizAlarmLevel; +import com.casic.missiles.modular.system.model.BizSensor; import java.util.List; @@ -16,5 +17,5 @@ */ public interface IBizAlarmLevelService extends IService { - List selectLevelList(EntityWrapper query); + List selectSensorList(EntityWrapper query); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmRecordsService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmRecordsService.java index 3e653f4..ed5faf6 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmRecordsService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBizAlarmRecordsService.java @@ -2,8 +2,8 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.modular.system.model.BizAlarmRecords; import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.system.model.BizAlarmRecords; import java.util.List; @@ -25,4 +25,11 @@ * @return 分页列表 */ List selectRecordsPage(Page page, EntityWrapper query); + + /** + * 取消告警信息 + * + * @param id 告警主键 + */ + void cancelAlarmRecords(Long id); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BizAlarmLevelServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BizAlarmLevelServiceImpl.java index 7e81c2d..fe6c7c6 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BizAlarmLevelServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BizAlarmLevelServiceImpl.java @@ -32,26 +32,21 @@ } @Override - public List selectLevelList(EntityWrapper query) { + public List selectSensorList(EntityWrapper query) { - List levels = this.selectList(query); - levels.stream().forEach(level -> { + List sensors = sensorService.selectList(query); + sensors.stream().forEach(sensor -> { // 查询告警规则 EntityWrapper ruleQuery = new EntityWrapper<>(); ruleQuery.eq("del_flag", 0); - ruleQuery.eq("sensor", level.getSensor()); - ruleQuery.eq("level", level.getAlarmLevel()); - level.setHasAlarmLevel(ruleService.selectCount(ruleQuery) > 0); + ruleQuery.eq("sensor", sensor.getSensor()); + sensor.setHasAlarmLevel(ruleService.selectCount(ruleQuery) > 0); // 查询配置规则 EntityWrapper sensorQuery = new EntityWrapper(); - sensorQuery.eq("sensor", level.getSensor()); + sensorQuery.eq("sensor", sensor.getSensor()); BizSensor bizSensor = sensorService.selectOne(sensorQuery); - if (bizSensor != null) { - level.setSensorName(bizSensor.getName()); - level.setUnit(bizSensor.getUnit()); - } }); - return levels; + return sensors; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BizAlarmRecordsServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BizAlarmRecordsServiceImpl.java index f934a52..9444d88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BizAlarmRecordsServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BizAlarmRecordsServiceImpl.java @@ -2,10 +2,12 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.modular.system.model.BizAlarmRecords; -import com.casic.missiles.modular.system.dao.BizAlarmRecordsMapper; -import com.casic.missiles.modular.system.service.IBizAlarmRecordsService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.modular.system.dao.BizAlarmRecordsMapper; +import com.casic.missiles.modular.system.model.BizAlarmRecords; +import com.casic.missiles.modular.system.service.IBizAlarmRecordsService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -20,10 +22,21 @@ */ @Service public class BizAlarmRecordsServiceImpl extends ServiceImpl implements IBizAlarmRecordsService { + @Autowired + private ICommonPermissionService service; @Override public List selectRecordsPage(Page page, EntityWrapper query) { + List records = baseMapper.selectRecordsPage(page, query); + records.stream().forEach(record -> { + record.setAlarmLevelName(service.getDictNameByCode("envAlarmLevel", String.valueOf(record.getAlarmLevel()))); + record.setAlarmTypeName(service.getDictNameByCode("alarmType1", String.valueOf(record.getAlarmType()))); + }); + return records; + } - return baseMapper.selectRecordsPage(page,query); + @Override + public void cancelAlarmRecords(Long id) { + this.baseMapper.cancelAlarmRecords(id); } }