代码生成工具支持MyBatisDynamicSql

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java

@@ -357,7 +357,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
             return "";
         } else if (!name.contains("_")) {
             // 不含下划线，仅将首字母大写
-            return name.substring(0, 1).toUpperCase() + name.substring(1);
+            return name.substring(0, 1).toUpperCase() + name.substring(1).toLowerCase();
         }
         // 用下划线将原始字符串分割
         String[] camels = name.split("_");
@@ -382,7 +382,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
             return null;
         }
         if (s.indexOf(SEPARATOR) == -1) {
-            return s;
+            return s.toLowerCase();
         }
         s = s.toLowerCase();
         StringBuilder sb = new StringBuilder(s.length());

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileActionHandler.java

@@ -0,0 +1,18 @@
+package com.ruoyi.common.core.utils.file;
+
+import java.io.File;
+
+/**
+ * @author Alan Scipio
+ * created on 2024/2/2
+ */
+@FunctionalInterface
+public interface FileActionHandler {
+
+    void onHandle(File file, Object... args);
+
+    default void onHandle(File file) {
+        onHandle(file, (Object[]) null);
+    }
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileFilter.java

@@ -0,0 +1,14 @@
+package com.ruoyi.common.core.utils.file;
+
+import java.io.File;
+
+/**
+ * @author Alan Scipio
+ * created on 2024/2/2
+ */
+@FunctionalInterface
+public interface FileFilter {
+
+    boolean accept(File file);
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java

@@ -1,83 +1,71 @@
 package com.ruoyi.common.core.utils.file;
 
-import java.io.File;
+import com.ruoyi.common.core.utils.StringUtils;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 /**
  * 文件处理工具类
- * 
+ *
  * @author ruoyi
  */
-public class FileUtils
+public class FileUtils {
-{
+    /**
-    /** 字符常量：斜杠 {@code '/'} */
+     * 字符常量：斜杠 {@code '/'}
+     */
     public static final char SLASH = '/';
 
-    /** 字符常量：反斜杠 {@code '\\'} */
+    /**
+     * 字符常量：反斜杠 {@code '\\'}
+     */
     public static final char BACKSLASH = '\\';
 
-    public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
+    public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-|.\\u4e00-\\u9fa5]+";
 
     /**
      * 输出指定文件的byte数组
-     * 
+     *
      * @param filePath 文件路径
-     * @param os 输出流
+     * @param os       输出流
-     * @return
      */
-    public static void writeBytes(String filePath, OutputStream os) throws IOException
+    public static void writeBytes(String filePath, OutputStream os) throws IOException {
-    {
         FileInputStream fis = null;
-        try
+        try {
-        {
             File file = new File(filePath);
-            if (!file.exists())
+            if (!file.exists()) {
-            {
                 throw new FileNotFoundException(filePath);
             }
             fis = new FileInputStream(file);
             byte[] b = new byte[1024];
             int length;
-            while ((length = fis.read(b)) > 0)
+            while ((length = fis.read(b)) > 0) {
-            {
                 os.write(b, 0, length);
             }
-        }
+        } catch (IOException e) {
-        catch (IOException e)
-        {
             throw e;
-        }
+        } finally {
-        finally
+            if (os != null) {
-        {
+                try {
-            if (os != null)
-            {
-                try
-                {
                     os.close();
-                }
+                } catch (IOException e1) {
-                catch (IOException e1)
-                {
                     e1.printStackTrace();
                 }
             }
-            if (fis != null)
+            if (fis != null) {
-            {
+                try {
-                try
-                {
                     fis.close();
-                }
+                } catch (IOException e1) {
-                catch (IOException e1)
-                {
                     e1.printStackTrace();
                 }
             }
@@ -86,17 +74,14 @@ public class FileUtils
 
     /**
      * 删除文件
-     * 
+     *
      * @param filePath 文件
-     * @return
      */
-    public static boolean deleteFile(String filePath)
+    public static boolean deleteFile(String filePath) {
-    {
         boolean flag = false;
         File file = new File(filePath);
         // 路径为文件且不为空则进行删除
-        if (file.isFile() && file.exists())
+        if (file.isFile() && file.exists()) {
-        {
             flag = file.delete();
         }
         return flag;
@@ -104,26 +89,23 @@ public class FileUtils
 
     /**
      * 文件名称验证
-     * 
+     *
      * @param filename 文件名称
      * @return true 正常 false 非法
      */
-    public static boolean isValidFilename(String filename)
+    public static boolean isValidFilename(String filename) {
-    {
         return filename.matches(FILENAME_PATTERN);
     }
 
     /**
      * 检查文件是否可下载
-     * 
+     *
      * @param resource 需要下载的文件
      * @return true 正常 false 非法
      */
-    public static boolean checkAllowDownload(String resource)
+    public static boolean checkAllowDownload(String resource) {
-    {
         // 禁止目录上跳级别
-        if (StringUtils.contains(resource, ".."))
+        if (StringUtils.contains(resource, "..")) {
-        {
             return false;
         }
         // 判断是否在允许下载的文件规则内
@@ -132,35 +114,27 @@ public class FileUtils
 
     /**
      * 下载文件名重新编码
-     * 
+     *
-     * @param request 请求对象
+     * @param request  请求对象
      * @param fileName 文件名
      * @return 编码后的文件名
      */
-    public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException
+    public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException {
-    {
         final String agent = request.getHeader("USER-AGENT");
         String filename = fileName;
-        if (agent.contains("MSIE"))
+        if (agent.contains("MSIE")) {
-        {
             // IE浏览器
-            filename = URLEncoder.encode(filename, "utf-8");
+            filename = URLEncoder.encode(filename, StandardCharsets.UTF_8);
             filename = filename.replace("+", " ");
-        }
+        } else if (agent.contains("Firefox")) {
-        else if (agent.contains("Firefox"))
-        {
             // 火狐浏览器
             filename = new String(fileName.getBytes(), "ISO8859-1");
-        }
+        } else if (agent.contains("Chrome")) {
-        else if (agent.contains("Chrome"))
-        {
             // google浏览器
-            filename = URLEncoder.encode(filename, "utf-8");
+            filename = URLEncoder.encode(filename, StandardCharsets.UTF_8);
-        }
+        } else {
-        else
-        {
             // 其它浏览器
-            filename = URLEncoder.encode(filename, "utf-8");
+            filename = URLEncoder.encode(filename, StandardCharsets.UTF_8);
         }
         return filename;
     }
@@ -171,30 +145,24 @@ public class FileUtils
      * @param filePath 文件
      * @return 文件名
      */
-    public static String getName(String filePath)
+    public static String getName(String filePath) {
-    {
+        if (null == filePath) {
-        if (null == filePath)
-        {
             return null;
         }
         int len = filePath.length();
-        if (0 == len)
+        if (0 == len) {
-        {
             return filePath;
         }
-        if (isFileSeparator(filePath.charAt(len - 1)))
+        if (isFileSeparator(filePath.charAt(len - 1))) {
-        {
             // 以分隔符结尾的去掉结尾分隔符
             len--;
         }
 
         int begin = 0;
         char c;
-        for (int i = len - 1; i > -1; i--)
+        for (int i = len - 1; i > -1; i--) {
-        {
             c = filePath.charAt(i);
-            if (isFileSeparator(c))
+            if (isFileSeparator(c)) {
-            {
                 // 查找最后一个路径分隔符（/或者\）
                 begin = i + 1;
                 break;
@@ -211,31 +179,27 @@ public class FileUtils
      * @param c 字符
      * @return 是否为Windows或者Linux（Unix）文件分隔符
      */
-    public static boolean isFileSeparator(char c)
+    public static boolean isFileSeparator(char c) {
-    {
         return SLASH == c || BACKSLASH == c;
     }
 
     /**
      * 下载文件名重新编码
      *
-     * @param response 响应对象
+     * @param response     响应对象
      * @param realFileName 真实文件名
-     * @return
      */
-    public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException
+    public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException {
-    {
         String percentEncodedFileName = percentEncode(realFileName);
 
-        StringBuilder contentDispositionValue = new StringBuilder();
+        String contentDispositionValue = "attachment; filename=" +
-        contentDispositionValue.append("attachment; filename=")
+                percentEncodedFileName +
-                .append(percentEncodedFileName)
+                ";" +
-                .append(";")
+                "filename*=" +
-                .append("filename*=")
+                "utf-8''" +
-                .append("utf-8''")
+                percentEncodedFileName;
-                .append(percentEncodedFileName);
 
-        response.setHeader("Content-disposition", contentDispositionValue.toString());
+        response.setHeader("Content-disposition", contentDispositionValue);
         response.setHeader("download-filename", percentEncodedFileName);
     }
 
@@ -245,9 +209,137 @@ public class FileUtils
      * @param s 需要百分号编码的字符串
      * @return 百分号编码后的字符串
      */
-    public static String percentEncode(String s) throws UnsupportedEncodingException
+    public static String percentEncode(String s) {
-    {
+        String encode = URLEncoder.encode(s, StandardCharsets.UTF_8);
-        String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString());
         return encode.replaceAll("\\+", "%20");
     }
+
+    /**
+     * 递归地在指定根目录下查找所有具有特定文件名的文件。
+     *
+     * @param rootDir        根目录
+     * @param searchFileName 要查找的文件名
+     * @param caseSensitive  是否大小写敏感
+     * @return 找到的具有特定文件名的文件对象列表
+     * @throws IOException 如果在访问文件系统时发生错误
+     */
+    public static List<File> findFiles(File rootDir, String searchFileName, boolean caseSensitive) throws IOException {
+        Path startPath = rootDir.toPath();
+
+        if (!Files.exists(startPath)) {
+            throw new FileNotFoundException("The provided root path does not exist: " + rootDir.getAbsolutePath());
+        }
+
+        List<File> matchingFiles;
+
+        try (var paths = Files.walk(startPath)) {
+            matchingFiles = paths
+                    .filter(Files::isRegularFile)
+                    .filter(path -> {
+                        if (caseSensitive) {
+                            return path.getFileName().toString().equals(searchFileName);
+                        } else {
+                            return path.getFileName().toString().equalsIgnoreCase(searchFileName);
+                        }
+                    })
+                    .map(Path::toFile)
+                    .collect(Collectors.toList());
+        }
+
+        return matchingFiles;
+    }
+
+    public static List<File> findFiles(String rootPath, String searchFileName, boolean caseSensitive) throws IOException {
+        return findFiles(new File(rootPath), searchFileName, caseSensitive);
+    }
+
+    public static List<File> findFiles(String rootPath, String searchFileName) throws IOException {
+        return findFiles(rootPath, searchFileName, true);
+    }
+
+    /**
+     * 读取文件内容并替换多组指定字符串。
+     *
+     * @param file         文件
+     * @param replacements 一个映射表，其中键为要替换的目标字符串，值为替换后的字符串
+     * @param handler      替换时的回调
+     * @throws IOException 如果读取或写入文件时发生错误
+     */
+    public static void replaceInFile(File file, Map<String, String> replacements, FileActionHandler handler) throws IOException {
+        if (file == null) {
+            throw new IllegalArgumentException("The provided file is null");
+        }
+        if (!file.exists()) {
+            throw new FileNotFoundException("The provided file does not exist: " + file.getAbsolutePath());
+        }
+        if (replacements.isEmpty()) {
+            return;
+        }
+
+        Path path = file.toPath();
+
+        // 读取文件内容到String
+        String content = Files.readString(path, StandardCharsets.UTF_8);
+
+        // 遍历replacements Map，对每个要替换的字符串进行处理
+        for (Map.Entry<String, String> entry : replacements.entrySet()) {
+            if (handler != null) {
+                handler.onHandle(file, entry);
+            }
+            content = content.replace(entry.getKey(), entry.getValue());
+        }
+
+        // 将修改后的内容写回文件
+        Files.writeString(path, content, StandardCharsets.UTF_8);
+    }
+
+    public static void replaceInFile(File file, Map<String, String> replacements) throws IOException {
+        replaceInFile(file, replacements, null);
+    }
+
+    /**
+     * 检查并删除指定文件中符合正则表达式的行。
+     *
+     * @param file    文件
+     * @param regex   符合此正则表达式的行将被删除
+     * @param handler 找到符合正则表达式的行时的回调
+     * @throws IOException 如果读取或写入文件时发生错误
+     */
+    public static void removeLinesMatchingRegex(File file, String regex, FileActionHandler handler) throws IOException {
+        if (file == null) {
+            throw new IllegalArgumentException("The provided file is null");
+        }
+        if (!file.exists()) {
+            throw new FileNotFoundException("The provided file does not exist: " + file.getAbsolutePath());
+        }
+        if (StringUtils.isBlank(regex)) {
+            return;
+        }
+
+        Path path = file.toPath();
+
+        // 读取文件的每一行，过滤掉符合正则表达式的行
+        try (var lines = Files.lines(path, StandardCharsets.UTF_8)) {
+            AtomicInteger lineNo = new AtomicInteger(1);
+            List<String> filteredLines = lines.filter(line -> {
+                        boolean matches = line.matches(regex);
+                        if (matches) {
+                            if (handler != null) {
+                                handler.onHandle(file, lineNo.get(), line);
+                            }
+                        }
+                        lineNo.getAndIncrement();
+                        return !matches;
+                    })
+                    .collect(Collectors.toList());
+
+            // 将过滤后的内容写回文件
+            Files.write(path, filteredLines, StandardCharsets.UTF_8);
+        }
+    }
+
+    public static void removeLinesMatchingRegex(File file, String regex) throws IOException {
+        removeLinesMatchingRegex(file, regex, null);
+    }
+
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -1,57 +1,5 @@
 package com.ruoyi.common.core.utils.poi;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import jakarta.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.RegExUtils;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.annotation.Excel.Type;
@@ -63,6 +11,31 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.file.FileTypeUtils;
 import com.ruoyi.common.core.utils.file.ImageUtils;
 import com.ruoyi.common.core.utils.reflect.ReflectUtils;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.RegExUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Excel相关处理
@@ -366,18 +339,16 @@ public class ExcelUtil<T> {
                     } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {
                         val = Convert.toBool(val, false);
                     }
-                    if (StringUtils.isNotNull(fieldType)) {
+                    String propertyName = field.getName();
-                        String propertyName = field.getName();
+                    if (StringUtils.isNotEmpty(attr.targetAttr())) {
-                        if (StringUtils.isNotEmpty(attr.targetAttr())) {
+                        propertyName = field.getName() + "." + attr.targetAttr();
-                            propertyName = field.getName() + "." + attr.targetAttr();
-                        }
-                        if (StringUtils.isNotEmpty(attr.readConverterExp())) {
-                            val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
-                        } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
-                            val = dataFormatHandlerAdapter(val, attr, null);
-                        }
-                        ReflectUtils.invokeSetter(entity, propertyName, val);
                     }
+                    if (StringUtils.isNotEmpty(attr.readConverterExp())) {
+                        val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
+                    } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
+                        val = dataFormatHandlerAdapter(val, attr, null);
+                    }
+                    ReflectUtils.invokeSetter(entity, propertyName, val);
                 }
                 list.add(entity);
             }
@@ -403,7 +374,6 @@ public class ExcelUtil<T> {
      * @param list      导出数据集合
      * @param sheetName 工作表的名称
      * @param title     标题
-     * @return 结果
      */
     public void exportExcel(HttpServletResponse response, List<T> list, String sheetName, String title) {
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java

@@ -1,22 +1,5 @@
 package com.ruoyi.gen.controller;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import jakarta.servlet.http.HttpServletResponse;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -28,6 +11,16 @@ import com.ruoyi.gen.domain.GenTable;
 import com.ruoyi.gen.domain.GenTableColumn;
 import com.ruoyi.gen.service.IGenTableColumnService;
 import com.ruoyi.gen.service.IGenTableService;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 代码生成 操作处理
@@ -167,8 +160,8 @@ public class GenController extends BaseController {
      */
     @RequiresPermissions("tool:gen:edit")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
-    @GetMapping("/synchDb/{tableName}")
+    @GetMapping("/syncDb/{tableName}")
-    public AjaxResult synchDb(@PathVariable("tableName") String tableName) {
+    public AjaxResult syncDb(@PathVariable("tableName") String tableName) {
         genTableService.synchDb(tableName);
         return success();
     }
@@ -190,7 +183,7 @@ public class GenController extends BaseController {
      */
     private void genCode(HttpServletResponse response, byte[] data) throws IOException {
         response.reset();
-        response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
+        response.setHeader("Content-Disposition", "attachment; filename=\"generatedCodes.zip\"");
         response.addHeader("Content-Length", "" + data.length);
         response.setContentType("application/octet-stream; charset=UTF-8");
         IOUtils.write(data, response.getOutputStream());

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java

@@ -1,13 +1,14 @@
 package com.ruoyi.gen.domain;
 
-import java.io.Serial;
-import java.util.List;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import org.apache.commons.lang3.ArrayUtils;
 import com.ruoyi.common.core.constant.GenConstants;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.io.Serial;
+import java.util.List;
 
 /**
  * 业务表 gen_table
@@ -46,6 +47,9 @@ public class GenTable extends BaseEntity
     /** 前端类型（element-ui模版 element-plus模版） */
     private String tplWebType;
 
+    /** 后端类型（MyBaitsDynamicSQL模板，常规模板） */
+    private String tplBackendType;
+
     /** 生成包路径 */
     @NotBlank(message = "生成包路径不能为空")
     private String packageName;
@@ -100,6 +104,14 @@ public class GenTable extends BaseEntity
     /** 上级菜单名称字段 */
     private String parentMenuName;
 
+    public String getTplBackendType() {
+        return tplBackendType;
+    }
+
+    public void setTplBackendType(String tplBackendType) {
+        this.tplBackendType = tplBackendType;
+    }
+
     public Long getTableId()
     {
         return tableId;

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java

@@ -1,5 +1,6 @@
 package com.ruoyi.gen.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.validation.constraints.NotBlank;
 
 import com.ruoyi.common.core.utils.StringUtils;
@@ -52,6 +53,12 @@ public class GenTableColumn extends BaseEntity {
     @NotBlank(message = "Java属性不能为空")
     private String javaField;
 
+    /**
+     * JAVA字段名（开头大写）
+     */
+    @JsonIgnore
+    private transient String javaFieldUpper;
+
     /**
      * 是否主键（1是）
      */
@@ -107,6 +114,14 @@ public class GenTableColumn extends BaseEntity {
      */
     private Integer sort;
 
+    public String getJavaFieldUpper() {
+        return javaFieldUpper;
+    }
+
+    public void setJavaFieldUpper(String javaFieldUpper) {
+        this.javaFieldUpper = javaFieldUpper;
+    }
+
     public void setColumnId(Long columnId) {
         this.columnId = columnId;
     }

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

@@ -1,27 +1,5 @@
 package com.ruoyi.gen.service;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.constant.Constants;
@@ -37,6 +15,28 @@ import com.ruoyi.gen.mapper.GenTableMapper;
 import com.ruoyi.gen.util.GenUtils;
 import com.ruoyi.gen.util.VelocityInitializer;
 import com.ruoyi.gen.util.VelocityUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 /**
  * 业务 服务层实现
@@ -187,7 +187,7 @@ public class GenTableServiceImpl implements IGenTableService {
         VelocityContext context = VelocityUtils.prepareContext(table);
 
         // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType(), table.getTplBackendType());
         for (String template : templates) {
             // 渲染模板
             StringWriter sw = new StringWriter();
@@ -232,7 +232,7 @@ public class GenTableServiceImpl implements IGenTableService {
         VelocityContext context = VelocityUtils.prepareContext(table);
 
         // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType(), table.getTplBackendType());
         for (String template : templates) {
             if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) {
                 // 渲染模板
@@ -329,7 +329,7 @@ public class GenTableServiceImpl implements IGenTableService {
         VelocityContext context = VelocityUtils.prepareContext(table);
 
         // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType(), table.getTplBackendType());
         for (String template : templates) {
             // 渲染模板
             StringWriter sw = new StringWriter();

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java

@@ -1,25 +1,24 @@
 package com.ruoyi.gen.util;
 
-import java.util.Arrays;
-import org.apache.commons.lang3.RegExUtils;
 import com.ruoyi.common.core.constant.GenConstants;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.gen.config.GenConfig;
 import com.ruoyi.gen.domain.GenTable;
 import com.ruoyi.gen.domain.GenTableColumn;
+import org.apache.commons.lang3.RegExUtils;
+
+import java.util.Arrays;
 
 /**
  * 代码生成器 工具类
- * 
+ *
  * @author ruoyi
  */
-public class GenUtils
+public class GenUtils {
-{
     /**
      * 初始化表信息
      */
-    public static void initTable(GenTable genTable, String operName)
+    public static void initTable(GenTable genTable, String operName) {
-    {
         genTable.setClassName(convertClassName(genTable.getTableName()));
         genTable.setPackageName(GenConfig.getPackageName());
         genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
@@ -32,8 +31,7 @@ public class GenUtils
     /**
      * 初始化列属性字段
      */
-    public static void initColumnField(GenTableColumn column, GenTable table)
+    public static void initColumnField(GenTableColumn column, GenTable table) {
-    {
         String dataType = getDbType(column.getColumnType());
         String columnName = column.getColumnName();
         column.setTableId(table.getTableId());
@@ -44,36 +42,28 @@ public class GenUtils
         column.setJavaType(GenConstants.TYPE_STRING);
         column.setQueryType(GenConstants.QUERY_EQ);
 
-        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType))
+        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) {
-        {
             // 字符串长度超过500设置为文本域
             Integer columnLength = getColumnLength(column.getColumnType());
             String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
             column.setHtmlType(htmlType);
-        }
+        } else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) {
-        else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType))
-        {
             column.setJavaType(GenConstants.TYPE_DATE);
             column.setHtmlType(GenConstants.HTML_DATETIME);
-        }
+        } else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) {
-        else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType))
-        {
             column.setHtmlType(GenConstants.HTML_INPUT);
 
             // 如果是浮点型 统一用BigDecimal
             String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
-            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
+            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) {
-            {
                 column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
             }
             // 如果是整形
-            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
+            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) {
-            {
                 column.setJavaType(GenConstants.TYPE_INTEGER);
             }
             // 长整形
-            else
+            else {
-            {
                 column.setJavaType(GenConstants.TYPE_LONG);
             }
         }
@@ -82,74 +72,63 @@ public class GenUtils
         column.setIsInsert(GenConstants.REQUIRE);
 
         // 编辑字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk())
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk()) {
-        {
             column.setIsEdit(GenConstants.REQUIRE);
         }
         // 列表字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk())
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk()) {
-        {
             column.setIsList(GenConstants.REQUIRE);
         }
         // 查询字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk())
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) {
-        {
             column.setIsQuery(GenConstants.REQUIRE);
         }
 
         // 查询字段类型
-        if (StringUtils.endsWithIgnoreCase(columnName, "name"))
+        if (StringUtils.endsWithIgnoreCase(columnName, "name")) {
-        {
             column.setQueryType(GenConstants.QUERY_LIKE);
         }
         // 状态字段设置单选框
-        if (StringUtils.endsWithIgnoreCase(columnName, "status"))
+        if (StringUtils.endsWithIgnoreCase(columnName, "status")) {
-        {
             column.setHtmlType(GenConstants.HTML_RADIO);
         }
         // 类型&性别字段设置下拉框
         else if (StringUtils.endsWithIgnoreCase(columnName, "type")
-                || StringUtils.endsWithIgnoreCase(columnName, "sex"))
+                || StringUtils.endsWithIgnoreCase(columnName, "sex")) {
-        {
             column.setHtmlType(GenConstants.HTML_SELECT);
         }
         // 图片字段设置图片上传控件
-        else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
+        else if (StringUtils.endsWithIgnoreCase(columnName, "image")) {
-        {
             column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
         }
         // 文件字段设置文件上传控件
-        else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
+        else if (StringUtils.endsWithIgnoreCase(columnName, "file")) {
-        {
             column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
         }
         // 内容字段设置富文本控件
-        else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
+        else if (StringUtils.endsWithIgnoreCase(columnName, "content")) {
-        {
             column.setHtmlType(GenConstants.HTML_EDITOR);
         }
     }
 
     /**
      * 校验数组是否包含指定值
-     * 
+     *
-     * @param arr 数组
+     * @param arr         数组
      * @param targetValue 值
      * @return 是否包含
      */
-    public static boolean arraysContains(String[] arr, String targetValue)
+    public static boolean arraysContains(String[] arr, String targetValue) {
-    {
         return Arrays.asList(arr).contains(targetValue);
     }
 
     /**
      * 获取模块名
-     * 
+     *
      * @param packageName 包名
      * @return 模块名
      */
-    public static String getModuleName(String packageName)
+    public static String getModuleName(String packageName) {
-    {
         int lastIndex = packageName.lastIndexOf(".");
         int nameLength = packageName.length();
         return StringUtils.substring(packageName, lastIndex + 1, nameLength);
@@ -157,12 +136,11 @@ public class GenUtils
 
     /**
      * 获取业务名
-     * 
+     *
      * @param tableName 表名
      * @return 业务名
      */
-    public static String getBusinessName(String tableName)
+    public static String getBusinessName(String tableName) {
-    {
         int lastIndex = tableName.lastIndexOf("_");
         int nameLength = tableName.length();
         return StringUtils.substring(tableName, lastIndex + 1, nameLength);
@@ -170,16 +148,14 @@ public class GenUtils
 
     /**
      * 表名转换成Java类名
-     * 
+     *
      * @param tableName 表名称
      * @return 类名
      */
-    public static String convertClassName(String tableName)
+    public static String convertClassName(String tableName) {
-    {
         boolean autoRemovePre = GenConfig.getAutoRemovePre();
         String tablePrefix = GenConfig.getTablePrefix();
-        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
+        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) {
-        {
             String[] searchList = StringUtils.split(tablePrefix, ",");
             tableName = replaceFirst(tableName, searchList);
         }
@@ -188,19 +164,15 @@ public class GenUtils
 
     /**
      * 批量替换前缀
-     * 
+     *
-     * @param replacementm 替换值
+     * @param replacement 替换值
-     * @param searchList 替换列表
+     * @param searchList   替换列表
-     * @return
      */
-    public static String replaceFirst(String replacementm, String[] searchList)
+    public static String replaceFirst(String replacement, String[] searchList) {
-    {
+        String text = replacement;
-        String text = replacementm;
+        for (String searchString : searchList) {
-        for (String searchString : searchList)
+            if (replacement.startsWith(searchString)) {
-        {
+                text = replacement.replaceFirst(searchString, "");
-            if (replacementm.startsWith(searchString))
-            {
-                text = replacementm.replaceFirst(searchString, "");
                 break;
             }
         }
@@ -209,48 +181,39 @@ public class GenUtils
 
     /**
      * 关键字替换
-     * 
+     *
      * @param text 需要被替换的名字
      * @return 替换后的名字
      */
-    public static String replaceText(String text)
+    public static String replaceText(String text) {
-    {
         return RegExUtils.replaceAll(text, "(?:表|若依)", "");
     }
 
     /**
      * 获取数据库类型字段
-     * 
+     *
      * @param columnType 列类型
      * @return 截取后的列类型
      */
-    public static String getDbType(String columnType)
+    public static String getDbType(String columnType) {
-    {
+        if (StringUtils.indexOf(columnType, "(") > 0) {
-        if (StringUtils.indexOf(columnType, "(") > 0)
-        {
             return StringUtils.substringBefore(columnType, "(");
-        }
+        } else {
-        else
-        {
             return columnType;
         }
     }
 
     /**
      * 获取字段长度
-     * 
+     *
      * @param columnType 列类型
      * @return 截取后的列类型
      */
-    public static Integer getColumnLength(String columnType)
+    public static Integer getColumnLength(String columnType) {
-    {
+        if (StringUtils.indexOf(columnType, "(") > 0) {
-        if (StringUtils.indexOf(columnType, "(") > 0)
-        {
             String length = StringUtils.substringBetween(columnType, "(", ")");
             return Integer.valueOf(length);
-        }
+        } else {
-        else
-        {
             return 0;
         }
     }

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java

@@ -1,33 +1,29 @@
 package com.ruoyi.gen.util;
 
-import java.util.Properties;
-import org.apache.velocity.app.Velocity;
 import com.ruoyi.common.core.constant.Constants;
+import org.apache.velocity.app.Velocity;
+
+import java.util.Properties;
 
 /**
  * VelocityEngine工厂
- * 
+ *
  * @author ruoyi
  */
-public class VelocityInitializer
+public class VelocityInitializer {
-{
     /**
      * 初始化vm方法
      */
-    public static void initVelocity()
+    public static void initVelocity() {
-    {
         Properties p = new Properties();
-        try
+        try {
-        {
             // 加载classpath目录下的vm文件
             p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
             // 定义字符集
             p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8);
             // 初始化Velocity引擎，指定配置Properties
             Velocity.init(p);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             throw new RuntimeException(e);
         }
     }

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java

@@ -1,10 +1,5 @@
 package com.ruoyi.gen.util;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.apache.velocity.VelocityContext;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.constant.GenConstants;
@@ -12,21 +7,32 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.gen.domain.GenTable;
 import com.ruoyi.gen.domain.GenTableColumn;
+import org.apache.velocity.VelocityContext;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 模板工具类
- * 
+ *
  * @author ruoyi
  */
-public class VelocityUtils
+public class VelocityUtils {
-{
+    /**
-    /** 项目空间路径 */
+     * 项目空间路径
+     */
     private static final String PROJECT_PATH = "main/java";
 
-    /** mybatis空间路径 */
+    /**
+     * mybatis空间路径
+     */
     private static final String MYBATIS_PATH = "main/resources/mapper";
 
-    /** 默认上级菜单，系统工具 */
+    /**
+     * 默认上级菜单，系统工具
+     */
     private static final String DEFAULT_PARENT_MENU_ID = "3";
 
     /**
@@ -34,8 +40,7 @@ public class VelocityUtils
      *
      * @return 模板列表
      */
-    public static VelocityContext prepareContext(GenTable genTable)
+    public static VelocityContext prepareContext(GenTable genTable) {
-    {
         String moduleName = genTable.getModuleName();
         String businessName = genTable.getBusinessName();
         String packageName = genTable.getPackageName();
@@ -62,30 +67,27 @@ public class VelocityUtils
         velocityContext.put("table", genTable);
         velocityContext.put("dicts", getDicts(genTable));
         setMenuVelocityContext(velocityContext, genTable);
-        if (GenConstants.TPL_TREE.equals(tplCategory))
+        if (GenConstants.TPL_TREE.equals(tplCategory)) {
-        {
             setTreeVelocityContext(velocityContext, genTable);
         }
-        if (GenConstants.TPL_SUB.equals(tplCategory))
+        if (GenConstants.TPL_SUB.equals(tplCategory)) {
-        {
             setSubVelocityContext(velocityContext, genTable);
         }
+        addJavaFieldUpperCase(genTable.getColumns()); //javaField首字母大写
         return velocityContext;
     }
 
-    public static void setMenuVelocityContext(VelocityContext context, GenTable genTable)
+    public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) {
-    {
         String options = genTable.getOptions();
         JSONObject paramsObj = JSON.parseObject(options);
         String parentMenuId = getParentMenuId(paramsObj);
         context.put("parentMenuId", parentMenuId);
     }
 
-    public static void setTreeVelocityContext(VelocityContext context, GenTable genTable)
+    public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) {
-    {
         String options = genTable.getOptions();
         JSONObject paramsObj = JSON.parseObject(options);
-        String treeCode = getTreecode(paramsObj);
+        String treeCode = getTreeCode(paramsObj);
         String treeParentCode = getTreeParentCode(paramsObj);
         String treeName = getTreeName(paramsObj);
 
@@ -93,18 +95,15 @@ public class VelocityUtils
         context.put("treeParentCode", treeParentCode);
         context.put("treeName", treeName);
         context.put("expandColumn", getExpandColumn(genTable));
-        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
+        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
-        {
             context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE));
         }
-        if (paramsObj.containsKey(GenConstants.TREE_NAME))
+        if (paramsObj.containsKey(GenConstants.TREE_NAME)) {
-        {
             context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME));
         }
     }
 
-    public static void setSubVelocityContext(VelocityContext context, GenTable genTable)
+    public static void setSubVelocityContext(VelocityContext context, GenTable genTable) {
-    {
         GenTable subTable = genTable.getSubTable();
         String subTableName = genTable.getSubTableName();
         String subTableFkName = genTable.getSubTableFkName();
@@ -123,36 +122,40 @@ public class VelocityUtils
 
     /**
      * 获取模板信息
-     * @param tplCategory 生成的模板
+     *
-     * @param tplWebType 前端类型
+     * @param tplCategory    生成的模板
+     * @param tplWebType     前端类型
+     * @param tplBackendType 后端类型
      * @return 模板列表
      */
-    public static List<String> getTemplateList(String tplCategory, String tplWebType)
+    public static List<String> getTemplateList(String tplCategory, String tplWebType, String tplBackendType) {
-    {
+        List<String> templates = new ArrayList<>();
+        //后端
+        if ("mybatis-dynamic".equals(tplBackendType)) {
+            //MyBatis Dynamic SQL
+            templates.add("vm/java/controller-dynamic.java.vm");
+            templates.add("vm/java/serviceImpl-dynamic.java.vm");
+        } else {
+            //常规
+            templates.add("vm/java/domain.java.vm");
+            templates.add("vm/java/controller.java.vm");
+            templates.add("vm/java/serviceImpl.java.vm");
+            templates.add("vm/java/mapper.java.vm");
+            templates.add("vm/xml/mapper.xml.vm");
+        }
+        templates.add("vm/java/service.java.vm");
+        templates.add("vm/sql/sql.vm");
+        //前端
+        templates.add("vm/js/api.js.vm");
         String useWebType = "vm/vue";
-        if ("element-plus".equals(tplWebType))
+        if ("element-plus".equals(tplWebType)) {
-        {
             useWebType = "vm/vue/v3";
         }
-        List<String> templates = new ArrayList<String>();
+        if (GenConstants.TPL_CRUD.equals(tplCategory)) {
-        templates.add("vm/java/domain.java.vm");
-        templates.add("vm/java/mapper.java.vm");
-        templates.add("vm/java/service.java.vm");
-        templates.add("vm/java/serviceImpl.java.vm");
-        templates.add("vm/java/controller.java.vm");
-        templates.add("vm/xml/mapper.xml.vm");
-        templates.add("vm/sql/sql.vm");
-        templates.add("vm/js/api.js.vm");
-        if (GenConstants.TPL_CRUD.equals(tplCategory))
-        {
             templates.add(useWebType + "/index.vue.vm");
-        }
+        } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
-        else if (GenConstants.TPL_TREE.equals(tplCategory))
-        {
             templates.add(useWebType + "/index-tree.vue.vm");
-        }
+        } else if (GenConstants.TPL_SUB.equals(tplCategory)) {
-        else if (GenConstants.TPL_SUB.equals(tplCategory))
-        {
             templates.add(useWebType + "/index.vue.vm");
             templates.add("vm/java/sub-domain.java.vm");
         }
@@ -162,8 +165,7 @@ public class VelocityUtils
     /**
      * 获取文件名
      */
-    public static String getFileName(String template, GenTable genTable)
+    public static String getFileName(String template, GenTable genTable) {
-    {
         // 文件名称
         String fileName = "";
         // 包路径
@@ -179,48 +181,32 @@ public class VelocityUtils
         String mybatisPath = MYBATIS_PATH + "/" + moduleName;
         String vuePath = "vue";
 
-        if (template.contains("domain.java.vm"))
+        if (template.contains("domain.java.vm")) {
-        {
             fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
         }
-        if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
+        if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) {
-        {
             fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
-        }
+        } else if (template.contains("mapper.java.vm")) {
-        else if (template.contains("mapper.java.vm"))
-        {
             fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
-        }
+        } else if (template.contains("service.java.vm")) {
-        else if (template.contains("service.java.vm"))
-        {
             fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className);
-        }
+        } else if (template.contains("serviceImpl.java.vm")) {
-        else if (template.contains("serviceImpl.java.vm"))
-        {
             fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
-        }
+        } else if (template.contains("serviceImpl-dynamic.java.vm")) {
-        else if (template.contains("controller.java.vm"))
+            fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
-        {
+        } else if (template.contains("controller.java.vm")) {
             fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className);
-        }
+        } else if (template.contains("controller-dynamic.java.vm")) {
-        else if (template.contains("mapper.xml.vm"))
+            fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className);
-        {
+        } else if (template.contains("mapper.xml.vm")) {
             fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className);
-        }
+        } else if (template.contains("sql.vm")) {
-        else if (template.contains("sql.vm"))
-        {
             fileName = businessName + "Menu.sql";
-        }
+        } else if (template.contains("api.js.vm")) {
-        else if (template.contains("api.js.vm"))
-        {
             fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
-        }
+        } else if (template.contains("index.vue.vm")) {
-        else if (template.contains("index.vue.vm"))
-        {
             fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
-        }
+        } else if (template.contains("index-tree.vue.vm")) {
-        else if (template.contains("index-tree.vue.vm"))
-        {
             fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
         }
         return fileName;
@@ -232,36 +218,29 @@ public class VelocityUtils
      * @param packageName 包名称
      * @return 包前缀名称
      */
-    public static String getPackagePrefix(String packageName)
+    public static String getPackagePrefix(String packageName) {
-    {
         int lastIndex = packageName.lastIndexOf(".");
         return StringUtils.substring(packageName, 0, lastIndex);
     }
 
     /**
      * 根据列类型获取导入包
-     * 
+     *
      * @param genTable 业务表对象
      * @return 返回需要导入的包列表
      */
-    public static HashSet<String> getImportList(GenTable genTable)
+    public static HashSet<String> getImportList(GenTable genTable) {
-    {
         List<GenTableColumn> columns = genTable.getColumns();
         GenTable subGenTable = genTable.getSubTable();
         HashSet<String> importList = new HashSet<String>();
-        if (StringUtils.isNotNull(subGenTable))
+        if (StringUtils.isNotNull(subGenTable)) {
-        {
             importList.add("java.util.List");
         }
-        for (GenTableColumn column : columns)
+        for (GenTableColumn column : columns) {
-        {
+            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) {
-            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
-            {
                 importList.add("java.util.Date");
                 importList.add("com.fasterxml.jackson.annotation.JsonFormat");
-            }
+            } else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) {
-            else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType()))
-            {
                 importList.add("java.math.BigDecimal");
             }
         }
@@ -270,17 +249,15 @@ public class VelocityUtils
 
     /**
      * 根据列类型获取字典组
-     * 
+     *
      * @param genTable 业务表对象
      * @return 返回字典组
      */
-    public static String getDicts(GenTable genTable)
+    public static String getDicts(GenTable genTable) {
-    {
         List<GenTableColumn> columns = genTable.getColumns();
         Set<String> dicts = new HashSet<String>();
         addDicts(dicts, columns);
-        if (StringUtils.isNotNull(genTable.getSubTable()))
+        if (StringUtils.isNotNull(genTable.getSubTable())) {
-        {
             List<GenTableColumn> subColumns = genTable.getSubTable().getColumns();
             addDicts(dicts, subColumns);
         }
@@ -289,18 +266,15 @@ public class VelocityUtils
 
     /**
      * 添加字典列表
-     * 
+     *
-     * @param dicts 字典列表
+     * @param dicts   字典列表
      * @param columns 列集合
      */
-    public static void addDicts(Set<String> dicts, List<GenTableColumn> columns)
+    public static void addDicts(Set<String> dicts, List<GenTableColumn> columns) {
-    {
+        for (GenTableColumn column : columns) {
-        for (GenTableColumn column : columns)
-        {
             if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
                     column.getHtmlType(),
-                    new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX }))
+                    new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) {
-            {
                 dicts.add("'" + column.getDictType() + "'");
             }
         }
@@ -309,12 +283,11 @@ public class VelocityUtils
     /**
      * 获取权限前缀
      *
-     * @param moduleName 模块名称
+     * @param moduleName   模块名称
      * @param businessName 业务名称
      * @return 返回权限前缀
      */
-    public static String getPermissionPrefix(String moduleName, String businessName)
+    public static String getPermissionPrefix(String moduleName, String businessName) {
-    {
         return StringUtils.format("{}:{}", moduleName, businessName);
     }
 
@@ -324,11 +297,9 @@ public class VelocityUtils
      * @param paramsObj 生成其他选项
      * @return 上级菜单ID字段
      */
-    public static String getParentMenuId(JSONObject paramsObj)
+    public static String getParentMenuId(JSONObject paramsObj) {
-    {
         if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
-                && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID)))
+                && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) {
-        {
             return paramsObj.getString(GenConstants.PARENT_MENU_ID);
         }
         return DEFAULT_PARENT_MENU_ID;
@@ -340,10 +311,8 @@ public class VelocityUtils
      * @param paramsObj 生成其他选项
      * @return 树编码
      */
-    public static String getTreecode(JSONObject paramsObj)
+    public static String getTreeCode(JSONObject paramsObj) {
-    {
+        if (paramsObj.containsKey(GenConstants.TREE_CODE)) {
-        if (paramsObj.containsKey(GenConstants.TREE_CODE))
-        {
             return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
         }
         return StringUtils.EMPTY;
@@ -355,10 +324,8 @@ public class VelocityUtils
      * @param paramsObj 生成其他选项
      * @return 树父编码
      */
-    public static String getTreeParentCode(JSONObject paramsObj)
+    public static String getTreeParentCode(JSONObject paramsObj) {
-    {
+        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
-        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
-        {
             return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
         }
         return StringUtils.EMPTY;
@@ -370,10 +337,8 @@ public class VelocityUtils
      * @param paramsObj 生成其他选项
      * @return 树名称
      */
-    public static String getTreeName(JSONObject paramsObj)
+    public static String getTreeName(JSONObject paramsObj) {
-    {
+        if (paramsObj.containsKey(GenConstants.TREE_NAME)) {
-        if (paramsObj.containsKey(GenConstants.TREE_NAME))
-        {
             return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
         }
         return StringUtils.EMPTY;
@@ -385,24 +350,26 @@ public class VelocityUtils
      * @param genTable 业务表对象
      * @return 展开按钮列序号
      */
-    public static int getExpandColumn(GenTable genTable)
+    public static int getExpandColumn(GenTable genTable) {
-    {
         String options = genTable.getOptions();
         JSONObject paramsObj = JSON.parseObject(options);
         String treeName = paramsObj.getString(GenConstants.TREE_NAME);
         int num = 0;
-        for (GenTableColumn column : genTable.getColumns())
+        for (GenTableColumn column : genTable.getColumns()) {
-        {
+            if (column.isList()) {
-            if (column.isList())
-            {
                 num++;
                 String columnName = column.getColumnName();
-                if (columnName.equals(treeName))
+                if (columnName.equals(treeName)) {
-                {
                     break;
                 }
             }
         }
         return num;
     }
+
+    public static void addJavaFieldUpperCase(List<GenTableColumn> columns) {
+        for (GenTableColumn column : columns) {
+            column.setJavaFieldUpper(column.getCapJavaField());
+        }
+    }
 }

ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -1,177 +1,304 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gen.mapper.GenTableMapper">
 
-	<resultMap type="GenTable" id="GenTableResult">
+    <resultMap type="com.ruoyi.gen.domain.GenTable" id="GenTableResult">
-	    <id     property="tableId"        column="table_id"          />
+        <id property="tableId" column="table_id"/>
-		<result property="tableName"      column="table_name"        />
+        <result property="tableName" column="table_name"/>
-		<result property="tableComment"   column="table_comment"     />
+        <result property="tableComment" column="table_comment"/>
-		<result property="subTableName"   column="sub_table_name"    />
+        <result property="subTableName" column="sub_table_name"/>
-		<result property="subTableFkName" column="sub_table_fk_name" />
+        <result property="subTableFkName" column="sub_table_fk_name"/>
-		<result property="className"      column="class_name"        />
+        <result property="className" column="class_name"/>
-		<result property="tplCategory"    column="tpl_category"      />
+        <result property="tplCategory" column="tpl_category"/>
-		<result property="tplWebType"     column="tpl_web_type"      />
+        <result property="tplWebType" column="tpl_web_type"/>
-		<result property="packageName"    column="package_name"      />
+        <result property="tplBackendType" column="tpl_backend_type"/>
-		<result property="moduleName"     column="module_name"       />
+        <result property="packageName" column="package_name"/>
-		<result property="businessName"   column="business_name"     />
+        <result property="moduleName" column="module_name"/>
-		<result property="functionName"   column="function_name"     />
+        <result property="businessName" column="business_name"/>
-		<result property="functionAuthor" column="function_author"   />
+        <result property="functionName" column="function_name"/>
-		<result property="genType"        column="gen_type"          />
+        <result property="functionAuthor" column="function_author"/>
-		<result property="genPath"        column="gen_path"          />
+        <result property="genType" column="gen_type"/>
-		<result property="options"        column="options"           />
+        <result property="genPath" column="gen_path"/>
-		<result property="createBy"       column="create_by"         />
+        <result property="options" column="options"/>
-		<result property="createTime"     column="create_time"       />
+        <result property="createBy" column="create_by"/>
-		<result property="updateBy"       column="update_by"         />
+        <result property="createTime" column="create_time"/>
-		<result property="updateTime"     column="update_time"       />
+        <result property="updateBy" column="update_by"/>
-		<result property="remark"         column="remark"            />
+        <result property="updateTime" column="update_time"/>
-		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
+        <result property="remark" column="remark"/>
-	</resultMap>
+        <collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult"/>
-	
-	<resultMap type="GenTableColumn" id="GenTableColumnResult">
-        <id     property="columnId"       column="column_id"      />
-        <result property="tableId"        column="table_id"       />
-        <result property="columnName"     column="column_name"    />
-        <result property="columnComment"  column="column_comment" />
-        <result property="columnType"     column="column_type"    />
-        <result property="javaType"       column="java_type"      />
-        <result property="javaField"      column="java_field"     />
-        <result property="isPk"           column="is_pk"          />
-        <result property="isIncrement"    column="is_increment"   />
-        <result property="isRequired"     column="is_required"    />
-        <result property="isInsert"       column="is_insert"      />
-        <result property="isEdit"         column="is_edit"        />
-        <result property="isList"         column="is_list"        />
-        <result property="isQuery"        column="is_query"       />
-        <result property="queryType"      column="query_type"     />
-        <result property="htmlType"       column="html_type"      />
-        <result property="dictType"       column="dict_type"      />
-        <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
-        <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
-        <result property="updateTime"     column="update_time"    />
     </resultMap>
-	
-	<sql id="selectGenTableVo">
-        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
-    </sql>
-    
-    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
-		<include refid="selectGenTableVo"/>
-		<where>
-			<if test="tableName != null and tableName != ''">
-				AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
-			</if>
-			<if test="tableComment != null and tableComment != ''">
-				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
-		</where>
-	</select>
 
-	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
+    <resultMap type="com.ruoyi.gen.domain.GenTableColumn" id="GenTableColumnResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
+        <id property="columnId" column="column_id"/>
-		where table_schema = (select database())
+        <result property="tableId" column="table_id"/>
-		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
+        <result property="columnName" column="column_name"/>
-		AND table_name NOT IN (select table_name from gen_table)
+        <result property="columnComment" column="column_comment"/>
-		<if test="tableName != null and tableName != ''">
+        <result property="columnType" column="column_type"/>
-			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+        <result property="javaType" column="java_type"/>
-		</if>
+        <result property="javaField" column="java_field"/>
-		<if test="tableComment != null and tableComment != ''">
+        <result property="isPk" column="is_pk"/>
-			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+        <result property="isIncrement" column="is_increment"/>
-		</if>
+        <result property="isRequired" column="is_required"/>
-		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+        <result property="isInsert" column="is_insert"/>
-			AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        <result property="isEdit" column="is_edit"/>
-		</if>
+        <result property="isList" column="is_list"/>
-		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+        <result property="isQuery" column="is_query"/>
-			AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        <result property="queryType" column="query_type"/>
-		</if>
+        <result property="htmlType" column="html_type"/>
+        <result property="dictType" column="dict_type"/>
+        <result property="sort" column="sort"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectGenTableVo">
+        select table_id,
+               table_name,
+               table_comment,
+               sub_table_name,
+               sub_table_fk_name,
+               class_name,
+               tpl_category,
+               tpl_web_type,
+               tpl_backend_type,
+               package_name,
+               module_name,
+               business_name,
+               function_name,
+               function_author,
+               gen_type,
+               gen_path,
+               options,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from gen_table
+    </sql>
+
+    <select id="selectGenTableList" parameterType="com.ruoyi.gen.domain.GenTable" resultMap="GenTableResult">
+        <include refid="selectGenTableVo"/>
+        <where>
+            <if test="tableName != null and tableName != ''">
+                AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+            </if>
+            <if test="tableComment != null and tableComment != ''">
+                AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+            </if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+        </where>
+    </select>
+
+    <select id="selectDbTableList" parameterType="com.ruoyi.gen.domain.GenTable" resultMap="GenTableResult">
+        select table_name, table_comment, create_time, update_time from information_schema.tables
+        where table_schema = (select database())
+        AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
+        AND table_name NOT IN (select table_name from gen_table)
+        <if test="tableName != null and tableName != ''">
+            AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+        </if>
+        <if test="tableComment != null and tableComment != ''">
+            AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+        </if>
+        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        </if>
+        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        </if>
         order by create_time desc
-	</select>
+    </select>
-	
+
-	<select id="selectDbTableListByNames" resultMap="GenTableResult">
+    <select id="selectDbTableListByNames" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
+        select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
+        where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
-		and table_name in
+        and table_name in
-	    <foreach collection="array" item="name" open="(" separator="," close=")">
+        <foreach collection="array" item="name" open="(" separator="," close=")">
- 			#{name}
+            #{name}
-        </foreach> 
+        </foreach>
-	</select>
+    </select>
-	
+
-	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
+    <select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
+        select table_name, table_comment, create_time, update_time
-		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
+        from information_schema.tables
-		and table_name = #{tableName}
+        where table_comment <![CDATA[ <> ]]> ''
-	</select>
+          and table_schema = (select database())
-	
+          and table_name = #{tableName}
-	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
+    </select>
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+
-			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+    <select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
-		FROM gen_table t
+        SELECT t.table_id,
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+               t.table_name,
-		where t.table_id = #{tableId} order by c.sort
+               t.table_comment,
-	</select>
+               t.sub_table_name,
-	
+               t.sub_table_fk_name,
-	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
+               t.class_name,
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+               t.tpl_category,
-			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+               t.tpl_web_type,
-		FROM gen_table t
+               t.tpl_backend_type,
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+               t.package_name,
-		where t.table_name = #{tableName} order by c.sort
+               t.module_name,
-	</select>
+               t.business_name,
-	
+               t.function_name,
-	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
+               t.function_author,
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
+               t.gen_type,
-			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+               t.gen_path,
-		FROM gen_table t
+               t.options,
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+               t.remark,
-		order by c.sort
+               c.column_id,
-	</select>
+               c.column_name,
-	
+               c.column_comment,
-	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
+               c.column_type,
+               c.java_type,
+               c.java_field,
+               c.is_pk,
+               c.is_increment,
+               c.is_required,
+               c.is_insert,
+               c.is_edit,
+               c.is_list,
+               c.is_query,
+               c.query_type,
+               c.html_type,
+               c.dict_type,
+               c.sort
+        FROM gen_table t
+                 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+        where t.table_id = #{tableId}
+        order by c.sort
+    </select>
+
+    <select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
+        SELECT t.table_id,
+               t.table_name,
+               t.table_comment,
+               t.sub_table_name,
+               t.sub_table_fk_name,
+               t.class_name,
+               t.tpl_category,
+               t.tpl_web_type,
+               t.tpl_backend_type,
+               t.package_name,
+               t.module_name,
+               t.business_name,
+               t.function_name,
+               t.function_author,
+               t.gen_type,
+               t.gen_path,
+               t.options,
+               t.remark,
+               c.column_id,
+               c.column_name,
+               c.column_comment,
+               c.column_type,
+               c.java_type,
+               c.java_field,
+               c.is_pk,
+               c.is_increment,
+               c.is_required,
+               c.is_insert,
+               c.is_edit,
+               c.is_list,
+               c.is_query,
+               c.query_type,
+               c.html_type,
+               c.dict_type,
+               c.sort
+        FROM gen_table t
+                 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+        where t.table_name = #{tableName}
+        order by c.sort
+    </select>
+
+    <select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
+        SELECT t.table_id,
+               t.table_name,
+               t.table_comment,
+               t.sub_table_name,
+               t.sub_table_fk_name,
+               t.class_name,
+               t.tpl_category,
+               t.tpl_web_type,
+               t.tpl_backend_type,
+               t.package_name,
+               t.module_name,
+               t.business_name,
+               t.function_name,
+               t.function_author,
+               t.options,
+               t.remark,
+               c.column_id,
+               c.column_name,
+               c.column_comment,
+               c.column_type,
+               c.java_type,
+               c.java_field,
+               c.is_pk,
+               c.is_increment,
+               c.is_required,
+               c.is_insert,
+               c.is_edit,
+               c.is_list,
+               c.is_query,
+               c.query_type,
+               c.html_type,
+               c.dict_type,
+               c.sort
+        FROM gen_table t
+                 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+        order by c.sort
+    </select>
+
+    <insert id="insertGenTable" parameterType="com.ruoyi.gen.domain.GenTable" useGeneratedKeys="true"
+            keyProperty="tableId">
         insert into gen_table (
-			<if test="tableName != null">table_name,</if>
+        <if test="tableName != null">table_name,</if>
-			<if test="tableComment != null and tableComment != ''">table_comment,</if>
+        <if test="tableComment != null and tableComment != ''">table_comment,</if>
-			<if test="className != null and className != ''">class_name,</if>
+        <if test="className != null and className != ''">class_name,</if>
-			<if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
+        <if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
-			<if test="tplWebType != null and tplWebType != ''">tpl_web_type,</if>
+        <if test="tplWebType != null and tplWebType != ''">tpl_web_type,</if>
-			<if test="packageName != null and packageName != ''">package_name,</if>
+        <if test="tplBackendType != null and tplBackendType != ''">tpl_backend_type,</if>
-			<if test="moduleName != null and moduleName != ''">module_name,</if>
+        <if test="packageName != null and packageName != ''">package_name,</if>
-			<if test="businessName != null and businessName != ''">business_name,</if>
+        <if test="moduleName != null and moduleName != ''">module_name,</if>
-			<if test="functionName != null and functionName != ''">function_name,</if>
+        <if test="businessName != null and businessName != ''">business_name,</if>
-			<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
+        <if test="functionName != null and functionName != ''">function_name,</if>
-			<if test="genType != null and genType != ''">gen_type,</if>
+        <if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
-			<if test="genPath != null and genPath != ''">gen_path,</if>
+        <if test="genType != null and genType != ''">gen_type,</if>
-			<if test="remark != null and remark != ''">remark,</if>
+        <if test="genPath != null and genPath != ''">gen_path,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+        <if test="remark != null and remark != ''">remark,</if>
-			create_time
+        <if test="createBy != null and createBy != ''">create_by,</if>
-         )values(
+        create_time
-			<if test="tableName != null">#{tableName},</if>
+        )values(
-			<if test="tableComment != null and tableComment != ''">#{tableComment},</if>
+        <if test="tableName != null">#{tableName},</if>
-			<if test="className != null and className != ''">#{className},</if>
+        <if test="tableComment != null and tableComment != ''">#{tableComment},</if>
-			<if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
+        <if test="className != null and className != ''">#{className},</if>
-			<if test="tplWebType != null and tplWebType != ''">#{tplWebType},</if>
+        <if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
-			<if test="packageName != null and packageName != ''">#{packageName},</if>
+        <if test="tplWebType != null and tplWebType != ''">#{tplWebType},</if>
-			<if test="moduleName != null and moduleName != ''">#{moduleName},</if>
+        <if test="tplBackendType != null and tplBackendType != ''">#{tplBackendType},</if>
-			<if test="businessName != null and businessName != ''">#{businessName},</if>
+        <if test="packageName != null and packageName != ''">#{packageName},</if>
-			<if test="functionName != null and functionName != ''">#{functionName},</if>
+        <if test="moduleName != null and moduleName != ''">#{moduleName},</if>
-			<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
+        <if test="businessName != null and businessName != ''">#{businessName},</if>
-			<if test="genType != null and genType != ''">#{genType},</if>
+        <if test="functionName != null and functionName != ''">#{functionName},</if>
-			<if test="genPath != null and genPath != ''">#{genPath},</if>
+        <if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
-			<if test="remark != null and remark != ''">#{remark},</if>
+        <if test="genType != null and genType != ''">#{genType},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+        <if test="genPath != null and genPath != ''">#{genPath},</if>
-			sysdate()
+        <if test="remark != null and remark != ''">#{remark},</if>
-         )
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
     </insert>
-    
+
-    <update id="updateGenTable" parameterType="GenTable">
+    <update id="updateGenTable" parameterType="com.ruoyi.gen.domain.GenTable">
         update gen_table
         <set>
             <if test="tableName != null">table_name = #{tableName},</if>
@@ -184,6 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
             <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
             <if test="tplWebType != null and tplWebType != ''">tpl_web_type = #{tplWebType},</if>
+            <if test="tplBackendType != null and tplBackendType != ''">tpl_backend_type = #{tplBackendType},</if>
             <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
             <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
             <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
@@ -195,9 +323,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </set>
         where table_id = #{tableId}
     </update>
-    
+
     <delete id="deleteGenTableByIds" parameterType="Long">
-        delete from gen_table where table_id in 
+        delete from gen_table where table_id in
         <foreach collection="array" item="tableId" open="(" separator="," close=")">
             #{tableId}
         </foreach>

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller-dynamic.java.vm

@@ -0,0 +1,116 @@
+package ${packageName}.controller;
+
+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import ${packageName}.domain.${ClassName};
+import ${packageName}.service.I${ClassName}Service;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.web.page.TableDataInfo;
+#elseif($table.tree)
+#end
+
+/**
+ * ${functionName}Controller
+ * 
+ * @author ${author}
+ * created on ${datetime}
+ */
+@RestController
+@RequestMapping("/${businessName}")
+public class ${ClassName}Controller extends BaseController
+{
+    @Autowired
+    private I${ClassName}Service ${className}Service;
+
+    /**
+     * 查询${functionName}列表
+     */
+    @RequiresPermissions("${permissionPrefix}:list")
+    @GetMapping("/list")
+#if($table.crud || $table.sub)
+    public TableDataInfo list(${ClassName} ${className})
+    {
+        startPage();
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        return getDataTable(list);
+    }
+#elseif($table.tree)
+    public AjaxResult list(${ClassName} ${className})
+    {
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        return success(list);
+    }
+#end
+
+    //TODO 如果要启用导出功能，需要在domain实体类的字段上添加注解：@com.ruoyi.common.core.annotation.Excel(name = "字段名")
+    /*
+     * 导出${functionName}列表
+     */
+//    @RequiresPermissions("${permissionPrefix}:export")
+//    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, ${ClassName} ${className})
+//    {
+//        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+//        ExcelUtil<${ClassName}> util = new ExcelUtil<>(${ClassName}.class);
+//        util.exportExcel(response, list, "${functionName}数据");
+//    }
+
+    /**
+     * 获取${functionName}详细信息
+     */
+    @RequiresPermissions("${permissionPrefix}:query")
+    @GetMapping(value = "/{${pkColumn.javaField}}")
+    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+    }
+
+    /**
+     * 新增${functionName}
+     */
+    @RequiresPermissions("${permissionPrefix}:add")
+    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ${ClassName} ${className})
+    {
+        return toAjax(${className}Service.insert${ClassName}(${className}));
+    }
+
+    /**
+     * 修改${functionName}
+     */
+    @RequiresPermissions("${permissionPrefix}:edit")
+    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ${ClassName} ${className})
+    {
+        return toAjax(${className}Service.update${ClassName}(${className}));
+    }
+
+    /**
+     * 删除${functionName}
+     */
+    @RequiresPermissions("${permissionPrefix}:remove")
+    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{${pkColumn.javaField}s}")
+    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
+    {
+        return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
+    }
+}

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm

@@ -1,8 +1,7 @@
 package ${packageName}.controller;
 
 import java.util.List;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,7 +28,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  * ${functionName}Controller
  * 
  * @author ${author}
- * @date ${datetime}
+ * created on ${datetime}
  */
 @RestController
 @RequestMapping("/${businessName}")
@@ -67,7 +66,7 @@ public class ${ClassName}Controller extends BaseController
     public void export(HttpServletResponse response, ${ClassName} ${className})
     {
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
-        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
+        ExcelUtil<${ClassName}> util = new ExcelUtil<>(${ClassName}.class);
         util.exportExcel(response, list, "${functionName}数据");
     }
 
@@ -108,7 +107,7 @@ public class ${ClassName}Controller extends BaseController
      */
     @RequiresPermissions("${permissionPrefix}:remove")
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{${pkColumn.javaField}s}")
+    @DeleteMapping("/{${pkColumn.javaField}s}")
     public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
     {
         return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.web.domain.TreeEntity;
  * ${functionName}对象 ${tableName}
  * 
  * @author ${author}
- * @date ${datetime}
+ * created on ${datetime}
  */
 #if($table.crud || $table.sub)
 #set($Entity="BaseEntity")

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm

@@ -10,7 +10,7 @@ import ${packageName}.domain.${subClassName};
  * ${functionName}Mapper接口
  * 
  * @author ${author}
- * @date ${datetime}
+ * created on ${datetime}
  */
 public interface ${ClassName}Mapper 
 {
@@ -20,7 +20,7 @@ public interface ${ClassName}Mapper
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return ${functionName}
      */
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+    ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 查询${functionName}列表
@@ -28,7 +28,7 @@ public interface ${ClassName}Mapper
      * @param ${className} ${functionName}
      * @return ${functionName}集合
      */
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+    List<${ClassName}> select${ClassName}List(${ClassName} ${className});
 
     /**
      * 新增${functionName}
@@ -36,7 +36,7 @@ public interface ${ClassName}Mapper
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int insert${ClassName}(${ClassName} ${className});
+    int insert${ClassName}(${ClassName} ${className});
 
     /**
      * 修改${functionName}
@@ -44,7 +44,7 @@ public interface ${ClassName}Mapper
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int update${ClassName}(${ClassName} ${className});
+    int update${ClassName}(${ClassName} ${className});
 
     /**
      * 删除${functionName}
@@ -52,7 +52,7 @@ public interface ${ClassName}Mapper
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return 结果
      */
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+    int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 批量删除${functionName}
@@ -60,7 +60,7 @@ public interface ${ClassName}Mapper
      * @param ${pkColumn.javaField}s 需要删除的数据主键集合
      * @return 结果
      */
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+    int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
 #if($table.sub)
 
     /**
@@ -69,7 +69,7 @@ public interface ${ClassName}Mapper
      * @param ${pkColumn.javaField}s 需要删除的数据主键集合
      * @return 结果
      */
-    public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+    int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
     
     /**
      * 批量新增${subTable.functionName}
@@ -77,7 +77,7 @@ public interface ${ClassName}Mapper
      * @param ${subclassName}List ${subTable.functionName}列表
      * @return 结果
      */
-    public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
+    int batch${subClassName}(List<${subClassName}> ${subclassName}List);
     
 
     /**

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm

@@ -1,61 +1,61 @@
 package ${packageName}.service;
 
 import java.util.List;
-import ${packageName}.domain.${ClassName};
+
+import ${packageName}.domain .${ClassName};
 
 /**
  * ${functionName}Service接口
- * 
+ *
  * @author ${author}
- * @date ${datetime}
+ * created on ${datetime}
  */
-public interface I${ClassName}Service 
+public interface I${ClassName}Service {
-{
     /**
      * 查询${functionName}
-     * 
+     *
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return ${functionName}
      */
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+        ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 查询${functionName}列表
-     * 
+     *
      * @param ${className} ${functionName}
      * @return ${functionName}集合
      */
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+    List<${ClassName}> select${ClassName}List(${ClassName} ${className});
 
     /**
      * 新增${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int insert${ClassName}(${ClassName} ${className});
+    int insert${ClassName}(${ClassName} ${className});
 
     /**
      * 修改${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int update${ClassName}(${ClassName} ${className});
+    int update${ClassName}(${ClassName} ${className});
 
     /**
      * 批量删除${functionName}
-     * 
+     *
      * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
      * @return 结果
      */
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+    int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
 
     /**
      * 删除${functionName}信息
-     * 
+     *
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return 结果
      */
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+    int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 }

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl-dynamic.java.vm

@@ -0,0 +1,217 @@
+package ${packageName}.service.impl;
+
+import java.util.List;
+#foreach ($column in $columns)
+#if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
+import com.ruoyi.common.core.utils.DateUtils;
+#break
+#end
+#end
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.mybatis.dynamic.sql.where.condition.IsEqualTo;
+import org.mybatis.dynamic.sql.where.condition.IsIn;
+import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
+import org.mybatis.dynamic.sql.SqlBuilder;
+#if($table.sub)
+import java.util.ArrayList;
+import com.ruoyi.common.core.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import ${packageName}.domain.${subClassName};
+#end
+import ${packageName}.mapper.${ClassName}Mapper;
+import ${packageName}.domain.${ClassName};
+import ${packageName}.mapper.${ClassName}DynamicSqlSupport;
+import ${packageName}.service.I${ClassName}Service;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * ${functionName}Service业务层处理
+ * 
+ * @author ${author}
+ * created on ${datetime}
+ */
+@Service
+public class ${ClassName}ServiceImpl implements I${ClassName}Service 
+{
+    @Autowired
+    private ${ClassName}Mapper ${className}Mapper;
+
+    /**
+     * 查询${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return ${functionName}
+     */
+    @Override
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        Optional<${ClassName}> result = ${className}Mapper.selectOne(dsl -> dsl.where(${ClassName}DynamicSqlSupport.${pkColumn.javaField}, SqlBuilder.isEqualTo(${pkColumn.javaField})));
+        return result.orElse(null);
+    }
+
+    /**
+     * 查询${functionName}列表
+     * 
+     * @param ${className} ${functionName}
+     * @return ${functionName}
+     */
+    @Override
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
+    {
+##        return ${className}Mapper.select(SelectDSLCompleter.allRows()); //查询全部字段
+#set ($whereFuncName = "where")
+#set ($conditionFuncName = "isEqualToWhenPresent")
+        return unitInfoMapper.select(dsl -> dsl
+#foreach ($column in $columns)
+    ## where语句是where还是and开头
+    #if (!$foreach.first)
+        #set ($whereFuncName = "and")
+    #end
+    ## 查询条件
+    #if ($columne.queryType == "EQ")
+        #set ($conditionFuncName = "isEqualToWhenPresent")
+    #elseif ($columne.queryType == "NE")
+        #set ($conditionFuncName = "isNotEqualToWhenPresent")
+    #elseif ($columne.queryType == "GT")
+        #set ($conditionFuncName = "isGreaterThanWhenPresent")
+    #elseif ($columne.queryType == "GTE")
+        #set ($conditionFuncName = "isGreaterThanOrEqualToWhenPresent")
+    #elseif ($columne.queryType == "LT")
+        #set ($conditionFuncName = "isLessThanWhenPresent")
+    #elseif ($columne.queryType == "LTE")
+        #set ($conditionFuncName = "isLessThanOrEqualToWhenPresent")
+    #elseif ($columne.queryType == "LIKE")
+        #set ($conditionFuncName = "isLikeWhenPresent")
+    #elseif ($columne.queryType == "BETWEEN")
+        #set ($conditionFuncName = "isBetweenWhenPresent")
+##            #elseif ($columne.queryType == "IN")
+##                #set ($conditionFuncName = "isIn")
+##            #elseif ($columne.queryType == "NI")
+##                #set ($conditionFuncName = "isNotIn")
+    #end
+    ## 对like条件的特殊处理
+    #if ($columne.queryType == "LIKE")
+        .${whereFuncName}(${ClassName}DynamicSqlSupport.$column.javaField, SqlBuilder.${conditionFuncName}(${className}.get${column.javaFieldUpper}() == null ? null : "%" + ${className}.get${column.javaFieldUpper}() + "%")
+    #else
+        .${whereFuncName}(${ClassName}DynamicSqlSupport.$column.javaField, SqlBuilder.${conditionFuncName}(${className}.get${column.javaFieldUpper}()))
+    #end
+#end
+        );
+    }
+
+    /**
+     * 新增${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int insert${ClassName}(${ClassName} ${className})
+    {
+#foreach ($column in $columns)
+#if($column.javaField == 'createTime')
+        ${className}.setCreateTime(DateUtils.getNowDate());
+#end
+#end
+#if($table.sub)
+        int rows = ${className}Mapper.insertSelective(${className});
+        insert${subClassName}(${className});
+        return rows;
+#else
+        return ${className}Mapper.insertSelective(${className});
+#end
+    }
+
+    /**
+     * 修改${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int update${ClassName}(${ClassName} ${className})
+    {
+#foreach ($column in $columns)
+#if($column.javaField == 'updateTime')
+        ${className}.setUpdateTime(DateUtils.getNowDate());
+#end
+#end
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
+        insert${subClassName}(${className});
+#end
+        return ${className}Mapper.updateByPrimaryKeySelective(${className});
+    }
+
+    /**
+     * 批量删除${functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
+    {
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
+#end
+
+        return ${className}Mapper.delete(dsl -> dsl.where(${ClassName}DynamicSqlSupport.${pkColumn.javaField}, SqlBuilder.isIn(${pkColumn.javaField}s)));
+    }
+
+    /**
+     * 删除${functionName}信息
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+    {
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
+#end
+        return ${className}Mapper.delete(dsl -> dsl.where(${ClassName}DynamicSqlSupport.${pkColumn.javaField}, SqlBuilder.isEqualTo(${pkColumn.javaField})));
+    }
+#if($table.sub)
+
+    /**
+     * 新增${subTable.functionName}信息
+     * 
+     * @param ${className} ${functionName}对象
+     */
+    public void insert${subClassName}(${ClassName} ${className})
+    {
+        List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
+        ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
+        if (StringUtils.isNotNull(${subclassName}List))
+        {
+            List<${subClassName}> list = new ArrayList<${subClassName}>();
+            for (${subClassName} ${subclassName} : ${subclassName}List)
+            {
+                ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
+                list.add(${subclassName});
+            }
+            if (!list.isEmpty())
+            {
+                ${className}Mapper.batch${subClassName}(list);
+            }
+        }
+    }
+#end
+}

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm

@@ -23,7 +23,7 @@ import ${packageName}.service.I${ClassName}Service;
  * ${functionName}Service业务层处理
  * 
  * @author ${author}
- * @date ${datetime}
+ * created on ${datetime}
  */
 @Service
 public class ${ClassName}ServiceImpl implements I${ClassName}Service 
@@ -159,7 +159,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
                 ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
                 list.add(${subclassName});
             }
-            if (list.size() > 0)
+            if (!list.isEmpty())
             {
                 ${className}Mapper.batch${subClassName}(list);
             }

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/sub-domain.java.vm

@@ -12,7 +12,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * ${subTable.functionName}对象 ${subTableName}
  * 
  * @author ${author}
- * @date ${datetime}
+ * created on ${datetime}
  */
 public class ${subClassName} extends BaseEntity
 {

ruoyi-modules/ruoyi-system/src/main/resources/com/ruoyi/system/mapper/SysConfigMapper.xml

@@ -1,96 +1,105 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
-    
+
-    <resultMap type="SysConfig" id="SysConfigResult">
+    <resultMap type="com.ruoyi.system.domain.SysConfig" id="SysConfigResult">
-    	<id     property="configId"      column="config_id"      />
+        <id property="configId" column="config_id"/>
-        <result property="configName"    column="config_name"    />
+        <result property="configName" column="config_name"/>
-        <result property="configKey"     column="config_key"     />
+        <result property="configKey" column="config_key"/>
-        <result property="configValue"   column="config_value"   />
+        <result property="configValue" column="config_value"/>
-        <result property="configType"    column="config_type"    />
+        <result property="configType" column="config_type"/>
-        <result property="createBy"      column="create_by"      />
+        <result property="createBy" column="create_by"/>
-        <result property="createTime"    column="create_time"    />
+        <result property="createTime" column="create_time"/>
-        <result property="updateBy"      column="update_by"      />
+        <result property="updateBy" column="update_by"/>
-        <result property="updateTime"    column="update_time"    />
+        <result property="updateTime" column="update_time"/>
     </resultMap>
-    
+
     <sql id="selectConfigVo">
-        select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark 
+        select config_id,
-		from sys_config
+               config_name,
+               config_key,
+               config_value,
+               config_type,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from sys_config
     </sql>
-    
+
     <!-- 查询条件 -->
-	<sql id="sqlwhereSearch">
+    <sql id="sqlWhereSearch">
-		<where>
+        <where>
-			<if test="configId !=null">
+            <if test="configId !=null">
-				and config_id = #{configId}
+                and config_id = #{configId}
-			</if>
+            </if>
-			<if test="configKey !=null and configKey != ''">
+            <if test="configKey !=null and configKey != ''">
-				and config_key = #{configKey}
+                and config_key = #{configKey}
-			</if>
+            </if>
-		</where>
+        </where>
-	</sql>
+    </sql>
-    
+
-    <select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
+    <select id="selectConfig" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
-        <include refid="sqlwhereSearch"/>
+        <include refid="sqlWhereSearch"/>
     </select>
-    
+
-    <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
+    <select id="selectConfigList" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         <where>
-			<if test="configName != null and configName != ''">
+            <if test="configName != null and configName != ''">
-				AND config_name like concat('%', #{configName}, '%')
+                AND config_name like concat('%', #{configName}, '%')
-			</if>
+            </if>
-			<if test="configType != null and configType != ''">
+            <if test="configType != null and configType != ''">
-				AND config_type = #{configType}
+                AND config_type = #{configType}
-			</if>
+            </if>
-			<if test="configKey != null and configKey != ''">
+            <if test="configKey != null and configKey != ''">
-				AND config_key like concat('%', #{configKey}, '%')
+                AND config_key like concat('%', #{configKey}, '%')
-			</if>
+            </if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+                and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
+            </if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+                and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
+            </if>
-		</where>
+        </where>
     </select>
-    
+
     <select id="selectConfigById" parameterType="Long" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         where config_id = #{configId}
     </select>
-    
+
     <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         where config_key = #{configKey} limit 1
     </select>
-    
+
-    <insert id="insertConfig" parameterType="SysConfig">
+    <insert id="insertConfig" parameterType="com.ruoyi.system.domain.SysConfig">
         insert into sys_config (
-			<if test="configName != null and configName != '' ">config_name,</if>
+        <if test="configName != null and configName != '' ">config_name,</if>
-			<if test="configKey != null and configKey != '' ">config_key,</if>
+        <if test="configKey != null and configKey != '' ">config_key,</if>
-			<if test="configValue != null and configValue != '' ">config_value,</if>
+        <if test="configValue != null and configValue != '' ">config_value,</if>
-			<if test="configType != null and configType != '' ">config_type,</if>
+        <if test="configType != null and configType != '' ">config_type,</if>
-			<if test="createBy != null and createBy != ''">create_by,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
-			<if test="remark != null and remark != ''">remark,</if>
+        <if test="remark != null and remark != ''">remark,</if>
- 			create_time
+        create_time
         )values(
-			<if test="configName != null and configName != ''">#{configName},</if>
+        <if test="configName != null and configName != ''">#{configName},</if>
-			<if test="configKey != null and configKey != ''">#{configKey},</if>
+        <if test="configKey != null and configKey != ''">#{configKey},</if>
-			<if test="configValue != null and configValue != ''">#{configValue},</if>
+        <if test="configValue != null and configValue != ''">#{configValue},</if>
-			<if test="configType != null and configType != ''">#{configType},</if>
+        <if test="configType != null and configType != ''">#{configType},</if>
-			<if test="createBy != null and createBy != ''">#{createBy},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
-			<if test="remark != null and remark != ''">#{remark},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
- 			sysdate()
+        sysdate()
-		)
+        )
     </insert>
-	 
+
-    <update id="updateConfig" parameterType="SysConfig">
+    <update id="updateConfig" parameterType="com.ruoyi.system.domain.SysConfig">
-        update sys_config 
+        update sys_config
         <set>
             <if test="configName != null and configName != ''">config_name = #{configName},</if>
             <if test="configKey != null and configKey != ''">config_key = #{configKey},</if>
@@ -98,20 +107,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="configType != null and configType != ''">config_type = #{configType},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
- 			update_time = sysdate()
+            update_time = sysdate()
         </set>
         where config_id = #{configId}
     </update>
-	
+
     <delete id="deleteConfigById" parameterType="Long">
-        delete from sys_config where config_id = #{configId}
+        delete
+        from sys_config
+        where config_id = #{configId}
     </delete>
-    
+
     <delete id="deleteConfigByIds" parameterType="Long">
-        delete from sys_config where config_id in 
+        delete from sys_config where config_id in
         <foreach item="configId" collection="array" open="(" separator="," close=")">
-        	#{configId}
+            #{configId}
         </foreach>
     </delete>
-    
+
 </mapper>

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/UnitInfoController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.wms.controller;
+
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.wms.domain.UnitInfo;
+import com.ruoyi.wms.service.IUnitInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 单位信息管理Controller
+ * 
+ * @author ruoyi
+ * created on 2024-02-02
+ */
+@RestController
+@RequestMapping("/UnitInfo")
+public class UnitInfoController extends BaseController
+{
+    @Autowired
+    private IUnitInfoService unitInfoService;
+
+    /**
+     * 查询单位信息管理列表
+     */
+    @RequiresPermissions("wms:UnitInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo list(UnitInfo unitInfo)
+    {
+        startPage();
+        List<UnitInfo> list = unitInfoService.selectUnitInfoList(unitInfo);
+        return getDataTable(list);
+    }
+
+    //TODO 如果要启用导出功能，需要在domain实体类的字段上添加注解：@com.ruoyi.common.core.annotation.Excel(name = "字段名")
+    /*
+     * 导出单位信息管理列表
+     */
+//    @RequiresPermissions("wms:UnitInfo:export")
+//    @Log(title = "单位信息管理", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, UnitInfo unitInfo)
+//    {
+//        List<UnitInfo> list = unitInfoService.selectUnitInfoList(unitInfo);
+//        ExcelUtil<UnitInfo> util = new ExcelUtil<>(UnitInfo.class);
+//        util.exportExcel(response, list, "单位信息管理数据");
+//    }
+
+    /**
+     * 获取单位信息管理详细信息
+     */
+    @RequiresPermissions("wms:UnitInfo:query")
+    @GetMapping(value = "/{orgCd}")
+    public AjaxResult getInfo(@PathVariable("orgCd") String orgCd)
+    {
+        return success(unitInfoService.selectUnitInfoByOrgCd(orgCd));
+    }
+
+    /**
+     * 新增单位信息管理
+     */
+    @RequiresPermissions("wms:UnitInfo:add")
+    @Log(title = "单位信息管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UnitInfo unitInfo)
+    {
+        return toAjax(unitInfoService.insertUnitInfo(unitInfo));
+    }
+
+    /**
+     * 修改单位信息管理
+     */
+    @RequiresPermissions("wms:UnitInfo:edit")
+    @Log(title = "单位信息管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UnitInfo unitInfo)
+    {
+        return toAjax(unitInfoService.updateUnitInfo(unitInfo));
+    }
+
+    /**
+     * 删除单位信息管理
+     */
+    @RequiresPermissions("wms:UnitInfo:remove")
+    @Log(title = "单位信息管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{orgCds}")
+    public AjaxResult remove(@PathVariable String[] orgCds)
+    {
+        return toAjax(unitInfoService.deleteUnitInfoByOrgCds(orgCds));
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/UnitInfoMapper.java

@@ -1,18 +1,8 @@
 package com.ruoyi.wms.mapper;
 
-import static com.ruoyi.wms.mapper.UnitInfoDynamicSqlSupport.*;
-import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
-
 import com.ruoyi.wms.domain.UnitInfo;
 import jakarta.annotation.Generated;
-import java.util.Collection;
+import org.apache.ibatis.annotations.*;
-import java.util.List;
-import java.util.Optional;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Result;
-import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.type.JdbcType;
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
@@ -23,11 +13,14 @@ import org.mybatis.dynamic.sql.update.UpdateDSL;
 import org.mybatis.dynamic.sql.update.UpdateDSLCompleter;
 import org.mybatis.dynamic.sql.update.UpdateModel;
 import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
-import org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.*;
-import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper;
+
-import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;
+import java.util.Collection;
-import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper;
+import java.util.List;
-import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
+import java.util.Optional;
+
+import static com.ruoyi.wms.mapper.UnitInfoDynamicSqlSupport.*;
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
 
 @Mapper
 public interface UnitInfoMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper<UnitInfo>, CommonUpdateMapper {

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IUnitInfoService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.wms.service;
+
+import com.ruoyi.wms.domain.UnitInfo;
+
+import java.util.List;
+
+/**
+ * 单位信息管理Service接口
+ *
+ * @author ruoyi
+ * created on 2024-02-02
+ */
+public interface IUnitInfoService {
+    /**
+     * 查询单位信息管理
+     *
+     * @param orgCd 单位信息管理主键
+     * @return 单位信息管理
+     */
+        UnitInfo selectUnitInfoByOrgCd(String orgCd);
+
+    /**
+     * 查询单位信息管理列表
+     *
+     * @param unitInfo 单位信息管理
+     * @return 单位信息管理集合
+     */
+    List<UnitInfo> selectUnitInfoList(UnitInfo unitInfo);
+
+    /**
+     * 新增单位信息管理
+     *
+     * @param unitInfo 单位信息管理
+     * @return 结果
+     */
+    int insertUnitInfo(UnitInfo unitInfo);
+
+    /**
+     * 修改单位信息管理
+     *
+     * @param unitInfo 单位信息管理
+     * @return 结果
+     */
+    int updateUnitInfo(UnitInfo unitInfo);
+
+    /**
+     * 批量删除单位信息管理
+     *
+     * @param orgCds 需要删除的单位信息管理主键集合
+     * @return 结果
+     */
+    int deleteUnitInfoByOrgCds(String[] orgCds);
+
+    /**
+     * 删除单位信息管理信息
+     *
+     * @param orgCd 单位信息管理主键
+     * @return 结果
+     */
+    int deleteUnitInfoByOrgCd(String orgCd);
+}

ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/UnitInfoServiceImpl.java

@@ -0,0 +1,113 @@
+package com.ruoyi.wms.service.impl;
+
+import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.wms.domain.UnitInfo;
+import com.ruoyi.wms.mapper.UnitInfoDynamicSqlSupport;
+import com.ruoyi.wms.mapper.UnitInfoMapper;
+import com.ruoyi.wms.service.IUnitInfoService;
+import org.mybatis.dynamic.sql.SqlBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 单位信息管理Service业务层处理
+ *
+ * @author ruoyi
+ * created on 2024-02-02
+ */
+@Service
+public class UnitInfoServiceImpl implements IUnitInfoService {
+    @Autowired
+    private UnitInfoMapper unitInfoMapper;
+
+    /**
+     * 查询单位信息管理
+     *
+     * @param orgCd 单位信息管理主键
+     * @return 单位信息管理
+     */
+    @Override
+    public UnitInfo selectUnitInfoByOrgCd(String orgCd) {
+        Optional<UnitInfo> result = unitInfoMapper.selectOne(dsl -> dsl.where(UnitInfoDynamicSqlSupport.orgCd, SqlBuilder.isEqualTo(orgCd)));
+        return result.orElse(null);
+    }
+
+    /**
+     * 查询单位信息管理列表
+     *
+     * @param unitInfo 单位信息管理
+     * @return 单位信息管理
+     */
+    @Override
+    public List<UnitInfo> selectUnitInfoList(UnitInfo unitInfo) {
+        return unitInfoMapper.select(dsl -> dsl
+                .where(UnitInfoDynamicSqlSupport.orgCd, SqlBuilder.isEqualToWhenPresent(unitInfo.getOrgCd()))
+                .and(UnitInfoDynamicSqlSupport.unit, SqlBuilder.isEqualToWhenPresent(unitInfo.getUnit()))
+                .and(UnitInfoDynamicSqlSupport.unitName, SqlBuilder.isEqualToWhenPresent(unitInfo.getUnitName()))
+                .and(UnitInfoDynamicSqlSupport.unitConvRate, SqlBuilder.isEqualToWhenPresent(unitInfo.getUnitConvRate()))
+                .and(UnitInfoDynamicSqlSupport.srcConvUnit, SqlBuilder.isEqualToWhenPresent(unitInfo.getSrcConvUnit()))
+                .and(UnitInfoDynamicSqlSupport.remark1, SqlBuilder.isEqualToWhenPresent(unitInfo.getRemark1()))
+                .and(UnitInfoDynamicSqlSupport.remark2, SqlBuilder.isEqualToWhenPresent(unitInfo.getRemark2()))
+                .and(UnitInfoDynamicSqlSupport.remark3, SqlBuilder.isEqualToWhenPresent(unitInfo.getRemark3()))
+                .and(UnitInfoDynamicSqlSupport.remark4, SqlBuilder.isEqualToWhenPresent(unitInfo.getRemark4()))
+                .and(UnitInfoDynamicSqlSupport.remark5, SqlBuilder.isEqualToWhenPresent(unitInfo.getRemark5()))
+                .and(UnitInfoDynamicSqlSupport.updateCount, SqlBuilder.isEqualToWhenPresent(unitInfo.getUpdateCount()))
+                .and(UnitInfoDynamicSqlSupport.deleteFlag, SqlBuilder.isEqualToWhenPresent(unitInfo.getDeleteFlag()))
+                .and(UnitInfoDynamicSqlSupport.createBy, SqlBuilder.isEqualToWhenPresent(unitInfo.getCreateBy()))
+                .and(UnitInfoDynamicSqlSupport.createTime, SqlBuilder.isEqualToWhenPresent(unitInfo.getCreateTime()))
+                .and(UnitInfoDynamicSqlSupport.updateBy, SqlBuilder.isEqualToWhenPresent(unitInfo.getUpdateBy()))
+                .and(UnitInfoDynamicSqlSupport.updateTime, SqlBuilder.isEqualToWhenPresent(unitInfo.getUpdateTime()))
+                .and(UnitInfoDynamicSqlSupport.remark, SqlBuilder.isEqualToWhenPresent(unitInfo.getRemark()))
+        );
+    }
+
+    /**
+     * 新增单位信息管理
+     *
+     * @param unitInfo 单位信息管理
+     * @return 结果
+     */
+    @Override
+    public int insertUnitInfo(UnitInfo unitInfo) {
+        unitInfo.setCreateTime(DateUtils.getNowDate());
+        return unitInfoMapper.insertSelective(unitInfo);
+    }
+
+    /**
+     * 修改单位信息管理
+     *
+     * @param unitInfo 单位信息管理
+     * @return 结果
+     */
+    @Override
+    public int updateUnitInfo(UnitInfo unitInfo) {
+        unitInfo.setUpdateTime(DateUtils.getNowDate());
+        return unitInfoMapper.updateByPrimaryKeySelective(unitInfo);
+    }
+
+    /**
+     * 批量删除单位信息管理
+     *
+     * @param orgCds 需要删除的单位信息管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUnitInfoByOrgCds(String[] orgCds) {
+
+        return unitInfoMapper.delete(dsl -> dsl.where(UnitInfoDynamicSqlSupport.orgCd, SqlBuilder.isIn(orgCds)));
+    }
+
+    /**
+     * 删除单位信息管理信息
+     *
+     * @param orgCd 单位信息管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUnitInfoByOrgCd(String orgCd) {
+        return unitInfoMapper.delete(dsl -> dsl.where(UnitInfoDynamicSqlSupport.orgCd, SqlBuilder.isEqualTo(orgCd)));
+    }
+}

ruoyi-ui/src/api/tool/gen.js

@@ -70,7 +70,7 @@ export function genCode(tableName) {
 // 同步数据库
 export function synchDb(tableName) {
   return request({
-    url: '/code/gen/synchDb/' + tableName,
+    url: '/code/gen/syncDb/' + tableName,
     method: 'get'
   })
 }

ruoyi-ui/src/views/tool/build/index.vue

@@ -1,3 +1,3 @@
 <template>
-   <div> 表单构建 <svg-icon icon-class="build" /> </div>
+   <div> 表单构建 (此功能未开发) <svg-icon icon-class="build" /> </div>
 </template>

ruoyi-ui/src/views/tool/gen/genInfoForm.vue

@@ -22,6 +22,16 @@
         </el-form-item>
       </el-col>
 
+      <el-col :span="12">
+        <el-form-item prop="tplWebType">
+          <template #label>后端类型</template>
+          <el-select v-model="info.tplBackendType">
+            <el-option label="常规模式" value="normal" />
+            <el-option label="MyBatis动态SQL支持" value="mybatis-dynamic" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+
       <el-col :span="12">
         <el-form-item prop="packageName">
           <template #label>
@@ -293,5 +303,11 @@ watch(() => props.info.tplWebType, val => {
   }
 });
 
+watch(() => props.info.tplBackendType, val => {
+  if (val === '') {
+    props.info.tplBackendType = "normal";
+  }
+});
+
 getMenuTreeselect();
 </script>

ruoyi-ui/src/views/tool/gen/index.vue

@@ -222,7 +222,7 @@ function handleGenTable(row) {
       proxy.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
     });
   } else {
-    proxy.$download.zip("/code/gen/batchGenCode?tables=" + tbNames, "ruoyi.zip");
+    proxy.$download.zip("/code/gen/batchGenCode?tables=" + tbNames, "generatedCodes.zip");
   }
 }
 /** 同步数据库操作 */

sql/ry-cloud-ryas.sql

@@ -11,12 +11,41 @@
  Target Server Version : 80200 (8.2.0)
  File Encoding         : 65001
 
- Date: 31/01/2024 15:40:13
+ Date: 02/02/2024 18:45:15
 */
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
+-- ----------------------------
+-- Table structure for SF_WMS_M_UNIT_INFO
+-- ----------------------------
+DROP TABLE IF EXISTS `SF_WMS_M_UNIT_INFO`;
+CREATE TABLE `SF_WMS_M_UNIT_INFO`  (
+  `ORG_CD` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `UNIT` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `UNIT_NAME` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `UNIT_CONV_RATE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `SRC_CONV_UNIT` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `REMARK_1` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+  `REMARK_2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+  `REMARK_3` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+  `REMARK_4` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+  `REMARK_5` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+  `UPDATE_COUNT` int NOT NULL DEFAULT 0,
+  `DELETE_FLAG` int NOT NULL DEFAULT 0,
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`ORG_CD`, `UNIT`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of SF_WMS_M_UNIT_INFO
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for gen_table
 -- ----------------------------
@@ -30,6 +59,7 @@ CREATE TABLE `gen_table`  (
   `class_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '实体类名称',
   `tpl_category` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT 'crud' COMMENT '使用的模板（crud单表操作 tree树表操作）',
   `tpl_web_type` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '前端模板类型（element-ui模版 element-plus模版）',
+  `tpl_backend_type` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '后端模板类型（MyBaitsDynamicSQL模板，常规模板）',
   `package_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '生成包路径',
   `module_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '生成模块名',
   `business_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '生成业务名',
@@ -44,12 +74,12 @@ CREATE TABLE `gen_table`  (
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`table_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of gen_table
 -- ----------------------------
-INSERT INTO `gen_table` VALUES (1, 'sys_user', '用户信息表', NULL, NULL, 'SysUser', 'crud', '', 'com.ruoyi.system', 'system', 'user', '用户信息', 'ruoyi', '0', '/', NULL, 'admin', '2024-01-31 07:06:17', '', NULL, NULL);
+INSERT INTO `gen_table` VALUES (5, 'SF_WMS_M_UNIT_INFO', '单位信息', NULL, NULL, 'UnitInfo', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.wms', 'wms', 'wms', '单位信息管理', 'ruoyi', '0', '/', '{\"parentMenuId\":2000}', 'admin', '2024-02-02 10:40:41', '', '2024-02-02 10:42:03', NULL);
 
 -- ----------------------------
 -- Table structure for gen_table_column
@@ -79,30 +109,50 @@ CREATE TABLE `gen_table_column`  (
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '更新者',
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`column_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表字段' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 88 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表字段' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of gen_table_column
 -- ----------------------------
-INSERT INTO `gen_table_column` VALUES (1, 1, 'user_id', '用户ID', 'bigint', 'Long', 'userId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (71, 5, 'ORG_CD', NULL, 'varchar(25)', 'String', 'orgCd', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:03');
-INSERT INTO `gen_table_column` VALUES (2, 1, 'dept_id', '部门ID', 'bigint', 'Long', 'deptId', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 2, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (72, 5, 'UNIT', NULL, 'varchar(25)', 'String', 'unit', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 2, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (3, 1, 'user_name', '用户账号', 'varchar(30)', 'String', 'userName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (73, 5, 'UNIT_NAME', NULL, 'varchar(10)', 'String', 'unitName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (4, 1, 'nick_name', '用户昵称', 'varchar(30)', 'String', 'nickName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 4, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (74, 5, 'UNIT_CONV_RATE', NULL, 'varchar(100)', 'String', 'unitConvRate', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 4, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (5, 1, 'user_type', '用户类型（00系统用户）', 'varchar(2)', 'String', 'userType', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'select', '', 5, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (75, 5, 'SRC_CONV_UNIT', NULL, 'varchar(25)', 'String', 'srcConvUnit', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 5, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (6, 1, 'email', '用户邮箱', 'varchar(50)', 'String', 'email', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 6, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (76, 5, 'REMARK_1', NULL, 'varchar(100)', 'String', 'remark1', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 6, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (7, 1, 'phonenumber', '手机号码', 'varchar(11)', 'String', 'phonenumber', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 7, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (77, 5, 'REMARK_2', NULL, 'varchar(100)', 'String', 'remark2', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 7, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (8, 1, 'sex', '用户性别（0男 1女 2未知）', 'char(1)', 'String', 'sex', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'select', '', 8, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (78, 5, 'REMARK_3', NULL, 'varchar(100)', 'String', 'remark3', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 8, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (9, 1, 'avatar', '头像地址', 'varchar(100)', 'String', 'avatar', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 9, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (79, 5, 'REMARK_4', NULL, 'varchar(100)', 'String', 'remark4', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 9, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (10, 1, 'password', '密码', 'varchar(100)', 'String', 'password', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 10, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (80, 5, 'REMARK_5', NULL, 'varchar(100)', 'String', 'remark5', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 10, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (11, 1, 'status', '帐号状态（0正常 1停用）', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 11, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (81, 5, 'UPDATE_COUNT', NULL, 'int', 'Long', 'updateCount', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 11, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (12, 1, 'del_flag', '删除标志（0代表存在 2代表删除）', 'char(1)', 'String', 'delFlag', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 12, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (82, 5, 'DELETE_FLAG', NULL, 'int', 'Long', 'deleteFlag', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 12, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (13, 1, 'login_ip', '最后登录IP', 'varchar(128)', 'String', 'loginIp', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 13, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (83, 5, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 13, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (14, 1, 'login_date', '最后登录时间', 'datetime', 'Date', 'loginDate', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'datetime', '', 14, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (84, 5, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 14, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (15, 1, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 15, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (85, 5, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 15, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (16, 1, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 16, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (86, 5, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 16, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (17, 1, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 17, 'admin', '2024-01-31 07:06:17', '', NULL);
+INSERT INTO `gen_table_column` VALUES (87, 5, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'textarea', '', 17, 'admin', '2024-02-02 10:40:42', '', '2024-02-02 10:42:04');
-INSERT INTO `gen_table_column` VALUES (18, 1, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 18, 'admin', '2024-01-31 07:06:17', '', NULL);
+
-INSERT INTO `gen_table_column` VALUES (19, 1, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'textarea', '', 19, 'admin', '2024-01-31 07:06:17', '', NULL);
+-- ----------------------------
+-- Table structure for sys_common
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_common`;
+CREATE TABLE `sys_common`  (
+  `config_id` int NOT NULL AUTO_INCREMENT COMMENT '参数主键',
+  `config_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '参数名称',
+  `config_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '参数键名',
+  `config_value` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '参数键值',
+  `config_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT 'N' COMMENT '系统内置（Y是 N否）',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`config_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '参数配置表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_common
+-- ----------------------------
 
 -- ----------------------------
 -- Table structure for sys_config
@@ -278,7 +328,7 @@ CREATE TABLE `sys_job`  (
 -- ----------------------------
 -- Records of sys_job
 -- ----------------------------
-INSERT INTO `sys_job` VALUES (1, '系统默认（无参）', 'DEFAULT', 'ryTask.ryNoParams', '0/10 * * * * ?', '3', '1', '1', 'admin', '2024-01-30 05:05:41', '', NULL, '');
+INSERT INTO `sys_job` VALUES (1, '系统默认（无参）', 'DEFAULT', 'ryTask.ryNoParams', '0/10 * * * * ?', '3', '1', '1', 'admin', '2024-01-30 05:05:41', 'admin', '2024-01-31 09:19:48', '');
 INSERT INTO `sys_job` VALUES (2, '系统默认（有参）', 'DEFAULT', 'ryTask.ryParams(\'ry\')', '0/15 * * * * ?', '3', '1', '1', 'admin', '2024-01-30 05:05:41', '', NULL, '');
 INSERT INTO `sys_job` VALUES (3, '系统默认（多参）', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)', '0/20 * * * * ?', '3', '1', '1', 'admin', '2024-01-30 05:05:41', '', NULL, '');
 
@@ -296,7 +346,7 @@ CREATE TABLE `sys_job_log`  (
   `exception_info` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '异常信息',
   `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`job_log_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '定时任务调度日志表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '定时任务调度日志表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_job_log
@@ -316,7 +366,7 @@ CREATE TABLE `sys_logininfor`  (
   PRIMARY KEY (`info_id`) USING BTREE,
   INDEX `idx_sys_logininfor_s`(`status` ASC) USING BTREE,
   INDEX `idx_sys_logininfor_lt`(`access_time` ASC) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 105 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统访问记录' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 120 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统访问记录' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_logininfor
@@ -326,6 +376,21 @@ INSERT INTO `sys_logininfor` VALUES (101, 'admin', '127.0.0.1', '0', '登录成
 INSERT INTO `sys_logininfor` VALUES (102, 'admin', '127.0.0.1', '0', '登录成功', '2024-01-31 06:02:52');
 INSERT INTO `sys_logininfor` VALUES (103, 'admin', '127.0.0.1', '0', '登录成功', '2024-01-31 06:06:25');
 INSERT INTO `sys_logininfor` VALUES (104, 'admin', '127.0.0.1', '0', '登录成功', '2024-01-31 06:12:41');
+INSERT INTO `sys_logininfor` VALUES (105, 'admin', '127.0.0.1', '0', '退出成功', '2024-01-31 09:18:53');
+INSERT INTO `sys_logininfor` VALUES (106, 'admin', '127.0.0.1', '0', '登录成功', '2024-01-31 09:19:02');
+INSERT INTO `sys_logininfor` VALUES (107, 'admin', '127.0.0.1', '0', '退出成功', '2024-01-31 09:47:21');
+INSERT INTO `sys_logininfor` VALUES (108, 'admin', '127.0.0.1', '0', '登录成功', '2024-01-31 09:47:30');
+INSERT INTO `sys_logininfor` VALUES (109, 'admin', '127.0.0.1', '0', '退出成功', '2024-01-31 09:47:39');
+INSERT INTO `sys_logininfor` VALUES (110, 'admin', '127.0.0.1', '0', '登录成功', '2024-02-01 06:39:26');
+INSERT INTO `sys_logininfor` VALUES (111, 'admin', '127.0.0.1', '0', '退出成功', '2024-02-01 08:07:08');
+INSERT INTO `sys_logininfor` VALUES (112, 'admin', '127.0.0.1', '0', '登录成功', '2024-02-01 08:07:23');
+INSERT INTO `sys_logininfor` VALUES (113, 'admin', '127.0.0.1', '0', '退出成功', '2024-02-01 08:07:29');
+INSERT INTO `sys_logininfor` VALUES (114, 'admin', '127.0.0.1', '0', '登录成功', '2024-02-01 08:07:49');
+INSERT INTO `sys_logininfor` VALUES (115, 'admin', '127.0.0.1', '0', '退出成功', '2024-02-01 08:08:54');
+INSERT INTO `sys_logininfor` VALUES (116, 'admin', '127.0.0.1', '0', '登录成功', '2024-02-01 08:32:24');
+INSERT INTO `sys_logininfor` VALUES (117, 'admin', '127.0.0.1', '0', '登录成功', '2024-02-01 08:39:20');
+INSERT INTO `sys_logininfor` VALUES (118, 'admin', '127.0.0.1', '0', '退出成功', '2024-02-01 08:45:48');
+INSERT INTO `sys_logininfor` VALUES (119, 'admin', '127.0.0.1', '0', '登录成功', '2024-02-02 06:47:11');
 
 -- ----------------------------
 -- Table structure for sys_menu
@@ -352,14 +417,14 @@ CREATE TABLE `sys_menu`  (
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '备注',
   PRIMARY KEY (`menu_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2000 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '菜单权限表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 2001 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '菜单权限表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_menu
 -- ----------------------------
-INSERT INTO `sys_menu` VALUES (1, '系统管理', 0, 1, 'system', NULL, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', '2024-01-30 05:05:40', '', NULL, '系统管理目录');
+INSERT INTO `sys_menu` VALUES (1, '系统管理', 0, 100, 'system', NULL, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', '2024-01-30 05:05:40', 'admin', '2024-02-02 09:13:20', '系统管理目录');
-INSERT INTO `sys_menu` VALUES (2, '系统监控', 0, 2, 'monitor', NULL, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', '2024-01-30 05:05:40', '', NULL, '系统监控目录');
+INSERT INTO `sys_menu` VALUES (2, '系统监控', 0, 200, 'monitor', NULL, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', '2024-01-30 05:05:40', 'admin', '2024-02-02 09:13:26', '系统监控目录');
-INSERT INTO `sys_menu` VALUES (3, '系统工具', 0, 3, 'tool', NULL, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', '2024-01-30 05:05:40', '', NULL, '系统工具目录');
+INSERT INTO `sys_menu` VALUES (3, '系统工具', 0, 300, 'tool', NULL, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', '2024-01-30 05:05:40', 'admin', '2024-02-02 09:13:31', '系统工具目录');
 INSERT INTO `sys_menu` VALUES (100, '用户管理', 1, 1, 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', '2024-01-30 05:05:40', '', NULL, '用户管理菜单');
 INSERT INTO `sys_menu` VALUES (101, '角色管理', 1, 2, 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', '2024-01-30 05:05:40', '', NULL, '角色管理菜单');
 INSERT INTO `sys_menu` VALUES (102, '菜单管理', 1, 3, 'menu', 'system/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 'admin', '2024-01-30 05:05:40', '', NULL, '菜单管理菜单');
@@ -440,6 +505,7 @@ INSERT INTO `sys_menu` VALUES (1057, '生成删除', 115, 3, '#', '', '', 1, 0,
 INSERT INTO `sys_menu` VALUES (1058, '导入代码', 115, 2, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 'admin', '2024-01-30 05:05:40', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (1059, '预览代码', 115, 4, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 'admin', '2024-01-30 05:05:40', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (1060, '生成代码', 115, 5, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 'admin', '2024-01-30 05:05:40', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2000, '基础信息', 0, 20, 'masterData', NULL, NULL, 1, 0, 'M', '0', '0', '', 'dict', 'admin', '2024-02-02 09:13:06', 'admin', '2024-02-02 09:13:43', '');
 
 -- ----------------------------
 -- Table structure for sys_notice
@@ -491,7 +557,7 @@ CREATE TABLE `sys_oper_log`  (
   INDEX `idx_sys_oper_log_bt`(`business_type` ASC) USING BTREE,
   INDEX `idx_sys_oper_log_s`(`status` ASC) USING BTREE,
   INDEX `idx_sys_oper_log_ot`(`oper_time` ASC) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 111 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '操作日志记录' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 142 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '操作日志记录' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_oper_log
@@ -507,6 +573,37 @@ INSERT INTO `sys_oper_log` VALUES (107, '代码生成', 8, 'com.ruoyi.gen.contro
 INSERT INTO `sys_oper_log` VALUES (108, '在线用户', 7, 'com.ruoyi.system.controller.SysUserOnlineController.forceLogout()', 'DELETE', 1, 'admin', NULL, '/online/c4162f46-426e-4a0c-89f7-c22833733e6a', '127.0.0.1', '', '{}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 07:29:30', 5);
 INSERT INTO `sys_oper_log` VALUES (109, '在线用户', 7, 'com.ruoyi.system.controller.SysUserOnlineController.forceLogout()', 'DELETE', 1, 'admin', NULL, '/online/23d1b863-75c6-4fde-bb75-dbc0c60edb90', '127.0.0.1', '', '{}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 07:29:33', 1);
 INSERT INTO `sys_oper_log` VALUES (110, '在线用户', 7, 'com.ruoyi.system.controller.SysUserOnlineController.forceLogout()', 'DELETE', 1, 'admin', NULL, '/online/40f17282-b982-4954-825f-bffb9c28edd0', '127.0.0.1', '', '{}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 07:29:45', 1);
+INSERT INTO `sys_oper_log` VALUES (111, '定时任务', 2, 'com.ruoyi.job.controller.SysJobController.edit()', 'PUT', 1, 'admin', NULL, '/job', '127.0.0.1', '', '{\"concurrent\":\"1\",\"createBy\":\"admin\",\"createTime\":\"2024-01-30 05:05:41\",\"cronExpression\":\"0/10 * * * * ?\",\"invokeTarget\":\"ryTask.ryNoParams\",\"jobGroup\":\"DEFAULT\",\"jobId\":1,\"jobName\":\"系统默认（无参）1\",\"misfirePolicy\":\"3\",\"nextValidTime\":\"2024-01-31 17:19:50\",\"params\":{},\"remark\":\"\",\"status\":\"1\",\"updateBy\":\"admin\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-01-31 09:19:48', 259);
+INSERT INTO `sys_oper_log` VALUES (112, '代码生成', 3, 'com.ruoyi.gen.controller.GenController.remove()', 'DELETE', 1, 'admin', NULL, '/gen/1', '127.0.0.1', '', '{}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 06:47:31', 337);
+INSERT INTO `sys_oper_log` VALUES (113, '代码生成', 6, 'com.ruoyi.gen.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/gen/importTable', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 06:49:28', 1660);
+INSERT INTO `sys_oper_log` VALUES (114, '代码生成', 2, 'com.ruoyi.gen.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/gen', '127.0.0.1', '', '{\"businessName\":\"UnitInfo\",\"className\":\"UnitInfo\",\"columns\":[{\"capJavaField\":\"OrgCd\",\"columnId\":20,\"columnName\":\"ORG_CD\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"orgCd\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":1,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"UNIT\",\"columnId\":21,\"columnName\":\"UNIT\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"UNIT\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":2,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"UnitName\",\"columnId\":22,\"columnName\":\"UNIT_NAME\",\"columnType\":\"varchar(10)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitName\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"LIKE\",\"required\":true,\"sort\":3,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"UnitConvRate\",\"columnId\":23,\"columnName\":\"UNIT_CONV_RATE\",\"columnType\":\"varchar(100)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitConvRate\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"EQ\",\"required\":true,\"sort\":4,\"superColumn\":fal', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 06:51:22', 2374);
+INSERT INTO `sys_oper_log` VALUES (115, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 06:51:58', 432);
+INSERT INTO `sys_oper_log` VALUES (116, '代码生成', 2, 'com.ruoyi.gen.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/gen', '127.0.0.1', '', '{\"businessName\":\"UnitInfo\",\"className\":\"UnitInfo\",\"columns\":[{\"capJavaField\":\"OrgCd\",\"columnId\":20,\"columnName\":\"ORG_CD\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"orgCd\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":1,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"updateTime\":\"2024-02-02 06:51:20\",\"usableColumn\":false},{\"capJavaField\":\"UNIT\",\"columnId\":21,\"columnName\":\"UNIT\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"UNIT\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":2,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"updateTime\":\"2024-02-02 06:51:20\",\"usableColumn\":false},{\"capJavaField\":\"UnitName\",\"columnId\":22,\"columnName\":\"UNIT_NAME\",\"columnType\":\"varchar(10)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitName\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"LIKE\",\"required\":true,\"sort\":3,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"updateTime\":\"2024-02-02 06:51:20\",\"usableColumn\":false},{\"capJavaField\":\"UnitConvRate\",\"columnId\":23,\"columnName\":\"UNIT_CONV_RATE\",\"columnType\":\"varchar(100)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitConvRate\",\"javaType\":\"String\",\"l', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 08:40:19', 1198);
+INSERT INTO `sys_oper_log` VALUES (117, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 08:40:32', 351);
+INSERT INTO `sys_oper_log` VALUES (118, '菜单管理', 1, 'com.ruoyi.system.controller.SysMenuController.add()', 'POST', 1, 'admin', NULL, '/menu', '127.0.0.1', '', '{\"children\":[],\"createBy\":\"admin\",\"icon\":\"dict\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuName\":\"基础信息\",\"menuType\":\"M\",\"orderNum\":100,\"params\":{},\"parentId\":0,\"path\":\"masterData\",\"status\":\"0\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 09:13:06', 91);
+INSERT INTO `sys_oper_log` VALUES (119, '菜单管理', 2, 'com.ruoyi.system.controller.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/menu', '127.0.0.1', '', '{\"children\":[],\"createTime\":\"2024-01-30 05:05:40\",\"icon\":\"system\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":1,\"menuName\":\"系统管理\",\"menuType\":\"M\",\"orderNum\":100,\"params\":{},\"parentId\":0,\"path\":\"system\",\"perms\":\"\",\"query\":\"\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 09:13:20', 94);
+INSERT INTO `sys_oper_log` VALUES (120, '菜单管理', 2, 'com.ruoyi.system.controller.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/menu', '127.0.0.1', '', '{\"children\":[],\"createTime\":\"2024-01-30 05:05:40\",\"icon\":\"monitor\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":2,\"menuName\":\"系统监控\",\"menuType\":\"M\",\"orderNum\":200,\"params\":{},\"parentId\":0,\"path\":\"monitor\",\"perms\":\"\",\"query\":\"\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 09:13:26', 111);
+INSERT INTO `sys_oper_log` VALUES (121, '菜单管理', 2, 'com.ruoyi.system.controller.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/menu', '127.0.0.1', '', '{\"children\":[],\"createTime\":\"2024-01-30 05:05:40\",\"icon\":\"tool\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":3,\"menuName\":\"系统工具\",\"menuType\":\"M\",\"orderNum\":300,\"params\":{},\"parentId\":0,\"path\":\"tool\",\"perms\":\"\",\"query\":\"\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 09:13:31', 71);
+INSERT INTO `sys_oper_log` VALUES (122, '菜单管理', 2, 'com.ruoyi.system.controller.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/menu', '127.0.0.1', '', '{\"children\":[],\"createTime\":\"2024-02-02 09:13:06\",\"icon\":\"dict\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":2000,\"menuName\":\"基础信息\",\"menuType\":\"M\",\"orderNum\":20,\"params\":{},\"parentId\":0,\"path\":\"masterData\",\"perms\":\"\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 09:13:43', 109);
+INSERT INTO `sys_oper_log` VALUES (123, '代码生成', 2, 'com.ruoyi.gen.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/gen', '127.0.0.1', '', '{\"businessName\":\"UnitInfo\",\"className\":\"UnitInfo\",\"columns\":[{\"capJavaField\":\"OrgCd\",\"columnId\":20,\"columnName\":\"ORG_CD\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"orgCd\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":1,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"updateTime\":\"2024-02-02 08:40:18\",\"usableColumn\":false},{\"capJavaField\":\"UNIT\",\"columnId\":21,\"columnName\":\"UNIT\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"UNIT\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":2,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"updateTime\":\"2024-02-02 08:40:18\",\"usableColumn\":false},{\"capJavaField\":\"UnitName\",\"columnId\":22,\"columnName\":\"UNIT_NAME\",\"columnType\":\"varchar(10)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitName\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"LIKE\",\"required\":true,\"sort\":3,\"superColumn\":false,\"tableId\":2,\"updateBy\":\"\",\"updateTime\":\"2024-02-02 08:40:18\",\"usableColumn\":false},{\"capJavaField\":\"UnitConvRate\",\"columnId\":23,\"columnName\":\"UNIT_CONV_RATE\",\"columnType\":\"varchar(100)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 06:49:26\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitConvRate\",\"javaType\":\"String\",\"l', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 09:14:12', 1291);
+INSERT INTO `sys_oper_log` VALUES (124, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 09:14:17', 252);
+INSERT INTO `sys_oper_log` VALUES (125, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 09:14:41', 110);
+INSERT INTO `sys_oper_log` VALUES (126, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 09:16:58', 966);
+INSERT INTO `sys_oper_log` VALUES (127, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 09:47:06', 68678);
+INSERT INTO `sys_oper_log` VALUES (128, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:22:38', 1125);
+INSERT INTO `sys_oper_log` VALUES (129, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:24:13', 13105);
+INSERT INTO `sys_oper_log` VALUES (130, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:25:48', 368);
+INSERT INTO `sys_oper_log` VALUES (131, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:28:38', 742);
+INSERT INTO `sys_oper_log` VALUES (132, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:31:51', 675);
+INSERT INTO `sys_oper_log` VALUES (133, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:34:29', 104);
+INSERT INTO `sys_oper_log` VALUES (134, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:35:10', 678);
+INSERT INTO `sys_oper_log` VALUES (135, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:37:33', 23652);
+INSERT INTO `sys_oper_log` VALUES (136, '代码生成', 3, 'com.ruoyi.gen.controller.GenController.remove()', 'DELETE', 1, 'admin', NULL, '/gen/2', '127.0.0.1', '', '{}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 10:38:07', 214);
+INSERT INTO `sys_oper_log` VALUES (137, '代码生成', 6, 'com.ruoyi.gen.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/gen/importTable', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 10:38:50', 30902);
+INSERT INTO `sys_oper_log` VALUES (138, '代码生成', 6, 'com.ruoyi.gen.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/gen/importTable', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 10:39:44', 25132);
+INSERT INTO `sys_oper_log` VALUES (139, '代码生成', 6, 'com.ruoyi.gen.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/gen/importTable', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 10:40:42', 847);
+INSERT INTO `sys_oper_log` VALUES (140, '代码生成', 2, 'com.ruoyi.gen.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/gen', '127.0.0.1', '', '{\"businessName\":\"wms\",\"className\":\"UnitInfo\",\"columns\":[{\"capJavaField\":\"OrgCd\",\"columnId\":71,\"columnName\":\"ORG_CD\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 10:40:42\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"orgCd\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":1,\"superColumn\":false,\"tableId\":5,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"Unit\",\"columnId\":72,\"columnName\":\"UNIT\",\"columnType\":\"varchar(25)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 10:40:42\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"unit\",\"javaType\":\"String\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":2,\"superColumn\":false,\"tableId\":5,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"UnitName\",\"columnId\":73,\"columnName\":\"UNIT_NAME\",\"columnType\":\"varchar(10)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 10:40:42\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitName\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"LIKE\",\"required\":true,\"sort\":3,\"superColumn\":false,\"tableId\":5,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"UnitConvRate\",\"columnId\":74,\"columnName\":\"UNIT_CONV_RATE\",\"columnType\":\"varchar(100)\",\"createBy\":\"admin\",\"createTime\":\"2024-02-02 10:40:42\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"isRequired\":\"1\",\"javaField\":\"unitConvRate\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"EQ\",\"required\":true,\"sort\":4,\"superColumn\":false,\"t', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2024-02-02 10:42:04', 881);
+INSERT INTO `sys_oper_log` VALUES (141, '代码生成', 8, 'com.ruoyi.gen.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/gen/batchGenCode', '127.0.0.1', '', '{\"tables\":\"SF_WMS_M_UNIT_INFO\"}', NULL, 0, NULL, '2024-02-02 10:42:11', 3415);
 
 -- ----------------------------
 -- Table structure for sys_post

sql/ry-config-ryas.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80200 (8.2.0)
  File Encoding         : 65001
 
- Date: 02/02/2024 10:59:15
+ Date: 02/02/2024 18:45:36
 */
 
 SET NAMES utf8mb4;