添加晋能数据权限过滤

realtime/generationXK-service/pom.xml

@@ -118,8 +118,16 @@
             <version>5.1.1</version>
             <scope>test</scope>
         </dependency>
-
-
+        <dependency>
+            <groupId>com.taosdata.jdbc</groupId>
+            <artifactId>taos-jdbcdriver</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.5.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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

@@ -19,9 +19,9 @@ import org.springframework.core.env.Environment;
 
 @Configuration
 //@PropertySource("classpath:xxl-job-executor.properties")
-@PropertySource("classpath:xxl-job-executor2.properties")
+//@PropertySource("classpath:xxl-job-executor2.properties")
 //@PropertySource("classpath:xxl-job-executor3.properties")
-//@PropertySource("classpath:xxl-job-executor4.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")

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/AlarmTsMapper.java

@@ -0,0 +1,96 @@
+package com.gyee.generation.mapper.auto;
+
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.generation.model.auto.AlarmTs;
+import com.gyee.generation.model.vo.AlarmSimpleVo;
+import com.gyee.generation.model.vo.AlarmTsVo;
+import com.gyee.generation.model.vo.AlarmVo;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+
+@DS("slave")
+public interface AlarmTsMapper extends BaseMapper<AlarmTs> {
+
+
+    @Update("CREATE STABLE if not exists ${superTableName} (ts TIMESTAMP,val INT,confirmed BOOL,endts TIMESTAMP,timeLong DOUBLE) " +
+            "TAGS (alarmid NCHAR(100),alarmtype NCHAR(50),characteristic NCHAR(50)," +
+            "components NCHAR(50),description NCHAR(500),deviceid NCHAR(50),devicename NCHAR(70)," +
+            "devicetype NCHAR(50),enabled BOOL,lineid NCHAR(50),linename NCHAR(70),modelId NCHAR(50),projectid NCHAR(50)," +
+            "projectname NCHAR(70),rank INT,resettable BOOL,stationid NCHAR(50),stationname NCHAR(70),subcomponents NCHAR(50)," +
+            "suffix NCHAR(50),tagid NCHAR(100),triggertype INT,uniformcode NCHAR(50));")
+    int createAlarmSuperTable(@Param("superTableName") String superTableName);
+
+
+
+    @Update("create table if not exists ${tbName} using ${superTableName} tags( #{alarmid}, #{alarmtype}," +
+            "#{characteristic}, #{components},  #{description}, #{deviceid}, #{devicename}," +
+            "#{devicetype}, #{enabled}, #{lineid}, #{linename}, #{modelId}, #{projectid}," +
+            "#{projectname}, #{rank}, #{resettable}, #{stationid}, #{stationname}, #{subcomponents}," +
+            "#{suffix},  #{tagid}, #{triggertype}, #{uniformcode}" +
+            ")")
+    int createTable(@Param("tbName") String tbName, @Param("alarmid") String alarmid, @Param("alarmtype") String alarmtype,
+                    @Param("characteristic") String characteristic, @Param("components") String components,
+                    @Param("description") String description,
+                    @Param("deviceid") String deviceid, @Param("devicename") String devicename,
+                    @Param("devicetype") String devicetype, @Param("enabled") Boolean enabled,
+                    @Param("lineid") String lineid, @Param("linename") String linename,
+                    @Param("modelId") String modelId, @Param("projectid") String projectid,
+                    @Param("projectname") String projectname, @Param("rank") Integer rank,
+                    @Param("resettable") Boolean resettable, @Param("stationid") String stationid,
+                    @Param("stationname") String stationname, @Param("subcomponents") String subcomponents,
+                    @Param("suffix") String suffix, @Param("tagid") String tagid,
+                    @Param("triggertype") Integer triggertype, @Param("uniformcode") String uniformcode, @Param("superTableName") String superTableName
+
+    );
+
+
+
+    @Update("create table  if not exists ${tbName} using ${superTableName} tags( #{alarmid}, #{alarmtype}," +
+            "#{characteristic}, #{components}, #{description}, #{deviceid}, #{devicename}," +
+            "#{devicetype}, #{enabled}, #{lineid}, #{linename}, #{modelId}, #{projectid}," +
+            "#{projectname}, #{rank}, #{resettable}, #{stationid}, #{stationname}, #{subcomponents}," +
+            "#{suffix},  #{tagid}, #{triggertype}, #{uniformcode}" +
+            ")")
+    int createTable(AlarmVo vo);
+
+    @Update("drop table if exists ${superTableName}")
+    void dropSuperTable(@Param("superTableName")String superTableName);
+
+    @Insert("insert into ${tbName} (ts, val,oval,confirmed) values(#{ts}, #{val}, #{oval}, #{confirmed})")
+    int insertOne(AlarmTs one);
+
+
+
+    @Insert("${sql}")
+    int insertList(@Param("sql") String sql);
+
+    @Select("select last_row(*),alarmid,alarmtype,characteristic,components,confirmed,description,deviceid,devicename,devicetype,enabled,lineid,linename," +
+            "modelId,projectid,projectname,rank,resettable,stationid,stationname,subcomponents,suffix,tagid,triggertype,uniformcode from #{stbaleName} group by tbname")
+    List<AlarmVo> findTags(@Param("stbaleName") String stbaleName);
+
+
+    @Select("select deviceid,description,count(*) as val,sum(timeLong) as timeLong from #{superTableName} where ts>=#{begin} and ts<=#{end}  stationid=#{stationid}  group by description,deviceid  ")
+    List<AlarmTsVo> selectByGroup(@Param("superTableName") String superTableName, @Param("stationid") String stationid, @Param("begin")long begin, @Param("end") long end);
+
+
+    @Select("select ts,val,confirmed,endts,timeLong,alarmid,alarmtype,characteristic,components,confirmed,description,deviceid,devicename,devicetype,enabled,lineid,linename," +
+            "modelId,projectid,projectname,rank,resettable,stationid,stationname,subcomponents,suffix,tagid,triggertype,uniformcode from #{tbName}   limit #{limit} offset #{offset} ")
+    List<AlarmVo> selectByTbName(@Param("tbName") String tbName,@Param("limit") long limit,@Param("offset") long offset);
+
+
+    @Select("select last_row(*),tbname from #{superTableName} where tbname in( #{tbnames} ) group by tbname")
+    List<AlarmSimpleVo> selectLastRowByTbname(@Param("superTableName") String superTableName, @Param("tbnames") String tbnames);
+
+    @Select("select last_row(*),alarmid,alarmtype,characteristic,components,confirmed,description,deviceid,devicename,devicetype,enabled,lineid,linename," +
+            "modelId,projectid,projectname,rank,resettable,stationid,stationname,subcomponents,suffix,tagid,triggertype,uniformcode from #{superTableName}" +
+            " where deviceid=#{deviceid} order by rank desc,ts desc limit 0,1")
+    List<AlarmVo> selectLastRowByDeviceid(@Param("superTableName") String superTableName, @Param("deviceid") String deviceid);
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/AlarmTs.java

@@ -0,0 +1,18 @@
+package com.gyee.generation.model.auto;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.sql.Timestamp;
+
+@Data
+@ToString
+public class AlarmTs {
+
+    private Timestamp ts;
+    private Integer val;
+    private Integer oval;
+    private Boolean confirmed;
+    private Timestamp endts;
+    private String tbName;
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/vo/AlarmSimpleVo.java

@@ -0,0 +1,18 @@
+package com.gyee.generation.model.vo;
+
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class AlarmSimpleVo {
+
+    private  String tbName;
+    private Timestamp ts;
+    private Integer val;
+    private Integer oval;
+    private Timestamp endts;
+    private Double timelong;
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/vo/AlarmSuperTalbeType.java

@@ -0,0 +1,53 @@
+package com.gyee.generation.model.vo;
+
+public enum AlarmSuperTalbeType {
+
+    WT("alarmWt", "设备报警超级表"),
+    BT("alarmBt", "升压站报警超级表"),
+    CT("alarmCt", "自定义报警超级表");
+
+    private String code;
+    private String name;
+
+    AlarmSuperTalbeType(String code) {
+        this.code = code;
+    }
+
+    AlarmSuperTalbeType(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * 根据code获取message
+     *
+     * @param code
+     * @return
+     */
+    public static String getNmaeByCode(String code) {
+        for (AlarmSuperTalbeType ele : values()) {
+            if (ele.getCode().equals(code)) {
+                return ele.getName();
+            }
+        }
+        return null;
+    }
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/vo/AlarmTsVo.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.model.vo;
+
+
+import lombok.Data;
+
+@Data
+public class AlarmTsVo {
+
+
+    private String description;
+    private String deviceid;
+    private Integer val;
+
+    private Double timeLong;
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/vo/AlarmVo.java

@@ -0,0 +1,46 @@
+package com.gyee.generation.model.vo;
+
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class AlarmVo {
+
+    private  String tbName;
+    private String alarmid;
+    private String alarmtype;
+    private String characteristic;
+    private String components;
+    private Boolean confirmed;
+    private String description;
+    private String deviceid;
+    private String devicename;
+    private String devicetype;
+    private Boolean enabled;
+    private String lineid;
+    private String linename;
+    private String modelId;
+    private String projectid;
+    private String projectname;
+    private Integer rank;
+    private Boolean resettable;
+    private String stationid;
+    private String stationname;
+    private String subcomponents;
+    private String suffix;
+    private String tagid;
+    private Integer triggertype;
+    private String uniformcode;
+    private String superTableName;
+
+    private Timestamp ts;
+    private Integer val;
+    private Integer oval;
+
+    private Timestamp endts;
+
+    private Double timelong;
+
+}

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

@@ -129,14 +129,14 @@ public class EquipmentInfo1Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconEquipmentInfoDay1Service.saveOrUpdateBatch(templs);
+                proEconEquipmentInfoDay1Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconEquipmentInfoDay1Service.saveOrUpdateBatch(templs);
+            proEconEquipmentInfoDay1Service.saveBatch(templs);
         }
 //        proEconEquipmentInfoDay1Service.saveBatch(dayls);
     }

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

@@ -134,14 +134,14 @@ public class EquipmentInfo2Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconEquipmentInfoDay2Service.saveOrUpdateBatch(templs);
+                proEconEquipmentInfoDay2Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconEquipmentInfoDay2Service.saveOrUpdateBatch(templs);
+            proEconEquipmentInfoDay2Service.saveBatch(templs);
         }
 //        proEconEquipmentInfoDay2Service.saveBatch(dayls);
     }

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

@@ -138,14 +138,14 @@ public class EquipmentInfo3Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconEquipmentInfoDay3Service.saveOrUpdateBatch(templs);
+                proEconEquipmentInfoDay3Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconEquipmentInfoDay3Service.saveOrUpdateBatch(templs);
+            proEconEquipmentInfoDay3Service.saveBatch(templs);
         }
 //        proEconEquipmentInfoDay3Service.saveBatch(dayls);
     }

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

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.generation.init.CacheContext;
+import com.gyee.generation.mapper.auto.AlarmTsMapper;
 import com.gyee.generation.model.auto.*;
