修改代码

energy-manage-service/docker-compose/.env

@@ -1,9 +1,10 @@
-MYSQL_HOST_PORT=3389
+MYSQL_HOST_PORT=3306
+MYSQL_ROOT_USER=admin
 MYSQL_ROOT_PASSWORD=admin123456
 MYSQL_DATA_DIR=./mysql
 MYSQL_CONF_FILE=./conf/mysql.cnf
 
-REDIS_HOST_PORT=6378
+REDIS_HOST_PORT=6379
 REDIS_PASSWORD=admin123456
 REDIS_CONF_FILE=./conf/redis.conf
 REDIS_LOG_DIR=./log/redis
@@ -15,9 +16,7 @@ MODE=standalone
 SPRING_DATASOURCE_PLATFORM=mysql
 MYSQL_SERVICE_HOST=mysql
 MYSQL_SERVICE_DB_NAME=nacos
-MYSQL_SERVICE_USER=root
-MYSQL_SERVICE_PASSWORD=123456
 NACOS_PROPERTIES=./conf/custom.properties
-MYSQL_SERVICE_DB_PARAM=useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false&allowPublicKeyRetrieval=true
+MYSQL_SERVICE_DB_PARAM=useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
 
 PARENT_WORK_DIR=/usr/local

energy-manage-service/docker-compose/app/Dockerfile

@@ -1,5 +1,5 @@
 # 该镜像需要依赖的基础镜像
-FROM openjdk:24-ea-slim
+FROM openjdk:8-jdk-alpine
 
 # 设置自定义标签
 LABEL version="1.0.0" maintainer="znzn"
@@ -10,7 +10,7 @@ ENV WORKDIR="/data/app"
 WORKDIR $WORKDIR
 
 # 将当前目录下的jar包复制到docker容器的工作目录下
-COPY ./energy.jar ./energy.jar
+COPY ./app/energy.jar ./energy.jar
 
 #设置时区
 RUN mkdir ./logs

energy-manage-service/docker-compose/docker-compose.yml

@@ -1,5 +1,5 @@
 #compose版本
-version: '2.33.0'
+version: '2.24.6-desktop.1'
 #服务列表
 services:
   mysql:
@@ -18,13 +18,16 @@ services:
     #将mysql目录映射到本地 应根据自己所需要映射的目录进行修改
     volumes:
       - ${PARENT_WORK_DIR}/mysql-data/conf:/etc/mysql/conf.d
-      #根据日志路径配置
+#      #根据日志路径配置
       - ${PARENT_WORK_DIR}/mysql-data/logs:/var/log/mysql
       - ${PARENT_WORK_DIR}/mysql-data/data:/var/lib/mysql
     restart: on-failure
+    networks:
+      phm_net:
+        ipv4_address: 172.40.0.20
 
   redis:
-    image: redis:latest
+    image: redis
     container_name: energy-redis
     environment:
       - REDIS_PASSWORD=${REDIS_PASSWORD}
@@ -36,71 +39,117 @@ services:
       - ${PARENT_WORK_DIR}/redis-data/conf/redis.conf:/usr/local/etc/redis/redis.conf
       - ${PARENT_WORK_DIR}/redis-data/logs:/logs
     restart: on-failure
-#
-#
-#  nacos:
-#    image: nacos/nacos-server
-#    container_name: energy-nacos
-#    #如果挂载卷中指定nacos application.properties文件，则不需要指定以下环境变量
-#    environment:
-#      - SPRING_DATASOURCE_PLATFORM=${SPRING_DATASOURCE_PLATFORM}
-#      - MYSQL_SERVICE_HOST=${MYSQL_SERVICE_HOST}
-#      - MYSQL_SERVICE_PORT=${MYSQL_SERVICE_PORT}
-#      - MYSQL_SERVICE_DB_NAME=${MYSQL_SERVICE_DB_NAME}
-#      - MYSQL_SERVICE_DB_PARAM=${MYSQL_SERVICE_DB_PARAM}
-#      - MYSQL_SERVICE_USER=${MYSQL_SERVICE_USER}
-#      - MYSQL_SERVICE_PASSWORD=${MYSQL_ROOT_PASSWORD}
-#      - MODE=${MODE}
+    networks:
+      phm_net:
+        ipv4_address: 172.40.0.21
+
+  nacos:
+    image: nacos/nacos-server
+    container_name: energy-nacos
+    #如果挂载卷中指定nacos application.properties文件，则不需要指定以下环境变量
+    environment:
+      - SPRING_DATASOURCE_PLATFORM=${SPRING_DATASOURCE_PLATFORM}
+      - MYSQL_SERVICE_HOST=${MYSQL_SERVICE_HOST}
+      - MYSQL_SERVICE_PORT=${MYSQL_SERVICE_PORT}
+      - MYSQL_SERVICE_DB_NAME=${MYSQL_SERVICE_DB_NAME}
+      - MYSQL_SERVICE_DB_PARAM=${MYSQL_SERVICE_DB_PARAM}
+      - MYSQL_SERVICE_USER=${MYSQL_ROOT_USER}
+      - MYSQL_SERVICE_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MODE=${MODE}
 #      - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789
