Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

治理绘图调整

Browse Source
This commit is contained in:
hongawen
2023-09-28 15:15:35 +08:00
parent d670713a01
commit fd4613f305
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
View File

@@ -47,7 +47,6 @@ import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
/** /**
*
* Description: * Description:
* Date: 2023/9/4 15:15【需求编号】 * Date: 2023/9/4 15:15【需求编号】
* *
@@ -57,7 +56,7 @@ import java.util.stream.Stream;
@Slf4j @Slf4j
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO> implements CsEventPOService{ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO> implements CsEventPOService {
private final EvtDataService evtDataService; private final EvtDataService evtDataService;
@@ -81,7 +80,7 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
public List<EventDetailVO> queryEventList(CsEventUserQueryParam csEventUserQueryParam) { public List<EventDetailVO> queryEventList(CsEventUserQueryParam csEventUserQueryParam) {
List<EventDetailVO> list = csEventUserPOService.queryUserEventList(csEventUserQueryParam); List<EventDetailVO> list = csEventUserPOService.queryUserEventList(csEventUserQueryParam);
list.forEach(temp->{ list.forEach(temp -> {
DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(temp.getDeviceId()).getData(); DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(temp.getDeviceId()).getData();
temp.setEquipmentName(devDetail.getEquipmentName()); temp.setEquipmentName(devDetail.getEquipmentName());
temp.setProjectId(devDetail.getProjectId()); temp.setProjectId(devDetail.getProjectId());
@@ -93,11 +92,11 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
List<EventDataSetDTO> eventDataSetDTOS = new ArrayList<>(); List<EventDataSetDTO> eventDataSetDTOS = new ArrayList<>();
for (EleEvtParm eleEvtParm : data1) { for (EleEvtParm eleEvtParm : data1) {
EventDataSetDTO eventDataSetDTO = new EventDataSetDTO(); EventDataSetDTO eventDataSetDTO = new EventDataSetDTO();
BeanUtils.copyProperties(eleEvtParm,eventDataSetDTO); BeanUtils.copyProperties(eleEvtParm, eventDataSetDTO);
EventDataSetDTO evtData = evtDataService.getEventDataSet("evt_data", temp.getId(), eleEvtParm.getName()); EventDataSetDTO evtData = evtDataService.getEventDataSet("evt_data", temp.getId(), eleEvtParm.getName());
if (evtData == null) { if (evtData == null) {
eventDataSetDTO.setValue("3.1415926"); eventDataSetDTO.setValue("3.1415926");
}else { } else {
eventDataSetDTO.setValue(Optional.ofNullable(evtData.getValue()).orElse("3.1415926")); eventDataSetDTO.setValue(Optional.ofNullable(evtData.getValue()).orElse("3.1415926"));
} }
@@ -112,7 +111,6 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
} }
/** /**
* @return WaveDataDTO * @return WaveDataDTO
* @date 2023/9/21 15:59 * @date 2023/9/21 15:59
@@ -163,16 +161,16 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
WaveDataDTO waveDataDTO = this.analyseWave(eventId, iType); WaveDataDTO waveDataDTO = this.analyseWave(eventId, iType);
//数据筛选,如果是双路电压的话，会存在2个波形数据 //数据筛选,如果是双路电压的话，会存在2个波形数据
List<WaveDataDetail> waveDataDetails = WaveUtil.filterWaveData(waveDataDTO); List<WaveDataDetail> waveDataDetails = WaveUtil.filterWaveData(waveDataDTO);
String instantPath = wavePicComponent.generateImageShun(waveDataDTO, waveDataDetails); String instantPath = wavePicComponent.generateInstantImageZl(waveDataDetails);
eventDetail.setInstantPics(instantPath); eventDetail.setInstantPics(instantPath);
if (StrUtil.isBlank(eventDetail.getRmsPics())) { if (StrUtil.isBlank(eventDetail.getRmsPics())) {
String rmsPath = wavePicComponent.generateImageRms(waveDataDTO, waveDataDetails); String rmsPath = wavePicComponent.generateRmsImageZl(waveDataDetails);
eventDetail.setRmsPics(rmsPath); eventDetail.setRmsPics(rmsPath);
} }
this.updateById(eventDetail); this.updateById(eventDetail);
} }
CsEventVO csEventVO = new CsEventVO(); CsEventVO csEventVO = new CsEventVO();
BeanUtil.copyProperties(eventDetail,csEventVO); BeanUtil.copyProperties(eventDetail, csEventVO);
return csEventVO; return csEventVO;
} }

1
cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java
View File

@@ -9,7 +9,6 @@ import com.njcn.csdevice.api.AppProjectFeignClient;
import com.njcn.csdevice.api.EquipmentFeignClient; import com.njcn.csdevice.api.EquipmentFeignClient;
import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO; import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
import com.njcn.csdevice.pojo.po.AppProjectPO; import com.njcn.csdevice.pojo.po.AppProjectPO;
import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
import com.njcn.cswarn.mapper.CsEquipmentAlarmPOMapper; import com.njcn.cswarn.mapper.CsEquipmentAlarmPOMapper;
import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmAddParm; import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmAddParm;
import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmParm; import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmParm;