Merge branch 'energy-manage-chy'

energy-manage-service/src/main/java/com/energy/manage/service/controller/analysis/AnalysisController.java

@@ -40,24 +40,24 @@ public class AnalysisController extends BaseServiceController {
     private AnalysisService analysisService;
 
 
-//    @UserLoginToken
-//    @ApiOperation(value = "分析结果列表")
-//    @GetMapping("/analysisResultList")
-//    public ResultResp<Page<AnalysisResultVo>> analysisResultList(AnalysisResultDto analysisResultDto)
-//    {
-//        analysisResultDto.setRoleId(getRoleId());
-//        return pageResult(analysisService.analysisResultList(analysisResultDto),analysisResultDto);
-//    }
-
     @UserLoginToken
     @ApiOperation(value = "分析结果列表")
     @GetMapping("/analysisResultList")
-    public ResultResp<Page<WindFieldPO>> analysisResultList(AnalysisResultDto analysisResultDto)
+    public ResultResp<Page<AnalysisResultVo>> analysisResultList(AnalysisResultDto analysisResultDto)
     {
         analysisResultDto.setRoleId(getRoleId());
-        return success(analysisService.analysisResultList(analysisResultDto));
+        return pageResult(analysisService.analysisResultList(analysisResultDto),analysisResultDto);
     }
 
+//    @UserLoginToken
+//    @ApiOperation(value = "分析结果列表")
+//    @GetMapping("/analysisResultList")
+//    public ResultResp<Page<WindFieldPO>> analysisResultList(AnalysisResultDto analysisResultDto)
+//    {
+//        analysisResultDto.setRoleId(getRoleId());
+//        return success(analysisService.analysisResultList(analysisResultDto));
+//    }
+
     @UserLoginToken
     @ApiOperation(value = "风场下所有的分析编号")
     @GetMapping("/analysisResultListByFieldCode")

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/AnalysisService.java

@@ -28,7 +28,7 @@ public interface AnalysisService {
      * @param analysisResultDto
      * @return
      */
-//    List<AnalysisResultVo> analysisResultList(AnalysisResultDto analysisResultDto);
+    List<AnalysisResultVo> analysisResultList(AnalysisResultDto analysisResultDto);
 
 
 
@@ -37,7 +37,7 @@ public interface AnalysisService {
      * @param analysisResultDto
      * @return
      */
-    Page<WindFieldPO> analysisResultList(AnalysisResultDto analysisResultDto);
+//    Page<WindFieldPO> analysisResultList(AnalysisResultDto analysisResultDto);
 
     /**
      * 根据风场查询分析结果

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -183,23 +183,23 @@ public class AnalysisServiceImpl implements AnalysisService {
      * @param analysisResultDto
      * @return
      */
-//    @Override
-//    public List<AnalysisResultVo> analysisResultList(AnalysisResultDto analysisResultDto) {
-//        List<AnalysisResultVo> resultVos = analysisResultMapper.selectByCondition(analysisResultDto);
-//        resultVos.stream().forEach(item -> item.setReportVos(resultReportMapper.selectByBatchCode(item.getBatchCode())));
-//        return resultVos;
-//    }
-
     @Override
-    public Page<WindFieldPO> analysisResultList(AnalysisResultDto analysisResultDto){
-        int pageNum = analysisResultDto.getPageNum();
-        int pageSize = analysisResultDto.getPageSize();
-        PageHelper.startPage(pageNum, pageSize);
-        List<WindFieldPO> resultVos = analysisResultMapper.selectFieldCode(analysisResultDto);
-        Long total = org.apache.commons.collections.CollectionUtils.isEmpty(resultVos) ? 0L : new PageInfo<>(resultVos).getTotal();
-        return Page.build(pageNum, pageSize, total, resultVos);
+    public List<AnalysisResultVo> analysisResultList(AnalysisResultDto analysisResultDto) {
+        List<AnalysisResultVo> resultVos = analysisResultMapper.selectByCondition(analysisResultDto);
+        resultVos.stream().forEach(item -> item.setReportVos(resultReportMapper.selectByBatchCode(item.getBatchCode())));
+        return resultVos;
     }
 
+//    @Override
+//    public Page<WindFieldPO> analysisResultList(AnalysisResultDto analysisResultDto){
+//        int pageNum = analysisResultDto.getPageNum();
+//        int pageSize = analysisResultDto.getPageSize();
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<WindFieldPO> resultVos = analysisResultMapper.selectFieldCode(analysisResultDto);
+//        Long total = org.apache.commons.collections.CollectionUtils.isEmpty(resultVos) ? 0L : new PageInfo<>(resultVos).getTotal();
+//        return Page.build(pageNum, pageSize, total, resultVos);
+//    }
+
     @Override
     public List<AnalysisResultVo> analysisResultListByAnalysisCode(String fieldCode){
         List<AnalysisResultVo> resultVos = analysisResultMapper.selectByFieldCode(fieldCode);