From 13b9b624a4fda25d0e01f091fc1e5e8105786bf9 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Wed, 7 Jun 2023 20:25:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=91=8A=E8=AD=A6=20=20?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TerminalAlarmController.java | 32 ++++- .../main/resources/META-INF/spring.factories | 2 +- .../entity/TerminalImgAlarmParams.java | 24 ++++ .../model/AllTowerListModel.java | 2 - .../model/TerminalAlarmListModel.java | 18 +++ .../model/TerminalImgAlarmParamsModel.java | 32 +++++ .../vo/TerminalAlarmIdVo.java | 3 +- .../vo/TerminalAlarmSelectVo.java | 3 + .../dao/TerminalImgAlarmParamsDao.java | 21 ++++ .../dao/TerminalImgAlarmsDao.java | 2 +- .../src/main/resources/generatorConfig.xml | 45 +++---- .../mappers/TerminalImgAlarmParamsDao.xml | 111 ++++++++++++++++++ .../mappers/TerminalImgAlarmsDao.xml | 12 +- .../mappers/TerminalImgAlarmsDetailsDao.xml | 2 +- xymanager_framework/pom.xml | 8 +- .../shxy/xymanager_service/cache/XyCache.java | 10 ++ .../impl/TerminalAlarmServiceImpl.java | 88 ++++++++++++-- .../service/TerminalAlarmService.java | 9 +- 18 files changed, 373 insertions(+), 51 deletions(-) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalImgAlarmParams.java create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalImgAlarmParamsModel.java create mode 100644 xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmParamsDao.java create mode 100644 xymanager_dao/src/main/resources/mappers/TerminalImgAlarmParamsDao.xml diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalAlarmController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalAlarmController.java index 204904a..65c268f 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalAlarmController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalAlarmController.java @@ -45,8 +45,8 @@ public class TerminalAlarmController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/readAlarm") @Log(title = "更改告警列表未读状态", type = "修改") - public ResponseReult readAlarm(@RequestBody @Validated TerminalAlarmIdVo vo) { - ServiceBody serviceBody = terminalAlarmService.readAlarm(vo); + public ResponseReult readAlarm(@RequestBody @Validated TerminalAlarmIdVo vo) { + ServiceBody serviceBody = terminalAlarmService.readAlarm(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { @@ -54,4 +54,32 @@ public class TerminalAlarmController extends BaseController { } } + + @ApiOperation(value = "获取告警分类列表", notes = "获取告警分类列表", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getAlarmTypeList") + @Log(title = "获取告警分类列表", type = "查询") + public ResponseReult getAlarmTypeList() { + ServiceBody serviceBody = terminalAlarmService.getAlarmTypeList(); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + + +// @ApiOperation(value = "修改告警分类列表", notes = "修改告警分类列表", httpMethod = "POST") +// @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) +// @RequestMapping("/getAlarmTypeList") +// @Log(title = "修改告警分类列表", type = "修改") +// public ResponseReult updateAlarmTypeList() { +// ServiceBody serviceBody = terminalAlarmService.getAlarmTypeList(); +// if (serviceBody.getCode() == ServiceStatus.SUCCESS) { +// return ResponseReult.success(serviceBody.getData()); +// } else { +// return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); +// } +// } + } diff --git a/xymanager_admin/src/main/resources/META-INF/spring.factories b/xymanager_admin/src/main/resources/META-INF/spring.factories index 8e7c358..5e2059b 100644 --- a/xymanager_admin/src/main/resources/META-INF/spring.factories +++ b/xymanager_admin/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -#org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor +org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalImgAlarmParams.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalImgAlarmParams.java new file mode 100644 index 0000000..ac76cc4 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalImgAlarmParams.java @@ -0,0 +1,24 @@ +package com.shxy.xymanager_common.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class TerminalImgAlarmParams implements Serializable { + private Integer id; + + private Integer label; + + private String name; + + private Float prob; + + private Date createTime; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/AllTowerListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/AllTowerListModel.java index b6950b8..2ae247b 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/AllTowerListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/AllTowerListModel.java @@ -32,7 +32,5 @@ public class AllTowerListModel implements Serializable { @ApiModelProperty(value = "线路编号", example = "123456") private String lineName; - - } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalAlarmListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalAlarmListModel.java index e46ac0c..cde23d4 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalAlarmListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalAlarmListModel.java @@ -31,6 +31,7 @@ public class TerminalAlarmListModel implements Serializable { @ApiModelProperty(value = "告警编号", example = "123456") private BigInteger id; + @ApiModelProperty(value = "装置编号", example = "123456") private Integer termId; @@ -60,29 +61,46 @@ public class TerminalAlarmListModel implements Serializable { @ApiModelProperty(value = "预置位编号", example = "123456") private Integer presetId; + @ApiModelProperty(value = "图片编号", example = "123456") private BigInteger photoOrgId; + @ApiModelProperty(value = "图片地址", example = "123456") private String path; + @ApiModelProperty(value = "告警时间", example = "123456") private Date alarmTime; + @ApiModelProperty(value = "识别标签编码", example = "123456") private Integer label; + @ApiModelProperty(value = "告警名称", example = "123456") private String name; + @ApiModelProperty(value = "告警中文", example = "123456") private String enname; + @ApiModelProperty(value = "可信度", example = "123456") private Float prob; + @ApiModelProperty(value = " 识别框横坐标", example = "123456") private Float x; + @ApiModelProperty(value = " 识别框纵坐标", example = "123456") private Float y; + @ApiModelProperty(value = "识别框宽度", example = "123456") private Float width; + @ApiModelProperty(value = "识别框高度", example = "123456") private Float height; + @ApiModelProperty(value = "图片宽度", example = "123456") + private Integer photoWidth; + + @ApiModelProperty(value = "图片高度", example = "123456") + private Integer photoHeight; + @ApiModelProperty(value = "1", example = "0--未读 1--已读") private Integer isread; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalImgAlarmParamsModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalImgAlarmParamsModel.java new file mode 100644 index 0000000..36979ed --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalImgAlarmParamsModel.java @@ -0,0 +1,32 @@ +package com.shxy.xymanager_common.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "告警类型", description = "告警类型信息") +public class TerminalImgAlarmParamsModel implements Serializable { + + @ApiModelProperty(value = "告警类型列表", example = "[]") + private List list; + + @Data + public static class AlarmParamBean { + @ApiModelProperty(value = "编号", example = "123456") + private Integer id; + @ApiModelProperty(value = "告警编号", example = "123456") + private Integer label; + @ApiModelProperty(value = "告警名称", example = "123456") + private String name; + @ApiModelProperty(value = "可信度", example = "123456") + private Float prob; + } + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmIdVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmIdVo.java index 720d1e5..417b4e8 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmIdVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmIdVo.java @@ -6,16 +6,17 @@ import lombok.Data; import org.springframework.validation.annotation.Validated; import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.math.BigInteger; import java.util.Date; @Data -@Validated @ApiModel(value = "装置告警编号对象", description = "装置告警编号对象") public class TerminalAlarmIdVo { @ApiModelProperty(value = "告警编号", example = "123455") + @NotNull(message = "编号不能缺少") private BigInteger id; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmSelectVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmSelectVo.java index be1252c..2b8891e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmSelectVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmSelectVo.java @@ -23,6 +23,9 @@ public class TerminalAlarmSelectVo { @ApiModelProperty(value = "杆塔编号", example = "123455") private Integer towerid; + @ApiModelProperty(value = "告警类型", example = "123455") + private Integer label; + @NotNull(message = "查询时间不能缺少") @ApiModelProperty(value = "查询时间", example = "123455") private Date starttime; diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmParamsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmParamsDao.java new file mode 100644 index 0000000..feba265 --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmParamsDao.java @@ -0,0 +1,21 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.TerminalImgAlarmParams; + +import java.util.List; + +public interface TerminalImgAlarmParamsDao { + int deleteByPrimaryKey(Integer id); + + int insert(TerminalImgAlarmParams record); + + int insertSelective(TerminalImgAlarmParams record); + + TerminalImgAlarmParams selectByPrimaryKey(Integer id); + + List selectAll(); + + int updateByPrimaryKeySelective(TerminalImgAlarmParams record); + + int updateByPrimaryKey(TerminalImgAlarmParams record); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmsDao.java index 06372dc..6716edf 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmsDao.java @@ -17,7 +17,7 @@ public interface TerminalImgAlarmsDao { TerminalImgAlarms selectByPrimaryKey(Long id); - List selectAlarmsDetails(@Param("terminalidlist") List termidlist, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime); + List selectAlarmsDetails(@Param("terminalidlist") List termidlist, @Param("label") Integer label,@Param("prob") Float prob, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime); int updateByPrimaryKeySelective(TerminalImgAlarms record); diff --git a/xymanager_dao/src/main/resources/generatorConfig.xml b/xymanager_dao/src/main/resources/generatorConfig.xml index d3f199d..7d64fd1 100644 --- a/xymanager_dao/src/main/resources/generatorConfig.xml +++ b/xymanager_dao/src/main/resources/generatorConfig.xml @@ -35,7 +35,7 @@ 也可以使用“MAVEN”来自动生成，这样生成的代码会在target/generatord-source目录下 --> + targetProject="D:/Project/JAVAProject/xympbackend/xymanager_common/src/main/java"> @@ -213,32 +213,37 @@ - - - - - - - - + + + + + + + - - -
+ + + + + + + - + + + + + + +
- \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmParamsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmParamsDao.xml new file mode 100644 index 0000000..bbc5b03 --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmParamsDao.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + id, label, name, prob, create_time, update_time + + + + + delete from terminal_img_alarm_params + where id = #{id,jdbcType=INTEGER} + + + insert into terminal_img_alarm_params (id, label, name, + prob, create_time, update_time + ) + values (#{id,jdbcType=INTEGER}, #{label,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, + #{prob,jdbcType=REAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} + ) + + + insert into terminal_img_alarm_params + + + id, + + + label, + + + name, + + + prob, + + + create_time, + + + update_time, + + + + + #{id,jdbcType=INTEGER}, + + + #{label,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{prob,jdbcType=REAL}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + + + update terminal_img_alarm_params + + + label = #{label,jdbcType=INTEGER}, + + + name = #{name,jdbcType=VARCHAR}, + + + prob = #{prob,jdbcType=REAL}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + + update terminal_img_alarm_params + set label = #{label,jdbcType=INTEGER}, + name = #{name,jdbcType=VARCHAR}, + prob = #{prob,jdbcType=REAL}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml index 322c1cf..57e26c5 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml @@ -41,7 +41,7 @@ where id = #{id,jdbcType=BIGINT} - select b.id as id, a.term_id as term_id, @@ -67,11 +67,13 @@ #{item} + + and label = #{label} + + + and prob >= #{prob} + order by a.alarm_time desc - - - - diff --git a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDetailsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDetailsDao.xml index 745eb76..31d3c74 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDetailsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDetailsDao.xml @@ -151,7 +151,7 @@ update terminal_img_alarm_details - set isread = #{status}, + set isread = #{status} where id = #{id} \ No newline at end of file diff --git a/xymanager_framework/pom.xml b/xymanager_framework/pom.xml index 5601665..b5c0cbd 100644 --- a/xymanager_framework/pom.xml +++ b/xymanager_framework/pom.xml @@ -40,10 +40,10 @@ ch.qos.logback logback-classic - - - - + + org.springframework.boot + spring-boot-starter-tomcat + diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java index 3607e30..3fc3fe8 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java @@ -4,6 +4,7 @@ import com.shxy.xymanager_common.dto.LineAndDyNameDto; import com.shxy.xymanager_common.dto.TowerDto; import com.shxy.xymanager_common.entity.TerminalChannelMapper; import com.shxy.xymanager_common.entity.TerminalChannels; +import com.shxy.xymanager_common.entity.TerminalImgAlarmParams; import com.shxy.xymanager_common.entity.Terminals; import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_dao.dao.*; @@ -24,6 +25,8 @@ public class XyCache { public static Map termchannelMap = new HashMap(); /*装置编号+‘#’+通道编号 装置映射表*/ public static Map termchannelMapMap = new HashMap(); + //告警类型 + public static Map alarmParamMap = new HashMap(); @Autowired private LinesDao linesDao; @@ -35,6 +38,8 @@ public class XyCache { private TerminalChannelsDao terminalChannelsDao; @Autowired private TerminalChannelMapperDao terminalChannelMapperDao; + @Autowired + private TerminalImgAlarmParamsDao terminalImgAlarmParamsDao; @PostConstruct public void init() { @@ -65,6 +70,11 @@ public class XyCache { termchannelMapMap.put(s, item); } + List terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll(); + for (TerminalImgAlarmParams item : terminalImgAlarmParams) { + alarmParamMap.put(item.getLabel(), item); + } + } @PreDestroy diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java index 9590a74..c1eda02 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java @@ -5,13 +5,11 @@ import cn.hutool.core.date.DateTime; import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.dto.*; -import com.shxy.xymanager_common.entity.TerminalChannelMapper; -import com.shxy.xymanager_common.entity.TerminalChannels; -import com.shxy.xymanager_common.entity.TerminalPhoto; -import com.shxy.xymanager_common.entity.Terminals; +import com.shxy.xymanager_common.entity.*; import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.model.TerminalAlarmListModel; +import com.shxy.xymanager_common.model.TerminalImgAlarmParamsModel; import com.shxy.xymanager_common.page.PageUtils; import com.shxy.xymanager_common.util.MyDateUtils; import com.shxy.xymanager_common.vo.TerminalAlarmIdVo; @@ -46,6 +44,9 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { @Autowired private TerminalImgAlarmsDetailsDao terminalImgAlarmsDetailsDao; + @Autowired + private TerminalImgAlarmParamsDao terminalImgAlarmParamsDao; + @Autowired DyLevelDao dyLevelDao; @@ -68,6 +69,19 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { Integer dyid = vo.getDyid(); Integer lineid = vo.getLineid(); Integer towerid = vo.getTowerid(); + Integer label = vo.getLabel(); + Float prob = null; + if (label !=null && label == -1) { + label = null; + prob = null; + } else { + Map alarmParamMap = XyCache.alarmParamMap; + TerminalImgAlarmParams terminalImgAlarmParams = alarmParamMap.get(label); + if (terminalImgAlarmParams != null) { + prob = terminalImgAlarmParams.getProb(); + } + } + Date starttime = vo.getStarttime(); Date endtime = vo.getEndtime(); int pageindex = vo.getPageindex(); @@ -79,7 +93,7 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { List termidlist = new ArrayList<>(); if (dyid == null || dyid.intValue() == 0) { PageUtils.SetPage(pageindex, pagesize); - list = terminalImgAlarmsDao.selectAlarmsDetails(null, BigInteger.valueOf(start), BigInteger.valueOf(end)); + list = terminalImgAlarmsDao.selectAlarmsDetails(null, label, prob, BigInteger.valueOf(start), BigInteger.valueOf(end)); } else { if (lineid == null || lineid.intValue() == 0) { dtos = dyLevelDao.selectDyAndLineAndTowerAnTermList(dyid, null, null, null, CommonStatus.EFFECTIVE.value()); @@ -100,7 +114,7 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { } } PageUtils.SetPage(pageindex, pagesize); - list = terminalImgAlarmsDao.selectAlarmsDetails(termidlist, BigInteger.valueOf(start), BigInteger.valueOf(end)); + list = terminalImgAlarmsDao.selectAlarmsDetails(termidlist, label, prob, BigInteger.valueOf(start), BigInteger.valueOf(end)); } if (CollectionUtil.isNotEmpty(list)) { @@ -145,16 +159,13 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { } TerminalChannels terminalChannels = termchannelMap.get(channelId); if (terminalChannels != null) { - alarmBean.setChannnelName(terminalChannels.getChannelName()); - } TerminalChannelMapper terminalChannelMapper = termchannelMapMap.get(termId + "#" + channelId); if (terminalChannelMapper != null) { alarmBean.setAlias(terminalChannelMapper.getAlias()); } - alarmBean.setPresetId(item.getPresetId()); alarmBean.setPhotoOrgId(item.getPhotoOrgId()); if (map != null) { @@ -169,6 +180,8 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { } else { alarmBean.setPath(""); } + alarmBean.setPhotoWidth(terminalPhoto.getWidth()); + alarmBean.setPhotoHeight(terminalPhoto.getHeight()); } else { alarmBean.setPath(""); } @@ -185,8 +198,12 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { alarmBean.setY(item.getY()); alarmBean.setWidth(item.getWidth()); alarmBean.setHeight(item.getHeight()); - if (item.getIsread() == null) { + + Integer isread = item.getIsread(); + if (isread == null) { alarmBean.setIsread(CommonStatus.DELETE.value()); + } else { + alarmBean.setIsread(isread); } alarmBeans.add(alarmBean); } @@ -215,13 +232,58 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { * @return */ @Override - public ServiceBody readAlarm(TerminalAlarmIdVo vo) { + public ServiceBody readAlarm(TerminalAlarmIdVo vo) { int i = terminalImgAlarmsDetailsDao.updateReadByPrimaryKey(vo.getId().longValue(), CommonStatus.EFFECTIVE.value()); if (i > 0) { - return Asserts.success("success"); + return Asserts.success(true); } else { - return Asserts.error("更改失败"); + return Asserts.success(false); } } + + /** + * 获取告警分类列表 + * + * @return + */ + @Override + public ServiceBody getAlarmTypeList() { + TerminalImgAlarmParamsModel model = new TerminalImgAlarmParamsModel(); + ArrayList list = new ArrayList<>(); + Map beans = XyCache.alarmParamMap; + beans.forEach((key, value) -> { + TerminalImgAlarmParamsModel.AlarmParamBean alarmBean = new TerminalImgAlarmParamsModel.AlarmParamBean(); + alarmBean.setId(value.getId()); + alarmBean.setLabel(value.getLabel()); + alarmBean.setName(value.getName()); + alarmBean.setProb(value.getProb()); + list.add(alarmBean); + }); + model.setList(list); + return Asserts.success(model); + } + + +// /** +// * 获取告警分类列表 +// * +// * @return +// */ +// @Override +// public ServiceBody updateAlarmTypeList() { +// TerminalImgAlarmParamsModel model = new TerminalImgAlarmParamsModel(); +// ArrayList list = new ArrayList<>(); +// Map beans = XyCache.alarmParamMap; +// beans.forEach((key, value) -> { +// TerminalImgAlarmParamsModel.AlarmBean alarmBean = new TerminalImgAlarmParamsModel.AlarmBean(); +// alarmBean.setId(value.getId()); +// alarmBean.setLabel(value.getLabel()); +// alarmBean.setName(value.getName()); +// alarmBean.setProb(value.getProb()); +// list.add(alarmBean); +// }); +// model.setList(list); +// return Asserts.success(model); +// } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalAlarmService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalAlarmService.java index cba3cb8..f1724d8 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalAlarmService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalAlarmService.java @@ -23,6 +23,13 @@ public interface TerminalAlarmService { * * @return */ - ServiceBody readAlarm(TerminalAlarmIdVo vo); + ServiceBody readAlarm(TerminalAlarmIdVo vo); + + /** + * 获取告警分类列表 + * + * @return + */ + ServiceBody getAlarmTypeList(); }