等级评估功能

.idea/compiler.xml

@@ -9,28 +9,28 @@
         <outputRelativeToContentRoot value="true" />
         <module name="datatraining-server" />
         <module name="consumer-hb" />
-        <module name="benchmarking-web-hb" />
+        <module name="adapter-td-hb" />
         <module name="meteorologicalcollection" />
         <module name="customization-hb" />
-        <module name="healthmanagement-web-hb" />
+        <module name="datacenter-hb" />
         <module name="failurestatistics-server" />
         <module name="analysis-histroy-hb" />
         <module name="cache" />
-        <module name="adapter-td-hb" />
         <module name="healthmodel-server" />
         <module name="meteorologicalcollection-web" />
-        <module name="common" />
-        <module name="knowledge-hb" />
         <module name="monitor-web" />
+        <module name="knowledge-hb" />
+        <module name="benchmarking-web-hb" />
         <module name="benchmarking-web" />
         <module name="healthmanagement-histroy" />
-        <module name="analysis-web-hb" />
+        <module name="benchmarking-histroy-hb" />
         <module name="healthmanagement-histroy-hb" />
         <module name="consumer" />
-        <module name="benchmarking-histroy-hb" />
+        <module name="analysis-web-hb" />
         <module name="benchmarking-histroy" />
+        <module name="healthmanagement-web-hb" />
+        <module name="common" />
         <module name="algorithm-web" />
-        <module name="datacenter-hb" />
       </profile>
     </annotationProcessing>
   </component>

common/src/main/java/com/gyee/common/vo/healthmanager/CompareVo.java

@@ -0,0 +1,10 @@
+package com.gyee.common.vo.healthmanager;
+
+import lombok.Data;
+
+@Data
+public class CompareVo {
+
+    private String target;
+    private Object data;
+}

web/consumer/src/main/java/com/gyee/consumer/api/healthmanagement/LevelAssessmentApi.java

@@ -0,0 +1,20 @@
+package com.gyee.consumer.api.healthmanagement;
+
+import com.gyee.common.config.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient("healthmanagement-provider")
+@RequestMapping("//levelAssessment")
+public interface LevelAssessmentApi {
+    @GetMapping("/list")
+    public R list(@RequestParam(value = "recorddate",required = true) String recorddate,
+                  @RequestParam(value = "type",required = true) String type,
+                  @RequestParam(value = "wpid",required = true) String wpid
+    );
+
+    @GetMapping("/comparison")
+    public R comparison(@RequestParam(value = "id1",required = true) String id1,
+                        @RequestParam(value = "id2",required = true) String id2
+    );
+}

web/consumer/src/main/java/com/gyee/consumer/controller/healthmanagement/LevelAssessmentController.java

@@ -0,0 +1,42 @@
+package com.gyee.consumer.controller.healthmanagement;
+
+import com.gyee.common.config.R;
+import com.gyee.consumer.api.healthmanagement.LevelAssessmentApi;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+public class LevelAssessmentController {
+
+    @Resource
+    private LevelAssessmentApi levelAssessmentApi;
+
+    /**
+     * 等级评估列表查询
+     * @param recorddate
+     * @param type
+     * @param wpid
+     * @return
+     */
+    @GetMapping("/consumer/levelAssessment/list")
+    public R list(@RequestParam(value = "recorddate",required = true) String recorddate,
+                  @RequestParam(value = "type",required = true) String type,
+                  @RequestParam(value = "wpid",required = true) String wpid
+    ){
+        return levelAssessmentApi.list(recorddate,type,wpid);
+    }
+
+    /**
+     * 数据对比
+     * @param id1
+     * @param id2
+     * @return
+     */
+    @GetMapping("/consumer/levelAssessment/comparison")
+    public R comparison(@RequestParam(value = "id1",required = true) String id1,
+                        @RequestParam(value = "id2",required = true) String id2
+    ){
+        return levelAssessmentApi.comparison(id1,id2);
+    }
+}

web/healthmanagement-web-hb/src/main/java/com/gyee/healthmanagement/controller/auto/Windturbineinfodaytop2Controller.java

