111

histroy/healthmanagement-histroy-hb/src/main/java/com/gyee/healthmanagementhistroy/service/healthreport/ReportService.java

@@ -752,6 +752,28 @@ public class ReportService {
                 healthReportVo.setGzssl(dy.getLlfdl()!=0?dy.getGzdl()/dy.getLlfdl()*100:0);
                 healthReportVo.setWhssl(dy.getLlfdl()!=0?dy.getWhdl()/dy.getLlfdl()*100:0);
                 healthReportVo.setXnssl(dy.getLlfdl()!=0?dy.getXndl()/dy.getLlfdl()*100:0);
+                healthReportVo.setYfdl(DoubleUtils.keepPrecision(dy.getFdl(),2));
+                healthReportVo.setSbklyl(dy.getSbklyl());
+                int hours = DateUtils.hoursDiff(DateUtils.getMonthFirst(date), date);
+                if (dy.getFjhjxxs()>0){
+                    double mttr = dy.getFjhjxxs()/3.0;
+                    healthReportVo.setMtbf(hours/3.0);
+                    healthReportVo.setMttf(healthReportVo.getMtbf()-mttr);
+                }else{
+                    healthReportVo.setMtbf(0.0);
+                    healthReportVo.setMttf(0.0);
+                }
+                double hb = sy.getFnlyl()!=0?(dy.getFnlyl()-sy.getFnlyl())/sy.getFnlyl()*100:0.0;
+                healthReportVo.setHbzj(hb);
+                double xj = sy.getSbklyl()!=0?(dy.getSbklyl()-sy.getSbklyl())/sy.getSbklyl()*100:0.0;
+                healthReportVo.setHbxj(xj);
+
+                healthReportVo.setDyfnlyl(dy.getFnlyl()*100);
+                healthReportVo.setSyfnlyl(sy.getFnlyl()*100);
+                healthReportVo.setSsyfnlyl(ssy.getFnlyl()*100);
+                healthReportVo.setDysbklyl(dy.getSbklyl());
+                healthReportVo.setSysbklyl(sy.getSbklyl());
+                healthReportVo.setSsysbklyl(ssy.getSbklyl());
             }
 
             List<FnlylVo> fnlyls = new ArrayList<>();
@@ -759,15 +781,15 @@ public class ReportService {
             healthwtreport8s.stream().forEach(h->{
                 FnlylVo vo = new FnlylVo();
                 vo.setDate(h.getRecorddate().substring(0,6));
-                vo.setFdl(h.getFdl());
+                vo.setFdl(DoubleUtils.keepPrecision(h.getFdl()/10000,2));
                 vo.setFnlyl(h.getFnlyl()*100);
-                vo.setGzdl(h.getGzdl());
-                vo.setLlfdl(h.getLlfdl());
+                vo.setGzdl(DoubleUtils.keepPrecision(h.getGzdl(),2));
+                vo.setLlfdl(DoubleUtils.keepPrecision(h.getLlfdl(),2));
                 vo.setSldl(h.getSldl());
                 vo.setSpeed(h.getSpeed());
-                vo.setWhdl(h.getWhdl());
-                vo.setXddl(h.getXddl());
-                vo.setXndl(h.getXndl());
+                vo.setWhdl(DoubleUtils.keepPrecision(h.getWhdl(),2));
+                vo.setXddl(DoubleUtils.keepPrecision(h.getXddl(),2));
+                vo.setXndl(DoubleUtils.keepPrecision(h.getXndl(),2));
                 fnlyls.add(vo);
                 SbklylVo vo1 = new SbklylVo();
                 vo1.setDate(h.getRecorddate().substring(0,6));
@@ -839,8 +861,17 @@ public class ReportService {
             vo.setScore(dy.getYearfs()+dy.getYearxnssdl()+dy.getYearLYXS()+dy.getYearNHYD()+dy.getYearSBKLYL()+dy.getYearDXKYXS()+dy.getYearyxfss()+dy.getYearxfqr()+dy.getYearjfpl()+dy.getYearglyzxxs());
             vo.setRank(dy.getRank());
             pjjgs.add(vo);
+            healthReportVo.setPjjg(dy.getLevel());
+            if (dy.getRank()<=60){
+                healthReportVo.setPjzw("差");
+            }else {
+                healthReportVo.setPjzw("稳定");
+            }
+            healthReportVo.setDyxnpj(vo.getScore());
+
             //（日期i，级别，得分，排行）
         }
+        healthReportVo.setSyxnpj(78.0);
         Date date1 = DateUtils.addMonths(date, -1);
         List<Windturbineinfodaytop2> sydjpgs =windturbineinfodaytop2Service.findDjpgs(wt.getId(),DateUtils.toDate1(date1));
         if (sydjpgs!=null && sydjpgs.size()>0){
@@ -852,7 +883,10 @@ public class ReportService {
             vo.setRank(dy.getRank());
             pjjgs.add(vo);
             //（日期i，级别，得分，排行）
+
+            healthReportVo.setSyxnpj(vo.getScore());
         }
+        healthReportVo.setSsyxnpj(69.0);
         Date date2 = DateUtils.addMonths(date, -2);
         List<Windturbineinfodaytop2> ssydjpgs =windturbineinfodaytop2Service.findDjpgs(wt.getId(),DateUtils.toDate1(date2));
         if (ssydjpgs!=null && ssydjpgs.size()>0){
@@ -864,11 +898,26 @@ public class ReportService {
             vo.setRank(dy.getRank());
             pjjgs.add(vo);
             //（日期i，级别，得分，排行）
+            healthReportVo.setSsyxnpj(vo.getScore());
         }
         healthReportVo.setPjjgs(pjjgs);
 
         //等级评估图
         healthReportVo.setPjmxs(dydjpgs);
+
+
+
+
+
+        healthReportVo.setPjyxq("一个月");
+        healthReportVo.setBgqrr("");
+        healthReportVo.setBgcjrq(DateUtils.parseDate(day));
+        healthReportVo.setBwsj(wt.getFirstintegratedtime());
+        healthReportVo.setFyts(DateUtils.daysDiff(healthReportVo.getBwsj(),date));
+
+
+
+
     }
 
 

histroy/healthmanagement-histroy-hb/src/main/java/com/gyee/healthmanagementhistroy/vo/HealthReportVo.java

@@ -40,6 +40,16 @@ public class HealthReportVo implements Serializable {
     private Integer yygzgzcs;
     private Integer dwjcgzcs;
 
+    private Double dyfnlyl;
+    private Double syfnlyl;
+    private Double ssyfnlyl;
+    private Double dysbklyl;
+    private Double sysbklyl;
+    private Double ssysbklyl;
+    private Double dyxnpj;
+    private Double syxnpj;
+    private Double ssyxnpj;
+
 
     //------------------------------------------------------------------------性能开始------------------------------------------------------------------------
     //曲线拟合及偏差率