diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index 38a85460e..858796095 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -415,7 +415,14 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple String scaTmp = scaleResult.getData().getValue(); Overlimit overlimit = new Overlimit(line.getId(), scaTmp, lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); overlimitMapper.deleteById(line.getId()); + + //页面存在自己填写的电压上下偏差 + overlimit.setVoltageDev(lineParam.getVoltageDev()); + overlimit.setUvoltageDev(lineParam.getUvoltageDev()); overlimitMapper.insert(overlimit); + + + } } @@ -689,7 +696,16 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple lineDetail.setMonitorFlag(0); } 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()); //监测点限值 HttpResult scaleResult = dicDataFeignClient.getDicDataById(updateSubVoltageParam.getScale()); @@ -697,6 +713,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple throw new BusinessException(CommonResponseEnum.DIC_DATA); } 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); } //获取用户信息 diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java index b3858c738..764af78de 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java @@ -37,10 +37,9 @@ import com.njcn.event.service.majornetwork.EventDetailService; import com.njcn.event.service.majornetwork.TransientService; import com.njcn.event.utils.WaveUtil; 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.oss.utils.FileStorageUtil; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; @@ -96,6 +95,8 @@ public class TransientServiceImpl implements TransientService { private final RmpEventDetailMapper rmpEventDetailMapper; + private final FileStorageUtil fileStorageUtil; + @Override public Page getTransientData(TransientParam transientParam) { Page page = new Page<>(); @@ -211,12 +212,12 @@ public class TransientServiceImpl implements TransientService { } originalData = waveUtil.getComtrade(cfgStream, datStream, 1); // } else if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS) { - } else { + } else { cfgPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.CFG; datPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.DAT; try ( - InputStream cfgStream = obsUtil.downloadStream(cfgPath); - InputStream datStream = obsUtil.downloadStream(datPath) + InputStream cfgStream = fileStorageUtil.downloadStream(cfgPath); + InputStream datStream = fileStorageUtil.downloadStream(datPath) ) { if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) { throw new BusinessException(EventResponseEnum.ANALYSEWAVE_NOT_FOUND);