@@ -0,0 +1,20 @@
+package com.gyee.healthmanagement.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-23
+ */
+@RestController
+@RequestMapping("//windturbineinfodaytop2")
+public class Windturbineinfodaytop2Controller {
+
+}

web/healthmanagement-web-hb/src/main/java/com/gyee/healthmanagement/controller/levelassessment/LevelAssessmentController.java

@@ -0,0 +1,65 @@
+package com.gyee.healthmanagement.controller.levelassessment;
+
+import com.gyee.common.model.StringUtils;
+import com.gyee.healthmanagement.config.R;
+import com.gyee.healthmanagement.model.auto.Windturbineinfodaytop2;
+import com.gyee.healthmanagement.service.levelassessment.LevelAssessmentService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("//levelAssessment")
+public class LevelAssessmentController {
+    @Resource
+    private LevelAssessmentService levelAssessmentService;
+
+    /**
+     * 等级评估列表
+     * @param recorddate
+     * @param type
+     * @param wpid
+     * @return
+     */
+    @GetMapping("/list")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R list(@RequestParam(value = "recorddate",required = true) String recorddate,
+                            @RequestParam(value = "type",required = true) String type,
+                  @RequestParam(value = "wpid",required = true) String wpid,
+                  @RequestParam(value = "orderby",required = false) String orderby,
+                  @RequestParam(value = "isAsc",required = false) String isAsc
+    )  {
+        List<Windturbineinfodaytop2> resultlist = levelAssessmentService.list(recorddate,type,wpid,orderby,isAsc);
+        if (StringUtils.isNotNull(resultlist)) {
+            return R.ok(resultlist.size()).data(resultlist);
+        }else{
+            return R.error().message("访问失败");
+        }
+
+    }
+
+    /**
+     * 数据对比
+     * @param id1
+     * @param id2
+     * @return
+     */
+    @GetMapping("/comparison")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R comparison(@RequestParam(value = "id1",required = true) String id1,
+                  @RequestParam(value = "id2",required = true) String id2
+    )  {
+        Map<String,Object> resultMap = levelAssessmentService.comparison(id1,id2);
+        if (StringUtils.isNotNull(resultMap)) {
+            return R.ok(resultMap.size()).data(resultMap);
+        }else{
+            return R.error().message("访问失败");
+        }
+
+    }
+
+}

web/healthmanagement-web-hb/src/main/java/com/gyee/healthmanagement/mapper/auto/Windturbineinfodaytop2Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.healthmanagement.mapper.auto;
+
+import com.gyee.healthmanagement.model.auto.Windturbineinfodaytop2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-23
+ */
+public interface Windturbineinfodaytop2Mapper extends BaseMapper<Windturbineinfodaytop2> {
+
+}

web/healthmanagement-web-hb/src/main/java/com/gyee/healthmanagement/model/auto/Windturbineinfodaytop2.java

