From 6ccbfd6a5192d432facf94b6fd91ae3dd26683e4 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Tue, 15 Oct 2024 15:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

---
 dyh-service/dyh-cust/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java
index 6373839..c16edbd 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/buildcode/service/BuildCodeService.java
@@ -68,7 +68,7 @@
      * @param version 版本
      * @return Map
      */
-    private Map getTplData(String packagePath, String packageName, String className, String tableName, String author, String version) {
+    private Map getTplData(String packagePath, String packageName, String className, String tableSchema, String tableName, String author, String version) {
         Map tplData = Maps.newHashMap();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         tplData.put("packageName", packageName);
@@ -78,7 +78,7 @@
         tplData.put("createTime", format.format(new Date()));
         tplData.put("basePackage", packagePath);
         tplData.put("basePackagePath", packagePath.replace(".", "/") + "/");
-        List<UserTabColsBO> list = buildCodeMapper.getTabInfo(tableName);
+        List<UserTabColsBO> list = buildCodeMapper.getTabInfo(tableSchema, tableName);
         if (!CollectionUtils.isEmpty(list)) {
             UserTabColsBO vo = list.get(0);
             tplData.put("tableName", vo.getTableName());
@@ -105,8 +105,8 @@
      * @param author 作者
      * @param version 版本
      */
-    public void buildAll(String basePackage, String packageName, String className, String tableName, String author, String version) {
-        Map tplData = this.getTplData(basePackage, packageName, className, tableName, author, version);
+    public void buildAll(String basePackage, String packageName, String className, String tableSchema, String tableName, String author, String version) {
+        Map tplData = this.getTplData(basePackage, packageName, className, tableSchema, tableName, author, version);
         try {
             // 必须
             this.buildPo(tplData);
@@ -141,8 +141,8 @@
      * @param author 作者
      * @param version 版本
      */
-    public void buildPo(String basePackage, String packageName, String className, String tableName, String author, String version) {
-        Map tplData = this.getTplData(basePackage, packageName, className, tableName, author, version);
+    public void buildPo(String basePackage, String packageName, String className, String tableSchema, String tableName, String author, String version) {
+        Map tplData = this.getTplData(basePackage, packageName, className, tableSchema, tableName, author, version);
         try {
             this.buildPo(tplData);
         } catch (TemplateNotFoundException e) {
@@ -167,8 +167,8 @@
      * @param author 作者
      * @param version 版本
      */
-    public void buildBo(String basePackage, String packageName, String className, String tableName, String author, String version) {
-        Map tplData = this.getTplData(basePackage, packageName, className, tableName, author, version);
+    public void buildBo(String basePackage, String packageName, String className, String tableSchema, String tableName, String author, String version) {
+        Map tplData = this.getTplData(basePackage, packageName, className, tableSchema, tableName, author, version);
         try {
             this.buildBo(tplData);
         } catch (TemplateNotFoundException e) {
@@ -193,8 +193,8 @@
      * @param author 作者
      * @param version 版本
      */
-    public void buildDaoMapper(String basePackage, String packageName, String className, String tableName, String author, String version) {
-        Map tplData = this.getTplData(basePackage, packageName, className, tableName, author, version);
+    public void buildDaoMapper(String basePackage, String packageName, String className, String tableSchema, String tableName, String author, String version) {
+        Map tplData = this.getTplData(basePackage, packageName, className, tableSchema, tableName, author, version);
         try {
             this.buildDaoMapper(tplData);
         } catch (TemplateNotFoundException e) {
@@ -219,8 +219,8 @@
      * @param author 作者
      * @param version 版本
      */
-    public void buildDaoMapperXml(String basePackage, String packageName, String className, String tableName, String author, String version) {
-        Map tplData = this.getTplData(basePackage, packageName, className, tableName, author, version);
+    public void buildDaoMapperXml(String basePackage, String packageName, String className, String tableSchema, String tableName, String author, String version) {
+        Map tplData = this.getTplData(basePackage, packageName, className, tableSchema, tableName, author, version);
         try {
             this.buildDaoMapperXml(tplData);
         } catch (TemplateNotFoundException e) {
@@ -245,8 +245,8 @@
      * @param author 作者
      * @param version 版本
      */
-    public void buildService(String basePackage, String packageName, String className, String tableName, String author, String version) {
-        Map tplData = this.getTplData(basePackage, packageName, className, tableName, author, version);
+    public void buildService(String basePackage, String packageName, String className, String tableSchema, String tableName, String author, String version) {
+        Map tplData = this.getTplData(basePackage, packageName, className, tableSchema, tableName, author, version);
         try {
             this.buildService(tplData);
         } catch (TemplateNotFoundException e) {
@@ -271,8 +271,8 @@
      * @param author 作者
      * @param version 版本
      */
-    public void buildWebController(String basePackage, String packageName, String className, String tableName, String author, String version) {
-        Map tplData = this.getTplData(basePackage, packageName, className, tableName, author, version);
+    public void buildWebController(String basePackage, String packageName, String className, String tableSchema, String tableName, String author, String version) {
+        Map tplData = this.getTplData(basePackage, packageName, className, tableSchema, tableName, author, version);
         try {
             this.buildWebController(tplData);
         } catch (TemplateNotFoundException e) {
@@ -297,8 +297,8 @@
      * @param author 作者
      * @param version 版本
      */
-    public void buildWechatController(String basePackage, String packageName, String className, String tableName, String author, String version) {
-        Map tplData = this.getTplData(basePackage, packageName, className, tableName, author, version);
+    public void buildWechatController(String basePackage, String packageName, String className, String tableSchema, String tableName, String author, String version) {
+        Map tplData = this.getTplData(basePackage, packageName, className, tableSchema, tableName, author, version);
         try {
             this.buildWechatController(tplData);
         } catch (TemplateNotFoundException e) {
@@ -323,8 +323,8 @@
      * @param author 作者
      * @param version 版本
      */
-    public void buildControllerTest(String basePackage, String packageName, String className, String tableName, String author, String version) {
-        Map tplData = this.getTplData(basePackage, packageName, className, tableName, author, version);
+    public void buildControllerTest(String basePackage, String packageName, String className, String tableSchema, String tableName, String author, String version) {
+        Map tplData = this.getTplData(basePackage, packageName, className, tableSchema, tableName, author, version);
         try {
             this.buildControllerTest(tplData);
 
@@ -350,8 +350,8 @@
      * @param author 作者
      * @param version 版本
      */
-    public void buildServiceTest(String basePackage, String packageName, String className, String tableName, String author, String version) {
-        Map tplData = this.getTplData(basePackage, packageName, className, tableName, author, version);
+    public void buildServiceTest(String basePackage, String packageName, String className, String tableSchema, String tableName, String author, String version) {
+        Map tplData = this.getTplData(basePackage, packageName, className, tableSchema, tableName, author, version);
         try {
             this.buildServiceTest(tplData);
         } catch (TemplateNotFoundException e) {
@@ -376,8 +376,8 @@
      * @param author 作者
      * @param version 版本
      */
-    public void buildJson(String basePackage, String packageName, String className, String tableName, String author, String version) {
-        Map tplData = this.getTplData(basePackage, packageName, className, tableName, author, version);
+    public void buildJson(String basePackage, String packageName, String className, String tableSchema, String tableName, String author, String version) {
+        Map tplData = this.getTplData(basePackage, packageName, className, tableSchema, tableName, author, version);
         try {
             this.buildJson(tplData);
         } catch (TemplateNotFoundException e) {
@@ -403,8 +403,8 @@
      * @param author 作者
      * @param version 版本
      */
-    public void buildJsForm(String basePackage, String packageName, String className, String tableName, String author, String version) {
-        Map tplData = this.getTplData(basePackage, packageName, className, tableName, author, version);
+    public void buildJsForm(String basePackage, String packageName, String className, String tableSchema, String tableName, String author, String version) {
+        Map tplData = this.getTplData(basePackage, packageName, className, tableSchema, tableName, author, version);
         try {
             this.buildJsForm(tplData);
         } catch (TemplateNotFoundException e) {

--
Gitblit v1.8.0