计算指标修改

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

@@ -1,86 +1,86 @@
-//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-executorWPLY.properties")
-////@PropertySource("classpath:xxl-job-executorRG.properties")
-////@PropertySource("classpath:xxl-job-executorJN.properties")
-//
-////@PropertySource("classpath:xxl-job-7001.properties")
-////@PropertySource("classpath:xxl-job-7002.properties")
-////@PropertySource("classpath:xxl-job-7003.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();
-//     */
-//
-//
-//}
+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-executorWPLY.properties")
+//@PropertySource("classpath:xxl-job-executorRG.properties")
+//@PropertySource("classpath:xxl-job-executorJN.properties")
+//
+//@PropertySource("classpath:xxl-job-7001.properties")
+//@PropertySource("classpath:xxl-job-7002.properties")
+//@PropertySource("classpath:xxl-job-7003.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/initalcache/CacheService.java

@@ -4,9 +4,7 @@ package com.gyee.generation.service.initalcache;/*
 */
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
-import com.gyee.generation.model.auto.ProBasicSubStation;
+import com.gyee.generation.model.auto.ProBasicStatusPoint;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.redis.RedisService;
 import lombok.extern.slf4j.Slf4j;
@@ -14,10 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -137,18 +135,18 @@ public class CacheService {
 //        });
 //
 //        log.info("--------------------------redisSubWP");
-        List<ProBasicSubStation> subStationList = subStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        subStationList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
+//        List<ProBasicSubStation> subStationList = subStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+//        subStationList.stream().forEach(i->{
+//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+//            qw.eq("windpowerstation_id",i.getId());
+//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+//            windpowerstationtestingpoint2List.stream().forEach(x->{
+//                codeaimap.put(x.getUniformCode(),x);
+//            });
+//            String s = JSONObject.toJSONString(codeaimap);
+//            redisService.set(i.getId(),s);
+//        });
 //
 //        log.info("--------------------------redisWeatherWP");
 //        List<ProBasicWeatherStation> weatherStationList = proBasicWeatherStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
@@ -257,17 +255,17 @@ public class CacheService {
 //        redisService.set("ZLLGL", JSONObject.toJSONString(powerrdMap));
 //
 //        log.info("--------------------------redis十三种状态");
-//        Map<String,List<ProBasicStatusPoint>> sszztMap = new HashMap<>();
-//        List<ProBasicStatusPoint> windturbinestatusdis = proBasicStatusPointService.list();
-//        windturbinestatusdis.stream().forEach(w->{
-//            if (sszztMap.containsKey(w.getWindturbineId())){
-//                sszztMap.get(w.getWindturbineId()).add(w);
-//            }else {
-//                List<ProBasicStatusPoint> wdisList = new ArrayList<>();
-//                wdisList.add(w);
-//                sszztMap.put(w.getWindturbineId(),wdisList);
-//            }
-//        });
-//        redisService.set("SSZZT",JSONObject.toJSONString(sszztMap));
+        Map<String, List<ProBasicStatusPoint>> sszztMap = new HashMap<>();
+        List<ProBasicStatusPoint> windturbinestatusdis = proBasicStatusPointService.list();
+        windturbinestatusdis.stream().forEach(w->{
+            if (sszztMap.containsKey(w.getWindturbineId())){
+                sszztMap.get(w.getWindturbineId()).add(w);
+            }else {
+                List<ProBasicStatusPoint> wdisList = new ArrayList<>();
+                wdisList.add(w);
+                sszztMap.put(w.getWindturbineId(),wdisList);
+            }
+        });
+        redisService.set("SSZZT", JSONObject.toJSONString(sszztMap));
     }
 }

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