@@ -0,0 +1,241 @@
+package com.gyee.healthmanagement.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDTURBINEINFODAYTOP2")
+public class Windturbineinfodaytop2 extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private Long id;
+
+    @TableField("WINDPOWERSTATIONID")
+    private String windpowerstationid;
+
+    @TableField("PROJECTID")
+    private String projectid;
+
+    @TableField("LINEID")
+    private String lineid;
+
+    @TableField("WINDTURBINEID")
+    private String windturbineid;
+
+    @TableField("RECORDDATE")
+    private Date recorddate;
+
+    @TableField("DAYFDL")
+    private Double dayfdl;
+
+    @TableField("MONTHFDL")
+    private Double monthfdl;
+
+    @TableField("YEARFDL")
+    private Double yearfdl;
+
+    @TableField("DAYLLFDL")
+    private Double dayllfdl;
+
+    @TableField("MONTHLLFDL")
+    private Double monthllfdl;
+
+    @TableField("YEARLLFDL")
+    private Double yearllfdl;
+
+    @TableField("DAYFS")
+    private Double dayfs;
+
+    @TableField("MONTHFS")
+    private Double monthfs;
+
+    @TableField("YEARFS")
+    private Double yearfs;
+
+    @TableField("DAYGL")
+    private Double daygl;
+
+    @TableField("MONTHGL")
+    private Double monthgl;
+
+    @TableField("YEARGL")
+    private Double yeargl;
+
+    @TableField("DAYGZSSDL")
+    private Double daygzssdl;
+
+    @TableField("MONTHGZSSDL")
+    private Double monthgzssdl;
+
+    @TableField("YEARGZSSDL")
+    private Double yeargzssdl;
+
+    @TableField("DAYXDSSDL")
+    private Double dayxdssdl;
+
+    @TableField("MONTHXDSSDL")
+    private Double monthxdssdl;
+
+    @TableField("YEARXDSSDL")
+    private Double yearxdssdl;
+
+    @TableField("DAYWHSSDL")
+    private Double daywhssdl;
+
+    @TableField("MONTHWHSSDL")
+    private Double monthwhssdl;
+
+    @TableField("YEARWHSSDL")
+    private Double yearwhssdl;
+
+    @TableField("DAYXNSSDL")
+    private Double dayxnssdl;
+
+    @TableField("MONTHXNSSDL")
+    private Double monthxnssdl;
+
+    @TableField("YEARXNSSDL")
+    private Double yearxnssdl;
+
+    @TableField("DAYGZSJ")
+    private Double daygzsj;
+
+    @TableField("MONTHGZSJ")
+    private Double monthgzsj;
+
+    @TableField("YEARGZSJ")
+    private Double yeargzsj;
+
+    @TableField("DAYWHSJ")
+    private Double daywhsj;
+
+    @TableField("MONTHWHSJ")
+    private Double monthwhsj;
+
+    @TableField("YEARWHSJ")
+    private Double yearwhsj;
+
+    @TableField("DAYYXSJ")
+    private Double dayyxsj;
+
+    @TableField("MONTHYXSJ")
+    private Double monthyxsj;
+
+    @TableField("YEARYXSJ")
+    private Double yearyxsj;
+
+    @TableField("DAYTJSJ")
+    private Double daytjsj;
+
+    @TableField("MONTHTJSJ")
+    private Double monthtjsj;
+
+    @TableField("YEARTJSJ")
+    private Double yeartjsj;
+
+    @TableField("DAYLYXS")
+    private Double daylyxs;
+
+    @TableField("MONTHLYXS")
+    private Double monthlyxs;
+
+    @TableField("YEARLYXS")
+    private Double yearlyxs;
+
+    @TableField("DAYNHYD")
+    private Double daynhyd;
+
+    @TableField("MONTHNHYD")
+    private Double monthnhyd;
+
+    @TableField("YEARNHYD")
+    private Double yearnhyd;
+
+    @TableField("DAYSBKLYL")
+    private Double daysbklyl;
+
+    @TableField("MONTHSBKLYL")
+    private Double monthsbklyl;
+
+    @TableField("YEARSBKLYL")
+    private Double yearsbklyl;
+
+    @TableField("DAYDXKYXS")
+    private Double daydxkyxs;
+
+    @TableField("MONTHDXKYXS")
+    private Double monthdxkyxs;
+
+    @TableField("YEARDXKYXS")
+    private Double yeardxkyxs;
+
+    @TableField("DAYYXFSS")
+    private Double dayyxfss;
+
+    @TableField("MONTHYXFSS")
+    private Double monthyxfss;
+
+    @TableField("YEARYXFSS")
+    private Double yearyxfss;
+
+    @TableField("DAYXFQR")
+    private Double dayxfqr;
+
+    @TableField("MONTHXFQR")
+    private Double monthxfqr;
+
+    @TableField("YEARXFQR")
+    private Double yearxfqr;
+
+    @TableField("DAYJFPL")
+    private Double dayjfpl;
+
+    @TableField("MONTHJFPL")
+    private Double monthjfpl;
+
+    @TableField("YEARJFPL")
+    private Double yearjfpl;
+
+    @TableField("DAYGLYZXXS")
+    private Double dayglyzxxs;
+
+    @TableField("MONTHGLYZXXS")
+    private Double monthglyzxxs;
+
+    @TableField("YEARGLYZXXS")
+    private Double yearglyzxxs;
+
+    @TableField("TYPE")
+    private Integer type;
+
+    @TableField("RANK")
+    private Integer rank;
+
+    @TableField("\"LEVEL\"")
+    private String level;
+
+    @TableField("YEAR")
+    private Integer year;
+
+    @TableField("MONTH")
+    private Integer month;
+
+
+}

