diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/exception/BusinessException.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/exception/BusinessException.java index 99d34733c..7e58135c7 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/exception/BusinessException.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/exception/BusinessException.java @@ -1,5 +1,6 @@ package com.njcn.common.pojo.exception; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import lombok.Data; import lombok.NoArgsConstructor; @@ -83,5 +84,6 @@ public class BusinessException extends RuntimeException { public BusinessException(String message) { super(message); this.message = message; + this.code = CommonResponseEnum.FAIL.getCode(); } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadMainMonitorController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadMainMonitorController.java index 38173d003..ddeb7f4aa 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadMainMonitorController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadMainMonitorController.java @@ -7,6 +7,7 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.harmonic.pojo.dto.upload.RUploadMainMonitorDataDTO; import com.njcn.harmonic.pojo.param.UploadDataParam; import com.njcn.harmonic.pojo.po.upload.RUploadCommPointBus; import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData; @@ -42,9 +43,9 @@ public class RUploadMainMonitorController extends BaseController { @PostMapping("/getMainMonitorPage") @ApiOperation("分页查询主网监测点") @ApiImplicitParam(name = "param", value = "实体参数", required = true) - public HttpResult> getMainMonitorPage(@RequestBody @Validated UploadDataParam param) { + public HttpResult> getMainMonitorPage(@RequestBody @Validated UploadDataParam param) { String methodDescribe = getMethodDescribe("getMainMonitorPage"); - Page page = rUploadMainMonitorService.getMainMonitorPage(param); + Page page = rUploadMainMonitorService.getMainMonitorPage(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/RUploadMainMonitorService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/RUploadMainMonitorService.java index 303dd574a..ee8d49bc9 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/RUploadMainMonitorService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/RUploadMainMonitorService.java @@ -3,6 +3,7 @@ package com.njcn.harmonic.service.upload; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.harmonic.pojo.dto.upload.RUploadMainMonitorDataDTO; import com.njcn.harmonic.pojo.param.UploadDataParam; import com.njcn.harmonic.pojo.po.upload.RUploadCommPointBus; import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData; @@ -15,7 +16,7 @@ import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData; public interface RUploadMainMonitorService extends IService { - Page getMainMonitorPage(UploadDataParam param); + Page getMainMonitorPage(UploadDataParam param); Boolean upGwMainMonitor(UploadDataParam param); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java index 0d8c7808c..176a3993b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java @@ -60,20 +60,21 @@ public class RUploadCommPointBusServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + String temDate = param.getSearchBeginTime(); if(StrUtil.isBlank(param.getDataType())){ //类型为空则上送日月年数据 DateTime dateTime = DateUtil.parse(param.getSearchBeginTime(),DatePattern.NORM_DATE_PATTERN); String month = DateUtil.format(dateTime,DatePattern.NORM_MONTH_PATTERN); String year = DateUtil.format(dateTime,DatePattern.NORM_YEAR_PATTERN); - lambdaQueryWrapper.in(RUploadCommPointBus::getStatisticalDate, Stream.of(param.getSearchBeginTime(),month,year).collect(Collectors.toList())); + lambdaQueryWrapper.in(RUploadCommPointBus::getStatisticalDate, Stream.of(temDate,month,year).collect(Collectors.toList())); }else { if(param.getDataType().equals(DicDataEnum.STATISTICAL_TYPE_M.getCode())){ - param.setSearchBeginTime(DateUtil.format(DateUtil.parse(param.getSearchBeginTime(),DatePattern.NORM_DATE_PATTERN),DatePattern.NORM_MONTH_PATTERN)); + temDate = DateUtil.format(DateUtil.parse(param.getSearchBeginTime(),DatePattern.NORM_DATE_PATTERN),DatePattern.NORM_MONTH_PATTERN); }else if(param.getDataType().equals(DicDataEnum.STATISTICAL_TYPE_Y.getCode())){ - param.setSearchBeginTime(DateUtil.format(DateUtil.parse(param.getSearchBeginTime(),DatePattern.NORM_DATE_PATTERN),DatePattern.NORM_YEAR_PATTERN)); + temDate = DateUtil.format(DateUtil.parse(param.getSearchBeginTime(),DatePattern.NORM_DATE_PATTERN),DatePattern.NORM_YEAR_PATTERN); } lambdaQueryWrapper.eq(RUploadCommPointBus::getStatisticalType,param.getDataType()) - .eq(RUploadCommPointBus::getStatisticalDate,param.getSearchBeginTime()); + .eq(RUploadCommPointBus::getStatisticalDate,temDate); } List rUploadCommPointBusList = this.list(lambdaQueryWrapper); if(CollUtil.isEmpty(rUploadCommPointBusList)){ @@ -93,15 +94,8 @@ public class RUploadCommPointBusServiceImpl extends ServiceImpl sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.COMM_POINT); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java index bcc8a7094..1f3888c7e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java @@ -75,7 +75,9 @@ public class RUploadMainMonitorServiceImpl extends ServiceImpl getMainMonitorPage(UploadDataParam param) { + public Page getMainMonitorPage(UploadDataParam param) { + Page result = new Page<>(param.getPageNum(),param.getPageSize()); + DateTime dateTime = DateUtil.parse(param.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN); if(param.getDataType().equals(DicDataEnum.STATISTICAL_TYPE_M.getCode())){ param.setSearchBeginTime(DateUtil.format(dateTime,DatePattern.NORM_MONTH_PATTERN)); @@ -85,7 +87,16 @@ public class RUploadMainMonitorServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(RUploadMainMonitorData::getStatisticalType,param.getDataType()) .eq(RUploadMainMonitorData::getStatisticalDate,param.getSearchBeginTime()); - return this.page(new Page<>(PageFactory.getPageNum(param),PageFactory.getPageSize(param)),lambdaQueryWrapper); + Page page = this.page(new Page<>(PageFactory.getPageNum(param),PageFactory.getPageSize(param)),lambdaQueryWrapper); + if(CollUtil.isEmpty(page.getRecords())){ + return result; + } + List rUploadMainMonitorDataList = page.getRecords(); + List rUploadMainMonitorDataDTOList = new ArrayList<>(); + dataToResult(rUploadMainMonitorDataList,rUploadMainMonitorDataDTOList); + result.setRecords(rUploadMainMonitorDataDTOList); + result.setTotal(page.getTotal()); + return result; } @Override @@ -95,30 +106,88 @@ public class RUploadMainMonitorServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + String temDate = param.getSearchBeginTime(); if(StrUtil.isBlank(param.getDataType())){ //类型为空则上送日月年数据 DateTime dateTime = DateUtil.parse(param.getSearchBeginTime(),DatePattern.NORM_DATE_PATTERN); String month = DateUtil.format(dateTime,DatePattern.NORM_MONTH_PATTERN); String year = DateUtil.format(dateTime,DatePattern.NORM_YEAR_PATTERN); - lambdaQueryWrapper.in(RUploadMainMonitorData::getStatisticalDate, Stream.of(param.getSearchBeginTime(),month,year).collect(Collectors.toList())); + lambdaQueryWrapper.in(RUploadMainMonitorData::getStatisticalDate, Stream.of(temDate,month,year).collect(Collectors.toList())); }else { if(param.getDataType().equals(DicDataEnum.STATISTICAL_TYPE_M.getCode())){ - param.setSearchBeginTime(DateUtil.format(DateUtil.parse(param.getSearchBeginTime(),DatePattern.NORM_DATE_PATTERN),DatePattern.NORM_MONTH_PATTERN)); + temDate = DateUtil.format(DateUtil.parse(param.getSearchBeginTime(),DatePattern.NORM_DATE_PATTERN),DatePattern.NORM_MONTH_PATTERN); }else if(param.getDataType().equals(DicDataEnum.STATISTICAL_TYPE_Y.getCode())){ - param.setSearchBeginTime(DateUtil.format(DateUtil.parse(param.getSearchBeginTime(),DatePattern.NORM_DATE_PATTERN),DatePattern.NORM_YEAR_PATTERN)); + temDate = DateUtil.format(DateUtil.parse(param.getSearchBeginTime(),DatePattern.NORM_DATE_PATTERN),DatePattern.NORM_YEAR_PATTERN); } lambdaQueryWrapper.eq(RUploadMainMonitorData::getStatisticalType,param.getDataType()) - .eq(RUploadMainMonitorData::getStatisticalDate,param.getSearchBeginTime()); + .eq(RUploadMainMonitorData::getStatisticalDate,temDate); } List rUploadMainMonitorDataList = this.list(lambdaQueryWrapper); if(CollUtil.isEmpty(rUploadMainMonitorDataList)){ throw new BusinessException("查询数据为空"); } + List rUploadMainMonitorDataDTOList = new ArrayList<>(); + dataToResult(rUploadMainMonitorDataList,rUploadMainMonitorDataDTOList); + + List> list = CollUtil.split(rUploadMainMonitorDataDTOList,100); + for(int i=0;i sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.COMM_POINT); + List ids = list.get(i).stream().map(RUploadMainMonitorDataDTO::getObjId).collect(Collectors.toList()); + int count = GwSendUtil.returnInfoMsg(ids,sendRes); + System.out.println("上送成功,上送成功返回"+count+"条"); + if(count == list.get(i).size()){ + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(RUploadMainMonitorData::getUploadStatus,1).in(RUploadMainMonitorData::getObjId,ids); + this.update(lambdaUpdateWrapper); + } + } + return true; + } + + + + private void assOrg(Map pvTerminalTreeVOCodeMap,Map pvTerminalTreeVOIdMap,RUploadMainMonitorDataDTO rUploadMainMonitorDataDTO,Monitor monitor){ + PvTerminalTreeVO pvTerminalTreeVO = pvTerminalTreeVOCodeMap.get(monitor.getOrgId()); + rUploadMainMonitorDataDTO.setMaintOrg(pvTerminalTreeVO.getCode()); + rUploadMainMonitorDataDTO.setMaintOrgName(pvTerminalTreeVO.getName()); + + PvTerminalTreeVO pvTerminalTreeCity = pvTerminalTreeVOIdMap.get(pvTerminalTreeVO.getPid()); + rUploadMainMonitorDataDTO.setCityOrg(pvTerminalTreeCity.getCode()); + rUploadMainMonitorDataDTO.setCityOrgName(pvTerminalTreeCity.getName()); + + PvTerminalTreeVO pvTerminalTreeProvince = pvTerminalTreeVOIdMap.get(pvTerminalTreeCity.getPid()); + rUploadMainMonitorDataDTO.setProvinceOrg(pvTerminalTreeProvince.getCode()); + rUploadMainMonitorDataDTO.setProvinceOrgName(pvTerminalTreeProvince.getName()); + } + + + /** + * 数据赋值 + * @param rUploadMainMonitorDataList + * @param rUploadMainMonitorDataDTOList + */ + private void dataToResult(List rUploadMainMonitorDataList,List rUploadMainMonitorDataDTOList){ List deptTreeVOList = deptFeignClient.allDeptList().getData(); Map pvTerminalTreeVOCodeMap = deptTreeVOList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getCode,Function.identity())); Map pvTerminalTreeVOIdMap = deptTreeVOList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId,Function.identity())); + List dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); Map voltageMap = dictDataList.stream().collect(Collectors.toMap(DictData::getId,Function.identity())); @@ -136,7 +205,6 @@ public class RUploadMainMonitorServiceImpl extends ServiceImpl sysDicTreePOList = dictTreeFeignClient.queryAllByType(Integer.valueOf(DicTreeEnum.HB_PMS_TYPE.getCode())).getData(); Map dicTreeMap = sysDicTreePOList.stream().collect(Collectors.toMap(SysDicTreePO::getId,Function.identity())); - //获取测点map List monitorIds = rUploadMainMonitorDataList.stream().map(RUploadMainMonitorData::getMonitorId).distinct().collect(Collectors.toList()); List monitorList = monitorClient.getMonitorListByMid(monitorIds).getData(); @@ -146,7 +214,7 @@ public class RUploadMainMonitorServiceImpl extends ServiceImpl pmsTerminalList = pmsTerminalClient.getTerminalSelectByIds(terminalIds).getData(); Map pmsTerminalMap = pmsTerminalList.stream().collect(Collectors.toMap(PmsTerminal::getId,Function.identity())); - List rUploadMainMonitorDataDTOList = new ArrayList<>(); + rUploadMainMonitorDataList.forEach(item->{ RUploadMainMonitorDataDTO rUploadMainMonitorDataDTO = new RUploadMainMonitorDataDTO(); BeanUtil.copyProperties(item,rUploadMainMonitorDataDTO); @@ -184,57 +252,6 @@ public class RUploadMainMonitorServiceImpl extends ServiceImpl> list = CollUtil.split(rUploadMainMonitorDataDTOList,100); - for(int i=0;i sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.COMM_POINT); - List ids = list.get(i).stream().map(RUploadMainMonitorDataDTO::getObjId).collect(Collectors.toList()); - int count = GwSendUtil.returnInfoMsg(ids,sendRes); - System.out.println("上送成功,上送成功返回"+count+"条"); - if(count == list.get(i).size()){ - LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); - lambdaUpdateWrapper.set(RUploadMainMonitorData::getUploadStatus,1).in(RUploadMainMonitorData::getObjId,ids); - this.update(lambdaUpdateWrapper); - } - } - return true; - } - - - - private void assOrg(Map pvTerminalTreeVOCodeMap,Map pvTerminalTreeVOIdMap,RUploadMainMonitorDataDTO rUploadMainMonitorDataDTO,Monitor monitor){ - PvTerminalTreeVO pvTerminalTreeVO = pvTerminalTreeVOCodeMap.get(monitor.getOrgId()); - rUploadMainMonitorDataDTO.setMaintOrg(pvTerminalTreeVO.getCode()); - rUploadMainMonitorDataDTO.setMaintOrgName(pvTerminalTreeVO.getName()); - - PvTerminalTreeVO pvTerminalTreeCity = pvTerminalTreeVOIdMap.get(pvTerminalTreeVO.getPid()); - rUploadMainMonitorDataDTO.setCityOrg(pvTerminalTreeCity.getCode()); - rUploadMainMonitorDataDTO.setCityOrgName(pvTerminalTreeCity.getName()); - - PvTerminalTreeVO pvTerminalTreeProvince = pvTerminalTreeVOIdMap.get(pvTerminalTreeCity.getPid()); - rUploadMainMonitorDataDTO.setProvinceOrg(pvTerminalTreeProvince.getCode()); - rUploadMainMonitorDataDTO.setProvinceOrgName(pvTerminalTreeProvince.getName()); }