@@ -323,6 +323,10 @@ public class StatusService {
 //                                state++;
 //                            }
 //                        }
+//                        if(wt.getId().equals("SXJ_KGDL_BHB_F_WT_0028_EQ"))
+//                        {
+//                            System.out.println("SXJ_KGDL_XWT_F_WT_0019_EQ");
+//                        }
                         //读取三分钟前的切面值进行对比，如果数据一致判定通信中断
                         PointData oldValue = edosUtil.getHistMatrix(str, oldtime);
                         if (oldValue.getPointValueInDouble() == interruptionRealData.get(i).getPointValueInDouble()) {
@@ -332,7 +336,7 @@ public class StatusService {
                     //判定是否所有中断盘点点的取值时间，距离当前时间相差大于指定值，就统计到新的集合里，如果结果集数量等于中断点数量，说明设备通信中断
                     List<PointData> collect = interruptionRealData.stream().filter(i -> (currentDate.getTime() - i.getPointTime()) / 1000 > Integer.parseInt(second)).collect(Collectors.toList());
 
-                    if (state == 3 || collect.size() == interruptionRealData.size()) {
+                    if (state ==interruptionList.size() || collect.size() == interruptionRealData.size()) {
                         //离线
                         status = 1.0;
                     }else
@@ -391,8 +395,16 @@ public class StatusService {
         } else {
             //每个状态一个状态点
             Map<String, String> stateMap = new HashMap<>();
-            List<ProBasicStatusPoint> windturbinestatusdis = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformCode().equals(Contant.MX000) || w.getUniformCode().equals(Contant.MX002) || w.getUniformCode().equals(Contant.MX003) || w.getUniformCode().equals(Contant.MX006) || w.getUniformCode().equals(Contant.MX008)).collect(Collectors.toList());
-
+            List<ProBasicStatusPoint> windturbinestatusdis = statusMap.get(wt.getId()).stream()
+                    .filter(w -> w.getUniformCode().equals(ContantXk.MX000) || w.getUniformCode().equals(ContantXk.MX001) ||
+                            w.getUniformCode().equals(ContantXk.MX002) || w.getUniformCode().equals(ContantXk.MX003) ||
+                            w.getUniformCode().equals(ContantXk.MX004) || w.getUniformCode().equals(ContantXk.MX005) ||
+                            w.getUniformCode().equals(ContantXk.MX006) || w.getUniformCode().equals(ContantXk.MX007) ||
+                            w.getUniformCode().equals(ContantXk.MX008) || w.getUniformCode().equals(ContantXk.MX009) ||
+                            w.getUniformCode().equals(ContantXk.MX010) || w.getUniformCode().equals(ContantXk.MX011) ||
+                            w.getUniformCode().equals(ContantXk.MX012) || w.getUniformCode().equals(ContantXk.MX013)
+
+                    ).collect(Collectors.toList());
             List<String> pointls=new ArrayList<>();
             for (ProBasicStatusPoint w : windturbinestatusdis) {
                 pointls.add(w.getNemCode());
@@ -422,7 +434,7 @@ public class StatusService {
                 status = 2;
             }
 
-            if (stateMap.containsKey("MX005")) {
+            if (stateMap.containsKey("MX008") || stateMap.containsKey("MX009")) {
                 status = 3;
             }
         }
@@ -1080,13 +1092,23 @@ public class StatusService {
         }else {
             //每个状态一个状态点
             Map<String,String> stateMap = new HashMap<>();
-            List<ProBasicStatusPoint> windturbinestatusdis = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformCode().equals(Contant.MX000) || w.getUniformCode().equals(Contant.MX002) || w.getUniformCode().equals(Contant.MX003) || w.getUniformCode().equals(Contant.MX006) || w.getUniformCode().equals(Contant.MX008)).collect(Collectors.toList());
+            List<ProBasicStatusPoint> windturbinestatusdis = statusMap.get(wt.getId()).stream()
+                    .filter(w -> w.getUniformCode().equals(ContantXk.MX000) || w.getUniformCode().equals(ContantXk.MX001) ||
+                            w.getUniformCode().equals(ContantXk.MX002) || w.getUniformCode().equals(ContantXk.MX003) ||
+                            w.getUniformCode().equals(ContantXk.MX004) || w.getUniformCode().equals(ContantXk.MX005) ||
+                                    w.getUniformCode().equals(ContantXk.MX006) || w.getUniformCode().equals(ContantXk.MX007) ||
+                                    w.getUniformCode().equals(ContantXk.MX008) || w.getUniformCode().equals(ContantXk.MX009) ||
+                                    w.getUniformCode().equals(ContantXk.MX010) || w.getUniformCode().equals(ContantXk.MX011) ||
+                                    w.getUniformCode().equals(ContantXk.MX012) || w.getUniformCode().equals(ContantXk.MX013)
+
+                            ).collect(Collectors.toList());
 
 
             List<String> pointls=new ArrayList<>();
             for (ProBasicStatusPoint w : windturbinestatusdis) {
                 pointls.add(w.getNemCode());
             }
+
             List<PointData> values= edosUtil.getRealData(pointls);
 
 
@@ -1110,15 +1132,15 @@ public class StatusService {
                 }
             }
 
-            if (stateMap.containsKey("MX006") && stateMap.containsKey("MX008")){
-                mxstatus = Double.parseDouble(stateMap.get("MX008"));
+            if (stateMap.containsKey("MX004") && stateMap.containsKey("MX006")){
+                mxstatus = Double.parseDouble(stateMap.get("MX006"));
             }
 
             if (stateMap.containsKey("MX002") && stateMap.containsKey("MX003")){
                 mxstatus = Double.parseDouble(stateMap.get("MX003"));
             }
             if (zjzt==3){
-                if ( stateMap.containsKey("MX006")){
+                if ( stateMap.containsKey("MX009")){
                     mxstatus = 9;
                 }else
                 {

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

@@ -285,9 +285,7 @@ public class SaticScheduleCALTask {
 
         XxlJobHelper.log("区域公司安全天数程序执行开始!........");
         try {
-            while(true) {
-                regionCalreService.aqts();
-            }
+            regionCalreService.aqts();
         } catch (Exception e) {
             e.printStackTrace();
         }

realtime/generationXK-service/src/test/java/com/gyee/generation/RealTest.java

@@ -33,8 +33,10 @@ public class RealTest {
         begin=new Date();
         System.out.println("状态判定调度程序执行开始!。。。。。。");
 
-        statusService.middleStatusReal();
-        statusService.statusReal();
+//        statusService.middleStatusReal();
+//        statusService.statusReal();
+
+        cycleCalculationService.saveCyle();
 
 //        realtimeService.savaRealtimeTarget();
 //        cycleCalculationService.saveCyle();

web/gdsx-ghost/src/main/java/com/gyee/ghost/model/auto/vo/MainrecordCheckeVo.java

@@ -0,0 +1,46 @@
+package com.gyee.ghost.model.auto.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.*;
+
+import java.util.Date;
+
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-08-29
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class MainrecordCheckeVo extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("风机名称")
+    private String wtname;
+    @ExcelProperty("开始时间")
+    private Date begindate;
+    @ExcelProperty("结束时间")
+    private Date enddate;
+    @ExcelProperty("维护内容")
+    private String defecteliminating;
+    @ExcelProperty("故障时长")
+    private Double faultduration;
+    @ExcelProperty("时长影响容量")
+    private Double impactcapacity;
+    @ExcelProperty("内报/外报")
+    private String type;
+    @ExcelProperty("是否符合验证")
+    private Boolean checke;
+    @ExcelProperty("错误信息")
+    private String error;
+
+}

web/gdsx-ghost/src/main/java/com/gyee/ghost/model/auto/vo/MainrecordVo.java

@@ -0,0 +1,48 @@
+package com.gyee.ghost.model.auto.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-08-29
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
+public class MainrecordVo extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ExcelProperty("风机名称")
+    private String wtname;
+    @ExcelProperty("开始时间")
+    private Date begindate;
+    @ExcelProperty("结束时间")
+    private Date enddate;
+    @ExcelProperty("维护内容")
+    private String defecteliminating;
+    @ExcelProperty("故障时长")
+    private Double faultduration;
+    @ExcelProperty("时长影响容量")
+    private Double impactcapacity;
+    @ExcelProperty("内报/外报")
+    private String type;
+
+
+}