生产环境配置修正

common-cloud/ruoyi-auth/src/main/resources/application-demo.yml

@@ -1,5 +0,0 @@
-spring:
-  redis:
-    host: 172.10.0.18
-    port: 6379
-    password:

common-cloud/ruoyi-auth/src/main/resources/application-prod-ct.yml

@@ -0,0 +1,5 @@
+spring:
+  redis:
+    host: 10.0.8.25
+    port: 6379
+    password: ems2025

common-cloud/ruoyi-auth/src/main/resources/bootstrap.yml

@@ -9,21 +9,17 @@ spring:
     name: ruoyi-auth
   profiles:
     # 环境配置
-    active: local
+    active: prod
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.192.10.105:30003
-        group: ems
-        #server-addr: 172.10.0.71:8848
-        #group: public
+        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        namespace: ${env-nacos-namespace:null}
       config:
         # 配置中心地址
-        server-addr: 172.192.10.105:30003
-        group: ems
-        #server-addr: 172.10.0.71:8848
-        #group: public
+        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        namespace: ${env-nacos-namespace:null}
         # 配置文件格式
         file-extension: yml
         # 共享配置

common-cloud/ruoyi-gateway/src/main/resources/application-local.yml

@@ -36,7 +36,7 @@ spring:
             - StripPrefix=0
         # 能源-设备适配器
         - id: ems-dev-adapter
