diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java index 6d4fe8d79..f67c2ae27 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java @@ -8,6 +8,7 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.device.biz.pojo.dto.PollutionLineDTO; import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO; +import com.njcn.harmonic.pojo.excel.pollution.LinePollution; import com.njcn.harmonic.pojo.param.HarmonicPublicParam; import com.njcn.harmonic.pojo.param.PollutionSubstationQuryParam; import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; @@ -122,14 +123,16 @@ public class PollutionSubstationController extends BaseController { } @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation(value ="导出监测点谐波污染值",produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) + @ApiOperation(value ="监测点谐波污染值列表",produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) @GetMapping(value ="/downPollutionLineCalc",produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) - public void downPollutionLineCalc(@RequestParam(value = "startTime") String startTime, + public HttpResult> downPollutionLineCalc(@RequestParam(value = "startTime") String startTime, @RequestParam(value = "endTime") String endTime) { + String methodDescribe = getMethodDescribe("getSubstationInfo"); StatSubstationBizBaseParam param=new StatSubstationBizBaseParam(); param.setStartTime(startTime); param.setEndTime(endTime); - pollutionSubstationService.downPollutionLineCalc(param); + List linePollutions = pollutionSubstationService.downPollutionLineCalc(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, linePollutions, methodDescribe); } @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -153,4 +156,6 @@ public class PollutionSubstationController extends BaseController { param.setEndTime(endTime); pollutionSubstationService.downPollutionSubCalc(param); } + + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/PollutionSubstationService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/PollutionSubstationService.java index a11b32496..79aa17be3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/PollutionSubstationService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/PollutionSubstationService.java @@ -7,6 +7,7 @@ import com.njcn.device.biz.pojo.dto.PollutionLineDTO; import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO; import com.njcn.device.pq.pojo.param.GridDiagramParam; import com.njcn.device.pq.pojo.vo.GridDiagramVO; +import com.njcn.harmonic.pojo.excel.pollution.LinePollution; import com.njcn.harmonic.pojo.param.HarmonicPublicParam; import com.njcn.harmonic.pojo.param.PollutionSubstationQuryParam; import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; @@ -95,7 +96,7 @@ public interface PollutionSubstationService extends IService downPollutionLineCalc(StatSubstationBizBaseParam param); /** * 导出用户谐波电压污染值 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java index df4d3a45b..291b8b293 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java @@ -971,7 +971,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl downPollutionLineCalc(StatSubstationBizBaseParam param) { String startDate = DateUtil.beginOfDay(DateUtil.parse(param.getStartTime())).toString(); String endDate = DateUtil.endOfDay(DateUtil.parse(param.getEndTime())).toString(); List finalLinePollutionList = pollutionCalcList(startDate, endDate); @@ -979,9 +979,11 @@ public class PollutionSubstationServiceImpl extends ServiceImpl pollutionCalcList(String startDate,String endDate) { List linePollutionList = new ArrayList<>(); List lineIdList = commTerminalGeneralClient.getRunMonitorIds().getData();