xymp
/
backend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

图片告警 告警分类

Browse Source
master
liuguijing 2 years ago
parent c7be6bcb69
commit 13b9b624a4
18 changed files with 373 additions and 51 deletions
Show Stats Download Patch File Download Diff File

32
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalAlarmController.java
Unescape Escape View File

@ -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<String> readAlarm(@RequestBody @Validated TerminalAlarmIdVo vo) {
ServiceBody<String> serviceBody = terminalAlarmService.readAlarm(vo);
public ResponseReult<Boolean> readAlarm(@RequestBody @Validated TerminalAlarmIdVo vo) {
ServiceBody<Boolean> 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<TerminalImgAlarmParamsModel> getAlarmTypeList() {
ServiceBody<TerminalImgAlarmParamsModel> 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<TerminalImgAlarmParamsModel> updateAlarmTypeList() {
// ServiceBody<TerminalImgAlarmParamsModel> serviceBody = terminalAlarmService.getAlarmTypeList();
// if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
// return ResponseReult.success(serviceBody.getData());
// } else {
// return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
// }
// }
}

2
xymanager_admin/src/main/resources/META-INF/spring.factories
Unescape Escape View File

@ -1 +1 @@
#org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor
org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor

24
xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalImgAlarmParams.java
Unescape Escape View File

@ -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;
}

2
xymanager_common/src/main/java/com/shxy/xymanager_common/model/AllTowerListModel.java
Unescape Escape View File

@ -32,7 +32,5 @@ public class AllTowerListModel implements Serializable {
@ApiModelProperty(value = "线路编号", example = "123456")
private String lineName;
}
}

18
xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalAlarmListModel.java
Unescape Escape View File

@ -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;

32
xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalImgAlarmParamsModel.java
Unescape Escape View File

@ -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<AlarmParamBean> 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;
}

3
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmIdVo.java
Unescape Escape View File

@ -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;
}

3
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmSelectVo.java
Unescape Escape View File

@ -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;

21
xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmParamsDao.java
Unescape Escape View File

@ -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<TerminalImgAlarmParams> selectAll();
int updateByPrimaryKeySelective(TerminalImgAlarmParams record);
int updateByPrimaryKey(TerminalImgAlarmParams record);
}

2
xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmsDao.java
Unescape Escape View File

@ -17,7 +17,7 @@ public interface TerminalImgAlarmsDao {
TerminalImgAlarms selectByPrimaryKey(Long id);
List<TerminalImgAlarmsDto> selectAlarmsDetails(@Param("terminalidlist") List<Integer> termidlist, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime);
List<TerminalImgAlarmsDto> selectAlarmsDetails(@Param("terminalidlist") List<Integer> termidlist, @Param("label") Integer label,@Param("prob") Float prob, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime);
int updateByPrimaryKeySelective(TerminalImgAlarms record);

45
xymanager_dao/src/main/resources/generatorConfig.xml
Unescape Escape View File

@ -35,7 +35,7 @@
也可以使用“MAVEN”来自动生成，这样生成的代码会在target/generatord-source目录下
-->
<javaModelGenerator targetPackage="com.shxy.xymanager_common.entity"
targetProject="D:/Project/JAVAProject/XyManagerBackend/xymanager_common/src/main/java">
targetProject="D:/Project/JAVAProject/xympbackend/xymanager_common/src/main/java">
<property name="enableSubPackages" value="true"/>
<!-- 从数据库返回的值被清理前后的空格 -->
<property name="trimStrings" value="true"/>
@ -213,32 +213,37 @@
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="sys_user"-->
<!-- domainObjectName="SysUser"-->
<!-- mapperName="SysUserDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="sys_user"-->
<!-- domainObjectName="SysUser"-->
<!-- mapperName="SysUserDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<table tableName="terminal_img_alarms"
domainObjectName="TerminalImgAlarms"
mapperName="TerminalImgAlarmsDao"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
<!-- <property name="useActualColumnNames" value="false"/>-->
</table>
<!-- <table tableName="terminal_img_alarms"-->
<!-- domainObjectName="TerminalImgAlarms"-->
<!-- mapperName="TerminalImgAlarmsDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<table tableName="terminal_img_alarm_details"
domainObjectName="TerminalImgAlarmsDetails"
mapperName="TerminalImgAlarmsDetailsDao"
<!-- <table tableName="terminal_img_alarm_details"-->
<!-- domainObjectName="TerminalImgAlarmsDetails"-->
<!-- mapperName="TerminalImgAlarmsDetailsDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<table tableName="terminal_img_alarm_params"
domainObjectName="TerminalImgAlarmParams"
mapperName="TerminalImgAlarmParamsDao"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
<!-- <property name="useActualColumnNames" value="false"/>-->
</table>
</context>
</generatorConfiguration>

111
xymanager_dao/src/main/resources/mappers/TerminalImgAlarmParamsDao.xml
Unescape Escape View File

@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.shxy.xymanager_dao.dao.TerminalImgAlarmParamsDao">
<resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.TerminalImgAlarmParams">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="label" jdbcType="INTEGER" property="label" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="prob" jdbcType="REAL" property="prob" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
id, label, name, prob, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from terminal_img_alarm_params
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from terminal_img_alarm_params
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from terminal_img_alarm_params
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalImgAlarmParams">
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>
<insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.TerminalImgAlarmParams">
insert into terminal_img_alarm_params
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="label != null">
label,
</if>
<if test="name != null">
name,
</if>
<if test="prob != null">
prob,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="label != null">
#{label,jdbcType=INTEGER},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="prob != null">
#{prob,jdbcType=REAL},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.TerminalImgAlarmParams">
update terminal_img_alarm_params
<set>
<if test="label != null">
label = #{label,jdbcType=INTEGER},
</if>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="prob != null">
prob = #{prob,jdbcType=REAL},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TerminalImgAlarmParams">
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}
</update>
</mapper>

