Merge remote-tracking branch 'origin/master'

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/WindSpeedPointInfoServiceController.java

@@ -78,6 +78,7 @@ public class WindSpeedPointInfoServiceController {
     return ResponseVO.success(this.windSpeedPointInfoService.getBySpeed(page, size, speed));
   }
 
+  //TODO 参数过多，建议使用post请求
   @GetMapping(value = "/bySomeConditions/{page}/{size}/{fanNumber}/{wind}/{speed}/{unitBelongs}/{belong}")
   public ResponseVO getBySomeConditions(@PathVariable("page") Integer page,
                         @PathVariable("size") Integer size,

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/NwpService.java

@@ -253,6 +253,7 @@ public class NwpService extends BaseService {
   }
 
 
+  //todo 注释，方法作用 用于何处，写清楚
   public Map<String, Object> getWindCompare(Long startTime, Long endTime) throws BusinessException {
     Map<String,Object> map = new HashMap<>();
 
@@ -260,15 +261,19 @@ public class NwpService extends BaseService {
     List<Nwp> nwpList = new ArrayList<>();
     Map<String,Object> nwpDatas = new LinkedHashMap<>();
     List<Nwp> nwpCheckList = new ArrayList<>();
+    //todo 排序可以在查询中做
     nwpList = nwpRepository.findByPreTimeBetween(startTime, endTime);
     nwpList.sort(Comparator.comparing(Nwp::getPreTime));
 
     List<WindTowerStatusData> windTowerStatusDataList = new ArrayList<>();
     Map<String,Object> windTowerStatusDataDatas = new LinkedHashMap<>();
     List<WindTowerStatusData> windTowerStatusDataCheckList = new ArrayList<>();
+    //todo 排序可以在查询中做
     windTowerStatusDataList = windTowerStatusDataRepository.findByTimeBetween(new Date(startTime), new Date(endTime));
     windTowerStatusDataList.sort(Comparator.comparing(WindTowerStatusData::getTime));
 
+    //todo 页面传参直接限制为整15分是否可以解决这块代码？
+
     long startTimeLong  = startTime;
     long endTimeLong  = endTime;
     long timeStep = 900000L;
@@ -278,13 +283,14 @@ public class NwpService extends BaseService {
 
     for(long i = startTimeLong;i<endTimeLong;i=i+timeStep){
       long finalI = i;
+      //TODO 每次循环 nwpList都会遍历过滤一遍 性能影响？
       List<Nwp> nwp = nwpList.stream().filter(t -> t.getPreTime() == finalI).collect(Collectors.toList());
       if (nwp != null && nwp.size() > 0) {
         nwpCheckList.add(nwp.get(0));
       }else{
         nwpCheckList.add(new Nwp());
       }
-
+      //TODO 每次循环 windTowerStatusDataList都会遍历过滤一遍 性能影响？
       List<WindTowerStatusData> wtsd = windTowerStatusDataList.stream().filter(t -> t.getTime().getTime() == finalI).collect(Collectors.toList());
       if (wtsd != null && wtsd.size() > 0) {
         windTowerStatusDataCheckList.add(wtsd.get(0));
@@ -293,11 +299,13 @@ public class NwpService extends BaseService {
       }
 
     }
+    //TODO 此处过滤是否有意义，页面null如何显示，直接忽略断点是否可以？
     this.defaultReplace(nwpCheckList);
     this.defaultRealReplace(windTowerStatusDataCheckList);
 
     ElectricField electricField = this.getElectricField();
 
+    //TODO 这一堆放上面有意义吗？
     List<BigDecimal> wd10 = new ArrayList<>();
     List<BigDecimal> wd30 = new ArrayList<>();
     List<BigDecimal> wd50 = new ArrayList<>();
@@ -316,6 +324,7 @@ public class NwpService extends BaseService {
     List<BigDecimal> wdInst100 = new ArrayList<>();
     List<BigDecimal> wdInst170 = new ArrayList<>();
 
+    //TODO 此处判断意义？光伏站什么情况-页面为空？合理吗
     if(electricField.getElectricFieldTypeEnum().getCode() == 2){
       wd10 = nwpCheckList.stream().map(Nwp::getWd10).collect(Collectors.toList());
       wd30 = nwpCheckList.stream().map(Nwp::getWd30).collect(Collectors.toList());
@@ -373,7 +382,7 @@ public class NwpService extends BaseService {
 
     }
 
-
+    //todo 页面显示标题？是否可转为中文展示
     String[] nameList = {"N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE", "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW"};
 
     map.put("nwpDatas", nwpDatas);

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/WindSpeedPointInfoService.java

@@ -107,6 +107,7 @@ public class WindSpeedPointInfoService {
 
   public Page<WindSpeedPointInfo> getBySomeConditions(Integer page, Integer size, String fanNumber,String wind,
                                                  String speed, String unitBelongs, String belong){
+    //TODO 这个map干啥的？
     Map<String, Object> map = new HashMap<>();
     String nFanNumber = "null";
     if(!fanNumber.equals("null")){
@@ -116,6 +117,7 @@ public class WindSpeedPointInfoService {
     Specification<WindSpeedPointInfo> specification = this.specificationBySomeConditions(nFanNumber, wind, speed, unitBelongs, belong);
     Pageable pageable = PageRequest.of(page - 1, size);
     Page<WindSpeedPointInfo> windSpeedPointInfos = windSpeedPointInfoRepository.findAll(specification, pageable);
+    //TODO 没用的就删掉
 //    List<WindSpeedPointInfo> windSpeedPointInfos = windSpeedPointInfoRepository.findAll(specification);
 //    List<WindSpeedPointInfo> windSpeedPointInfoList = windSpeedPointInfos.getContent();
 //    map.put("content", windSpeedPointInfos);
@@ -140,6 +142,7 @@ public class WindSpeedPointInfoService {
   }
 
 
+  //TODO 干啥用的写明白
   Specification<WindSpeedPointInfo> specificationBySomeConditions(final String fanNumber,final String wind,
                                                                   final String speed, final String unitBelongs,
                                                                   final String belong) {
@@ -175,6 +178,7 @@ public class WindSpeedPointInfoService {
 //      if (predicates.isEmpty()) {
 //        return cb.isNotNull(root.get("id"));
 //      }
+      //TODO 下面这注释对吗？
       //添加排序的功能
       return cb.and(predicates.toArray(new Predicate[predicates.size()]));