web/healthmanagement-web-hb/src/main/java/com/gyee/healthmanagement/service/auto/IWindturbineinfodaytop2Service.java

@@ -0,0 +1,16 @@
+package com.gyee.healthmanagement.service.auto;
+
+import com.gyee.healthmanagement.model.auto.Windturbineinfodaytop2;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-23
+ */
+public interface IWindturbineinfodaytop2Service extends IService<Windturbineinfodaytop2> {
+
+}

web/healthmanagement-web-hb/src/main/java/com/gyee/healthmanagement/service/auto/impl/Windturbineinfodaytop2ServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.healthmanagement.service.auto.impl;
+
+import com.gyee.healthmanagement.model.auto.Windturbineinfodaytop2;
+import com.gyee.healthmanagement.mapper.auto.Windturbineinfodaytop2Mapper;
+import com.gyee.healthmanagement.service.auto.IWindturbineinfodaytop2Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-23
+ */
+@Service
+public class Windturbineinfodaytop2ServiceImpl extends ServiceImpl<Windturbineinfodaytop2Mapper, Windturbineinfodaytop2> implements IWindturbineinfodaytop2Service {
+
+}

web/healthmanagement-web-hb/src/main/java/com/gyee/healthmanagement/service/levelassessment/LevelAssessmentService.java