10
xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml
Unescape Escape View File

@ -67,11 +67,13 @@
#{item}
</foreach>
</if>
<if test="label != null">
and label = #{label}
</if>
<if test="prob != null and prob lte 100">
and prob >= #{prob}
</if>
order by a.alarm_time desc
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

2
xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDetailsDao.xml
Unescape Escape View File

@ -151,7 +151,7 @@
<update id="updateReadByPrimaryKey">
update terminal_img_alarm_details
set isread = #{status},
set isread = #{status}
where id = #{id}
</update>
</mapper>

8
xymanager_framework/pom.xml
Unescape Escape View File

@ -40,10 +40,10 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
<!-- <exclusion>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-tomcat</artifactId>-->
<!-- </exclusion>-->
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>

10
xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java vendored
Unescape Escape View File

@ -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<Integer, TerminalChannels> termchannelMap = new HashMap<Integer, TerminalChannels>();
/*装置编号+‘#’+通道编号 装置映射表*/
public static Map<String, TerminalChannelMapper> termchannelMapMap = new HashMap<String, TerminalChannelMapper>();
//告警类型
public static Map<Integer, TerminalImgAlarmParams> alarmParamMap = new HashMap<Integer, TerminalImgAlarmParams>();
@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> terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll();
for (TerminalImgAlarmParams item : terminalImgAlarmParams) {
alarmParamMap.put(item.getLabel(), item);
}
}
@PreDestroy

88
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java
Unescape Escape View File

@ -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<Integer, TerminalImgAlarmParams> 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<Integer> 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<String> readAlarm(TerminalAlarmIdVo vo) {
public ServiceBody<Boolean> 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<TerminalImgAlarmParamsModel> getAlarmTypeList() {
TerminalImgAlarmParamsModel model = new TerminalImgAlarmParamsModel();
ArrayList<TerminalImgAlarmParamsModel.AlarmParamBean> list = new ArrayList<>();
Map<Integer, TerminalImgAlarmParams> 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<TerminalImgAlarmParamsModel> updateAlarmTypeList() {
// TerminalImgAlarmParamsModel model = new TerminalImgAlarmParamsModel();
// ArrayList<TerminalImgAlarmParamsModel.AlarmBean> list = new ArrayList<>();
// Map<Integer, TerminalImgAlarmParams> 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);
// }
}

9
xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalAlarmService.java
Unescape Escape View File

@ -23,6 +23,13 @@ public interface TerminalAlarmService {
*
* @return
*/
ServiceBody<String> readAlarm(TerminalAlarmIdVo vo);
ServiceBody<Boolean> readAlarm(TerminalAlarmIdVo vo);
/**
* 获取告警分类列表
*
* @return
*/
ServiceBody<TerminalImgAlarmParamsModel> getAlarmTypeList();
}

Write Preview
Loading…
Cancel
Save