Merge remote-tracking branch 'origin/master'

realtime/generationXK-service/src/main/java/com/gyee/generation/config/XxlJobConfig.java

@@ -1,88 +1,88 @@
-//package com.gyee.generation.config;
-//
-//
-//import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.context.EnvironmentAware;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.context.annotation.PropertySource;
-//import org.springframework.core.env.Environment;
-//
-///**
-// * xxl-job config
-// *
-// * @author xuxueli 2017-04-28
-// */
-//
-//
-//@Configuration
-////@PropertySource("classpath:xxl-job-executor.properties")
-////@PropertySource("classpath:xxl-job-executor2.properties")
+package com.gyee.generation.config;
+
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+
+
+@Configuration
+//@PropertySource("classpath:xxl-job-executor.properties")
+//@PropertySource("classpath:xxl-job-executor2.properties")
 //@PropertySource("classpath:xxl-job-executor3.properties")
-////@PropertySource("classpath:xxl-job-executor4.properties")
-////@PropertySource("classpath:xxl-job-executor5.properties")
-////@PropertySource("classpath:xxl-job-executorWPLY.properties")
-////@PropertySource("classpath:xxl-job-executorRG.properties")
-////@PropertySource("classpath:xxl-job-executorJN.properties")
-////
-////@PropertySource("classpath:xxl-job-accuracy.properties")
-////@PropertySource("classpath:xxl-job-7001.properties")
-////@PropertySource("classpath:xxl-job-7002.properties")
-////@PropertySource("classpath:xxl-job-7003.properties")
-////@PropertySource("classpath:xxl-job-executorGF000.properties")
-////@PropertySource("classpath:xxl-job-executorGF001.properties")
-////@PropertySource("classpath:xxl-job-executorGF002.properties")
-////@PropertySource("classpath:xxl-job-executorGF003.properties")
-////@PropertySource("classpath:xxl-job-executorGF004.properties")
-////@PropertySource("classpath:xxl-job-executorGF005.properties")
-////@PropertySource("classpath:xxl-job-executorGF006.properties")
-//
-////@PropertySource("classpath:xxl-job-region.properties")
-//public class XxlJobConfig implements EnvironmentAware {
-//    private Environment env;
-//
-//
-//    @Override
-//    public void setEnvironment(Environment environment) {
-//        this.env = environment;
-//    }
-//
-//    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
-//
-//
-//    @Bean
-//    public XxlJobSpringExecutor xxlJobExecutor() {
-//        logger.info(">>>>>>>>>>> xxl-job config init.");
-//        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-//        xxlJobSpringExecutor.setAdminAddresses(env.getProperty("xxl.job.admin.addresses"));
-//        xxlJobSpringExecutor.setAppname(env.getProperty("xxl.job.executor.appname"));
-//        xxlJobSpringExecutor.setAddress(env.getProperty("xxl.job.executor.address"));
-//        xxlJobSpringExecutor.setIp(env.getProperty("xxl.job.executor.ip"));
-//        xxlJobSpringExecutor.setPort(Integer.parseInt(env.getProperty("xxl.job.executor.port")));
-//        xxlJobSpringExecutor.setAccessToken(env.getProperty("xxl.job.accessToken"));
-//        xxlJobSpringExecutor.setLogPath(env.getProperty("xxl.job.executor.logpath"));
-//        xxlJobSpringExecutor.setLogRetentionDays(Integer.parseInt(env.getProperty("xxl.job.executor.logretentiondays")));
-//        return xxlJobSpringExecutor;
-//    }
-//
-//    /**
-//     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
-//     *
-//     *      1、引入依赖：
-//     *          <dependency>
-//     *             <groupId>org.springframework.cloud</groupId>
-//     *             <artifactId>spring-cloud-commons</artifactId>
-//     *             <version>${version}</version>
-//     *         </dependency>
-//     *
-//     *      2、配置文件，或者容器启动变量
-//     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
-//     *
-//     *      3、获取IP
-//     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
-//     */
-//
+@PropertySource("classpath:xxl-job-executor4.properties")
+//@PropertySource("classpath:xxl-job-executor5.properties")
+//@PropertySource("classpath:xxl-job-executorWPLY.properties")
+//@PropertySource("classpath:xxl-job-executorRG.properties")
+//@PropertySource("classpath:xxl-job-executorJN.properties")
 //
