污染值列表

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<List<LinePollution>> 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<LinePollution> 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);
     }
+
+
 }

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<RStatPollutionSubst
      * 导出监测点谐波污染值
      * @param param
      */
-    void downPollutionLineCalc(StatSubstationBizBaseParam param);
+    List<LinePollution> downPollutionLineCalc(StatSubstationBizBaseParam param);
 
     /**
      * 导出用户谐波电压污染值

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java

@@ -971,7 +971,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
     }
 
     @Override
-    public void downPollutionLineCalc(StatSubstationBizBaseParam param) {
+    public List<LinePollution> downPollutionLineCalc(StatSubstationBizBaseParam param) {
         String startDate = DateUtil.beginOfDay(DateUtil.parse(param.getStartTime())).toString();
         String endDate = DateUtil.endOfDay(DateUtil.parse(param.getEndTime())).toString();
         List<LinePollution> finalLinePollutionList = pollutionCalcList(startDate, endDate);
@@ -979,9 +979,11 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
          finalLinePollutionList = finalLinePollutionList.stream()
                 .sorted(Comparator.comparing(LinePollution::getVHarmonicValue).reversed())
                 .collect(Collectors.toList());
-        ExcelUtil.exportExcel("监测点谐波电压污染值" + endDate + ".xlsx", LinePollution.class, finalLinePollutionList);
+         return finalLinePollutionList;
     }
 
+
+
     private List<LinePollution> pollutionCalcList(String startDate,String endDate) {
         List<LinePollution> linePollutionList = new ArrayList<>();
         List<String> lineIdList = commTerminalGeneralClient.getRunMonitorIds().getData();