From 17c7e460e0664ef30b34b6a6af8ad72a075d401c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 24 三月 2025 15:05:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
index ebee0b5..16dffd5 100644
--- a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
+++ b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom;
import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.generator.FastAutoGenerator;
@@ -15,15 +16,15 @@
// 婕旂ず渚嬪瓙锛屾墽琛� main 鏂规硶鎺у埗鍙拌緭鍏ユā鍧楄〃鍚嶅洖杞﹁嚜鍔ㄧ敓鎴愬搴旈」鐩洰褰曚腑
public class CodeGenerator {
- public static String database_url = "jdbc:mysql://114.132.189.42:9004/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8";
- public static String database_username = "root";
- public static String database_password= "123456";
+ public static String database_url = "jdbc:mysql://10.1.13.77:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8";
+ public static String database_username = "remote_user";
+ public static String database_password= "zttZTT123!";
public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
- public static String model_name = "/cnas-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
+ public static String model_name = "/inspect-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
public static String setParent = "com.yuanchu.mom"; // 鍖呰矾寰�
+ public static String tablePrefix = ""; // 璁剧疆杩囨护琛ㄥ墠缂�
public static void main(String[] args) {
String projectPath = System.getProperty("user.dir");
- System.out.println(projectPath+"===================");
FastAutoGenerator.create(database_url, database_username, database_password)
// 鍏ㄥ眬閰嶇疆
.globalConfig(builder -> {
@@ -43,7 +44,7 @@
// 绛栫暐閰嶇疆
.strategyConfig(builder -> {
builder.addInclude(scanner("琛ㄥ悕锛屽涓┖鏍煎垎鍓�").split(" ")) // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addTablePrefix("sys_") // 璁剧疆杩囨护琛ㄥ墠缂�
+ .addTablePrefix(tablePrefix) // 璁剧疆杩囨护琛ㄥ墠缂�
// Entity 绛栫暐閰嶇疆
.entityBuilder()
.enableLombok() //寮�鍚� Lombok
@@ -53,13 +54,16 @@
.logicDeleteColumnName("state")
.addTableFills(
new Column("create_time", FieldFill.INSERT),
- new Column("update_time", FieldFill.INSERT_UPDATE)
+ new Column("update_time", FieldFill.INSERT_UPDATE),
+ new Column("create_user", FieldFill.INSERT),
+ new Column("update_user", FieldFill.INSERT_UPDATE)
)
+ .idType(IdType.AUTO) // 鑷涓婚敭
// Mapper 绛栫暐閰嶇疆
.mapperBuilder()
.enableFileOverride() // 瑕嗙洊宸茬敓鎴怣apper鏂囦欢
-
+ .enableBaseResultMap() // 鑷姩鐢熸垚resultMap
// Service 绛栫暐閰嶇疆
.serviceBuilder()
.formatServiceFileName("%sService") //鏍煎紡鍖� service 鎺ュ彛鏂囦欢鍚嶇О锛�%s杩涜鍖归厤琛ㄥ悕锛屽 UserService
@@ -69,6 +73,7 @@
// Controller 绛栫暐閰嶇疆
.controllerBuilder()
.enableFileOverride() // 瑕嗙洊宸茬敓鎴愭枃浠�
+ .enableRestStyle() // 寮�鍚敓鎴怈RestController 鎺у埗鍣�
;
})
//5銆佹ā鏉垮紩鎿�
--
Gitblit v1.9.3