-//}
+//@PropertySource("classpath:xxl-job-accuracy.properties")
+//@PropertySource("classpath:xxl-job-7001.properties")
+//@PropertySource("classpath:xxl-job-7002.properties")
+//@PropertySource("classpath:xxl-job-7003.properties")
+//@PropertySource("classpath:xxl-job-executorGF000.properties")
+//@PropertySource("classpath:xxl-job-executorGF001.properties")
+//@PropertySource("classpath:xxl-job-executorGF002.properties")
+//@PropertySource("classpath:xxl-job-executorGF003.properties")
+//@PropertySource("classpath:xxl-job-executorGF004.properties")
+//@PropertySource("classpath:xxl-job-executorGF005.properties")
+//@PropertySource("classpath:xxl-job-executorGF006.properties")
+
+//@PropertySource("classpath:xxl-job-region.properties")
+public class XxlJobConfig implements EnvironmentAware {
+    private Environment env;
+
+
+    @Override
+    public void setEnvironment(Environment environment) {
+        this.env = environment;
+    }
+
+    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+
+    @Bean
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        logger.info(">>>>>>>>>>> xxl-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(env.getProperty("xxl.job.admin.addresses"));
+        xxlJobSpringExecutor.setAppname(env.getProperty("xxl.job.executor.appname"));
+        xxlJobSpringExecutor.setAddress(env.getProperty("xxl.job.executor.address"));
+        xxlJobSpringExecutor.setIp(env.getProperty("xxl.job.executor.ip"));
+        xxlJobSpringExecutor.setPort(Integer.parseInt(env.getProperty("xxl.job.executor.port")));
+        xxlJobSpringExecutor.setAccessToken(env.getProperty("xxl.job.accessToken"));
+        xxlJobSpringExecutor.setLogPath(env.getProperty("xxl.job.executor.logpath"));
+        xxlJobSpringExecutor.setLogRetentionDays(Integer.parseInt(env.getProperty("xxl.job.executor.logretentiondays")));
+        return xxlJobSpringExecutor;
+    }
+
+    /**
+     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
+     *
+     *      1、引入依赖：
+     *          <dependency>
+     *             <groupId>org.springframework.cloud</groupId>
+     *             <artifactId>spring-cloud-commons</artifactId>
+     *             <version>${version}</version>
+     *         </dependency>
+     *
+     *      2、配置文件，或者容器启动变量
+     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+     *
+     *      3、获取IP
+     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+     */
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo1Service.java

@@ -86,23 +86,56 @@ public class EquipmentInfo1Service {
 //                    edosUtil,latch)).start();
 //        }
 //        latch.await();
+//
+//        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
+//
+//
+//            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
+//            for (ProBasicEquipment wt : entry.getValue()) {
+//                if (!wpls.contains(wt.getWindpowerstationId())) {
+//                    wpls.add(wt.getWindpowerstationId());
+//                }
+//
+//                new Thread(new EquipmentInfo1Thread(executor,  wt,  pep1map,
+//                        recordDate,  end,  begin,dayls,
+//                        edosUtil,latch)).start();
+//
+//            }
+//            latch.await();
+//        }
+        List<ProBasicEquipment> wttemps = new ArrayList<>();
 
-        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
+        for(ProBasicEquipment wt:CacheContext.wtls) {
 
+            if (!wpls.contains(wt.getWindpowerstationId())) {
+                wpls.add(wt.getWindpowerstationId());
+            }
+            wttemps.add(wt);
+            if (wttemps.size() == 500) {
 
-            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
-            for (ProBasicEquipment wt : entry.getValue()) {
-                if (!wpls.contains(wt.getWindpowerstationId())) {
-                    wpls.add(wt.getWindpowerstationId());
+                final CountDownLatch latch = new CountDownLatch(500);
+                for (ProBasicEquipment wt1 : wttemps) {
+                    new Thread(new EquipmentInfo1Thread(executor, wt1, pep1map,
+                            recordDate, end, begin, dayls,
+                            edosUtil, latch)).start();
                 }
+                latch.await();
+                wttemps = new ArrayList<>();
+            }
 
-                new Thread(new EquipmentInfo1Thread(executor,  wt,  pep1map,
-                        recordDate,  end,  begin,dayls,
-                        edosUtil,latch)).start();
+        }
 
+        if (!wttemps.isEmpty()) {
+            final CountDownLatch latch = new CountDownLatch(wttemps.size());
+            for (ProBasicEquipment wt1 : wttemps) {
+                new Thread(new EquipmentInfo1Thread(executor, wt1, pep1map,
+                        recordDate, end, begin, dayls,
+                        edosUtil, latch)).start();
             }
             latch.await();
         }
+
+
         c=Calendar.getInstance();
         c.setTime(recordDate);
 

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo2Service.java

@@ -41,9 +41,8 @@ public class EquipmentInfo2Service {
     public void calEquipmentInfoDay(Date recordDate) throws Exception {
         Calendar c = Calendar.getInstance();
         c.setTime(recordDate);
-        if(c.get(Calendar.MINUTE)==0)
-        {
-            c.add(Calendar.DAY_OF_MONTH,-1);
+        if (c.get(Calendar.MINUTE) == 0) {
+            c.add(Calendar.DAY_OF_MONTH, -1);
         }
 
         c.set(Calendar.HOUR_OF_DAY, 23);
@@ -109,25 +108,55 @@ public class EquipmentInfo2Service {
 //                    edosUtil,latch)).start();
 //        }
 //        latch.await();
+//
+//        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
+//
+//
+//            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
+//            for (ProBasicEquipment wt : entry.getValue()) {
+//                if (!wpls.contains(wt.getWindpowerstationId())) {
+//                    wpls.add(wt.getWindpowerstationId());
+//                }
+//
+//                new Thread(new EquipmentInfo2Thread(executor,  wt,  pep2map,
+//                    recordDate,  end,  begin,dayls,
+//                    edosUtil,latch)).start();
+//
+//            }
+//            latch.await();
+//        }
+        List<ProBasicEquipment> wttemps = new ArrayList<>();
 
-        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
-
+        for(ProBasicEquipment wt:CacheContext.wtls) {
 
-            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
-            for (ProBasicEquipment wt : entry.getValue()) {
-                if (!wpls.contains(wt.getWindpowerstationId())) {
-                    wpls.add(wt.getWindpowerstationId());
+            if (!wpls.contains(wt.getWindpowerstationId())) {
+                wpls.add(wt.getWindpowerstationId());
+            }
+            wttemps.add(wt);
+            if (wttemps.size() == 500) {
+
+                final CountDownLatch latch = new CountDownLatch(500);
+                for (ProBasicEquipment wt1 : wttemps) {
+                    new Thread(new EquipmentInfo2Thread(executor, wt1, pep2map,
+                            recordDate, end, begin, dayls,
+                            edosUtil, latch)).start();
                 }
+                latch.await();
+                wttemps = new ArrayList<>();
+            }
 
-                new Thread(new EquipmentInfo2Thread(executor,  wt,  pep2map,
-                    recordDate,  end,  begin,dayls,
-                    edosUtil,latch)).start();
+        }
 
+        if (!wttemps.isEmpty()) {
+            final CountDownLatch latch = new CountDownLatch(wttemps.size());
+            for (ProBasicEquipment wt1 : wttemps) {
+                new Thread(new EquipmentInfo2Thread(executor, wt1, pep2map,
+                        recordDate, end, begin, dayls,
+                        edosUtil, latch)).start();
             }
             latch.await();
         }
 
-
         c = Calendar.getInstance();
         c.setTime(recordDate);
 

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo3Service.java

@@ -119,21 +119,52 @@ public class EquipmentInfo3Service {
 //                    edosUtil,latch)).start();
 //        }
 //        latch.await();
+//
+//
+//        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
+//
+//
+//            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
+//            for (ProBasicEquipment wt : entry.getValue()) {
+//                if (!wpls.contains(wt.getWindpowerstationId())) {
+//                    wpls.add(wt.getWindpowerstationId());
+//                }
+//
+//                new Thread(new EquipmentInfo3Thread(executor,  wt,  pep3map,
+//                        recordDate,  end,  begin,dayls,
+//                        edosUtil,latch)).start();
+//
+//            }
+//            latch.await();
+//        }
+        List<ProBasicEquipment> wttemps = new ArrayList<>();
 
+        for(ProBasicEquipment wt:CacheContext.wtls) {
 
-        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
-
-
-            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
-            for (ProBasicEquipment wt : entry.getValue()) {
-                if (!wpls.contains(wt.getWindpowerstationId())) {
-                    wpls.add(wt.getWindpowerstationId());
+            if (!wpls.contains(wt.getWindpowerstationId())) {
+                wpls.add(wt.getWindpowerstationId());
+            }
+            wttemps.add(wt);
+            if (wttemps.size() == 500) {
+
+                final CountDownLatch latch = new CountDownLatch(500);
+                for (ProBasicEquipment wt1 : wttemps) {
+                    new Thread(new EquipmentInfo3Thread(executor, wt1, pep3map,
+                            recordDate, end, begin, dayls,
+                            edosUtil, latch)).start();
                 }
+                latch.await();
+                wttemps = new ArrayList<>();
+            }
 
-                new Thread(new EquipmentInfo3Thread(executor,  wt,  pep3map,
-                        recordDate,  end,  begin,dayls,
-                        edosUtil,latch)).start();
+        }
 
+        if (!wttemps.isEmpty()) {
+            final CountDownLatch latch = new CountDownLatch(wttemps.size());
+            for (ProBasicEquipment wt1 : wttemps) {
+                new Thread(new EquipmentInfo3Thread(executor, wt1, pep3map,
+                        recordDate, end, begin, dayls,
+                        edosUtil, latch)).start();
             }
             latch.await();
         }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/PowerCurveFittingByTimeService.java

@@ -1654,11 +1654,11 @@ public class PowerCurveFittingByTimeService {
 
             for(int j=i-10;j<i;j++)
             {
-                //设置时间为10分钟前，10钟前有停机事件数据进行过滤
-                if (ztls.get(j).getPointValueInDouble() == 4) {
-
-                    return false;
-                }
+//                //设置时间为10分钟前，10钟前有停机事件数据进行过滤
+//                if (ztls.get(j).getPointValueInDouble() == 4) {
+//
+//                    return false;
+//                }
                 //设置时间为10分钟后，运行后10分钟数据进行过滤
                 if (ztls.get(j).getPointValueInDouble() != 2) {
 
@@ -1667,6 +1667,22 @@ public class PowerCurveFittingByTimeService {
             }
         }
 
+        int number=i+10;
+
+        if(number>ztls.size())
+        {
+            number=ztls.size();
+        }
+
+        for(int j=i;j<number;j++)
+        {
+
+            //设置时间为10分钟后，运行后10分钟数据进行过滤
+            if (ztls.get(j).getPointValueInDouble() != 2) {
+
+                return false;
+            }
+        }
 
         if (CacheContext.wtmap.containsKey(windturbineId)) {
             String modelid = CacheContext.wtmap.get(windturbineId).getModelId();

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindDeviationService.java

@@ -39,7 +39,7 @@ public class WindDeviationService {
     public void save(String begin,String end){
 
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
-        List<ProBasicEquipment> wtls = CacheContext.wtls;
+        List<ProBasicEquipment> wtfdls = CacheContext.wtfdls;
         Map<String, Double> modelpower = CacheContext.modelpower;
         List<ProEconEquipmentDeviatSpeed> speedsResultList = new ArrayList<>();
         List<ProEconEquipmentDeviatPower> powersResultList = new ArrayList<>();
@@ -54,7 +54,7 @@ public class WindDeviationService {
             del.lambda().eq(ProEconEquipmentDeviatSpeed::getRecordDate,date);
             proEconEquipmentDeviatSpeedService.remove(del);
 
-            wtls.stream().forEach(wt->{
+            wtfdls.stream().forEach(wt->{
                 if (wt.getEquipmentCategory()==-1){
                     Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
 

realtime/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/math/LineUtil.java

@@ -35,6 +35,8 @@ public class LineUtil {
 
         double[] coefficient = multiLine(arrX, arrY, length, dimension);
 
+        double gl=0.0;
+
         for (double i = arrX[0]; i <= arrX[arrX.length - 1]; i += scale)
         {
             PointVo point = new PointVo();
@@ -49,7 +51,12 @@ public class LineUtil {
                 }else
                 {
                     double temp=coefficient[j] * Math.pow(point.getX(), (double)j);
-                    point.setY(point.getY()+temp);
+
+                    if(temp>0)
+                    {
+                        point.setY(point.getY()+temp);
+                    }
+
                 }
 
             }
@@ -72,6 +79,11 @@ public class LineUtil {
                 max = point.getY();
             }
 
+            if(point.getY()<gl)
+            {
+                point.setY(gl);
+            }
+            gl=point.getY();
             points.add(point);
         }
         builder(points, min, max);

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()));
 
 

web/health/src/main/java/com/gyee/health/mapper/auto/AlarmsnapMapper.java

@@ -31,8 +31,8 @@ public interface AlarmsnapMapper extends BaseMapper<Alarmsnap> {
             "    and a.alerttime>= '${beginDate}' and a.alerttime < '${endDate}'")
     List<TotalNumsVo> getAlarmhistoryList(@Param("tname") String tname, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
     @DS("slave")
-    @Select(" select t.altype typeId,r.ednavalue numbers,r.id,t.name from alertrule2 r,alertrulefailuresub t where t.tid=r.id and t.altype is not null ")
-    List<TotalNumVo> findAlertrulefailuresubMap();
+    @Select(" select components typeId,count(alarmid) numbers from alarmWt where stationid = '${wpId}' and ts >= #{begin} and ts <= #{end}  group by components ")
+    List<TotalNumVo> findAlertrulefailuresubMap( @Param(value = "wpId")String wpId,@Param("begin")long begin,@Param("end")long end);
 
 
 }

web/health/src/main/java/com/gyee/health/model/custom/TotalNumVo.java

@@ -11,17 +11,17 @@ public class TotalNumVo  implements Serializable{
 	
 	private String wtId;
 	private String typeId;
-	private Integer numbers;
+	private String numbers;
 	public String getWtId() {
 		return wtId;
 	}
 	public void setWtId(String wtId) {
 		this.wtId = wtId;
 	}
-	public Integer getNumbers() {
+	public String getNumbers() {
 		return numbers;
 	}
-	public void setNumbers(Integer numbers) {
+	public void setNumbers(String numbers) {
 		this.numbers = numbers;
 	}
 	public String getTypeId() {

web/health/src/main/java/com/gyee/health/service/auto/impl/ProEconAlarmRuleFailureServiceImpl.java

@@ -29,7 +29,7 @@ public class ProEconAlarmRuleFailureServiceImpl extends ServiceImpl<ProEconAlarm
     public List<ProEconAlarmRuleFailure> queryObject(String name, String wpId,String modelId) {
         List<ProEconAlarmRuleFailure> ls = new ArrayList<>();
 
-        if (StringUtils.notEmp(name) && StringUtils.notEmp(modelId) && StringUtils.notEmp(wpId)) {
+        if (StringUtils.notEmp(name)) {
             ls = proEconAlarmRuleFailureMapper.queryObject(name,wpId,modelId);
         }
         return ls;

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

@@ -235,9 +235,18 @@ public class HealthReportService {
                                     String gz1=gzarr[0];
                                     String gz2=gzarr[1];
                                     String gz3=gzarr[2];
+                                    List<ProEconAlarmRuleFailure> afls=null;
 
+                                    if(gz1.equals("风速突变"))
+                                    {
+                                       afls=proEconAlarmRuleFailureService.queryObject(gz1,null,null);
+
+                                    }else
+                                    {
+                                         afls=proEconAlarmRuleFailureService.queryObject(gz1,wt.getWindpowerstationId(),wt.getModelId());
+
+                                    }
 
-                                    List<ProEconAlarmRuleFailure> afls=proEconAlarmRuleFailureService.queryObject(gz1,wt.getWindpowerstationId(),wt.getModelId());
                                     if(!afls.isEmpty())
                                     {
 

web/health/src/main/java/com/gyee/health/service/health/LossPowerRateHealthService.java

@@ -13,6 +13,7 @@ import com.gyee.health.model.custom.TotalNumVo;
 import com.gyee.health.model.custom.TotalNumsVo;
 import com.gyee.health.service.TokenService;
 import com.gyee.health.service.auto.IProBasicEquipmentPointService;
+import com.gyee.health.util.DateUtils;
 import com.gyee.health.util.IRealTimeDataBaseUtil;
 import com.gyee.health.util.RealTimeDataBaseFactory;
 import com.gyee.health.util.StringUtils;
@@ -60,7 +61,7 @@ public class LossPowerRateHealthService {
 
         Map<String, List<String>> ahmap =getAlarmhistoryLMap();
 
-        Map<String, String> altypemap = findAlertrulefailuresubMap();
+        Map<String, String> altypemap = findAlertrulefailuresubMap(wpId);
 
         List<HealthmodelrecordsVo> vos = new ArrayList<HealthmodelrecordsVo>();
         int id = 0;
@@ -241,11 +242,14 @@ public class LossPowerRateHealthService {
         return map;
     }
 
-    private Map<String, String> findAlertrulefailuresubMap() {
+    private Map<String, String> findAlertrulefailuresubMap(String wpId) {
 
         Map<String, String> map = new HashMap<String, String>();
-
-        List<TotalNumVo> list =alarmsnapMapper.findAlertrulefailuresubMap();
+        Calendar c=Calendar.getInstance();
+        Date end=c.getTime();
+        c.setTime(DateUtils.truncate(c.getTime()));
+        Date begin=c.getTime();
+        List<TotalNumVo> list =alarmsnapMapper.findAlertrulefailuresubMap(wpId,begin.getTime(),end.getTime());
 
         if (!list.isEmpty()) {
             for (TotalNumVo vo : list) {

web/health/src/main/java/com/gyee/health/service/health/WindTurbineHealthListService.java

@@ -11,6 +11,7 @@ import com.gyee.health.model.custom.HealthmodelrecordsVo;
 import com.gyee.health.model.custom.TotalNumVo;
 import com.gyee.health.model.custom.TotalNumsVo;
 import com.gyee.health.service.auto.IProBasicEquipmentPointService;
+import com.gyee.health.util.DateUtils;
 import com.gyee.health.util.IRealTimeDataBaseUtil;
 import com.gyee.health.util.RealTimeDataBaseFactory;
 import com.gyee.health.util.StringUtils;
@@ -54,7 +55,7 @@ public class WindTurbineHealthListService {
 
         Map<String, List<String>> ahmap =getAlarmhistoryLMap(wpId);
 
-        Map<String, String> altypemap = findAlertrulefailuresubMap();
+        Map<String, String> altypemap = findAlertrulefailuresubMap(wpId);
 
         List<HealthmodelrecordsVo> vos = new ArrayList<>();
         if(CacheContext.wpwtmap.containsKey(wpId))
@@ -255,11 +256,15 @@ public class WindTurbineHealthListService {
         return map;
     }
 
-    private Map<String, String> findAlertrulefailuresubMap() {
+    private Map<String, String> findAlertrulefailuresubMap(String wpId) {
 
         Map<String, String> map = new HashMap<String, String>();
 
-        List<TotalNumVo> list =alarmsnapMapper.findAlertrulefailuresubMap();
+        Calendar c=Calendar.getInstance();
+        Date end=c.getTime();
+        c.setTime(DateUtils.truncate(c.getTime()));
+        Date begin=c.getTime();
+        List<TotalNumVo> list =alarmsnapMapper.findAlertrulefailuresubMap(wpId,begin.getTime(),end.getTime());
 
         if (!list.isEmpty()) {
             for (TotalNumVo vo : list) {

web/health/src/main/java/com/gyee/health/service/leaderboard/LeaderboardService.java

@@ -91,8 +91,8 @@ public class LeaderboardService {
                     if (c == wc.getSpeed()) {
                         vo.setValue1(wc.getSpeed());
                         if (StringUtils.notEmp(type) && type.equals(SJBZ) && null != modelmap) {
-                            if (modelmap.containsKey(String.valueOf(wc.getSpeed()))) {
-                                ProBasicModelPowerRd mp = modelmap.get(String.valueOf(wc.getSpeed()));
+                            if (modelmap.containsKey(wc.getSpeed())) {
+                                ProBasicModelPowerRd mp = modelmap.get(wc.getSpeed());
                                 vo.setValue3(mp.getEnsurePower());
                             } else {
                                 vo.setValue3(0.0);
@@ -104,8 +104,8 @@ public class LeaderboardService {
                             vo.setValue3(wc.getOptimalPower());
 
                         } else if (StringUtils.notEmp(type) && type.equals(ZYBZ) && null != modelmap) {
-                            if (modelmap.containsKey(String.valueOf(wc.getSpeed()))) {
-                                ProBasicModelPowerRd mp = modelmap.get(String.valueOf(wc.getSpeed()));
+                            if (modelmap.containsKey(wc.getSpeed())) {
+                                ProBasicModelPowerRd mp = modelmap.get(wc.getSpeed());
                                 vo.setValue3(mp.getEnsurePower());
                             } else {
                                 vo.setValue3(0.0);
@@ -264,7 +264,7 @@ public class LeaderboardService {
 
             if(StringUtils.notEmp(stid))
             {
-                List<ProEconWtCurveFitting> stmonthls = proEconWtCurveFittingService.comparechatAjax(wtId,recorddate);
+                List<ProEconWtCurveFitting> stmonthls = proEconWtCurveFittingService.comparechatAjax(stid,recorddate);
 
                 if (null != stmonthls && !stmonthls.isEmpty()) {
 
@@ -399,8 +399,8 @@ public class LeaderboardService {
                     if (c == wc.getSpeed()) {
                         vo.setValue1(wc.getSpeed());
                         if (StringUtils.notEmp(type) && type.equals(SJBZ) && null != modelmap) {
-                            if (modelmap.containsKey(String.valueOf(wc.getSpeed()))) {
-                                ProBasicModelPowerRd mp = modelmap.get(String.valueOf(wc.getSpeed()));
+                            if (modelmap.containsKey(wc.getSpeed())) {
+                                ProBasicModelPowerRd mp = modelmap.get(wc.getSpeed());
                                 vo.setValue3(mp.getEnsurePower());
                             } else {
                                 vo.setValue3(0.0);
@@ -415,8 +415,8 @@ public class LeaderboardService {
                             name1 = "实际功率";
                             name2 = "最优功率";
                         } else if (StringUtils.notEmp(type) && type.equals(ZYBZ) && null != modelmap) {
-                            if (modelmap.containsKey(String.valueOf(wc.getSpeed()))) {
-                                ProBasicModelPowerRd mp = modelmap.get(String.valueOf(wc.getSpeed()));
+                            if (modelmap.containsKey(wc.getSpeed())) {
+                                ProBasicModelPowerRd mp = modelmap.get(wc.getSpeed());
                                 vo.setValue3(mp.getEnsurePower());
                             } else {
                                 vo.setValue3(0.0);