From 86c404dee5594cffd62d7f1cd6a05adb443b5095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 4 Nov 2024 10:05:33 +0800
Subject: [PATCH] 'commit'

---
 .../Res/Controller/ResourceController.java    | 18 ++++++++-
 .../dsideal/base/Res/Model/ResourceModel.java | 32 +++++++++-------
 src/main/resources/application_huawei.yaml    | 38 -------------------
 3 files changed, 35 insertions(+), 53 deletions(-)
 delete mode 100644 src/main/resources/application_huawei.yaml

diff --git a/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java b/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java
index bc739ccd..d9d40b7d 100644
--- a/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java
+++ b/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java
@@ -1,5 +1,6 @@
 package com.dsideal.base.Res.Controller;
 
+import com.dsideal.base.BaseApplication;
 import com.dsideal.base.Interceptor.IsLoginInterface;
 import com.dsideal.base.Interceptor.IsNumericInterface;
 import com.dsideal.base.Res.Model.ResourceModel;
@@ -13,7 +14,7 @@ import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.upload.UploadFile;
 import com.jfinal.plugin.activerecord.Record;
 
-import java.io.UnsupportedEncodingException;
+import java.io.File;
 import java.util.UUID;
 
 public class ResourceController extends Controller {
@@ -26,7 +27,7 @@ public class ResourceController extends Controller {
      * @param pageSize 每页几条
      */
     @Before(GET.class)
-    public void getZskPage(int pageNum, int pageSize) throws UnsupportedEncodingException {
+    public void getZskPage(int pageNum, int pageSize) {
         Page<Record> page = rm.getZskPage(pageNum, pageSize);
         renderJson(CommonUtil.renderJsonForLayUI(page));
     }
@@ -51,6 +52,19 @@ public class ResourceController extends Controller {
         int type_id = getParaToInt("type_id");//1:文档，2：数据库
         String file_id = UUID.randomUUID().toString();
         String key = file_id + fileExtension;
+        //保存的目录
+        String resPath = BaseApplication.PropKit.get("upload.path");
+        // 创建目标文件对象
+        File targetFile = new File(resPath);
+        // 检查目标目录是否存在，如果不存在则创建
+        if (!targetFile.getParentFile().exists()) {
+            targetFile.getParentFile().mkdirs();
+        }
+        // 移动文件到目标路径
+        uploadFile.getFile().renameTo(targetFile);
+
+        //保存到数据库记录
+        rm.uploadZskDocument(name, key, type_id, identity_id, area_code);
 
         //返回
         Kv kv = Kv.create();
diff --git a/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java b/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java
index 6f37c187..31b27d08 100644
--- a/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java
+++ b/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java
@@ -55,18 +55,6 @@ public class ResourceModel {
         return page;
     }
 
-    /**
-     * 功能：上传文档
-     *
-     * @param name
-     * @param url
-     */
-    public void uploadZskDocument(String name, String url) {
-        Record record = new Record();
-        record.set("name", name);
-        record.set("url", url);
-        Db.use("ds_db").save("t_zsk_files", record);
-    }
 
     /**
      * 功能：删除知识库文档
@@ -74,7 +62,25 @@ public class ResourceModel {
      * @param id
      */
     public void delZskDocument(int id) {
-        String sql = "delete from ds_db.t_zsk_files where id=?";
+        String sql = "delete from t_zsk_files where id=?";
         Db.update(sql, id);
     }
+
+    /**
+     * 功能：上传知识库文档
+     * @param name
+     * @param file_name
+     * @param type_id
+     * @param identity_id
+     * @param area_code
+     */
+    public void uploadZskDocument(String name, String file_name, int type_id, int identity_id, String area_code) {
+        Record record = new Record();
+        record.set("name", name);
+        record.set("file_name", file_name);
+        record.set("type_id", type_id);
+        record.set("identity_id", identity_id);
+        record.set("area_code", area_code);
+        Db.save("t_zsk_files", "id", record);
+    }
 }
diff --git a/src/main/resources/application_huawei.yaml b/src/main/resources/application_huawei.yaml
deleted file mode 100644
index 88b83c4b..00000000
--- a/src/main/resources/application_huawei.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-# 上传文件的临时路径
-uploadTempPath: c:/Windows/Temp
-# JWT
-SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
-# 生成Token的密码
-CookieMd5SingPwd: DsideaL4r5t6y7u
-
-# 系统的启动路径
-rootPath : /usr/local/dsBase/classes
-
-mysql:
-  # 数据库信息
-  driverClassName: com.mysql.cj.jdbc.Driver
-  user: root
-  password: Password123@mysql
-  jdbcUrl : jdbc:mysql://localhost:3306/ds_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
-
-
-redis:
-  ip: 10.10.14.210
-  port: 18890
-  password:
-
-# 数据可视化
-dataEase:
-  dataVisualizationName: 黄海测试的市州地图
-  publish_url: http://10.10.14.203:8100
-# ==============================================================
-
-excel:
-  #  导出excel 的模板配置路径
-  excelExportTemplatePathSuffix: /ExcelExportTemplate/
-  #  导入excel 的模板配置路径
-  ExcelImportTemplatePathSuffix: /ExcelImportTemplate/
-
-# 上传文件地址
-upload:
-  path: D:/dsWork/YunNanDsBase/WebRoot/upload
\ No newline at end of file