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-21 11:39:34 +08:00
parent 4776060043
commit 36afca9f96
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,7 +415,14 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
String scaTmp = scaleResult.getData().getValue(); String scaTmp = scaleResult.getData().getValue();
Overlimit overlimit = new Overlimit(line.getId(), scaTmp, lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); Overlimit overlimit = new Overlimit(line.getId(), scaTmp, lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity());
overlimitMapper.deleteById(line.getId()); overlimitMapper.deleteById(line.getId());
//页面存在自己填写的电压上下偏差
overlimit.setVoltageDev(lineParam.getVoltageDev());
overlimit.setUvoltageDev(lineParam.getUvoltageDev());
overlimitMapper.insert(overlimit); overlimitMapper.insert(overlimit);
} }
} }
@@ -689,7 +696,16 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
lineDetail.setMonitorFlag(0); lineDetail.setMonitorFlag(0);
} }
lineDetailMapper.updateById(lineDetail); lineDetailMapper.updateById(lineDetail);
if ((!lineDetailRes.getDevCapacity().equals(lineDetail.getDevCapacity())) || ((!lineDetailRes.getShortCapacity().equals(lineDetail.getShortCapacity()))) || ((!lineDetailRes.getDealCapacity().equals(lineDetail.getDealCapacity())))) {
Overlimit overlimitTem = overlimitMapper.selectById(lineId);
if ((!lineDetailRes.getDevCapacity().equals(lineDetail.getDevCapacity()))
|| ((!lineDetailRes.getShortCapacity().equals(lineDetail.getShortCapacity())))
|| ((!lineDetailRes.getDealCapacity().equals(lineDetail.getDealCapacity())))
|| ((!lineDetailRes.getStandardCapacity().equals(lineDetail.getStandardCapacity())))
|| ((!overlimitTem.getVoltageDev().equals(updateLineBO.getVoltageDev()))
|| ((!overlimitTem.getUvoltageDev().equals(updateLineBO.getUvoltageDev()))))
) {
overlimitMapper.deleteById(line.getId()); overlimitMapper.deleteById(line.getId());
//监测点限值 //监测点限值
HttpResult<DictData> scaleResult = dicDataFeignClient.getDicDataById(updateSubVoltageParam.getScale()); HttpResult<DictData> scaleResult = dicDataFeignClient.getDicDataById(updateSubVoltageParam.getScale());
@@ -697,6 +713,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
throw new BusinessException(CommonResponseEnum.DIC_DATA); throw new BusinessException(CommonResponseEnum.DIC_DATA);
} }
Overlimit overlimit = new Overlimit(line.getId(), scaleResult.getData().getValue(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); Overlimit overlimit = new Overlimit(line.getId(), scaleResult.getData().getValue(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity());
overlimit.setVoltageDev(updateLineBO.getVoltageDev());
overlimit.setUvoltageDev(updateLineBO.getUvoltageDev());
overlimitMapper.insert(overlimit); overlimitMapper.insert(overlimit);
} }
//获取用户信息 //获取用户信息

11
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
View File

@@ -37,10 +37,9 @@ import com.njcn.event.service.majornetwork.EventDetailService;
import com.njcn.event.service.majornetwork.TransientService; import com.njcn.event.service.majornetwork.TransientService;
import com.njcn.event.utils.WaveUtil; import com.njcn.event.utils.WaveUtil;
import com.njcn.huawei.obs.util.OBSUtil; import com.njcn.huawei.obs.util.OBSUtil;
import com.njcn.influxdb.mapper.InfluxDBResultMapperCn;
import com.njcn.influxdb.param.InfluxDBPublicParam;
import com.njcn.influxdb.utils.InfluxDBCommUtils;
import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.influxdb.utils.InfluxDbUtils;
import com.njcn.oss.utils.FileStorageUtil;
import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.po.DictData; import com.njcn.system.pojo.po.DictData;
@@ -96,6 +95,8 @@ public class TransientServiceImpl implements TransientService {
private final RmpEventDetailMapper rmpEventDetailMapper; private final RmpEventDetailMapper rmpEventDetailMapper;
private final FileStorageUtil fileStorageUtil;
@Override @Override
public Page<TransientVO> getTransientData(TransientParam transientParam) { public Page<TransientVO> getTransientData(TransientParam transientParam) {
Page<TransientVO> page = new Page<>(); Page<TransientVO> page = new Page<>();
@@ -215,8 +216,8 @@ public class TransientServiceImpl implements TransientService {
cfgPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.CFG; cfgPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.CFG;
datPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.DAT; datPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.DAT;
try ( try (
InputStream cfgStream = obsUtil.downloadStream(cfgPath); InputStream cfgStream = fileStorageUtil.downloadStream(cfgPath);
InputStream datStream = obsUtil.downloadStream(datPath) InputStream datStream = fileStorageUtil.downloadStream(datPath)
) { ) {
if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) { if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) {
throw new BusinessException(EventResponseEnum.ANALYSEWAVE_NOT_FOUND); throw new BusinessException(EventResponseEnum.ANALYSEWAVE_NOT_FOUND);