宁夏分停机事件参数异常处理

.idea/compiler.xml

@@ -8,8 +8,10 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="alarm-scanner" />
-        <module name="alarm-service" />
+        <module name="alarm-web" />
         <module name="alarm-custom" />
+        <module name="alarm-stat" />
+        <module name="alarm-service" />
       </profile>
     </annotationProcessing>
   </component>

.idea/encodings.xml

@@ -7,6 +7,10 @@
     <file url="file://$PROJECT_DIR$/alarm-scanner/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/alarm-service/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/alarm-service/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/alarm-stat/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/alarm-stat/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/alarm-web/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/alarm-web/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>

.idea/jarRepositories.xml

@@ -8,6 +8,21 @@
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://192.168.2.172:8081/repository/maven-public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
@@ -19,7 +34,17 @@
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
       <option name="url" value="https://maven.aliyun.com/repository/public" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/central" />
+    </remote-repository>
   </component>
 </project>

alarm-custom/target/classes/application-jn.yml

@@ -1,6 +1,6 @@
 
 server:
-  port: 6012
+  port: 6013
   servlet:
     context-path: /
 
@@ -134,8 +134,8 @@ logging:
 
 #db url
 db:
-  url1: http://10.81.3.154:8021/ts
-  url2: http://10.81.3.154:8022/ts
+  url1: http://10.81.3.160:8011/ts
+  url2: http://10.81.3.160:8012/ts
 
 
 #参与计算的场站
@@ -168,10 +168,11 @@ frequency:
   #切入切出
   cutinandout: 1
 urls:
-  alarm-service: http://127.0.0.1:6010
+  alarm-service: http://10.81.3.154:6014
+#  alarm-service: http://127.0.0.1:6014
 
-task-count: 10
-read-count: 10
+task-count: 5000
+read-count: 300000
 interval: 1
 
 #WT("wt_alarms", "设备报警超级表"),

alarm-custom/target/classes/application.yml

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

alarm-custom/target/classes/xxl-job-executor.properties

@@ -1,25 +1,25 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-#xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
-xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-
-### xxl-job executor appname
-### 场站计算
-xxl.job.executor.appname=generationTarget-job
-### 区域公司计算
-#xxl.job.executor.appname=generationRG-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-xxl.job.executor.port=9201
-#区域端口
-#xxl.job.executor.port=9202
-
-### xxl-job executor log-path
-xxl.job.executor.logpath=/data/nem/computeEngine/logs
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-
+#### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
+##xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
+#xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
+#### xxl-job, access token
+#xxl.job.accessToken=
+#
+#### xxl-job executor appname
+#### 场站计算
+#xxl.job.executor.appname=generationTarget-job
+#### 区域公司计算
+##xxl.job.executor.appname=generationRG-job
+#### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
+#xxl.job.executor.address=
+#### xxl-job executor server-info
+#xxl.job.executor.ip=
+##场站端口
+#xxl.job.executor.port=9201
+##区域端口
+##xxl.job.executor.port=9202
+#
+#### xxl-job executor log-path
+#xxl.job.executor.logpath=/data/nem/computeEngine/logs
+#### xxl-job executor log-retention-days
+#xxl.job.executor.logretentiondays=30
+#

alarm-scanner/target/classes/application-jn.yml

@@ -1,187 +0,0 @@
-
-server:
-  port: 6011
-  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
-  servlet:
-    multipart:
-      # 开启 multipart 上传功能
-      enabled: true
-      # 文件写入磁盘的阈值
-      file-size-threshold: 2KB
-      # 最大文件大小
-      max-file-size: 200MB
-      # 最大请求大小
-      max-request-size: 215MB
-
-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.154:8021/ts
-  url2: http://10.81.3.154:8022/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
-urls:
-  alarm-service: http://127.0.0.1:6010
-
-task-count: 10
-interval: 1
-
-#WT("wt_alarms", "设备报警超级表"),
-#BT("bt_alarms", "升压站报警超级表"),
-#CT("custom_alarms", "自定义报警超级表");
-alarmType: bt_alarms
-read-rows: 1000
-
-
-
-
-
-
-

alarm-scanner/target/classes/application.yml

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