@@ -0,0 +1,135 @@
+package com.gyee.healthmanagement.service.levelassessment;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.util.DateUtils;
+import com.gyee.common.vo.healthmanager.CompareVo;
+import com.gyee.healthmanagement.model.auto.Windturbineinfodaytop2;
+import com.gyee.healthmanagement.service.auto.IWindturbineinfodaytop2Service;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Service
+public class LevelAssessmentService {
+    @Resource
+    private IWindturbineinfodaytop2Service windturbineinfodaytop2Service;
+
+    public List<Windturbineinfodaytop2> list(String recorddate, String type,String wpid,String orderby,String isAsc) {
+        Calendar c = Calendar.getInstance();
+        Date date = DateUtils.parseDate(recorddate);
+        c.setTime(date);
+        int year = c.get(Calendar.YEAR);
+        int month = c.get(Calendar.MONTH)+1;
+        QueryWrapper<Windturbineinfodaytop2> qw = new QueryWrapper<>();
+        qw.eq("type",Integer.parseInt(type));
+        qw.eq("windpowerstationid",wpid);
+        if (type.equals("1")){
+            qw.eq("recorddate", date);
+        }else if(type.equals("2")){
+            qw.eq("month", month);
+            qw.eq("year", year);
+        }else {
+            qw.eq("year", year);
+        }
+        if (StringUtils.isNotEmpty(orderby) && StringUtils.isNotEmpty(isAsc)){
+            if (isAsc.equals("1")){
+                qw.orderByAsc(orderby);
+            }else{
+                qw.orderByDesc(orderby);
+            }
+        }else{
+            qw.orderByAsc("windturbineid");
+        }
+        List<Windturbineinfodaytop2> list = windturbineinfodaytop2Service.list(qw);
+        return list;
+    }
+
+    public Map<String,Object> comparison(String id1, String id2) {
+        Map<String,Object> resultMap = new HashMap<>();
+        Map<String,Object> chartsMap = new HashMap<>();
+
+        QueryWrapper<Windturbineinfodaytop2> qw = new QueryWrapper<>();
+        qw.in("id",id1,id2);
+        List<Windturbineinfodaytop2> dataList = windturbineinfodaytop2Service.list(qw);
+        resultMap.put("data",dataList);
+
+        dataList.stream().forEach(wtd->{
+            List<CompareVo> compareList = new ArrayList<>();
+            for (int i = 0; i < 10; i++) {
+                CompareVo vo = new CompareVo();
+
+                switch (i) {
+                    case 0:
+                        // vo.setName("N("+winfo.getN4()+"/"+winfo.getN()+")");
+                        vo.setTarget("平均切入风速");
+                        // vo.setData1(wtd.getMonthxfqr());
+                        vo.setData(wtd.getYearxfqr());
+                        break;
+                    case 1:
+                        // vo.setName("NNE("+winfo.getNne4()+"/"+winfo.getNne()+")");
+                        vo.setTarget("性能损失电量");
+                        // vo.setData1(wtd.getMonthxnssdl());
+                        vo.setData(wtd.getYearxnssdl());
+                        break;
+                    case 2:
+                        // vo.setName("NE("+winfo.getNe4()+"/"+winfo.getNe()+")");
+                        vo.setTarget("拟合优度");
+                        // vo.setData1(wtd.getMonthnhyd());
+                        vo.setData(wtd.getYearnhyd());
+                        break;
+                    case 3:
+                        // vo.setName("ENE("+winfo.getEne4()+"/"+winfo.getEne()+")");
+                        vo.setTarget("功率一致性系数");
+                        // vo.setData1(wtd.getMonthglyzxxs());
+                        vo.setData(wtd.getYearglyzxxs());
+                        break;
+                    case 4:
+                        // vo.setName("E("+winfo.getE4()+"/"+winfo.getE()+")");
+                        vo.setTarget("利用小时");
+                        // vo.setData1(wtd.getMonthlyxs());
+                        vo.setData(wtd.getYearlyxs());
+                        break;
+                    case 5:
+                        // vo.setName("ESE("+winfo.getEse()+"/"+winfo.getEse()+")");
+                        vo.setTarget("设备可利用率");
+                        // vo.setData1(wtd.getMonthsbklyl());
+                        vo.setData(wtd.getYearsbklyl());
+                        break;
+                    case 6:
+                        // vo.setName("ESE("+winfo.getEse()+"/"+winfo.getEse()+")");
+                        vo.setTarget("等效可利用系数");
+                        // vo.setData1(wtd.getMonthdxkyxs());
+                        vo.setData(wtd.getYeardxkyxs());
+                        break;
+                    case 7:
+                        // vo.setName("ESE("+winfo.getEse()+"/"+winfo.getEse()+")");
+                        vo.setTarget("有效风时数");
+                        // vo.setData1(wtd.getMonthyxfss());
+                        vo.setData(wtd.getYearyxfss());
+                        break;
+                    case 8:
+                        // vo.setName("ESE("+winfo.getEse()+"/"+winfo.getEse()+")");
+                        vo.setTarget("平均风速");
+                        // vo.setData1(wtd.getMonthdxkyxs());
+                        vo.setData(wtd.getYeardxkyxs());
+                        break;
+                    case 9:
+                        // vo.setName("ESE("+winfo.getEse()+"/"+winfo.getEse()+")");
+                        vo.setTarget("静风频率");
+                        // vo.setData1(wtd.getMonthdxkyxs());
+                        vo.setData(wtd.getYeardxkyxs());
+                        break;
+                    default:
+                        break;
+                }
+                compareList.add(vo);
+            }
+            chartsMap.put(wtd.getWindturbineid(),compareList);
+        });
+        resultMap.put("charts",chartsMap);
+
+        return resultMap;
+    }
+}

web/healthmanagement-web-hb/target/classes/application-dev.yml

@@ -6,7 +6,7 @@ server:
 
 spring:
   application:
-    name: benchmarking-provider
+    name: healthmanagement-provider
   main:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   cloud:

web/healthmanagement-web-hb/target/classes/application-test.yml

@@ -6,7 +6,7 @@ server:
 
 spring:
   application:
-    name: benchmarking-provider
+    name: healthmanagement-provider
   main:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   cloud: