|
@@ -67,6 +67,9 @@ public class CalculateMonitorInfoServiceImpl implements ICalculateMonitorInfoSer
|
|
|
@Autowired
|
|
|
private IMonitorSiteBaseInfoService iMonitorSiteBaseInfoService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IEncryptSectionMonitorInfoService iEncryptSectionMonitorInfoService;
|
|
|
+
|
|
|
@Override
|
|
|
public PictureDetailInfoVo getMonitorInfoAll(List<MonitorSiteBaseInfo> monitorSiteBaseInfoList) {
|
|
|
PictureDetailInfoVo infoVo = new PictureDetailInfoVo();
|
|
@@ -147,6 +150,12 @@ public class CalculateMonitorInfoServiceImpl implements ICalculateMonitorInfoSer
|
|
|
wrapper.lambda().eq(GovernPointMonitorInfo::getMonitorSiteCode, monitorSiteCode));
|
|
|
list = iWaterQualityMonitorInfoService.viewConversion(JSON.parseArray(JSON.toJSONString(monitorInfoList), WaterQualityMonitorInfo.class));
|
|
|
|
|
|
+ } else if(ExcelImportFileTypeEnum.IMPORT_ENCRYPT_SECTION_MONITOR_INFO_XML.getTemplateServiceType().equals(moduleBelongType)){
|
|
|
+ QueryWrapper<EncryptSectionMonitorInfo> wrapper = new QueryWrapper<>();
|
|
|
+ List<EncryptSectionMonitorInfo> monitorInfoList =
|
|
|
+ iEncryptSectionMonitorInfoService.list(
|
|
|
+ wrapper.lambda().eq(EncryptSectionMonitorInfo::getMonitorSiteCode, monitorSiteCode));
|
|
|
+ list = iWaterQualityMonitorInfoService.viewConversion(JSON.parseArray(JSON.toJSONString(monitorInfoList), WaterQualityMonitorInfo.class));
|
|
|
} else {
|
|
|
QueryWrapper<WaterQualityMonitorInfo> wrapper = new QueryWrapper<>();
|
|
|
list = iWaterQualityMonitorInfoService.viewConversion(
|