-#    ports:
-#      - "8849:8848"
-##    volumes:
-##      - ${PARENT_WORK_DIR}/nacos:/data/nacos/conf
-#    restart: on-failure
-#    depends_on:
-#      - mysql
-#
-#  xxl_job:
-#    build:
-#      context: .
-#      dockerfile: ./xxl-job/Dockerfile
-#      container_name: energy-xxl-job
-#      ports:
-#        - "16900:16900"
-#      environment:
-#        - TZ=Asia/Shanghai
-##      volumes:
-##        - ${PARENT_WORK_DIR}/xxl-job/conf:/data/applogs/xxl-job/conf
-#      dependson:
-#        - mysql
-#      restart: on-failure
-#
-#  minio:
-#
-#
-#  energy-admin:
-#    # 指定构建文件
-#    build:
-#      context: .
-#      # dockerfile文件所在路径
-#      dockerfile: app/Dockerfile
-##    #或者指定镜像都可以
-##    image: timo-service:1.0.3
-#    container_name: energy-admin
-#    environment:
-#      - TZ=Asia/Shanghai
-#    #端口映射
-#    ports:
-#      - "16200:16200"
-#    volumes:
-#      - ${PARENT_WORK_DIR}/energy/logs:/data/app/logs
-#    restart: on-failure
-#    depends_on:
-#      - mysql
-#      - redis
-#      - nacos
-#      - xxl_job
-#      - minio
+    ports:
+      - "8849:8848"
+    volumes:
+      - ${PARENT_WORK_DIR}/nacos:/home/nacos/conf
+      - ${PARENT_WORK_DIR}/nacos/logs:/home/nacos/logs
+      - ${PARENT_WORK_DIR}/nacos/data:/home/nacos/data
+    restart: on-failure
+    depends_on:
+      - mysql
+    networks:
+      phm_net:
+        ipv4_address: 172.40.0.22
+
+  xxl_job:
+    build:
+      context: .
+      dockerfile: ./xxl-job/Dockerfile
+    container_name: energy-xxl-job
+    ports:
+      - "16800:16900"
+    environment:
+      - TZ=Asia/Shanghai
+#      volumes:
+#        - ${PARENT_WORK_DIR}/xxl-job/conf:/data/applogs/xxl-job/conf
+    depends_on:
+      - mysql
+    restart: on-failure
+    networks:
+      phm_net:
+        ipv4_address: 172.40.0.23
+
+  minio:
+    image: minio/minio:latest
+    container_name: energy-minio
+    ports:
+      - "9000:9000"
+      - "9001:9001"
+    environment:
+      - MINIO_ROOT_USER=zgh-zn-nacos
+      - MINIO_ROOT_PASSWORD=zgh-zn-nacos-password
+    volumes:
+      - ${PARENT_WORK_DIR}/minio-data/data:/data
+    command: server  /data --console-address ":9001"
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
+      interval: 30s
+      timeout: 20s
+      retries: 3
+    networks:
+      phm_net:
+        ipv4_address: 172.40.0.24
+
+  #创建bucket
+  mc:
+    image: minio/mc:latest
+    container_name: mc
+    depends_on:
+      minio:
+        condition: service_healthy
+    entrypoint: >
+      /bin/sh -c "
+      /usr/bin/mc alias set theminio http://172.40.0.24:9000 zgh-zn-nacos zgh-zn-nacos-password;
+      /usr/bin/mc mb theminio/bucket-zhzn;
+      /usr/bin/mc policy set public theminio/bucket-zhzn;
+      exit 0;
+      "
+      EOF
+    networks:
+      - phm_net
+
+  energy-admin:
+    # 指定构建文件
+    build:
+      context: .
+      # dockerfile文件所在路径
+      dockerfile: ./app/Dockerfile
+    container_name: energy-admin
+    environment:
+      - TZ=Asia/Shanghai
+    #端口映射
+    ports:
+      - "16200:16200"
+    volumes:
+      - ${PARENT_WORK_DIR}/energy/logs:/data/app/logs
+    restart: on-failure
+    depends_on:
+      - mysql
+      - redis
+      - nacos
+      - minio
+    networks:
+      phm_net:
+        ipv4_address: 172.40.0.25
 #
 #  nginx:
 #    image: nginx:stable-perl
