新增：分析结果风场列表

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

@@ -49,14 +49,14 @@ public class AnalysisController extends BaseServiceController {
         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("/analysisResulFieldList")
+    public ResultResp<Page<WindFieldPO>> analysisResulFieldList(AnalysisResultDto analysisResultDto)
+    {
+        analysisResultDto.setRoleId(getRoleId());
+        return success(analysisService.analysisResulFieldList(analysisResultDto));
+    }
 
     @UserLoginToken
     @ApiOperation(value = "风场下所有的分析编号")

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

@@ -33,11 +33,11 @@ public interface AnalysisService {
 
 
     /**
-     * 分析结果列表
+     * 分析结果风场列表
      * @param analysisResultDto
      * @return
      */
-//    Page<WindFieldPO> analysisResultList(AnalysisResultDto analysisResultDto);
+    Page<WindFieldPO> analysisResulFieldList(AnalysisResultDto analysisResultDto);
 
     /**
      * 根据风场查询分析结果

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

@@ -190,15 +190,15 @@ public class AnalysisServiceImpl implements AnalysisService {
         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 Page<WindFieldPO> analysisResulFieldList(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){