web系统意外卡死，bug排查修整注释

web/runeconomy-xk/src/main/java/com/gyee/RunEconomyApplication.java

@@ -8,7 +8,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.system.ApplicationHome;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
-import org.springframework.scheduling.annotation.EnableScheduling;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -16,7 +15,7 @@ import java.net.UnknownHostException;
 
 @Log4j2
 @SpringBootApplication
-@EnableScheduling
+//@EnableScheduling
 @MapperScan("com.gyee.runeconomy.mapper,com.gyee.jinneng_kpi.mapper")
 public class RunEconomyApplication {
 

web/runeconomy-xk/src/main/java/com/gyee/neic_service/config/ActiveMQConfig.java

@@ -1,17 +1,17 @@
-package com.gyee.neic_service.config;
-
-import org.apache.activemq.command.ActiveMQTopic;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 消息队列配置
- */
-@Configuration
-public class ActiveMQConfig {
-
-    @Bean
-    public ActiveMQTopic topic() {
-        return new ActiveMQTopic("LVSP.function");
-    }
-}
+//package com.gyee.neic_service.config;
+//
+//import org.apache.activemq.command.ActiveMQTopic;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+///**
+// * 消息队列配置
+// */
+//@Configuration
+//public class ActiveMQConfig {
+//
+//    @Bean
+//    public ActiveMQTopic topic() {
+//        return new ActiveMQTopic("LVSP.function");
+//    }
+//}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/config/ThreadPoolConfig.java

@@ -1,76 +1,76 @@
-package com.gyee.neic_service.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-import java.util.concurrent.ThreadPoolExecutor;
-
-/**
- * 线程池配置
- *
- * @author xysn
- */
-@Configuration
-public class ThreadPoolConfig {
-
-    /**
-     *   默认情况下，在创建了线程池后，线程池中的线程数为0，当有任务来之后，就会创建一个线程去执行任务，
-     *	当线程池中的线程数目达到corePoolSize后，就会把到达的任务放到缓存队列当中；
-     *  当队列满了，就继续创建线程，当线程数量大于等于maxPoolSize后，开始使用拒绝策略拒绝
-     */
-
-    /**
-     * 核心线程数（默认线程数）
-     */
-    private static final int corePoolSize = 40;
-    /**
-     * 最大线程数
-     */
-    private static final int maxPoolSize = 100;
-    /**
-     * 允许线程空闲时间（单位：默认为秒）
-     */
-    private static final int keepAliveTime = 60;
-    /**
-     * 缓冲队列大小
-     */
-    private static final int queueCapacity = 300;
-    /**
-     * 允许等待最长时间
-     */
-    private static final int awaitTime = 15;
-    /**
-     * 线程池名前缀
-     */
-    private static final String threadNamePrefix = "Alarm-Thread-";
-
-    private ThreadPoolTaskExecutor executor;
-
-    public ThreadPoolTaskExecutor getExecutor() {
-        if (executor == null) {
-            executor = taskExecutor();
-        }
-
-        return executor;
-    }
-
-
-    @Bean
-    public ThreadPoolTaskExecutor taskExecutor() {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(corePoolSize);
-        executor.setMaxPoolSize(maxPoolSize);
-        executor.setQueueCapacity(queueCapacity);
-        executor.setKeepAliveSeconds(keepAliveTime);
-        executor.setThreadNamePrefix(threadNamePrefix);
-        executor.setAwaitTerminationSeconds(awaitTime);
-
-        // 线程池对拒绝任务的处理策略
-        // CallerRunsPolicy：由调用线程（提交任务的线程）处理该任务
-        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-        // 初始化
-        executor.initialize();
-        return executor;
-    }
-}
+//package com.gyee.neic_service.config;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+//
+//import java.util.concurrent.ThreadPoolExecutor;
+//
+///**
+// * 线程池配置
+// *
+// * @author xysn
+// */
+//@Configuration
+//public class ThreadPoolConfig {
+//
+//    /**
+//     *   默认情况下，在创建了线程池后，线程池中的线程数为0，当有任务来之后，就会创建一个线程去执行任务，
+//     *	当线程池中的线程数目达到corePoolSize后，就会把到达的任务放到缓存队列当中；
+//     *  当队列满了，就继续创建线程，当线程数量大于等于maxPoolSize后，开始使用拒绝策略拒绝
+//     */
+//
+//    /**
+//     * 核心线程数（默认线程数）
+//     */
+//    private static final int corePoolSize = 40;
+//    /**
+//     * 最大线程数
+//     */
+//    private static final int maxPoolSize = 100;
+//    /**
+//     * 允许线程空闲时间（单位：默认为秒）
+//     */
+//    private static final int keepAliveTime = 60;
+//    /**
+//     * 缓冲队列大小
+//     */
+//    private static final int queueCapacity = 300;
+//    /**
+//     * 允许等待最长时间
+//     */
+//    private static final int awaitTime = 15;
+//    /**
+//     * 线程池名前缀
+//     */
+//    private static final String threadNamePrefix = "Alarm-Thread-";
+//
+//    private ThreadPoolTaskExecutor executor;
+//
+//    public ThreadPoolTaskExecutor getExecutor() {
+//        if (executor == null) {
+//            executor = taskExecutor();
+//        }
+//
+//        return executor;
+//    }
+//
+//
+//    @Bean
+//    public ThreadPoolTaskExecutor taskExecutor() {
+//        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+//        executor.setCorePoolSize(corePoolSize);
+//        executor.setMaxPoolSize(maxPoolSize);
+//        executor.setQueueCapacity(queueCapacity);
+//        executor.setKeepAliveSeconds(keepAliveTime);
+//        executor.setThreadNamePrefix(threadNamePrefix);
+//        executor.setAwaitTerminationSeconds(awaitTime);
+//
+//        // 线程池对拒绝任务的处理策略
+//        // CallerRunsPolicy：由调用线程（提交任务的线程）处理该任务
+//        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+//        // 初始化
+//        executor.initialize();
+//        return executor;
+//    }
+//}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/feigns/FeignsBuilder.java

@@ -1,56 +1,56 @@
-package com.gyee.neic_service.feigns;
-
-import feign.Feign;
-import feign.Request;
-import feign.Retryer;
-import feign.jackson.JacksonDecoder;
-import feign.jackson.JacksonEncoder;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author xysn
- */
-@Configuration
-public class FeignsBuilder {
-    /**
-     * 数据适配器url
-     */
-    @Value("${urls.adapter: http://127.0.0.1:8011}")
-    private String adapterUrl;
-
-    /**
-     * 推荐url
-     */
-    @Value("${recommendationUrl: http://127.0.0.1:8101}")
-    private String recommendationUrl;
-
-    /**
-     * 报警url
-     */
-    @Value("${shardingUrl:http://localhost:8075}")
-    private String shardingUrl;
-
-    @Bean
-    public IDataAdapter dataAdapter() {
-        return Feign.builder()
-                .encoder(new JacksonEncoder())
-                .decoder(new JacksonDecoder())
-                .options(new Request.Options(1000, 100000))
-                .retryer(new Retryer.Default(5000, 5000, 3))
-                .target(IDataAdapter.class, adapterUrl);
-    }
-
-
-
-    @Bean
-    public ISharding shardingService() {
-        return Feign.builder()
-                .encoder(new JacksonEncoder())
-                .decoder(new JacksonDecoder())
-                .options(new Request.Options(1000, 10000))
-                .retryer(new Retryer.Default(5000, 5000, 3))
-                .target(ISharding.class, shardingUrl);
-    }
-}
+//package com.gyee.neic_service.feigns;
+//
+//import feign.Feign;
+//import feign.Request;
+//import feign.Retryer;
+//import feign.jackson.JacksonDecoder;
+//import feign.jackson.JacksonEncoder;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+///**
+// * @author xysn
+// */
+//@Configuration
+//public class FeignsBuilder {
+//    /**
+//     * 数据适配器url
+//     */
+//    @Value("${urls.adapter: http://127.0.0.1:8011}")
+//    private String adapterUrl;
+//
+//    /**
+//     * 推荐url
+//     */
+//    @Value("${recommendationUrl: http://127.0.0.1:8101}")
+//    private String recommendationUrl;
+//
+//    /**
+//     * 报警url
+//     */
+//    @Value("${shardingUrl:http://localhost:8075}")
+//    private String shardingUrl;
+//
+//    @Bean
+//    public IDataAdapter dataAdapter() {
+//        return Feign.builder()
+//                .encoder(new JacksonEncoder())
+//                .decoder(new JacksonDecoder())
+//                .options(new Request.Options(1000, 100000))
+//                .retryer(new Retryer.Default(5000, 5000, 3))
+//                .target(IDataAdapter.class, adapterUrl);
+//    }
+//
+//
+//
+//    @Bean
+//    public ISharding shardingService() {
+//        return Feign.builder()
+//                .encoder(new JacksonEncoder())
+//                .decoder(new JacksonDecoder())
+//                .options(new Request.Options(1000, 10000))
+//                .retryer(new Retryer.Default(5000, 5000, 3))
+//                .target(ISharding.class, shardingUrl);
+//    }
+//}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/feigns/IDataAdapter.java

@@ -1,85 +1,85 @@
-package com.gyee.neic_service.feigns;
-
-import com.gyee.neic_service.dao.windturbine.PointData;
-import feign.Param;
-import feign.RequestLine;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * DataAdapter数据请求
- */
-public interface IDataAdapter {
-    /**
-     * 获取实时数据
-     *
-     * @param keys 以逗号(,)隔开的一个或多个标签
-     * @return 实时数据
-     */
-    @RequestLine("GET /ts/latest?keys={keys}")
-    Map<String, PointData> getValueByKeys(@Param(value = "keys") String keys);
-
-
-    /**
-     * 获取等间隔历史数据
-     *
-     * @param tagName  测点名称
-     * @param startTs  开始时间
-     * @param endTs    结束时间
-     * @param interval 数据间隔
-     * @return 历史数据
-     */
-    @RequestLine("GET /ts/history/snap?tagName={tagName}&startTs={startTs}&endTs={endTs}&interval={interval}")
-    List<PointData> getSnapValuesByKey(@Param(value = "tagName") String tagName, @Param(value = "startTs") long startTs,
-                                       @Param(value = "endTs") long endTs, @Param(value = "interval") int interval);
-
-
-    /**
-     * 获取等间隔历史数据
-     *
-     * @param thingId   设备ID
-     * @param thingType 设备类型
-     * @param startTs   开始时间
-     * @param endTs     结束时间
-     * @param interval  时间间隔
-     * @return 历史数据
-     */
-    @RequestLine("GET /ts/history/snap?thingId={thingId}&uniformCode={uniformCode}&thingType={thingType}&startTs={startTs}&endTs={endTs}&interval={interval}")
-    List<PointData> getSnapValuesByUniformCode(@Param(value = "thingId") String thingId, @Param(value = "uniformCode") String uniformCode,
-                                               @Param(value = "thingType") String thingType, @Param(value = "startTs") long startTs,
-                                               @Param(value = "endTs") long endTs, @Param(value = "interval") int interval);
-
-
-    /**
-     * 获取历史数据
-     *
-     * @param thingId   设备ID
-     * @param thingType 设备类型
-     * @param startTs   开始时间
-     * @param endTs     结束时间
-     * @return 历史数据
-     */
-    @RequestLine("GET /ts/history/raw?thingId={thingId}&uniformCode={uniformCode}&thingType={thingType}&startTs={startTs}&endTs={endTs}")
-    List<PointData> getRawValuesByUniformCode(@Param(value = "thingId") String thingId, @Param(value = "uniformCode") String uniformCode,
-                                              @Param(value = "thingType") String thingType, @Param(value = "startTs") long startTs,
-                                              @Param(value = "endTs") long endTs);
-
-    /**
-     * 获取历史数据
-     *
-     * @param tagName 测点名称
-     * @param startTs 开始时间
-     * @param endTs   结束时间
-     * @return 历史数据
-     */
-    @RequestLine("GET /ts/history/raw?tagName={tagName}&startTs={startTs}&endTs={endTs}")
-    List<PointData> getRawValuesByKey(@Param(value = "tagName") String tagName, @Param(value = "startTs") long startTs, @Param(value = "endTs") long endTs);
-
-
-    /**
-     * 获取历史时刻数据
-     */
-    @RequestLine("GET /ts/history/section?tagNames={tagNames}&ts={ts}")
-    Map<String, PointData> getHistorySection(@Param(value = "tagNames") String tagNames, @Param(value = "ts") long ts);
-}
+//package com.gyee.neic_service.feigns;
+//
+//import com.gyee.neic_service.dao.windturbine.PointData;
+//import feign.Param;
+//import feign.RequestLine;
+//
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * DataAdapter数据请求
+// */
+//public interface IDataAdapter {
+//    /**
+//     * 获取实时数据
+//     *
+//     * @param keys 以逗号(,)隔开的一个或多个标签
+//     * @return 实时数据
+//     */
+//    @RequestLine("GET /ts/latest?keys={keys}")
+//    Map<String, PointData> getValueByKeys(@Param(value = "keys") String keys);
+//
+//
+//    /**
+//     * 获取等间隔历史数据
+//     *
+//     * @param tagName  测点名称
+//     * @param startTs  开始时间
+//     * @param endTs    结束时间
+//     * @param interval 数据间隔
+//     * @return 历史数据
+//     */
+//    @RequestLine("GET /ts/history/snap?tagName={tagName}&startTs={startTs}&endTs={endTs}&interval={interval}")
+//    List<PointData> getSnapValuesByKey(@Param(value = "tagName") String tagName, @Param(value = "startTs") long startTs,
+//                                       @Param(value = "endTs") long endTs, @Param(value = "interval") int interval);
+//
+//
+//    /**
+//     * 获取等间隔历史数据
+//     *
+//     * @param thingId   设备ID
+//     * @param thingType 设备类型
+//     * @param startTs   开始时间
+//     * @param endTs     结束时间
+//     * @param interval  时间间隔
+//     * @return 历史数据
+//     */
+//    @RequestLine("GET /ts/history/snap?thingId={thingId}&uniformCode={uniformCode}&thingType={thingType}&startTs={startTs}&endTs={endTs}&interval={interval}")
+//    List<PointData> getSnapValuesByUniformCode(@Param(value = "thingId") String thingId, @Param(value = "uniformCode") String uniformCode,
+//                                               @Param(value = "thingType") String thingType, @Param(value = "startTs") long startTs,
+//                                               @Param(value = "endTs") long endTs, @Param(value = "interval") int interval);
+//
+//
+//    /**
+//     * 获取历史数据
+//     *
+//     * @param thingId   设备ID
+//     * @param thingType 设备类型
+//     * @param startTs   开始时间
+//     * @param endTs     结束时间
+//     * @return 历史数据
+//     */
+//    @RequestLine("GET /ts/history/raw?thingId={thingId}&uniformCode={uniformCode}&thingType={thingType}&startTs={startTs}&endTs={endTs}")
+//    List<PointData> getRawValuesByUniformCode(@Param(value = "thingId") String thingId, @Param(value = "uniformCode") String uniformCode,
+//                                              @Param(value = "thingType") String thingType, @Param(value = "startTs") long startTs,
+//                                              @Param(value = "endTs") long endTs);
+//
+//    /**
+//     * 获取历史数据
+//     *
+//     * @param tagName 测点名称
+//     * @param startTs 开始时间
+//     * @param endTs   结束时间
+//     * @return 历史数据
+//     */
+//    @RequestLine("GET /ts/history/raw?tagName={tagName}&startTs={startTs}&endTs={endTs}")
+//    List<PointData> getRawValuesByKey(@Param(value = "tagName") String tagName, @Param(value = "startTs") long startTs, @Param(value = "endTs") long endTs);
+//
+//
+//    /**
+//     * 获取历史时刻数据
+//     */
+//    @RequestLine("GET /ts/history/section?tagNames={tagNames}&ts={ts}")
+//    Map<String, PointData> getHistorySection(@Param(value = "tagNames") String tagNames, @Param(value = "ts") long ts);
+//}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/feigns/ISharding.java

@@ -1,128 +1,128 @@
-package com.gyee.neic_service.feigns;
-
-import com.gyee.neic_service.dao.entity.FaultHistory;
-import com.gyee.neic_service.dao.entity.FaultSnap;
-import com.gyee.neic_service.model.RequestInfo;
-import com.gyee.neic_service.model.alarm.AlertSnap;
-import com.gyee.neic_service.model.alarm.FaultInfo;
-import com.gyee.neic_service.model.alarm.OverhaulInfo;
-import feign.Headers;
-import feign.Param;
-import feign.RequestLine;
-
-import java.util.List;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2020-04-29
- */
-public interface ISharding {
-
-    @RequestLine("GET /alarm/snap?stationid={stationid}&windturbineid={windturbineid}&category1={category1}" +
-            "&category2={category2}&rank={rank}" +
-            "&isopened={isopened}&keyword={keyword}&starttime={starttime}&endtime={endtime}")
-    List<AlertSnap> getRealTimeAlarm(
-            @Param(value = "stationid") String stationid,
-            @Param(value = "windturbineid") String windturbineid,
-            @Param(value = "category1") String category1,
-            @Param(value = "category2") String category2,
-            @Param(value = "rank") String rank,
-            @Param(value = "isopened") Integer isopened,
-            @Param(value = "keyword") String keyWord,
-            @Param(value = "starttime") String startTime,
-            @Param(value = "endtime") String endTime
-    );
-
-    /**
-     * 获取一段时间的活跃报警
-     *
-     * @param startTime 开始时间 2021-10-16 12:01:01
-     * @param endTime   结束时间
-     * @return 报警列表
-     */
-    @RequestLine("GET /fault/snap/list?starttime={startTime}&endtime={endTime}&isopened=1")
-    List<FaultSnap> getFalutSnapListOpened(@Param(value = "startTime") String startTime, @Param(value = "endTime") String endTime);
-
-    /**
-     * 通过场站ID和机型获取报警缓存
-     *
-     * @param stationId 场站ID
-     * @param modelId   机型ID
-     * @return 报警缓存
-     */
-    @RequestLine("GET /alarm/snap?stationid={stationId}&modelid={modelId}")
-    List<AlertSnap> getAlarmSnapByStationAndModel(@Param(value = "stationId") String stationId, @Param(value = "modelId") String modelId);
-
-    //获取最新实时报警2   websocketController getRealTimeAlertInfo()
-    @RequestLine("GET /alarm/snap/single?windturbineid={wtId}&alertvalue={alertValue}")
-    List<AlertSnap> getRealTimeAlarmByObjectId(
-            @Param(value = "cateGory1") String cateGory1,
-            @Param(value = "objectId") String objectId,
-            @Param(value = "startTime") String startTime,
-            @Param(value = "isOpened") boolean isOpened //默认为1
-    );
-
-    //获取历史故障 websocketController getHistoryFaultInfo
-    @RequestLine("GET /fault/history/list?pagenum={pagenum}&pagesize={pagesize}&stationid={stationid}&keyword={keyword}&starttime={starttime}&endtime={endtime}")
-    List<FaultInfo> getFaultHistoryInfo(
-            @Param(value = "pagenum") Integer pagenum,
-            @Param(value = "pagesize") Integer pagesize,
-            @Param(value = "stationid") String stationid,
-            @Param(value = "keyword") String keyword,
-            @Param(value = "starttime") String starttime,
-            @Param(value = "endtime") String endtime
-    );
-
-    //故障确认故障 websocketController faultAlarmConfirm()
-    @Headers({"Content-Type: application/json", "Accept: application/json"})
-    @RequestLine("POST /fault/history")
-    void confirmFault(FaultHistory confirmData);
-
-    //根据id获取故障历史  getPopupStatus
-    @RequestLine("GET /fault/history/{historyId}")
-    FaultHistory getFaultHistoryById(@Param(value = "historyId") long historyId);
-
-
-    //获取故障弹窗状态  getPopupStatus
-    @RequestLine("GET /fault/snap/ids?ids={ids}")
-    List<FaultSnap> getFaultSnapByIdList(@Param(value = "ids") String ids);
-
-    //获取最新的一定数量的故障
-    @RequestLine("GET /fault/top?topnum={count}")
-    List<FaultInfo> getlatestFaultInfoByCount(@Param(value = "count") int count);
-
-    //获取当前正在活跃的故障
-    @RequestLine("GET /alarm/snap/single?windturbineid={wtId}&alertvalue={alertValue}")
-    List<FaultInfo> getlatestIsOpenedFaultInfo(
-            @Param(value = "confirmType") int confirmType,
-            @Param(value = "opened") int opened,
-            @Param(value = "messageType") int messageType,
-            @Param(value = "startTime") int startTime,
-            @Param(value = "endTime") int endTime);
-
-    //获取最新的一定数量的故障
-    @RequestLine("GET /fault/recent?faulttime={faulttime}")
-    List<FaultInfo> GetRealTimeFaultInfoByStartTime(@Param(value = "faulttime") String faulttime);
-
-
-    //一键清除弹窗
-    @RequestLine("GET /fault/clear?startTime={startTime}&endTime={endTime}")
-    void clearFault(@Param(value = "startTime") Long startTime, @Param(value = "endTime") Long endTime);
-
-    //确认时批量确认
-    @RequestLine("GET /fault/confirm?faultHistoryId={faultHistoryId}&confirmType={confirmType}&userName={userName}&snpaId={snpaId}")
-    void confirmBatch(@Param(value = "faultHistoryId") Long faultHistoryId,
-                      @Param(value = "confirmType") int confirmType,
-                      @Param(value = "userName") String userName,
-                      @Param(value = "snpaId") Long snpaId);
-
-
-    /**
-     * 获取检修信息
-     *
-     * @return 检修信息
-     */
-    @RequestLine("GET /inspectorder/order/list?startTime={startTime}&endTime={endTime}")
-    RequestInfo<OverhaulInfo> getInspectorder(@Param(value = "startTime") long startTime, @Param(value = "endTime") long endTime);
-}
+//package com.gyee.neic_service.feigns;
+//
+//import com.gyee.neic_service.dao.entity.FaultHistory;
+//import com.gyee.neic_service.dao.entity.FaultSnap;
+//import com.gyee.neic_service.model.RequestInfo;
+//import com.gyee.neic_service.model.alarm.AlertSnap;
+//import com.gyee.neic_service.model.alarm.FaultInfo;
+//import com.gyee.neic_service.model.alarm.OverhaulInfo;
+//import feign.Headers;
+//import feign.Param;
+//import feign.RequestLine;
+//
+//import java.util.List;
+//
+///**
+// * @descrition:
+// * @author:Wanghs
+// * @date:2020-04-29
+// */
+//public interface ISharding {
+//
+//    @RequestLine("GET /alarm/snap?stationid={stationid}&windturbineid={windturbineid}&category1={category1}" +
+//            "&category2={category2}&rank={rank}" +
+//            "&isopened={isopened}&keyword={keyword}&starttime={starttime}&endtime={endtime}")
+//    List<AlertSnap> getRealTimeAlarm(
+//            @Param(value = "stationid") String stationid,
+//            @Param(value = "windturbineid") String windturbineid,
+//            @Param(value = "category1") String category1,
+//            @Param(value = "category2") String category2,
+//            @Param(value = "rank") String rank,
+//            @Param(value = "isopened") Integer isopened,
+//            @Param(value = "keyword") String keyWord,
+//            @Param(value = "starttime") String startTime,
+//            @Param(value = "endtime") String endTime
+//    );
+//
+//    /**
+//     * 获取一段时间的活跃报警
+//     *
+//     * @param startTime 开始时间 2021-10-16 12:01:01
+//     * @param endTime   结束时间
+//     * @return 报警列表
+//     */
+//    @RequestLine("GET /fault/snap/list?starttime={startTime}&endtime={endTime}&isopened=1")
+//    List<FaultSnap> getFalutSnapListOpened(@Param(value = "startTime") String startTime, @Param(value = "endTime") String endTime);
+//
+//    /**
+//     * 通过场站ID和机型获取报警缓存
+//     *
+//     * @param stationId 场站ID
+//     * @param modelId   机型ID
+//     * @return 报警缓存
+//     */
+//    @RequestLine("GET /alarm/snap?stationid={stationId}&modelid={modelId}")
+//    List<AlertSnap> getAlarmSnapByStationAndModel(@Param(value = "stationId") String stationId, @Param(value = "modelId") String modelId);
+//
+//    //获取最新实时报警2   websocketController getRealTimeAlertInfo()
+//    @RequestLine("GET /alarm/snap/single?windturbineid={wtId}&alertvalue={alertValue}")
+//    List<AlertSnap> getRealTimeAlarmByObjectId(
+//            @Param(value = "cateGory1") String cateGory1,
+//            @Param(value = "objectId") String objectId,
+//            @Param(value = "startTime") String startTime,
+//            @Param(value = "isOpened") boolean isOpened //默认为1
+//    );
+//
+//    //获取历史故障 websocketController getHistoryFaultInfo
+//    @RequestLine("GET /fault/history/list?pagenum={pagenum}&pagesize={pagesize}&stationid={stationid}&keyword={keyword}&starttime={starttime}&endtime={endtime}")
+//    List<FaultInfo> getFaultHistoryInfo(
+//            @Param(value = "pagenum") Integer pagenum,
+//            @Param(value = "pagesize") Integer pagesize,
+//            @Param(value = "stationid") String stationid,
+//            @Param(value = "keyword") String keyword,
+//            @Param(value = "starttime") String starttime,
+//            @Param(value = "endtime") String endtime
+//    );
+//
+//    //故障确认故障 websocketController faultAlarmConfirm()
+//    @Headers({"Content-Type: application/json", "Accept: application/json"})
+//    @RequestLine("POST /fault/history")
+//    void confirmFault(FaultHistory confirmData);
+//
+//    //根据id获取故障历史  getPopupStatus
+//    @RequestLine("GET /fault/history/{historyId}")
+//    FaultHistory getFaultHistoryById(@Param(value = "historyId") long historyId);
+//
+//
+//    //获取故障弹窗状态  getPopupStatus
+//    @RequestLine("GET /fault/snap/ids?ids={ids}")
+//    List<FaultSnap> getFaultSnapByIdList(@Param(value = "ids") String ids);
+//
+//    //获取最新的一定数量的故障
+//    @RequestLine("GET /fault/top?topnum={count}")
+//    List<FaultInfo> getlatestFaultInfoByCount(@Param(value = "count") int count);
+//
+//    //获取当前正在活跃的故障
+//    @RequestLine("GET /alarm/snap/single?windturbineid={wtId}&alertvalue={alertValue}")
+//    List<FaultInfo> getlatestIsOpenedFaultInfo(
+//            @Param(value = "confirmType") int confirmType,
+//            @Param(value = "opened") int opened,
+//            @Param(value = "messageType") int messageType,
+//            @Param(value = "startTime") int startTime,
+//            @Param(value = "endTime") int endTime);
+//
+//    //获取最新的一定数量的故障
+//    @RequestLine("GET /fault/recent?faulttime={faulttime}")
+//    List<FaultInfo> GetRealTimeFaultInfoByStartTime(@Param(value = "faulttime") String faulttime);
+//
+//
+//    //一键清除弹窗
+//    @RequestLine("GET /fault/clear?startTime={startTime}&endTime={endTime}")
+//    void clearFault(@Param(value = "startTime") Long startTime, @Param(value = "endTime") Long endTime);
+//
+//    //确认时批量确认
+//    @RequestLine("GET /fault/confirm?faultHistoryId={faultHistoryId}&confirmType={confirmType}&userName={userName}&snpaId={snpaId}")
+//    void confirmBatch(@Param(value = "faultHistoryId") Long faultHistoryId,
+//                      @Param(value = "confirmType") int confirmType,
+//                      @Param(value = "userName") String userName,
+//                      @Param(value = "snpaId") Long snpaId);
+//
+//
+//    /**
+//     * 获取检修信息
+//     *
+//     * @return 检修信息
+//     */
+//    @RequestLine("GET /inspectorder/order/list?startTime={startTime}&endTime={endTime}")
+//    RequestInfo<OverhaulInfo> getInspectorder(@Param(value = "startTime") long startTime, @Param(value = "endTime") long endTime);
+//}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/config/WebSocketConfig.java

@@ -1,20 +1,20 @@
-package com.gyee.runeconomy.config;
-
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-
-/**
- * 开启 WebSocket 支持
- **/
-@Configuration
-public class WebSocketConfig {
-
-    @Bean
-    public ServerEndpointExporter serverEndpointExporter() {
-        System.out.println("开启websocket支持。。。。。");
-        return new ServerEndpointExporter();
-    }
-
-}
+//package com.gyee.runeconomy.config;
+//
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+//
+///**
+// * 开启 WebSocket 支持
+// **/
+//@Configuration
+//public class WebSocketConfig {
+//
+//    @Bean
+//    public ServerEndpointExporter serverEndpointExporter() {
+//        System.out.println("开启websocket支持。。。。。");
+//        return new ServerEndpointExporter();
+//    }
+//
+//}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/WindDeviationController.java

@@ -0,0 +1,48 @@
+package com.gyee.runeconomy.controller;
+
+import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.dto.R;
+import com.gyee.runeconomy.dto.ResultMsg;
+import com.gyee.runeconomy.service.WindDeviationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/winddeviation")
+@Api(value = "曲线对风偏差", tags = "曲线对风偏差")
+public class WindDeviationController {
+
+
+    @Resource
+    private WindDeviationService windDeviationService;
+
+    /**
+     * 查询曲线对风偏差
+     *
+     * @return
+     */
+    @GetMapping("/getDeviationValue")
+    @ResponseBody
+    @ApiOperation(value = "曲线对风偏差", notes = "曲线对风偏差")
+    public R getDeviationValue(
+                          @RequestParam(value = "wtId", required = true) String wtId ,
+                          @RequestParam(value = "recorddate", required = true) String recorddate) throws Exception {
+
+        Map<String, Object> result=  windDeviationService.getDeviationValue(wtId,recorddate);
+
+        if (StringUtils.isNotNull(result)) {
+            return R.data(ResultMsg.ok(result));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconEquipmentDeviatPowerMapper.java

@@ -0,0 +1,17 @@
+package com.gyee.runeconomy.mapper.auto;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentDeviatPower;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xieshengjie
+ * @since 2023-04-27
+ */
+public interface ProEconEquipmentDeviatPowerMapper extends BaseMapper<ProEconEquipmentDeviatPower> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconEquipmentDeviatSpeedMapper.java

@@ -0,0 +1,17 @@
+package com.gyee.runeconomy.mapper.auto;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentDeviatSpeed;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xieshengjie
+ * @since 2023-04-27
+ */
+public interface ProEconEquipmentDeviatSpeedMapper extends BaseMapper<ProEconEquipmentDeviatSpeed> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/ProEconEquipmentDeviatPower.java

@@ -0,0 +1,250 @@
+package com.gyee.runeconomy.model.auto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xieshengjie
+ * @since 2023-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconEquipmentDeviatPower extends Model {
+
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "id",type = IdType.INPUT)
+    private String id;
+
+    private String windturbineId;
+
+    private Date recordDate;
+
+    private String windpowerstationId;
+
+    private String projectId;
+
+    private String lineId;
+
+    private String companyId;
+
+    private String regionId;
+
+    private Integer p50;
+
+    private Integer p49;
+
+    private Integer p48;
+
+    private Integer p47;
+
+    private Integer p46;
+
+    private Integer p45;
+
+    private Integer p44;
+
+    private Integer p43;
+
+    private Integer p42;
+
+    private Integer p41;
+
+    private Integer p40;
+
+    private Integer p39;
+
+    private Integer p38;
+
+    private Integer p37;
+
+    private Integer p36;
+
+    private Integer p35;
+
+    private Integer p34;
+
+    private Integer p33;
+
+    private Integer p32;
+
+    private Integer p31;
+
+    private Integer p30;
+
+    private Integer p29;
+
+    private Integer p28;
+
+    private Integer p27;
+
+    private Integer p26;
+
+    private Integer p25;
+
+    private Integer p24;
+
+    private Integer p23;
+
+    private Integer p22;
+
+    private Integer p21;
+
+    private Integer p20;
+
+    private Integer p19;
+
+    private Integer p18;
+
+    private Integer p17;
+
+    private Integer p16;
+
+    private Integer p15;
+
+    private Integer p14;
+
+    private Integer p13;
+
+    private Integer p12;
+
+    private Integer p11;
+
+    private Integer p10;
+
+    private Integer p9;
+
+    private Integer p8;
+
+    private Integer p7;
+
+    private Integer p6;
+
+    private Integer p5;
+
+    private Integer p4;
+
+    private Integer p3;
+
+    private Integer p2;
+
+    private Integer p1;
+
+    private Integer p0;
+
+    private Integer n1;
+
+    private Integer n2;
+
+    private Integer n3;
+
+    private Integer n4;
+
+    private Integer n5;
+
+    private Integer n6;
+
+    private Integer n7;
+
+    private Integer n8;
+
+    private Integer n9;
+
+    private Integer n10;
+
+    private Integer n11;
+
+    private Integer n12;
+
+    private Integer n13;
+
+    private Integer n14;
+
+    private Integer n15;
+
+    private Integer n16;
+
+    private Integer n17;
+
+    private Integer n18;
+
+    private Integer n19;
+
+    private Integer n20;
+
+    private Integer n21;
+
+    private Integer n22;
+
+    private Integer n23;
+
+    private Integer n24;
+
+    private Integer n25;
+
+    private Integer n26;
+
+    private Integer n27;
+
+    private Integer n28;
+
+    private Integer n29;
+
+    private Integer n30;
+
+    private Integer n31;
+
+    private Integer n32;
+
+    private Integer n33;
+
+    private Integer n34;
+
+    private Integer n35;
+
+    private Integer n36;
+
+    private Integer n37;
+
+    private Integer n38;
+
+    private Integer n39;
+
+    private Integer n40;
+
+    private Integer n41;
+
+    private Integer n42;
+
+    private Integer n43;
+
+    private Integer n44;
+
+    private Integer n45;
+
+    private Integer n46;
+
+    private Integer n47;
+
+    private Integer n48;
+
+    private Integer n49;
+
+    private Integer n50;
+
+    private Integer qualified;
+
+    private Integer unqualified;
+
+    private Integer power;
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/ProEconEquipmentDeviatSpeed.java

@@ -0,0 +1,250 @@
+package com.gyee.runeconomy.model.auto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xieshengjie
+ * @since 2023-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconEquipmentDeviatSpeed extends Model {
+
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "id",type = IdType.INPUT)
+    private String id;
+
+    private String windturbineId;
+
+    private Date recordDate;
+
+    private String windpowerstationId;
+
+    private String projectId;
+
+    private String lineId;
+
+    private String companyId;
+
+    private String regionId;
+
+    private Integer p50;
+
+    private Integer p49;
+
+    private Integer p48;
+
+    private Integer p47;
+
+    private Integer p46;
+
+    private Integer p45;
+
+    private Integer p44;
+
+    private Integer p43;
+
+    private Integer p42;
+
+    private Integer p41;
+
+    private Integer p40;
+
+    private Integer p39;
+
+    private Integer p38;
+
+    private Integer p37;
+
+    private Integer p36;
+
+    private Integer p35;
+
+    private Integer p34;
+
+    private Integer p33;
+
+    private Integer p32;
+
+    private Integer p31;
+
+    private Integer p30;
+
+    private Integer p29;
+
+    private Integer p28;
+
+    private Integer p27;
+
+    private Integer p26;
+
+    private Integer p25;
+
+    private Integer p24;
+
+    private Integer p23;
+
+    private Integer p22;
+
+    private Integer p21;
+
+    private Integer p20;
+
+    private Integer p19;
+
+    private Integer p18;
+
+    private Integer p17;
+
+    private Integer p16;
+
+    private Integer p15;
+
+    private Integer p14;
+
+    private Integer p13;
+
+    private Integer p12;
+
+    private Integer p11;
+
+    private Integer p10;
+
+    private Integer p9;
+
+    private Integer p8;
+
+    private Integer p7;
+
+    private Integer p6;
+
+    private Integer p5;
+
+    private Integer p4;
+
+    private Integer p3;
+
+    private Integer p2;
+
+    private Integer p1;
+
+    private Integer p0;
+
+    private Integer n1;
+
+    private Integer n2;
+
+    private Integer n3;
+
+    private Integer n4;
+
+    private Integer n5;
+
+    private Integer n6;
+
+    private Integer n7;
+
+    private Integer n8;
+
+    private Integer n9;
+
+    private Integer n10;
+
+    private Integer n11;
+
+    private Integer n12;
+
+    private Integer n13;
+
+    private Integer n14;
+
+    private Integer n15;
+
+    private Integer n16;
+
+    private Integer n17;
+
+    private Integer n18;
+
+    private Integer n19;
+
+    private Integer n20;
+
+    private Integer n21;
+
+    private Integer n22;
+
+    private Integer n23;
+
+    private Integer n24;
+
+    private Integer n25;
+
+    private Integer n26;
+
+    private Integer n27;
+
+    private Integer n28;
+
+    private Integer n29;
+
+    private Integer n30;
+
+    private Integer n31;
+
+    private Integer n32;
+
+    private Integer n33;
+
+    private Integer n34;
+
+    private Integer n35;
+
+    private Integer n36;
+
+    private Integer n37;
+
+    private Integer n38;
+
+    private Integer n39;
+
+    private Integer n40;
+
+    private Integer n41;
+
+    private Integer n42;
+
+    private Integer n43;
+
+    private Integer n44;
+
+    private Integer n45;
+
+    private Integer n46;
+
+    private Integer n47;
+
+    private Integer n48;
+
+    private Integer n49;
+
+    private Integer n50;
+
+    private Integer qualified;
+
+    private Integer unqualified;
+
+    private Integer speed;
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/vo/DeviatPowerVo.java

@@ -0,0 +1,19 @@
+package com.gyee.runeconomy.model.vo;
+
+import lombok.Data;
+
+
+@Data
+public class DeviatPowerVo  {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private String wtid;
+
+    private Double power;
+
+    private Double dfpcl;
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/vo/DeviatSpeedVo.java

@@ -0,0 +1,19 @@
+package com.gyee.runeconomy.model.vo;
+
+import lombok.Data;
+
+
+@Data
+public class DeviatSpeedVo  {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private String wtid;
+
+    private Double speed;
+
+    private Double dfpcl;
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/vo/DeviatValueVo.java

@@ -0,0 +1,19 @@
+package com.gyee.runeconomy.model.vo;
+
+import lombok.Data;
+
+
+@Data
+public class DeviatValueVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private String wtid;
+
+    private Integer value;
+
+    private Integer bhg;
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WindDeviationService.java

@@ -0,0 +1,696 @@
+package com.gyee.runeconomy.service;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentDeviatPower;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentDeviatSpeed;
+import com.gyee.runeconomy.model.vo.DeviatPowerVo;
+import com.gyee.runeconomy.model.vo.DeviatSpeedVo;
+import com.gyee.runeconomy.model.vo.DeviatValueVo;
+import com.gyee.runeconomy.service.auto.IProEconEquipmentDeviatPowerService;
+import com.gyee.runeconomy.service.auto.IProEconEquipmentDeviatSpeedService;
+import com.gyee.runeconomy.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class WindDeviationService {
+
+    @Resource
+    private IProEconEquipmentDeviatSpeedService proEconEquipmentDeviatSpeedService;
+    @Resource
+    private IProEconEquipmentDeviatPowerService proEconEquipmentDeviatPowerService;
+
+
+    /**
+     * 保存对风偏差率描述
+     */
+    public Map<String, Object> getDeviationValue(String wtId,String date){
+
+
+        Map<String, Object> resultMap=new HashMap<>();
+
+        if(StringUtils.notEmp(wtId) && StringUtils.notEmp(date))
+        {
+
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+
+            Date recorddate=null;
+
+            try {
+                recorddate=df.parse(date);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            QueryWrapper<ProEconEquipmentDeviatSpeed> windqueryWrapper = new QueryWrapper<>();
+            windqueryWrapper.eq("record_date",recorddate);
+            windqueryWrapper.eq("windturbine_id",wtId);
+            List<ProEconEquipmentDeviatSpeed> speedCollect = proEconEquipmentDeviatSpeedService.list(windqueryWrapper);
+
+            QueryWrapper<ProEconEquipmentDeviatPower> powerqueryWrapper = new QueryWrapper<>();
+            powerqueryWrapper.eq("record_date",recorddate);
+            powerqueryWrapper.eq("windturbine_id",wtId);
+            List<ProEconEquipmentDeviatPower> powerCollect = proEconEquipmentDeviatPowerService.list(powerqueryWrapper);
+
+            List<DeviatValueVo> resultList = new ArrayList<>();
+            
+            if(!speedCollect.isEmpty())
+            {
+                for(int i=-50;i<51;i++)
+                {
+                    int bhg=0;
+                    DeviatValueVo vo=new DeviatValueVo();
+                    vo.setWtid(wtId);
+                    switch (i) {
+                        case -50:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP50).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -49:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP49).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -48:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP48).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -47:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP47).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -46:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP46).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -45:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP45).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -44:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP44).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -43:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP43).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -42:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP42).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -41:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP41).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -40:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP40).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -39:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP39).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -38:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP38).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -37:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP37).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -36:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP36).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -35:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP35).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -34:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP34).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -33:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP33).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -32:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP32).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -31:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP31).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -30:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP30).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -29:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP29).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -28:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP28).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -27:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP27).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -26:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP26).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -25:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP25).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -24:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP24).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -23:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP23).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -22:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP22).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -21:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP21).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -20:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP20).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -19:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP19).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -18:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP18).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -17:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP17).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -16:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP16).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -15:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP15).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -14:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP14).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -13:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP13).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -12:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP12).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -11:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP11).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -10:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP10).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -9:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP9).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -8:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP8).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -7:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP7).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -6:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP6).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -5:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP5).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -4:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP4).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -3:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP3).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -2:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP2).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -1:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP1).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case -0:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getP0).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 1:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN1).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 2:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN2).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 3:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN3).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 4:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN4).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 5:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN5).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 6:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN6).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 7:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN7).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 8:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN8).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 9:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN9).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 10:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN10).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 11:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN11).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 12:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN12).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 13:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN13).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 14:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN14).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 15:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN15).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 16:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN16).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 17:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN17).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 18:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN18).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 19:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN19).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 20:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN20).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 21:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN21).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 22:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN22).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 23:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN23).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 24:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN24).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 25:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN25).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 26:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN26).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 27:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN27).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 28:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN28).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 29:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN29).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 30:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN30).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 31:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN31).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 32:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN32).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 33:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN33).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 34:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN34).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 35:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN35).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 36:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN36).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 37:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN37).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 38:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN38).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 39:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN39).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 40:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN40).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 41:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN41).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 42:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN42).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 43:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN43).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 44:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN44).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 45:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN45).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 46:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN46).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 47:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN47).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 48:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN48).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 49:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN49).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                        case 50:
+                            bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getN50).sum();
+                            vo.setValue(i);
+                            vo.setBhg(bhg);
+                            break;
+                    }
+
+                    resultList.add(vo);
+                }
+
+            }
+
+            resultMap.put("deviationls",resultList);
+            int hg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getQualified).sum();
+            int bhg = speedCollect.stream().mapToInt(ProEconEquipmentDeviatSpeed::getUnqualified).sum();
+
+            int sum = hg+bhg;
+
+            Double dfpcl=0.0;
+            if(sum!=0)
+            {
+                dfpcl=new BigDecimal(sum).divide(new BigDecimal(sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+
+            }
+            resultMap.put("hg",hg);
+            resultMap.put("bhg",bhg);
+            resultMap.put("dfpcl",dfpcl);
+
+            int threehg = speedCollect.stream().filter(i->i.getSpeed() >= 3 && i.getSpeed() < 5).mapToInt(ProEconEquipmentDeviatSpeed::getQualified).sum();
+            int threebhg = speedCollect.stream().filter(i->i.getSpeed() >= 3 && i.getSpeed() < 5).mapToInt(ProEconEquipmentDeviatSpeed::getUnqualified).sum();
+            int threesum = threehg+threebhg;
+
+            double threedfpcl=0.0;
+
+            if(threesum!=0)
+            {
+                threedfpcl=new BigDecimal(threebhg).divide(new BigDecimal(threesum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+
+            }
+            resultMap.put("threedfpcl",threedfpcl);
+            double fivedfpcl=0.0;
+            int fivehg = speedCollect.stream().filter(i->i.getSpeed() >= 5 && i.getSpeed() < 11).mapToInt(ProEconEquipmentDeviatSpeed::getQualified).sum();
+            int fivebhg = speedCollect.stream().filter(i->i.getSpeed() >= 5 && i.getSpeed() < 11).mapToInt(ProEconEquipmentDeviatSpeed::getUnqualified).sum();
+            int fivesum = fivehg+fivebhg;
+            if(fivesum!=0)
+            {
+                fivedfpcl=new BigDecimal(fivebhg).divide(new BigDecimal(fivesum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+
+            }
+            resultMap.put("fivedfpcl",fivedfpcl);
+            double  eledfpcl=0.0;
+
+            int elehg = speedCollect.stream().filter(i->i.getSpeed() >= 11).mapToInt(ProEconEquipmentDeviatSpeed::getQualified).sum();
+            int elebhg = speedCollect.stream().filter(i->i.getSpeed() >= 11).mapToInt(ProEconEquipmentDeviatSpeed::getUnqualified).sum();
+            int elesum = elehg+elebhg;
+
+            if(elesum!=0)
+            {
+                eledfpcl=new BigDecimal(elebhg).divide(new BigDecimal(elesum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+
+            }
+            resultMap.put("eledfpcl",eledfpcl);
+
+            List<DeviatPowerVo> powerresultList = new ArrayList<>();
+            List<DeviatSpeedVo> speedresultList = new ArrayList<>();
+
+            if (powerCollect!=null && powerCollect.size()>0){
+                List<Double> powercollect = powerCollect.stream().map(i -> (double)i.getPower()).distinct().collect(Collectors.toList());
+                Collections.sort(powercollect);
+
+                for (Double aDouble : powercollect) {
+                    DeviatPowerVo powerVo = new DeviatPowerVo();
+                    powerVo.setWtid(wtId);
+                    powerVo.setPower(aDouble);
+
+                    int xhg = powerCollect.stream().filter(i->(double)i.getPower()==aDouble).mapToInt(ProEconEquipmentDeviatPower::getQualified).sum();
+                    int xbhg= powerCollect.stream().filter(i->(double)i.getPower()==aDouble).mapToInt(ProEconEquipmentDeviatPower::getUnqualified).sum();
+                    int xsum = xhg + xbhg;
+
+                    double xbdfpcl=0.0;
+                    if(xsum!=0)
+                    {
+                        xbdfpcl=new BigDecimal(fivebhg).divide(new BigDecimal(xsum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+
+                    }
+                    powerVo.setDfpcl(xbdfpcl);
+                    powerresultList.add(powerVo);
+
+                }
+
+            }
+
+            resultMap.put("powerresultList",powerresultList);
+
+            if (speedCollect!=null && speedCollect.size()>0){
+                List<Double> speedcollect = speedCollect.stream().map(i ->(double) i.getSpeed()).distinct().collect(Collectors.toList());
+                Collections.sort(speedcollect);
+                for (Double aDouble : speedcollect) {
+                    DeviatSpeedVo speedVo = new DeviatSpeedVo();
+
+                    speedVo.setWtid(wtId);
+                    speedVo.setSpeed(aDouble);
+
+                    int xhg = speedCollect.stream().filter(i->(double)i.getSpeed()==aDouble).mapToInt(ProEconEquipmentDeviatSpeed::getQualified).sum();
+                    int xbhg= speedCollect.stream().filter(i->(double)i.getSpeed()==aDouble).mapToInt(ProEconEquipmentDeviatSpeed::getUnqualified).sum();
+                    int xsum = xhg + xbhg;
+                    double xbdfpcl=0.0;
+                    if(xsum!=0)
+                    {
+                        xbdfpcl=new BigDecimal(fivebhg).divide(new BigDecimal(xsum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+
+                    }
+                    speedVo.setDfpcl(xbdfpcl);
+                    speedresultList.add(speedVo);
+                }
+            }
+
+            resultMap.put("speedresultList",speedresultList);
+        }
+
+        return resultMap;
+
+    }
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/IProEconEquipmentDeviatPowerService.java

@@ -0,0 +1,17 @@
+package com.gyee.runeconomy.service.auto;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentDeviatPower;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xieshengjie
+ * @since 2023-04-27
+ */
+public interface IProEconEquipmentDeviatPowerService extends IService<ProEconEquipmentDeviatPower> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/IProEconEquipmentDeviatSpeedService.java

@@ -0,0 +1,17 @@
+package com.gyee.runeconomy.service.auto;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentDeviatSpeed;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xieshengjie
+ * @since 2023-04-27
+ */
+public interface IProEconEquipmentDeviatSpeedService extends IService<ProEconEquipmentDeviatSpeed> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentDeviatPowerServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.runeconomy.mapper.auto.ProEconEquipmentDeviatPowerMapper;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentDeviatPower;
+import com.gyee.runeconomy.service.auto.IProEconEquipmentDeviatPowerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xieshengjie
+ * @since 2023-04-27
+ */
+@Service
+public class ProEconEquipmentDeviatPowerServiceImpl extends ServiceImpl<ProEconEquipmentDeviatPowerMapper, ProEconEquipmentDeviatPower> implements IProEconEquipmentDeviatPowerService {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentDeviatSpeedServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.runeconomy.mapper.auto.ProEconEquipmentDeviatSpeedMapper;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentDeviatSpeed;
+import com.gyee.runeconomy.service.auto.IProEconEquipmentDeviatSpeedService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xieshengjie
+ * @since 2023-04-27
+ */
+@Service
+public class ProEconEquipmentDeviatSpeedServiceImpl extends ServiceImpl<ProEconEquipmentDeviatSpeedMapper, ProEconEquipmentDeviatSpeed> implements IProEconEquipmentDeviatSpeedService {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/task/SaticScheduleTask.java

@@ -1,38 +1,34 @@
-package com.gyee.runeconomy.task;
-
-import com.gyee.common.util.DateUtils;
-import com.gyee.runeconomy.service.auto.IProEconBenchmarkingBetweenService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-import java.util.Date;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-public class SaticScheduleTask {
-
-    @Autowired
-    private IProEconBenchmarkingBetweenService iProEconBenchmarkingBetweenService;
-
-
-    /**
-     * 定时调度任务
-     */
-//    @Scheduled(cron = "0 0 1 * * ?")
-    //@Scheduled(cron = "0 24 14 * * ?")
-    //或直接指定时间间隔，例如：5秒
-//    @Scheduled(fixedRate=5000)
-    private void configureTasks1() {
-        Date yestday = DateUtils.getYestday(new Date());
-        String date = DateUtils.toDate1(yestday);
-        try {
-            //值际对标定时
-            iProEconBenchmarkingBetweenService.saveBeanchmarkList(date, date);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-}
+//package com.gyee.runeconomy.task;
+//
+//import com.gyee.runeconomy.service.auto.IProEconBenchmarkingBetweenService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//public class SaticScheduleTask {
+//
+//    @Autowired
+//    private IProEconBenchmarkingBetweenService iProEconBenchmarkingBetweenService;
+//
+//
+//    /**
+//     * 定时调度任务
+//     */
+////    @Scheduled(cron = "0 0 1 * * ?")
+//    //@Scheduled(cron = "0 24 14 * * ?")
+//    //或直接指定时间间隔，例如：5秒
+////    @Scheduled(fixedRate=5000)
+////    private void configureTasks1() {
+////        Date yestday = DateUtils.getYestday(new Date());
+////        String date = DateUtils.toDate1(yestday);
+////        try {
+////            //值际对标定时
+////            iProEconBenchmarkingBetweenService.saveBeanchmarkList(date, date);
+////        } catch (Exception e) {
+////            e.printStackTrace();
+////        }
+////
+////    }
+//
+//}