更新提交

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/controller/BenchmarkingController.java

@@ -46,6 +46,26 @@ public class BenchmarkingController {
             return R.error().message("访问失败");
         }
     }
+
+
+    /**
+     * GF场站列表
+     * @return
+     */
+    @GetMapping("/wpgflist")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R wpGFlist(){
+        List<Windpowerstation> resultList = benchmarkingService.wpGFList();
+
+        if (StringUtils.isNotNull(resultList)) {
+            SortUtils.sort(resultList,"ordernum",SortUtils.ASC);
+            return R.ok(resultList.size()).data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
     /**
      * 根据场站查询
      * 项目列表

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/controller/auto/OperationrecordController.java

@@ -17,7 +17,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author 谢生杰
@@ -28,28 +28,41 @@ import java.util.Map;
 public class OperationrecordController {
     @Autowired
     private OperationrecordServiceImpl operationrecordService;
+
     @GetMapping("/czlb")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
-    public R czlb(@RequestParam(value = "WindPowerStation",required = true)String WindPowerStation,
-                     @RequestParam( value ="wtid",required = false)String wtid,
-                     @RequestParam(value = "beginDate",required = false) String beginDate,
-                     @RequestParam(value = "endDate",required = true) String endDate){
+    public R czlb(@RequestParam(value = "windPowerStation", required = false) String windPowerStation,
+                  @RequestParam(value = "wtid", required = false) String wtid,
+                  @RequestParam(value = "beginDate", required = false) String beginDate,
+                  @RequestParam(value = "endDate", required = false) String endDate) {
+
+        List<Map> Map = operationrecordService.listBy(windPowerStation, wtid, DateUtils.parseDate(beginDate), DateUtils.parseDate(endDate));
+
+        if (StringUtils.isNotNull(Map)) {
+            return R.ok(Map.size()).data(Map);
+        } else {
+            return R.error().message("访问失败");
+        }
 
-        List<Map> Map = operationrecordService.listBy(WindPowerStation,wtid,DateUtils.parseDate(beginDate),DateUtils.parseDate(endDate));
-        return R.ok(Map.size()).data(Map);
     }
 
     @GetMapping("/zhlb")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
-    public R zhlb(@RequestParam(value = "WindPowerStation",required = true)String WindPowerStation,
-                  @RequestParam( value ="wtid",required = false)String wtid,
-                  @RequestParam(value = "beginDate",required = false) String beginDate,
-                  @RequestParam(value = "endDate",required = true) String endDate){
+    public R zhlb(@RequestParam(value = "WindPowerStation", required = false) String WindPowerStation,
+                  @RequestParam(value = "wtid", required = false) String wtid,
+                  @RequestParam(value = "beginDate", required = false) String beginDate,
+                  @RequestParam(value = "endDate", required = false) String endDate) {
+
+        List<Map> Map = operationrecordService.conversion(WindPowerStation, wtid, DateUtils.parseDate(beginDate), DateUtils.parseDate(endDate));
+
+        if (StringUtils.isNotNull(Map)) {
+            return R.ok(Map.size()).data(Map);
+        } else {
+            return R.error().message("访问失败");
+        }
 
-        List<Map> Map = operationrecordService.conversion(WindPowerStation,wtid,DateUtils.parseDate(beginDate),DateUtils.parseDate(endDate));
-        return R.ok(Map.size()).data(Map);
     }
 
 }

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/mapper/auto/OperationrecordMapper.java

@@ -21,9 +21,22 @@ public interface OperationrecordMapper extends BaseMapper<Operationrecord> {
     @Select("select * from operationrecord where time>=#{begin} and time <=#{end} ")
     public List<Operationrecord> listByBeginAndEnd(@Param(value = "begin") Date begin, @Param(value = "end")Date end);
 
-    @Select(" select s.name,o.wtid,o.id,w.windpowerstationid,o.time,o.value from operationrecord o left join windturbine w on w.id = o.wtid left join WindPowerStation s on s.id = w.windpowerstationid where w.windpowerstationid = #{WindPowerStation} and o.wtid = #{wtid} and o.time >=#{beginDate} and o.time <=#{endDate}")
-    public List<Map> listBy(@Param(value = "WindPowerStation") String WindPowerStation,@Param(value = "wtid")String wtid,
-                                @Param(value = "beginDate")Date beginDate,@Param(value = "endDate")Date endDate);
+
+    @Select({" <script> "
+            + " select s.name, o.wtid, o.id, w.windpowerstationid, o.time, o.value from operationrecord o  left join windturbine w on w.id = o.wtid left join WindPowerStation s on s.id = w.windpowerstationid "
+            + " WHERE 1=1 "
+            + " <if  test='WindPowerStation!=null'> "
+            + " AND w.windpowerstationid = #{WindPowerStation} "
+            + " </if> "
+            + " <if  test='wtid!=null'> "
+            + " AND o.wtid = #{wtid} "
+            + " </if> "
+            + " <if  test='beginDate!=null and null !=endDate '> "
+            + " AND o.time &gt;= #{beginDate}  and o.time &lt;= #{endDate} "
+            + " </if> "
+            + " </script> "})
+    public List<Map> listBy(@Param(value = "WindPowerStation") String WindPowerStation, @Param(value = "wtid") String wtid,
+                            @Param(value = "beginDate") Date beginDate, @Param(value = "endDate") Date endDate);
 
     @Select(" select s.name,o.wtid,o.id,w.windpowerstationid,o.time,o.value from operationrecord o left join windturbine w on w.id = o.wtid left join WindPowerStation s on s.id = w.windpowerstationid where w.windpowerstationid = #{WindPowerStation} and o.wtid = #{wtid} and o.time >=#{beginDate} and o.time <=#{endDate}")
     public List<Map> conversion(@Param(value = "WindPowerStation") String WindPowerStation,@Param(value = "wtid")String wtid,

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/BenchmarkingService.java

@@ -687,6 +687,17 @@ public class BenchmarkingService  {
     }
 
     /**
+     * GF场站列表
+     * @return
+     */
+    public List<Windpowerstation> wpGFList() {
+
+        List<Windpowerstation> wplist = CacheContext.wplist.stream().filter(i->i.getId().endsWith("GDC") && i.getCompanyid().equals("NXGD_GS")).collect(Collectors.toList());
+        return wplist;
+
+    }
+
+    /**
      * 根据场站查询风机列表
      * @param wpid
      * @return

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/impl/OperationrecordServiceImpl.java

@@ -1,13 +1,9 @@
 package com.gyee.benchmarkingimpala.service.auto.impl;
 
-import com.gyee.benchmarkingimpala.model.auto.Benchmarkingbetween;
 import com.gyee.benchmarkingimpala.model.auto.Operationrecord;
 import com.gyee.benchmarkingimpala.mapper.auto.OperationrecordMapper;
-import com.gyee.benchmarkingimpala.model.auto.Windpowerstation;
-import com.gyee.benchmarkingimpala.model.auto.Windturbinetestingpointai2;
 import com.gyee.benchmarkingimpala.service.auto.IOperationrecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -33,40 +29,34 @@ public class OperationrecordServiceImpl extends ServiceImpl<OperationrecordMappe
     public List<Map> listBy (String WindPowerStation,String wtid,Date beginDate, Date endDate) {
         List<Map> map = operationrecordMapper.listBy(WindPowerStation,wtid,beginDate,endDate);
 
-//        for (int i = 0;i<map.size();i++) {
-//            map.get(i).put("ConversionName",Statedescription(map.get(i).get("VALUE").toString()));
-//        }
-
-
         List<Map> conversiontype = new ArrayList<Map>();
 
         for (int i = 0;i<map.size();i++) {
             Map<String, String> maps = new HashMap<>();
             maps.put("zhsj",map.get(i).get("TIME").toString());//时间
-            maps.put("ConversionName",Statedescription(map.get(i).get("VALUE").toString()));//状态描述
+            maps.put("ConversionName", stateDescriPtion(map.get(i).get("VALUE").toString()));//状态描述
             maps.put("wtid",map.get(i).get("WTID").toString());
             maps.put("name",map.get(i).get("NAME").toString());
             maps.put("id",map.get(i).get("ID").toString());
             maps.put("windpowerstationid",map.get(i).get("WINDPOWERSTATIONID").toString());
             conversiontype.add(maps);
         }
-
         return conversiontype;
 
     }
 
     public List<Map> conversion (String WindPowerStation,String wtid,Date beginDate, Date endDate) {
-        List<Map> map = operationrecordMapper.conversion(WindPowerStation,wtid,beginDate,endDate);
+        List<Map> map = operationrecordMapper.listBy(WindPowerStation,wtid,beginDate,endDate);
 
         List<Map> conversiontype = new ArrayList<Map>();
 
         for (int i = 0;i<map.size()-1;i++) {
             Map<String, String> maps = new HashMap<>();
             maps.put("zhsj",map.get(i).get("TIME").toString());//转换时间
-//            maps.put("beforeConversion",map.get(i).get("VALUE").toString());//转换前状态
-            maps.put("beforeConversionName",Statedescription(map.get(i).get("VALUE").toString()));//转换前状态描述
-//            maps.put("AfterConversion",map.get(i+1).get("VALUE").toString());//转换后状态
-            maps.put("AfterConversionName",Statedescription(map.get(i+1).get("VALUE").toString()));//转换后状态描述
+            maps.put("beforeConversion",map.get(i).get("VALUE").toString());//转换前状态
+            maps.put("beforeConversionName", stateDescriPtion(map.get(i).get("VALUE").toString()));//转换前状态描述
+            maps.put("AfterConversion",map.get(i+1).get("VALUE").toString());//转换后状态
+            maps.put("AfterConversionName", stateDescriPtion(map.get(i+1).get("VALUE").toString()));//转换后状态描述
             maps.put("wtid",map.get(i).get("WTID").toString());
             maps.put("name",map.get(i).get("NAME").toString());
             maps.put("id",map.get(i).get("ID").toString());
@@ -78,7 +68,7 @@ public class OperationrecordServiceImpl extends ServiceImpl<OperationrecordMappe
     }
 
 
-    public  static String Statedescription(String code) {
+    public  static String stateDescriPtion(String code) {
 
 
         String  name = "VALUE";
@@ -121,6 +111,7 @@ public class OperationrecordServiceImpl extends ServiceImpl<OperationrecordMappe
                 name = "取消挂牌";
                 break;
             default:
+                break;
 
         }
         return name;

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/BenchmarkController.java

@@ -1,13 +1,22 @@
 package com.gyee.gradeevaluation.controller.auto;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.gradeevaluation.config.R;
+import com.gyee.gradeevaluation.model.auto.Benchmark;
+import com.gyee.gradeevaluation.model.auto.Windpowerinfoday;
+import com.gyee.gradeevaluation.service.auto.IBenchmarkService;
+import com.gyee.gradeevaluation.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author 谢生杰
@@ -17,4 +26,25 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("//benchmark")
 public class BenchmarkController {
 
+
+    @Autowired
+    private IBenchmarkService benchmarkService;
+
+    /**
+     * 主要指标
+     * @param windPowerStation
+     * @return
+     */
+    @GetMapping("/zyzb")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R zyzb(@RequestParam(value = "windPowerStation", required = false) String windPowerStation) {
+
+        List<Map> resultlist = benchmarkService.zyzb(windPowerStation);
+
+        return R.ok().data(resultlist);
+
+    }
+
+
 }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/auto/IBenchmarkService.java

@@ -3,6 +3,9 @@ package com.gyee.gradeevaluation.service.auto;
 import com.gyee.gradeevaluation.model.auto.Benchmark;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBenchmarkService extends IService<Benchmark> {
 
+
+    public List<Map> zyzb(String windPowerStation);
+
 }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/auto/impl/BenchmarkServiceImpl.java

@@ -1,14 +1,21 @@
 package com.gyee.gradeevaluation.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.gradeevaluation.config.R;
 import com.gyee.gradeevaluation.model.auto.Benchmark;
 import com.gyee.gradeevaluation.mapper.auto.BenchmarkMapper;
 import com.gyee.gradeevaluation.service.auto.IBenchmarkService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.gradeevaluation.util.BigDecimalUtils;
+import com.gyee.gradeevaluation.util.DateUtils;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.*;
+
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 谢生杰
@@ -17,4 +24,39 @@ import org.springframework.stereotype.Service;
 @Service
 public class BenchmarkServiceImpl extends ServiceImpl<BenchmarkMapper, Benchmark> implements IBenchmarkService {
 
+    @Override
+    public List<Map> zyzb(String windPowerStation) {
+        Date monthFirst = DateUtils.getMonthFirst(new Date());
+        Date monthLast = DateUtils.getMonthLast(new Date());
+        QueryWrapper<Benchmark> wrapper = new QueryWrapper<>();
+        wrapper.select("foreignkeyid, sum(actualpower) actualpower," +
+                "sum(theoreticalpower) theoreticalpower," +
+                "avg(comprehensiverate) comprehensiverate," +
+                "sum(utilizationhours) utilizationhours," +
+                "avg(availability) availability," +
+                " sum(mtbf) mtbf,sum(mttr) mttr");
+        if (null != windPowerStation && !"".equals(windPowerStation)) {
+            wrapper.eq("foreignkeyid", windPowerStation);
+        }
+        wrapper.ge("recorddate", monthFirst).le("recorddate", monthLast);
+        wrapper.groupBy("foreignkeyid");
+        List<Benchmark> resultlist = this.list(wrapper);
+        List<Map> list = new ArrayList<>();
+        resultlist.stream().forEach(i -> {
+            Map m = new HashMap();
+            m.put("foreignkeyid", i.getForeignkeyid());
+            if (i.getTheoreticalpower().compareTo(BigDecimal.ZERO) != 0) {
+                m.put("actualpower", (BigDecimalUtils.divide(i.getActualpower(), i.getTheoreticalpower(), 2).multiply(new BigDecimal(100))));
+            } else {
+                m.put("actualpower", 0.00);
+            }
+            m.put("comprehensiverate", BigDecimalUtils.add(i.getComprehensiverate(), new BigDecimal(0), 2));//综合厂用电率
+            m.put("utilizationhours", i.getUtilizationhours());//利用小时
+            m.put("availability", BigDecimalUtils.add(i.getAvailability(), new BigDecimal(0), 2));//设备可利用率
+            m.put("mtbf", i.getMtbf());
+            m.put("mttr", i.getMttr());
+            list.add(m);
+        });
+        return list;
+    }
 }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/threerate/ThreeRateService.java

@@ -54,9 +54,7 @@ public class ThreeRateService {
 //        qw.groupBy("windpwoerid");
         List<Statetransitionrates> list = statetransitionratesService.listZdy(beginDate,endDate);
         getData(resultList, list);
-
         SortUtils.sort(resultList,"ordernum",SortUtils.ASC);
-
         return resultList;
     }
 
@@ -109,9 +107,7 @@ public class ThreeRateService {
             esfz.updateAndGet(v -> new Double((double) (v + i.getTimerate19())));
             yfwcs.updateAndGet(v -> new Double((double) (v + i.getTimerate20())));
             FwjslVo vo = new FwjslVo();
-
             vo.setOrdernum(station.get(i.getWindpwoerid()));
-
             vo.setWpid(CacheContext.wpmap.get(i.getWindpwoerid()).getName());
             vo.setYfwcs(i.getTimerate20());
 
@@ -159,9 +155,7 @@ public class ThreeRateService {
             esfz.updateAndGet(v -> new Double((double) (v + i.getTimerate4())));
             yfwcs.updateAndGet(v -> new Double((double) (v + i.getTimerate13())));
             FwjslVo vo = new FwjslVo();
-
             vo.setOrdernum(station.get(i.getWindpwoerid()));
-
             vo.setWpid(CacheContext.wpmap.get(i.getWindpwoerid()).getName());
             vo.setYfwcs(i.getTimerate13());
 
@@ -180,7 +174,6 @@ public class ThreeRateService {
         vo.setWpid("合计");
 
         vo.setOrdernum(BigDecimal.valueOf(station.size()+1));
-
         vo.setYfwcs(yfwcs.get());
         vo.setWfz(wfz.get());
         vo.setSfz(sfz.get());
@@ -198,8 +191,6 @@ public class ThreeRateService {
 
         Map<String, BigDecimal> station =  windpowerstationService.list()
                 .stream().collect(Collectors.toMap(Windpowerstation::getId,Windpowerstation::getOrdernum));
-
-
         AtomicReference<Double> wfz = new AtomicReference<>((double) 0);
         AtomicReference<Double> sfz = new AtomicReference<>((double) 0);
         AtomicReference<Double> swfz = new AtomicReference<>((double) 0);
@@ -215,8 +206,6 @@ public class ThreeRateService {
 
 
             vo.setOrdernum(station.get(i.getWindpwoerid()));
-
-
             vo.setWpid(CacheContext.wpmap.get(i.getWindpwoerid()).getName());
             vo.setYfwcs(i.getTimerate14());
 
@@ -288,11 +277,7 @@ public class ThreeRateService {
         });
         FwjslVo vo = new FwjslVo();
         vo.setWpid("合计");
-
-
         vo.setOrdernum(BigDecimal.valueOf(station.size()+1));
-
-
         vo.setYfwcs(yfwcs.get());
         vo.setWfz(wfz.get());
         vo.setSfz(sfz.get());

gradeevaluation/src/main/java/com/gyee/gradeevaluation/variable/MainConstant.java

@@ -60,9 +60,10 @@ public class MainConstant {
     // 马场湖日照强度
 
 
-    public static final String JSFW_HZJRFDLB = "HZJGDCJSFW.NX_GD_HZJG_XX_XX_XXX_XXX_CI0088"; //
-    public static final String JSFW_HZJSSFS = "HZJGDCJSFW.NX_GD_HZJG_XX_XX_XXX_XXX_CI0134"; //
-    public static final String JSFW_HZJSSZGL = "HZJGDCJSFW.NX_GD_HZJG_XX_XX_XXX_XXX_CI0135"; //
+    public static final String JSFW_HZJRFDLB = "HZJGDCJSFW.NX_GD_HZJG_XX_XX_XXX_XXX_CI0088"; //海子井日发电量
+    public static final String JSFW_HZJSSFS = "HZJGDCJSFW.NX_GD_HZJG_XX_XX_XXX_XXX_CI0134"; //海子井日照强度
+    public static final String JSFW_HZJSSZGL = "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0052"; //海子井总功率
+
 
 
     public static final String JSFW_XHRFDLB = "XHGDCJSFW.NX_GD_XHG_XX_XX_XXX_XXX_CI0088"; // 宣和日发电量
@@ -156,4 +157,6 @@ public class MainConstant {
     public static final String XHFS = "XHGGL.NX_GD_XHG_YC_P1_L1_001_QXZ001"; // 宣和日照强度
     public static final String MCHFS = "MCHGGL.NX_GD_MCHG_YC_P1_L1_001_QXZ001"; // 马场湖日照强度
     public static final String HZJFS = "HZJGGL.NX_GD_HZJG_YC_P1_L1_001_QXZ001"; // 海子井日照强度
+
+
 }