From d7820a3ec1583ead0b6be86a51aeca2fc4c9dd31 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Tue, 25 Jul 2023 15:15:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=92=8C=E5=91=8A=E8=AD=A6=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GloableParamsController.java | 19 ++++++++-- .../xymanager_common/dto/LastPicTimeDto.java | 16 +++++++++ .../dto/TerminalsAndStatusAndLastPicDto.java | 11 ++---- .../enums/GloableParamsType.java | 2 +- .../model/GlobalParamsModel.java | 23 ++++++++++++ .../vo/TerminalAlarmSelectVo.java | 3 -- .../mappers/TerminalImgAlarmsDao.xml | 2 +- .../main/resources/mappers/TerminalsDao.xml | 2 +- .../impl/GloablParamsServiceImpl.java | 36 ++++++++++++++++--- .../impl/TerminalAlarmServiceImpl.java | 14 +++++--- .../impl/TerminalServiceImpl.java | 15 ++++---- .../service/GloablParamsService.java | 9 ++++- 12 files changed, 120 insertions(+), 32 deletions(-) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LastPicTimeDto.java create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/model/GlobalParamsModel.java diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/GloableParamsController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/GloableParamsController.java index dff1689..e2464ef 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/GloableParamsController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/GloableParamsController.java @@ -5,6 +5,7 @@ import com.shxy.xymanager_common.base.BaseController; import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceStatus; +import com.shxy.xymanager_common.model.GlobalParamsModel; import com.shxy.xymanager_service.service.GloablParamsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,8 +30,8 @@ public class GloableParamsController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getMarkEnableStatus") @Log(title = "查询图片绘制开关状态", type = "查询") - public ResponseReult getMarkEnableStatus() { - ServiceBody serviceBody = gloableParamsService.getMarkEnableStatus(); + public ResponseReult getMarkEnableStatus() { + ServiceBody serviceBody = gloableParamsService.getMarkEnableStatus(); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { @@ -42,7 +43,7 @@ public class GloableParamsController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/updateMarkEnableStatus") @Log(title = "修改图片绘制开关状态", type = "修改") - public ResponseReult updateMarkEnableStatus(@RequestParam("status") Integer status) { + public ResponseReult updateMarkEnableStatus(@RequestParam("status") Integer status) { ServiceBody serviceBody = gloableParamsService.updateMarkEnableStatus(status); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); @@ -51,5 +52,17 @@ public class GloableParamsController extends BaseController { } } + @ApiOperation(value = "修改告警展示的通道接口", notes = "修改告警展示的通道接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/updateAlarmChannel") + @Log(title = "修改告警展示的通道接口", type = "修改") + public ResponseReult updateAlarmChannel(@RequestParam("channel") Integer status) { + ServiceBody serviceBody = gloableParamsService.updateAlarmChannel(status); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LastPicTimeDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LastPicTimeDto.java new file mode 100644 index 0000000..4a7e0b4 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LastPicTimeDto.java @@ -0,0 +1,16 @@ +package com.shxy.xymanager_common.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigInteger; +import java.util.List; + +@Data +public class LastPicTimeDto implements Serializable { + + private BigInteger photoTime; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndStatusAndLastPicDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndStatusAndLastPicDto.java index d7469c8..be04ce6 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndStatusAndLastPicDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndStatusAndLastPicDto.java @@ -11,9 +11,9 @@ import java.util.List; public class TerminalsAndStatusAndLastPicDto implements Serializable { private Integer id; - private Integer towerid; + private Integer towerId; - private String cmdid; + private String cmdId; private String displayName; @@ -29,12 +29,7 @@ public class TerminalsAndStatusAndLastPicDto implements Serializable { private BigInteger lastHeartbeat; - private List list; - - @Data - public static class PhotoTime { - private BigInteger photoTime; - } + private List list; private static final long serialVersionUID = 1L; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/GloableParamsType.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/GloableParamsType.java index 0124106..0a9962e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/GloableParamsType.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/GloableParamsType.java @@ -8,7 +8,7 @@ package com.shxy.xymanager_common.enums; * @author 晶晶 */ public enum GloableParamsType { - ImgMark("img_mark"); + ImgMark("img_mark"),ALarmChannel("alarm_channel"); private String name; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/GlobalParamsModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/GlobalParamsModel.java new file mode 100644 index 0000000..7a7d958 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/GlobalParamsModel.java @@ -0,0 +1,23 @@ +package com.shxy.xymanager_common.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 全局参数对象 + */ +@Data +@ApiModel(value = "全局参数对象", description = "全局参数对象") +public class GlobalParamsModel implements Serializable { + + @ApiModelProperty(value = "图像标志", example = "123456") + private Integer imgMark; + + @ApiModelProperty(value = "告警通道", example = "123456") + private Integer alarmChannel; + + +} 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 93304a8..d01fc43 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 @@ -26,9 +26,6 @@ public class TerminalAlarmSelectVo { @ApiModelProperty(value = "告警类型", example = "123455") private Integer label; - @ApiModelProperty(value = "通道编号", example = "123455") - private Integer channel; - @NotNull(message = "查询时间不能缺少") @ApiModelProperty(value = "查询时间", example = "123455") private Date starttime; diff --git a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml index 2dbc773..91fc809 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml @@ -74,7 +74,7 @@ #{item} - + and channel_id = #{channel} diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index 92ceb90..fef2dde 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -75,7 +75,7 @@ - + diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/GloablParamsServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/GloablParamsServiceImpl.java index b76a71f..89d1587 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/GloablParamsServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/GloablParamsServiceImpl.java @@ -1,9 +1,11 @@ package com.shxy.xymanager_service.impl; +import cn.hutool.core.util.StrUtil; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.entity.GlobalParams; import com.shxy.xymanager_common.enums.GloableParamsType; import com.shxy.xymanager_common.exception.Asserts; +import com.shxy.xymanager_common.model.GlobalParamsModel; import com.shxy.xymanager_dao.dao.GlobalParamsDao; import com.shxy.xymanager_service.cache.XyCache; import com.shxy.xymanager_service.service.CacheService; @@ -35,14 +37,26 @@ public class GloablParamsServiceImpl implements GloablParamsService { * @return */ @Override - public ServiceBody getMarkEnableStatus() { + public ServiceBody getMarkEnableStatus() { + GlobalParamsModel model = new GlobalParamsModel(); Map globalParams = cacheService.getGolobalMap(); String s = globalParams.get(GloableParamsType.ImgMark.value()); - Integer integer = Integer.valueOf(s); - return Asserts.success(integer); + if (StrUtil.isNotEmpty(s)) { + Integer integer = Integer.valueOf(s); + model.setImgMark(integer); + } else { + model.setImgMark(0); + } + String channelstr = globalParams.get(GloableParamsType.ALarmChannel.value()); + if (StrUtil.isNotEmpty(channelstr)) { + Integer channel = Integer.valueOf(channelstr); + model.setAlarmChannel(channel); + } else { + model.setAlarmChannel(-1); + } + return Asserts.success(model); } - /** * 修改绘制状态 * @@ -62,4 +76,18 @@ public class GloablParamsServiceImpl implements GloablParamsService { } } + @Override + public ServiceBody updateAlarmChannel(Integer channelid) { + GlobalParams record = new GlobalParams(); + record.setParamName(GloableParamsType.ALarmChannel.value()); + record.setParamValue(String.valueOf(channelid)); + int i = globalParamsDao.updateByParamName(record, new Date()); + if (i != 0) { + cacheService.updateGolobalMap(); + return Asserts.success("修改成功"); + } else { + return Asserts.error("修改失败"); + } + } + } 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 a42a4c8..bdc6545 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 @@ -9,6 +9,7 @@ import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.dto.*; import com.shxy.xymanager_common.entity.*; import com.shxy.xymanager_common.enums.CommonStatus; +import com.shxy.xymanager_common.enums.GloableParamsType; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.model.*; import com.shxy.xymanager_common.page.PageUtils; @@ -72,10 +73,6 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { Integer lineid = vo.getLineId(); Integer towerid = vo.getTowerId(); Integer label = vo.getLabel(); - Integer channel = vo.getChannel(); - if (channel == null || channel == -1) { - channel = null; - } String search = vo.getSearch(); if (StrUtil.isEmpty(search)) { search = null; @@ -91,6 +88,15 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { labellist.add(terminalImgAlarmParams); } + Integer channel = null; + Map globalParams = cacheService.getGolobalMap(); + String s = globalParams.get(GloableParamsType.ALarmChannel.value()); + if (StrUtil.isNotEmpty(s)) { + Integer integer = Integer.valueOf(s); + channel = integer; + } else { + channel = null; + } Date starttime = vo.getStarttime(); Date endtime = vo.getEndtime(); int pageindex = vo.getPageindex(); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index e07039f..5f6749e 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -579,17 +579,17 @@ public class TerminalServiceImpl implements TerminalService { @Override public ServiceBody> getOnlineTerminalList() { List modellist = new ArrayList<>(); - TerminalAndLastPicListExcelModel model = new TerminalAndLastPicListExcelModel(); Map towerMap = cacheService.getTowerMap(); List list = terminalsDao.selectTermAndStatusAndLastPicList(CommonStatus.EFFECTIVE.value()); boolean empty = CollectionUtil.isEmpty(list); if (!empty) { for (int i = 0; i < list.size(); i++) { + TerminalAndLastPicListExcelModel model = new TerminalAndLastPicListExcelModel(); TerminalsAndStatusAndLastPicDto item = list.get(i); if (item != null) { - model.setCmdId(item.getCmdid()); + model.setCmdId(item.getCmdId()); if (towerMap != null) { - Integer towerid = item.getTowerid(); + Integer towerid = item.getTowerId(); TowerDto towerDto = towerMap.get(towerid); if (towerDto != null) { model.setLineName(towerDto.getLineName()); @@ -609,18 +609,21 @@ public class TerminalServiceImpl implements TerminalService { } else { model.setIsonline("否"); } - List timeList = item.getList(); + List timeList = item.getList(); if (CollectionUtil.isNotEmpty(timeList)) { ArrayList list1 = new ArrayList<>(); for (int j = 0; j < timeList.size(); j++) { - TerminalsAndStatusAndLastPicDto.PhotoTime photoTime = timeList.get(j); + LastPicTimeDto photoTime = timeList.get(j); if (photoTime != null) { list1.add(photoTime.getPhotoTime()); } } if (CollectionUtil.isNotEmpty(list1)) { + String s = ""; BigInteger max = CollectionUtil.max(list1); - String s = MyDateUtils.TimeSecondToDate(max); + if (max.longValue() != 0) { + s = MyDateUtils.TimeSecondToDate(max); + } model.setPictime(s); } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/GloablParamsService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/GloablParamsService.java index 70b899d..8e0a84a 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/GloablParamsService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/GloablParamsService.java @@ -2,6 +2,7 @@ package com.shxy.xymanager_service.service; import com.shxy.xymanager_common.bean.ServiceBody; +import com.shxy.xymanager_common.model.GlobalParamsModel; /** * 全局参数设置 @@ -15,7 +16,7 @@ public interface GloablParamsService { * * @return */ - ServiceBody getMarkEnableStatus(); + ServiceBody getMarkEnableStatus(); /** * 修改绘制状态 @@ -25,4 +26,10 @@ public interface GloablParamsService { ServiceBody updateMarkEnableStatus(Integer status); + /** + * 修改告警展示的通道接口 + * @param status + * @return + */ + ServiceBody updateAlarmChannel(Integer status); }