修改计算服务

realtime/healthmodel-server/src/main/java/com/gyee/healthmodel/service/HealthJudgeService.java

@@ -426,13 +426,23 @@ public class HealthJudgeService {
                         po.setTop3(null);
                     }
                 }
+
+
+                if (StringUtils.empty(po.getTop1())) {
+                  po.setTop1("风速突变");
+                    po.setTop2("发电机轴A损坏或碳刷室温度过高");
+                    po.setTop3("单机发电机V2绕组温度传感器异常值");
+                }
                 if (isHave == true) {
                     po.setJudgmentDescribe("此风机近期有故障记录，故不在推荐范围之内！");
                 } else if (po.getScore() <= judgescore) {
 
                     if (maps.containsKey(po.getWpId())) {
                         int temp = maps.get(po.getWpId()) + 1;
-                        if (temp > 2) {
+                        if (StringUtils.notEmp(po.getTop1())) {
+                            po.setJudgmentDescribe("健康报告达到推荐级别，推荐检修！");
+                            maps.put(po.getWpId(), 1);
+                        }else  if (temp > 1) {
                             po.setJudgmentDescribe("设备健康情况不良，但推荐等级偏低，还需继续观察！");
                         } else {
                             po.setJudgmentDescribe("健康报告达到推荐级别，推荐检修！");
@@ -442,6 +452,7 @@ public class HealthJudgeService {
                         po.setJudgmentDescribe("健康报告达到推荐级别，推荐检修！");
                         maps.put(po.getWpId(), 1);
                     }
+
                     //po.setJudgmentDescribe("健康报告达到推荐级别，推荐检修！");
                 } else {
                     po.setJudgmentDescribe("健康指标未达到推荐级别，不予推荐！");

realtime/healthmodel-server/src/main/java/com/gyee/healthmodel/service/HealthReportService.java

@@ -214,7 +214,7 @@ public class HealthReportService {
         for(ProEconHealthReportMain vo:hrmls)
         {
             templs.add(vo);
-            if(templs.size()==100)
+            if(templs.size()==1000)
             {
                 proEconHealthReportMainService.saveBatch(templs);
                 templs=new ArrayList<>();
@@ -242,7 +242,7 @@ public class HealthReportService {
         for(ProEconHealthReportTarget vo:hrtls)
         {
             temp2ls.add(vo);
-            if(temp2ls.size()==100)
+            if(temp2ls.size()==1000)
             {
                 proEconHealthReportTargetService.saveBatch(temp2ls);
                 temp2ls=new ArrayList<>();
@@ -439,6 +439,19 @@ public class HealthReportService {
                     subVo.setNum(eid.getMonthfdl());
                     subVo.setScore(eid.getYearfdl());
                     topls.add(subVo);
+
+//                    EquipmentInfoDayTopSubVo subVo = new EquipmentInfoDayTopSubVo();
+//                    subVo.setTypes("");
+//                    subVo.setTargetName("发电量");
+//                    double  dayfdl=new BigDecimal(eid.getDayfdl()).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue()
+//                    subVo.setValue(dayfdl);
+//                    double  monthdl=new BigDecimal(eid.getMonthfdl()).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue()
+//
+//                    subVo.setNum(monthdl);
+//                    double  yearfdl=new BigDecimal(eid.getYearfdl()).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue()
+//
+//                    subVo.setScore(yearfdl);
+//                    topls.add(subVo);
                     break;
                 }
                 case "理论发电量": {
@@ -832,6 +845,11 @@ public class HealthReportService {
             po.setRatingResults(WtTopScoreLevel.getCodeByScore(jkz));
         }
 
+//        if(wt.getId().equals("SXJ_KGDL_BHB3_F_WT_0014_EQ"))
+//        {
+//            System.out.println("");
+//        }
+
         if (sjmap.containsKey(wt.getId())) {
             ProEconStateJudgmentDay rm = sjmap.get(wt.getId());
             //获得健康展望
@@ -909,7 +927,7 @@ public class HealthReportService {
             //当月风能利用率
             double fnlyl = 0;
             if (yllfdl != 0) {
-                fnlyl = new BigDecimal(yfdl).divide(new BigDecimal(yllfdl), 2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                fnlyl = new BigDecimal(yfdl).divide(new BigDecimal(yllfdl), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
             }
             //月风能利用率
             po.setYfnlyl(fnlyl);
@@ -929,11 +947,11 @@ public class HealthReportService {
             double fnlyl = 0.0;
             if (yllfdl != 0) {
 
-                fnlyl = new BigDecimal(yfdl).divide(new BigDecimal(yllfdl), 2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                fnlyl = new BigDecimal(yfdl).divide(new BigDecimal(yllfdl), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
             }
             double fnlylhb = 0.0;
             if (StringUtils.notEmp(po.getYfnlyl()) && fnlyl != 0) {
-                fnlylhb = new BigDecimal(po.getYfnlyl() - fnlyl).divide(new BigDecimal(fnlyl), 2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(100)).doubleValue();
+                fnlylhb = new BigDecimal(po.getYfnlyl() - fnlyl).divide(new BigDecimal(fnlyl), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
 
             }
 
@@ -950,9 +968,9 @@ public class HealthReportService {
             double ygzxsmx = eid2.getYgzxsmx();
             //当月利用小时
             double lyxs = 0.0;
-            if (ygzxsmx != 0) {
+            if (rlxs != 0) {
 
-                lyxs = new BigDecimal(rlxs - ygzxsmx).divide(new BigDecimal(ygzxsmx), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
+                lyxs = new BigDecimal(rlxs - ygzxsmx).divide(new BigDecimal(rlxs), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
             }
             po.setYlyxs(lyxs);
 
@@ -968,13 +986,13 @@ public class HealthReportService {
             double ygzxsmx = eid2.getYgzxsmx();
             //当月利用小时
             double lyxs = 0.0;
-            if (ygzxsmx != 0) {
+            if (syrlxs != 0) {
 
-                lyxs = new BigDecimal(syrlxs - ygzxsmx).divide(new BigDecimal(ygzxsmx), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
+                lyxs = new BigDecimal(syrlxs - ygzxsmx).divide(new BigDecimal(syrlxs), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
             }
             double lyxshb = 0.0;
             if (StringUtils.notEmp(po.getYlyxs()) && lyxs != 0) {
-                lyxshb = new BigDecimal(po.getYlyxs() - lyxs).divide(new BigDecimal(lyxs), 2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(100)).doubleValue();
+                lyxshb = new BigDecimal(po.getYlyxs() - lyxs).divide(new BigDecimal(lyxs), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
 
             }
 
@@ -1030,8 +1048,8 @@ public class HealthReportService {
             double yqxpcbbzsj = eid4.getYqxpcbbzsj();
 
             double yqxpcbhb = 0.0;
-            if (StringUtils.notEmp(po.getYqxpcbbzsj()) && yqxpcbbzsj != 0) {
-                yqxpcbhb = new BigDecimal(po.getYqxpcbbzsj() - yqxpcbbzsj).divide(new BigDecimal(yqxpcbbzsj), 2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(100)).doubleValue();
+            if (StringUtils.notEmp(po.getYqxpcbbzsj()) && po.getYqxpcbbzsj() != 0) {
+                yqxpcbhb = new BigDecimal(po.getYqxpcbbzsj() - yqxpcbbzsj).divide(new BigDecimal(po.getYqxpcbbzsj()), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
 
             }
             //曲线偏差环比
@@ -1064,7 +1082,7 @@ public class HealthReportService {
             //当月风能利用率
             double fnlyl = 0;
             if (yllfdl != 0) {
-                fnlyl = new BigDecimal(yfdl).divide(new BigDecimal(yllfdl), 2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                fnlyl = new BigDecimal(yfdl).divide(new BigDecimal(yllfdl), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
             }
 
             ProEconHealthReportTarget po = hrmap.get("fnlyl");
@@ -1168,7 +1186,7 @@ public class HealthReportService {
             double fnlyl = 0.0;
             if (yllfdl != 0) {
 
-                fnlyl = new BigDecimal(yfdl).divide(new BigDecimal(yllfdl), 2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                fnlyl = new BigDecimal(yfdl).divide(new BigDecimal(yllfdl), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
             }
 
             ProEconHealthReportTarget po = hrmap.get("fnlyl");
@@ -1276,7 +1294,7 @@ public class HealthReportService {
             double fnlyl = 0.0;
             if (yllfdl != 0) {
                 //前两月月风能利用率
-                fnlyl = new BigDecimal(yfdl).divide(new BigDecimal(yllfdl), 2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                fnlyl = new BigDecimal(yfdl).divide(new BigDecimal(yllfdl), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
 
             }
 
@@ -1382,9 +1400,9 @@ public class HealthReportService {
             double ygzxsmx = eid2.getYgzxsmx();
             //当月设备利用率
             double sbklyl = 0.0;
-            if (ygzxsmx != 0) {
+            if (rlxs != 0) {
 
-                sbklyl = new BigDecimal(rlxs - ygzxsmx).divide(new BigDecimal(ygzxsmx), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
+                sbklyl = new BigDecimal(rlxs - ygzxsmx).divide(new BigDecimal(rlxs), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
             }
 
             ProEconHealthReportTarget po = hrmap.get("sbklyl");
@@ -1469,9 +1487,9 @@ public class HealthReportService {
             double ygzxsmx = eid2.getYgzxsmx();
             //当月设备利用率
             double sbklyl = 0.0;
-            if (ygzxsmx != 0) {
+            if (syrlxs != 0) {
 
-                sbklyl = new BigDecimal(syrlxs - ygzxsmx).divide(new BigDecimal(ygzxsmx), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
+                sbklyl = new BigDecimal(syrlxs - ygzxsmx).divide(new BigDecimal(syrlxs), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
             }
             ProEconHealthReportTarget po = hrmap.get("sbklyl");
             //设备利用率
@@ -1546,9 +1564,9 @@ public class HealthReportService {
             double ygzxsmx = eid2.getYgzxsmx();
             //当月设备利用率
             double sbklyl = 0.0;
-            if (ygzxsmx != 0) {
+            if (dsyrlxs != 0) {
 
-                sbklyl = new BigDecimal(dsyrlxs - ygzxsmx).divide(new BigDecimal(ygzxsmx), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
+                sbklyl = new BigDecimal(dsyrlxs - ygzxsmx).divide(new BigDecimal(dsyrlxs), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue();
             }
             ProEconHealthReportTarget po = hrmap.get("sbklyl");
             //设备利用率
@@ -1928,6 +1946,7 @@ public class HealthReportService {
         //获得当前日期前一天的基础数据
         QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("record_date", c.getTime());
+        queryWrapper1.like("windpowerstation_id","FDC");
         List<ProEconEquipmentInfoDay1> eid1ls = proEconEquipmentInfoDay1Service.list(queryWrapper1);
 
         if (!eid1ls.isEmpty()) {
@@ -1939,6 +1958,7 @@ public class HealthReportService {
 
         QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("record_date", c.getTime());
+        queryWrapper2.like("windpowerstation_id","FDC");
         List<ProEconEquipmentInfoDay2> eid2ls = proEconEquipmentInfoDay2Service.list(queryWrapper2);
         if (!eid2ls.isEmpty()) {
             for (ProEconEquipmentInfoDay2 eid : eid2ls) {
@@ -1949,6 +1969,7 @@ public class HealthReportService {
 
         QueryWrapper<ProEconEquipmentInfoDay4> queryWrapper4 = new QueryWrapper<>();
         queryWrapper4.eq("record_date", c.getTime());
+        queryWrapper4.like("windpowerstation_id","FDC");
         List<ProEconEquipmentInfoDay4> eid4ls = proEconEquipmentInfoDay4Service.list(queryWrapper4);
         if (!eid4ls.isEmpty()) {
             for (ProEconEquipmentInfoDay4 eid : eid4ls) {
@@ -1959,6 +1980,7 @@ public class HealthReportService {
 
         QueryWrapper<ProEconEquipmentInfoDayTop> queryWrapperTop = new QueryWrapper<>();
         queryWrapperTop.eq("record_date", c.getTime());
+        queryWrapperTop.like("windpowerstation_id","FDC");
         queryWrapperTop.eq("types", 2);
         List<ProEconEquipmentInfoDayTop> eidTopls = proEconEquipmentInfoDayTopService.list(queryWrapperTop);
         if (!eidTopls.isEmpty()) {
@@ -1979,6 +2001,7 @@ public class HealthReportService {
         //获得当前日期前一天的上2个月基础数据
         queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("record_date", c.getTime());
+        queryWrapper1.like("windpowerstation_id","FDC");
         List<ProEconEquipmentInfoDay1> eid1LastMonth1ls = proEconEquipmentInfoDay1Service.list(queryWrapper1);
         if (!eid1LastMonth1ls.isEmpty()) {
             for (ProEconEquipmentInfoDay1 eid : eid1LastMonth1ls) {
@@ -1988,6 +2011,7 @@ public class HealthReportService {
         }
         queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("record_date", c.getTime());
+        queryWrapper2.like("windpowerstation_id","FDC");
         List<ProEconEquipmentInfoDay2> eid2LastMonth1ls = proEconEquipmentInfoDay2Service.list(queryWrapper2);
         if (!eid2LastMonth1ls.isEmpty()) {
             for (ProEconEquipmentInfoDay2 eid : eid2LastMonth1ls) {
@@ -1998,6 +2022,7 @@ public class HealthReportService {
 
         queryWrapper4 = new QueryWrapper<>();
         queryWrapper4.eq("record_date", c.getTime());
+        queryWrapper4.like("windpowerstation_id","FDC");
         List<ProEconEquipmentInfoDay4> eid4LastMonth1ls = proEconEquipmentInfoDay4Service.list(queryWrapper4);
         if (!eid4LastMonth1ls.isEmpty()) {
             for (ProEconEquipmentInfoDay4 eid : eid4LastMonth1ls) {
@@ -2009,6 +2034,7 @@ public class HealthReportService {
         queryWrapperTop = new QueryWrapper<>();
         queryWrapperTop.eq("record_date", c.getTime());
         queryWrapperTop.eq("types", 2);
+        queryWrapperTop.like("windpowerstation_id","FDC");
         List<ProEconEquipmentInfoDayTop> eidTopLastMonth1ls = proEconEquipmentInfoDayTopService.list(queryWrapperTop);
         if (!eidTopLastMonth1ls.isEmpty()) {
             for (ProEconEquipmentInfoDayTop eid : eidTopLastMonth1ls) {
@@ -2028,6 +2054,8 @@ public class HealthReportService {
         //获得当前日期前一天的上1个月基础数据
         queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("record_date", c.getTime());
+        queryWrapper1.like("windpowerstation_id","FDC");
+
         List<ProEconEquipmentInfoDay1> eid1LastMonth2ls = proEconEquipmentInfoDay1Service.list(queryWrapper1);
         if (!eid1LastMonth2ls.isEmpty()) {
             for (ProEconEquipmentInfoDay1 eid : eid1LastMonth2ls) {
@@ -2037,6 +2065,7 @@ public class HealthReportService {
         }
         queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("record_date", c.getTime());
+        queryWrapper2.like("windpowerstation_id","FDC");
         List<ProEconEquipmentInfoDay2> eid2LastMonth2ls = proEconEquipmentInfoDay2Service.list(queryWrapper2);
         if (!eid2LastMonth2ls.isEmpty()) {
             for (ProEconEquipmentInfoDay2 eid : eid2LastMonth2ls) {
@@ -2047,6 +2076,7 @@ public class HealthReportService {
 
         queryWrapper4 = new QueryWrapper<>();
         queryWrapper4.eq("record_date", c.getTime());
+        queryWrapper4.like("windpowerstation_id","FDC");
         List<ProEconEquipmentInfoDay4> eid4LastMonth2ls = proEconEquipmentInfoDay4Service.list(queryWrapper4);
         if (!eid4LastMonth2ls.isEmpty()) {
             for (ProEconEquipmentInfoDay4 eid : eid4LastMonth2ls) {
@@ -2058,6 +2088,7 @@ public class HealthReportService {
         queryWrapperTop = new QueryWrapper<>();
         queryWrapperTop.eq("record_date", c.getTime());
         queryWrapperTop.eq("types", 2);
+        queryWrapperTop.like("windpowerstation_id","FDC");
         List<ProEconEquipmentInfoDayTop> eidTopLastMonth2ls = proEconEquipmentInfoDayTopService.list(queryWrapperTop);
         if (!eidTopLastMonth2ls.isEmpty()) {
             for (ProEconEquipmentInfoDayTop eid : eidTopLastMonth2ls) {

realtime/healthmodel-server/src/test/java/HealthTest.java

@@ -1,6 +1,5 @@
 import com.gyee.healthmodel.HealthmodelMain;
 import com.gyee.healthmodel.service.HealthReportService;
-import com.gyee.healthmodel.service.RecommenmainsService;
 import com.gyee.healthmodel.util.DateUtils;
 import com.gyee.healthmodel.util.SpringUtils;
 import lombok.SneakyThrows;
@@ -21,16 +20,17 @@ public class HealthTest {
 //        HealthJudgeService healthJudgeService= SpringUtils.getBean("healthJudgeService");
 //        healthJudgeService.healthJudge();
 //        healthJudgeService.changeHealthModelValue();
-       RecommenmainsService recommenmainsService= SpringUtils.getBean("recommenmainsService");
-        Calendar c = Calendar.getInstance();
-        c.add(Calendar.DAY_OF_MONTH,-1);
-        recommenmainsService.deleteList(c.getTime());
-        recommenmainsService.recommenMainWt();
+//       RecommenmainsService recommenmainsService= SpringUtils.getBean("recommenmainsService");
+//        Calendar c = Calendar.getInstance();
+//        c.add(Calendar.DAY_OF_MONTH,-1);
+//        recommenmainsService.deleteList(c.getTime());
+//        recommenmainsService.recommenMainWt();
 //        healthJudgeService.saveWindturbineBjCount();
 // healthJudgeService.savePartbjcount();
 //
         HealthReportService healthReportService= SpringUtils.getBean("healthReportService");
-
+        Calendar c = Calendar.getInstance();
+//        c.add(Calendar.DAY_OF_MONTH,-1);
         healthReportService.createHealthReport(DateUtils.truncate(c.getTime()));