健康报告缓存表服务

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

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@RestController
+@RequestMapping("//reportdanger")
+public class ReportdangerController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@RestController
+@RequestMapping("//reportdeviation")
+public class ReportdeviationController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@RestController
+@RequestMapping("//reportpowerfitting")
+public class ReportpowerfittingController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-17
+ */
+@RestController
+@RequestMapping("//reportpowerpartweather")
+public class ReportpowerpartweatherController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@RestController
+@RequestMapping("//winddeviationrate")
+public class WinddeviationrateController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@RestController
+@RequestMapping("//windpowerdeviationrate")
+public class WindpowerdeviationrateController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/ReportdangerMapper.java

@@ -0,0 +1,24 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Reportdanger;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+public interface ReportdangerMapper extends BaseMapper<Reportdanger> {
+    @Select("select part,sum(count) count,sum(times) times,sum(countavg) countavg,sum(timesavg) timesavg from Reportdanger where wtid=#{id} group by part ")
+    List<Reportdanger> getBjyhdb(@Param("id") String id);
+    @Select("select * from Reportdanger where wtid=#{id}")
+    List<Reportdanger> getBjyhdbBywt(@Param("id") String id);
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/ReportdeviationMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Reportdeviation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+public interface ReportdeviationMapper extends BaseMapper<Reportdeviation> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/ReportpowerfittingMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Reportpowerfitting;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+public interface ReportpowerfittingMapper extends BaseMapper<Reportpowerfitting> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/ReportpowerpartweatherMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Reportpowerpartweather;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-17
+ */
+public interface ReportpowerpartweatherMapper extends BaseMapper<Reportpowerpartweather> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/WinddeviationrateMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Winddeviationrate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+public interface WinddeviationrateMapper extends BaseMapper<Winddeviationrate> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/WindpowerdeviationrateMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Windpowerdeviationrate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+public interface WindpowerdeviationrateMapper extends BaseMapper<Windpowerdeviationrate> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/model/auto/Reportdanger.java

@@ -0,0 +1,55 @@
+package com.gyee.gradeevaluation.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.gyee.gradeevaluation.util.DoubleUtils;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("REPORTDANGER")
+public class Reportdanger extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("WTID")
+    private String wtid;
+
+    @TableField("WPID")
+    private String wpid;
+
+    @TableField("PART")
+    private String part;
+
+    @TableField("DANGER")
+    private String danger;
+
+    @TableField("COUNT")
+    private Integer count;
+
+    @TableField("COUNTAVG")
+    private Integer countavg;
+
+    @TableField("TIMES")
+    private Double times;
+
+    @TableField("TIMESAVG")
+    private Double timesavg;
+
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/model/auto/Reportdeviation.java

@@ -0,0 +1,45 @@
+package com.gyee.gradeevaluation.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("REPORTDEVIATION")
+public class Reportdeviation extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("WTID")
+    private String wtid;
+
+    @TableField("RECORDDATE")
+    private Date recorddate;
+
+    @TableField("PCL")
+    private Double pcl;
+
+    @TableField("JZZ")
+    private Double jzz;
+
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/model/auto/Reportpowerfitting.java

@@ -0,0 +1,48 @@
+package com.gyee.gradeevaluation.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("REPORTPOWERFITTING")
+public class Reportpowerfitting extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("WTID")
+    private String wtid;
+
+    @TableField("YEAR")
+    private Integer year;
+
+    @TableField("MONTH")
+    private Integer month;
+
+    @TableField("SPEED")
+    private Integer speed;
+
+    @TableField("NHGL")
+    private Double nhgl;
+
+    @TableField("BZGL")
+    private Double bzgl;
+
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/model/auto/Reportpowerpartweather.java

@@ -0,0 +1,48 @@
+package com.gyee.gradeevaluation.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("REPORTPOWERPARTWEATHER")
+public class Reportpowerpartweather extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("WTID")
+    private String wtid;
+
+    @TableField("PARTNAME")
+    private String partname;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("POWER")
+    private String power;
+
+    @TableField("DATAVALUE")
+    private Double datavalue;
+
+    @TableField("EARLYWARNINGVALUE")
+    private Double earlywarningvalue;
+
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/model/auto/Winddeviationrate.java

@@ -0,0 +1,40 @@
+package com.gyee.gradeevaluation.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.models.auth.In;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDDEVIATIONRATE")
+public class Winddeviationrate extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("WTID")
+    private String wtid;
+
+    @TableField("TYPE")
+    private String type;
+
+    @TableField("COUNT")
+    private Integer count;
+
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/model/auto/Windpowerdeviationrate.java

@@ -0,0 +1,42 @@
+package com.gyee.gradeevaluation.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDPOWERDEVIATIONRATE")
+public class Windpowerdeviationrate extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("WTID")
+    private String wtid;
+
+    @TableField("TYPEVALUE")
+    private Double typevalue;
+
+    @TableField("VALUE")
+    private Double value;
+
+    @TableField("TYPE")
+    private Integer type;
+
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/model/healthreport/DfpclSpeedVo.java

@@ -14,6 +14,6 @@ import java.io.Serializable;
 public class DfpclSpeedVo implements Serializable {
     private static final long serialVersionUID = -2971071084255391957L;
     //风速不合格率曲线（风速，不合格率）
-    private Integer speed;
+    private Double speed;
     private Double dfpcl;
 }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/model/healthreport/NhglVo.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 public class NhglVo implements Serializable {
     private static final long serialVersionUID = -684477821231671554L;
     //拟合功率曲线（风速，拟合功率，保证功率，点值）
-    private Double speed;
+    private Integer speed;
     private Double nhgl;
     private Double bzgl;
     private Double pointvalue;

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

@@ -0,0 +1,21 @@
+package com.gyee.gradeevaluation.service.auto;
+
+import com.gyee.gradeevaluation.model.auto.Reportdanger;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+public interface IReportdangerService extends IService<Reportdanger> {
+
+    List<Reportdanger> getBjyhdb(String id);
+
+    List<Reportdanger> getBjyhdbBywt(String id);
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.service.auto;
+
+import com.gyee.gradeevaluation.model.auto.Reportdeviation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+public interface IReportdeviationService extends IService<Reportdeviation> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.service.auto;
+
+import com.gyee.gradeevaluation.model.auto.Reportpowerfitting;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+public interface IReportpowerfittingService extends IService<Reportpowerfitting> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.service.auto;
+
+import com.gyee.gradeevaluation.model.auto.Reportpowerpartweather;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-17
+ */
+public interface IReportpowerpartweatherService extends IService<Reportpowerpartweather> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.service.auto;
+
+import com.gyee.gradeevaluation.model.auto.Winddeviationrate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+public interface IWinddeviationrateService extends IService<Winddeviationrate> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.service.auto;
+
+import com.gyee.gradeevaluation.model.auto.Windpowerdeviationrate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+public interface IWindpowerdeviationrateService extends IService<Windpowerdeviationrate> {
+
+}

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

@@ -0,0 +1,33 @@
+package com.gyee.gradeevaluation.service.auto.impl;
+
+import com.gyee.gradeevaluation.model.auto.Reportdanger;
+import com.gyee.gradeevaluation.mapper.auto.ReportdangerMapper;
+import com.gyee.gradeevaluation.service.auto.IReportdangerService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@Service
+public class ReportdangerServiceImpl extends ServiceImpl<ReportdangerMapper, Reportdanger> implements IReportdangerService {
+    @Resource
+    private ReportdangerMapper reportdangerMapper;
+    @Override
+    public List<Reportdanger> getBjyhdb(String id) {
+        return reportdangerMapper.getBjyhdb(id);
+    }
+
+    @Override
+    public List<Reportdanger> getBjyhdbBywt(String id) {
+        return reportdangerMapper.getBjyhdbBywt(id);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.service.auto.impl;
+
+import com.gyee.gradeevaluation.model.auto.Reportdeviation;
+import com.gyee.gradeevaluation.mapper.auto.ReportdeviationMapper;
+import com.gyee.gradeevaluation.service.auto.IReportdeviationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@Service
+public class ReportdeviationServiceImpl extends ServiceImpl<ReportdeviationMapper, Reportdeviation> implements IReportdeviationService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.service.auto.impl;
+
+import com.gyee.gradeevaluation.model.auto.Reportpowerfitting;
+import com.gyee.gradeevaluation.mapper.auto.ReportpowerfittingMapper;
+import com.gyee.gradeevaluation.service.auto.IReportpowerfittingService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@Service
+public class ReportpowerfittingServiceImpl extends ServiceImpl<ReportpowerfittingMapper, Reportpowerfitting> implements IReportpowerfittingService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.service.auto.impl;
+
+import com.gyee.gradeevaluation.model.auto.Reportpowerpartweather;
+import com.gyee.gradeevaluation.mapper.auto.ReportpowerpartweatherMapper;
+import com.gyee.gradeevaluation.service.auto.IReportpowerpartweatherService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-17
+ */
+@Service
+public class ReportpowerpartweatherServiceImpl extends ServiceImpl<ReportpowerpartweatherMapper, Reportpowerpartweather> implements IReportpowerpartweatherService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.service.auto.impl;
+
+import com.gyee.gradeevaluation.model.auto.Winddeviationrate;
+import com.gyee.gradeevaluation.mapper.auto.WinddeviationrateMapper;
+import com.gyee.gradeevaluation.service.auto.IWinddeviationrateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@Service
+public class WinddeviationrateServiceImpl extends ServiceImpl<WinddeviationrateMapper, Winddeviationrate> implements IWinddeviationrateService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.service.auto.impl;
+
+import com.gyee.gradeevaluation.model.auto.Windpowerdeviationrate;
+import com.gyee.gradeevaluation.mapper.auto.WindpowerdeviationrateMapper;
+import com.gyee.gradeevaluation.service.auto.IWindpowerdeviationrateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-15
+ */
+@Service
+public class WindpowerdeviationrateServiceImpl extends ServiceImpl<WindpowerdeviationrateMapper, Windpowerdeviationrate> implements IWindpowerdeviationrateService {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/gradeevaluation/QuartService.java

@@ -337,7 +337,8 @@ public class QuartService {
                         List<Windturbine> windturbines = wtmap.get(wpid);
                         if (StringUtils.isNotNull(dayTargets)) {
                             if (timetypes.contains("日")){
-                                List<Windturbineinfodaytop3> windturbineinfodaytop3s = map.get(wpid).stream().filter(i->i.getType()==1).collect(Collectors.toList());
+                                List<Windturbineinfodaytop3> windturbineinfodaytop3s1 = map.get(wpid);
+                                List<Windturbineinfodaytop3> windturbineinfodaytop3s = windturbineinfodaytop3s1.stream().filter(i->String.valueOf(i.getType()).equals("1")).collect(Collectors.toList());
                                 if (StringUtils.isNotEmpty(windturbineinfodaytop3s)){
                                     for (Evaluationdatasource dayTarget : dayTargets) {
                                         if (dayTarget.getSort().equals("升序")) {
@@ -390,7 +391,7 @@ public class QuartService {
                                 }
                             }
                             if (timetypes.contains("月")){
-                                List<Windturbineinfodaytop3> windturbineinfodaytop3s = map.get(wpid).stream().filter(i->i.getType()==3).collect(Collectors.toList());
+                                List<Windturbineinfodaytop3> windturbineinfodaytop3s = map.get(wpid).stream().filter(i->String.valueOf(i.getType()).equals("2")).collect(Collectors.toList());
                                 if(StringUtils.isNotEmpty(windturbineinfodaytop3s)){
                                     for (Evaluationdatasource dayTarget : dayTargets) {
                                         if (dayTarget.getSort().equals("升序")) {
@@ -446,7 +447,7 @@ public class QuartService {
                                 }
                             }
                             if (timetypes.contains("年")){
-                                List<Windturbineinfodaytop3> windturbineinfodaytop3s = map.get(wpid).stream().filter(i->i.getType()==3).collect(Collectors.toList());
+                                List<Windturbineinfodaytop3> windturbineinfodaytop3s = map.get(wpid).stream().filter(i->String.valueOf(i.getType()).equals("3")).collect(Collectors.toList());
                                 if(StringUtils.isNotEmpty(windturbineinfodaytop3s)){
                                     for (Evaluationdatasource dayTarget : dayTargets) {
                                         if (dayTarget.getSort().equals("升序")) {

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/health/HealthReportService.java

@@ -11,6 +11,7 @@ import com.gyee.gradeevaluation.model.auto.*;
 import com.gyee.gradeevaluation.model.healthreport.*;
 import com.gyee.gradeevaluation.service.auto.*;
 import com.gyee.gradeevaluation.util.*;
+import com.gyee.gradeevaluation.util.golden.timeseries.StringUtil;
 import io.lettuce.core.GeoArgs;
 import org.springframework.stereotype.Service;
 
@@ -72,6 +73,18 @@ public class HealthReportService {
     private IHealthreportService healthreportService;
     @Resource
     private IFaultstatisticwindturbineService faultstatisticwindturbineService;
+    @Resource
+    private IReportpowerfittingService reportpowerfittingService;
+    @Resource
+    private IReportdeviationService reportdeviationService;
+    @Resource
+    private IWindpowerdeviationrateService windpowerdeviationrateService;
+    @Resource
+    private IWinddeviationrateService winddeviationrateService;
+    @Resource
+    private IReportdangerService reportdangerService;
+    @Resource
+    private IReportpowerpartweatherService reportpowerpartweatherService;
 
     /**
      * 保存风机报告
@@ -201,14 +214,21 @@ public class HealthReportService {
 
         }
         //功率曲线拟合
-        List<Windturbinecurvefittingmonth> glqxnhlist = windturbinecurvefittingmonthService.glqxnhlist(wt.getId(),year,month);
+        QueryWrapper<Reportpowerfitting> reportpowerfittingQueryWrapper = new QueryWrapper<>();
+        reportpowerfittingQueryWrapper.eq("month",month);
+        reportpowerfittingQueryWrapper.eq("year",year);
+        reportpowerfittingQueryWrapper.eq("wtid",wt.getId());
+        List<Reportpowerfitting> glqxnhlist = reportpowerfittingService.list(reportpowerfittingQueryWrapper);
+//        List<Windturbinecurvefittingmonth> glqxnhlist = windturbinecurvefittingmonthService.glqxnhlist(wt.getId(),year,month);
         if (glqxnhlist!=null && glqxnhlist.size()>0){
             List<NhglVo> list = new ArrayList<>();
             glqxnhlist.stream().forEach(i->{
                 NhglVo vo = new NhglVo();
                 vo.setSpeed(i.getSpeed());
-                vo.setNhgl(i.getActualpower());
-                vo.setBzgl(i.getOptimalpower());
+//                vo.setNhgl(i.getActualpower());
+//                vo.setBzgl(i.getOptimalpower());
+                vo.setNhgl(i.getNhgl());
+                vo.setBzgl(i.getBzgl());
                 list.add(vo);
             });
             SortUtils.sort(list,"speed",SortUtils.ASC);
@@ -216,14 +236,21 @@ public class HealthReportService {
         }
 
         //曲线偏差率
-        List<Wtreportsub> wtreportsub = wtreportsubService.qxpcllist(wt.getId(),day);
+        QueryWrapper<Reportdeviation> reportdeviationQueryWrapper = new QueryWrapper<>();
+        reportdeviationQueryWrapper.eq("wtid",wt.getId());
+        reportdeviationQueryWrapper.ge("recorddate",monthFirst).le("recorddate",yestday);
+        List<Reportdeviation> wtreportsub = reportdeviationService.list(reportdeviationQueryWrapper);
+//        List<Wtreportsub> wtreportsub = wtreportsubService.qxpcllist(wt.getId(),day);
         if (wtreportsub!=null && wtreportsub.size()>0){
             List<QxpclVo> list = new ArrayList<>();
             wtreportsub.stream().forEach(i->{
                 QxpclVo vo = new QxpclVo();
-                vo.setDate(i.getRecodedate());
-                vo.setQxpcl(i.getQxpcl());
-                vo.setJzz(i.getQxpcljzz());
+//                vo.setDate(i.getRecodedate());
+//                vo.setQxpcl(i.getQxpcl());
+//                vo.setJzz(i.getQxpcljzz());
+                vo.setDate(i.getRecorddate());
+                vo.setQxpcl(i.getPcl());
+                vo.setJzz(i.getJzz());
                 list.add(vo);
             });
             healthReportVo.setQxpcls(list);
@@ -271,76 +298,94 @@ public class HealthReportService {
         }
 
         //对风偏差图
-        List<Windturbinepoweryaw> glqxts =windturbinepoweryawService.getPowerDraw(wt.getId(),day);
+        QueryWrapper<Windpowerdeviationrate> windpowerdeviationrateQueryWrapper = new QueryWrapper<>();
+        windpowerdeviationrateQueryWrapper.eq("wtid",wt.getId());
+        List<Windpowerdeviationrate> windpowerdeviationrates = windpowerdeviationrateService.list(windpowerdeviationrateQueryWrapper);
+        List<Windpowerdeviationrate> glqxts = windpowerdeviationrates.stream().filter(deviationrate-> deviationrate.getType() == 2).collect(Collectors.toList());
+//        List<Windturbinepoweryaw> glqxts =windturbinepoweryawService.getPowerDraw(wt.getId(),day);
         List<DfpclPowerVo> dfpclpowers = new ArrayList<>();
         if (glqxts!=null && glqxts.size()>0){
             glqxts.stream().forEach(i->{
                 DfpclPowerVo vo = new DfpclPowerVo();
-                vo.setPower(i.getPower());
-                int sum = i.getQualified() + i.getUnqualified();
-                if (i.getUnqualified()!=0){
-                    BigDecimal divide = BigDecimalUtils.divide(String.valueOf(i.getUnqualified()), String.valueOf(sum), 2);
-                    vo.setDfpcl(divide.doubleValue()*100);
-                }else{
-                    vo.setDfpcl(0.0);
-                }
+//                vo.setPower(i.getPower());
+//                int sum = i.getQualified() + i.getUnqualified();
+//                if (i.getUnqualified()!=0){
+//                    BigDecimal divide = BigDecimalUtils.divide(String.valueOf(i.getUnqualified()), String.valueOf(sum), 2);
+//                    vo.setDfpcl(divide.doubleValue()*100);
+//                }else{
+//                    vo.setDfpcl(0.0);
+//                }
+                vo.setPower(i.getTypevalue());
+                vo.setDfpcl(i.getValue());
                 dfpclpowers.add(vo);
             });
             SortUtils.sort(dfpclpowers,"power",SortUtils.ASC);
             healthReportVo.setDfpclpowers(dfpclpowers);
         }
-
-        List<Windturbinewindyaw> fsqxts =windturbinewindyawService.getPowerDraw(wt.getId(),day);
+        List<Windpowerdeviationrate> fsqxts = windpowerdeviationrates.stream().filter(deviationrate-> deviationrate.getType() == 1).collect(Collectors.toList());
+//        List<Windturbinewindyaw> fsqxts =windturbinewindyawService.getPowerDraw(wt.getId(),day);
         List<DfpclSpeedVo> dfpclSpeeds = new ArrayList<>();
         if (fsqxts!=null && fsqxts.size()>0){
             fsqxts.stream().forEach(i->{
                 DfpclSpeedVo vo = new DfpclSpeedVo();
-                vo.setSpeed(i.getSpeed());
-                int sum = i.getQualified() + i.getUnqualified();
-                if (i.getUnqualified()!=0){
-                    BigDecimal divide = BigDecimalUtils.divide(String.valueOf(i.getUnqualified()), String.valueOf(sum), 2);
-                    vo.setDfpcl(divide.doubleValue()*100);
-                }else{
-                    vo.setDfpcl(0.0);
-                }
-                vo.setDfpcl(sum != 0 ? (i.getUnqualified())/sum*100 : 0.0);
+//                vo.setSpeed(i.getSpeed());
+//                int sum = i.getQualified() + i.getUnqualified();
+//                if (i.getUnqualified()!=0){
+//                    BigDecimal divide = BigDecimalUtils.divide(String.valueOf(i.getUnqualified()), String.valueOf(sum), 2);
+//                    vo.setDfpcl(divide.doubleValue()*100);
+//                }else{
+//                    vo.setDfpcl(0.0);
+//                }
+//                vo.setDfpcl(sum != 0 ? (i.getUnqualified())/sum*100 : 0.0);
+                vo.setSpeed(DoubleUtils.getRoundingNum(i.getTypevalue(),0));
+                vo.setDfpcl(i.getValue());
                 dfpclSpeeds.add(vo);
             });
             SortUtils.sort(dfpclSpeeds,"speed",SortUtils.ASC);
             healthReportVo.setDfpclSpeeds(dfpclSpeeds);
         }
+        QueryWrapper<Winddeviationrate> winddeviationrateQueryWrapper = new QueryWrapper<>();
+        winddeviationrateQueryWrapper.eq("wtid",wt.getId());
+        List<Winddeviationrate> winddeviationrates = winddeviationrateService.list(winddeviationrateQueryWrapper);
+        if (winddeviationrates!=null){
+            winddeviationrates.stream().forEach(i->{
+                NippleVo vo = new NippleVo();
+                vo.setPcl(Integer.parseInt(i.getType().substring(i.getType().indexOf("R")+1)));
+                vo.setCount(i.getCount());
+            });
 
-        List<Windturbinewindyaw> nzs =windturbinewindyawService.getnzt(wt.getId(),day);
-        if(nzs.get(0)!=null){
-            Windturbinewindyaw windturbinewindyaw = nzs.get(0);
-            Field[] field = windturbinewindyaw.getClass().getDeclaredFields(); // 获取实体类的所有属性，返回Field数组
-            List<NippleVo> nippleVos = new ArrayList<>();
-            try {
-                for (int j = 7; j < field.length; j++) { // 遍历所有属性
-                    String name = field[j].getName(); // 获取属性的名字
-                    name = name.substring(0, 1).toUpperCase() + name.substring(1); // 将属性的首字符大写，方便构造get，set方法
-                    Method m = windturbinewindyaw.getClass().getMethod("get" + name);
-                    Integer value = (Integer) m.invoke(windturbinewindyaw);
-                    NippleVo vo = new NippleVo();
-                    vo.setPcl(Integer.parseInt(name.substring(1).replace("f","-")));
-                    vo.setCount(value);
-                    nippleVos.add(vo);
-                    // 如果有需要,可以仿照上面继续进行扩充,再增加对其它类型的判断
-                }
-                SortUtils.sort(nippleVos,"pcl",SortUtils.ASC);
-                healthReportVo.setNipples(nippleVos);
-            } catch (NoSuchMethodException e) {
-                e.printStackTrace();
-            } catch (SecurityException e) {
-                e.printStackTrace();
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (IllegalArgumentException e) {
-                e.printStackTrace();
-            } catch (InvocationTargetException e) {
-                e.printStackTrace();
-            }
         }
+//        List<Windturbinewindyaw> nzs =windturbinewindyawService.getnzt(wt.getId(),day);
+//        if(nzs.get(0)!=null){
+//            Windturbinewindyaw windturbinewindyaw = nzs.get(0);
+//            Field[] field = windturbinewindyaw.getClass().getDeclaredFields(); // 获取实体类的所有属性，返回Field数组
+//            List<NippleVo> nippleVos = new ArrayList<>();
+//            try {
+//                for (int j = 7; j < field.length; j++) { // 遍历所有属性
+//                    String name = field[j].getName(); // 获取属性的名字
+//                    name = name.substring(0, 1).toUpperCase() + name.substring(1); // 将属性的首字符大写，方便构造get，set方法
+//                    Method m = windturbinewindyaw.getClass().getMethod("get" + name);
+//                    Integer value = (Integer) m.invoke(windturbinewindyaw);
+//                    NippleVo vo = new NippleVo();
+//                    vo.setPcl(Integer.parseInt(name.substring(1).replace("f","-")));
+//                    vo.setCount(value);
+//                    nippleVos.add(vo);
+//                    // 如果有需要,可以仿照上面继续进行扩充,再增加对其它类型的判断
+//                }
+//                SortUtils.sort(nippleVos,"pcl",SortUtils.ASC);
+//                healthReportVo.setNipples(nippleVos);
+//            } catch (NoSuchMethodException e) {
+//                e.printStackTrace();
+//            } catch (SecurityException e) {
+//                e.printStackTrace();
+//            } catch (IllegalAccessException e) {
+//                e.printStackTrace();
+//            } catch (IllegalArgumentException e) {
+//                e.printStackTrace();
+//            } catch (InvocationTargetException e) {
+//                e.printStackTrace();
+//            }
+//        }
         //切入切出整合
         List<QrqcVo> qrqcVos = new ArrayList<>();
         List<Inputoroutputspeedtotal> inputoroutputspeedtotals =inputoroutputspeedtotalService.getQrqc(wt.getId(),day);
@@ -368,73 +413,73 @@ public class HealthReportService {
         healthReportVo.setQrqcs(qrqcVos);
 
         //可靠性
-        List<Jkbgbjyh> jkbgbjyhs = jkbgbjyhService.getBjyhdb(wt.getId(),day);
-
+//        List<Jkbgbjyh> jkbgbjyhs = jkbgbjyhService.getBjyhdb(wt.getId(),day);
+        List<Reportdanger> jkbgbjyhs = reportdangerService.getBjyhdb(wt.getId());
         List<BjyhdbVo> bjyhdbs = new ArrayList<>();
         if (jkbgbjyhs!=null && jkbgbjyhs.size()>0){
-            List<String> types = jkbgbjyhs.stream().map(i -> i.getType()).collect(Collectors.toList());
+            List<String> types = jkbgbjyhs.stream().map(i -> i.getPart()).collect(Collectors.toList());
             BjyhdbVo sj = new BjyhdbVo();
             sj.setForeignkeyid(wt.getId());
             if (types.contains("传动链")){
-                Jkbgbjyh cdl = jkbgbjyhs.stream().filter(i -> i.getType().contains("传动链")).findFirst().get();
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("传动链")).findFirst().get();
                 sj.setCdlcount(cdl.getCount());
-                sj.setCdltimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                sj.setCdltimes(DoubleUtils.getRoundingNum(cdl.getTimes(),0));
             }else {
                 sj.setCdlcount(0);
                 sj.setCdltimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("测风系统")){
-                Jkbgbjyh cdl = jkbgbjyhs.stream().filter(i -> i.getType().contains("测风系统")).findFirst().get();
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("测风系统")).findFirst().get();
                 sj.setCfxtcount(cdl.getCount());
-                sj.setCfxttimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                sj.setCfxttimes(DoubleUtils.getRoundingNum(cdl.getTimes(),0));
             }else {
                 sj.setCfxtcount(0);
                 sj.setCfxttimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("齿轮箱")){
-                Jkbgbjyh cdl = jkbgbjyhs.stream().filter(i -> i.getType().contains("齿轮箱")).findFirst().get();
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("齿轮箱")).findFirst().get();
                 sj.setClxcount(cdl.getCount());
-                sj.setClxtimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                sj.setClxtimes(DoubleUtils.getRoundingNum(cdl.getTimes(),0));
             }else {
                 sj.setClxcount(0);
                 sj.setClxtimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("发电机")){
-                Jkbgbjyh cdl = jkbgbjyhs.stream().filter(i -> i.getType().contains("发电机")).findFirst().get();
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("发电机")).findFirst().get();
                 sj.setFdjcount(cdl.getCount());
-                sj.setFdjtimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                sj.setFdjtimes(DoubleUtils.getRoundingNum(cdl.getTimes(),0));
             }else {
                 sj.setFdjcount(0);
                 sj.setFdjtimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("变桨")){
-                Jkbgbjyh cdl = jkbgbjyhs.stream().filter(i -> i.getType().contains("变桨")).findFirst().get();
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("变桨")).findFirst().get();
                 sj.setBjcount(cdl.getCount());
-                sj.setBjtimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                sj.setBjtimes(DoubleUtils.getRoundingNum(cdl.getTimes(),0));
             }else {
                 sj.setBjcount(0);
                 sj.setBjtimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("机舱")){
-                Jkbgbjyh cdl = jkbgbjyhs.stream().filter(i -> i.getType().contains("机舱")).findFirst().get();
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("机舱")).findFirst().get();
                 sj.setJccount(cdl.getCount());
-                sj.setJctimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                sj.setJctimes(DoubleUtils.getRoundingNum(cdl.getTimes(),0));
             }else {
                 sj.setJccount(0);
                 sj.setJctimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("偏航")){
-                Jkbgbjyh cdl = jkbgbjyhs.stream().filter(i -> i.getType().contains("偏航")).findFirst().get();
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("偏航")).findFirst().get();
                 sj.setPhcount(cdl.getCount());
-                sj.setPhtimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                sj.setPhtimes(DoubleUtils.getRoundingNum(cdl.getTimes(),0));
             }else {
                 sj.setPhcount(0);
                 sj.setPhtimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("塔底柜")){
-                Jkbgbjyh cdl = jkbgbjyhs.stream().filter(i -> i.getType().contains("塔底柜")).findFirst().get();
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("塔底柜")).findFirst().get();
                 sj.setTdgcount(cdl.getCount());
-                sj.setTdgtimes(cdl.getTime());
+                sj.setTdgtimes(cdl.getTimes());
             }else {
                 sj.setTdgcount(0);
                 sj.setTdgtimes(DoubleUtils.getRoundingNum(0.0,0));
@@ -462,71 +507,71 @@ public class HealthReportService {
                 sj.setTdgtimes(DoubleUtils.getRoundingNum(0.0,0));
             bjyhdbs.add(sj);
         }
-        List<Jkbgbjyh> jkbgbjyhsjz = jkbgbjyhService.getBjyhdbjz(wt.getWindpowerstationid(),day);
-        if (jkbgbjyhsjz!=null && jkbgbjyhsjz.size()>0){
-            List<String> types = jkbgbjyhsjz.stream().map(i -> i.getType()).collect(Collectors.toList());
+//        List<Jkbgbjyh> jkbgbjyhsjz = jkbgbjyhService.getBjyhdbjz(wt.getWindpowerstationid(),day);
+        if (jkbgbjyhs!=null && jkbgbjyhs.size()>0){
+            List<String> types = jkbgbjyhs.stream().map(i -> i.getPart()).collect(Collectors.toList());
             BjyhdbVo sj = new BjyhdbVo();
             sj.setForeignkeyid("平均值");
             if (types.contains("传动链")){
-                Jkbgbjyh cdl = jkbgbjyhsjz.stream().filter(i -> i.getType().contains("传动链")).findFirst().get();
-                sj.setCdlcount(cdl.getCount());
-                sj.setCdltimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("传动链")).findFirst().get();
+                sj.setCdlcount(cdl.getCountavg());
+                sj.setCdltimes(DoubleUtils.getRoundingNum(cdl.getTimesavg(),0));
             }else {
                 sj.setCdlcount(0);
                 sj.setCdltimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("测风系统")){
-                Jkbgbjyh cdl = jkbgbjyhsjz.stream().filter(i -> i.getType().contains("测风系统")).findFirst().get();
-                sj.setCfxtcount(cdl.getCount());
-                sj.setCfxttimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("测风系统")).findFirst().get();
+                sj.setCfxtcount(cdl.getCountavg());
+                sj.setCfxttimes(DoubleUtils.getRoundingNum(cdl.getTimesavg(),0));
             }else {
                 sj.setCfxtcount(0);
                 sj.setCfxttimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("齿轮箱")){
-                Jkbgbjyh cdl = jkbgbjyhsjz.stream().filter(i -> i.getType().contains("齿轮箱")).findFirst().get();
-                sj.setClxcount(cdl.getCount());
-                sj.setClxtimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("齿轮箱")).findFirst().get();
+                sj.setClxcount(cdl.getCountavg());
+                sj.setClxtimes(DoubleUtils.getRoundingNum(cdl.getTimesavg(),0));
             }else {
                 sj.setClxcount(0);
                 sj.setClxtimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("发电机")){
-                Jkbgbjyh cdl = jkbgbjyhsjz.stream().filter(i -> i.getType().contains("发电机")).findFirst().get();
-                sj.setFdjcount(cdl.getCount());
-                sj.setFdjtimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("发电机")).findFirst().get();
+                sj.setFdjcount(cdl.getCountavg());
+                sj.setFdjtimes(DoubleUtils.getRoundingNum(cdl.getTimesavg(),0));
             }else {
                 sj.setFdjcount(0);
                 sj.setFdjtimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("变桨")){
-                Jkbgbjyh cdl = jkbgbjyhsjz.stream().filter(i -> i.getType().contains("变桨")).findFirst().get();
-                sj.setBjcount(cdl.getCount());
-                sj.setBjtimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("变桨")).findFirst().get();
+                sj.setBjcount(cdl.getCountavg());
+                sj.setBjtimes(DoubleUtils.getRoundingNum(cdl.getTimesavg(),0));
             }else {
                 sj.setBjcount(0);
                 sj.setBjtimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("机舱")){
-                Jkbgbjyh cdl = jkbgbjyhsjz.stream().filter(i -> i.getType().contains("机舱")).findFirst().get();
-                sj.setJccount(cdl.getCount());
-                sj.setJctimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("机舱")).findFirst().get();
+                sj.setJccount(cdl.getCountavg());
+                sj.setJctimes(DoubleUtils.getRoundingNum(cdl.getTimesavg(),0));
             }else {
                 sj.setJccount(0);
                 sj.setJctimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("偏航")){
-                Jkbgbjyh cdl = jkbgbjyhsjz.stream().filter(i -> i.getType().contains("偏航")).findFirst().get();
-                sj.setPhcount(cdl.getCount());
-                sj.setPhtimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("偏航")).findFirst().get();
+                sj.setPhcount(cdl.getCountavg());
+                sj.setPhtimes(DoubleUtils.getRoundingNum(cdl.getTimesavg(),0));
             }else {
                 sj.setPhcount(0);
                 sj.setPhtimes(DoubleUtils.getRoundingNum(0.0,0));
             }
             if (types.contains("塔底柜")){
-                Jkbgbjyh cdl = jkbgbjyhsjz.stream().filter(i -> i.getType().contains("塔底柜")).findFirst().get();
-                sj.setTdgcount(cdl.getCount());
-                sj.setTdgtimes(DoubleUtils.getRoundingNum(cdl.getTime(),0));
+                Reportdanger cdl = jkbgbjyhs.stream().filter(i -> i.getPart().contains("塔底柜")).findFirst().get();
+                sj.setTdgcount(cdl.getCountavg());
+                sj.setTdgtimes(DoubleUtils.getRoundingNum(cdl.getTimesavg(),0));
             }else {
                 sj.setTdgcount(0);
                 sj.setTdgtimes(DoubleUtils.getRoundingNum(0.0,0));
@@ -557,23 +602,25 @@ public class HealthReportService {
             bjyhdbs.add(sj);
         }
         healthReportVo.setBjyhdbs(bjyhdbs);
-
-        List<Jkbgbjyh> yht2sj = jkbgbjyhService.getBjyhdbBywt(wt.getId(),day);
-        List<Jkbgbjyh> yht2jz = jkbgbjyhService.getBjyhdbBywp(wt.getWindpowerstationid(),day);
+        List<Reportdanger> yht2sj = reportdangerService.getBjyhdbBywt(wt.getId());
+//        List<Jkbgbjyh> yht2sj = jkbgbjyhService.getBjyhdbBywt(wt.getId(),day);
+//        List<Jkbgbjyh> yht2jz = jkbgbjyhService.getBjyhdbBywp(wt.getWindpowerstationid(),day);
         List<YhmxdbVo> yhmxdbs = new ArrayList<>();
         if (yht2sj!=null & yht2sj.size()>0){
             yht2sj.stream().forEach(i->{
                 YhmxdbVo vo = new YhmxdbVo();
-                vo.setPart(i.getType());
-                vo.setYhmx(i.getAlerttext());
+                vo.setPart(i.getPart());
+                vo.setYhmx(i.getDanger());
                 vo.setCount(i.getCount());
-                vo.setTimes(DoubleUtils.getRoundingNum(i.getTime(),0));
+                vo.setTimes(DoubleUtils.getRoundingNum(i.getTimes(),0));
+                vo.setMeantimes(DoubleUtils.getRoundingNum(i.getTimesavg(),0));
+                vo.setMeancount(i.getCountavg());
                 yhmxdbs.add(vo);
             });
-            yhmxdbs.stream().forEach(i->{
-                i.setMeancount(yht2jz.stream().filter(j->j.getAlerttext().equals(i.getYhmx())).findFirst().get().getCount());
-                i.setMeantimes(DoubleUtils.getRoundingNum(yht2jz.stream().filter(j->j.getAlerttext().equals(i.getYhmx())).findFirst().get().getTime(),2));
-            });
+//            yhmxdbs.stream().forEach(i->{
+//                i.setMeancount(yht2jz.stream().filter(j->j.getAlerttext().equals(i.getYhmx())).findFirst().get().getCount());
+//                i.setMeantimes(DoubleUtils.getRoundingNum(yht2jz.stream().filter(j->j.getAlerttext().equals(i.getYhmx())).findFirst().get().getTime(),2));
+//            });
             SortUtils.sort(yhmxdbs,"part",SortUtils.ASC);
 
         }
@@ -587,17 +634,21 @@ public class HealthReportService {
         SortUtils.sort(faultstatisticwindturbines,"monthwarningnum",SortUtils.DESC);
         healthReportVo.setFaultclass(faultstatisticwindturbines);
         //功率对部件温度影响
-        List<Bjgltjb> bjgltjbs = bjgltjbService.getpartwds(wt.getId(),day);
+
+        QueryWrapper<Reportpowerpartweather> reportpowerpartweatherQueryWrapper = new QueryWrapper<>();
+        reportpowerpartweatherQueryWrapper.eq("wtid",wt.getId());
+        List<Reportpowerpartweather> bjgltjbs = reportpowerpartweatherService.list(reportpowerpartweatherQueryWrapper);
+//        List<Bjgltjb> bjgltjbs = bjgltjbService.getpartwds(wt.getId(),day);
         List<PartwdVo> partwds = new ArrayList<>();
         if (bjgltjbs!=null && bjgltjbs.size()>0){
             bjgltjbs.stream().forEach(i->{
                 PartwdVo vo = new PartwdVo();
                 //（部件，温度分类，温度，实际值，平均值）
-                vo.setPart(i.getPartid());
+                vo.setPart(i.getPartname());
                 vo.setType(i.getName());
                 vo.setPower(i.getPower());
                 vo.setValue(i.getDatavalue());
-                vo.setMeanvalue(0.0);
+                vo.setMeanvalue(i.getEarlywarningvalue());
                 partwds.add(vo);
             });
             SortUtils.sort(partwds,"part",SortUtils.DESC);

gradeevaluation/src/test/java/com/gyee/gradeevaluation/GradeevaluationApplicationTests.java

@@ -46,7 +46,9 @@ class GradeevaluationApplicationTests {
         String date = DateUtils.toDate1(yestday);
 
 //        specificService.saveWindpowerspecificinfoday("2021-08-01","2021-08-04");
-        mttrmtbfTaskService.saveWpMttrAndMtbfDay("2021-08-01","2021-08-04");
+//        quartService.saveWindturbineinfodaytop3("2021-10-01","2021-10-13");
+        quartService.saveEvaluationSub("2021-10-01","2021-10-13");
+        quartService.saveEvaluationMain("2021-10-01","2021-10-13");
 //        mttrmtbfTaskService.saveWpMttrAndMtbMonth(date,date);
 //        mttrmtbfTaskService.saveWpMttrAndMtbfYear(date,date);
     }
@@ -57,7 +59,7 @@ class GradeevaluationApplicationTests {
         Date yestday = DateUtils.getYestday(new Date());
         String date = DateUtils.toDate1(yestday);
 
-        healthReportService.saveHealthReport("2021-08-03","2021-08-03","MHS_FDC");
+        healthReportService.saveHealthReport(date,date,"XS_FDC");
 
        // specificService.saveWindpowerspecificinfoday("2020-05-02","2020-06-01");
     }