update

Dockerfile

@@ -24,5 +24,6 @@ EXPOSE 8080
 #ADD ./src/main/resources/jeecg ./config/jeecg
 COPY --from=build /app/physical-launcher/target/physical-launcher-3.7.0.jar physical-launcher-3.7.0.jar
 COPY --from=build /app/templates ./templates
+ENV PROFILE=dev
 
-CMD sleep 10;java -Djava.security.egd=file:/dev/./urandom -jar physical-launcher-3.7.0.jar --spring.profiles.active=test
+CMD sleep 10;java -Djava.security.egd=file:/dev/./urandom -jar physical-launcher-3.7.0.jar --spring.profiles.active=${PROFILE}

docker-compose-prod.yml

@@ -0,0 +1,111 @@
+services:
+  physical-mysql:
+    environment:
+      MYSQL_ROOT_PASSWORD: 123456
+      MYSQL_ROOT_HOST: '%'
+      TZ: Asia/Shanghai
+      MYSQL_DATABASE: physical-boot
+    restart: always
+    container_name: physical-mysql
+    image: registry.cn-shanghai.aliyuncs.com/physical/physical-mysql
+    hostname: physical-mysql
+    command:
+      --character-set-server=utf8mb4
+      --collation-server=utf8mb4_general_ci
+      --explicit_defaults_for_timestamp=true
+      --lower_case_table_names=1
+      --max_allowed_packet=128M
+      --default-authentication-plugin=caching_sha2_password
+    ports:
+      - "23306:3306"
+    volumes:
+      - mysql_data:/var/lib/mysql
+      - ./db/:/docker-entrypoint-initdb.d/
+    networks:
+      - physical-boot
+
+  physical-redis:
+    image: registry.cn-shanghai.aliyuncs.com/physical/physical-redis
+    ports:
+      - "26379:6379"
+    restart: always
+    hostname: physical-redis
+    container_name: physical-redis
+    networks:
+      - physical-boot
+  physical-minio:
+    image: registry.cn-shanghai.aliyuncs.com/physical/physical-minio
+    ports:
+      - "29000:9000"
+      - "29001:9001"
+    restart: always
+    hostname: physical-minio
+    container_name: physical-minio
+    environment:
+      MINIO_ROOT_USER: root
+      MINIO_ROOT_PASSWORD: 12345678
+    volumes:
+      - minio_data:/data
+    command: server /data --console-address ":9001"
+    networks:
+      - physical-boot
+
+  physical-launcher:
+    restart: on-failure
+    environment:
+      PROFILE: prod
+    depends_on:
+      - physical-mysql
+      - physical-redis
+      - physical-minio
+    container_name: physical-launcher
+    image: registry.cn-shanghai.aliyuncs.com/physical/physical-boot
+    hostname: physical-launcher
+    ports:
+      - "28080:8080"
+    networks:
+      - physical-boot
+  physical-kkfileview:
+    restart: on-failure
+    container_name: physical-kkfileview
+    image: registry.cn-shanghai.aliyuncs.com/physical/kkfileview
+    hostname: physical-kkfileview
+    ports:
+      - "8099:8012"
+    networks:
+      - physical-boot
+
+  physical-web:
+    container_name: physical-web
+    image: registry.cn-shanghai.aliyuncs.com/physical/physical-web
+    hostname: physical-web
+    depends_on:
+      - physical-launcher
+    networks:
+      - physical-boot
+    ports:
+      - "80:80"
+  physical-crawler:
+    container_name: physical-crawler
+    restart: on-failure
+    depends_on:
+      - physical-mysql
+      - physical-minio
+    image: registry.cn-shanghai.aliyuncs.com/physical/physical-crawler
+    networks:
+      - physical-boot
+    ports:
+      - "25000:5000"
+    environment:
+      - FLASK_ENV=production
+      - PYTHON-UNBUFFERED=1  # 禁用 Python 输出缓冲
+    volumes:
+      - ./crawler_files:/app/downloaded_files
+
+networks:
+  physical-boot:
+    name: physical_boot
+
+volumes:
+  minio_data:
+  mysql_data:

docker-compose.yml

@@ -51,9 +51,9 @@ services:
       - physical-boot
 
   physical-launcher:
-#    build:
-#      context: ./physical-launcher
     restart: on-failure
