update

.fleet/run.json

@@ -0,0 +1,21 @@
+{
+    "configurations": [
+
+        {
+            "type": "spring-boot",
+            "name": "PhysicalApplication",
+            "mainClass": "org.jeecg.PhysicalApplication",
+            "module": "physical-launcher",
+            "options": ["-XX:TieredStopAtLevel=1", "-Dspring.output.ansi.enabled=always", "-Dcom.sun.management.jmxremote", "-Dspring.jmx.enabled=true", "-Dspring.liveBeansView.mbeanDomain", "-Dspring.application.admin.enabled=true", "-Dmanagement.endpoints.jmx.exposure.include=*", "-Dfile.encoding=UTF-8", "-Dsun.stdout.encoding=UTF-8", "-Dsun.stderr.encoding=UTF-8"],
+            "activeProfiles": [""],
+            "workingDir": "$PROJECT_DIR$",
+            "dependsOn": ["Build"]
+        },
+        {
+            "type": "jps-build",
+            "name": "Build",
+            "module": "physical-launcher",
+            "includeTests": false
+        }
+    ]
+}

physical-launcher/src/main/resources/application-dev.yml

@@ -168,7 +168,7 @@ spring:
       datasource:
         master:
 #          url: jdbc:mysql://127.0.0.1:3306/physical-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          url: jdbc:mysql://47.102.126.67:23306/physical-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://47.102.126.67:23306/physical-boot-prod?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: urwTocIA1f395t
           driver-class-name: com.mysql.cj.jdbc.Driver

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

@@ -146,4 +146,11 @@ public class HistoricalDatabase implements Serializable {
     @Excel(name = "附件", width = 15)
     @Schema(description = "附件")
     private String fileUrl;
+
+    /**
+     * 描述
+     */
+    @Excel(name = "描述", width = 15)
+    @Schema(description = "描述")
+    private String description;
 }

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

@@ -142,7 +142,12 @@ public class LocalDatabase implements Serializable {
     @Schema(description = "样品型号")
     private String  sampleModel;
 
-
+    /**
+     * 描述
+     */
+    @Excel(name = "描述", width = 15)
+    @Schema(description = "描述")
+    private String description;
 
     @TableField(exist = false)
     private List<ExperimentReviewDTO> ExperimentReviewList;

scripts/common.py

@@ -4,6 +4,7 @@ from datetime import datetime
 from datetime import timedelta
 
 import mysql.connector
+import pandas as pd
 from minio import Minio
 from minio.error import S3Error
 
@@ -21,13 +22,13 @@ db_config = {
 
 # minio 配置
 minio_client = Minio(
-    "127.0.0.1:9000",  # MinIO服务器地址或IP
+    "47.102.126.67:29000",  # MinIO服务器地址或IP
     # "192.168.50.100:29000",  # MinIO服务器地址或IP
     access_key="root",  # 替换为你的Access Key
-    secret_key="12345678",  # 替换为你的Secret Key
+    secret_key="FeF4qA6uQBHeRd",  # 替换为你的Secret Key
     secure=False  # 如果使用的是http则为False
 )
-bucket_name = 'physical'
+bucket_name = 'physical2'
 
 
 def get_md5(input_string):
@@ -54,7 +55,7 @@ def save_to_db_import_record(connection,data):
     cursor = connection.cursor()
     try:
         """保存数据到 MySQL 数据库"""
-        insert_query = """INSERT INTO `nasa_data_record` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `device_type`, `device_name`, `device_mode`, `device_function`, `device_batch`, `manufacturer`, `experiment_date`, `data_source`, `experiment_user`, `total_count`, `file_list`,`origin_data`) 
+        insert_query = """INSERT INTO `nasa_data_record` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `device_type`, `device_name`, `device_mode`, `device_function`, `device_batch`, `manufacturer`, `experiment_date`, `data_source`, `experiment_user`, `total_count_nasa`, `file_list`,`origin_data`) 
         VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s);"""
         cursor.execute(insert_query, data)
         connection.commit()