From 7fa9b9c407e3c2b189c42a6f0afd7ce95573ef5e Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 30 Aug 2023 08:45:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=9B=91=E6=B5=8B=E7=82=B9=E5=8D=8A=E6=9C=88?= =?UTF-8?q?=E6=8A=A5=202.=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pq/pojo/vo/HalfReportVO.java | 84 +++++++++++++++++++ .../device/pq/controller/LineController.java | 14 +++- .../com/njcn/device/pq/mapper/LineMapper.java | 10 +++ .../device/pq/mapper/mapping/LineMapper.xml | 81 ++++++++++++++++++ .../njcn/device/pq/service/LineService.java | 3 + .../pq/service/impl/LineServiceImpl.java | 9 ++ .../system/service/impl/AuditServiceImpl.java | 2 +- .../impl/EventTemplateServiceImpl.java | 25 ++++-- 8 files changed, 214 insertions(+), 14 deletions(-) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/HalfReportVO.java diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/HalfReportVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/HalfReportVO.java new file mode 100644 index 000000000..cd4f16cb8 --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/HalfReportVO.java @@ -0,0 +1,84 @@ +package com.njcn.device.pq.pojo.vo; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 半月报返回体 + */ +@Data +public class HalfReportVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("省份") + private String areaName; + + @ApiModelProperty("供电公司") + private String gdName; + + @ApiModelProperty("所属变电站") + private String subName; + + @ApiModelProperty("监测点名称") + private String lineName; + + @ApiModelProperty("重要等级") + private String lineGrade; + + @ApiModelProperty("行业类型") + private String businessType; + + @ApiModelProperty("运行状态") + private String runFlag; + + @ApiModelProperty("监测点通讯状态") + private String comFlag; + + @ApiModelProperty("投运时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime loginTime; + + @ApiModelProperty("数据更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + + @ApiModelProperty("在线率(%)") + private BigDecimal onlineRate; + + @ApiModelProperty("完整性(%)") + private BigDecimal integrityData; + + @ApiModelProperty("装置名称") + private String devName; + + @ApiModelProperty("装置系列") + private String devSeries; + + @ApiModelProperty("mac地址") + private String ip; + + @ApiModelProperty("总流量(M)") + private BigDecimal flowMeal; + + @ApiModelProperty("使用流量(M)") + private BigDecimal statisValue; + + // @ApiModelProperty("剩余流量(M)") +// private BigDecimal ; +// @ApiModelProperty("使用率(%)") +// private BigDecimal ; + @ApiModelProperty("ICICD") + private String sim; + + @ApiModelProperty("备注") + private String remark; + + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java index d8f7646d4..77913dfdf 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java @@ -1,5 +1,6 @@ package com.njcn.device.pq.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -11,9 +12,7 @@ import com.njcn.device.biz.enums.DeviceResponseEnum; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.mapper.*; import com.njcn.device.pq.pojo.dto.*; -import com.njcn.device.pq.pojo.param.DeviceInfoParam; -import com.njcn.device.pq.pojo.param.LineBaseQueryParam; -import com.njcn.device.pq.pojo.param.OnlineRateParam; +import com.njcn.device.pq.pojo.param.*; import com.njcn.device.pq.pojo.po.*; import com.njcn.device.pq.pojo.vo.*; import com.njcn.device.pq.service.LineService; @@ -426,5 +425,12 @@ public class LineController extends BaseController { List onIntegrityByIds = integrityDMapper.getOnIntegrityByIdsAndTime (param.getLineIds(),param.getStartTime(),param.getEndTime()); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onIntegrityByIds,methodDescribe); } - + @PostMapping("/getHalfReport") + @ApiOperation("监测点半月报") + @ApiImplicitParam(name = "param", value = "参数实体", required = true) + public HttpResult> getHalfReport(@RequestBody TerminalMainQueryParam param) { + String methodDescribe = getMethodDescribe("getHalfReport"); + Page halfReportVOS = lineService.halfReport(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,halfReportVOS,methodDescribe); + } } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java index 80aba042f..9c2fbe0d6 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java @@ -15,6 +15,7 @@ import com.njcn.device.pq.pojo.dto.OverLimitLineDTO; import com.njcn.device.pq.pojo.dto.PollutionLineDTO; import com.njcn.device.pq.pojo.dto.WarningSubstationDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; +import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.po.*; import com.njcn.device.pq.pojo.vo.*; import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO; @@ -495,4 +496,13 @@ public interface LineMapper extends BaseMapper { * @return */ List getDevicesIp(@Param("devIds") List devIds); + + /** + * @Description: 监测点半月报功能 + * @param + * @return: java.util.List + * @Author: wr + * @Date: 2023/8/29 12:50 + */ + Page selectHalfReport(Page page,@Param("param") TerminalMainQueryParam param); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 7ddb4b2a1..c8abae46d 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -1243,5 +1243,86 @@ #{item} + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java index 4ef339838..1de94f428 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java @@ -6,6 +6,7 @@ import com.njcn.device.pq.pojo.dto.PollutionParamDTO; import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.PqsParam; +import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.po.Line; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.pojo.po.TopMsgPO; @@ -178,4 +179,6 @@ public interface LineService { Page dailyDeviceAbnormalStatistics(PqsParam param); List dailyDeviceAbnormal(DeviceInfoParam.BusinessParam conditionBusinessParam); + + Page halfReport(TerminalMainQueryParam param); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java index bb1bf1fc0..94d068127 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java @@ -24,6 +24,7 @@ import com.njcn.device.pq.pojo.dto.PollutionParamDTO; import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.PqsParam; +import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.po.*; import com.njcn.device.pq.pojo.vo.*; import com.njcn.device.pq.mapper.*; @@ -460,6 +461,14 @@ public class LineServiceImpl extends ServiceImpl implements Li return topMsgDetails; } + @Override + public Page halfReport(TerminalMainQueryParam param) { + Page page = new Page<>(param.getPageNum(), param.getPageSize()); + param.setSearchBeginTime(DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())).toString()); + param.setSearchEndTime(DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())).toString()); + return this.baseMapper.selectHalfReport(page,param); + } + @Override public List getOverLimitByList(PollutionParamDTO pollutionParamDTO) { return overlimitMapper.selectBatchIds(pollutionParamDTO.getLineList()); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java index dfccf1434..ba8bd2fca 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java @@ -362,7 +362,7 @@ public class AuditServiceImpl extends ServiceImpl implem vo = BeanUtil.copyProperties(datum, OnlineUsersVO.class); Long integer = time.get(datum.getId()); DateTime date = DateUtil.date(integer * 1000); - vo.setTime(date.toDateStr()); + vo.setTime(date.toString()); info.add(vo); } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java index e2070ef16..0c06fc77f 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.system.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -132,15 +133,21 @@ public class EventTemplateServiceImpl extends ServiceImpl list = new ArrayList<>(); - eventTemplateUpdateParam.getIds().forEach(rdId -> { - TemplateRel relevancy = new TemplateRel(); - // 模版id - relevancy.setRtId(id); - relevancy.setRdId(rdId); - list.add(relevancy); - }); - flag = templateRelMapper.batchInsert(list); + if(CollUtil.isNotEmpty(eventTemplateUpdateParam.getIds())){ + List list = new ArrayList<>(); + eventTemplateUpdateParam.getIds().forEach(rdId -> { + TemplateRel relevancy = new TemplateRel(); + // 模版id + relevancy.setRtId(id); + relevancy.setRdId(rdId); + list.add(relevancy); + }); + if(CollUtil.isNotEmpty(list)){ + flag = templateRelMapper.batchInsert(list); + } + } + + return flag; }