+    environment:
+      PROFILE: test
     depends_on:
       - physical-mysql
       - physical-redis
@@ -76,8 +76,6 @@ services:
       - physical-boot
 
   physical-web:
-#    build:
-#      context: ../physical-web
     container_name: physical-web
     image: registry.cn-shanghai.aliyuncs.com/physical/physical-web
     hostname: physical-web

physical-launcher/Dockerfile

@@ -1,17 +0,0 @@
-#FROM bellsoft/liberica-openjdk-debian:17
-FROM maven:3.9.8-eclipse-temurin-17
-
-MAINTAINER lslvxy@163.com
-
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-#RUN mkdir -p /jeecg-boot/config/jeecg/
-
-WORKDIR /jeecg-boot
-
-EXPOSE 8080
-
-#ADD ./src/main/resources/jeecg ./config/jeecg
-ADD ./target/physical-launcher-3.7.0.jar ./
-
-CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar physical-launcher-3.7.0.jar --spring.profiles.active=test

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/IrradiationStandards.java

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -17,7 +15,7 @@ import java.util.Date;
 /**
  * @Description: 辐照标准
  * @Author: jeecg-boot
- * @Date: 2024-08-30
+ * @Date: 2024-11-14
  * @Version: V1.0
  */
 @Data
@@ -76,15 +74,57 @@ public class IrradiationStandards implements Serializable {
     @Schema(description = "标准代码")
     private String code;
     /**
-     * 内容
+     * 辐照环境温度
      */
-    @Excel(name = "内容", width = 15)
+    @Excel(name = "辐照环境温度", width = 15)
-    @Schema(description = "内容")
+    @Schema(description = "辐照环境温度")
-    private String content;
+    private String environmentalTemperature;
     /**
-     * 附件
+     * 退火时长
      */
-    @Excel(name = "附件", width = 15)
+    @Excel(name = "退火时长", width = 15)
-    @Schema(description = "附件")
+    @Schema(description = "退火时长")
-    private String attachment;
+    private String annealTimes;
+    /**
+     * 辐射源
+     */
+    @Excel(name = "辐射源", width = 15)
+    @Schema(description = "辐射源")
+    private String radiationSource;
+    /**
+     * 条件A
+     */
+    @Excel(name = "条件A", width = 15)
+    @Schema(description = "条件A")
+    private String conditionA;
+    /**
+     * 条件B
+     */
+    @Excel(name = "条件B", width = 15)
+    @Schema(description = "条件B")
+    private String conditionB;
+    /**
+     * 条件C
+     */
+    @Excel(name = "条件C", width = 15)
+    @Schema(description = "条件C")
+    private String conditionC;
+    /**
+     * 条件D
+     */
+    @Excel(name = "条件D", width = 15)
+    @Schema(description = "条件D")
+    private String conditionD;
+    /**
+     * 条件E
+     */
+    @Excel(name = "条件E", width = 15)
+    @Schema(description = "条件E")
+    private String conditionE;
+    /**
+     * 条件F
+     */
+    @Excel(name = "条件F", width = 15)
+    @Schema(description = "条件F")
+    private String conditionF;
 }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/NasaDataRecord.java

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -17,7 +15,7 @@ import java.util.Date;
 /**
  * @Description: NASA数据管理
  * @Author: jeecg-boot
- * @Date: 2024-11-04
+ * @Date: 2024-11-14
  * @Version: V1.0
  */
 @Data
@@ -118,15 +116,27 @@ public class NasaDataRecord implements Serializable {
     @Schema(description = "试验人员")
     private String experimentUser;
     /**
-     * 条目数统计
+     * 西核院统计
      */
-    @Excel(name = "条目数统计", width = 15)
+    @Excel(name = "西核院统计", width = 15)
-    @Schema(description = "条目数统计")
+    @Schema(description = "西核院统计")
-    private String totalCount;
+    private String totalCountNasa;
+    /**
+     * 理化所统计
+     */
+    @Excel(name = "理化所统计", width = 15)
+    @Schema(description = "理化所统计")
+    private String totalCountLhs;
     /**
      * 附件IDs
      */
     @Excel(name = "附件IDs", width = 15)
     @Schema(description = "附件IDs")
     private String fileList;
+    /**
+     * 原始数据
+     */
+    @Excel(name = "原始数据", width = 15)
+    @Schema(description = "原始数据")
+    private String originData;
 }