@@ -121,4 +170,11 @@ services:
 #    #重启方式
 #    restart: on-failure
 
+networks:
+  phm_net:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.40.0.0/16
+
 

energy-manage-service/docker-compose/mysql/Dockerfile

@@ -20,5 +20,5 @@ COPY ./mysql/$SQL_JOB_FILE $WORK_PATH/
 #复制自动执行脚本
 COPY ./mysql/$INSTALL_DATA_SHELL $AUTO_RUN_DIR/
 
-#给执行文件增加可执行权限 && 添加软连接时区设置
+#给执行文件增加可执行权限
 RUN chmod a+x $AUTO_RUN_DIR/$INSTALL_DATA_SHELL

energy-manage-service/docker-compose/mysql/docker-entrypoint.sh

@@ -1,15 +1,13 @@
 #!/bin/bash
 export WORK_BASE=/usr/local
-#export MYSQL_PWD=chen1989
-#mysql -u root -p "$MYSQL_PWD" <<EOF
-mysql -uroot -padmin123456 <<EOF
-create database energy;
+mysql -uroot -padmin1234567 <<EOF
+create database if not exists energy;
 use energy;
-source "$WORK_BASE"/energy.sql;
+source $WORK_BASE/energy.sql;
 create database nacos;
 use nacos;
-source "$WORK_BASE"/nacos.sql;
+source $WORK_BASE/nacos.sql;
 create database xxl_job;
 use xxl_job;
-source "$WORK_BASE"/xxl_job.sql;
+source $WORK_BASE/xxl_job.sql;
 EOF

energy-manage-service/docker-compose/mysql/energy.sql

