Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

冀北拓扑图代码提交

Browse Source
This commit is contained in:
wr
2023-06-15 16:28:45 +08:00
parent e0c4e4b88f
commit e249670056
16 changed files with 464 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java
View File

@@ -78,7 +78,6 @@ public class LineIntegrityDataController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getIntegrityByLineIds")
@ApiOperation("通过监测点集合查询监测点数据完整性")
@ApiImplicitParam(name = "lineIds", value = "监测点集合", required = true)
@ApiIgnore
public HttpResult<List<RStatIntegrityD>> getIntegrityByLineIds(@RequestBody List<String> lineIds, @RequestParam("startTime")String startTime, @RequestParam("endTime")String endTime) {
String methodDescribe = getMethodDescribe("getIntegrityByLineIds");

41
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java
View File

@@ -1,5 +1,6 @@
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 cn.hutool.core.util.ObjectUtil;
@@ -70,7 +71,7 @@ public class LogManageServiceImpl implements LogManageService {
//待分页数据总量
page.setTotal(terminalLogs.size());
//分页总页数
int pages = (int)Math.ceil(terminalLogs.size()*1.0/deviceLogParam.getPageSize());
int pages = (int) Math.ceil(terminalLogs.size() * 1.0 / deviceLogParam.getPageSize());
page.setPages(pages);
if (!CollectionUtils.isEmpty(terminalLogs)) {
@@ -78,7 +79,7 @@ public class LogManageServiceImpl implements LogManageService {
List<TerminalLogs> pageLogs = partition.get(deviceLogParam.getPageNum() - 1);
if (!CollectionUtils.isEmpty(pageLogs)) {
for (TerminalLogs logs: pageLogs) {
for (TerminalLogs logs : pageLogs) {
DeviceLogVO deviceLogVO = logManageMapper.getDeviceLogData(logs.getLineId(), logs.getTerminalType(), logs.getUpdateBy());
if (Objects.isNull(deviceLogVO)) {
continue;
@@ -103,7 +104,9 @@ public class LogManageServiceImpl implements LogManageService {
//查询全部时间
List<String> lineByIDs = lineMapper.getLineByIDs(eventLogParam.getSearchValue());
if (CollUtil.isEmpty(lineByIDs)) {
return new Page<>();
}
Page<EventLogVO> page = new Page<>();
page.setSize(eventLogParam.getPageSize());
page.setCurrent(eventLogParam.getPageNum());
@@ -113,9 +116,9 @@ public class LogManageServiceImpl implements LogManageService {
p.setSize(eventLogParam.getPageSize());
p.setCurrent(eventLogParam.getPageNum());
QueryWrapper<EventPushLogs> wrapper = new QueryWrapper<>();
wrapper.between("start_time",DateUtil.beginOfDay(DateUtil.parse(eventLogParam.getSearchBeginTime())),DateUtil.endOfDay(DateUtil.parse(eventLogParam.getSearchEndTime())));
wrapper.eq(eventLogParam.getResult()!=null,"Result",eventLogParam.getResult());
wrapper.in("measurement_point_id",lineByIDs);
wrapper.between("start_time", DateUtil.beginOfDay(DateUtil.parse(eventLogParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(eventLogParam.getSearchEndTime())));
wrapper.eq(eventLogParam.getResult() != null, "Result", eventLogParam.getResult());
wrapper.in("measurement_point_id", lineByIDs);
if (ObjectUtil.isAllNotEmpty(eventLogParam.getSortBy(), eventLogParam.getOrderBy())) {
wrapper.orderBy(true, eventLogParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(eventLogParam.getSortBy()));
} else {
@@ -145,16 +148,16 @@ public class LogManageServiceImpl implements LogManageService {
eventLogVO.setLine(areaMap.get(rawLog.getMeasurementPointId()).get(0).getLineName());
eventLogVO.setSubstation(areaMap.get(rawLog.getMeasurementPointId()).get(0).getSubName());
eventLogVO.setPowerCompany(areaMap.get(rawLog.getMeasurementPointId()).get(0).getGdName());
Double e=eventDetailMap.get(rawLog.getMeasurementPointId()).get(0).getFeatureAmplitude();
Double e = eventDetailMap.get(rawLog.getMeasurementPointId()).get(0).getFeatureAmplitude();
BigDecimal bd = new BigDecimal(e);
e= bd.setScale(2, BigDecimal.ROUND_DOWN).doubleValue();
eventLogVO.setEventValue(String.valueOf(e*100));
e = bd.setScale(2, BigDecimal.ROUND_DOWN).doubleValue();
eventLogVO.setEventValue(String.valueOf(e * 100));
double i = eventDetailMap.get(rawLog.getMeasurementPointId()).get(0).getDuration();
eventLogVO.setPersistTime(String.valueOf(i));
eventLogVO.setCreatTime(dateTimeFormatter.format(rawLog.getCreateTime()));
eventLogVO.setCreatTimed(dateTimeFormatter.format(rawLog.getCreateTime()));
eventLogVO.setPushFailed(rawLog.getPushFailed());
if (rawLog.getResult()==0) {
if (rawLog.getResult() == 0) {
eventLogVO.setResult("失败");
eventLogVO.setState("未推送");
} else {
@@ -173,12 +176,12 @@ public class LogManageServiceImpl implements LogManageService {
return page;
}
private boolean filterLineIdAndTime(EventDetail eventDetail, List<EventPushLogs> eventPushLogs) {
private boolean filterLineIdAndTime(EventDetail eventDetail, List<EventPushLogs> eventPushLogs) {
boolean flag = false;
String evenDetailTime = eventDetail.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
for (EventPushLogs log : eventPushLogs) {
String logTime = log.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
if (log.getMeasurementPointId().equals(eventDetail.getLineId())&& log.getEventId().equals(eventDetail.getEventId())&& evenDetailTime.equals(logTime)) {
if (log.getMeasurementPointId().equals(eventDetail.getLineId()) && log.getEventId().equals(eventDetail.getEventId()) && evenDetailTime.equals(logTime)) {
flag = true;
}
}
@@ -187,6 +190,7 @@ public class LogManageServiceImpl implements LogManageService {
/**
* influxDB查询终端运维日志相关信息
*
* @param startTime
* @param endTime
* @param type
@@ -197,11 +201,11 @@ public class LogManageServiceImpl implements LogManageService {
StringBuilder string = new StringBuilder();
string.append(InfluxDBPublicParam.TIME + " >= '" + startTime + InfluxDBPublicParam.START_TIME + "' and " + InfluxDBPublicParam.TIME + " <= '" + endTime + InfluxDBPublicParam.END_TIME + "'");
if (!type.isEmpty()) {
string.append(" and terminal_type = '" + type +"'");
string.append(" and terminal_type = '" + type + "'");
}
//sql语句
String sql = "SELECT * FROM "+InfluxDBPublicParam.PQS_TERMINAL_LOGS+" WHERE " + string + InfluxDBPublicParam.TIME_ZONE;
System.out.println("sql==========="+sql);
String sql = "SELECT * FROM " + InfluxDBPublicParam.PQS_TERMINAL_LOGS + " WHERE " + string + InfluxDBPublicParam.TIME_ZONE;
System.out.println("sql===========" + sql);
//结果集
QueryResult results = influxDbUtils.query(sql);
//结果集映射到对象中
@@ -213,6 +217,7 @@ public class LogManageServiceImpl implements LogManageService {
/**
* influxDB查询暂降事件相关信息
*
* @param startTime
* @param endTime
* @param result
@@ -222,12 +227,12 @@ public class LogManageServiceImpl implements LogManageService {
//组装sql语句
StringBuilder string = new StringBuilder();
string.append(DeviceValidMessage.TIME + " >= '" + startTime + DeviceValidMessage.START_TIME + "' and " + DeviceValidMessage.TIME + " <= '" + endTime + DeviceValidMessage.END_TIME + "'");
if (result==1 || result==2) {
if (result == 1 || result == 2) {
string.append(" and result=" + result);
}
//sql语句
String sql = "SELECT * FROM pqs_event_push_logs WHERE " + string +InfluxDBPublicParam.TIME_ZONE;
System.out.println("sql==========="+sql);
String sql = "SELECT * FROM pqs_event_push_logs WHERE " + string + InfluxDBPublicParam.TIME_ZONE;
System.out.println("sql===========" + sql);
//结果集
QueryResult results = influxDbUtils.query(sql);
//结果集映射到对象中