-          uri: http://127.0.0.1:9203
+          uri: lb://ems-dev-adapter
           predicates:
             - Path=/ems-dev-adapter/**
           filters:

common-cloud/ruoyi-gateway/src/main/resources/application-demo.yml → common-cloud/ruoyi-gateway/src/main/resources/application-prod-ct.yml

@@ -1,8 +1,8 @@
 spring:
   redis:
-    host: 172.192.10.105
-    port: 30013
-    password:
+    host: 10.0.8.25
+    port: 6379
+    password: ems2025
   cloud:
     gateway:
       discovery:
@@ -34,6 +34,13 @@ spring:
             - Path=/ems/**
           filters:
             - StripPrefix=0
+        # 能源-设备适配器
+        - id: ems-dev-adapter
+          uri: lb://ems-dev-adapter
+          predicates:
+            - Path=/ems-dev-adapter/**
+          filters:
+            - StripPrefix=0
         # 定时任务
         - id: ruoyi-job
           uri: lb://ruoyi-job

common-cloud/ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -9,21 +9,17 @@ spring:
     name: ruoyi-gateway
   profiles:
     # 环境配置
-    active: local
+    active: prod
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.192.10.105:30003
-        group: ems
-        #server-addr: 172.10.0.71:8848
-        #group: public
+        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        namespace: ${env-nacos-namespace:null}
       config:
         # 配置中心地址
-        server-addr: 172.192.10.105:30003
-        group: ems
-        #server-addr: 172.10.0.71:8848
-        #group: public
+        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        namespace: ${env-nacos-namespace:null}
         # 配置文件格式
         file-extension: yml
         # 共享配置

common-cloud/ruoyi-modules/ruoyi-system/src/main/resources/application-demo.yml → common-cloud/ruoyi-modules/ruoyi-system/src/main/resources/application-prod-ct.yml

@@ -1,9 +1,12 @@
 # spring配置
 spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   redis:
-    host: 172.10.0.18
+    host: 10.0.8.25
     port: 6379
-    password:
+    password: ems2025
   datasource:
     druid:
       stat-view-servlet:
@@ -30,15 +33,15 @@ spring:
         # 主库数据源
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://172.10.0.10:3306/ems?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-          username: root
-          password: abc123
-          # 从库数据源
-          # slave:
-          # username:
-          # password:
-          # url:
-          # driver-class-name:
+          url: jdbc:mysql://10.0.8.20:3306/ems_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: ems_ct
+          password: SBBsnTccaQaJ3ceW
+        # 从库数据源
+        slave:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://10.0.8.21:3306/ems_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: ems_ct
+          password: SBBsnTccaQaJ3ceW
 
 # mybatis配置
 mybatis:
@@ -50,5 +53,4 @@ mybatis:
 # swagger配置
 swagger:
   title: 系统模块接口文档
-  license: Powered By ruoyi
-  licenseUrl: https://ruoyi.vip
+  enabled: true

common-cloud/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -1,6 +1,7 @@
 # Tomcat
 server:
   port: 9201
+
 # Spring
 spring:
   application:
@@ -8,23 +9,20 @@ spring:
     name: ruoyi-system
   profiles:
     # 环境配置
-    active: local
+    active: prod
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.192.10.105:30003
-        group: ems
-        #server-addr: 172.10.0.71:8848
-        #group: public
+        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        namespace: ${env-nacos-namespace:null}
       config:
         # 配置中心地址
-        server-addr: 172.192.10.105:30003
-        group: ems
-        #server-addr: 172.10.0.71:8848
-        #group: public
+        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        namespace: ${env-nacos-namespace:null}
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        group: DEFAULT_GROUP

common-cloud/tool-modules/general-data/pom.xml

@@ -45,9 +45,9 @@
         </dependency>
         <!-- mysql驱动 -->
         <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>2.2.6</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.0.33</version>
         </dependency>
         <!-- Druid 数据库连接池依赖 -->
         <dependency>

common-cloud/tool-modules/general-data/src/main/resources/application-locale.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://172.192.13.95:3306/common_data?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
-    password: 'abc123'
-    url: jdbc:mariadb://172.192.13.95:3310/common_data?characterEncoding=utf8&useSSL=false&allowMultiQueries=true
-    driver-class-name: org.mariadb.jdbc.Driver
+    password: abc123
 
 mybatis:
   mapper-locations: classpath:mapper/*.xml

common-cloud/tool-modules/general-data/src/main/resources/application.yml

@@ -5,6 +5,6 @@ spring:
     active: locale
 
 server:
-  port: 9300
+  port: 9000
   servlet:
     context-path: /general-data

ems/ems-cloud/ems-dev-adapter/src/main/resources/application-prod-ct.yml

@@ -0,0 +1,68 @@
+# spring配置
+spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  redis:
+    host: 10.0.8.25
+    port: 6379
+    password: ems2025
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        loginUsername: admin
+        loginPassword: 123456
+    dynamic:
+      druid:
+        initial-size: 5
+        min-idle: 5
+        maxActive: 20
+        maxWait: 60000
+        timeBetweenEvictionRunsMillis: 60000
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        filters: stat,slf4j
+        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+      datasource:
+        # 主库数据源
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://10.0.8.20:3306/ems_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: ems_ct
+          password: SBBsnTccaQaJ3ceW
+        # 从库数据源
+        slave:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://10.0.8.21:3306/ems_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: ems_ct
+          password: SBBsnTccaQaJ3ceW
+
+mqtt:
+  server:
+    host: tcp://10.0.8.28:1883
+    client_id: ems-dev-adapter
+  executor:
+    msgHandle:
+      corePoolSize: 20
+      maxPoolSize: 50
+      queueCapacity: 2000
+      namePrefix: 'mqttHandle-'
+
+# mybatis配置
+mybatis:
+  # 搜索指定包别名
+  typeAliasesPackage: com.ruoyi.ems.**.domain;
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*.xml
+  configuration:
+    map-underscore-to-camel-case: true
+# swagger配置
+swagger:
+  title: 能源模块接口文档
+  enabled: true

ems/ems-cloud/ems-dev-adapter/src/main/resources/bootstrap.yml

@@ -10,21 +10,17 @@ spring:
     name: ems-dev-adapter
   profiles:
     # 环境配置
-    active: local
+    active: prod
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.192.10.105:30003
-        group: ems
-        #server-addr: 172.10.0.71:8848
-        #group: public
+        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        namespace: ${env-nacos-namespace:null}
       config:
         # 配置中心地址
-        server-addr: 172.192.10.105:30003
-        group: ems
-        #server-addr: 172.10.0.71:8848
-        #group: public
+        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        namespace: ${env-nacos-namespace:null}
         # 配置文件格式
         file-extension: yml
         # 共享配置

ems/ems-cloud/ems-server/src/main/resources/application-demo.yml → ems/ems-cloud/ems-server/src/main/resources/application-prod-ct.yml

@@ -4,9 +4,9 @@ spring:
     pathmatch:
       matching-strategy: ant_path_matcher
   redis:
-    host: 172.10.0.18
+    host: 10.0.8.25
     port: 6379
-    password:
+    password: ems2025
   datasource:
     druid:
       stat-view-servlet:
@@ -33,15 +33,15 @@ spring:
         # 主库数据源
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://172.10.0.10:3306/ems?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-          username: root
-          password: abc123
-          # 从库数据源
-          # slave:
-          # username:
-          # password:
-          # url:
-          # driver-class-name:
+          url: jdbc:mysql://10.0.8.20:3306/ems_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: ems_ct
+          password: SBBsnTccaQaJ3ceW
+        # 从库数据源
+        slave:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://10.0.8.20:3306/ems_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: ems_ct
+          password: SBBsnTccaQaJ3ceW
 
 # mybatis配置
 mybatis:
@@ -54,4 +54,4 @@ mybatis:
 # swagger配置
 swagger:
   title: 能源模块接口文档
-  enabled: true
+  enabled: true

ems/ems-cloud/ems-server/src/main/resources/bootstrap.yml

@@ -10,21 +10,17 @@ spring:
     name: ems-server
   profiles:
     # 环境配置
-    active: local
+    active: prod
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.192.10.105:30003
-        group: ems
-        #server-addr: 172.10.0.71:8848
-        #group: public
+        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        namespace: ${env-nacos-namespace:null}
       config:
         # 配置中心地址
-        server-addr: 172.192.10.105:30003
-        group: ems
-        #server-addr: 172.10.0.71:8848
-        #group: public
+        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        namespace: ${env-nacos-namespace:null}
         # 配置文件格式
         file-extension: yml
         # 共享配置

ems/sql/ems_init_data.sql

@@ -954,73 +954,6 @@ INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`
 INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2025', '202503', 1823, '2025-02-28', 2074, '2025-03-31', 12550, NULL, NULL);
 
 
--- 自动抄表数据
--- 广场照明自动抄表脚本
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3001', 'J-D-B-G001', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3002', 'J-D-N-G001', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
-
--- 水表抄表脚本
--- INSERT INTO `adm_water_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `water_quantity`, `meter_unit_price`, `use_water_cost`) VALUES ('321283124S3001', 'J-S-B-01', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(RAND() * 100), 3.2, FLOOR(RAND() * 300))
--- INSERT INTO `adm_water_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `water_quantity`, `meter_unit_price`, `use_water_cost`) VALUES ('321283124S3002', 'J-S-N-01', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(RAND() * 100), 3.2, FLOOR(RAND() * 300))
-
--- 设施抄表脚本
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3001', 'J-D-B-Z101', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3001', 'J-D-B-Z102', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3001', 'J-D-B-Z110', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3001', 'J-D-B-Z120', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
-
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3002', 'J-D-N-Z201', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3002', 'J-D-N-Z202', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3002', 'J-D-N-Z210', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3002', 'J-D-N-Z220', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
-
--- 区域自动抄表脚本
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3001', 'J-D-B-101', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3001', 'J-D-B-102', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3001', 'J-D-B-103', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3001', 'J-D-B-104', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
-
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3002', 'J-D-N-101', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3002', 'J-D-N-102', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3002', 'J-D-N-103', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
--- INSERT INTO `adm_elec_meter_h` (`area_code`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`, `meter_type`, `meter_unit_price`, `use_elec_cost`) VALUES ('321283124S3002', 'J-D-N-104', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(50 + (RAND() * 110)), 0, 0.538, FLOOR(100 + (RAND() * 110)))
-
-
--- 电网计量指标数据 Mock
--- INSERT INTO adm_ems_pg_supply_h (area_code, facs_code, record_time, `date`, `time`, time_index, meter_type, meter_unit_price, use_elec_quantity, use_elec_cost) VALUES ('321283124S3001', 'W201', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, 0, 0.75, FLOOR(50 + (RAND() * (150 - 50 + 1))), FLOOR(RAND() * (100 - 1 + 1)) + 1);
-
--- 光伏指标数据 Mock
--- 6-17点执行日数据
--- INSERT INTO adm_ems_pv_supply_h (area_code, facs_code, record_time, `date`, `time`, time_index, up_unit_price, gen_elec_quantity, use_elec_quantity, up_elec_quantity, up_elec_earn) VALUES ('321283124S3001', 'E501', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, 0.45, FLOOR(60 + (RAND() * 41)), FLOOR(40 + (RAND() * 41)), FLOOR(20 + (RAND() * 41)), FLOOR(10 +(RAND() * 21)));
--- INSERT INTO adm_ems_pv_supply_h (area_code, facs_code, record_time, `date`, `time`, time_index, up_unit_price, gen_elec_quantity, use_elec_quantity, up_elec_quantity, up_elec_earn) VALUES ('321283124S3002', 'E502', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, 0.45, FLOOR(60 + (RAND() * 41)), FLOOR(40 + (RAND() * 41)), FLOOR(20 + (RAND() * 41)), FLOOR(10 +(RAND() * 21)));
--- INSERT INTO adm_ems_pv_supply_h (area_code, facs_code, record_time, `date`, `time`, time_index, up_unit_price, gen_elec_quantity, use_elec_quantity, up_elec_quantity, up_elec_earn) VALUES ('321283124S3003', 'E503', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, 0.45, FLOOR(60 + (RAND() * 41)), FLOOR(40 + (RAND() * 41)), FLOOR(20 + (RAND() * 41)), FLOOR(10 +(RAND() * 21)));
--- 夜数据
--- INSERT INTO adm_ems_pv_supply_h (area_code, facs_code, record_time, `date`, `time`, time_index, up_unit_price, gen_elec_quantity, use_elec_quantity, up_elec_quantity, up_elec_earn) VALUES ('321283124S3001', 'E501', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, 0.45, 0, 0, 0, 0);
--- INSERT INTO adm_ems_pv_supply_h (area_code, facs_code, record_time, `date`, `time`, time_index, up_unit_price, gen_elec_quantity, use_elec_quantity, up_elec_quantity, up_elec_earn) VALUES ('321283124S3002', 'E502', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, 0.45, 0, 0, 0, 0);
--- INSERT INTO adm_ems_pv_supply_h (area_code, facs_code, record_time, `date`, `time`, time_index, up_unit_price, gen_elec_quantity, use_elec_quantity, up_elec_quantity, up_elec_earn) VALUES ('321283124S3003', 'E503', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, 0.45, 0, 0, 0, 0);
-
--- 储能计量demo数据 Mock
--- 0 to 9点执行 储能
--- INSERT INTO `adm_ems_elec_store_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `charge_elec_quantity`, `discharge_elec_quantity`) VALUES ('321283124S3001', 'C101', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(30 + (RAND() * (60 - 30 + 1))), 0);
--- INSERT INTO `adm_ems_elec_store_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `charge_elec_quantity`, `discharge_elec_quantity`) VALUES ('321283124S3002', 'C102', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR(30 + (RAND() * (60 - 30 + 1))), 0);
--- 10 to 23点执行不储能
--- INSERT INTO `adm_ems_elec_store_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `charge_elec_quantity`, `discharge_elec_quantity`) VALUES ('321283124S3001', 'C101', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, 0, FLOOR(30 + (RAND() * (60 - 30 + 1))));
--- INSERT INTO `adm_ems_elec_store_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `charge_elec_quantity`, `discharge_elec_quantity`) VALUES ('321283124S3002', 'C102', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, 0, FLOOR(30 + (RAND() * (60 - 30 + 1))));
-
--- 电力负荷数据
--- 储能负荷
--- INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 2, 'C101', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
--- INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 2, 'C102', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
-
--- 变压器负荷
--- INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 3, 'D-B-1001', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
--- INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 3, 'D-N-1001', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
-
--- 空调负荷
--- INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 2, 'Z120', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
--- INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 2, 'Z220', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
-
-
 -- 台账数据
 INSERT INTO `adm_ems_device_rbook` (`record_code`, `area_code`, `obj_type`, `obj_code`, `obj_name`, `record_time`, `ins_location`, `maintain_title`, `maintain_content`, `maintain_person`) VALUES ('TZ-20240901001', '321283124S3001', 1, 'W201', '北区-电网', '2024-09-01 10:32:00', '北区-广场', '北区广场变压器维护', '执行例行维护', '李大航');
 INSERT INTO `adm_ems_device_rbook` (`record_code`, `area_code`, `obj_type`, `obj_code`, `obj_name`, `record_time`, `ins_location`, `maintain_title`, `maintain_content`, `maintain_person`) VALUES ('TZ-20240901002', '321283124S3001', 2, 'Z010-R101-001', '北区-开水炉', '2024-09-10 17:34:56', '北区/综合楼/一楼开水间', '开水炉除垢', '执行开水炉除垢', '王凯');

ems/sql/ems_server.sql

@@ -692,13 +692,13 @@ create table adm_ems_obj_model  (
 
 
 -- 对象模型初始数据
-INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `ability_handler`) VALUES ('M_W2', '国网供电模型', 1, null, null);
-INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `ability_handler`) VALUES ('M_E5', '光伏设施模型', 1, null, null);
-INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `ability_handler`) VALUES ('M_C1', '储能模型', 1, null, null);
-INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `ability_handler`) VALUES ('M_W2_T', '变压器设备模型', 2, null, null);
-INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `ability_handler`) VALUES ('M_W2_AP', '配电柜模型', 2, null, null);
-INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `ability_handler`) VALUES ('M_W2_QR', '漏电保护器模型', 2, null, null);
-INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `ability_handler`) VALUES ('M_W2_QF', '断路器模型', 2, null, null);
+INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `event_handler`) VALUES ('M_W2', '国网供电模型', 1, null, null);
+INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `event_handler`) VALUES ('M_E5', '光伏设施模型', 1, null, null);
+INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `event_handler`) VALUES ('M_C1', '储能模型', 1, null, null);
+INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `event_handler`) VALUES ('M_W2_T', '变压器设备模型', 2, null, null);
+INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `event_handler`) VALUES ('M_W2_AP', '配电柜模型', 2, null, null);
+INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `event_handler`) VALUES ('M_W2_QR', '漏电保护器模型', 2, null, null);
+INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `event_handler`) VALUES ('M_W2_QF', '断路器模型', 2, null, null);
 
 
 -- ----------------------------

ems/sql/ems_sys_data.sql

@@ -50,7 +50,7 @@ insert into sys_menu values ('117',  '策略',            '2',    '7',  'strateg
 insert into sys_menu values ('126',  '产能分析',       '3',    '1',  'power-prod',         'analysis/power/prod',       '', 1, 0, 'C', '0', '0',    'analysis:power:prod',    'energyprod',     'admin', sysdate(), '', null, '产能分析');
 insert into sys_menu values ('127',  '储能分析',       '3',    '2',  'power-store',        'analysis/power/store',      '', 1, 0, 'C', '0', '0',    'analysis:power:store',   'energystore',    'admin', sysdate(), '', null, '储能分析');
 insert into sys_menu values ('128',  '用能分析',       '3',    '3',  'power-consume',      'analysis/power/consume',    '', 1, 0, 'C', '0', '0',    'analysis:power:consume', 'energyconsume',  'admin', sysdate(), '', null, '用能分析');
-insert into sys_menu values ('129',  '节能分析',       '3',    '4',  'EmsEcoD', 'ems/EmsEcoD/index', 1, 0, 'C', '0', '0', 'ems:EmsEcoD:list',    'energysave',     'admin', sysdate(), '', null, '节能分析');
+insert into sys_menu values ('129',  '节能分析',       '3',    '4',  'EmsEcoD',            'ems/EmsEcoD/index',         '',1, 0, 'C', '0', '0', 'ems:EmsEcoD:list',    'energysave',     'admin', sysdate(), '', null, '节能分析');
 insert into sys_menu values ('120',  '趋势预测',       '3',    '5',  'prediction',         '',                          '', 1, 0, 'M', '0', '0',    '',                       'prediction',     'admin', sysdate(), '', null, '趋势预测');
 insert into sys_menu values ('121',  '数据报表',       '3',    '6',  'analysis-statement', '',                          '', 1, 0, 'M', '0', '0',    'analysis:statement',     'statement',      'admin', sysdate(), '', null, '数据报表');