去掉作假数据

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/controller/benching/BenchmarkingController.java

@@ -6,7 +6,6 @@ import com.gyee.benchmarkingweb.init.CacheContext;
 import com.gyee.benchmarkingweb.model.auto.*;
 import com.gyee.benchmarkingweb.service.benching.BenchmarkingService;
 import com.gyee.common.model.StringUtils;
-import com.gyee.common.util.RandomUtil;
 import com.gyee.common.util.SortUtils;
 import com.gyee.common.vo.benchmark.FjjxbVo;
 import com.gyee.common.vo.benchmark.FjjxbmxVo;
@@ -507,60 +506,39 @@ public class BenchmarkingController {
                           @RequestParam(value = "foreigntype",required = true)String foreigntype) throws Exception {
         List<Benchmark> resultList =  benchmarkingService.dbmainbottom(timetype,foreigntype);
 
-        if (timetype.equals("月")){
-            resultList.stream().forEach(i->{
-                if (i.getForeignkeyid().equals("MHS_FDC")){
-                    i.setComprehensiverate(1.06);
-                }else if(i.getForeignkeyid().equals("NSS_FDC")){
-                    i.setComprehensiverate(1.52);
-                }else if(i.getForeignkeyid().equals("QS_FDC")){
-                    i.setComprehensiverate(1.37);
-                }else if(i.getForeignkeyid().equals("SBQ_FDC")){
-                    i.setComprehensiverate(1.68);
-                }else if(i.getForeignkeyid().equals("XS_FDC")){
-                    i.setComprehensiverate(0.82);
-                }
-                i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
-            });
-        }
-        if (timetype.equals("年")){
-            resultList.stream().forEach(i->{
-                if (i.getForeignkeyid().equals("MHS_FDC")){
-                    i.setComprehensiverate(2.06);
-                }else if(i.getForeignkeyid().equals("NSS_FDC")){
-                    i.setComprehensiverate(1.62);
-                }else if(i.getForeignkeyid().equals("QS_FDC")){
-                    i.setComprehensiverate(1.37);
-                }else if(i.getForeignkeyid().equals("SBQ_FDC")){
-                    i.setComprehensiverate(0.68);
-                }else if(i.getForeignkeyid().equals("XS_FDC")){
-                    i.setComprehensiverate(1.82);
-                }
-                i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
-            });
-            if (timetype.equals("年")){
-                resultList.stream().forEach(i->{
-                    if (i.getForeignkeyid().equals("MHS_FDC")){
-                        i.setComprehensiverate(1.06);
-                    }else if(i.getForeignkeyid().equals("NSS_FDC")){
-                        i.setComprehensiverate(0.62);
-                    }else if(i.getForeignkeyid().equals("QS_FDC")){
-                        i.setComprehensiverate(2.37);
-                    }else if(i.getForeignkeyid().equals("SBQ_FDC")){
-                        i.setComprehensiverate(1.68);
-                    }else if(i.getForeignkeyid().equals("XS_FDC")){
-                        i.setComprehensiverate(1.82);
-                    }
-                    i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                    i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                    i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                });
-            }
-        }
+//        if (timetype.equals("月")){
+//            resultList.stream().forEach(i->{
+//
+//                i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
+//                i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
+//                i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
+//            });
+//        }
+//        if (timetype.equals("年")){
+//            resultList.stream().forEach(i->{
+//                i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
+//                i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
+//                i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
+//            });
+//            if (timetype.equals("年")){
+//                resultList.stream().forEach(i->{
+//                    if (i.getForeignkeyid().equals("MHS_FDC")){
+//                        i.setComprehensiverate(1.06);
+//                    }else if(i.getForeignkeyid().equals("NSS_FDC")){
+//                        i.setComprehensiverate(0.62);
+//                    }else if(i.getForeignkeyid().equals("QS_FDC")){
+//                        i.setComprehensiverate(2.37);
+//                    }else if(i.getForeignkeyid().equals("SBQ_FDC")){
+//                        i.setComprehensiverate(1.68);
+//                    }else if(i.getForeignkeyid().equals("XS_FDC")){
+//                        i.setComprehensiverate(1.82);
+//                    }
+//                    i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
+//                    i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
+//                    i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
+//                });
+//            }
+//        }
         Map<String, Windpowerstation> wpmap = CacheContext.wpmap;
         resultList.stream().forEach(i->{
             i.setOrderno(wpmap.get(i.getForeignkeyid()).getOrdernum());
@@ -586,30 +564,30 @@ public class BenchmarkingController {
     public R dbmaintop(@RequestParam(value = "timetype",required = true)String timetype,
                           @RequestParam(value = "foreigntype",required = true)String foreigntype) throws Exception {
         List<Benchmark> resultList =  benchmarkingService.dbmaintop(timetype,foreigntype);
-        if (timetype.equals("月")){
-            resultList.stream().forEach(i->{
-                if (i.getForeignkeyid().equals("实际")){
-                    i.setComprehensiverate(1.32);
-                }
-                if (i.getForeignkeyid().equals("基准")){
-                    i.setComprehensiverate(1.60);
-                }
-                i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
-            });
-        }
-        if (timetype.equals("年")){
-            resultList.stream().forEach(i->{
-                if (i.getForeignkeyid().equals("实际")){
-                    i.setComprehensiverate(1.42);
-                }
-                if (i.getForeignkeyid().equals("基准")){
-                    i.setComprehensiverate(1.50);
-                }
-
-            });
-        }
+//        if (timetype.equals("月")){
+//            resultList.stream().forEach(i->{
+//                if (i.getForeignkeyid().equals("实际")){
+//                    i.setComprehensiverate(1.32);
+//                }
+//                if (i.getForeignkeyid().equals("基准")){
+//                    i.setComprehensiverate(1.60);
+//                }
+//                i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
+//                i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
+//                i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
+//            });
+//        }
+//        if (timetype.equals("年")){
+//            resultList.stream().forEach(i->{
+//                if (i.getForeignkeyid().equals("实际")){
+//                    i.setComprehensiverate(1.42);
+//                }
+//                if (i.getForeignkeyid().equals("基准")){
+//                    i.setComprehensiverate(1.50);
+//                }
+//
+//            });
+//        }
         if (StringUtils.isNotNull(resultList)) {
             return R.ok(resultList.size()).data(resultList);
         }else{

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/service/benching/BenchmarkingService.java

@@ -8,7 +8,6 @@ import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.*;
 import com.gyee.common.vo.benchmark.*;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -1968,8 +1967,8 @@ public class BenchmarkingService {
         }else if(timetype.equals("年")){
             begin = DateUtils.getYearBegin(end);
         }
-        begin = DateUtils.addYears(begin,-5);
-        end = DateUtils.addYears(end,-5);
+        begin = DateUtils.addYears(begin,-1);
+        end = DateUtils.addYears(end,-1);
         qw.ge("recorddate",begin).le("recorddate",end);
         List<Benchmark> jzList = benchmarkService.list(qw);
         if (StringUtils.isNotNull(jzList)  && StringUtils.isNotEmpty(jzList)){

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/service/specific/SpecificService.java

@@ -40,7 +40,8 @@ public class SpecificService {
      */
     public List<SpecificTopVo> maintoplist(String yearmonth) throws ParseException {
         List<SpecificTopVo> resultList = new ArrayList<>();
-        Date date = DateUtils.parseDate3(yearmonth);
+        Date date = DateUtils.parseDate(yearmonth+"-01");
+        String[] split = yearmonth.split("-");
         Calendar c = Calendar.getInstance();
         c.setTime(date);
         Integer year = c.get(Calendar.YEAR);
@@ -291,7 +292,7 @@ public class SpecificService {
      */
     public Map<String,List<SpecificCenterVo>> maincenterlist(String yearmonth) throws ParseException {
         Map<String, Windpowerstation> wpmap = CacheContext.wpmap;
-        Date date = DateUtils.parseDate3(yearmonth);
+        Date date = DateUtils.parseDate(yearmonth+"-01");
         Calendar  c= Calendar.getInstance();
         c.setTime(date);
         int year = c.get(Calendar.YEAR);