diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/DimBusBarParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/DimBusBarParam.java index 1c302b5bf..b3ba6b6b7 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/DimBusBarParam.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/DimBusBarParam.java @@ -12,22 +12,35 @@ import java.util.List; */ @Data public class DimBusBarParam { + + private String deployState; + private String endTime; + private String startTime; + private String orgId; + private String orgLevel; + private String statType; + + + + + + + private String busId; private List busIds; private String busName; private String dataSource; - private String deployState; + private String detailType; - private String endTime; + private Integer harmonicNum; private String indexType; private String monitorId; private String nodeId; private String nodeLevel; private List seqs; - private String startTime; private String statDate; - private String statType; + private String stationName; private String voltageLevel; private Integer pageNum; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadDataLogController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadDataLogController.java index e6f61250a..5f3bbeecc 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadDataLogController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadDataLogController.java @@ -50,7 +50,7 @@ public class RUploadDataLogController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getList") @ApiOperation("查询国网上送数据日志") - @ApiImplicitParam(name = "param", value = "实体参数", required = true) + @ApiImplicitParam(name = "baseParam", value = "实体参数", required = true) public HttpResult> getList(@RequestBody BaseParam baseParam) { String methodDescribe = getMethodDescribe("getList"); Page list = rUploadDataLogService.getList(baseParam); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java index a2e175b4a..6026d7410 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java @@ -219,118 +219,86 @@ public class REvaluationDataServiceImpl extends ServiceImpl getBaseEvaOnlineBusDetail(DimBusBarParam param) { List temBusIds = new ArrayList<>(); - //TODO 非空判断以总部的返回方式返回 - //统计类型不为空，则查询指定统计天数的数据 - if (StrUtil.isBlank(param.getStatType())) { - - } - //判断日月年不为空时候对应参数不能为空 - if (StrUtil.isBlank(param.getStartTime()) || StrUtil.isBlank(param.getEndTime())) { - - } - - if (StrUtil.isBlank(param.getNodeId())) { - //没有组织id则认为查询日的省级数据 - - } LocalDate begin = LocalDate.parse(param.getStartTime()); if (param.getStatType().equals(DicDataEnum.STATISTICAL_TYPE_D.getCode())) { //具体日期投运,监测台账查询 LambdaQueryWrapper dayLam = new LambdaQueryWrapper<>(); - dayLam.eq(PmsRunStatisticD::getStatisticDate, begin).eq(PmsRunStatisticD::getDeptId, param.getNodeId()); + dayLam.select(PmsRunStatisticD::getRunBusIds) + .eq(PmsRunStatisticD::getStatisticDate, begin).eq(PmsRunStatisticD::getDeptId, param.getOrgId()); PmsRunStatisticD pmsRunStatisticD = pmsRunStatisticDMapper.selectOne(dayLam); if (Objects.nonNull(pmsRunStatisticD)) { - if (StrUtil.isNotBlank(param.getDataSource())) { - temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticD.getOnlineBusMidIds().split(StrUtil.COMMA))); - } else { temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticD.getRunBusIds().split(StrUtil.COMMA))); - } } - //稳态指标条件筛选 - QueryWrapper queryWrapper = new QueryWrapper<>(); - this.harmTarget(param, temBusIds, queryWrapper); - List rDimBusUpDList = rDimBusUpDMapper.selectList(queryWrapper); - temBusIds = rDimBusUpDList.stream().map(RDimBusUpD::getMidBusId).distinct().collect(Collectors.toList()); + } else if (param.getStatType().equals(DicDataEnum.STATISTICAL_TYPE_M.getCode())) { //具体日期投运,监测台账查询 LambdaQueryWrapper dayLam = new LambdaQueryWrapper<>(); - dayLam.eq(PmsRunStatisticM::getStatisticDate, begin).eq(PmsRunStatisticM::getDeptId, param.getNodeId()); + dayLam.select(PmsRunStatisticM::getRunBusIds) + .eq(PmsRunStatisticM::getStatisticDate, begin).eq(PmsRunStatisticM::getDeptId, param.getOrgId()); PmsRunStatisticM pmsRunStatisticM = pmsRunStatisticMMapper.selectOne(dayLam); if (Objects.nonNull(pmsRunStatisticM)) { - if (StrUtil.isNotBlank(param.getDataSource())) { - temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticM.getOnlineBusMidIds().split(StrUtil.COMMA))); - } else { temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticM.getRunBusIds().split(StrUtil.COMMA))); - } } - - //稳态指标条件筛选 - - QueryWrapper queryWrapper = new QueryWrapper<>(); - this.harmTarget(param, temBusIds, queryWrapper); - List rDimBusUpMList = rDimBusUpMMapper.selectList(queryWrapper); - temBusIds = rDimBusUpMList.stream().map(RDimBusUpM::getMidBusId).distinct().collect(Collectors.toList()); } else if (param.getStatType().equals(DicDataEnum.STATISTICAL_TYPE_Y.getCode())) { //具体日期投运,监测台账查询 LambdaQueryWrapper dayLam = new LambdaQueryWrapper<>(); - dayLam.eq(PmsRunStatisticY::getStatisticDate, begin).eq(PmsRunStatisticY::getDeptId, param.getNodeId()); + dayLam.select(PmsRunStatisticY::getRunBusIds) + .eq(PmsRunStatisticY::getStatisticDate, begin).eq(PmsRunStatisticY::getDeptId, param.getNodeId()); PmsRunStatisticY pmsRunStatisticY = pmsRunStatisticYMapper.selectOne(dayLam); if (Objects.nonNull(pmsRunStatisticY)) { - if (StrUtil.isNotBlank(param.getDataSource())) { temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticY.getOnlineBusMidIds().split(StrUtil.COMMA))); - } else { - temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticY.getRunBusIds().split(StrUtil.COMMA))); - } } - - //稳态指标条件筛选 - - QueryWrapper queryWrapper = new QueryWrapper<>(); - this.harmTarget(param, temBusIds, queryWrapper); - List rDimBusUpYList = rDimBusUpYMapper.selectList(queryWrapper); - temBusIds = rDimBusUpYList.stream().map(RDimBusUpY::getMidBusId).distinct().collect(Collectors.toList()); } if (CollectionUtil.isEmpty(temBusIds)) { return new Page<>(); } param.setOnlineBusIds(temBusIds); - if (CollectionUtil.isEmpty(temBusIds)) { - return new Page<>(); - } return this.baseMapper.getBaseEvaOnlineBusDetail(new Page<>(param.getPageNum(), param.getPageSize()), param); } @Override public Page getBaseEvaMonitorBusDetail(DimBusBarParam param) { List temBusIds = new ArrayList<>(); - List rDimUpDTOList = new ArrayList<>(); LocalDate begin = LocalDate.parse(param.getStartTime()); + if (param.getStatType().equals(DicDataEnum.STATISTICAL_TYPE_D.getCode())) { + //具体日期投运,监测台账查询 + LambdaQueryWrapper dayLam = new LambdaQueryWrapper<>(); + dayLam.select(PmsRunStatisticD::getOnlineBusIds) + .eq(PmsRunStatisticD::getStatisticDate, begin) + .eq(PmsRunStatisticD::getDeptId, param.getOrgId()); + PmsRunStatisticD pmsRunStatisticD = pmsRunStatisticDMapper.selectOne(dayLam); + if (Objects.nonNull(pmsRunStatisticD)) { + temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticD.getOnlineBusIds().split(StrUtil.COMMA))); + } - String statisticType = param.getStatType(); - if (DicDataEnum.STATISTICAL_TYPE_D.getCode().equals(statisticType)) { - temBusIds = getOnlineBusIds(param.getNodeId(), begin, PmsRunStatisticD.class); - } else if (DicDataEnum.STATISTICAL_TYPE_M.getCode().equals(statisticType)) { - temBusIds = getOnlineBusIds(param.getNodeId(), begin, PmsRunStatisticM.class); - } else if (DicDataEnum.STATISTICAL_TYPE_Y.getCode().equals(statisticType)) { - temBusIds = getOnlineBusIds(param.getNodeId(), begin, PmsRunStatisticY.class); + } else if (param.getStatType().equals(DicDataEnum.STATISTICAL_TYPE_M.getCode())) { + //具体日期投运,监测台账查询 + LambdaQueryWrapper dayLam = new LambdaQueryWrapper<>(); + dayLam.select(PmsRunStatisticM::getOnlineBusIds) + .eq(PmsRunStatisticM::getStatisticDate, begin).eq(PmsRunStatisticM::getDeptId, param.getOrgId()); + PmsRunStatisticM pmsRunStatisticM = pmsRunStatisticMMapper.selectOne(dayLam); + if (Objects.nonNull(pmsRunStatisticM)) { + temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticM.getOnlineBusIds().split(StrUtil.COMMA))); + } + } else if (param.getStatType().equals(DicDataEnum.STATISTICAL_TYPE_Y.getCode())) { + + //具体日期投运,监测台账查询 + LambdaQueryWrapper dayLam = new LambdaQueryWrapper<>(); + dayLam.select(PmsRunStatisticY::getOnlineBusIds) + .eq(PmsRunStatisticY::getStatisticDate, begin).eq(PmsRunStatisticY::getDeptId, param.getNodeId()); + PmsRunStatisticY pmsRunStatisticY = pmsRunStatisticYMapper.selectOne(dayLam); + if (Objects.nonNull(pmsRunStatisticY)) { + temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticY.getOnlineBusIds().split(StrUtil.COMMA))); + } } - temBusIds = this.busTargetAss(param, temBusIds, rDimUpDTOList); if (CollectionUtil.isEmpty(temBusIds)) { return new Page<>(); } param.setOnlineBusIds(temBusIds); - Page page = this.baseMapper.getBaseEvaOnlineBusDetail(new Page<>(param.getPageNum(), param.getPageSize()), param); - if (CollectionUtil.isNotEmpty(page.getRecords())) { - Map map = rDimUpDTOList.stream().collect(Collectors.toMap(RDimUpDTO::getBusMidId, Function.identity())); - page.getRecords().forEach(it -> { - it.setBusEfectiveMnitorNum(map.containsKey(it.getAstId()) ? map.get(it.getAstId()).getEffectIds().split(StrUtil.COMMA).length : 0); - it.setBusEffectiveMonitors(map.containsKey(it.getAstId()) ? map.get(it.getAstId()).getEffectIds() : null); - }); - } - return page; + return this.baseMapper.getBaseEvaOnlineBusDetail(new Page<>(param.getPageNum(), param.getPageSize()), param); }