From 7a41565df8f9daf81889b504062d25a3b00d8400 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 04 七月 2024 11:22:21 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java | 5 +++--
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java | 2 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java | 9 +++------
zy-asrs-framework/src/main/resources/templates/vue/Controller.txt | 3 ++-
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java
index 00495b4..03b902f 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java
@@ -42,6 +42,7 @@
public String password;
public String table;
public String tableName;
+ public String rootPackagePath;
public String packagePath;
public boolean controller = true;
public boolean service = true;
@@ -201,6 +202,7 @@
.replaceAll("@\\{SIMPLEENTITYNAME}", simpleEntityName)
.replaceAll("@\\{UENTITYNAME}", simpleEntityName)
.replaceAll("@\\{COMPANYNAME}",packagePath)
+ .replaceAll("@\\{ROOTPACKAGEPATH}",rootPackagePath)
.replaceAll("@\\{ITEMNAME}",itemName)
// .replaceAll("@\\{XMLCONTENT}", xmlContent)
.replaceAll("@\\{HTMLCONTENT}", htmlContent)
diff --git a/zy-asrs-framework/src/main/resources/templates/vue/Controller.txt b/zy-asrs-framework/src/main/resources/templates/vue/Controller.txt
index d505653..7a7c0c6 100644
--- a/zy-asrs-framework/src/main/resources/templates/vue/Controller.txt
+++ b/zy-asrs-framework/src/main/resources/templates/vue/Controller.txt
@@ -1,4 +1,4 @@
-package com.zy.asrs.wms.system.controller;
+package @{COMPANYNAME}.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,6 +10,7 @@
import com.zy.asrs.wms.common.domain.PageParam;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
import @{COMPANYNAME}.service.@{ENTITYNAME}Service;
+import @{ROOTPACKAGEPATH}.system.controller.BaseController;
import com.zy.asrs.wms.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
index ddece93..b58af46 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
@@ -1,9 +1,6 @@
package com.zy.asrs.wms.system.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.enums.LoginSystemType;
import com.zy.asrs.wms.common.domain.BaseParam;
-import com.zy.asrs.wms.system.entity.Role;
import com.zy.asrs.wms.system.entity.User;
import com.zy.asrs.wms.system.entity.UserLogin;
import com.zy.asrs.wms.system.service.UserLoginService;
@@ -12,15 +9,15 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
-
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Created by vincent on 1/30/2024
*/
public class BaseController {
+ protected static final String RANGE_TIME_LINK = " - ";
+
@Autowired
private UserLoginService userLoginService;
@Autowired
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
index e6f97e0..8dd15bd 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
@@ -22,8 +22,9 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_mat";
- generator.tableName="鍟嗗搧妗ｆ";
+ generator.table="man_order_type";
+ generator.tableName="鍗曟嵁绫诲瀷";
+ generator.rootPackagePath="com.zy.asrs.wms";
generator.packagePath="com.zy.asrs.wms.asrs";
generator.build();
--
Gitblit v1.9.1