From 3eb812d9afc90e909a52eae85b3a31eedaf684bc Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 30 五月 2025 16:16:59 +0800
Subject: [PATCH] 修复
---
ruoyi-common/src/main/java/com/ruoyi/basic/service/impl/StorageBlobServiceImpl.java | 1
ruoyi-admin/src/main/resources/application.yml.example | 9 ---
ruoyi-admin/pom.xml | 5 +
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 6 ++
ruoyi-common/src/main/java/com/ruoyi/common/handler/MyMetaObjectHandler.java | 40 ++++---------
ruoyi-common/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql | 57 +++++++++++++++++++
basic-server/pom.xml | 18 +++++-
basic-server/src/main/java/com/ruoyi/basic/controller/TestController1.java | 16 +++++
ruoyi-admin/src/main/resources/application-druid.yml.example | 11 +++
9 files changed, 122 insertions(+), 41 deletions(-)
diff --git a/basic-server/pom.xml b/basic-server/pom.xml
index b45552d..3560169 100644
--- a/basic-server/pom.xml
+++ b/basic-server/pom.xml
@@ -23,10 +23,22 @@
<artifactId>ruoyi-framework</artifactId>
</dependency>
- <!-- 绯荤粺妯″潡-->
<dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-system</artifactId>
+ <groupId>org.flywaydb</groupId>
+ <artifactId>flyway-core</artifactId>
+ <version>10.11.0</version> <!-- 鎴栨洿楂樼増鏈紝濡� 10.11.0 -->
+ </dependency>
+
+ <!-- mysql杩佺Щ -->
+ <dependency>
+ <groupId>org.flywaydb</groupId>
+ <artifactId>flyway-mysql</artifactId>
+ </dependency>
+
+ <!-- pgsql杩佺Щ -->
+ <dependency>
+ <groupId>org.flywaydb</groupId>
+ <artifactId>flyway-database-postgresql</artifactId>
</dependency>
</dependencies>
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/TestController1.java b/basic-server/src/main/java/com/ruoyi/basic/controller/TestController1.java
new file mode 100644
index 0000000..6fdddd8
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/TestController1.java
@@ -0,0 +1,16 @@
+package com.ruoyi.basic.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("test")
+public class TestController1 {
+
+ @GetMapping("/list")
+ public void ss(){
+ System.out.println("1111");
+ }
+}
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 559a649..0c0d663 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -68,6 +68,11 @@
<artifactId>ruoyi-framework</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>basic-server</artifactId>
+ </dependency>
+
<!-- 瀹氭椂浠诲姟-->
<dependency>
<groupId>com.ruoyi</groupId>
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-druid.yml.example
index 4d78ad4..df74201 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-druid.yml.example
@@ -62,4 +62,13 @@
merge-sql: true
wall:
config:
- multi-statement-allow: true
\ No newline at end of file
+ multi-statement-allow: true
+
+minio:
+ endpoint: lunor.cn
+ port: 9000
+ secure: false
+ accessKey: admin
+ secretKey: Admin123!
+ preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
+ default-bucket: ruoyi # 榛樿瀛樺偍妗�
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application.yml.example b/ruoyi-admin/src/main/resources/application.yml.example
index 4ebf163..a173945 100644
--- a/ruoyi-admin/src/main/resources/application.yml.example
+++ b/ruoyi-admin/src/main/resources/application.yml.example
@@ -1,12 +1,3 @@
-minio:
- endpoint: lunor.cn
- port: 9000
- secure: false
- accessKey: admin
- secretKey: Admin123!
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: ruoyi # 榛樿瀛樺偍妗�
-
# 椤圭洰鐩稿叧閰嶇疆
ruoyi:
# 鍚嶇О
diff --git a/ruoyi-common/src/main/java/com/ruoyi/basic/service/impl/StorageBlobServiceImpl.java b/ruoyi-common/src/main/java/com/ruoyi/basic/service/impl/StorageBlobServiceImpl.java
index dc7acff..72c2dd7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/basic/service/impl/StorageBlobServiceImpl.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/basic/service/impl/StorageBlobServiceImpl.java
@@ -65,7 +65,6 @@
dto.setByteSize(file.getSize());
dto.setKey(IdUtils.simpleUUID());
dto.setBucketName(bucketName);
- dto.setCreateTime(DateUtils.getNowDate());
dto.setUrl(minioUtils.getPreviewUrl(res.getBucketFileName(), bucketName, false));
// 鎻掑叆鏁版嵁搴�
storageBlobMapper.insert(dto);
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index acc95e1..7ebfb7a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -5,6 +5,8 @@
import java.util.HashMap;
import java.util.Map;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -30,17 +32,21 @@
private Integer deleted;
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/** 澶囨敞 */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/handler/MyMetaObjectHandler.java b/ruoyi-common/src/main/java/com/ruoyi/common/handler/MyMetaObjectHandler.java
index 46811dd..3ae24ea 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/handler/MyMetaObjectHandler.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/handler/MyMetaObjectHandler.java
@@ -1,6 +1,7 @@
package com.ruoyi.common.handler;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.utils.SecurityUtils;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
@@ -12,32 +13,17 @@
*/
@Component
public class MyMetaObjectHandler implements MetaObjectHandler {
+ @Override
+ public void insertFill(MetaObject metaObject) {
+ Long userId = SecurityUtils.getLoginUser().getUserId();
+ this.strictInsertFill(metaObject, "createBy", Long.class, userId);
+ this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
+ }
-
- @Override
- public void insertFill(MetaObject metaObject) {
- this.setFieldValByName("createTime", LocalDateTime.now(), metaObject);
- this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
- // 寮�绾跨▼锛屽彇涓嶅埌user
- try {
-// SysUser currentUser = SecurityUtils.getLoginUser();
-// if (currentUser != null) {
-// this.setFieldValByName("createUser", currentUser.getUsername(), metaObject);
-// this.setFieldValByName("updateUser", currentUser.getUsername(), metaObject);
-// }
- } catch (Exception e) {
- }
- }
-
- @Override
- public void updateFill(MetaObject metaObject) {
- this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
- try {
-// ZttUser currentUser = SecurityUtils.getUser();
-// if (currentUser != null) {
-// this.setFieldValByName("updateUser", currentUser.getUsername(), metaObject);
-// }
- } catch (Exception e) {
- }
- }
+ @Override
+ public void updateFill(MetaObject metaObject) {
+ Long userId = SecurityUtils.getLoginUser().getUserId();
+ this.strictInsertFill(metaObject, "updateBy", Long.class, userId);
+ this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
+ }
}
diff --git a/ruoyi-common/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql b/ruoyi-common/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql
new file mode 100644
index 0000000..e96683a
--- /dev/null
+++ b/ruoyi-common/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql
@@ -0,0 +1,57 @@
+DROP TABLE IF EXISTS supply;
+
+CREATE TABLE supply
+(
+ id BIGSERIAL PRIMARY KEY,
+ supplier_name VARCHAR(255) NOT NULL, -- 渚涘簲鍟嗗悕绉�
+ taxpayer_id VARCHAR(255) NOT NULL, -- 绾崇◣浜鸿瘑鍒彿
+ business_address VARCHAR(255) NOT NULL DEFAULT '', -- 缁忚惀鍦板潃
+ bank_account VARCHAR(255) NOT NULL DEFAULT '', -- 閾惰璐﹀彿
+ bank_name VARCHAR(255) NOT NULL DEFAULT '', -- 寮�鎴疯
+ contact_person VARCHAR(255) NOT NULL DEFAULT '', -- 鑱旂郴浜�
+ contact_address VARCHAR(255) NOT NULL DEFAULT '', -- 鑱旂郴鍦板潃
+ province_id BIGINT NOT NULL DEFAULT 0,
+ city_id BIGINT NOT NULL DEFAULT 0,
+ district_id BIGINT NOT NULL DEFAULT 0,
+ create_time TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP -- 鑷姩濉厖鍒涘缓鏃堕棿
+);
+
+-- 琛ㄦ敞閲婏細渚涘簲鍟嗕俊鎭〃锛屽瓨鍌ㄤ緵搴斿晢鍩烘湰淇℃伅锛堝惈鍦板潃灞傜骇鍏宠仈锛�
+COMMENT ON TABLE supply IS '渚涘簲鍟嗕俊鎭〃';
+
+-- 瀛楁娉ㄩ噴锛氫富閿紙鑷澶ф暣鏁帮級
+COMMENT ON COLUMN supply.id IS '渚涘簲鍟嗗敮涓�鏍囪瘑锛岄噰鐢˙IGSERIAL鑷涓婚敭锛岀‘淇濇暟鎹敮涓�鎬�';
+
+-- 渚涘簲鍟嗗悕绉帮紙闈炵┖锛�
+COMMENT ON COLUMN supply.supplier_name IS '渚涘簲鍟嗗叏绉帮紝涓氬姟鍦烘櫙涓敮涓�璇嗗埆鐨勫悕绉帮紝';
+
+-- 绾崇◣浜鸿瘑鍒彿锛堥潪绌猴級
+COMMENT ON COLUMN supply.taxpayer_id IS '渚涘簲鍟嗙◣鍔＄櫥璁板敮涓�鏍囪瘑锛堝缁熶竴绀句細淇＄敤浠ｇ爜锛夛紝鐢ㄤ簬璐㈢◣绠＄悊';
+
+-- 缁忚惀鍦板潃锛堥粯璁ょ┖瀛楃涓诧紝闈炵┖锛�
+COMMENT ON COLUMN supply.business_address IS '渚涘簲鍟嗚惀涓氭墽鐓ф敞鍐屽湴鍧�鎴栦富瑕佺粡钀ュ満鎵�锛岄粯璁ょ┖瀛楃涓�';
+
+-- 閾惰璐﹀彿锛堥粯璁ょ┖瀛楃涓诧紝闈炵┖锛�
+COMMENT ON COLUMN supply.bank_account IS '渚涘簲鍟嗘敹娆鹃摱琛岃处鎴蜂俊鎭紝榛樿绌哄瓧绗︿覆锛岀敤浜庤祫閲戝線鏉�';
+
+-- 寮�鎴疯锛堥粯璁ょ┖瀛楃涓诧紝闈炵┖锛�
+COMMENT ON COLUMN supply.bank_name IS '渚涘簲鍟嗛摱琛岃处鎴风殑寮�鎴锋満鏋勫悕绉帮紝榛樿绌哄瓧绗︿覆锛�';
+
+-- 鑱旂郴浜猴紙榛樿绌哄瓧绗︿覆锛岄潪绌猴級
+COMMENT ON COLUMN supply.contact_person IS '渚涘簲鍟嗕笟鍔″鎺ヤ汉濮撳悕';
+
+-- 鑱旂郴鍦板潃锛堥粯璁ょ┖瀛楃涓诧紝闈炵┖锛�
+COMMENT ON COLUMN supply.contact_address IS '渚涘簲鍟嗚仈绯讳汉鐨勮仈绯诲湴鍧�';
+
+-- 鐪佷唤ID锛堥粯璁�0锛岄潪绌猴紝鍏宠仈鍦板潃瀛楀吀锛�
+COMMENT ON COLUMN supply.province_id IS '渚涘簲鍟嗘墍鍦ㄧ渷浠界殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0';
+
+-- 鍩庡競ID锛堥粯璁�0锛岄潪绌猴紝鍏宠仈鍦板潃瀛楀吀锛�
+COMMENT ON COLUMN supply.city_id IS '渚涘簲鍟嗘墍鍦ㄥ煄甯傜殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0';
+
+-- 鍖哄幙ID锛堥粯璁�0锛岄潪绌猴紝鍏宠仈鍦板潃瀛楀吀锛�
+COMMENT ON COLUMN supply.district_id IS '渚涘簲鍟嗘墍鍦ㄥ尯鍘跨殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0锛岀敤浜庡湴鍧�灞傜骇鍒掑垎';
+
+-- 鍒涘缓鏃堕棿锛堝甫鏃跺尯锛岃嚜鍔ㄥ～鍏咃級
+COMMENT ON COLUMN supply.create_time IS '璁板綍鏁版嵁鍒涘缓鐨勬椂闂存埑锛堝甫鏃跺尯锛夛紝绯荤粺鑷姩濉厖褰撳墠鏃堕棿';
+
--
Gitblit v1.9.3