From 9594457ffba1ba57dbc488c7bb574a568c5f1a82 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Fri, 2 Jun 2023 14:03:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?#20230529=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/shxy/xymanager_common/vo/TerminalGpsVo.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java index 051eb08..d1e321c 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java @@ -9,12 +9,6 @@ import lombok.Data; @ApiModel(value = "查询GPS对象", description = "查询GPS对象描述") public class TerminalGpsVo { - @ApiModelProperty(value = "装置编号", example = "123455") - private Integer termid; - - @ApiModelProperty(value = "查询时间", example = "123455") - private DateTime queryTime; - @ApiModelProperty(value = "装置ID", example = "123455") private String cmdId; } From 7bf1c055e420305197a468695b8e59f7584a18ed Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Fri, 2 Jun 2023 14:59:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?#20230529=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java index 061646a..0ab6737 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java @@ -120,8 +120,8 @@ public class TerminalGpsServiceImpl implements TerminalGpsService { model.setUpdatetime(MyDateUtils.date(updatetime.longValue())); BigInteger queryTime = MyDateUtils.TimeMillSecond2Second(vo.getQueryTime()); hasNew = updatetime.compareTo(queryTime) < 0 ? false : true; - model.setHasNew(hasNew); } + model.setHasNew(hasNew); if (null!=model) { return Asserts.success(model); } else { From b2f3d7bf8641e22694b2fde74e95b1f44b594912 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Fri, 2 Jun 2023 16:44:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?#20230529=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TerminalAlarmController.java | 50 +++++++++++++++++++ .../model/TerminalAlarmListModel.java | 50 +++++++++++++++++++ .../xymanager_common/vo/TerminalAlarmVo.java | 23 +++++++++ .../impl/TerminalAlarmServiceImpl.java | 27 ++++++++++ .../impl/TerminalGpsServiceImpl.java | 15 +----- .../service/TerminalAlarmService.java | 22 ++++++++ 6 files changed, 173 insertions(+), 14 deletions(-) create mode 100644 xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalAlarmController.java create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalAlarmListModel.java create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmVo.java create mode 100644 xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java create mode 100644 xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalAlarmService.java 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 new file mode 100644 index 0000000..d167f3f --- /dev/null +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalAlarmController.java @@ -0,0 +1,50 @@ +package com.shxy.xymanager_admin.controller; + +import com.shxy.xymanager_common.annotation.Log; +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.*; +import com.shxy.xymanager_common.vo.*; +import com.shxy.xymanager_service.service.TerminalAlarmService; +import com.shxy.xymanager_service.service.TerminalPhotoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; + + +@Api(value = "告警接口", tags = "告警接口相关") +@RestController +@Slf4j +public class TerminalAlarmController extends BaseController { + + @Autowired + TerminalAlarmService terminalAlarmService; + + @ApiOperation(value = "获取告警列表", notes = "获取告警列表接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getTerminalAlarmList") + @Log(title = "获取告警列表", type = "查询") + public ResponseReult getTerminalAlarmList(@RequestBody @Validated TerminalAlarmVo vo) { + ServiceBody serviceBody = terminalAlarmService.getAlarmList(vo); + 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/model/TerminalAlarmListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalAlarmListModel.java new file mode 100644 index 0000000..deddf12 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalAlarmListModel.java @@ -0,0 +1,50 @@ +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.math.BigInteger; +import java.util.List; + +/** + * 通道列表 + */ +@Data +@ApiModel(value = "通道列表", description = "通道列表信息") +public class TerminalAlarmListModel implements Serializable { + @ApiModelProperty(value = "总记录数", example = "120") + private long total; + @ApiModelProperty(value = "总页数", example = "120") + private int totalpage; + @ApiModelProperty(value = "当前页", example = "1") + private int currentpage; + @ApiModelProperty(value = "每页记录数", example = "1") + private int pagesize; + @ApiModelProperty(value = "通道列表对象", example = "[]") + private List list; + + @Data + public static class AlarmBean { + + @ApiModelProperty(value = "告警编号", example = "123456") + private Integer id; + + @ApiModelProperty(value = "告警时间", example = "123456") + private BigInteger alarmTime; + + @ApiModelProperty(value = "电压等级", example = "123456") + private String dyLevel; + + @ApiModelProperty(value = "线路名称", example = "123456") + private String lineName; + + @ApiModelProperty(value = "是否已读", example = "123456") + private Short status; + + @ApiModelProperty(value = "杆塔名称", example = "123456") + private String towerName; + + } +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmVo.java new file mode 100644 index 0000000..16690d8 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmVo.java @@ -0,0 +1,23 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +@ApiModel(value = "告警信息查询对象", description = "告警信息查询对象描述") +public class TerminalAlarmVo extends PageVo{ + + @ApiModelProperty(value = "电压等级编号", example = "123455") + private Integer dyId; + + + @ApiModelProperty(value = "线路编号", example = "123455") + private Integer lineId; + + @ApiModelProperty(value = "杆塔编号", example = "123455") + private Integer towerId; + +} 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 new file mode 100644 index 0000000..b0bd4cd --- /dev/null +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java @@ -0,0 +1,27 @@ +package com.shxy.xymanager_service.impl; + +import com.shxy.xymanager_common.bean.ServiceBody; +import com.shxy.xymanager_common.model.TerminalAlarmListModel; +import com.shxy.xymanager_common.model.TerminalChannelListModel; +import com.shxy.xymanager_common.vo.TerminalAlarmVo; +import com.shxy.xymanager_service.service.TerminalAlarmService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + + +/** + * 告警实现层 + * + * @author cy + */ +@Slf4j +@Service +public class TerminalAlarmServiceImpl implements TerminalAlarmService { + + + @Override + public ServiceBody getAlarmList(TerminalAlarmVo vo) { + return null; + } +} + diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java index 0ab6737..cabe0cc 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java @@ -68,7 +68,6 @@ public class TerminalGpsServiceImpl implements TerminalGpsService { @Override public ServiceBody setTermGPS(TerminalIdAndGpsVo vo) { // Cma cma = new Cma("47.96.238.157", 6891); - boolean set = true; Integer status; Integer gpsstatus = vo.getGpsstatus(); if (gpsstatus == 0) { @@ -78,19 +77,7 @@ public class TerminalGpsServiceImpl implements TerminalGpsService { } String cmd = Constants.CMD+"gpsctrl --flag=1 --cmdid="+vo.getCmdId() +"\t" +"--ctrl="+ status; ProcessExecUtils.exec(cmd); - if (set) { - TerminalStatus record = new TerminalStatus(); - record.setTermId(vo.getTermid()); - record.setGpsStatus(status); - int i = terminalStatusDao.updateByPrimaryKeySelective(record); - if (i != 0) { - return Asserts.success("操作成功"); - } else { - return Asserts.error("操作成功，数据库修改失败"); - } - } else { - return Asserts.error("操作失败"); - } + return Asserts.success("操作成功"); } /** 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 new file mode 100644 index 0000000..50cf7fd --- /dev/null +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalAlarmService.java @@ -0,0 +1,22 @@ +package com.shxy.xymanager_service.service; + +import com.shxy.xymanager_common.bean.ServiceBody; +import com.shxy.xymanager_common.model.*; +import com.shxy.xymanager_common.vo.*; + +/** + * 告警接口 + * + * @author CY + */ +public interface TerminalAlarmService { + + /** + * 获取告警信息列表分页 + * + * @return + */ + ServiceBody getAlarmList(TerminalAlarmVo vo); + + +}