@@ -33,7 +33,7 @@ CREATE TABLE `analysis_comment_description` (
   `update_by` int(11) NOT NULL DEFAULT '0' COMMENT '更新人',
   PRIMARY KEY (`id`),
   KEY `index_batch_code` (`batch_code`) USING BTREE COMMENT '批次编号索引'
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COMMENT='分析图表文本描述 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='分析图表文本描述 ';
 
 -- ----------------------------
 -- Table structure for analysis_comment_type_relation
@@ -50,7 +50,7 @@ CREATE TABLE `analysis_comment_type_relation` (
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `is_delete` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除0：否 1：是',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COMMENT=' 分析结果评论类型关系表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT=' 分析结果评论类型关系表';
 
 -- ----------------------------
 -- Table structure for analysis_data_relation_records
@@ -74,7 +74,7 @@ CREATE TABLE `analysis_data_relation_records` (
   `task_id` varchar(50) NOT NULL DEFAULT '' COMMENT '任务id',
   `auto_or_manual` varchar(20) DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Table structure for analysis_diagram_relation
@@ -91,7 +91,7 @@ CREATE TABLE `analysis_diagram_relation` (
   `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   PRIMARY KEY (`id`),
   KEY `index_batch_code` (`batch_code`) USING BTREE COMMENT '批次索引'
-) ENGINE=InnoDB AUTO_INCREMENT=1100 DEFAULT CHARSET=utf8mb4 COMMENT='分析图表关系表 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='分析图表关系表 ';
 
 -- ----------------------------
 -- Table structure for analysis_general_file
@@ -109,7 +109,7 @@ CREATE TABLE `analysis_general_file` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `index_file_unique` (`batch_code`,`analysis_type_code`,`file_addr`) USING BTREE COMMENT '唯一索引',
   KEY `index_batch_code` (`batch_code`) USING BTREE COMMENT '批次索引'
-) ENGINE=InnoDB AUTO_INCREMENT=134 DEFAULT CHARSET=utf8mb4 COMMENT='分析结果总文件信息表 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='分析结果总文件信息表 ';
 
 -- ----------------------------
 -- Table structure for analysis_option_records
@@ -124,7 +124,7 @@ CREATE TABLE `analysis_option_records` (
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '操作时间',
   PRIMARY KEY (`id`),
   KEY `index_field_code` (`field_code`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=69 DEFAULT CHARSET=utf8mb4 COMMENT='分析操作记录';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='分析操作记录';
 
 -- ----------------------------
 -- Table structure for analysis_priority_records
@@ -139,7 +139,7 @@ CREATE TABLE `analysis_priority_records` (
   `execute_status` tinyint(2) NOT NULL DEFAULT '0' COMMENT '是否已执行（默认0 0：否 1：是）',
   `task_id` varchar(100) NOT NULL DEFAULT '' COMMENT '任务执行序列号',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Table structure for analysis_result
@@ -169,7 +169,7 @@ CREATE TABLE `analysis_result` (
   `analysis_start_time` datetime DEFAULT NULL COMMENT '分析开始时间',
   PRIMARY KEY (`id`),
   UNIQUE KEY `index_batch_code` (`batch_code`) USING BTREE COMMENT '批次索引'
-) ENGINE=InnoDB AUTO_INCREMENT=1324 DEFAULT CHARSET=utf8mb4 COMMENT='分析结果表—批次分析结果表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='分析结果表—批次分析结果表';
 
 -- ----------------------------
 -- Table structure for analysis_result_report
@@ -199,7 +199,7 @@ CREATE TABLE `analysis_type` (
   `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `type_code` varchar(50) NOT NULL DEFAULT '' COMMENT '分析类型编号',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=131 DEFAULT CHARSET=utf8mb4 COMMENT='分析类型字典表 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='分析类型字典表 ';
 
 -- ----------------------------
 -- Table structure for anemometer_tower
@@ -219,7 +219,7 @@ CREATE TABLE `anemometer_tower` (
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`),
   KEY `anemometer_code` (`anemometer_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='测风塔信息 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='测风塔信息 ';
 
 -- ----------------------------
 -- Table structure for anemometer_tower_height
@@ -235,7 +235,7 @@ CREATE TABLE `anemometer_tower_height` (
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`),
   KEY `anemometer_code` (`anemometer_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='测风塔层高信息表 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='测风塔层高信息表 ';
 
 -- ----------------------------
 -- Table structure for anemometer_tower_relation
@@ -251,7 +251,7 @@ CREATE TABLE `anemometer_tower_relation` (
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`),
   KEY `field_code` (`field_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='测风塔与风场关系表 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='测风塔与风场关系表 ';
 
 -- ----------------------------
 -- Table structure for data_transfer
@@ -281,7 +281,7 @@ CREATE TABLE `data_transfer` (
   `transfer_progress` decimal(6,2) NOT NULL DEFAULT '1.00' COMMENT '转换进度',
   PRIMARY KEY (`id`),
   KEY `index_batch_code` (`batch_code`) USING BTREE COMMENT '批次编号'
-) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb4 COMMENT='scada数据转换';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='scada数据转换';
 
 -- ----------------------------
 -- Table structure for data_transfer_history
@@ -298,7 +298,7 @@ CREATE TABLE `data_transfer_history` (
   `option_by` int(11) NOT NULL COMMENT '转换人',
   `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COMMENT='数据转换异常历史表 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='数据转换异常历史表 ';
 
 -- ----------------------------
 -- Table structure for data_transfer_type
@@ -310,7 +310,7 @@ CREATE TABLE `data_transfer_type` (
   `transfer_type` varchar(20) NOT NULL COMMENT '转换类型',
   `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COMMENT=' 转换类型表（scada分钟级 scada秒级）';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT=' 转换类型表（scada分钟级 scada秒级）';
 
 -- ----------------------------
 -- Table structure for detection_point_dic
@@ -322,7 +322,7 @@ CREATE TABLE `detection_point_dic` (
   `detection_point_en` varchar(100) NOT NULL DEFAULT '' COMMENT '测点英文名称',
   `drive_mode` varchar(100) NOT NULL DEFAULT '' COMMENT '驱动方式（格式：1,2,3）',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8mb4 COMMENT='测点与驱动方式字典表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='测点与驱动方式字典表';
 
 -- ----------------------------
 -- Table structure for detection_point_dic_copy
@@ -334,7 +334,7 @@ CREATE TABLE `detection_point_dic_copy` (
   `detection_point_en` varchar(100) NOT NULL DEFAULT '' COMMENT '测点英文名称',
   `drive_mode` varchar(100) NOT NULL DEFAULT '' COMMENT '驱动方式（格式：1,2,3）',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=82 DEFAULT CHARSET=utf8mb4 COMMENT='测点与驱动方式字典表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='测点与驱动方式字典表';
 
 -- ----------------------------
 -- Table structure for dict_constants
@@ -347,7 +347,7 @@ CREATE TABLE `dict_constants` (
   `contents_name` varchar(255) DEFAULT NULL COMMENT '常量显示内容',
   `contents_describe` varchar(255) DEFAULT NULL COMMENT '描述信息',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=401 DEFAULT CHARSET=utf8mb4 COMMENT='字典表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='字典表';
 
 -- ----------------------------
 -- Table structure for power_word_relation_contract
@@ -367,7 +367,7 @@ CREATE TABLE `power_word_relation_contract` (
   `update_by` int(11) DEFAULT NULL COMMENT '更新人',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1502 DEFAULT CHARSET=utf8mb4 COMMENT='合同功率曲线关系表 合同功率曲线-关联机型厂商+风场';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='合同功率曲线关系表 合同功率曲线-关联机型厂商+风场';
 
 -- ----------------------------
 -- Table structure for power_word_relation_criterion
@@ -385,7 +385,7 @@ CREATE TABLE `power_word_relation_criterion` (
   `update_by` int(11) DEFAULT NULL COMMENT '更新人',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=536 DEFAULT CHARSET=utf8mb4 COMMENT='标准功率曲线关系表 标准功率曲线-关联机型';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='标准功率曲线关系表 标准功率曲线-关联机型';
 
 -- ----------------------------
 -- Table structure for sys_areas_info
@@ -401,7 +401,7 @@ CREATE TABLE `sys_areas_info` (
   `root_id` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `areas_index` (`type`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2310 DEFAULT CHARSET=utf8 COMMENT='省市区县表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='省市区县表';
 
 -- ----------------------------
 -- Table structure for sys_organization_auth
@@ -419,7 +419,7 @@ CREATE TABLE `sys_organization_auth` (
   PRIMARY KEY (`id`),
   KEY `role_id` (`role_id`),
   KEY `code_number` (`code_number`)
-) ENGINE=InnoDB AUTO_INCREMENT=85 DEFAULT CHARSET=utf8mb4 COMMENT='组织架构权限关系表 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='组织架构权限关系表 ';
 
 -- ----------------------------
 -- Table structure for sys_permission
@@ -438,7 +438,7 @@ CREATE TABLE `sys_permission` (
   `permission_icon_url` varchar(255) DEFAULT NULL COMMENT '图标icon Url',
   `permission_depth` int(11) DEFAULT NULL COMMENT '所有父id集合',
   PRIMARY KEY (`permission_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=254 DEFAULT CHARSET=utf8 COMMENT='资源表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='资源表';
 
 -- ----------------------------
 -- Table structure for sys_role
@@ -456,7 +456,7 @@ CREATE TABLE `sys_role` (
   `update_by` int(11) DEFAULT NULL,
   `update_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8 COMMENT='角色表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='角色表';
 
 -- ----------------------------
 -- Table structure for sys_role_permission
@@ -471,7 +471,7 @@ CREATE TABLE `sys_role_permission` (
   PRIMARY KEY (`id`),
   KEY `role_id` (`role_id`),
   KEY `permission_id` (`permission_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=5283 DEFAULT CHARSET=utf8 COMMENT='角色资源关联表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='角色资源关联表';
 
 -- ----------------------------
 -- Table structure for sys_user_info
@@ -491,7 +491,7 @@ CREATE TABLE `sys_user_info` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `id_idx` (`id`) USING BTREE,
   UNIQUE KEY `phone_idx` (`user_phone`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=135 DEFAULT CHARSET=utf8 COMMENT='后台用户表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='后台用户表';
 
 -- ----------------------------
 -- Table structure for sys_user_role
@@ -524,7 +524,7 @@ CREATE TABLE `unit_bearings` (
   `update_by` int(11) DEFAULT NULL COMMENT '更新人 更新人',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间 更新时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='主轴承部件表 主轴承部件表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='主轴承部件表 主轴承部件表';
 
 -- ----------------------------
 -- Table structure for unit_dict_brand_bearing
@@ -542,7 +542,7 @@ CREATE TABLE `unit_dict_brand_bearing` (
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`),
   UNIQUE KEY `M_N_INDES` (`manufacture`,`model_number`)
-) ENGINE=InnoDB AUTO_INCREMENT=34633 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Table structure for unit_dict_brand_model
@@ -557,7 +557,7 @@ CREATE TABLE `unit_dict_brand_model` (
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`),
   UNIQUE KEY `M_N_INDES` (`manufacture`,`model_number`)
-) ENGINE=InnoDB AUTO_INCREMENT=34656 DEFAULT CHARSET=utf8mb4 COMMENT='品牌型号表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='品牌型号表';
 
 -- ----------------------------
 -- Table structure for unit_dict_constants
@@ -579,7 +579,7 @@ CREATE TABLE `unit_dict_constants` (
   `update_by` int(11) DEFAULT NULL COMMENT '更新人',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=67 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='部件带子集树结构的字典表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='部件带子集树结构的字典表';
 
 -- ----------------------------
 -- Table structure for unit_dynamo
@@ -603,7 +603,7 @@ CREATE TABLE `unit_dynamo` (
   `update_by` int(11) DEFAULT NULL COMMENT '更新人',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='发电机部件详情表 发电机部件详情表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='发电机部件详情表 发电机部件详情表';
 
 -- ----------------------------
 -- Table structure for unit_gearbox
@@ -621,7 +621,7 @@ CREATE TABLE `unit_gearbox` (
   `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='齿轮箱部件总表 齿轮箱部件表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='齿轮箱部件总表 齿轮箱部件表';
 
 -- ----------------------------
 -- Table structure for unit_gearbox_bearings
@@ -645,7 +645,7 @@ CREATE TABLE `unit_gearbox_bearings` (
   `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COMMENT='齿轮箱轴承表 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='齿轮箱轴承表 ';
 
 -- ----------------------------
 -- Table structure for unit_gearbox_structure
@@ -671,7 +671,7 @@ CREATE TABLE `unit_gearbox_structure` (
   `update_by` int(11) DEFAULT NULL COMMENT '更新人',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='齿轮箱结构表 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='齿轮箱结构表 ';
 
 -- ----------------------------
 -- Table structure for wave_data_transfer
@@ -694,7 +694,7 @@ CREATE TABLE `wave_data_transfer` (
   `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
   `transfer_type` tinyint(2) NOT NULL DEFAULT '1' COMMENT '转换类型：1.振动 2.激光',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COMMENT='振动/激光数据转换表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='振动/激光数据转换表';
 
 -- ----------------------------
 -- Table structure for wave_data_transfer_histoty
@@ -711,7 +711,7 @@ CREATE TABLE `wave_data_transfer_histoty` (
   `err_info` varchar(200) DEFAULT '' COMMENT '异常信息',
   `transfer_type` tinyint(2) NOT NULL DEFAULT '1' COMMENT '转换类型 1.振动 2.激光',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Table structure for wind_company
@@ -735,7 +735,7 @@ CREATE TABLE `wind_company` (
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`),
   KEY `company_code` (`company_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COMMENT='企业信息表(项目公司)';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='企业信息表(项目公司)';
 
 -- ----------------------------
 -- Table structure for wind_engine_group
@@ -764,7 +764,7 @@ CREATE TABLE `wind_engine_group` (
   `update_by` int(11) DEFAULT NULL COMMENT '更新人',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1030 DEFAULT CHARSET=utf8mb4 COMMENT='风机机组信息表 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='风机机组信息表 ';
 
 -- ----------------------------
 -- Table structure for wind_engine_mill
@@ -844,7 +844,7 @@ CREATE TABLE `wind_field` (
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`),
   KEY `field_code` (`field_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=89 DEFAULT CHARSET=utf8mb4 COMMENT='风场信息表 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='风场信息表 ';
 
 -- ----------------------------
 -- Table structure for wind_field_batch
@@ -866,7 +866,7 @@ CREATE TABLE `wind_field_batch` (
   UNIQUE KEY `index_batch_code` (`batch_code`) USING BTREE COMMENT '批次编号索引',
   UNIQUE KEY `index_batch_name` (`batch_name`) USING BTREE COMMENT '批次名称索引',
   KEY `index_field_code` (`field_code`) USING BTREE COMMENT '风场编号索引'
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COMMENT='风机批次信息表 批次etl风机信息表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='风机批次信息表 批次etl风机信息表';
 
 -- ----------------------------
 -- Table structure for wind_field_contract
@@ -885,7 +885,7 @@ CREATE TABLE `wind_field_contract` (
   `update_by` int(11) DEFAULT NULL,
   `update_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8mb4 COMMENT='合同功率曲线和风场关系表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='合同功率曲线和风场关系表';
 
 -- ----------------------------
 -- Table structure for wind_field_resource
@@ -921,6 +921,6 @@ CREATE TABLE `wind_relation` (
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`),
   KEY `code_number` (`code_number`)
-) ENGINE=InnoDB AUTO_INCREMENT=137 DEFAULT CHARSET=utf8mb4 COMMENT='风场关系表 ';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='风场关系表 ';
 
 SET FOREIGN_KEY_CHECKS = 1;

energy-manage-service/docker-compose/xxl-job/Dockerfile

@@ -1,5 +1,5 @@
 # 该镜像需要依赖的基础镜像
-FROM openjdk:24-ea-slim
+FROM openjdk:8-jdk-alpine
 
 # 设置自定义标签
 LABEL version="1.0.0" maintainer="znzn"
@@ -10,9 +10,9 @@ ENV WORKDIR="/data/xxl-job"
 WORKDIR $WORKDIR
 
 # 将当前目录下的jar包复制到docker容器的工作目录下
-COPY ./xxl-job.jar ./xxl-job.jar
+COPY ./xxl-job/xxl-job.jar ./xxl-job.jar
 
-#设置时区
+#设置日志目录
 RUN mkdir ./logs
 
 #设置环境变量

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -632,8 +632,9 @@ public class AnalysisServiceImpl implements AnalysisService {
         AnalysisRelateInfoVo returnVo = new AnalysisRelateInfoVo();
         AnalysisResultPo analysisResultPo = analysisResultMapper.selectByBatchCode(batchCode);
         BeanUtils.copyProperties(analysisResultPo,returnVo);
+        List<Map<String,Object>> list = queryAnalysisedType(batchCode);
         returnVo.setUpdateByName(sysUserInfoMapper.getUserInfoByUserId(analysisResultPo.getCreateBy()).getUserName())
-                .setAnalysisTypes(queryAnalysisedType(batchCode))
+                .setAnalysisTypes(list)
                 .setWindEngineGroups(queryAnalysisedEngine(batchCode,null));
         return returnVo;
     }

energy-manage-service/src/main/java/com/energy/manage/service/util/TreeUtil.java

@@ -107,7 +107,10 @@ public class TreeUtil {
    * @param parentKeyName 父类key名称
    * @return
    */
-  public static List<Map<String, Object>> getJava8ResultTree(List<Map<String, Object>> mapList,String parentKeyName,String keyName) {
+  public static List<Map<String, Object>> getJava8ResultTree(List<Map<String,
+                                                            Object>> mapList,
+                                                            String parentKeyName,
+                                                            String keyName) {
     if (org.springframework.util.CollectionUtils.isEmpty(mapList)) {
       return Lists.newArrayList();
     }