From 7cabd4c4c3828655b969ace21919e6030caf7227 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Mon, 3 Apr 2023 19:32:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=AE=A1=E7=90=86=E5=91=98-?= =?UTF-8?q?=E7=BB=88=E7=AB=AF=E8=BF=90=E7=BB=B4=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E4=B8=BB=E5=88=97=E8=A1=A8-=E6=B5=81=E9=87=8F=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../influxdb/param/InfluxDBPublicParam.java | 2 + .../pq/pojo/po/influxdb/DeviceDayFlow.java | 28 +++++++++ .../pq/pojo/vo/TerminalDaliyFlowVO.java | 18 ++++-- .../controller/OperationContrController.java | 6 +- .../TerminalMaintainController.java | 10 +-- .../pq/mapper/TerminalMaintainMapper.java | 2 +- .../device/pq/mapper/mapping/LineMapper.xml | 6 +- .../mapper/mapping/TerminalMaintainMapper.xml | 9 ++- .../pq/service/TerminalMaintainService.java | 2 +- .../pq/service/impl/GeneralDeviceService.java | 3 +- .../impl/TerminalMaintainServiceImpl.java | 63 +++++++++++++++++-- .../handler/DeviceAbnormalStatisticsJob.java | 30 +++++++++ .../param/DeviceAbnormaStatisticsParam.java | 5 +- .../DeviceAbnormaStatisticsServiceImpl.java | 18 +++--- .../com/njcn/user/UserBootApplication.java | 3 +- 15 files changed, 165 insertions(+), 40 deletions(-) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/influxdb/DeviceDayFlow.java create mode 100644 pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java diff --git a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java index 027907934..0253b6adb 100644 --- a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java +++ b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java @@ -227,6 +227,8 @@ public interface InfluxDBPublicParam { */ String PQS_COMMUNICATE = "pqs_communicate"; + String PQS_ACTUAL_FLOW = "pqs_actual_flow"; + /** * 终端在线率表 */ diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/influxdb/DeviceDayFlow.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/influxdb/DeviceDayFlow.java new file mode 100644 index 000000000..c8d3e034e --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/influxdb/DeviceDayFlow.java @@ -0,0 +1,28 @@ +package com.njcn.device.pq.pojo.po.influxdb; + +import lombok.Data; +import org.influxdb.annotation.Column; +import org.influxdb.annotation.Measurement; + +import java.time.Instant; +import java.time.LocalDateTime; + +@Data +@Measurement(name = "pqs_actual_flow") +public class DeviceDayFlow { + + @Column(name="time") + private Instant time; + + @Column(name="actual_value") + private Integer actualValue; + + @Column(name="dev_id") + private String devId; + + private float dailyActualValue; + + private String date; + + private String month; +} diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java index 0de9e7b38..9f7b2f3b0 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java @@ -1,5 +1,6 @@ package com.njcn.device.pq.pojo.vo; +import com.njcn.device.pq.pojo.po.influxdb.DeviceDayFlow; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -7,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; +import java.util.List; @Data @ApiModel(value = "装置每日流量VO") @@ -16,12 +18,20 @@ public class TerminalDaliyFlowVO { @ApiModelProperty(name = "devId",value = "装置Id") private String devId; - @ApiModelProperty(name = "date",value = "日期") - private LocalDateTime date; - @ApiModelProperty(name = "actualValue",value = "实际使用流量") + @ApiModelProperty(name = "month",value = "月份") + private String month; + @ApiModelProperty(name = "actualValue",value = "月实际使用流量") private Float actualValue; - @ApiModelProperty(name = "statisValue",value = "统计流量") + @ApiModelProperty(name = "statisValue",value = "运营商统计流量") private Float statisValue; + @ApiModelProperty(name = "baseFlow",value = "基础套餐流量") + private Float baseFlow; + @ApiModelProperty(name = "extendFlow",value = "拓展套餐流量") + private Float extendFlow; + @ApiModelProperty(name = "flowMeal",value = "套餐流量(基础+拓展)") + private Float flowMeal; + @ApiModelProperty(name = "deviceDayFlowsList",value = "装置日流量统计集合") + private List deviceDayFlowsList; } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java index 54de9cf04..84564f56e 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java @@ -110,8 +110,10 @@ public class OperationContrController extends BaseController { @ApiImplicitParam(name = "deviceInfoParam", value = "实体", required = true) public HttpResult> getNewDeviceRunStatistics(@RequestBody PqsParam deviceInfoParam){ String methodDescribe = getMethodDescribe("getDeviceRunStatistics"); - DeviceInfoParam param = new DeviceInfoParam(RequestUtil.getDeptIndex(),null); - deviceInfoParam.setDeptIndex(param.getDeptIndex()); +// DeviceInfoParam param = new DeviceInfoParam(RequestUtil.getDeptIndex(),null); +// deviceInfoParam.setDeptIndex(param.getDeptIndex()); + // 本地测试 + deviceInfoParam.setDeptIndex("9b8f910f3c3ad4b049b6abda59d66419"); LogUtil.njcnDebug(log, "{}，参数集合：{}", methodDescribe, deviceInfoParam); Page result = lineService.getNewDeviceRunStatistics(deviceInfoParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalMaintainController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalMaintainController.java index f3b05d54c..4cb162607 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalMaintainController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalMaintainController.java @@ -40,7 +40,7 @@ import java.util.Objects; @Slf4j @Api(tags = "终端运维管理") @RestController -@RequestMapping("maintain") +@RequestMapping("/maintain") @RequiredArgsConstructor @Validated public class TerminalMaintainController extends BaseController { @@ -96,11 +96,11 @@ public class TerminalMaintainController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getFlowManageDetail") - @ApiOperation("终端流量管理列表") - public HttpResult> getFlowManageDetail(@RequestBody TerminalMainQueryParam param) { + @ApiOperation("终端流量管理详情") + public HttpResult> getFlowManageDetail(@RequestBody TerminalMainQueryParam param) { String methodDescribe = getMethodDescribe("getFlowManageDetail"); - Page resList = terminalMaintainService.getFlowManageDetail(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, resList, methodDescribe); + List res = terminalMaintainService.getFlowManageDetail(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe); } /** diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java index 909e1484c..6cbc10b21 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java @@ -76,5 +76,5 @@ public interface TerminalMaintainMapper { List getFlowStrategyList(@Param("ids") List ids); - PagegetFlowManageDetail(Page page, @Param("devId") String deviceId); + TerminalDaliyFlowVO getFlowManageDetail(@Param("devId") String deviceId); } 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 a83f51f69..5eb31394d 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 @@ -788,7 +788,7 @@ INNER JOIN pq_device b ON vol.pid = b.id INNER JOIN pq_line sub ON dev.pid = sub.id INNER JOIN pq_line elc ON sub.pid = elc.id - LEFT JOIN cld_month_flow m ON b.id = m.Dev_Id + LEFT JOIN cld_month_flow m ON b.id = m.Line_Id LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id @@ -826,7 +826,7 @@ INNER JOIN pq_device b ON vol.pid = b.id INNER JOIN pq_line sub ON dev.pid = sub.id INNER JOIN pq_line elc ON sub.pid = elc.id - LEFT JOIN cld_month_flow m ON b.id = m.Dev_Id + LEFT JOIN cld_month_flow m ON b.id = m.Line_Id LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id @@ -855,7 +855,7 @@ ifnull(m.Actual_Value,0) statisValue FROM pq_line a INNER JOIN pq_device b ON a.id = b.id - LEFT JOIN cld_month_flow m ON b.id = m.Dev_Id + LEFT JOIN cld_month_flow m ON b.id = m.Line_Id LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml index 658b7058c..a3947618b 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml @@ -125,7 +125,14 @@ FROM diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalMaintainService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalMaintainService.java index 43fc9aa3b..9ff07e3c8 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalMaintainService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalMaintainService.java @@ -54,5 +54,5 @@ public interface TerminalMaintainService { boolean updateFlowStrategy(TerminalParam terminalParam); - Page getFlowManageDetail(TerminalMainQueryParam param); + List getFlowManageDetail(TerminalMainQueryParam param); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java index 7414894fb..327cb1e61 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java @@ -288,8 +288,7 @@ public class GeneralDeviceService { */ public List getDeviceInfo(DeviceInfoParam deviceInfoParam, List runFlag, - List devModel) - { + List devModel) { //定义待返回终端信息 List deviceInfos = new ArrayList<>(); //初始化终端查询条件 diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java index 6aa73f05d..591700799 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java @@ -2,6 +2,7 @@ package com.njcn.device.pq.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -12,26 +13,34 @@ import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.param.TerminalParam; +import com.njcn.device.pq.pojo.po.Communicate; import com.njcn.device.pq.pojo.po.DevMeal; import com.njcn.device.pq.pojo.po.DevStrategy; import com.njcn.device.pq.pojo.po.Device; +import com.njcn.device.pq.pojo.po.influxdb.DeviceDayFlow; import com.njcn.device.pq.pojo.vo.TerminalDaliyFlowVO; import com.njcn.device.pq.pojo.vo.TerminalMaintainVO; import com.njcn.device.pq.service.IDevMealService; import com.njcn.device.pq.service.IDevStrategyService; import com.njcn.device.pq.service.IDeviceService; import com.njcn.device.pq.service.TerminalMaintainService; +import com.njcn.influxdb.param.InfluxDBPublicParam; +import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.system.pojo.enums.StatisticsEnum; import com.njcn.user.api.DeptFeignClient; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.influxdb.dto.QueryResult; +import org.influxdb.impl.InfluxDBResultMapper; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.time.Instant; +import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * pqs @@ -56,6 +65,8 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService { private final DeptFeignClient deptFeignClient; + private final InfluxDbUtils influxDbUtils; + @Override public List getTerminalMainList(TerminalMainQueryParam terminalMainQueryParam) { List resList = new ArrayList<>(); @@ -155,9 +166,49 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService { } @Override - public Page getFlowManageDetail (TerminalMainQueryParam param) { - Page page = terminalMaintainMapper.getFlowManageDetail(new Page(param.getPageNum(), param.getPageSize()), param.getDevId()); - return page; + public List getFlowManageDetail(TerminalMainQueryParam param) { + List list = new ArrayList<>(); + TerminalDaliyFlowVO flowManageDetail = terminalMaintainMapper.getFlowManageDetail(param.getDevId()); + if (flowManageDetail == null) { + list.add(new TerminalDaliyFlowVO()); + return list; + } + List deviceDayFlowList = getFlowManageDetailFromInfluxDB(param); + float sum = (float) deviceDayFlowList.stream().mapToDouble(DeviceDayFlow::getDailyActualValue).sum(); + flowManageDetail.setDeviceDayFlowsList(deviceDayFlowList); + flowManageDetail.setActualValue(sum); + list.add(flowManageDetail); + list.forEach(terminalDaliyFlowVO -> terminalDaliyFlowVO.setMonth(param.getSearchBeginTime().substring(6, 7) + "月")); + return list; + } + + private List getFlowManageDetailFromInfluxDB (TerminalMainQueryParam param) { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))).append("' and "); + stringBuilder.append("dev_id ='").append(param.getDevId()).append("'"); + String sql = "select * from " + InfluxDBPublicParam.PQS_ACTUAL_FLOW + " where " + stringBuilder.toString() + InfluxDBPublicParam.TIME_ZONE; + QueryResult result = influxDbUtils.query(sql); + InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); + List deviceDayFlow = influxDBResultMapper.toPOJO(result, DeviceDayFlow.class); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); +// Instant time = deviceDayFlow.get(0).getTime(); +// System.out.println(time); +// Date from = Date.from(time); +// System.out.println(from); + deviceDayFlow.forEach(t-> t.setDate(formatter.format(Date.from(t.getTime())))); + Map> dayFlowMap = deviceDayFlow.stream().collect(Collectors.groupingBy(DeviceDayFlow::getDate)); + List list = new ArrayList<>(); + for (Map.Entry> entry : dayFlowMap.entrySet()) { + DeviceDayFlow dayFlow = new DeviceDayFlow(); + dayFlow.setDevId(entry.getValue().get(0).getDevId()); + BigDecimal bigDecimal = new BigDecimal((float) entry.getValue().stream().mapToInt(DeviceDayFlow::getActualValue).sum() / (float)1024 /(float) 1024); + dayFlow.setDailyActualValue(bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).floatValue()); + dayFlow.setDate(entry.getKey()); + list.add(dayFlow); + } + list = list.stream().sorted(Comparator.comparing(DeviceDayFlow::getDate)).collect(Collectors.toList()); + + return list; } private List getChildren(String id,List all){ diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java new file mode 100644 index 000000000..334169cb2 --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java @@ -0,0 +1,30 @@ +package com.njcn.executor.handler; + +import com.njcn.prepare.harmonic.api.device.DeviceAbnormalFeignClient; +import com.njcn.prepare.harmonic.pojo.param.DeviceAbnormaStatisticsParam; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.text.SimpleDateFormat; +import java.util.Calendar; + +@Slf4j +@Component +@AllArgsConstructor +public class DeviceAbnormalStatisticsJob { + private final DeviceAbnormalFeignClient deviceAbnormalFeignClient; + + @XxlJob("deviceAbnormalStatisticsJob") + public void deviceAbnormalStatisticsJob (){ + // System.out.println("朱鑫宇定时任务"); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + String format = formatter.format(Calendar.getInstance().getTime()); + System.out.println(format); + log.info("执行日期deviceAbnormalStatisticsJob===============>"+format); + DeviceAbnormaStatisticsParam param =new DeviceAbnormaStatisticsParam(); + param.setTime(formatter.format(Calendar.getInstance().getTime())); + deviceAbnormalFeignClient.dailyDeviceAbnormaStatistics(param); + } +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/DeviceAbnormaStatisticsParam.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/DeviceAbnormaStatisticsParam.java index 6b9397726..cfa7fbdee 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/DeviceAbnormaStatisticsParam.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/DeviceAbnormaStatisticsParam.java @@ -9,8 +9,5 @@ import java.io.Serializable; public class DeviceAbnormaStatisticsParam implements Serializable { @ApiModelProperty("开始时间") - private String beginTime; - - @ApiModelProperty("结束时间") - private String endTime; + private String time; } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java index d381ca39b..e67f4b448 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java @@ -51,26 +51,26 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist // 获取监测点数据完整性 List lineIntegritys = deviceAbnormaStatisticsMapper.getIntegrityByLineIds( monotorIds, - DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), - DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))); + DateUtil.beginOfDay(DateUtil.parse(param.getTime())), + DateUtil.endOfDay(DateUtil.parse(param.getTime()))); Map> lineIntegrityMap = lineIntegritys.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId)); List lineAlarms = deviceAbnormaStatisticsMapper.getAlarmByLines( monotorIds, devIds, - DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), - DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))); + DateUtil.beginOfDay(DateUtil.parse(param.getTime())), + DateUtil.endOfDay(DateUtil.parse(param.getTime()))); Map> lineAlarmsMap = lineAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId)); // 获取设备流量 List deviceFlowAndOnlineRate = deviceAbnormaStatisticsMapper.getFlowAndOnlineRateByDevice( devIds, - DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), - DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))); + DateUtil.beginOfDay(DateUtil.parse(param.getTime())), + DateUtil.endOfDay(DateUtil.parse(param.getTime()))); if (CollectionUtil.isNotEmpty(deviceFlowAndOnlineRate)) { deviceFlowAndOnlineRateMap = deviceFlowAndOnlineRate.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId)); } // 获取通信中断信息 // List list = Arrays.asList("025fa0e4c91f72ad7f1c1bd29026f20a"); - List comMsgs = getCommunicate(devIds, param.getBeginTime(), param.getEndTime()); + List comMsgs = getCommunicate(devIds, param.getTime(), param.getTime()); if (CollectionUtil.isNotEmpty(comMsgs)) { comMap = comMsgs.stream().collect(Collectors.groupingBy(TopMsgPO::getDevId)); } @@ -131,11 +131,11 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist } else { topMsg.setOfftimeFlag(0); String updateTime = localDateTimeFormat(alarmEntry.getValue().get(0).getUpdateTime()); - long time = DateUtil.endOfDay(DateUtil.parse(param.getEndTime())).getTime() - + long time = DateUtil.endOfDay(DateUtil.parse(param.getTime())).getTime() - alarmEntry.getValue().get(0).getUpdateTime().toInstant(ZoneOffset.ofHours(8)).toEpochMilli(); topMsg.setOfftimeValue((int)(time/1000/60)); topMsg.setComOutCount(1); - topMsg.setComOutDescription(updateTime+"至"+DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))); + topMsg.setComOutDescription(updateTime+"至"+DateUtil.endOfDay(DateUtil.parse(param.getTime()))); } if (topMsg.getFlowFlag() != 1 || topMsg.getIntegrityFlag() != 1 || topMsg.getOfftimeFlag() != 0 || topMsg.getAlarmCountFlag() != 1 || topMsg.getOnlineRateFlag() != 1) { diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/UserBootApplication.java b/pqs-user/user-boot/src/main/java/com/njcn/user/UserBootApplication.java index 5d753fdaf..c667daea9 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/UserBootApplication.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/UserBootApplication.java @@ -16,8 +16,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @MapperScan("com.njcn.**.mapper") @EnableFeignClients(basePackages = "com.njcn") @SpringBootApplication(scanBasePackages = "com.njcn") -public class -UserBootApplication { +public class UserBootApplication { public static void main(String[] args) { SpringApplication.run(UserBootApplication.class, args);