健康管理优化

realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/init/CacheContext.java

@@ -89,8 +89,14 @@ public class CacheContext implements CommandLineRunner {
             }
         }
 
+//        List<Windpowerstation> wptempls = windpowerstationService.list();
+//        wptempls.stream().filter(i->i.getCompanyid().equals("1")).forEach(i->{
+//            wpls.add(i);
+//            wpmap.put(i.getId(),i);
+//        });
+
         List<Windpowerstation> wptempls = windpowerstationService.list();
-        wptempls.stream().filter(i->i.getCompanyid().equals("1")).forEach(i->{
+        wptempls.stream().filter(i->i.getId().endsWith("FDC")).forEach(i->{
             wpls.add(i);
             wpmap.put(i.getId(),i);
         });

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

@@ -56,7 +56,7 @@ public class HealthJudgeService {
     private PartbjcountsubsService partbjcountsubsService;
     @Resource
     private WobugeqsService wobugeqsService;
-    @Resource
+	@Resource
     private AlertrulefailuresubsService alertrulefailuresubsService;
     @Resource
     private EarlywarningsService earlywarningsService;
@@ -103,32 +103,40 @@ public class HealthJudgeService {
                     }
                 }
 
-                String[] points = new String[codels.size()];
-
+//                String[] points = new String[codels.size()];
+				List<String> points=new ArrayList<>();
                 for (int i = 0; i < codels.size(); i++) {
                     if (CacheContext.wtpAimap.containsKey(wt.getId())) {
                         Map<String, Windturbinetestingpointnew> wtmap = CacheContext.wtpAimap.get(wt.getId());
                         // 判断是否包含该统一编码
                         if (wtmap.containsKey(codels.get(i))) {
                             Windturbinetestingpointnew temp = wtmap.get(codels.get(i));
-                            points[i] = temp.getCode();
+                            points.add(temp.getCode());
                         }
 
                     }
                 }
 
                 Windturbinetestingpointnew fjjkzf = windturbinetestingpointnewsService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJJKZZ);
-
-                DNAVal[] ssvalues = realApiUtil.getRealtimeTagValues(points);
+				List<PointData> ssvalues=realApiUtil.getRealData(points);
+//                DNAVal[] ssvalues = realApiUtil.getRealtimeTagValues(points);
 
                 PointData fjjkzfpoint=new PointData();
                 fjjkzfpoint.setEdnaId(fjjkzf.getCode());
                 fjjkzfpoint.setPointTime(new BigDecimal(new Date().getTime()).divide(new BigDecimal(1000), 0, RoundingMode.HALF_EVEN).longValue());
 
-                double clxzt = ssvalues[0].DValue;
-                double fdjzt = ssvalues[1].DValue;
-                double bjzt = ssvalues[2].DValue;
-                double zkzt = ssvalues[3].DValue;
+				double clxzt =0.0;
+				double fdjzt = 0.0;
+				double bjzt = 0.0;
+				double zkzt =0.0;
+				if(ssvalues.size()==4)
+				{
+					 clxzt = ssvalues.get(0).getPointValueInDouble();
+					 fdjzt = ssvalues.get(1).getPointValueInDouble();
+					 bjzt = ssvalues.get(2).getPointValueInDouble();
+					 zkzt = ssvalues.get(3).getPointValueInDouble();
+				}
+
 
                 fjjkzfpoint.setPointValueInDouble(score);
                 realApiUtil.updatePoint(fjjkzfpoint);
@@ -401,8 +409,10 @@ public class HealthJudgeService {
 					});
 					for (int i = 0; i < rlist.size(); i++) {
 						StatejudgmentrecordVo po = rlist.get(i);
-						Boolean isHave = wobugeqsService
-								.isQueryThreeDayWobugeqs(po.getWtid());
+						Boolean isHave = false;
+
+//						Boolean isHave = wobugeqsService
+//								.isQueryThreeDayWobugeqs(po.getWtid());
 						List<String> parts = relevancePartTopThree(CacheContext.wtmap
 								.get(po.getWtid()));
 						int size = parts.size();
@@ -1015,8 +1025,8 @@ public class HealthJudgeService {
 				for (DataVo ar : arlist) {
 
 					for (Windturbine w : wtls) {
-						if (wobugeqsService
-								.isQueryThreeDayWobugeqs(w.getId()) == false) {
+//						if (wobugeqsService
+//								.isQueryThreeDayWobugeqs(w.getId()) == false) {
 							Long snapid = getAlarmsnapid(w.getId(),ar.getEdnavalue()
 									);
 							String cc = findAlarmcount(snapid, beginDate,
@@ -1045,7 +1055,7 @@ public class HealthJudgeService {
 							wbc.setReference(avg);
 							wbc.setRecodedate(date);
 							melist.add(wbc);
-						}
+//						}
 
 					}
 

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

@@ -84,12 +84,12 @@ public class Windturbineinfoday3sService {
     private double getXnssRate(Windturbineinfoday3 wi) {
         double xnssrate;
 
-        double fdl = wi.getDaydl2();// 发电量
-        double xnss = wi.getDaynhqfdl();// 性能损失
-        double gzss = wi.getDaynhgzssdl();// 故障损失
-        double xdss = wi.getDaynhxdssdl();// 限电损失
-        double slss = wi.getDaynhcfdl();// 受累损失
-        double whss = wi.getDaynhwhssdl();// 性能损失
+        double fdl = null!=wi.getDaydl2()?wi.getDaydl2():0.0;// 发电量
+        double xnss = null!=wi.getDaynhqfdl()?wi.getDaynhqfdl():0.0;// 性能损失
+        double gzss = null!=wi.getDaynhgzssdl()?wi.getDaynhgzssdl():0.0;// 故障损失
+        double xdss = null!=wi.getDaynhxdssdl()?wi.getDaynhxdssdl():0.0;// 限电损失
+        double slss = null!=wi.getDaynhcfdl()?wi.getDaynhcfdl():0.0;// 受累损失
+        double whss = null!=wi.getDaynhwhssdl()?wi.getDaynhwhssdl():0.0;// 性能损失
         double temp = xnss + fdl+ gzss+ xdss+ slss+ whss;
 
         if (temp != 0) {

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

@@ -1,4 +1,5 @@
 import com.gyee.healthmodel.HealthmodelMain;
+import com.gyee.healthmodel.service.HealthJudgeService;
 import com.gyee.healthmodel.service.RecommenmainsService;
 import com.gyee.healthmodel.util.SpringUtils;
 import lombok.SneakyThrows;
@@ -15,14 +16,15 @@ public class HealthTest {
 
         System.out.println("调度程序执行开始!........");
 
-//        HealthJudgeService healthJudgeService= SpringUtils.getBean("healthJudgeService");
+        HealthJudgeService healthJudgeService= SpringUtils.getBean("healthJudgeService");
 //        healthJudgeService.healthJudge3();
+        healthJudgeService.changeHealthModelValue();
        RecommenmainsService recommenmainsService= SpringUtils.getBean("recommenmainsService");
         Calendar cal = Calendar.getInstance();
-        recommenmainsService.deleteList(cal.getTime());
-        recommenmainsService.recommenMainWt();
-//        healthJudgeService.saveWindturbineBjCount();
-// healthJudgeService.savePartbjcount();
+//        recommenmainsService.deleteList(cal.getTime());
+//        recommenmainsService.recommenMainWt();
+        healthJudgeService.saveWindturbineBjCount();
+ healthJudgeService.savePartbjcount();
          System.out.println("调度任务处理完成!........");