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

暂态模块格式化时间处理

Browse Source
This commit is contained in:
雨木c
2023-04-20 10:44:18 +08:00
parent bdffafbf56
commit 4b3ff6e3ff
8 changed files with 47 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
View File

@@ -56,6 +56,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -144,6 +145,7 @@ public class CustomReportServiceImpl implements CustomReportService {
//修改模板数据
ExcelRptTemp excelRptTemp = new ExcelRptTemp();
BeanUtils.copyProperties(reportTemplateParam, excelRptTemp);
excelRptTemp.setUpdateTime(LocalDateTime.now());
excelRptTempMapper.updateById(excelRptTemp);
return true;
@@ -201,12 +203,13 @@ public class CustomReportServiceImpl implements CustomReportService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean delTemplate(ReportSearchParam reportSearchParam) {
//根据模板ID和部门ID删除绑定的数据
LambdaQueryWrapper<SysDeptTemp> lambdaQuery = new LambdaQueryWrapper<>();
lambdaQuery.eq(SysDeptTemp::getTempId, reportSearchParam.getTempId()).eq(SysDeptTemp::getDeptId, reportSearchParam.getDeptId());
lambdaQuery.eq(SysDeptTemp::getTempId, reportSearchParam.getTempId());
deptTempMapper.delete(lambdaQuery);
excelRptTempMapper.deleteById(reportSearchParam.getTempId());
return true;
}

37
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyExceedRateServiceImpl.java
View File

@@ -513,43 +513,6 @@ public class SteadyExceedRateServiceImpl implements SteadyExceedRateService {
}
return limitRatePOS;
//组装sql语句
// StringBuilder string = new StringBuilder();
// string.append(Param.QualityFlag + "='1' and (" + Param.PHASIC_TYPE + "='" + Param.PHASIC_TYPEA + "' or " + Param.PHASIC_TYPE + "='" + Param.PHASIC_TYPEB + "' or " + Param.PHASIC_TYPE + "='" + Param.PHASIC_TYPEC + "') and "+ Param.VALUETYPE + "='AVG' and ");
// StringBuilder timeId = new StringBuilder();
// timeId.append(InfluxDBPublicParam.PHASIC_TYPE + "='" + InfluxDBPublicParam.PHASIC_TYPET + "' and " + InfluxDBPublicParam.TIME + " >= '" + startTime + InfluxDBPublicParam.START_TIME + "' and " + InfluxDBPublicParam.TIME + " <= '" + endTime + InfluxDBPublicParam.END_TIME + "' and ");
// for (int i = 0; i < lineIndexes.size(); i++) {
// if (lineIndexes.size() - i != 1) {
// timeId.append(InfluxDBPublicParam.LINE_ID + "='").append(lineIndexes.get(i)).append("' or ");
// } else {
// timeId.append(InfluxDBPublicParam.LINE_ID + "='").append(lineIndexes.get(i)).append("' tz('Asia/Shanghai')");
// }
// }
// //sql语句
// String sql = "SELECT * FROM "+ InfluxDBPublicParam.LIMIT_RATE +" WHERE " + timeId;
// //结果集
// QueryResult result = influxDbUtils.query(sql);
// // if (Objects.isNull(result.getResults().get(0).getSeries())) {
// // throw new BusinessException(HarmonicResponseEnum.LIMIT_RATE_ERROR);
// // }
// //结果集映射到对象中
// InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
// limitRatePOS = resultMapper.toPOJO(result, LimitRatePO.class);
// //将时间处理为年月日的字符串
// DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// DateTimeFormatter monthFormatter = DateTimeFormatter.ofPattern("yyyy-MM");
// limitRatePOS.forEach(item->{
// Instant instant = item.getTime();
// ZoneId zoneId = ZoneId.systemDefault();
// LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zoneId);
// String dateStr = dateTimeFormatter.format(localDateTime);
// String monthStr = monthFormatter.format(localDateTime);
// item.setDayStr(dateStr);
// item.setMouthStr(monthStr);
// });
//
//
// return limitRatePOS;
}
}

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
View File

@@ -130,8 +130,8 @@ public class THDistortionServiceImpl implements THDistortionService {
deviceInfoParam.setDeptIndex(statisticsBizBaseParam.getId());
deviceInfoParam.setStatisticalType(new SimpleDTO());
deviceInfoParam.setServerName(generalInfo.getMicroServiceName());
deviceInfoParam.setPowerFlag(0);
deviceInfoParam.setMonitorFlag(0);
deviceInfoParam.setPowerFlag(2);
deviceInfoParam.setMonitorFlag(2);
/*获取按部门分类的实际所有终端综合信息*/
List<GeneralDeviceDTO> deviceList = generalDeviceInfoClient.getPracticalAllDeviceInfoAsDept(deviceInfoParam).getData();
/*监测点ID扁平化*/
@@ -139,7 +139,7 @@ public class THDistortionServiceImpl implements THDistortionService {
QueryWrapper<RMpVThd> wrapper = new QueryWrapper<>();
wrapper.in("measurement_point_id", collect)
.between("data_date", statisticsBizBaseParam.getStartTime(), statisticsBizBaseParam.getEndTime())
.eq("data_type", 1)
.eq("data_type", 0)
.orderByDesc("v_thd");
List<RMpVThd> rMpVThdList = rMpVThdMapper.selectList(wrapper);
rMpVThdVOList = rMpVThdList.stream().limit(topNum).map(rMpVThd -> {