+import com.gyee.generation.model.vo.AlarmSuperTalbeType;
+import com.gyee.generation.model.vo.AlarmVo;
 import com.gyee.generation.model.vo.StatusDetailValue;
 import com.gyee.generation.service.auto.IProEconInterruptionService;
 import com.gyee.generation.service.auto.IProEconShutdownEvent2Service;
@@ -41,6 +44,10 @@ public class ShutdownnewService {
     @Resource
     private IProEconInterruptionService proEconInterruptionService;
 
+    @Resource
+    private AlarmTsMapper alarmTsMapper;
+
+
 
     public static Logger logger = LoggerFactory.getLogger(ShutdownnewService.class);
 
@@ -160,6 +167,11 @@ public class ShutdownnewService {
                 item = oldStatusMap.get(wtId);
             }
             if (oldShutdownEvent.containsKey(wtId)) {
+
+                if(wtId.equals("SXJ_KGDL_HSM_F_WT_0021_EQ"))
+                {
+                    System.out.println("");
+                }
                 shutdwonEvent = oldShutdownEvent.get(wtId);
             }
             if (oldShutdownEvent2.containsKey(wtId)) {
@@ -420,15 +432,23 @@ public class ShutdownnewService {
         item.setWindturbineId(wtId);
         if (wtStatusMap.get(wtId).getPointValueInDouble() == StatusDetailValue.GZ.getCode()) {
 
-            item.setStopTypeId("gzbmq");
+            item.setStopTypeId("gz");
 
             //读取报警记录表前后五分钟数据，选取第一个报警报警类型
 
-            // String stopTypeId =newMethod( windturbineId, begin, end);
-            String stopTypeId = null;
-            if (StringUtils.notEmp(stopTypeId)) {
-                item.setStopTypeId(stopTypeId);
+            List<AlarmVo> vos=alarmTsMapper.selectLastRowByDeviceid(AlarmSuperTalbeType.WT.getCode(),wtId);
+            if(!vos.isEmpty())
+            {
+                AlarmVo vo=vos.get(0);
 
+                if(StringUtils.notEmp(vo.getAlarmid()))
+                {
+                    item.setWarningId(vo.getAlarmid());
+                }
+                if(StringUtils.notEmp(vo.getDescription()))
+                {
+                    item.setFaultView(vo.getDescription());
+                }
             }
         } else if (wtStatusMap.get(wtId).getPointValueInDouble() == StatusDetailValue.JX.getCode()) {
             item.setStopTypeId("wh");
@@ -448,15 +468,23 @@ public class ShutdownnewService {
         item.setWindturbineId(wtId);
         if (wtStatusMap.get(wtId).getPointValueInDouble() == StatusDetailValue.GZ.getCode()) {
 
-            item.setStopTypeId("gzbmq");
+            item.setStopTypeId("gz");
 
             //读取报警记录表前后五分钟数据，选取第一个报警报警类型
 
-            // String stopTypeId =newMethod( windturbineId, begin, end);
-            String stopTypeId = null;
-            if (StringUtils.notEmp(stopTypeId)) {
-                item.setStopTypeId(stopTypeId);
+            List<AlarmVo> vos=alarmTsMapper.selectLastRowByDeviceid(AlarmSuperTalbeType.WT.getCode(),wtId);
+            if(!vos.isEmpty())
+            {
+                AlarmVo vo=vos.get(0);
 
+                if(StringUtils.notEmp(vo.getAlarmid()))
+                {
+                    item.setWarningId(vo.getAlarmid());
+                }
+                if(StringUtils.notEmp(vo.getDescription()))
+                {
+                    item.setFaultView(vo.getDescription());
+                }
             }
         } else if (wtStatusMap.get(wtId).getPointValueInDouble() == StatusDetailValue.JX.getCode()) {
             item.setStopTypeId("wh");
@@ -465,7 +493,7 @@ public class ShutdownnewService {
         return item;
     }
 
-    private static void initalShutdownEvent(List<ProEconShutdownEvent> insertProEconShutdownEventls,
+    private  void initalShutdownEvent(List<ProEconShutdownEvent> insertProEconShutdownEventls,
                                             String wtId, Map<String, PointData> wtStatusMap, Date currentTime, ProEconShutdownEvent item) {
         item.setId(StringUtils.getUUID());
         item.setProjectId(CacheContext.wtmap.get(wtId).getProjectId());
@@ -475,16 +503,25 @@ public class ShutdownnewService {
         item.setWindturbineId(wtId);
         if (wtStatusMap.get(wtId).getPointValueInDouble() == StatusDetailValue.GZ.getCode()) {
 
-            item.setStoptypeId("gzbmq");
+            item.setStoptypeId("gz");
 
             //读取报警记录表前后五分钟数据，选取第一个报警报警类型
 
-            // String stopTypeId =newMethod( windturbineId, begin, end);
-            String stopTypeId = null;
-            if (StringUtils.notEmp(stopTypeId)) {
-                item.setStoptypeId(stopTypeId);
+            List<AlarmVo> vos=alarmTsMapper.selectLastRowByDeviceid(AlarmSuperTalbeType.WT.getCode(),wtId);
+            if(!vos.isEmpty())
+            {
+                AlarmVo vo=vos.get(0);
 
+                if(StringUtils.notEmp(vo.getAlarmid()))
+                {
+                    item.setWarningId(vo.getAlarmid());
+                }
+                if(StringUtils.notEmp(vo.getDescription()))
+                {
+                    item.setFaultView(vo.getDescription());
+                }
             }
+
         } else if (wtStatusMap.get(wtId).getPointValueInDouble() == StatusDetailValue.JX.getCode()) {
             item.setStoptypeId("wh");
 
@@ -535,11 +572,7 @@ public class ShutdownnewService {
         updateProEconWindturbineStatusls.add(item);
     }
 
-    private String newMethod(String windturbineId, Date begin, Date end) {
-        String result = "";
 
-        return result;
-    }
 
 
     private Double calLossPower(String windturbineId, Date startDate, Date endDate) throws Exception {

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

@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
+import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
+import com.gyee.generation.model.auto.ProBasicSubStation;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.redis.RedisService;
 import lombok.extern.slf4j.Slf4j;
@@ -137,18 +139,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());

realtime/generationXK-service/src/main/resources/application-jntaos.yml

@@ -0,0 +1,172 @@
+
+server:
+  port: 7020
+  servlet:
+    context-path: /
+
+
+spring:
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  #redis集群
+  redis:
+    #host: 127.0.0.1
+    host: 10.81.3.155
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释，单机不需要打开
+    #    cluster:
+    #      #集群信息
+    #      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
+    password:
+    application:
+      name: test
+    jedis:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1
+    database: 9
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    #type: com.alibaba.druid.pool.DruidDataSource
+    type: com.alibaba.druid.pool.DruidDataSource
+    dynamic:
+      primary: master #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+      datasource:
+        master:
+          url: jdbc:postgresql://10.81.3.151:5432/IMS_NEM_JN
+          username: postgres
+          password: gd123
+          driver-class-name: org.postgresql.Driver
+        slave:
+          driver-class-name: com.taosdata.jdbc.TSDBDriver
+          url: jdbc:TAOS://10.81.3.154:6030/nemjn?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
+          username: root
+          password: taosdata
+        #配置初始化连接数大小
+      initial-size: 10
+      # 最大连接数
+      max-active: 50
+      #最小连接数
+      min-idle: 10
+      #获取连接等待超时时间
+      max-wait: 5000
+      pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+      max-pool-prepared-statement-per-connection-size: 20
+      validation-query: SELECT 1 FROM DUAL
+      validation-query-timeout: 20000
+      test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+      time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+      #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        #可以增加访问账号密码【去掉注释就可以】
+        #login-username: admin
+        #login-password: admin
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: false
+        wall:
+          config:
+            multi-statement-allow: true
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+# 日志配置
+logging:
+  level:
+    root: info
+  charset:
+    # 输出控制台编码
+    console: UTF-8
+    # 输出文件编码
+    file: UTF-8
+  # 输出文件名及路径，不配置则不输出文件
+  file:
+    # 切记，该文件表示正在产出日志的日志文件。并不会打包，当文件大于max-file-size,会根据file-name-pattern格式打包
+    # 名称为log/ota.log文件夹会在项目根目录下，打包后会在启动包同目录下；名称为/log/ota.log的文件夹会在项目所在磁盘的跟目录下
+    name: log/ota.log
+  logback:
+    rollingpolicy:
+      # 单文件的大小，默认10M, 超过之后打包成一个日志文件
+      max-file-size: 1MB
+      # 日志保存的天数
+      max-history: 30
+      # 打包文件格式,默认： ${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz,书写格式为：文件路径/文件名.%i.文件后缀,其中%i不可省去，否则无日志显示
+      # 例如： 日期为：2021/11/5 ,则打包文件之后为： log/ota.2021-11-05.0.gz,0表示日志的第一部分，后续就是，1,2,3...
+      # 如果是压缩包，里面会多一个名log/ota.2021-11-05.0的日志文件
+      # 如下面的例子，打包之后为: log/2021-11/ota.2020-11-5.0.log，这是一个日志文件
+      file-name-pattern: log/%d{yyyy-MM}/ota.%d{yyyy-MM-dd}.%i.log
+
+#db url
+db:
+  url1: http://10.81.3.160:8011/ts
+  url2: http://10.81.3.160:8012/ts
+#  url1: http://127.0.0.1:8011/ts
+#  url2: http://127.0.0.1:8011/ts
+
+#参与计算的场站
+#runWindpowerstation: SXJ_KGDL_GJY_FDC_STA
+runWindpowerstation: SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_TL_GDC_STA
+
+#计算状态用ai或者di
+clauStatus:
+  ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次
+  di: GJY01_GC,GJY02_GC,DJY01_GC,DJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC,NJL01_GC,YTY01_GC,PDL01_GC
+#判断数据终端
+second: 1800
+#判断降出力
+AI110: 17.4    #叶轮转速给定
+AI178: 17.4    #转矩给定
+#AI443:容量
+
+#功率曲线拟合
+curvefitting:
+  #维度
+  dimension: 20
+  #尺度
+  scale: 0.01
+initialcode: INITIAL
+##调用区间间隔时长，需要与XXLJOB调度时长结合，保证查询区间时长大于调度时长，单位分钟
+frequency:
+  #停机
+  shutdown: 1
+  #限电
+  powerrationing: 1
+  #切入切出
+  cutinandout: 1
+
+
+
+
+
+
+
+
+
+
+

realtime/generationXK-service/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: jn
+    active: jntaos
 #    active: yun
 
 #    active: td

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

@@ -1,15 +1,7 @@
 package com.gyee.generation;
 
-import com.gyee.common.model.PointData;
-import com.gyee.common.model.algorithm.PointVo;
-import com.gyee.common.util.algorithm.LineBuild;
-import com.gyee.generation.init.CacheContext;
-import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
-import com.gyee.generation.service.*;
 import com.gyee.generation.service.initalcache.CacheService;
 import com.gyee.generation.service.realtimelibrary.*;
-import com.gyee.generation.util.realtimesource.EdosUtil;
-import com.gyee.generation.util.redis.RedisService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -18,7 +10,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
-import java.util.*;
 
 /**
  * @ClassName : GenerationTest
@@ -62,7 +53,7 @@ public class GenerationTest {
     public void test2() throws Exception {
 
 //        electricityMeteringService.saveGenerationDatas();
-        realtimeService.savaRealtimeTarget();
+//        realtimeService.savaRealtimeTarget();
 //        cycleCalculationService.saveCyle();
 //        statusService.powerRationing();
 //        statusService.statusReal();
@@ -89,7 +80,7 @@ public class GenerationTest {
 //        statusService.calculateStatusNumber();
 
 //          realtimeService.savaRealtimeTarget();
-        cycleCalculationService.saveCyle();
+//        cycleCalculationService.saveCyle();
 
 //        electricityMeteringService.saveGenerationDatas();
 

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

@@ -3,7 +3,7 @@ package com.gyee.generation;
 import com.gyee.common.util.DateUtils;
 import com.gyee.generation.service.InitialRedisService;
 import com.gyee.generation.service.InputOrOutPutService;
-import com.gyee.generation.service.WindturbineGoodnessService;
+import com.gyee.generation.service.ShutdownnewService;
 import com.gyee.generation.util.SpringUtils;
 import org.springframework.boot.SpringApplication;
 
@@ -90,18 +90,14 @@ public class HealthTest {
 //
 //
 //
-//        begin=new Date();
-//        System.out.println("停机记录调度程序执行开始!。。。。。。");
-//        ShutdownnewService shutdownnewService= SpringUtils.getBean("shutdownnewService");
-//       List<ProBasicPowerstation> wpls=new ArrayList<>();
-//
-//        ProBasicPowerstation wp=  CacheContext.wpmap.get("SXJ_KGDL_GJY_FDC_STA");
-//       wpls.add(wp);
-//        List<ProBasicEquipment> wtls=CacheContext.wpwtmap.get("SXJ_KGDL_GJY_FDC_STA");
-//        shutdownnewService.execShutdown(c.getTime());
-//        end=new Date();
-//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-//        System.out.println("停机记录调度程序执行结束!。。。。。。");
+        begin=new Date();
+        System.out.println("停机记录调度程序执行开始!。。。。。。");
+        ShutdownnewService shutdownnewService= SpringUtils.getBean("shutdownnewService");
+
+        shutdownnewService.execShutdown(c.getTime());
+        end=new Date();
+        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+        System.out.println("停机记录调度程序执行结束!。。。。。。");
 //
 //
 //        begin=new Date();
@@ -223,14 +219,14 @@ public class HealthTest {
 //
 //
 //
-        begin=new Date();
-        System.out.println("功率一致性系数和拟合优度调度程序执行开始!。。。。。。");
-        WindturbineGoodnessService windturbineGoodnessService= SpringUtils.getBean("windturbineGoodnessService");
-
-        windturbineGoodnessService.calWindturbineGoodness(c.getTime());
-        end=new Date();
-        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-        System.out.println("功率一致性系数和拟合优度调度程序执行结束!。。。。。。");
+//        begin=new Date();
+//        System.out.println("功率一致性系数和拟合优度调度程序执行开始!。。。。。。");
+//        WindturbineGoodnessService windturbineGoodnessService= SpringUtils.getBean("windturbineGoodnessService");
+//
+//        windturbineGoodnessService.calWindturbineGoodness(c.getTime());
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("功率一致性系数和拟合优度调度程序执行结束!。。。。。。");
 //
 //        c.add(Calendar.DAY_OF_MONTH,-1);
 //        begin=new Date();