first commit

mhd-modules/mhd-file/pom.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.mhd</groupId>
+        <artifactId>mhd-modules</artifactId>
+        <version>3.6.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mhd-modules-file</artifactId>
+
+    <description>
+        mhd-modules-file文件服务
+    </description>
+
+    <dependencies>
+    	
+    	<!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+        
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+		
+        <!-- FastDFS -->
+        <dependency>
+            <groupId>com.github.tobato</groupId>
+            <artifactId>fastdfs-client</artifactId>
+        </dependency>
+        
+        <!-- Minio -->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>${minio.version}</version>
+        </dependency>
+        
+        <!-- Mhd Api System -->
+        <dependency>
+            <groupId>com.mhd</groupId>
+            <artifactId>mhd-api-system</artifactId>
+        </dependency>
+        
+        <!-- Mhd Common Swagger -->
+        <dependency>
+            <groupId>com.mhd</groupId>
+            <artifactId>mhd-common-swagger</artifactId>
+        </dependency>
+        
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+   
+</project>

mhd-modules/mhd-file/src/main/java/com/mhd/file/MhdFileApplication.java

@@ -0,0 +1,31 @@
+package com.mhd.file;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import com.mhd.common.swagger.annotation.EnableCustomSwagger2;
+
+/**
+ * 文件服务
+ * 
+ * @author mhd
+ */
+@EnableCustomSwagger2
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
+public class MhdFileApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(MhdFileApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  文件服务模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

mhd-modules/mhd-file/src/main/java/com/mhd/file/config/MinioConfig.java

@@ -0,0 +1,82 @@
+package com.mhd.file.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import io.minio.MinioClient;
+
+/**
+ * Minio 配置信息
+ *
+ * @author mhd
+ */
+@Configuration
+@ConfigurationProperties(prefix = "minio")
+public class MinioConfig
+{
+    /**
+     * 服务地址
+     */
+    private String url;
+
+    /**
+     * 用户名
+     */
+    private String accessKey;
+
+    /**
+     * 密码
+     */
+    private String secretKey;
+
+    /**
+     * 存储桶名称
+     */
+    private String bucketName;
+
+    public String getUrl()
+    {
+        return url;
+    }
+
+    public void setUrl(String url)
+    {
+        this.url = url;
+    }
+
+    public String getAccessKey()
+    {
+        return accessKey;
+    }
+
+    public void setAccessKey(String accessKey)
+    {
+        this.accessKey = accessKey;
+    }
+
+    public String getSecretKey()
+    {
+        return secretKey;
+    }
+
+    public void setSecretKey(String secretKey)
+    {
+        this.secretKey = secretKey;
+    }
+
+    public String getBucketName()
+    {
+        return bucketName;
+    }
+
+    public void setBucketName(String bucketName)
+    {
+        this.bucketName = bucketName;
+    }
+
+    @Bean
+    public MinioClient getMinioClient()
+    {
+        return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build();
+    }
+}

mhd-modules/mhd-file/src/main/java/com/mhd/file/config/ResourcesConfig.java

@@ -0,0 +1,50 @@
+package com.mhd.file.config;
+
+import java.io.File;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * 通用映射配置
+ * 
+ * @author mhd
+ */
+@Configuration
+public class ResourcesConfig implements WebMvcConfigurer
+{
+    /**
+     * 上传文件存储在本地的根路径
+     */
+    @Value("${file.path}")
+    private String localFilePath;
+
+    /**
+     * 资源映射路径 前缀
+     */
+    @Value("${file.prefix}")
+    public String localFilePrefix;
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry)
+    {
+        /** 本地文件上传路径 */
+        registry.addResourceHandler(localFilePrefix + "/**")
+                .addResourceLocations("file:" + localFilePath + File.separator);
+    }
+    
+    /**
+     * 开启跨域
+     */
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        // 设置允许跨域的路由
+        registry.addMapping(localFilePrefix  + "/**")
+                // 设置允许跨域请求的域名
+                .allowedOrigins("*")
+                // 设置允许的方法
+                .allowedMethods("GET");
+    }
+}

mhd-modules/mhd-file/src/main/java/com/mhd/file/controller/SysFileController.java

@@ -0,0 +1,48 @@
+package com.mhd.file.controller;
+
+import com.mhd.file.service.ISysFileService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.mhd.common.core.domain.entity.R;
+import com.mhd.common.core.utils.file.FileUtils;
+import com.mhd.system.api.domain.SysFile;
+
+/**
+ * 文件请求处理
+ *
+ * @author mhd
+ */
+@RestController
+public class SysFileController
+{
+    private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
+
+    @Autowired
+    private ISysFileService sysFileService;
+
+    /**
+     * 文件上传请求
+     */
+    @PostMapping("upload")
+    public R<SysFile> upload(MultipartFile file)
+    {
+        try
+        {
+            // 上传并返回访问地址
+            String url = sysFileService.uploadFile(file);
+            SysFile sysFile = new SysFile();
+            sysFile.setName(FileUtils.getName(url));
+            sysFile.setUrl(url);
+            return R.ok(sysFile);
+        }
+        catch (Exception e)
+        {
+            log.error("上传文件失败", e);
+            return R.fail(e.getMessage());
+        }
+    }
+}

mhd-modules/mhd-file/src/main/java/com/mhd/file/service/FastDfsSysFileServiceImpl.java

@@ -0,0 +1,42 @@
+package com.mhd.file.service;
+
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import com.github.tobato.fastdfs.domain.fdfs.StorePath;
+import com.github.tobato.fastdfs.service.FastFileStorageClient;
+
+/**
+ * FastDFS 文件存储
+ * 
+ * @author mhd
+ */
+@Service
+public class FastDfsSysFileServiceImpl implements ISysFileService
+{
+    /**
+     * 域名或本机访问地址
+     */
+    @Value("${fdfs.domain}")
+    public String domain;
+
+    @Autowired
+    private FastFileStorageClient storageClient;
+
+    /**
+     * FastDfs文件上传接口
+     * 
+     * @param file 上传的文件
+     * @return 访问地址
+     * @throws Exception
+     */
+    @Override
+    public String uploadFile(MultipartFile file) throws Exception
+    {
+        StorePath storePath = storageClient.uploadFile(file.getInputStream(), file.getSize(),
+                FilenameUtils.getExtension(file.getOriginalFilename()), null);
+        return domain + "/" + storePath.getFullPath();
+    }
+}

mhd-modules/mhd-file/src/main/java/com/mhd/file/service/ISysFileService.java

@@ -0,0 +1,20 @@
+package com.mhd.file.service;
+
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 文件上传接口
+ * 
+ * @author mhd
+ */
+public interface ISysFileService
+{
+    /**
+     * 文件上传接口
+     * 
+     * @param file 上传的文件
+     * @return 访问地址
+     * @throws Exception
+     */
+    public String uploadFile(MultipartFile file) throws Exception;
+}

mhd-modules/mhd-file/src/main/java/com/mhd/file/service/LocalSysFileServiceImpl.java

@@ -0,0 +1,50 @@
+package com.mhd.file.service;
+
+import com.mhd.file.utils.FileUploadUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 本地文件存储
+ * 
+ * @author mhd
+ */
+@Primary
+@Service
+public class LocalSysFileServiceImpl implements ISysFileService
+{
+    /**
+     * 资源映射路径 前缀
+     */
+    @Value("${file.prefix}")
+    public String localFilePrefix;
+
+    /**
+     * 域名或本机访问地址
+     */
+    @Value("${file.domain}")
+    public String domain;
+    
+    /**
+     * 上传文件存储在本地的根路径
+     */
+    @Value("${file.path}")
+    private String localFilePath;
+
+    /**
+     * 本地文件上传接口
+     * 
+     * @param file 上传的文件
+     * @return 访问地址
+     * @throws Exception
+     */
+    @Override
+    public String uploadFile(MultipartFile file) throws Exception
+    {
+        String name = FileUploadUtils.upload(localFilePath, file);
+        String url = domain + localFilePrefix + name;
+        return url;
+    }
+}

mhd-modules/mhd-file/src/main/java/com/mhd/file/service/MinioSysFileServiceImpl.java

@@ -0,0 +1,45 @@
+package com.mhd.file.service;
+
+import com.mhd.file.config.MinioConfig;
+import com.mhd.file.utils.FileUploadUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import io.minio.MinioClient;
+import io.minio.PutObjectArgs;
+
+/**
+ * Minio 文件存储
+ * 
+ * @author mhd
+ */
+@Service
+public class MinioSysFileServiceImpl implements ISysFileService
+{
+    @Autowired
+    private MinioConfig minioConfig;
+
+    @Autowired
+    private MinioClient client;
+
+    /**
+     * 本地文件上传接口
+     * 
+     * @param file 上传的文件
+     * @return 访问地址
+     * @throws Exception
+     */
+    @Override
+    public String uploadFile(MultipartFile file) throws Exception
+    {
+        String fileName = FileUploadUtils.extractFilename(file);
+        PutObjectArgs args = PutObjectArgs.builder()
+                .bucket(minioConfig.getBucketName())
+                .object(fileName)
+                .stream(file.getInputStream(), file.getSize(), -1)
+                .contentType(file.getContentType())
+                .build();
+        client.putObject(args);
+        return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName;
+    }
+}

mhd-modules/mhd-file/src/main/java/com/mhd/file/utils/FileUploadUtils.java

@@ -0,0 +1,180 @@
+package com.mhd.file.utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Objects;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.web.multipart.MultipartFile;
+import com.mhd.common.core.exception.file.FileNameLengthLimitExceededException;
+import com.mhd.common.core.exception.file.FileSizeLimitExceededException;
+import com.mhd.common.core.exception.file.InvalidExtensionException;
+import com.mhd.common.core.utils.DateUtils;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.core.utils.file.FileTypeUtils;
+import com.mhd.common.core.utils.file.MimeTypeUtils;
+import com.mhd.common.core.utils.uuid.Seq;
+
+/**
+ * 文件上传工具类
+ * 
+ * @author mhd
+ */
+public class FileUploadUtils
+{
+    /**
+     * 默认大小 50M
+     */
+    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+
+    /**
+     * 默认的文件名最大长度 100
+     */
+    public static final int DEFAULT_FILE_NAME_LENGTH = 100;
+
+    /**
+     * 根据文件路径上传
+     *
+     * @param baseDir 相对应用的基目录
+     * @param file 上传的文件
+     * @return 文件名称
+     * @throws IOException
+     */
+    public static final String upload(String baseDir, MultipartFile file) throws IOException
+    {
+        try
+        {
+            return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+        }
+        catch (Exception e)
+        {
+            throw new IOException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 文件上传
+     *
+     * @param baseDir 相对应用的基目录
+     * @param file 上传的文件
+     * @param allowedExtension 上传文件类型
+     * @return 返回上传成功的文件名
+     * @throws FileSizeLimitExceededException 如果超出最大大小
+     * @throws FileNameLengthLimitExceededException 文件名太长
+     * @throws IOException 比如读写文件出错时
+     * @throws InvalidExtensionException 文件校验异常
+     */
+    public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
+            throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
+            InvalidExtensionException
+    {
+        int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
+        if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
+        {
+            throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
+        }
+
+        assertAllowed(file, allowedExtension);
+
+        String fileName = extractFilename(file);
+
+        String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
+        file.transferTo(Paths.get(absPath));
+        return getPathFileName(fileName);
+    }
+
+    /**
+     * 编码文件名
+     */
+    public static final String extractFilename(MultipartFile file)
+    {
+        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
+                FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file));
+    }
+
+    private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
+    {
+        File desc = new File(uploadDir + File.separator + fileName);
+
+        if (!desc.exists())
+        {
+            if (!desc.getParentFile().exists())
+            {
+                desc.getParentFile().mkdirs();
+            }
+        }
+        return desc.isAbsolute() ? desc : desc.getAbsoluteFile();
+    }
+
+    private static final String getPathFileName(String fileName) throws IOException
+    {
+        String pathFileName = "/" + fileName;
+        return pathFileName;
+    }
+
+    /**
+     * 文件大小校验
+     *
+     * @param file 上传的文件
+     * @throws FileSizeLimitExceededException 如果超出最大大小
+     * @throws InvalidExtensionException 文件校验异常
+     */
+    public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
+            throws FileSizeLimitExceededException, InvalidExtensionException
+    {
+        long size = file.getSize();
+        if (size > DEFAULT_MAX_SIZE)
+        {
+            throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
+        }
+
+        String fileName = file.getOriginalFilename();
+        String extension = FileTypeUtils.getExtension(file);
+        if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
+        {
+            if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else
+            {
+                throw new InvalidExtensionException(allowedExtension, extension, fileName);
+            }
+        }
+    }
+
+    /**
+     * 判断MIME类型是否是允许的MIME类型
+     *
+     * @param extension 上传文件类型
+     * @param allowedExtension 允许上传文件类型
+     * @return true/false
+     */
+    public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
+    {
+        for (String str : allowedExtension)
+        {
+            if (str.equalsIgnoreCase(extension))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+}

mhd-modules/mhd-file/src/main/resources/banner.txt

@@ -0,0 +1,10 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+                            _           __  _  _       
+                           (_)         / _|(_)| |      
+ _ __  _   _   ___   _   _  _  ______ | |_  _ | |  ___ 
+| '__|| | | | / _ \ | | | || ||______||  _|| || | / _ \
+| |   | |_| || (_) || |_| || |        | |  | || ||  __/
+|_|    \__,_| \___/  \__, ||_|        |_|  |_||_| \___|
+                      __/ |                            
+                     |___/                             

mhd-modules/mhd-file/src/main/resources/bootstrap.yml

@@ -0,0 +1,29 @@
+# Tomcat
+server:
+  port: 9300
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: mhd-file
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        #server-addr: 192.168.0.69:8848
+        server-addr: 127.0.0.1:8848
+        namespace: 4dd3256a-22c0-42db-9af1-de513a05c6a9
+      config:
+        # 配置中心地址
+        #server-addr: 192.168.0.69:8848
+        server-addr: 127.0.0.1:8848
+        # 配置文件格式
+        file-extension: yml
+        namespace: 4dd3256a-22c0-42db-9af1-de513a05c6a9
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

mhd-modules/mhd-file/src/main/resources/logback.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+	<property name="log.path" value="logs/mhd-file" />
+   <!-- 日志输出格式 -->
+	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+    <!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+	</appender>
+
+    <!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+	</appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+	<logger name="com.mhd" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+
+	<root level="info">
+		<appender-ref ref="console" />
+	</root>
+	
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+    </root>
+</configuration>

mhd-modules/mhd-gen/pom.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.mhd</groupId>
+        <artifactId>mhd-modules</artifactId>
+        <version>3.6.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mhd-modules-gen</artifactId>
+
+    <description>
+        mhd-modules-gen代码生成
+    </description>
+
+    <dependencies>
+    	
+    	<!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+        
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+		
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+        
+        <!-- Apache Velocity -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+        </dependency>
+        
+        <!-- Commons Collections -->
+        <dependency> 
+            <groupId>commons-collections</groupId> 
+            <artifactId>commons-collections</artifactId> 
+        </dependency>
+        
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        
+        <!-- Mhd Common Log -->
+        <dependency>
+            <groupId>com.mhd</groupId>
+            <artifactId>mhd-common-log</artifactId>
+        </dependency>
+        
+        <!-- Mhd Common Swagger -->
+        <dependency>
+            <groupId>com.mhd</groupId>
+            <artifactId>mhd-common-swagger</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+   
+</project>

mhd-modules/mhd-gen/src/main/java/com/mhd/gen/MhdGenApplication.java

@@ -0,0 +1,34 @@
+package com.mhd.gen;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.mhd.common.security.annotation.EnableCustomConfig;
+import com.mhd.common.security.annotation.EnableRyFeignClients;
+import com.mhd.common.swagger.annotation.EnableCustomSwagger2;
+
+/**
+ * 代码生成
+ * 
+ * @author mhd
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2   
+@EnableRyFeignClients
+@SpringBootApplication
+public class MhdGenApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(MhdGenApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  代码生成模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

mhd-modules/mhd-gen/src/main/java/com/mhd/gen/config/GenConfig.java

@@ -0,0 +1,66 @@
+package com.mhd.gen.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 代码生成相关配置
+ * 
+ * @author mhd
+ */
+@Component
+@ConfigurationProperties(prefix = "gen")
+public class GenConfig
+{
+    /** 作者 */
+    public static String author;
+
+    /** 生成包路径 */
+    public static String packageName;
+
+    /** 自动去除表前缀，默认是false */
+    public static boolean autoRemovePre;
+
+    /** 表前缀(类名不会包含表前缀) */
+    public static String tablePrefix;
+
+    public static String getAuthor()
+    {
+        return author;
+    }
+
+    public void setAuthor(String author)
+    {
+        GenConfig.author = author;
+    }
+
+    public static String getPackageName()
+    {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName)
+    {
+        GenConfig.packageName = packageName;
+    }
+
+    public static boolean getAutoRemovePre()
+    {
+        return autoRemovePre;
+    }
+
+    public void setAutoRemovePre(boolean autoRemovePre)
+    {
+        GenConfig.autoRemovePre = autoRemovePre;
+    }
+
+    public static String getTablePrefix()
+    {
+        return tablePrefix;
+    }
+
+    public void setTablePrefix(String tablePrefix)
+    {
+        GenConfig.tablePrefix = tablePrefix;
+    }
+}

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

@@ -0,0 +1,211 @@
+package com.mhd.gen.controller;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.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.mhd.common.core.text.Convert;
+import com.mhd.common.core.web.controller.BaseController;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.core.web.page.TableDataInfo;
+import com.mhd.common.log.annotation.Log;
+import com.mhd.common.log.enums.BusinessType;
+import com.mhd.common.security.annotation.RequiresPermissions;
+import com.mhd.gen.domain.GenTable;
+import com.mhd.gen.domain.GenTableColumn;
+import com.mhd.gen.service.IGenTableColumnService;
+import com.mhd.gen.service.IGenTableService;
+
+/**
+ * 代码生成 操作处理
+ * 
+ * @author mhd
+ */
+@RequestMapping("/gen")
+@RestController
+public class GenController extends BaseController
+{
+    @Autowired
+    private IGenTableService genTableService;
+
+    @Autowired
+    private IGenTableColumnService genTableColumnService;
+
+    /**
+     * 查询代码生成列表
+     */
+    @RequiresPermissions("tool:gen:list")
+    @GetMapping("/list")
+    public TableDataInfo genList(GenTable genTable)
+    {
+        startPage();
+        List<GenTable> list = genTableService.selectGenTableList(genTable);
+        return getDataTable(list);
+    }
+
+    /**
+     * 修改代码生成业务
+     */
+    @RequiresPermissions("tool:gen:query")
+    @GetMapping(value = "/{tableId}")
+    public AjaxResult getInfo(@PathVariable Long tableId)
+    {
+        GenTable table = genTableService.selectGenTableById(tableId);
+        List<GenTable> tables = genTableService.selectGenTableAll();
+        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("info", table);
+        map.put("rows", list);
+        map.put("tables", tables);
+        return AjaxResult.success(map);
+    }
+
+    /**
+     * 查询数据库列表
+     */
+    @RequiresPermissions("tool:gen:list")
+    @GetMapping("/db/list")
+    public TableDataInfo dataList(GenTable genTable)
+    {
+        startPage();
+        List<GenTable> list = genTableService.selectDbTableList(genTable);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询数据表字段列表
+     */
+    @GetMapping(value = "/column/{tableId}")
+    public TableDataInfo columnList(Long tableId)
+    {
+        TableDataInfo dataInfo = new TableDataInfo();
+        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
+        //dataInfo.setRows(list);
+        dataInfo.setTotal(list.size());
+        return dataInfo;
+    }
+
+    /**
+     * 导入表结构（保存）
+     */
+//    @RequiresPermissions("tool:gen:import")
+    @Log(title = "代码生成", businessType = BusinessType.IMPORT)
+    @PostMapping("/importTable")
+    public AjaxResult importTableSave(String tables ,String packageName)
+    {
+        String[] tableNames = Convert.toStrArray(tables);
+        // 查询表信息
+        List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
+        genTableService.importGenTable(tableList,packageName);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改保存代码生成业务
+     */
+    @RequiresPermissions("tool:gen:edit")
+    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
+    {
+        genTableService.validateEdit(genTable);
+        genTableService.updateGenTable(genTable);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 删除代码生成
+     */
+    @RequiresPermissions("tool:gen:remove")
+    @Log(title = "代码生成", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{tableIds}")
+    public AjaxResult remove(@PathVariable Long[] tableIds)
+    {
+        genTableService.deleteGenTableByIds(tableIds);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 预览代码
+     */
+    @RequiresPermissions("tool:gen:preview")
+    @GetMapping("/preview/{tableId}")
+    public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
+    {
+        Map<String, String> dataMap = genTableService.previewCode(tableId);
+        return AjaxResult.success(dataMap);
+    }
+
+    /**
+     * 生成代码（下载方式）
+     */
+    @RequiresPermissions("tool:gen:code")
+    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+    @GetMapping("/download/{tableName}")
+    public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
+    {
+        byte[] data = genTableService.downloadCode(tableName);
+        genCode(response, data);
+    }
+
+    /**
+     * 生成代码（自定义路径）
+     */
+    @RequiresPermissions("tool:gen:code")
+    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+    @GetMapping("/genCode/{tableName}")
+    public AjaxResult genCode(@PathVariable("tableName") String tableName)
+    {
+        genTableService.generatorCode(tableName);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同步数据库
+     */
+    @RequiresPermissions("tool:gen:edit")
+    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
+    @GetMapping("/synchDb/{tableName}")
+    public AjaxResult synchDb(@PathVariable("tableName") String tableName)
+    {
+        genTableService.synchDb(tableName);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 批量生成代码
+     */
+//    @RequiresPermissions("tool:gen:code")
+    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+    @GetMapping("/batchGenCode")
+    public void batchGenCode(HttpServletResponse response, String tables) throws IOException
+    {
+        String[] tableNames = Convert.toStrArray(tables);
+        byte[] data = genTableService.downloadCode(tableNames);
+        genCode(response, data);
+    }
+
+    /**
+     * 生成zip文件
+     */
+    private void genCode(HttpServletResponse response, byte[] data) throws IOException
+    {
+        response.reset();
+        response.setHeader("Content-Disposition", "attachment; filename=\"mhd.zip\"");
+        response.addHeader("Content-Length", "" + data.length);
+        response.setContentType("application/octet-stream; charset=UTF-8");
+        IOUtils.write(data, response.getOutputStream());
+    }
+}

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

@@ -0,0 +1,370 @@
+package com.mhd.gen.domain;
+
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mhd.common.core.constant.GenConstants;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.core.web.domain.BaseEntity;
+
+/**
+ * 业务表 gen_table
+ * 
+ * @author mhd
+ */
+public class GenTable extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long tableId;
+
+    /** 表名称 */
+    @NotBlank(message = "表名称不能为空")
+    private String tableName;
+
+    /** 表描述 */
+    @NotBlank(message = "表描述不能为空")
+    private String tableComment;
+
+    /** 关联父表的表名 */
+    private String subTableName;
+
+    /** 本表关联父表的外键名 */
+    private String subTableFkName;
+
+    /** 实体类名称(首字母大写) */
+    @NotBlank(message = "实体类名称不能为空")
+    private String className;
+
+    /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */
+    private String tplCategory;
+
+    /** 生成包路径 */
+    @NotBlank(message = "生成包路径不能为空")
+    private String packageName;
+
+    /** 生成模块名 */
+    @NotBlank(message = "生成模块名不能为空")
+    private String moduleName;
+
+    /** 生成业务名 */
+    @NotBlank(message = "生成业务名不能为空")
+    private String businessName;
+
+    /** 生成功能名 */
+    @NotBlank(message = "生成功能名不能为空")
+    private String functionName;
+
+    /** 生成作者 */
+    @NotBlank(message = "作者不能为空")
+    private String functionAuthor;
+
+    /** 生成代码方式（0zip压缩包 1自定义路径） */
+    private String genType;
+
+    /** 生成路径（不填默认项目路径） */
+    private String genPath;
+
+    /** 主键信息 */
+    private GenTableColumn pkColumn;
+
+    /** 子表信息 */
+    private GenTable subTable;
+
+    /** 表列信息 */
+    @Valid
+    private List<GenTableColumn> columns;
+
+    /** 其它生成选项 */
+    private String options;
+
+    /** 树编码字段 */
+    private String treeCode;
+
+    /** 树父编码字段 */
+    private String treeParentCode;
+
+    /** 树名称字段 */
+    private String treeName;
+
+    /** 上级菜单ID字段 */
+    private String parentMenuId;
+
+    /** 上级菜单名称字段 */
+    private String parentMenuName;
+
+    public Long getTableId()
+    {
+        return tableId;
+    }
+
+    public void setTableId(Long tableId)
+    {
+        this.tableId = tableId;
+    }
+
+    public String getTableName()
+    {
+        return tableName;
+    }
+
+    public void setTableName(String tableName)
+    {
+        this.tableName = tableName;
+    }
+
+    public String getTableComment()
+    {
+        return tableComment;
+    }
+
+    public void setTableComment(String tableComment)
+    {
+        this.tableComment = tableComment;
+    }
+
+    public String getSubTableName()
+    {
+        return subTableName;
+    }
+
+    public void setSubTableName(String subTableName)
+    {
+        this.subTableName = subTableName;
+    }
+
+    public String getSubTableFkName()
+    {
+        return subTableFkName;
+    }
+
+    public void setSubTableFkName(String subTableFkName)
+    {
+        this.subTableFkName = subTableFkName;
+    }
+
+    public String getClassName()
+    {
+        return className;
+    }
+
+    public void setClassName(String className)
+    {
+        this.className = className;
+    }
+
+    public String getTplCategory()
+    {
+        return tplCategory;
+    }
+
+    public void setTplCategory(String tplCategory)
+    {
+        this.tplCategory = tplCategory;
+    }
+
+    public String getPackageName()
+    {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName)
+    {
+        this.packageName = packageName;
+    }
+
+    public String getModuleName()
+    {
+        return moduleName;
+    }
+
+    public void setModuleName(String moduleName)
+    {
+        this.moduleName = moduleName;
+    }
+
+    public String getBusinessName()
+    {
+        return businessName;
+    }
+
+    public void setBusinessName(String businessName)
+    {
+        this.businessName = businessName;
+    }
+
+    public String getFunctionName()
+    {
+        return functionName;
+    }
+
+    public void setFunctionName(String functionName)
+    {
+        this.functionName = functionName;
+    }
+
+    public String getFunctionAuthor()
+    {
+        return functionAuthor;
+    }
+
+    public void setFunctionAuthor(String functionAuthor)
+    {
+        this.functionAuthor = functionAuthor;
+    }
+
+    public String getGenType()
+    {
+        return genType;
+    }
+
+    public void setGenType(String genType)
+    {
+        this.genType = genType;
+    }
+
+    public String getGenPath()
+    {
+        return genPath;
+    }
+
+    public void setGenPath(String genPath)
+    {
+        this.genPath = genPath;
+    }
+
+    public GenTableColumn getPkColumn()
+    {
+        return pkColumn;
+    }
+
+    public void setPkColumn(GenTableColumn pkColumn)
+    {
+        this.pkColumn = pkColumn;
+    }
+
+    public GenTable getSubTable()
+    {
+        return subTable;
+    }
+
+    public void setSubTable(GenTable subTable)
+    {
+        this.subTable = subTable;
+    }
+    public List<GenTableColumn> getColumns()
+    {
+        return columns;
+    }
+
+    public void setColumns(List<GenTableColumn> columns)
+    {
+        this.columns = columns;
+    }
+
+    public String getOptions()
+    {
+        return options;
+    }
+
+    public void setOptions(String options)
+    {
+        this.options = options;
+    }
+
+    public String getTreeCode()
+    {
+        return treeCode;
+    }
+
+    public void setTreeCode(String treeCode)
+    {
+        this.treeCode = treeCode;
+    }
+
+    public String getTreeParentCode()
+    {
+        return treeParentCode;
+    }
+
+    public void setTreeParentCode(String treeParentCode)
+    {
+        this.treeParentCode = treeParentCode;
+    }
+
+    public String getTreeName()
+    {
+        return treeName;
+    }
+
+    public void setTreeName(String treeName)
+    {
+        this.treeName = treeName;
+    }
+
+    public String getParentMenuId()
+    {
+        return parentMenuId;
+    }
+
+    public void setParentMenuId(String parentMenuId)
+    {
+        this.parentMenuId = parentMenuId;
+    }
+
+    public String getParentMenuName()
+    {
+        return parentMenuName;
+    }
+
+    public void setParentMenuName(String parentMenuName)
+    {
+        this.parentMenuName = parentMenuName;
+    }
+
+    public boolean isSub()
+    {
+        return isSub(this.tplCategory);
+    }
+
+    public static boolean isSub(String tplCategory)
+    {
+        return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
+    }
+    public boolean isTree()
+    {
+        return isTree(this.tplCategory);
+    }
+
+    public static boolean isTree(String tplCategory)
+    {
+        return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
+    }
+
+    public boolean isCrud()
+    {
+        return isCrud(this.tplCategory);
+    }
+
+    public static boolean isCrud(String tplCategory)
+    {
+        return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
+    }
+
+    public boolean isSuperColumn(String javaField)
+    {
+        return isSuperColumn(this.tplCategory, javaField);
+    }
+
+    public static boolean isSuperColumn(String tplCategory, String javaField)
+    {
+        if (isTree(tplCategory))
+        {
+            return StringUtils.equalsAnyIgnoreCase(javaField,
+                    ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
+        }
+        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
+    }
+}

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

@@ -0,0 +1,374 @@
+package com.mhd.gen.domain;
+
+import javax.validation.constraints.NotBlank;
+
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.core.web.domain.BaseEntity;
+
+/**
+ * 代码生成业务字段表 gen_table_column
+ * 
+ * @author mhd
+ */
+public class GenTableColumn extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long columnId;
+
+    /** 归属表编号 */
+    private Long tableId;
+
+    /** 列名称 */
+    private String columnName;
+
+    /** 列描述 */
+    private String columnComment;
+
+    /** 列类型 */
+    private String columnType;
+
+    /** JAVA类型 */
+    private String javaType;
+
+    /** JAVA字段名 */
+    @NotBlank(message = "Java属性不能为空")
+    private String javaField;
+
+    /** 是否主键（1是） */
+    private String isPk;
+
+    /** 是否自增（1是） */
+    private String isIncrement;
+
+    /** 是否必填（1是） */
+    private String isRequired;
+
+    /** 是否为插入字段（1是） */
+    private String isInsert;
+
+    /** 是否编辑字段（1是） */
+    private String isEdit;
+
+    /** 是否列表字段（1是） */
+    private String isList;
+
+    /** 是否查询字段（1是） */
+    private String isQuery;
+
+    /** 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */
+    private String queryType;
+
+    /** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件） */
+    private String htmlType;
+
+    /** 字典类型 */
+    private String dictType;
+
+    /** 排序 */
+    private Integer sort;
+
+    public void setColumnId(Long columnId)
+    {
+        this.columnId = columnId;
+    }
+
+    public Long getColumnId()
+    {
+        return columnId;
+    }
+
+    public void setTableId(Long tableId)
+    {
+        this.tableId = tableId;
+    }
+
+    public Long getTableId()
+    {
+        return tableId;
+    }
+
+    public void setColumnName(String columnName)
+    {
+        this.columnName = columnName;
+    }
+
+    public String getColumnName()
+    {
+        return columnName;
+    }
+
+    public void setColumnComment(String columnComment)
+    {
+        this.columnComment = columnComment;
+    }
+
+    public String getColumnComment()
+    {
+        return columnComment;
+    }
+
+    public void setColumnType(String columnType)
+    {
+        this.columnType = columnType;
+    }
+
+    public String getColumnType()
+    {
+        return columnType;
+    }
+
+    public void setJavaType(String javaType)
+    {
+        this.javaType = javaType;
+    }
+
+    public String getJavaType()
+    {
+        return javaType;
+    }
+
+    public void setJavaField(String javaField)
+    {
+        this.javaField = javaField;
+    }
+
+    public String getJavaField()
+    {
+        return javaField;
+    }
+
+    public String getCapJavaField()
+    {
+        return StringUtils.capitalize(javaField);
+    }
+
+    public void setIsPk(String isPk)
+    {
+        this.isPk = isPk;
+    }
+
+    public String getIsPk()
+    {
+        return isPk;
+    }
+
+    public boolean isPk()
+    {
+        return isPk(this.isPk);
+    }
+
+    public boolean isPk(String isPk)
+    {
+        return isPk != null && StringUtils.equals("1", isPk);
+    }
+
+    public String getIsIncrement()
+    {
+        return isIncrement;
+    }
+
+    public void setIsIncrement(String isIncrement)
+    {
+        this.isIncrement = isIncrement;
+    }
+
+    public boolean isIncrement()
+    {
+        return isIncrement(this.isIncrement);
+    }
+
+    public boolean isIncrement(String isIncrement)
+    {
+        return isIncrement != null && StringUtils.equals("1", isIncrement);
+    }
+
+    public void setIsRequired(String isRequired)
+    {
+        this.isRequired = isRequired;
+    }
+
+    public String getIsRequired()
+    {
+        return isRequired;
+    }
+
+    public boolean isRequired()
+    {
+        return isRequired(this.isRequired);
+    }
+
+    public boolean isRequired(String isRequired)
+    {
+        return isRequired != null && StringUtils.equals("1", isRequired);
+    }
+
+    public void setIsInsert(String isInsert)
+    {
+        this.isInsert = isInsert;
+    }
+
+    public String getIsInsert()
+    {
+        return isInsert;
+    }
+
+    public boolean isInsert()
+    {
+        return isInsert(this.isInsert);
+    }
+
+    public boolean isInsert(String isInsert)
+    {
+        return isInsert != null && StringUtils.equals("1", isInsert);
+    }
+
+    public void setIsEdit(String isEdit)
+    {
+        this.isEdit = isEdit;
+    }
+
+    public String getIsEdit()
+    {
+        return isEdit;
+    }
+
+    public boolean isEdit()
+    {
+        return isInsert(this.isEdit);
+    }
+
+    public boolean isEdit(String isEdit)
+    {
+        return isEdit != null && StringUtils.equals("1", isEdit);
+    }
+
+    public void setIsList(String isList)
+    {
+        this.isList = isList;
+    }
+
+    public String getIsList()
+    {
+        return isList;
+    }
+
+    public boolean isList()
+    {
+        return isList(this.isList);
+    }
+
+    public boolean isList(String isList)
+    {
+        return isList != null && StringUtils.equals("1", isList);
+    }
+
+    public void setIsQuery(String isQuery)
+    {
+        this.isQuery = isQuery;
+    }
+
+    public String getIsQuery()
+    {
+        return isQuery;
+    }
+
+    public boolean isQuery()
+    {
+        return isQuery(this.isQuery);
+    }
+
+    public boolean isQuery(String isQuery)
+    {
+        return isQuery != null && StringUtils.equals("1", isQuery);
+    }
+
+    public void setQueryType(String queryType)
+    {
+        this.queryType = queryType;
+    }
+
+    public String getQueryType()
+    {
+        return queryType;
+    }
+
+    public String getHtmlType()
+    {
+        return htmlType;
+    }
+
+    public void setHtmlType(String htmlType)
+    {
+        this.htmlType = htmlType;
+    }
+
+    public void setDictType(String dictType)
+    {
+        this.dictType = dictType;
+    }
+
+    public String getDictType()
+    {
+        return dictType;
+    }
+
+    public void setSort(Integer sort)
+    {
+        this.sort = sort;
+    }
+
+    public Integer getSort()
+    {
+        return sort;
+    }
+
+    public boolean isSuperColumn()
+    {
+        return isSuperColumn(this.javaField);
+    }
+
+    public static boolean isSuperColumn(String javaField)
+    {
+        return StringUtils.equalsAnyIgnoreCase(javaField,
+                // BaseEntity
+                "createBy", "createTime", "updateBy", "updateTime", "remark",
+                // TreeEntity
+                "parentName", "parentId", "orderNum", "ancestors");
+    }
+
+    public boolean isUsableColumn()
+    {
+        return isUsableColumn(javaField);
+    }
+
+    public static boolean isUsableColumn(String javaField)
+    {
+        // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
+        return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
+    }
+
+    public String readConverterExp()
+    {
+        String remarks = StringUtils.substringBetween(this.columnComment, "（", "）");
+        StringBuffer sb = new StringBuffer();
+        if (StringUtils.isNotEmpty(remarks))
+        {
+            for (String value : remarks.split(" "))
+            {
+                if (StringUtils.isNotEmpty(value))
+                {
+                    Object startStr = value.subSequence(0, 1);
+                    String endStr = value.substring(1);
+                    sb.append("").append(startStr).append("=").append(endStr).append(",");
+                }
+            }
+            return sb.deleteCharAt(sb.length() - 1).toString();
+        }
+        else
+        {
+            return this.columnComment;
+        }
+    }
+}

mhd-modules/mhd-gen/src/main/java/com/mhd/gen/mapper/GenTableColumnMapper.java

@@ -0,0 +1,61 @@
+package com.mhd.gen.mapper;
+
+import java.util.List;
+
+import com.mhd.gen.domain.GenTableColumn;
+
+/**
+ * 业务字段 数据层
+ * 
+ * @author mhd
+ */
+public interface GenTableColumnMapper
+{
+    /**
+     * 根据表名称查询列信息
+     * 
+     * @param tableName 表名称
+     * @return 列信息
+     */
+    public List<GenTableColumn> selectDbTableColumnsByName(String tableName);
+
+    /**
+     * 查询业务字段列表
+     * 
+     * @param tableId 业务字段编号
+     * @return 业务字段集合
+     */
+    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
+
+    /**
+     * 新增业务字段
+     * 
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    public int insertGenTableColumn(GenTableColumn genTableColumn);
+
+    /**
+     * 修改业务字段
+     * 
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    public int updateGenTableColumn(GenTableColumn genTableColumn);
+
+    /**
+     * 删除业务字段
+     * 
+     * @param genTableColumns 列数据
+     * @return 结果
+     */
+    public int deleteGenTableColumns(List<GenTableColumn> genTableColumns);
+
+    /**
+     * 批量删除业务字段
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteGenTableColumnByIds(Long[] ids);
+}

mhd-modules/mhd-gen/src/main/java/com/mhd/gen/mapper/GenTableMapper.java

@@ -0,0 +1,84 @@
+package com.mhd.gen.mapper;
+
+import java.util.List;
+
+import com.mhd.gen.domain.GenTable;
+
+/**
+ * 业务 数据层
+ * 
+ * @author mhd
+ */
+public interface GenTableMapper
+{
+    /**
+     * 查询业务列表
+     * 
+     * @param genTable 业务信息
+     * @return 业务集合
+     */
+    public List<GenTable> selectGenTableList(GenTable genTable);
+
+    /**
+     * 查询据库列表
+     * 
+     * @param genTable 业务信息
+     * @return 数据库表集合
+     */
+    public List<GenTable> selectDbTableList(GenTable genTable);
+
+    /**
+     * 查询据库列表
+     * 
+     * @param tableNames 表名称组
+     * @return 数据库表集合
+     */
+    public List<GenTable> selectDbTableListByNames(String[] tableNames);
+
+    /**
+     * 查询所有表信息
+     * 
+     * @return 表信息集合
+     */
+    public List<GenTable> selectGenTableAll();
+
+    /**
+     * 查询表ID业务信息
+     * 
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    public GenTable selectGenTableById(Long id);
+
+    /**
+     * 查询表名称业务信息
+     * 
+     * @param tableName 表名称
+     * @return 业务信息
+     */
+    public GenTable selectGenTableByName(String tableName);
+
+    /**
+     * 新增业务
+     * 
+     * @param genTable 业务信息
+     * @return 结果
+     */
+    public int insertGenTable(GenTable genTable);
+
+    /**
+     * 修改业务
+     * 
+     * @param genTable 业务信息
+     * @return 结果
+     */
+    public int updateGenTable(GenTable genTable);
+
+    /**
+     * 批量删除业务
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteGenTableByIds(Long[] ids);
+}

mhd-modules/mhd-gen/src/main/java/com/mhd/gen/service/GenTableColumnServiceImpl.java

@@ -0,0 +1,68 @@
+package com.mhd.gen.service;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mhd.common.core.text.Convert;
+import com.mhd.gen.domain.GenTableColumn;
+import com.mhd.gen.mapper.GenTableColumnMapper;
+
+/**
+ * 业务字段 服务层实现
+ * 
+ * @author mhd
+ */
+@Service
+public class GenTableColumnServiceImpl implements IGenTableColumnService 
+{
+	@Autowired
+	private GenTableColumnMapper genTableColumnMapper;
+
+	/**
+     * 查询业务字段列表
+     * 
+     * @param tableId 业务字段编号
+     * @return 业务字段集合
+     */
+	@Override
+	public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId)
+	{
+	    return genTableColumnMapper.selectGenTableColumnListByTableId(tableId);
+	}
+	
+    /**
+     * 新增业务字段
+     * 
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+	@Override
+	public int insertGenTableColumn(GenTableColumn genTableColumn)
+	{
+	    return genTableColumnMapper.insertGenTableColumn(genTableColumn);
+	}
+	
+	/**
+     * 修改业务字段
+     * 
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+	@Override
+	public int updateGenTableColumn(GenTableColumn genTableColumn)
+	{
+	    return genTableColumnMapper.updateGenTableColumn(genTableColumn);
+	}
+
+	/**
+     * 删除业务字段对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+	@Override
+	public int deleteGenTableColumnByIds(String ids)
+	{
+		return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids));
+	}
+}

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

@@ -0,0 +1,523 @@
+package com.mhd.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 com.mhd.gen.util.VelocityInitializer;
+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.mhd.common.core.constant.Constants;
+import com.mhd.common.core.constant.GenConstants;
+import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.text.CharsetKit;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.gen.domain.GenTable;
+import com.mhd.gen.domain.GenTableColumn;
+import com.mhd.gen.mapper.GenTableColumnMapper;
+import com.mhd.gen.mapper.GenTableMapper;
+import com.mhd.gen.util.GenUtils;
+import com.mhd.gen.util.VelocityUtils;
+
+/**
+ * 业务 服务层实现
+ * 
+ * @author mhd
+ */
+@Service
+public class GenTableServiceImpl implements IGenTableService
+{
+    private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class);
+
+    @Autowired
+    private GenTableMapper genTableMapper;
+
+    @Autowired
+    private GenTableColumnMapper genTableColumnMapper;
+
+    /**
+     * 查询业务信息
+     * 
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    @Override
+    public GenTable selectGenTableById(Long id)
+    {
+        GenTable genTable = genTableMapper.selectGenTableById(id);
+        setTableFromOptions(genTable);
+        return genTable;
+    }
+
+    /**
+     * 查询业务列表
+     * 
+     * @param genTable 业务信息
+     * @return 业务集合
+     */
+    @Override
+    public List<GenTable> selectGenTableList(GenTable genTable)
+    {
+        return genTableMapper.selectGenTableList(genTable);
+    }
+
+    /**
+     * 查询据库列表
+     * 
+     * @param genTable 业务信息
+     * @return 数据库表集合
+     */
+    @Override
+    public List<GenTable> selectDbTableList(GenTable genTable)
+    {
+        return genTableMapper.selectDbTableList(genTable);
+    }
+
+    /**
+     * 查询据库列表
+     * 
+     * @param tableNames 表名称组
+     * @return 数据库表集合
+     */
+    @Override
+    public List<GenTable> selectDbTableListByNames(String[] tableNames)
+    {
+        return genTableMapper.selectDbTableListByNames(tableNames);
+    }
+
+    /**
+     * 查询所有表信息
+     * 
+     * @return 表信息集合
+     */
+    @Override
+    public List<GenTable> selectGenTableAll()
+    {
+        return genTableMapper.selectGenTableAll();
+    }
+
+    /**
+     * 修改业务
+     * 
+     * @param genTable 业务信息
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateGenTable(GenTable genTable)
+    {
+        String options = JSON.toJSONString(genTable.getParams());
+        genTable.setOptions(options);
+        int row = genTableMapper.updateGenTable(genTable);
+        if (row > 0)
+        {
+            for (GenTableColumn cenTableColumn : genTable.getColumns())
+            {
+                genTableColumnMapper.updateGenTableColumn(cenTableColumn);
+            }
+        }
+    }
+
+    /**
+     * 删除业务对象
+     * 
+     * @param tableIds 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteGenTableByIds(Long[] tableIds)
+    {
+        genTableMapper.deleteGenTableByIds(tableIds);
+        genTableColumnMapper.deleteGenTableColumnByIds(tableIds);
+    }
+
+    /**
+     * 导入表结构
+     * 
+     * @param tableList 导入表列表
+     * @param packageName 包名
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void importGenTable(List<GenTable> tableList, String packageName)
+    {
+        String operName = SecurityUtils.getLoginUser().getUsername();
+        try
+        {
+            for (GenTable table : tableList)
+            {
+                String tableName = table.getTableName();
+                GenUtils.initTable(table, operName,packageName);
+                int row = genTableMapper.insertGenTable(table);
+                if (row > 0)
+                {
+                    // 保存列信息
+                    List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+                    for (GenTableColumn column : genTableColumns)
+                    {
+                        GenUtils.initColumnField(column, table);
+                        genTableColumnMapper.insertGenTableColumn(column);
+                    }
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            throw new ServiceException("导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 预览代码
+     * 
+     * @param tableId 表编号
+     * @return 预览数据列表
+     */
+    @Override
+    public Map<String, String> previewCode(Long tableId)
+    {
+        Map<String, String> dataMap = new LinkedHashMap<>();
+        // 查询表信息
+        GenTable table = genTableMapper.selectGenTableById(tableId);
+        // 设置主子表信息
+        setSubTable(table);
+        // 设置主键列信息
+        setPkColumn(table);
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+        for (String template : templates)
+        {
+            // 渲染模板
+            StringWriter sw = new StringWriter();
+            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+            tpl.merge(context, sw);
+            dataMap.put(template, sw.toString());
+        }
+        return dataMap;
+    }
+
+    /**
+     * 生成代码（下载方式）
+     * 
+     * @param tableName 表名称
+     * @return 数据
+     */
+    @Override
+    public byte[] downloadCode(String tableName)
+    {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(outputStream);
+        generatorCode(tableName, zip);
+        IOUtils.closeQuietly(zip);
+        return outputStream.toByteArray();
+    }
+
+    /**
+     * 生成代码（自定义路径）
+     * 
+     * @param tableName 表名称
+     */
+    @Override
+    public void generatorCode(String tableName)
+    {
+        // 查询表信息
+        GenTable table = genTableMapper.selectGenTableByName(tableName);
+        // 设置主子表信息
+        setSubTable(table);
+        // 设置主键列信息
+        setPkColumn(table);
+
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+        for (String template : templates)
+        {
+            if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))
+            {
+                // 渲染模板
+                StringWriter sw = new StringWriter();
+                Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+                tpl.merge(context, sw);
+                try
+                {
+                    String path = getGenPath(table, template);
+                    FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8);
+                }
+                catch (IOException e)
+                {
+                    throw new ServiceException("渲染模板失败，表名：" + table.getTableName());
+                }
+            }
+        }
+    }
+
+    /**
+     * 同步数据库
+     * 
+     * @param tableName 表名称
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void synchDb(String tableName)
+    {
+        GenTable table = genTableMapper.selectGenTableByName(tableName);
+        List<GenTableColumn> tableColumns = table.getColumns();
+        Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));
+
+        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+        if (StringUtils.isEmpty(dbTableColumns))
+        {
+            throw new ServiceException("同步数据失败，原表结构不存在");
+        }
+        List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
+
+        dbTableColumns.forEach(column -> {
+            GenUtils.initColumnField(column, table);
+            if (tableColumnMap.containsKey(column.getColumnName()))
+            {
+                GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
+                column.setColumnId(prevColumn.getColumnId());
+                if (column.isList())
+                {
+                    // 如果是列表，继续保留查询方式/字典类型选项
+                    column.setDictType(prevColumn.getDictType());
+                    column.setQueryType(prevColumn.getQueryType());
+                }
+                if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()
+                        && (column.isInsert() || column.isEdit())
+                        && ((column.isUsableColumn()) || (!column.isSuperColumn())))
+                {
+                    // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项
+                    column.setIsRequired(prevColumn.getIsRequired());
+                    column.setHtmlType(prevColumn.getHtmlType());
+                }
+                genTableColumnMapper.updateGenTableColumn(column);
+            }
+            else
+            {
+                genTableColumnMapper.insertGenTableColumn(column);
+            }
+        });
+
+        List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
+        if (StringUtils.isNotEmpty(delColumns))
+        {
+            genTableColumnMapper.deleteGenTableColumns(delColumns);
+        }
+    }
+
+    /**
+     * 批量生成代码（下载方式）
+     * 
+     * @param tableNames 表数组
+     * @return 数据
+     */
+    @Override
+    public byte[] downloadCode(String[] tableNames)
+    {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(outputStream);
+        for (String tableName : tableNames)
+        {
+            generatorCode(tableName, zip);
+        }
+        IOUtils.closeQuietly(zip);
+        return outputStream.toByteArray();
+    }
+
+    /**
+     * 查询表信息并生成代码
+     */
+    private void generatorCode(String tableName, ZipOutputStream zip)
+    {
+        // 查询表信息
+        GenTable table = genTableMapper.selectGenTableByName(tableName);
+        // 设置主子表信息
+        setSubTable(table);
+        // 设置主键列信息
+        setPkColumn(table);
+
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+        for (String template : templates)
+        {
+            // 渲染模板
+            StringWriter sw = new StringWriter();
+            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+            tpl.merge(context, sw);
+            try
+            {
+                // 添加到zip
+                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
+                IOUtils.write(sw.toString(), zip, Constants.UTF8);
+                IOUtils.closeQuietly(sw);
+                zip.flush();
+                zip.closeEntry();
+            }
+            catch (IOException e)
+            {
+                log.error("渲染模板失败，表名：" + table.getTableName(), e);
+            }
+        }
+    }
+
+    /**
+     * 修改保存参数校验
+     * 
+     * @param genTable 业务信息
+     */
+    @Override
+    public void validateEdit(GenTable genTable)
+    {
+        if (GenConstants.TPL_TREE.equals(genTable.getTplCategory()))
+        {
+            String options = JSON.toJSONString(genTable.getParams());
+            JSONObject paramsObj = JSON.parseObject(options);
+            if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE)))
+            {
+                throw new ServiceException("树编码字段不能为空");
+            }
+            else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE)))
+            {
+                throw new ServiceException("树父编码字段不能为空");
+            }
+            else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME)))
+            {
+                throw new ServiceException("树名称字段不能为空");
+            }
+            else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))
+            {
+                if (StringUtils.isEmpty(genTable.getSubTableName()))
+                {
+                    throw new ServiceException("关联子表的表名不能为空");
+                }
+                else if (StringUtils.isEmpty(genTable.getSubTableFkName()))
+                {
+                    throw new ServiceException("子表关联的外键名不能为空");
+                }
+            }
+        }
+    }
+
+    /**
+     * 设置主键列信息
+     * 
+     * @param table 业务表信息
+     */
+    public void setPkColumn(GenTable table)
+    {
+        for (GenTableColumn column : table.getColumns())
+        {
+            if (column.isPk())
+            {
+                table.setPkColumn(column);
+                break;
+            }
+        }
+        if (StringUtils.isNull(table.getPkColumn()))
+        {
+            table.setPkColumn(table.getColumns().get(0));
+        }
+        if (GenConstants.TPL_SUB.equals(table.getTplCategory()))
+        {
+            for (GenTableColumn column : table.getSubTable().getColumns())
+            {
+                if (column.isPk())
+                {
+                    table.getSubTable().setPkColumn(column);
+                    break;
+                }
+            }
+            if (StringUtils.isNull(table.getSubTable().getPkColumn()))
+            {
+                table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
+            }
+        }
+    }
+
+    /**
+     * 设置主子表信息
+     * 
+     * @param table 业务表信息
+     */
+    public void setSubTable(GenTable table)
+    {
+        String subTableName = table.getSubTableName();
+        if (StringUtils.isNotEmpty(subTableName))
+        {
+            table.setSubTable(genTableMapper.selectGenTableByName(subTableName));
+        }
+    }
+
+    /**
+     * 设置代码生成其他选项值
+     * 
+     * @param genTable 设置后的生成对象
+     */
+    public void setTableFromOptions(GenTable genTable)
+    {
+        JSONObject paramsObj = JSON.parseObject(genTable.getOptions());
+        if (StringUtils.isNotNull(paramsObj))
+        {
+            String treeCode = paramsObj.getString(GenConstants.TREE_CODE);
+            String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);
+            String treeName = paramsObj.getString(GenConstants.TREE_NAME);
+            String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);
+            String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
+
+            genTable.setTreeCode(treeCode);
+            genTable.setTreeParentCode(treeParentCode);
+            genTable.setTreeName(treeName);
+            genTable.setParentMenuId(parentMenuId);
+            genTable.setParentMenuName(parentMenuName);
+        }
+    }
+
+    /**
+     * 获取代码生成地址
+     * 
+     * @param table 业务表信息
+     * @param template 模板文件路径
+     * @return 生成地址
+     */
+    public static String getGenPath(GenTable table, String template)
+    {
+        String genPath = table.getGenPath();
+        if (StringUtils.equals(genPath, "/"))
+        {
+            return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
+        }
+        return genPath + File.separator + VelocityUtils.getFileName(template, table);
+    }
+}

mhd-modules/mhd-gen/src/main/java/com/mhd/gen/service/IGenTableColumnService.java

@@ -0,0 +1,44 @@
+package com.mhd.gen.service;
+
+import java.util.List;
+import com.mhd.gen.domain.GenTableColumn;
+
+/**
+ * 业务字段 服务层
+ * 
+ * @author mhd
+ */
+public interface IGenTableColumnService
+{
+    /**
+     * 查询业务字段列表
+     * 
+     * @param tableId 业务字段编号
+     * @return 业务字段集合
+     */
+    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
+
+    /**
+     * 新增业务字段
+     * 
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    public int insertGenTableColumn(GenTableColumn genTableColumn);
+
+    /**
+     * 修改业务字段
+     * 
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    public int updateGenTableColumn(GenTableColumn genTableColumn);
+
+    /**
+     * 删除业务字段信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteGenTableColumnByIds(String ids);
+}

mhd-modules/mhd-gen/src/main/java/com/mhd/gen/service/IGenTableService.java

@@ -0,0 +1,123 @@
+package com.mhd.gen.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.mhd.gen.domain.GenTable;
+
+/**
+ * 业务 服务层
+ * 
+ * @author mhd
+ */
+public interface IGenTableService
+{
+    /**
+     * 查询业务列表
+     * 
+     * @param genTable 业务信息
+     * @return 业务集合
+     */
+    public List<GenTable> selectGenTableList(GenTable genTable);
+
+    /**
+     * 查询据库列表
+     * 
+     * @param genTable 业务信息
+     * @return 数据库表集合
+     */
+    public List<GenTable> selectDbTableList(GenTable genTable);
+
+    /**
+     * 查询据库列表
+     * 
+     * @param tableNames 表名称组
+     * @return 数据库表集合
+     */
+    public List<GenTable> selectDbTableListByNames(String[] tableNames);
+
+    /**
+     * 查询所有表信息
+     * 
+     * @return 表信息集合
+     */
+    public List<GenTable> selectGenTableAll();
+
+    /**
+     * 查询业务信息
+     * 
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    public GenTable selectGenTableById(Long id);
+
+    /**
+     * 修改业务
+     * 
+     * @param genTable 业务信息
+     * @return 结果
+     */
+    public void updateGenTable(GenTable genTable);
+
+    /**
+     * 删除业务信息
+     * 
+     * @param tableIds 需要删除的表数据ID
+     * @return 结果
+     */
+    public void deleteGenTableByIds(Long[] tableIds);
+
+    /**
+     * 导入表结构
+     * 
+     * @param tableList 导入表列表
+     * @param packageName 包名
+     */
+    public void importGenTable(List<GenTable> tableList, String packageName);
+
+    /**
+     * 预览代码
+     * 
+     * @param tableId 表编号
+     * @return 预览数据列表
+     */
+    public Map<String, String> previewCode(Long tableId);
+
+    /**
+     * 生成代码（下载方式）
+     * 
+     * @param tableName 表名称
+     * @return 数据
+     */
+    public byte[] downloadCode(String tableName);
+
+    /**
+     * 生成代码（自定义路径）
+     * 
+     * @param tableName 表名称
+     * @return 数据
+     */
+    public void generatorCode(String tableName);
+
+    /**
+     * 同步数据库
+     * 
+     * @param tableName 表名称
+     */
+    public void synchDb(String tableName);
+
+    /**
+     * 批量生成代码（下载方式）
+     * 
+     * @param tableNames 表数组
+     * @return 数据
+     */
+    public byte[] downloadCode(String[] tableNames);
+
+    /**
+     * 修改保存参数校验
+     * 
+     * @param genTable 业务信息
+     */
+    public void validateEdit(GenTable genTable);
+}

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

@@ -0,0 +1,263 @@
+package com.mhd.gen.util;
+
+import java.util.Arrays;
+
+import cn.hutool.core.util.StrUtil;
+import org.apache.commons.lang3.RegExUtils;
+import com.mhd.common.core.constant.GenConstants;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.gen.config.GenConfig;
+import com.mhd.gen.domain.GenTable;
+import com.mhd.gen.domain.GenTableColumn;
+
+/**
+ * 代码生成器 工具类
+ * 
+ * @author mhd
+ */
+public class GenUtils
+{
+    /**
+     * 初始化表信息
+     */
+    public static void initTable(GenTable genTable, String operName, String packageName)
+    {
+        genTable.setClassName(convertClassName(genTable.getTableName()));
+        if (StrUtil.isNotEmpty(packageName)) {
+            genTable.setPackageName(packageName);
+        } else {
+            genTable.setPackageName(GenConfig.getPackageName());
+        }
+        genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
+        genTable.setBusinessName(getBusinessName(genTable.getTableName()));
+        genTable.setFunctionName(replaceText(genTable.getTableComment()));
+        genTable.setFunctionAuthor(GenConfig.getAuthor());
+        genTable.setCreateBy(operName);
+    }
+
+    /**
+     * 初始化列属性字段
+     */
+    public static void initColumnField(GenTableColumn column, GenTable table)
+    {
+        String dataType = getDbType(column.getColumnType());
+        String columnName = column.getColumnName();
+        column.setTableId(table.getTableId());
+        column.setCreateBy(table.getCreateBy());
+        // 设置java字段名
+        column.setJavaField(StringUtils.toCamelCase(columnName));
+        // 设置默认类型
+        column.setJavaType(GenConstants.TYPE_STRING);
+        column.setQueryType(GenConstants.QUERY_EQ);
+
+        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))
+        {
+            column.setJavaType(GenConstants.TYPE_DATE);
+            column.setHtmlType(GenConstants.HTML_DATETIME);
+        }
+        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)
+            {
+                column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
+            }
+            // 如果是整形
+            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
+            {
+                column.setJavaType(GenConstants.TYPE_INTEGER);
+            }
+            // 长整形
+            else
+            {
+                column.setJavaType(GenConstants.TYPE_LONG);
+            }
+        }
+
+        // 插入字段（默认所有字段都需要插入）
+        column.setIsInsert(GenConstants.REQUIRE);
+
+        // 编辑字段
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk())
+        {
+            column.setIsEdit(GenConstants.REQUIRE);
+        }
+        // 列表字段
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk())
+        {
+            column.setIsList(GenConstants.REQUIRE);
+        }
+        // 查询字段
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk())
+        {
+            column.setIsQuery(GenConstants.REQUIRE);
+        }
+
+        // 查询字段类型
+        if (StringUtils.endsWithIgnoreCase(columnName, "name"))
+        {
+            column.setQueryType(GenConstants.QUERY_LIKE);
+        }
+        // 状态字段设置单选框
+        if (StringUtils.endsWithIgnoreCase(columnName, "status"))
+        {
+            column.setHtmlType(GenConstants.HTML_RADIO);
+        }
+        // 类型&性别字段设置下拉框
+        else if (StringUtils.endsWithIgnoreCase(columnName, "type")
+                || StringUtils.endsWithIgnoreCase(columnName, "sex"))
+        {
+            column.setHtmlType(GenConstants.HTML_SELECT);
+        }
+        // 图片字段设置图片上传控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
+        {
+            column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
+        }
+        // 文件字段设置文件上传控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
+        {
+            column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
+        }
+        // 内容字段设置富文本控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
+        {
+            column.setHtmlType(GenConstants.HTML_EDITOR);
+        }
+    }
+
+    /**
+     * 校验数组是否包含指定值
+     * 
+     * @param arr 数组
+     * @param targetValue 值
+     * @return 是否包含
+     */
+    public static boolean arraysContains(String[] arr, String targetValue)
+    {
+        return Arrays.asList(arr).contains(targetValue);
+    }
+
+    /**
+     * 获取模块名
+     * 
+     * @param packageName 包名
+     * @return 模块名
+     */
+    public static String getModuleName(String packageName)
+    {
+        int lastIndex = packageName.lastIndexOf(".");
+        int nameLength = packageName.length();
+        return StringUtils.substring(packageName, lastIndex + 1, nameLength);
+    }
+
+    /**
+     * 获取业务名
+     * 
+     * @param tableName 表名
+     * @return 业务名
+     */
+    public static String getBusinessName(String tableName)
+    {
+        int lastIndex = tableName.lastIndexOf("_");
+        int nameLength = tableName.length();
+        return StringUtils.substring(tableName, lastIndex + 1, nameLength);
+    }
+
+    /**
+     * 表名转换成Java类名
+     * 
+     * @param tableName 表名称
+     * @return 类名
+     */
+    public static String convertClassName(String tableName)
+    {
+        boolean autoRemovePre = GenConfig.getAutoRemovePre();
+        String tablePrefix = GenConfig.getTablePrefix();
+        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
+        {
+            String[] searchList = StringUtils.split(tablePrefix, ",");
+            tableName = replaceFirst(tableName, searchList);
+        }
+        return StringUtils.convertToCamelCase(tableName);
+    }
+
+    /**
+     * 批量替换前缀
+     * 
+     * @param replacementm 替换值
+     * @param searchList 替换列表
+     * @return
+     */
+    public static String replaceFirst(String replacementm, String[] searchList)
+    {
+        String text = replacementm;
+        for (String searchString : searchList)
+        {
+            if (replacementm.startsWith(searchString))
+            {
+                text = replacementm.replaceFirst(searchString, "");
+                break;
+            }
+        }
+        return text;
+    }
+
+    /**
+     * 关键字替换
+     * 
+     * @param text 需要被替换的名字
+     * @return 替换后的名字
+     */
+    public static String replaceText(String text)
+    {
+        return RegExUtils.replaceAll(text, "(?:表|若依)", "");
+    }
+
+    /**
+     * 获取数据库类型字段
+     * 
+     * @param columnType 列类型
+     * @return 截取后的列类型
+     */
+    public static String getDbType(String columnType)
+    {
+        if (StringUtils.indexOf(columnType, "(") > 0)
+        {
+            return StringUtils.substringBefore(columnType, "(");
+        }
+        else
+        {
+            return columnType;
+        }
+    }
+
+    /**
+     * 获取字段长度
+     * 
+     * @param columnType 列类型
+     * @return 截取后的列类型
+     */
+    public static Integer getColumnLength(String columnType)
+    {
+        if (StringUtils.indexOf(columnType, "(") > 0)
+        {
+            String length = StringUtils.substringBetween(columnType, "(", ")");
+            return Integer.valueOf(length);
+        }
+        else
+        {
+            return 0;
+        }
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.mhd.gen.util;
+
+import java.util.Properties;
+import org.apache.velocity.app.Velocity;
+import com.mhd.common.core.constant.Constants;
+
+/**
+ * VelocityEngine工厂
+ * 
+ * @author mhd
+ */
+public class VelocityInitializer
+{
+    /**
+     * 初始化vm方法
+     */
+    public static void initVelocity()
+    {
+        Properties p = new Properties();
+        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)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+}

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

@@ -0,0 +1,437 @@
+package com.mhd.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.mhd.common.core.constant.GenConstants;
+import com.mhd.common.core.utils.DateUtils;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.gen.domain.GenTable;
+import com.mhd.gen.domain.GenTableColumn;
+
+/**
+ * 模板工具类
+ * 
+ * @author mhd
+ */
+public class VelocityUtils
+{
+    /** 项目空间路径 */
+    private static final String PROJECT_PATH = "main/java";
+
+    /** mybatis空间路径 */
+    private static final String MYBATIS_PATH = "main/resources/mapper";
+
+    /** 默认上级菜单，系统工具 */
+    private static final String DEFAULT_PARENT_MENU_ID = "3";
+
+    /**
+     * 设置模板变量信息
+     *
+     * @return 模板列表
+     */
+    public static VelocityContext prepareContext(GenTable genTable)
+    {
+        String moduleName = genTable.getModuleName();
+        String businessName = genTable.getBusinessName();
+        String packageName = genTable.getPackageName();
+        String tplCategory = genTable.getTplCategory();
+        String functionName = genTable.getFunctionName();
+
+        VelocityContext velocityContext = new VelocityContext();
+        velocityContext.put("tplCategory", genTable.getTplCategory());
+        velocityContext.put("tableName", genTable.getTableName());
+        velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
+        velocityContext.put("ClassName", genTable.getClassName());
+        velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName()));
+        velocityContext.put("moduleName", genTable.getModuleName());
+        velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName()));
+        velocityContext.put("businessName", genTable.getBusinessName());
+        velocityContext.put("basePackage", getPackagePrefix(packageName));
+        velocityContext.put("packageName", packageName);
+        velocityContext.put("author", genTable.getFunctionAuthor());
+        velocityContext.put("datetime", DateUtils.getDate());
+        velocityContext.put("pkColumn", genTable.getPkColumn());
+        velocityContext.put("importList", getImportList(genTable));
+        velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
+        velocityContext.put("columns", genTable.getColumns());
+        velocityContext.put("table", genTable);
+        velocityContext.put("dicts", getDicts(genTable));
+        velocityContext.put("pkJavaField", genTable.getPkColumn().getJavaField());
+        setMenuVelocityContext(velocityContext, genTable);
+        if (GenConstants.TPL_TREE.equals(tplCategory))
+        {
+            setTreeVelocityContext(velocityContext, genTable);
+        }
+        if (GenConstants.TPL_SUB.equals(tplCategory))
+        {
+            setSubVelocityContext(velocityContext, genTable);
+        }
+        return velocityContext;
+    }
+
+    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)
+    {
+        String options = genTable.getOptions();
+        JSONObject paramsObj = JSON.parseObject(options);
+        String treeCode = getTreecode(paramsObj);
+        String treeParentCode = getTreeParentCode(paramsObj);
+        String treeName = getTreeName(paramsObj);
+
+        context.put("treeCode", treeCode);
+        context.put("treeParentCode", treeParentCode);
+        context.put("treeName", treeName);
+        context.put("expandColumn", getExpandColumn(genTable));
+        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
+        {
+            context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE));
+        }
+        if (paramsObj.containsKey(GenConstants.TREE_NAME))
+        {
+            context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME));
+        }
+    }
+
+    public static void setSubVelocityContext(VelocityContext context, GenTable genTable)
+    {
+        GenTable subTable = genTable.getSubTable();
+        String subTableName = genTable.getSubTableName();
+        String subTableFkName = genTable.getSubTableFkName();
+        String subClassName = genTable.getSubTable().getClassName();
+        String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName);
+
+        context.put("subTable", subTable);
+        context.put("subTableName", subTableName);
+        context.put("subTableFkName", subTableFkName);
+        context.put("subTableFkClassName", subTableFkClassName);
+        context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName));
+        context.put("subClassName", subClassName);
+        context.put("subclassName", StringUtils.uncapitalize(subClassName));
+        context.put("subImportList", getImportList(genTable.getSubTable()));
+    }
+
+    /**
+     * 获取模板信息
+     *
+     * @return 模板列表
+     */
+    public static List<String> getTemplateList(String tplCategory)
+    {
+        List<String> templates = new ArrayList<String>();
+        templates.add("vm/java/api.java.vm");
+        templates.add("vm/java/assembler.java.vm");
+        templates.add("vm/java/applicationService.java.vm");
+        templates.add("vm/java/domainService.java.vm");
+        templates.add("vm/java/interface.java.vm");
+        templates.add("vm/java/impl.java.vm");
+        templates.add("vm/java/mapper.java.vm");
+        templates.add("vm/java/domain.java.vm");
+        templates.add("vm/java/do.java.vm");
+        templates.add("vm/java/po.java.vm");
+        templates.add("vm/java/dto.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("vm/vue/index.vue.vm");
+        }
+        else if (GenConstants.TPL_TREE.equals(tplCategory))
+        {
+            templates.add("vm/vue/index-tree.vue.vm");
+        }
+        else if (GenConstants.TPL_SUB.equals(tplCategory))
+        {
+            templates.add("vm/vue/index.vue.vm");
+            templates.add("vm/java/sub-domain.java.vm");
+        }
+        return templates;
+    }
+
+    /**
+     * 获取文件名
+     */
+    public static String getFileName(String template, GenTable genTable)
+    {
+        // 文件名称
+        String fileName = "";
+        // 包路径
+        String packageName = genTable.getPackageName();
+        // 模块名
+        String moduleName = genTable.getModuleName();
+        // 大写类名
+        String className = genTable.getClassName();
+        // 小写类名
+        String classLoadName = StringUtils.uncapitalize(className);
+        // 业务名称
+        String businessName = genTable.getBusinessName();
+
+        String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
+        String mybatisPath = MYBATIS_PATH;
+        String vuePath = "vue";
+
+
+        if (template.contains("api.java.vm"))
+        {
+            fileName = StringUtils.format("{}/interfaces/facadeApi/{}/{}Api.java", javaPath,classLoadName, className);
+        }
+        else if (template.contains("assembler.java.vm"))
+        {
+            fileName = StringUtils.format("{}/interfaces/assembler/{}/{}Assembler.java", javaPath, classLoadName, className);
+        }
+        else if (template.contains("applicationService.java.vm"))
+        {
+            fileName = StringUtils.format("{}/application/server/{}/{}ApplicationService.java", javaPath, classLoadName, className);
+        }
+        else if (template.contains("domainService.java.vm"))
+        {
+            fileName = StringUtils.format("{}/domain/{}/service/{}DomainService.java", javaPath, classLoadName, className);
+        }
+        else if (template.contains("interface.java.vm"))
+        {
+            fileName = StringUtils.format("{}/domain/{}/repository/facade/I{}Service.java", javaPath, classLoadName, className);
+        }
+        else if (template.contains("impl.java.vm"))
+        {
+            fileName = StringUtils.format("{}/domain/{}/repository/persistence/{}Impl.java", javaPath, classLoadName, className);
+        }
+        else if (template.contains("mapper.java.vm"))
+        {
+            fileName = StringUtils.format("{}/domain/{}/repository/mapper/{}Mapper.java", javaPath, classLoadName, className);
+        }
+        else if (template.contains("domain.java.vm"))
+        {
+            fileName = StringUtils.format("{}/domain/{}/entity/{}.java", javaPath, classLoadName, className);
+        }
+        else if (template.contains("po.java.vm"))
+        {
+            fileName = StringUtils.format("{}/domain/{}/repository/po/{}PO.java", javaPath, classLoadName, className);
+        }
+        else if (template.contains("do.java.vm"))
+        {
+            fileName = StringUtils.format("{}/domain/{}/repository/todo/{}DO.java", javaPath, classLoadName, className);
+        }
+        else if (template.contains("dto.java.vm"))
+        {
+            fileName = StringUtils.format("{}/interfaces/dto/{}/{}DTO.java", javaPath, classLoadName, className);
+        }
+        else if (template.contains("mapper.xml.vm"))
+        {
+            fileName = StringUtils.format("{}/{}/{}Mapper.xml", mybatisPath, classLoadName, className);
+        }
+
+
+        else if (template.contains("sql.vm"))
+        {
+            fileName = businessName + "Menu.sql";
+        }
+        else if (template.contains("api.js.vm"))
+        {
+            fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
+        }
+        else if (template.contains("index.vue.vm"))
+        {
+            fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+        }
+        else if (template.contains("index-tree.vue.vm"))
+        {
+            fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+        }
+        return fileName;
+    }
+
+    /**
+     * 获取包前缀
+     *
+     * @param packageName 包名称
+     * @return 包前缀名称
+     */
+    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)
+    {
+        List<GenTableColumn> columns = genTable.getColumns();
+        GenTable subGenTable = genTable.getSubTable();
+        HashSet<String> importList = new HashSet<String>();
+        if (StringUtils.isNotNull(subGenTable))
+        {
+            importList.add("java.util.List");
+        }
+        for (GenTableColumn column : columns)
+        {
+            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()))
+            {
+                importList.add("java.math.BigDecimal");
+            }
+        }
+        return importList;
+    }
+
+    /**
+     * 根据列类型获取字典组
+     * 
+     * @param genTable 业务表对象
+     * @return 返回字典组
+     */
+    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()))
+        {
+            List<GenTableColumn> subColumns = genTable.getSubTable().getColumns();
+            addDicts(dicts, subColumns);
+        }
+        return StringUtils.join(dicts, ", ");
+    }
+
+    /**
+     * 添加字典列表
+     * 
+     * @param dicts 字典列表
+     * @param columns 列集合
+     */
+    public static void addDicts(Set<String> dicts, List<GenTableColumn> 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 }))
+            {
+                dicts.add("'" + column.getDictType() + "'");
+            }
+        }
+    }
+
+    /**
+     * 获取权限前缀
+     *
+     * @param moduleName 模块名称
+     * @param businessName 业务名称
+     * @return 返回权限前缀
+     */
+    public static String getPermissionPrefix(String moduleName, String businessName)
+    {
+        return StringUtils.format("{}:{}", moduleName, businessName);
+    }
+
+    /**
+     * 获取上级菜单ID字段
+     *
+     * @param paramsObj 生成其他选项
+     * @return 上级菜单ID字段
+     */
+    public static String getParentMenuId(JSONObject paramsObj)
+    {
+        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
+                && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID)))
+        {
+            return paramsObj.getString(GenConstants.PARENT_MENU_ID);
+        }
+        return DEFAULT_PARENT_MENU_ID;
+    }
+
+    /**
+     * 获取树编码
+     *
+     * @param paramsObj 生成其他选项
+     * @return 树编码
+     */
+    public static String getTreecode(JSONObject paramsObj)
+    {
+        if (paramsObj.containsKey(GenConstants.TREE_CODE))
+        {
+            return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取树父编码
+     *
+     * @param paramsObj 生成其他选项
+     * @return 树父编码
+     */
+    public static String getTreeParentCode(JSONObject paramsObj)
+    {
+        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
+        {
+            return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取树名称
+     *
+     * @param paramsObj 生成其他选项
+     * @return 树名称
+     */
+    public static String getTreeName(JSONObject paramsObj)
+    {
+        if (paramsObj.containsKey(GenConstants.TREE_NAME))
+        {
+            return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取需要在哪一列上面显示展开按钮
+     *
+     * @param genTable 业务表对象
+     * @return 展开按钮列序号
+     */
+    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())
+        {
+            if (column.isList())
+            {
+                num++;
+                String columnName = column.getColumnName();
+                if (columnName.equals(treeName))
+                {
+                    break;
+                }
+            }
+        }
+        return num;
+    }
+}

mhd-modules/mhd-gen/src/main/resources/banner.txt

@@ -0,0 +1,10 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+                            _                             
+                           (_)                            
+ _ __  _   _   ___   _   _  _  ______   __ _   ___  _ __  
+| '__|| | | | / _ \ | | | || ||______| / _` | / _ \| '_ \ 
+| |   | |_| || (_) || |_| || |        | (_| ||  __/| | | |
+|_|    \__,_| \___/  \__, ||_|         \__, | \___||_| |_|
+                      __/ |             __/ |             
+                     |___/             |___/              

mhd-modules/mhd-gen/src/main/resources/bootstrap.yml

@@ -0,0 +1,29 @@
+# Tomcat
+server:
+  port: 9202
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: mhd-gen
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        #server-addr: 192.168.0.69:8848
+        server-addr: 127.0.0.1:8848
+        #        server-addr: 47.92.229.169:8848
+      config:
+        # 配置中心地址
+        #        server-addr: 47.92.229.169:8848
+        #server-addr: 192.168.0.69:8848
+        server-addr: 127.0.0.1:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

mhd-modules/mhd-gen/src/main/resources/logback.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+	<property name="log.path" value="logs/mhd-gen" />
+   <!-- 日志输出格式 -->
+	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+    <!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+	</appender>
+
+    <!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+	</appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+	<logger name="com.mhd" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+
+	<root level="info">
+		<appender-ref ref="console" />
+	</root>
+	
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+    </root>
+</configuration>

mhd-modules/mhd-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mhd.gen.mapper.GenTableColumnMapper">
+    
+    <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="selectGenTableColumnVo">
+        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
+    </sql>
+	
+    <select id="selectGenTableColumnListByTableId" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
+        <include refid="selectGenTableColumnVo"/>
+        where table_id = #{tableId}
+        order by sort
+    </select>
+    
+    <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
+		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
+		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
+		order by ordinal_position
+	</select>
+    
+    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
+        insert into gen_table_column (
+			<if test="tableId != null and tableId != ''">table_id,</if>
+			<if test="columnName != null and columnName != ''">column_name,</if>
+			<if test="columnComment != null and columnComment != ''">column_comment,</if>
+			<if test="columnType != null and columnType != ''">column_type,</if>
+			<if test="javaType != null and javaType != ''">java_type,</if>
+			<if test="javaField != null  and javaField != ''">java_field,</if>
+			<if test="isPk != null and isPk != ''">is_pk,</if>
+			<if test="isIncrement != null and isIncrement != ''">is_increment,</if>
+			<if test="isRequired != null and isRequired != ''">is_required,</if>
+			<if test="isInsert != null and isInsert != ''">is_insert,</if>
+			<if test="isEdit != null and isEdit != ''">is_edit,</if>
+			<if test="isList != null and isList != ''">is_list,</if>
+			<if test="isQuery != null and isQuery != ''">is_query,</if>
+			<if test="queryType != null and queryType != ''">query_type,</if>
+			<if test="htmlType != null and htmlType != ''">html_type,</if>
+			<if test="dictType != null and dictType != ''">dict_type,</if>
+			<if test="sort != null">sort,</if>
+			<if test="createBy != null and createBy != ''">create_by,</if>
+			create_time
+         )values(
+			<if test="tableId != null and tableId != ''">#{tableId},</if>
+			<if test="columnName != null and columnName != ''">#{columnName},</if>
+			<if test="columnComment != null and columnComment != ''">#{columnComment},</if>
+			<if test="columnType != null and columnType != ''">#{columnType},</if>
+			<if test="javaType != null and javaType != ''">#{javaType},</if>
+			<if test="javaField != null and javaField != ''">#{javaField},</if>
+			<if test="isPk != null and isPk != ''">#{isPk},</if>
+			<if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
+			<if test="isRequired != null and isRequired != ''">#{isRequired},</if>
+			<if test="isInsert != null and isInsert != ''">#{isInsert},</if>
+			<if test="isEdit != null and isEdit != ''">#{isEdit},</if>
+			<if test="isList != null and isList != ''">#{isList},</if>
+			<if test="isQuery != null and isQuery != ''">#{isQuery},</if>
+			<if test="queryType != null and queryType != ''">#{queryType},</if>
+			<if test="htmlType != null and htmlType != ''">#{htmlType},</if>
+			<if test="dictType != null and dictType != ''">#{dictType},</if>
+			<if test="sort != null">#{sort},</if>
+			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			sysdate()
+         )
+    </insert>
+	 
+    <update id="updateGenTableColumn" parameterType="GenTableColumn">
+        update gen_table_column
+        <set>
+            column_comment = #{columnComment},
+            java_type = #{javaType},
+            java_field = #{javaField},
+            is_insert = #{isInsert},
+            is_edit = #{isEdit},
+            is_list = #{isList},
+            is_query = #{isQuery},
+            is_required = #{isRequired},
+            query_type = #{queryType},
+            html_type = #{htmlType},
+            dict_type = #{dictType},
+            sort = #{sort},
+            update_by = #{updateBy},
+            update_time = sysdate()
+        </set>
+        where column_id = #{columnId}
+    </update>
+
+    <delete id="deleteGenTableColumnByIds" parameterType="Long">
+        delete from gen_table_column where table_id in 
+        <foreach collection="array" item="tableId" open="(" separator="," close=")">
+            #{tableId}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteGenTableColumns">
+        delete from gen_table_column where column_id in 
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item.columnId}
+        </foreach>
+    </delete>
+
+</mapper>

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

@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mhd.gen.mapper.GenTableMapper">
+
+	<resultMap type="GenTable" id="GenTableResult">
+	    <id     property="tableId"        column="table_id"          />
+		<result property="tableName"      column="table_name"        />
+		<result property="tableComment"   column="table_comment"     />
+		<result property="subTableName"   column="sub_table_name"    />
+		<result property="subTableFkName" column="sub_table_fk_name" />
+		<result property="className"      column="class_name"        />
+		<result property="tplCategory"    column="tpl_category"      />
+		<result property="packageName"    column="package_name"      />
+		<result property="moduleName"     column="module_name"       />
+		<result property="businessName"   column="business_name"     />
+		<result property="functionName"   column="function_name"     />
+		<result property="functionAuthor" column="function_author"   />
+		<result property="genType"        column="gen_type"          />
+		<result property="genPath"        column="gen_path"          />
+		<result property="options"        column="options"           />
+		<result property="createBy"       column="create_by"         />
+		<result property="createTime"     column="create_time"       />
+		<result property="updateBy"       column="update_by"         />
+		<result property="updateTime"     column="update_time"       />
+		<result property="remark"         column="remark"            />
+		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
+	</resultMap>
+	
+	<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, 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">
+		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 id="selectDbTableListByNames" resultMap="GenTableResult">
+		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())
+		and table_name in
+	    <foreach collection="array" item="name" open="(" separator="," close=")">
+ 			#{name}
+        </foreach> 
+	</select>
+	
+	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
+		and table_name = #{tableName}
+	</select>
+	
+	<select id="selectGenTableById" parameterType="Long" 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.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_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.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.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="GenTable" useGeneratedKeys="true" keyProperty="tableId">
+        insert into gen_table (
+			<if test="tableName != null">table_name,</if>
+			<if test="tableComment != null and tableComment != ''">table_comment,</if>
+			<if test="className != null and className != ''">class_name,</if>
+			<if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
+			<if test="packageName != null and packageName != ''">package_name,</if>
+			<if test="moduleName != null and moduleName != ''">module_name,</if>
+			<if test="businessName != null and businessName != ''">business_name,</if>
+			<if test="functionName != null and functionName != ''">function_name,</if>
+			<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
+			<if test="genType != null and genType != ''">gen_type,</if>
+			<if test="genPath != null and genPath != ''">gen_path,</if>
+			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+			create_time
+         )values(
+			<if test="tableName != null">#{tableName},</if>
+			<if test="tableComment != null and tableComment != ''">#{tableComment},</if>
+			<if test="className != null and className != ''">#{className},</if>
+			<if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
+			<if test="packageName != null and packageName != ''">#{packageName},</if>
+			<if test="moduleName != null and moduleName != ''">#{moduleName},</if>
+			<if test="businessName != null and businessName != ''">#{businessName},</if>
+			<if test="functionName != null and functionName != ''">#{functionName},</if>
+			<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
+			<if test="genType != null and genType != ''">#{genType},</if>
+			<if test="genPath != null and genPath != ''">#{genPath},</if>
+			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			sysdate()
+         )
+    </insert>
+    
+    <update id="updateGenTable" parameterType="GenTable">
+        update gen_table
+        <set>
+            <if test="tableName != null">table_name = #{tableName},</if>
+            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
+            <if test="subTableName != null">sub_table_name = #{subTableName},</if>
+            <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
+            <if test="className != null and className != ''">class_name = #{className},</if>
+            <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
+            <if test="genType != null and genType != ''">gen_type = #{genType},</if>
+            <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
+            <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</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>
+            <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
+            <if test="options != null and options != ''">options = #{options},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            update_time = sysdate()
+        </set>
+        where table_id = #{tableId}
+    </update>
+    
+    <delete id="deleteGenTableByIds" parameterType="Long">
+        delete from gen_table where table_id in 
+        <foreach collection="array" item="tableId" open="(" separator="," close=")">
+            #{tableId}
+        </foreach>
+    </delete>
+
+</mapper>

mhd-modules/mhd-gen/src/main/resources/vm/java/api.java.vm

@@ -0,0 +1,136 @@
+package ${packageName}.interfaces.${className}.facadeApi;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiOperation;
+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.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 ${packageName}.interfaces.dto.${className}.${ClassName}DTO;
+import ${packageName}.domain.${className}.repository.todo.${ClassName}DO;
+import ${packageName}.domain.${className}.repository.po.${ClassName}PO;
+import ${packageName}.application.service.${className}.${ClassName}ApplicationService;
+import ${packageName}.interfaces.assembler.${className}.${ClassName}Assembler;
+import javax.annotation.Resource;
+import com.mhd.common.core.web.controller.BaseController;
+import com.mhd.common.core.web.domain.AjaxResult;
+#if($table.crud || $table.sub)
+import com.mhd.common.core.web.page.TableDataInfo;
+#elseif($table.tree)
+#end
+
+/**
+ * ${functionName}Api
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+@RestController
+@RequestMapping("/${className}Api")
+public class ${ClassName}Api extends BaseController{
+    @Autowired
+    private ${ClassName}ApplicationService ${className}ApplicationService;
+
+    @Resource
+    private ${ClassName}Assembler ${className}Assembler;
+
+    /**
+     * 分页查询${functionName}列表
+     */
+##    @RequiresPermissions("${permissionPrefix}:list")
+    @ApiOperation("查询${functionName}列表")
+    @GetMapping("/list")
+#if($table.crud || $table.sub)
+    public TableDataInfo list(${ClassName}DTO ${className}DTO)
+    {
+        //转换实体
+        ${ClassName}DO ${className}DO = ${className}Assembler.toDO(${className}DTO);
+        startPage();
+        List<${ClassName}PO> list = ${className}ApplicationService.queryList(${className}DO);
+        return getDataTable(list);
+    }
+#elseif($table.tree)
+    public AjaxResult list(${ClassName} ${className})
+    {
+        List<${ClassName}> list = ${className}ApplicationService.queryList(${className});
+        return AjaxResult.success(list);
+    }
+#end
+
+    /**
+     * 编辑${functionName}
+     */
+##    @RequiresPermissions("${permissionPrefix}:edit")
+##    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
+    @ApiOperation("编辑${functionName}")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody ${ClassName}DTO ${className}DTO)
+    {
+        //转换实体
+        ${ClassName}DO ${className}DO = ${className}Assembler.toDO(${className}DTO);
+        if(${className}DTO.get${pkColumn.capJavaField}() != null){
+            return toAjax(${className}ApplicationService.update(${className}DO));
+        }else {
+            return toAjax(${className}ApplicationService.insert(${className}DO));
+        }
+    }
+
+    /**
+     * 批量删除${functionName}
+     */
+##    @RequiresPermissions("${permissionPrefix}:remove")
+##    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
+    @ApiOperation("批量删除${functionName}")
+    @DeleteMapping("/deleteByIds/{${pkColumn.javaField}s}")
+    public AjaxResult delete(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
+    {
+        return toAjax(${className}ApplicationService.delete(${pkColumn.javaField}s));
+    }
+
+    /**
+     * 获取${functionName}详细信息
+     */
+    @ApiOperation("获取${functionName}")
+##    @RequiresPermissions("${permissionPrefix}:query")
+    @GetMapping(value = "/getInfo/{${pkColumn.javaField}}")
+    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        return AjaxResult.success(${className}ApplicationService.getInfo(${pkColumn.javaField}));
+    }
+
+
+    #*/**
+     * 导出${functionName}列表
+     */
+    @RequiresPermissions("${permissionPrefix}:export")
+    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ${ClassName}DTO ${className}DTO)
+    {
+        List<${ClassName}> list = ${className}ApplicationService.select${ClassName}List(${className});
+        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
+        util.exportExcel(response, list, "${functionName}数据");
+    }*#
+
+
+
+   #* /**
+     * 新增${functionName}
+     */
+    @RequiresPermissions("${permissionPrefix}:add")
+    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ${ClassName} ${className})
+    {
+        return toAjax(${className}ApplicationService.insert${ClassName}(${className}));
+    }*#
+
+
+
+
+}

mhd-modules/mhd-gen/src/main/resources/vm/java/applicationService.java.vm

@@ -0,0 +1,72 @@
+package ${packageName}.application.${className}.service;
+
+import ${packageName}.domain.${className}.repository.po.${ClassName}PO;
+import ${packageName}.domain.${className}.repository.todo.${ClassName}DO;
+import ${packageName}.domain.${className}.service.${ClassName}DomainService;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+/**
+ * ${functionName}ApplicationService
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Service
+@Slf4j
+public class ${ClassName}ApplicationService {
+    @Autowired
+    private ${ClassName}DomainService ${className}DomainService;
+
+
+    /**
+     * 分页查询${functionName}列表
+     */
+
+    public List<${ClassName}PO> queryList(${ClassName}DO ${className}DO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null){
+            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+            if (topOrganizationId != null && topOrganizationId != 1){
+                ${className}DO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            }
+        }
+        return ${className}DomainService.queryList(${className}DO);
+    }
+
+
+    /**
+     * 新增${functionName}
+     */
+    public Boolean insert(${ClassName}DO ${className}DO) {
+
+        return ${className}DomainService.insert(${className}DO);
+    }
+
+    /**
+     * 修改${functionName}
+     */
+    public Boolean update(${ClassName}DO ${className}DO) {
+        return ${className}DomainService.update(${className}DO);
+    }
+
+    /**
+     * 批量删除${functionName}
+     */
+    public boolean delete(${pkColumn.javaType}[] ${pkColumn.javaField}s) {
+        return ${className}DomainService.delete(${pkColumn.javaField}s);
+    }
+
+    /**
+     * 获取${functionName}详细信息
+     */
+    public ${ClassName}PO getInfo(${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        return ${className}DomainService.getInfo(${pkColumn.javaField});
+    }
+
+
+}

mhd-modules/mhd-gen/src/main/resources/vm/java/assembler.java.vm

@@ -0,0 +1,65 @@
+package ${packageName}.interfaces.assembler.${className};
+
+import cn.hutool.core.util.ObjectUtil;
+import ${packageName}.domain.${className}.repository.todo.${ClassName}DO;
+import ${packageName}.interfaces.dto.${className}.${ClassName}DTO;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * ${functionName}Assembler
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Component
+public class ${ClassName}Assembler {
+
+    /**
+     * 转换实体
+     */
+    public ${ClassName}DO toDO(${ClassName}DTO ${className}DTO) {
+        ${ClassName}DO ${className}DO = new ${ClassName}DO();
+        // 拷贝
+        BeanUtils.copyProperties(${className}DTO, ${className}DO, IgnoreNullUtil.getNullPropertyNames(${className}DTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(${className}DTO.get${pkColumn.capJavaField}() != null){
+            if(userId != null){
+                ${className}DO.setUpdateBy(userId);
+            }else {
+                ${className}DO.setUpdateBy(new Long("0"));
+            }
+            ${className}DO.setUpdateByName(userName);
+            ${className}DO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                ${className}DO.setCreateBy(userId);
+                ${className}DO.setUpdateBy(userId);
+            }else {
+                ${className}DO.setCreateBy(new Long("0"));
+                ${className}DO.setUpdateBy(new Long("0"));
+            }
+            ${className}DO.setCreateByName(userName);
+            ${className}DO.setUpdateByName(userName);
+            ${className}DO.setCreateTime(new Date());
+            ${className}DO.setUpdateTime(new Date());
+            ${className}DO.setDelFlag(1);
+        }
+        return ${className}DO;
+    }
+
+}

mhd-modules/mhd-gen/src/main/resources/vm/java/do.java.vm

@@ -0,0 +1,54 @@
+package ${packageName}.domain.${className}.repository.todo;
+
+import com.mhd.common.core.annotation.Excel;
+import lombok.Data;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModelProperty;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+
+import java.util.List;
+
+
+/**
+ * ${functionName}对象 ${tableName}
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+
+#set($Entity="BaseVOEntity")
+@Data
+public class ${ClassName}DO extends ${Entity}{
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $columns)
+#if(!$table.isSuperColumn($column.javaField))
+    @ApiModelProperty("$column.columnComment")
+#if($column.list)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($parentheseIndex != -1)
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+#elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+#else
+    @Excel(name = "${comment}")
+#end
+#end
+    private $column.javaType $column.javaField;
+
+#end
+#end
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

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

@@ -0,0 +1,56 @@
+package ${packageName}.domain.${className}.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import java.math.BigDecimal;
+import lombok.Data;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+
+/**
+ * ${functionName}对象 ${tableName}
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+
+#set($Entity="BaseVOEntity")
+@Data
+public class ${ClassName} extends ${Entity}{
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $columns)
+#if(!$table.isSuperColumn($column.javaField))
+    @ApiModelProperty("$column.columnComment")
+#if($column.list)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($parentheseIndex != -1)
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+#elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+#else
+    @Excel(name = "${comment}")
+#end
+#end
+#if($pkJavaField !=$column.javaField)
+    private $column.javaType $column.javaField;
+
+#else
+    @TableId(type = IdType.AUTO)
+    private $column.javaType $column.javaField;
+
+#end
+#end
+#end
+
+}

mhd-modules/mhd-gen/src/main/resources/vm/java/domainService.java.vm

@@ -0,0 +1,64 @@
+package ${packageName}.domain.${className}.service;
+
+import ${packageName}.domain.${className}.repository.facade.I${ClassName}Service;
+import ${packageName}.domain.${className}.repository.po.${ClassName}PO;
+import ${packageName}.domain.${className}.repository.todo.${ClassName}DO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+/**
+ * ${functionName}
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Service
+@Slf4j
+public class ${ClassName}DomainService {
+
+    @Autowired
+    private I${ClassName}Service ${className}Service;
+
+
+    /**
+     * 分页查询${functionName}列表
+     */
+    public List<${ClassName}PO> queryList(${ClassName}DO ${className}DO) {
+        return ${className}Service.queryList(${className}DO);
+    }
+
+
+    /**
+     * 新增${functionName}
+     */
+    public Boolean insert(${ClassName}DO ${className}DO) {
+
+        return ${className}Service.insert(${className}DO);
+    }
+
+    /**
+     * 修改${functionName}
+     */
+    public Boolean update(${ClassName}DO ${className}DO) {
+        return ${className}Service.update(${className}DO);
+    }
+
+    /**
+     * 批量删除${functionName}
+     */
+    public Boolean delete(${pkColumn.javaType}[] ${pkColumn.javaField}s) {
+        return ${className}Service.delete(${pkColumn.javaField}s);
+    }
+
+    /**
+     * 获取${functionName}详细信息
+     */
+    public ${ClassName}PO getInfo(${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        return ${className}Service.getInfo(${pkColumn.javaField});
+    }
+
+
+}

mhd-modules/mhd-gen/src/main/resources/vm/java/dto.java.vm

@@ -0,0 +1,54 @@
+package ${packageName}.interfaces.dto.${className};
+
+import com.mhd.common.core.annotation.Excel;
+import lombok.Data;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModelProperty;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+
+import java.util.List;
+
+/**
+ * ${functionName}对象 ${tableName}
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+
+#set($Entity="BaseVOEntity")
+@Data
+public class ${ClassName}DTO extends ${Entity}{
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $columns)
+#if(!$table.isSuperColumn($column.javaField))
+    @ApiModelProperty("$column.columnComment")
+#if($column.list)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($parentheseIndex != -1)
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+#elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+#else
+    @Excel(name = "${comment}")
+#end
+#end
+    private $column.javaType $column.javaField;
+
+#end
+#end
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd-modules/mhd-gen/src/main/resources/vm/java/impl.java.vm

@@ -0,0 +1,81 @@
+package ${packageName}.domain.${className}.repository.persistence;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import ${packageName}.domain.${className}.entity.${ClassName};
+import ${packageName}.domain.${className}.repository.facade.I${ClassName}Service;
+import ${packageName}.domain.${className}.repository.mapper.${ClassName}Mapper;
+import ${packageName}.domain.${className}.repository.po.${ClassName}PO;
+import ${packageName}.domain.${className}.repository.todo.${ClassName}DO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * ${functionName}Service业务层处理
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Service
+public class ${ClassName}Impl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service{
+    @Autowired
+    private ${ClassName}Mapper ${className}Mapper;
+
+    /**
+     * 查询${functionName}列表
+     */
+    @Override
+    public List<${ClassName}PO> queryList(${ClassName}DO ${className}DO)
+    {
+        return ${className}Mapper.queryList(${className}DO);
+    }
+
+    /**
+     * 新增${functionName}
+     */
+    @Override
+    public Boolean insert(${ClassName}DO ${className}DO) {
+        ${ClassName} ${className} = new ${ClassName}();
+        BeanUtils.copyProperties(${className}DO,${className});
+        return this.save(${className});
+    }
+
+    /**
+     * 修改${functionName}
+     */
+    @Override
+    public Boolean update(${ClassName}DO ${className}DO) {
+        ${ClassName} ${className} = new ${ClassName}();
+        BeanUtils.copyProperties(${className}DO,${className});
+        return this.updateById(${className});
+    }
+
+    /**
+     * 批量删除${functionName}
+     */
+    @Override
+    public Boolean delete(${pkColumn.javaType}[] ${pkColumn.javaField}s ) {
+        List<${ClassName}> list = new ArrayList<>();
+        for (${pkColumn.javaType} id : ${pkColumn.javaField}s) {
+            ${ClassName} ${className} = new ${ClassName}();
+            ${className}.set${pkColumn.capJavaField}(id);
+            ${className}.setDelFlag(2);
+            list.add(${className});
+        }
+        return this.updateBatchById(list);
+    }
+
+    /**
+     * 修改${functionName}
+     */
+    @Override
+    public ${ClassName}PO getInfo(${pkColumn.javaType} ${pkColumn.javaField}) {
+        ${ClassName} ${className} = this.getById(${pkColumn.javaField});
+        ${ClassName}PO ${className}PO = new ${ClassName}PO();
+        BeanUtils.copyProperties(${className},${className}PO);
+        return ${className}PO;
+    }
+}

mhd-modules/mhd-gen/src/main/resources/vm/java/interface.java.vm

@@ -0,0 +1,43 @@
+package ${packageName}.domain.${className}.repository.facade;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import ${packageName}.domain.${className}.entity.${ClassName};
+import ${packageName}.domain.${className}.repository.po.${ClassName}PO;
+import ${packageName}.domain.${className}.repository.todo.${ClassName}DO;
+
+import java.util.List;
+
+/**
+ * ${functionName}Service接口
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public interface I${ClassName}Service extends IService<${ClassName}>
+{
+    /**
+     * 分页查询${functionName}列表
+     */
+    public List<${ClassName}PO> queryList(${ClassName}DO ${className}DO);
+
+    /**
+     * 新增${functionName}
+     */
+    public Boolean insert(${ClassName}DO ${className}DO);
+
+    /**
+     * 修改${functionName}
+     */
+    public Boolean update(${ClassName}DO ${className}DO);
+
+    /**
+     * 批量删除${functionName}
+     */
+    public Boolean delete(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+
+
+    /**
+     * 查询${functionName}
+     */
+    public ${ClassName}PO getInfo(${pkColumn.javaType} ${pkColumn.javaField});
+}

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

@@ -0,0 +1,22 @@
+package ${packageName}.domain.${className}.repository.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import ${packageName}.domain.${className}.entity.${ClassName};
+import ${packageName}.domain.${className}.repository.po.${ClassName}PO;
+import ${packageName}.domain.${className}.repository.todo.${ClassName}DO;
+import org.apache.ibatis.annotations.Param;
+/**
+ * ${functionName}Mapper接口
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
+{
+    /**
+     * 查询${functionName}列表
+     */
+    public List<${ClassName}PO> queryList(${ClassName}DO ${className}DO);
+
+}

mhd-modules/mhd-gen/src/main/resources/vm/java/po.java.vm

@@ -0,0 +1,51 @@
+package ${packageName}.domain.${className}.repository.po;
+
+import com.mhd.common.core.annotation.Excel;
+import lombok.Data;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+
+
+/**
+ * ${functionName}对象 ${tableName}
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+
+#set($Entity="BaseVOEntity")
+@Data
+@ApiModel(value = "${functionName}对象", description = "${functionName}响应对象")
+public class ${ClassName}PO extends ${Entity}{
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $columns)
+#if(!$table.isSuperColumn($column.javaField))
+    @ApiModelProperty("$column.columnComment")
+#if($column.list)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($parentheseIndex != -1)
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+#elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+#else
+    @Excel(name = "${comment}")
+#end
+#end
+    private $column.javaType $column.javaField;
+
+#end
+#end
+
+
+}

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

@@ -0,0 +1,73 @@
+package ${packageName}.domain;
+
+#foreach ($import in $subImportList)
+import ${import};
+#end
+import com.mhd.common.core.annotation.Excel;
+
+/**
+ * ${subTable.functionName}对象 ${subTableName}
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public class ${subClassName} extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $subTable.columns)
+#if(!$table.isSuperColumn($column.javaField))
+    /** $column.columnComment */
+#if($column.list)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($parentheseIndex != -1)
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+#elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+#else
+    @Excel(name = "${comment}")
+#end
+#end
+    private $column.javaType $column.javaField;
+
+#end
+#end
+#foreach ($column in $subTable.columns)
+#if(!$table.isSuperColumn($column.javaField))
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+    public void set${AttrName}($column.javaType $column.javaField) 
+    {
+        this.$column.javaField = $column.javaField;
+    }
+
+    public $column.javaType get${AttrName}() 
+    {
+        return $column.javaField;
+    }
+#end
+#end
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+#foreach ($column in $subTable.columns)
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+            .append("${column.javaField}", get${AttrName}())
+#end
+            .toString();
+    }
+}

mhd-modules/mhd-gen/src/main/resources/vm/js/api.js.vm

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询${functionName}列表
+export function list${BusinessName}(query) {
+  return request({
+    url: '/${moduleName}/${businessName}/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询${functionName}详细
+export function get${BusinessName}(${pkColumn.javaField}) {
+  return request({
+    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+    method: 'get'
+  })
+}
+
+// 新增${functionName}
+export function add${BusinessName}(data) {
+  return request({
+    url: '/${moduleName}/${businessName}',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改${functionName}
+export function update${BusinessName}(data) {
+  return request({
+    url: '/${moduleName}/${businessName}',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除${functionName}
+export function del${BusinessName}(${pkColumn.javaField}) {
+  return request({
+    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+    method: 'delete'
+  })
+}

mhd-modules/mhd-gen/src/main/resources/vm/sql/sql.vm

@@ -0,0 +1,22 @@
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}查询', @parentId, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}新增', @parentId, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}修改', @parentId, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}删除', @parentId, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}导出', @parentId, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 'admin', sysdate(), '', null, '');

mhd-modules/mhd-gen/src/main/resources/vm/vue/index-tree.vue.vm

@@ -0,0 +1,502 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.htmlType == "input")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-input
+          v-model="queryParams.${column.javaField}"
+          placeholder="请输入${comment}"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+          <el-option
+            v-for="dict in dict.type.${dictType}"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-date-picker clearable
+          v-model="queryParams.${column.javaField}"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择${comment}">
+        </el-date-picker>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      <el-form-item label="${comment}">
+        <el-date-picker
+          v-model="daterange${AttrName}"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+#end
+#end
+#end
+      <el-form-item>
+	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="${businessName}List"
+      row-key="${treeCode}"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+#foreach($column in $columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+#elseif($column.list && $column.htmlType == "datetime")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+#elseif($column.list && $column.htmlType == "imageUpload")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $column.dictType)
+      <el-table-column label="${comment}" align="center" prop="${javaField}">
+        <template slot-scope="scope">
+#if($column.htmlType == "checkbox")
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+#else
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
+#end
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $javaField)
+#if(${foreach.index} == 1)
+      <el-table-column label="${comment}" prop="${javaField}" />
+#else
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#end
+#end
+#end
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改${functionName}对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if("" != $treeParentCode && $column.javaField == $treeParentCode)
+        <el-form-item label="${comment}" prop="${treeParentCode}">
+          <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "input")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "imageUpload")
+        <el-form-item label="${comment}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "fileUpload")
+        <el-form-item label="${comment}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "editor")
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
+#elseif($column.htmlType == "select" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.label"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+
+            ></el-option>
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "select" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "datetime")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+#elseif($column.htmlType == "textarea")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+#end
+#end
+#end
+#end
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "${BusinessName}",
+#if(${dicts} != '')
+  dicts: [${dicts}],
+#end
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // ${functionName}表格数据
+      ${businessName}List: [],
+      // ${functionName}树选项
+      ${businessName}Options: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      // $comment时间范围
+      daterange${AttrName}: [],
+#end
+#end
+      // 查询参数
+      queryParams: {
+#foreach ($column in $columns)
+#if($column.query)
+        $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+#foreach ($column in $columns)
+#if($column.required)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+        $column.javaField: [
+          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+        ]#if($foreach.count != $columns.size()),#end
+#end
+#end
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询${functionName}列表 */
+    getList() {
+      this.loading = true;
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      this.queryParams.params = {};
+#break
+#end
+#end
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
+        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+      }
+#end
+#end
+      list${BusinessName}(this.queryParams).then(response => {
+        this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+        this.loading = false;
+      });
+    },
+    /** 转换${functionName}数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.${treeCode},
+        label: node.${treeName},
+        children: node.children
+      };
+    },
+	/** 查询${functionName}下拉树结构 */
+    getTreeselect() {
+      list${BusinessName}().then(response => {
+        this.${businessName}Options = [];
+        const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+        this.${businessName}Options.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+#foreach ($column in $columns)
+#if($column.htmlType == "radio")
+        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
+
+#elseif($column.htmlType == "checkbox")
+        $column.javaField: []#if($foreach.count != $columns.size()),#end
+#else
+        $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      this.daterange${AttrName} = [];
+#end
+#end
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.${treeCode}) {
+        this.form.${treeParentCode} = row.${treeCode};
+      } else {
+        this.form.${treeParentCode} = 0;
+      }
+      this.open = true;
+      this.title = "添加${functionName}";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.${treeParentCode} = row.${treeCode};
+      }
+      get${BusinessName}(row.${pkColumn.javaField}).then(response => {
+        this.form = response.data;
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+        this.form.$column.javaField = this.form.${column.javaField}.split(",");
+#end
+#end
+        this.open = true;
+        this.title = "修改${functionName}";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.#[[$]]#refs["form"].validate(valid => {
+        if (valid) {
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+          this.form.$column.javaField = this.form.${column.javaField}.join(",");
+#end
+#end
+          if (this.form.${pkColumn.javaField} != null) {
+            update${BusinessName}(this.form).then(response => {
+              this.#[[$modal]]#.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            add${BusinessName}(this.form).then(response => {
+              this.#[[$modal]]#.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
+        return del${BusinessName}(row.${pkColumn.javaField});
+      }).then(() => {
+        this.getList();
+        this.#[[$modal]]#.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>

mhd-modules/mhd-gen/src/main/resources/vm/vue/index.vue.vm

@@ -0,0 +1,598 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.htmlType == "input")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-input
+          v-model="queryParams.${column.javaField}"
+          placeholder="请输入${comment}"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+          <el-option
+            v-for="dict in dict.type.${dictType}"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-date-picker clearable
+          v-model="queryParams.${column.javaField}"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择${comment}">
+        </el-date-picker>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      <el-form-item label="${comment}">
+        <el-date-picker
+          v-model="daterange${AttrName}"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+#end
+#end
+#end
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['${moduleName}:${businessName}:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['${moduleName}:${businessName}:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['${moduleName}:${businessName}:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+#foreach($column in $columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#elseif($column.list && $column.htmlType == "datetime")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+#elseif($column.list && $column.htmlType == "imageUpload")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $column.dictType)
+      <el-table-column label="${comment}" align="center" prop="${javaField}">
+        <template slot-scope="scope">
+#if($column.htmlType == "checkbox")
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+#else
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
+#end
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $javaField)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#end
+#end
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改${functionName}对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if($column.htmlType == "input")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "imageUpload")
+        <el-form-item label="${comment}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "fileUpload")
+        <el-form-item label="${comment}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "editor")
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
+#elseif($column.htmlType == "select" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.label"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+
+            ></el-option>
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "select" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "datetime")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+#elseif($column.htmlType == "textarea")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+#end
+#end
+#end
+#end
+#if($table.sub)
+        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+#foreach($column in $subTable.columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk || $javaField == ${subTableFkclassName})
+#elseif($column.list && $column.htmlType == "input")
+          <el-table-column label="$comment" prop="${javaField}" width="150">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
+            </template>
+          </el-table-column>
+#elseif($column.list && $column.htmlType == "datetime")
+          <el-table-column label="$comment" prop="${javaField}" width="240">
+            <template slot-scope="scope">
+              <el-date-picker clearable v-model="scope.row.$javaField" type="date" value-format="yyyy-MM-dd" placeholder="请选择$comment" />
+            </template>
+          </el-table-column>
+#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
+          <el-table-column label="$comment" prop="${javaField}" width="150">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
+                <el-option
+                  v-for="dict in dict.type.$column.dictType"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
+          <el-table-column label="$comment" prop="${javaField}" width="150">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
+                <el-option label="请选择字典生成" value="" />
+              </el-select>
+            </template>
+          </el-table-column>
+#end
+#end
+        </el-table>
+#end
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+
+export default {
+  name: "${BusinessName}",
+#if(${dicts} != '')
+  dicts: [${dicts}],
+#end
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+#if($table.sub)
+      // 子表选中数据
+      checked${subClassName}: [],
+#end
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // ${functionName}表格数据
+      ${businessName}List: [],
+#if($table.sub)
+      // ${subTable.functionName}表格数据
+      ${subclassName}List: [],
+#end
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      // $comment时间范围
+      daterange${AttrName}: [],
+#end
+#end
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+#foreach ($column in $columns)
+#if($column.query)
+        $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+#foreach ($column in $columns)
+#if($column.required)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+        $column.javaField: [
+          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+        ]#if($foreach.count != $columns.size()),#end
+#end
+#end
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询${functionName}列表 */
+    getList() {
+      this.loading = true;
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      this.queryParams.params = {};
+#break
+#end
+#end
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
+        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+      }
+#end
+#end
+      list${BusinessName}(this.queryParams).then(response => {
+        this.${businessName}List = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+#foreach ($column in $columns)
+#if($column.htmlType == "radio")
+        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
+#elseif($column.htmlType == "checkbox")
+        $column.javaField: []#if($foreach.count != $columns.size()),#end
+#else
+        $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+      };
+#if($table.sub)
+      this.${subclassName}List = [];
+#end
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      this.daterange${AttrName} = [];
+#end
+#end
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.${pkColumn.javaField})
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加${functionName}";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
+      get${BusinessName}(${pkColumn.javaField}).then(response => {
+        this.form = response.data;
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+        this.form.$column.javaField = this.form.${column.javaField}.split(",");
+#end
+#end
+#if($table.sub)
+        this.${subclassName}List = response.data.${subclassName}List;
+#end
+        this.open = true;
+        this.title = "修改${functionName}";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.#[[$]]#refs["form"].validate(valid => {
+        if (valid) {
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+          this.form.$column.javaField = this.form.${column.javaField}.join(",");
+#end
+#end
+#if($table.sub)
+          this.form.${subclassName}List = this.${subclassName}List;
+#end
+          if (this.form.${pkColumn.javaField} != null) {
+            update${BusinessName}(this.form).then(response => {
+              this.#[[$modal]]#.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            add${BusinessName}(this.form).then(response => {
+              this.#[[$modal]]#.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
+      this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
+        return del${BusinessName}(${pkColumn.javaField}s);
+      }).then(() => {
+        this.getList();
+        this.#[[$modal]]#.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+#if($table.sub)
+	/** ${subTable.functionName}序号 */
+    row${subClassName}Index({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** ${subTable.functionName}添加按钮操作 */
+    handleAdd${subClassName}() {
+      let obj = {};
+#foreach($column in $subTable.columns)
+#if($column.pk || $column.javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $javaField)
+      obj.$column.javaField = "";
+#end
+#end
+      this.${subclassName}List.push(obj);
+    },
+    /** ${subTable.functionName}删除按钮操作 */
+    handleDelete${subClassName}() {
+      if (this.checked${subClassName}.length == 0) {
+        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
+      } else {
+        const ${subclassName}List = this.${subclassName}List;
+        const checked${subClassName} = this.checked${subClassName};
+        this.${subclassName}List = ${subclassName}List.filter(function(item) {
+          return checked${subClassName}.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handle${subClassName}SelectionChange(selection) {
+      this.checked${subClassName} = selection.map(item => item.index)
+    },
+#end
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('${moduleName}/${businessName}/export', {
+        ...this.queryParams
+      }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
+    }
+  }
+};
+</script>

mhd-modules/mhd-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm

@@ -0,0 +1,486 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.htmlType == "input")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-input
+          v-model="queryParams.${column.javaField}"
+          placeholder="请输入${comment}"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+          <el-option
+            v-for="dict in ${dictType}"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-date-picker clearable
+          v-model="queryParams.${column.javaField}"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="选择${comment}">
+        </el-date-picker>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      <el-form-item label="${comment}" style="width: 308px">
+        <el-date-picker
+          v-model="daterange${AttrName}"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+#end
+#end
+#end
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Sort"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="${businessName}List"
+      row-key="${treeCode}"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+#foreach($column in $columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+#elseif($column.list && $column.htmlType == "datetime")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+#elseif($column.list && $column.htmlType == "imageUpload")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+        <template #default="scope">
+          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $column.dictType)
+      <el-table-column label="${comment}" align="center" prop="${javaField}">
+        <template #default="scope">
+#if($column.htmlType == "checkbox")
+          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+#else
+          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
+#end
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $javaField)
+#if(${foreach.index} == 1)
+      <el-table-column label="${comment}" prop="${javaField}" />
+#else
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#end
+#end
+#end
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:edit']"
+          >修改</el-button>
+          <el-button
+            type="text"
+            icon="Plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:add']"
+          >新增</el-button>
+          <el-button
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改${functionName}对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if("" != $treeParentCode && $column.javaField == $treeParentCode)
+        <el-form-item label="${comment}" prop="${treeParentCode}">
+          <el-tree-select
+            v-model="form.${treeParentCode}"
+            :data="${businessName}Options"
+            :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+            value-key="${treeCode}"
+            placeholder="请选择${comment}"
+            check-strictly
+          />
+        </el-form-item>
+#elseif($column.htmlType == "input")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "imageUpload")
+        <el-form-item label="${comment}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "fileUpload")
+        <el-form-item label="${comment}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "editor")
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
+#elseif($column.htmlType == "select" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.label"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+
+            ></el-option>
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "select" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "datetime")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+#elseif($column.htmlType == "textarea")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+#end
+#end
+#end
+#end
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="${BusinessName}">
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+
+const { proxy } = getCurrentInstance();
+#if(${dicts} != '')
+#set($dictsNoSymbol=$dicts.replace("'", ""))
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts});
+#end
+
+const ${businessName}List = ref([]);
+const ${businessName}Options = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const title = ref("");
+const isExpandAll = ref(true);
+const refreshTable = ref(true);
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+const daterange${AttrName} = ref([]);
+#end
+#end
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    #foreach ($column in $columns)
+#if($column.query)
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+  },
+  rules: {
+    #foreach ($column in $columns)
+#if($column.required)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+    $column.javaField: [
+      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+    ]#if($foreach.count != $columns.size()),#end
+#end
+#end
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询${functionName}列表 */
+function getList() {
+  loading.value = true;
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+  queryParams.value.params = {};
+#break
+#end
+#end
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+  if (null != daterange${AttrName} && '' != daterange${AttrName}) {
+    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0];
+    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1];
+  }
+#end
+#end
+  list${BusinessName}(queryParams.value).then(response => {
+    ${businessName}List.value = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+    loading.value = false;
+  });
+}
+
+/** 查询${functionName}下拉树结构 */
+function getTreeselect() {
+  list${BusinessName}().then(response => {
+    ${businessName}Options.value = [];
+    const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
+    data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+    ${businessName}Options.value.push(data);
+  });
+}
+	
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+#foreach ($column in $columns)
+#if($column.htmlType == "radio")
+    $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
+
+#elseif($column.htmlType == "checkbox")
+    $column.javaField: []#if($foreach.count != $columns.size()),#end
+#else
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+  };
+  proxy.resetForm("${businessName}Ref");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+  daterange${AttrName}.value = [];
+#end
+#end
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+/** 新增按钮操作 */
+function handleAdd(row) {
+  reset();
+  getTreeselect();
+  if (row != null && row.${treeCode}) {
+    form.value.${treeParentCode} = row.${treeCode};
+  } else {
+    form.value.${treeParentCode} = 0;
+  }
+  open.value = true;
+  title.value = "添加${functionName}";
+}
+
+/** 展开/折叠操作 */
+function toggleExpandAll() {
+  refreshTable.value = false;
+  isExpandAll.value = !isExpandAll.value;
+  nextTick(() => {
+    refreshTable.value = true;
+  });
+}
+
+/** 修改按钮操作 */
+async function handleUpdate(row) {
+  reset();
+  await getTreeselect();
+  if (row != null) {
+    form.value.${treeParentCode} = row.${treeCode};
+  }
+  get${BusinessName}(row.${pkColumn.javaField}).then(response => {
+    form.value = response.data;
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+    form.value.$column.javaField = form.value.${column.javaField}.split(",");
+#end
+#end
+    open.value = true;
+    title.value = "修改${functionName}";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => {
+    if (valid) {
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+      form.value.$column.javaField = form.value.${column.javaField}.join(",");
+#end
+#end
+      if (form.value.${pkColumn.javaField} != null) {
+        update${BusinessName}(form.value).then(response => {
+          proxy.#[[$modal]]#.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        add${BusinessName}(form.value).then(response => {
+          proxy.#[[$modal]]#.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
+    return del${BusinessName}(row.${pkColumn.javaField});
+  }).then(() => {
+    getList();
+    proxy.#[[$modal]]#.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+getList();
+</script>

mhd-modules/mhd-gen/src/main/resources/vm/vue/v3/index.vue.vm

@@ -0,0 +1,596 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.htmlType == "input")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-input
+          v-model="queryParams.${column.javaField}"
+          placeholder="请输入${comment}"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+          <el-option
+            v-for="dict in ${dictType}"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-date-picker clearable
+          v-model="queryParams.${column.javaField}"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择${comment}">
+        </el-date-picker>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      <el-form-item label="${comment}" style="width: 308px">
+        <el-date-picker
+          v-model="daterange${AttrName}"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+#end
+#end
+#end
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['${moduleName}:${businessName}:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['${moduleName}:${businessName}:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['${moduleName}:${businessName}:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+#foreach($column in $columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#elseif($column.list && $column.htmlType == "datetime")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+#elseif($column.list && $column.htmlType == "imageUpload")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+        <template #default="scope">
+          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $column.dictType)
+      <el-table-column label="${comment}" align="center" prop="${javaField}">
+        <template #default="scope">
+#if($column.htmlType == "checkbox")
+          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+#else
+          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
+#end
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $javaField)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#end
+#end
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:edit']"
+          >修改</el-button>
+          <el-button
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改${functionName}对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if($column.htmlType == "input")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "imageUpload")
+        <el-form-item label="${comment}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "fileUpload")
+        <el-form-item label="${comment}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "editor")
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
+#elseif($column.htmlType == "select" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.label"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+
+            ></el-option>
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "select" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "datetime")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+#elseif($column.htmlType == "textarea")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+#end
+#end
+#end
+#end
+#if($table.sub)
+        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="Plus" @click="handleAdd${subClassName}">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+#foreach($column in $subTable.columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk || $javaField == ${subTableFkclassName})
+#elseif($column.list && $column.htmlType == "input")
+          <el-table-column label="$comment" prop="${javaField}" width="150">
+            <template #default="scope">
+              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
+            </template>
+          </el-table-column>
+#elseif($column.list && $column.htmlType == "datetime")
+          <el-table-column label="$comment" prop="${javaField}" width="240">
+            <template #default="scope">
+              <el-date-picker clearable
+                v-model="scope.row.$javaField"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择$comment">
+              </el-date-picker>
+            </template>
+          </el-table-column>
+#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
+          <el-table-column label="$comment" prop="${javaField}" width="150">
+            <template #default="scope">
+              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
+                <el-option
+                  v-for="dict in $column.dictType"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
+          <el-table-column label="$comment" prop="${javaField}" width="150">
+            <template #default="scope">
+              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
+                <el-option label="请选择字典生成" value="" />
+              </el-select>
+            </template>
+          </el-table-column>
+#end
+#end
+        </el-table>
+#end
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="${BusinessName}">
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+
+const { proxy } = getCurrentInstance();
+#if(${dicts} != '')
+#set($dictsNoSymbol=$dicts.replace("'", ""))
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts});
+#end
+
+const ${businessName}List = ref([]);
+#if($table.sub)
+const ${subclassName}List = ref([]);
+#end
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+#if($table.sub)
+const checked${subClassName} = ref([]);
+#end
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+const daterange${AttrName} = ref([]);
+#end
+#end
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    #foreach ($column in $columns)
+#if($column.query)
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+  },
+  rules: {
+    #foreach ($column in $columns)
+#if($column.required)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+    $column.javaField: [
+      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+    ]#if($foreach.count != $columns.size()),#end
+#end
+#end
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询${functionName}列表 */
+function getList() {
+  loading.value = true;
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+  queryParams.value.params = {};
+#break
+#end
+#end
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+  if (null != daterange${AttrName} && '' != daterange${AttrName}) {
+    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0];
+    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1];
+  }
+#end
+#end
+  list${BusinessName}(queryParams.value).then(response => {
+    ${businessName}List.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+#foreach ($column in $columns)
+#if($column.htmlType == "radio")
+    $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
+#elseif($column.htmlType == "checkbox")
+    $column.javaField: []#if($foreach.count != $columns.size()),#end
+#else
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
+#end
+  };
+#if($table.sub)
+  ${subclassName}List.value = [];
+#end
+  proxy.resetForm("${businessName}Ref");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+  daterange${AttrName}.value = [];
+#end
+#end
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.${pkColumn.javaField});
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加${functionName}";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const ${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
+  get${BusinessName}(${pkColumn.javaField}).then(response => {
+    form.value = response.data;
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+    form.value.$column.javaField = form.value.${column.javaField}.split(",");
+#end
+#end
+#if($table.sub)
+    ${subclassName}List.value = response.data.${subclassName}List;
+#end
+    open.value = true;
+    title.value = "修改${functionName}";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => {
+    if (valid) {
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+      form.value.$column.javaField = form.value.${column.javaField}.join(",");
+#end
+#end
+#if($table.sub)
+      form.value.${subclassName}List = ${subclassName}List.value;
+#end
+      if (form.value.${pkColumn.javaField} != null) {
+        update${BusinessName}(form.value).then(response => {
+          proxy.#[[$modal]]#.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        add${BusinessName}(form.value).then(response => {
+          proxy.#[[$modal]]#.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const ${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
+  proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
+    return del${BusinessName}(${pkColumn.javaField}s);
+  }).then(() => {
+    getList();
+    proxy.#[[$modal]]#.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+#if($table.sub)
+/** ${subTable.functionName}序号 */
+function row${subClassName}Index({ row, rowIndex }) {
+  row.index = rowIndex + 1;
+}
+
+/** ${subTable.functionName}添加按钮操作 */
+function handleAdd${subClassName}() {
+  let obj = {};
+#foreach($column in $subTable.columns)
+#if($column.pk || $column.javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $javaField)
+  obj.$column.javaField = "";
+#end
+#end
+  ${subclassName}List.value.push(obj);
+}
+
+/** ${subTable.functionName}删除按钮操作 */
+function handleDelete${subClassName}() {
+  if (checked${subClassName}.value.length == 0) {
+    proxy.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
+  } else {
+    const ${subclassName}s = ${subclassName}List.value;
+    const checked${subClassName}s = checked${subClassName}.value;
+    ${subclassName}List.value = ${subclassName}s.filter(function(item) {
+      return checked${subClassName}s.indexOf(item.index) == -1
+    });
+  }
+}
+
+/** 复选框选中数据 */
+function handle${subClassName}SelectionChange(selection) {
+  checked${subClassName}.value = selection.map(item => item.index)
+}
+
+#end
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('${moduleName}/${businessName}/export', {
+    ...queryParams.value
+  }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
+}
+
+getList();
+</script>

mhd-modules/mhd-gen/src/main/resources/vm/vue/v3/readme.txt

@@ -0,0 +1 @@
+���ʹ�õ���Mhd-Cloud-Vue3ǰ�ˣ���ô��Ҫ����һ�´�Ŀ¼��ģ��index.vue.vm��index-tree.vue.vm�ļ����ϼ�vueĿ¼��

mhd-modules/mhd-gen/src/main/resources/vm/xml/mapper.xml.vm

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="${packageName}.domain.${className}.repository.mapper.${ClassName}Mapper">
+    
+    <resultMap type="${packageName}.domain.${className}.repository.po.${ClassName}PO" id="${ClassName}Result">
+#foreach ($column in $columns)
+        <result property="${column.javaField}"    column="${column.columnName}"    />
+#end
+    </resultMap>
+
+
+    <sql id="select${ClassName}Po">
+        select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
+    </sql>
+
+    <sql id="select${ClassName}Po1">
+        <where>
+#foreach($column in $columns)
+#set($queryType=$column.queryType)
+#set($javaField=$column.javaField)
+#set($javaType=$column.javaType)
+#set($columnName=$column.columnName)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#if($column.query)
+    #if($column.queryType == "EQ")
+        <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+            and $columnName = #{$javaField}
+        </if>
+    #elseif($queryType == "NE")
+        <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+            and $columnName != #{$javaField}
+        </if>
+    #elseif($queryType == "GT")
+        <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+            and $columnName &gt; #{$javaField}
+        </if>
+    #elseif($queryType == "GTE")
+        <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+            and $columnName &gt;= #{$javaField}
+        </if>
+    #elseif($queryType == "LT")
+        <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+            and $columnName &lt; #{$javaField}
+        </if>
+    #elseif($queryType == "LTE")
+        <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+            and $columnName &lt;= #{$javaField}
+        </if>
+    #elseif($queryType == "LIKE")
+        <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+            and $columnName like concat('%', #{$javaField}, '%')
+        </if>
+    #elseif($queryType == "BETWEEN")
+        <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''">
+            and $columnName between #{params.begin$AttrName} and #{params.end$AttrName}
+        </if>
+    #end
+#end
+#end
+        </where>
+    </sql>
+
+    <select id="queryList" parameterType="${packageName}.domain.${className}.repository.todo.${ClassName}DO" resultMap="${ClassName}Result">
+        <include refid="select${ClassName}Po"/>
+        <include refid="select${ClassName}Po1"/>
+    </select>
+</mapper>

mhd-modules/mhd-job/pom.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.mhd</groupId>
+        <artifactId>mhd-modules</artifactId>
+        <version>3.6.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mhd-modules-job</artifactId>
+
+    <description>
+        mhd-modules-job定时任务
+    </description>
+
+    <dependencies>
+    	
+    	<!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+        
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+		
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+		
+        <!-- Quartz -->
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.mchange</groupId>
+                    <artifactId>c3p0</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        
+        <!-- Mhd Common Log -->
+        <dependency>
+            <groupId>com.mhd</groupId>
+            <artifactId>mhd-common-log</artifactId>
+        </dependency>
+        
+        <!-- Mhd Common Swagger -->
+        <dependency>
+            <groupId>com.mhd</groupId>
+            <artifactId>mhd-common-swagger</artifactId>
+        </dependency>
+        
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+   
+</project>

mhd-modules/mhd-job/src/main/java/com/mhd/job/MhdJobApplication.java

@@ -0,0 +1,34 @@
+package com.mhd.job;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.mhd.common.security.annotation.EnableCustomConfig;
+import com.mhd.common.security.annotation.EnableRyFeignClients;
+import com.mhd.common.swagger.annotation.EnableCustomSwagger2;
+
+/**
+ * 定时任务
+ * 
+ * @author mhd
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2   
+@EnableRyFeignClients
+@SpringBootApplication(scanBasePackages = {"com.mhd"})
+public class MhdJobApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(MhdJobApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  定时任务模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/config/ScheduleConfig.java

@@ -0,0 +1,59 @@
+package com.mhd.job.config;
+
+import java.util.Properties;
+import javax.sql.DataSource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.quartz.SchedulerFactoryBean;
+
+/**
+ * 定时任务配置（单机部署建议删除此类和qrtz数据库表，默认走内存会最高效）
+ *
+ * @author mhd
+ */
+@Configuration
+public class ScheduleConfig
+{
+    @Bean
+    public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource)
+    {
+        SchedulerFactoryBean factory = new SchedulerFactoryBean();
+        factory.setDataSource(dataSource);
+
+        // quartz参数
+        Properties prop = new Properties();
+        //本身对调度程序意义不大，如果是集群模式需要同一逻辑调度程序使用相同名称
+        prop.put("org.quartz.scheduler.instanceName", "SzwlScheduler");
+        //调度程序id 配置为AUTO 自动生成
+        prop.put("org.quartz.scheduler.instanceId", "AUTO");
+        // 线程池配置
+        prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
+        prop.put("org.quartz.threadPool.threadCount", "20");
+        prop.put("org.quartz.threadPool.threadPriority", "5");
+        // JobStore配置
+        prop.put("org.quartz.jobStore.class", "org.springframework.scheduling.quartz.LocalDataSourceJobStore");
+        // 集群配置
+        prop.put("org.quartz.jobStore.isClustered", "false");
+        prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
+        prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1");
+        prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true");
+
+        // sqlserver 启用
+        // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
+        prop.put("org.quartz.jobStore.misfireThreshold", "12000");
+        prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
+        factory.setQuartzProperties(prop);
+
+        factory.setSchedulerName("SzwlScheduler");
+        // 延时启动
+        factory.setStartupDelay(1);
+        factory.setApplicationContextSchedulerContextKey("applicationContextKey");
+        // 可选，QuartzScheduler
+        // 启动时更新己存在的Job，这样就不用每次修改targetObject后删除qrtz_job_details表对应记录了
+        factory.setOverwriteExistingJobs(true);
+        // 设置自动启动，默认为true
+        factory.setAutoStartup(true);
+
+        return factory;
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/controller/SysJobController.java

@@ -0,0 +1,186 @@
+package com.mhd.job.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.mhd.job.service.ISysJobService;
+import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
+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.mhd.common.core.constant.Constants;
+import com.mhd.common.core.exception.job.TaskException;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.core.utils.poi.ExcelUtil;
+import com.mhd.common.core.web.controller.BaseController;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.core.web.page.TableDataInfo;
+import com.mhd.common.log.annotation.Log;
+import com.mhd.common.log.enums.BusinessType;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.job.domain.SysJob;
+import com.mhd.job.util.CronUtils;
+import com.mhd.job.util.ScheduleUtils;
+
+/**
+ * 调度任务信息操作处理
+ * 
+ * @author mhd
+ */
+@RestController
+@RequestMapping("/job")
+public class SysJobController extends BaseController
+{
+    @Autowired
+    private ISysJobService jobService;
+
+    /**
+     * 查询定时任务列表
+     */
+    //@RequiresPermissions("monitor:job:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysJob sysJob)
+    {
+        startPage();
+        List<SysJob> list = jobService.selectJobList(sysJob);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出定时任务列表
+     */
+    //@RequiresPermissions("monitor:job:export")
+    @Log(title = "定时任务", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysJob sysJob)
+    {
+        List<SysJob> list = jobService.selectJobList(sysJob);
+        ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class);
+        util.exportExcel(response, list, "定时任务");
+    }
+
+    /**
+     * 获取定时任务详细信息
+     */
+    //@RequiresPermissions("monitor:job:query")
+    @GetMapping(value = "/{jobId}")
+    public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
+    {
+        return AjaxResult.success(jobService.selectJobById(jobId));
+    }
+
+    /**
+     * 新增定时任务
+     */
+    //@RequiresPermissions("monitor:job:add")
+    @Log(title = "定时任务", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
+    {
+        if (!CronUtils.isValid(job.getCronExpression()))
+        {
+            return error("新增任务'" + job.getJobName() + "'失败，Cron表达式不正确");
+        }
+        else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
+        {
+            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi'调用");
+        }
+        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
+        {
+            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用");
+        }
+        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
+        {
+            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用");
+        }
+        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
+        {
+            return error("新增任务'" + job.getJobName() + "'失败，目标字符串存在违规");
+        }
+        else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
+        {
+            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不在白名单内");
+        }
+        job.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(jobService.insertJob(job));
+    }
+
+    /**
+     * 修改定时任务
+     */
+    //@RequiresPermissions("monitor:job:edit")
+    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
+    {
+        if (!CronUtils.isValid(job.getCronExpression()))
+        {
+            return error("修改任务'" + job.getJobName() + "'失败，Cron表达式不正确");
+        }
+        else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
+        {
+            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi'调用");
+        }
+        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
+        {
+            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用");
+        }
+        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
+        {
+            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用");
+        }
+        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
+        {
+            return error("修改任务'" + job.getJobName() + "'失败，目标字符串存在违规");
+        }
+        else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
+        {
+            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不在白名单内");
+        }
+        job.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(jobService.updateJob(job));
+    }
+
+    /**
+     * 定时任务状态修改
+     */
+    //@RequiresPermissions("monitor:job:changeStatus")
+    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
+    {
+        SysJob newJob = jobService.selectJobById(job.getJobId());
+        newJob.setStatus(job.getStatus());
+        return toAjax(jobService.changeStatus(newJob));
+    }
+
+    /**
+     * 定时任务立即执行一次
+     */
+    //@RequiresPermissions("monitor:job:changeStatus")
+    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/run")
+    public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
+    {
+        jobService.run(job);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 删除定时任务
+     */
+    //@RequiresPermissions("monitor:job:remove")
+    @Log(title = "定时任务", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{jobIds}")
+    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
+    {
+        jobService.deleteJobByIds(jobIds);
+        return AjaxResult.success();
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/controller/SysJobLogController.java

@@ -0,0 +1,92 @@
+package com.mhd.job.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.mhd.job.service.ISysJobLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.mhd.common.core.utils.poi.ExcelUtil;
+import com.mhd.common.core.web.controller.BaseController;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.core.web.page.TableDataInfo;
+import com.mhd.common.log.annotation.Log;
+import com.mhd.common.log.enums.BusinessType;
+import com.mhd.common.security.annotation.RequiresPermissions;
+import com.mhd.job.domain.SysJobLog;
+
+/**
+ * 调度日志操作处理
+ * 
+ * @author mhd
+ */
+@RestController
+@RequestMapping("/job/log")
+public class SysJobLogController extends BaseController
+{
+    @Autowired
+    private ISysJobLogService jobLogService;
+
+    /**
+     * 查询定时任务调度日志列表
+     */
+    @RequiresPermissions("monitor:job:list")
+    @GetMapping("/list")
+    public TableDataInfo list(SysJobLog sysJobLog)
+    {
+        startPage();
+        List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出定时任务调度日志列表
+     */
+    @RequiresPermissions("monitor:job:export")
+    @Log(title = "任务调度日志", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysJobLog sysJobLog)
+    {
+        List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
+        ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);
+        util.exportExcel(response, list, "调度日志");
+    }
+
+    /**
+     * 根据调度编号获取详细信息
+     */
+    @RequiresPermissions("monitor:job:query")
+    @GetMapping(value = "/{configId}")
+    public AjaxResult getInfo(@PathVariable Long jobLogId)
+    {
+        return AjaxResult.success(jobLogService.selectJobLogById(jobLogId));
+    }
+
+    /**
+     * 删除定时任务调度日志
+     */
+    @RequiresPermissions("monitor:job:remove")
+    @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{jobLogIds}")
+    public AjaxResult remove(@PathVariable Long[] jobLogIds)
+    {
+        return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
+    }
+
+    /**
+     * 清空定时任务调度日志
+     */
+    @RequiresPermissions("monitor:job:remove")
+    @Log(title = "调度日志", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/clean")
+    public AjaxResult clean()
+    {
+        jobLogService.cleanJobLog();
+        return AjaxResult.success();
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/domain/SysJob.java

@@ -0,0 +1,171 @@
+package com.mhd.job.domain;
+
+import java.util.Date;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.annotation.Excel.ColumnType;
+import com.mhd.common.core.constant.ScheduleConstants;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.core.web.domain.BaseEntity;
+import com.mhd.job.util.CronUtils;
+
+/**
+ * 定时任务调度表 sys_job
+ * 
+ * @author mhd
+ */
+public class SysJob extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 任务ID */
+    @Excel(name = "任务序号", cellType = ColumnType.NUMERIC)
+    private Long jobId;
+
+    /** 任务名称 */
+    @Excel(name = "任务名称")
+    private String jobName;
+
+    /** 任务组名 */
+    @Excel(name = "任务组名")
+    private String jobGroup;
+
+    /** 调用目标字符串 */
+    @Excel(name = "调用目标字符串")
+    private String invokeTarget;
+
+    /** cron执行表达式 */
+    @Excel(name = "执行表达式 ")
+    private String cronExpression;
+
+    /** cron计划策略 */
+    @Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行")
+    private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
+
+    /** 是否并发执行（0允许 1禁止） */
+    @Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止")
+    private String concurrent;
+
+    /** 任务状态（0正常 1暂停） */
+    @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
+    private String status;
+
+    public Long getJobId()
+    {
+        return jobId;
+    }
+
+    public void setJobId(Long jobId)
+    {
+        this.jobId = jobId;
+    }
+
+    @NotBlank(message = "任务名称不能为空")
+    @Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
+    public String getJobName()
+    {
+        return jobName;
+    }
+
+    public void setJobName(String jobName)
+    {
+        this.jobName = jobName;
+    }
+
+    public String getJobGroup()
+    {
+        return jobGroup;
+    }
+
+    public void setJobGroup(String jobGroup)
+    {
+        this.jobGroup = jobGroup;
+    }
+
+    @NotBlank(message = "调用目标字符串不能为空")
+    @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
+    public String getInvokeTarget()
+    {
+        return invokeTarget;
+    }
+
+    public void setInvokeTarget(String invokeTarget)
+    {
+        this.invokeTarget = invokeTarget;
+    }
+
+    @NotBlank(message = "Cron执行表达式不能为空")
+    @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
+    public String getCronExpression()
+    {
+        return cronExpression;
+    }
+
+    public void setCronExpression(String cronExpression)
+    {
+        this.cronExpression = cronExpression;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date getNextValidTime()
+    {
+        if (StringUtils.isNotEmpty(cronExpression))
+        {
+            return CronUtils.getNextExecution(cronExpression);
+        }
+        return null;
+    }
+
+    public String getMisfirePolicy()
+    {
+        return misfirePolicy;
+    }
+
+    public void setMisfirePolicy(String misfirePolicy)
+    {
+        this.misfirePolicy = misfirePolicy;
+    }
+
+    public String getConcurrent()
+    {
+        return concurrent;
+    }
+
+    public void setConcurrent(String concurrent)
+    {
+        this.concurrent = concurrent;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("jobId", getJobId())
+            .append("jobName", getJobName())
+            .append("jobGroup", getJobGroup())
+            .append("cronExpression", getCronExpression())
+            .append("nextValidTime", getNextValidTime())
+            .append("misfirePolicy", getMisfirePolicy())
+            .append("concurrent", getConcurrent())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/domain/SysJobLog.java

@@ -0,0 +1,155 @@
+package com.mhd.job.domain;
+
+import java.util.Date;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseEntity;
+
+/**
+ * 定时任务调度日志表 sys_job_log
+ * 
+ * @author mhd
+ */
+public class SysJobLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @Excel(name = "日志序号")
+    private Long jobLogId;
+
+    /** 任务名称 */
+    @Excel(name = "任务名称")
+    private String jobName;
+
+    /** 任务组名 */
+    @Excel(name = "任务组名")
+    private String jobGroup;
+
+    /** 调用目标字符串 */
+    @Excel(name = "调用目标字符串")
+    private String invokeTarget;
+
+    /** 日志信息 */
+    @Excel(name = "日志信息")
+    private String jobMessage;
+
+    /** 执行状态（0正常 1失败） */
+    @Excel(name = "执行状态", readConverterExp = "0=正常,1=失败")
+    private String status;
+
+    /** 异常信息 */
+    @Excel(name = "异常信息")
+    private String exceptionInfo;
+
+    /** 开始时间 */
+    private Date startTime;
+
+    /** 停止时间 */
+    private Date stopTime;
+
+    public Long getJobLogId()
+    {
+        return jobLogId;
+    }
+
+    public void setJobLogId(Long jobLogId)
+    {
+        this.jobLogId = jobLogId;
+    }
+
+    public String getJobName()
+    {
+        return jobName;
+    }
+
+    public void setJobName(String jobName)
+    {
+        this.jobName = jobName;
+    }
+
+    public String getJobGroup()
+    {
+        return jobGroup;
+    }
+
+    public void setJobGroup(String jobGroup)
+    {
+        this.jobGroup = jobGroup;
+    }
+
+    public String getInvokeTarget()
+    {
+        return invokeTarget;
+    }
+
+    public void setInvokeTarget(String invokeTarget)
+    {
+        this.invokeTarget = invokeTarget;
+    }
+
+    public String getJobMessage()
+    {
+        return jobMessage;
+    }
+
+    public void setJobMessage(String jobMessage)
+    {
+        this.jobMessage = jobMessage;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getExceptionInfo()
+    {
+        return exceptionInfo;
+    }
+
+    public void setExceptionInfo(String exceptionInfo)
+    {
+        this.exceptionInfo = exceptionInfo;
+    }
+
+    public Date getStartTime()
+    {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime)
+    {
+        this.startTime = startTime;
+    }
+    
+    public Date getStopTime()
+    {
+        return stopTime;
+    }
+
+    public void setStopTime(Date stopTime)
+    {
+        this.stopTime = stopTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("jobLogId", getJobLogId())
+            .append("jobName", getJobName())
+            .append("jobGroup", getJobGroup())
+            .append("jobMessage", getJobMessage())
+            .append("status", getStatus())
+            .append("exceptionInfo", getExceptionInfo())
+            .append("startTime", getStartTime())
+            .append("stopTime", getStopTime())
+            .toString();
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/feign/LogisticsServiceFeign.java

@@ -0,0 +1,18 @@
+package com.mhd.job.feign;
+
+import cn.hutool.json.JSONObject;
+import com.mhd.common.core.web.domain.AjaxResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient("mhd-special-logistics-service")
+public interface LogisticsServiceFeign {
+
+    /**
+     * 定时任务测试
+     * @param
+     * @return
+     */
+    @GetMapping("/waybill/testJob")
+    public AjaxResult testJob(@RequestParam JSONObject jsonObject);
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/feign/ProductServiceFeign.java

@@ -0,0 +1,17 @@
+package com.mhd.job.feign;
+
+import com.mhd.common.core.web.domain.AjaxResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient("mhd-product-service")
+public interface ProductServiceFeign {
+
+    /**
+     * 定时任务测试
+     * @param
+     * @return
+     */
+    @GetMapping("/tenants/getAllOut0fDate")
+    public AjaxResult getAllOut0fDate();
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/feign/TicketServiceFeign.java

@@ -0,0 +1,17 @@
+package com.mhd.job.feign;
+
+import com.mhd.common.core.web.domain.AjaxResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient("mhd-ticket-service")
+public interface TicketServiceFeign {
+
+    /**
+     * 定时任务测试
+     * @param
+     * @return
+     */
+    @GetMapping("/ticketWaybillInvoiceApi/refuseAll")
+    public AjaxResult refuseAll();
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/feign/WlhyServiceFeign.java

@@ -0,0 +1,34 @@
+package com.mhd.job.feign;
+
+import com.mhd.common.core.constant.ServiceNameConstants;
+import com.mhd.system.api.feign.FeignAutoConfiguration;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@FeignClient(contextId = "wlhyServiceFeign-job",value = ServiceNameConstants.WLHY_SERVICE,configuration = FeignAutoConfiguration.class)
+public interface WlhyServiceFeign {
+    /**
+     * 首次竞价
+     *
+     * @return
+     */
+    @PostMapping(value = "/ntocc/biddingTask/pollingBiding")
+    public void pollingBiding();
+
+    /**
+     * 二次竞价
+     *
+     * @return
+     */
+    @PostMapping(value = "/ntocc/biddingTask/pollingSecondBidding")
+    public void pollingSecondBidding();
+
+    /**
+     * 关闭超时批量货
+     *
+     * @return
+     */
+    @PostMapping(value = "/ntocc/biddingTask/pollingSecondBidding")
+    public void closeOverrunOrder();
+
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/mapper/SysJobLogMapper.java

@@ -0,0 +1,65 @@
+package com.mhd.job.mapper;
+
+import java.util.List;
+
+import com.mhd.job.domain.SysJobLog;
+
+/**
+ * 调度任务日志信息 数据层
+ * 
+ * @author mhd
+ */
+public interface SysJobLogMapper
+{
+    /**
+     * 获取quartz调度器日志的计划任务
+     * 
+     * @param jobLog 调度日志信息
+     * @return 调度任务日志集合
+     */
+    public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
+
+    /**
+     * 查询所有调度任务日志
+     *
+     * @return 调度任务日志列表
+     */
+    public List<SysJobLog> selectJobLogAll();
+
+    /**
+     * 通过调度任务日志ID查询调度信息
+     * 
+     * @param jobLogId 调度任务日志ID
+     * @return 调度任务日志对象信息
+     */
+    public SysJobLog selectJobLogById(Long jobLogId);
+
+    /**
+     * 新增任务日志
+     * 
+     * @param jobLog 调度日志信息
+     * @return 结果
+     */
+    public int insertJobLog(SysJobLog jobLog);
+
+    /**
+     * 批量删除调度日志信息
+     * 
+     * @param logIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteJobLogByIds(Long[] logIds);
+
+    /**
+     * 删除任务日志
+     * 
+     * @param jobId 调度日志ID
+     * @return 结果
+     */
+    public int deleteJobLogById(Long jobId);
+
+    /**
+     * 清空任务日志
+     */
+    public void cleanJobLog();
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/mapper/SysJobMapper.java

@@ -0,0 +1,68 @@
+package com.mhd.job.mapper;
+
+import java.util.List;
+
+import com.mhd.job.domain.SysJob;
+
+/**
+ * 调度任务信息 数据层
+ * 
+ * @author mhd
+ */
+public interface SysJobMapper
+{
+    /**
+     * 查询调度任务日志集合
+     * 
+     * @param job 调度信息
+     * @return 操作日志集合
+     */
+    public List<SysJob> selectJobList(SysJob job);
+
+    /**
+     * 查询所有调度任务
+     * 
+     * @return 调度任务列表
+     */
+    public List<SysJob> selectJobAll();
+
+    /**
+     * 通过调度ID查询调度任务信息
+     * 
+     * @param jobId 调度ID
+     * @return 角色对象信息
+     */
+    public SysJob selectJobById(Long jobId);
+
+    /**
+     * 通过调度ID删除调度任务信息
+     * 
+     * @param jobId 调度ID
+     * @return 结果
+     */
+    public int deleteJobById(Long jobId);
+
+    /**
+     * 批量删除调度任务信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteJobByIds(Long[] ids);
+
+    /**
+     * 修改调度任务信息
+     * 
+     * @param job 调度任务信息
+     * @return 结果
+     */
+    public int updateJob(SysJob job);
+
+    /**
+     * 新增调度任务信息
+     * 
+     * @param job 调度任务信息
+     * @return 结果
+     */
+    public int insertJob(SysJob job);
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/service/ISysJobLogService.java

@@ -0,0 +1,56 @@
+package com.mhd.job.service;
+
+import java.util.List;
+import com.mhd.job.domain.SysJobLog;
+
+/**
+ * 定时任务调度日志信息信息 服务层
+ * 
+ * @author mhd
+ */
+public interface ISysJobLogService
+{
+    /**
+     * 获取quartz调度器日志的计划任务
+     * 
+     * @param jobLog 调度日志信息
+     * @return 调度任务日志集合
+     */
+    public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
+
+    /**
+     * 通过调度任务日志ID查询调度信息
+     * 
+     * @param jobLogId 调度任务日志ID
+     * @return 调度任务日志对象信息
+     */
+    public SysJobLog selectJobLogById(Long jobLogId);
+
+    /**
+     * 新增任务日志
+     * 
+     * @param jobLog 调度日志信息
+     */
+    public void addJobLog(SysJobLog jobLog);
+
+    /**
+     * 批量删除调度日志信息
+     * 
+     * @param logIds 需要删除的日志ID
+     * @return 结果
+     */
+    public int deleteJobLogByIds(Long[] logIds);
+
+    /**
+     * 删除任务日志
+     * 
+     * @param jobId 调度日志ID
+     * @return 结果
+     */
+    public int deleteJobLogById(Long jobId);
+
+    /**
+     * 清空任务日志
+     */
+    public void cleanJobLog();
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/service/ISysJobService.java

@@ -0,0 +1,102 @@
+package com.mhd.job.service;
+
+import java.util.List;
+import org.quartz.SchedulerException;
+import com.mhd.common.core.exception.job.TaskException;
+import com.mhd.job.domain.SysJob;
+
+/**
+ * 定时任务调度信息信息 服务层
+ * 
+ * @author mhd
+ */
+public interface ISysJobService
+{
+    /**
+     * 获取quartz调度器的计划任务
+     * 
+     * @param job 调度信息
+     * @return 调度任务集合
+     */
+    public List<SysJob> selectJobList(SysJob job);
+
+    /**
+     * 通过调度任务ID查询调度信息
+     * 
+     * @param jobId 调度任务ID
+     * @return 调度任务对象信息
+     */
+    public SysJob selectJobById(Long jobId);
+
+    /**
+     * 暂停任务
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public int pauseJob(SysJob job) throws SchedulerException;
+
+    /**
+     * 恢复任务
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public int resumeJob(SysJob job) throws SchedulerException;
+
+    /**
+     * 删除任务后，所对应的trigger也将被删除
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public int deleteJob(SysJob job) throws SchedulerException;
+
+    /**
+     * 批量删除调度信息
+     * 
+     * @param jobIds 需要删除的任务ID
+     * @return 结果
+     */
+    public void deleteJobByIds(Long[] jobIds) throws SchedulerException;
+
+    /**
+     * 任务调度状态修改
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public int changeStatus(SysJob job) throws SchedulerException;
+
+    /**
+     * 立即运行任务
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public void run(SysJob job) throws SchedulerException;
+
+    /**
+     * 新增任务
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public int insertJob(SysJob job) throws SchedulerException, TaskException;
+
+    /**
+     * 更新任务
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public int updateJob(SysJob job) throws SchedulerException, TaskException;
+
+    /**
+     * 校验cron表达式是否有效
+     * 
+     * @param cronExpression 表达式
+     * @return 结果
+     */
+    public boolean checkCronExpressionIsValid(String cronExpression);
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/service/SysJobLogServiceImpl.java

@@ -0,0 +1,86 @@
+package com.mhd.job.service;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mhd.job.domain.SysJobLog;
+import com.mhd.job.mapper.SysJobLogMapper;
+
+/**
+ * 定时任务调度日志信息 服务层
+ * 
+ * @author mhd
+ */
+@Service
+public class SysJobLogServiceImpl implements ISysJobLogService
+{
+    @Autowired
+    private SysJobLogMapper jobLogMapper;
+
+    /**
+     * 获取quartz调度器日志的计划任务
+     * 
+     * @param jobLog 调度日志信息
+     * @return 调度任务日志集合
+     */
+    @Override
+    public List<SysJobLog> selectJobLogList(SysJobLog jobLog)
+    {
+        return jobLogMapper.selectJobLogList(jobLog);
+    }
+
+    /**
+     * 通过调度任务日志ID查询调度信息
+     * 
+     * @param jobLogId 调度任务日志ID
+     * @return 调度任务日志对象信息
+     */
+    @Override
+    public SysJobLog selectJobLogById(Long jobLogId)
+    {
+        return jobLogMapper.selectJobLogById(jobLogId);
+    }
+
+    /**
+     * 新增任务日志
+     * 
+     * @param jobLog 调度日志信息
+     */
+    @Override
+    public void addJobLog(SysJobLog jobLog)
+    {
+        jobLogMapper.insertJobLog(jobLog);
+    }
+
+    /**
+     * 批量删除调度日志信息
+     * 
+     * @param logIds 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteJobLogByIds(Long[] logIds)
+    {
+        return jobLogMapper.deleteJobLogByIds(logIds);
+    }
+
+    /**
+     * 删除任务日志
+     * 
+     * @param jobId 调度日志ID
+     */
+    @Override
+    public int deleteJobLogById(Long jobId)
+    {
+        return jobLogMapper.deleteJobLogById(jobId);
+    }
+
+    /**
+     * 清空任务日志
+     */
+    @Override
+    public void cleanJobLog()
+    {
+        jobLogMapper.cleanJobLog();
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/service/SysJobServiceImpl.java

@@ -0,0 +1,253 @@
+package com.mhd.job.service;
+
+import java.util.List;
+import javax.annotation.PostConstruct;
+import org.quartz.JobDataMap;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.mhd.common.core.constant.ScheduleConstants;
+import com.mhd.common.core.exception.job.TaskException;
+import com.mhd.job.domain.SysJob;
+import com.mhd.job.mapper.SysJobMapper;
+import com.mhd.job.util.CronUtils;
+import com.mhd.job.util.ScheduleUtils;
+
+/**
+ * 定时任务调度信息 服务层
+ * 
+ * @author mhd
+ */
+@Service
+public class SysJobServiceImpl implements ISysJobService
+{
+    @Autowired
+    private Scheduler scheduler;
+
+    @Autowired
+    private SysJobMapper jobMapper;
+
+    /**
+     * 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据）
+     */
+    @PostConstruct
+    public void init() throws SchedulerException, TaskException
+    {
+        scheduler.clear();
+        List<SysJob> jobList = jobMapper.selectJobAll();
+        for (SysJob job : jobList)
+        {
+            ScheduleUtils.createScheduleJob(scheduler, job);
+        }
+    }
+
+    /**
+     * 获取quartz调度器的计划任务列表
+     * 
+     * @param job 调度信息
+     * @return
+     */
+    @Override
+    public List<SysJob> selectJobList(SysJob job)
+    {
+        return jobMapper.selectJobList(job);
+    }
+
+    /**
+     * 通过调度任务ID查询调度信息
+     * 
+     * @param jobId 调度任务ID
+     * @return 调度任务对象信息
+     */
+    @Override
+    public SysJob selectJobById(Long jobId)
+    {
+        return jobMapper.selectJobById(jobId);
+    }
+
+    /**
+     * 暂停任务
+     * 
+     * @param job 调度信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int pauseJob(SysJob job) throws SchedulerException
+    {
+        Long jobId = job.getJobId();
+        String jobGroup = job.getJobGroup();
+        job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
+        int rows = jobMapper.updateJob(job);
+        if (rows > 0)
+        {
+            scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
+        }
+        return rows;
+    }
+
+    /**
+     * 恢复任务
+     * 
+     * @param job 调度信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int resumeJob(SysJob job) throws SchedulerException
+    {
+        Long jobId = job.getJobId();
+        String jobGroup = job.getJobGroup();
+        job.setStatus(ScheduleConstants.Status.NORMAL.getValue());
+        int rows = jobMapper.updateJob(job);
+        if (rows > 0)
+        {
+            scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup));
+        }
+        return rows;
+    }
+
+    /**
+     * 删除任务后，所对应的trigger也将被删除
+     * 
+     * @param job 调度信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteJob(SysJob job) throws SchedulerException
+    {
+        Long jobId = job.getJobId();
+        String jobGroup = job.getJobGroup();
+        int rows = jobMapper.deleteJobById(jobId);
+        if (rows > 0)
+        {
+            scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup));
+        }
+        return rows;
+    }
+
+    /**
+     * 批量删除调度信息
+     * 
+     * @param jobIds 需要删除的任务ID
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteJobByIds(Long[] jobIds) throws SchedulerException
+    {
+        for (Long jobId : jobIds)
+        {
+            SysJob job = jobMapper.selectJobById(jobId);
+            deleteJob(job);
+        }
+    }
+
+    /**
+     * 任务调度状态修改
+     * 
+     * @param job 调度信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int changeStatus(SysJob job) throws SchedulerException
+    {
+        int rows = 0;
+        String status = job.getStatus();
+        if (ScheduleConstants.Status.NORMAL.getValue().equals(status))
+        {
+            rows = resumeJob(job);
+        }
+        else if (ScheduleConstants.Status.PAUSE.getValue().equals(status))
+        {
+            rows = pauseJob(job);
+        }
+        return rows;
+    }
+
+    /**
+     * 立即运行任务
+     * 
+     * @param job 调度信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void run(SysJob job) throws SchedulerException
+    {
+        Long jobId = job.getJobId();
+        String jobGroup = job.getJobGroup();
+        SysJob properties = selectJobById(job.getJobId());
+        // 参数
+        JobDataMap dataMap = new JobDataMap();
+        dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties);
+        scheduler.triggerJob(ScheduleUtils.getJobKey(jobId, jobGroup), dataMap);
+    }
+
+    /**
+     * 新增任务
+     * 
+     * @param job 调度信息 调度信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertJob(SysJob job) throws SchedulerException, TaskException
+    {
+        job.setStatus(ScheduleConstants.Status.NORMAL.getValue());
+        int rows = jobMapper.insertJob(job);
+        if (rows > 0)
+        {
+            ScheduleUtils.createScheduleJob(scheduler, job);
+        }
+        return rows;
+    }
+
+    /**
+     * 更新任务的时间表达式
+     * 
+     * @param job 调度信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateJob(SysJob job) throws SchedulerException, TaskException
+    {
+        SysJob properties = selectJobById(job.getJobId());
+        int rows = jobMapper.updateJob(job);
+        if (rows > 0)
+        {
+            updateSchedulerJob(job, properties.getJobGroup());
+        }
+        return rows;
+    }
+
+    /**
+     * 更新任务
+     * 
+     * @param job 任务对象
+     * @param jobGroup 任务组名
+     */
+    public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException
+    {
+        Long jobId = job.getJobId();
+        // 判断是否存在
+        JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
+        if (scheduler.checkExists(jobKey))
+        {
+            // 防止创建时存在数据问题 先移除，然后在执行创建操作
+            scheduler.deleteJob(jobKey);
+        }
+        ScheduleUtils.createScheduleJob(scheduler, job);
+    }
+
+    /**
+     * 校验cron表达式是否有效
+     * 
+     * @param cronExpression 表达式
+     * @return 结果
+     */
+    @Override
+    public boolean checkCronExpressionIsValid(String cronExpression)
+    {
+        return CronUtils.isValid(cronExpression);
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/task/AppLocationTask.java

@@ -0,0 +1,124 @@
+package com.mhd.job.task;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import com.mhd.common.core.constant.Constants;
+import com.mhd.common.core.constant.NoticeConstants;
+import com.mhd.common.core.domain.dto.NoticeMessageLoggingDto;
+import com.mhd.common.core.domain.entity.R;
+import com.mhd.common.core.enums.MessageTypeEnum;
+import com.mhd.common.core.service.jPush.AsyncJPushApplicationService;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.redis.service.RedisService;
+import com.mhd.system.api.SystemServiceFeign;
+import com.mhd.system.api.UserServiceFeign;
+import com.mhd.system.api.WlhyServiceFeign;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component("appLocationTask")
+public class AppLocationTask {
+
+    @Resource
+    private WlhyServiceFeign wlhyServiceFeign;
+
+    @Resource
+    private UserServiceFeign userServiceFeign;
+
+    @Resource
+    private RedisService redisService;
+
+    @Autowired
+    private AsyncJPushApplicationService asyncJPushApplicationService;
+
+    @Resource
+    private SystemServiceFeign systemServiceFeign;
+
+    public void getUserException(){
+//        log.info("app离线司机任务开始调用，时间{}", DateUtil.date());
+        //所有在运输的司机
+        List<Long> all = new ArrayList<>();
+        //当前在线的司机
+        List<Long> online = new ArrayList<>();
+        R<List<Long>> allTransportNote = wlhyServiceFeign.getAllTransportNote();
+        if (R.SUCCESS == allTransportNote.getCode()) {
+            all = allTransportNote.getData();
+            if (all != null && all.size() > 0 ){
+                all = all.stream().distinct().collect(Collectors.toList());
+            }
+        }
+        R<List<Long>> onlineDriver = userServiceFeign.getOnlineDriver();
+        if (R.SUCCESS == onlineDriver.getCode()) {
+            online = onlineDriver.getData();
+        }
+        //所有异常离线的司机
+        List<Long> offline = getLongSubList(all, online);
+
+        /**
+         * 通过redis转换，保存已经离线的司机和
+         * 1.获取redis中离线的司机
+         * 2.去除当前和redis中的差，为当前离线的司机
+         */
+        String key = Constants.APP_OFFLINE+ "offline";
+        List<Long> redisOffline = redisService.getCacheObject(key);
+
+        //目前离线司机
+        List<Long> nowoffline = getLongSubList(offline, redisOffline);
+        //重新保存所有离线司机
+        redisService.setCacheObject(key, offline);
+
+        //开始消息推送
+        if (nowoffline != null && nowoffline.size() > 0){
+            NoticeMessageLoggingDto param = new NoticeMessageLoggingDto();
+            NoticeMessageLoggingDto common = new NoticeMessageLoggingDto();
+            common.setNoticeMessageType(MessageTypeEnum.system_notifications.getCode());
+            common.setNoticeMessageName(MessageTypeEnum.system_notifications.getInfo());
+            common.setNoticeMessageTitle(NoticeConstants.exception_offline);
+            String text = StringUtils.format(NoticeConstants.app_location_exception, DateUtil.formatDateTime(new Date()));
+            common.setNoticeMessageContent(text);
+            List<String> list = new ArrayList<>();
+            List<NoticeMessageLoggingDto> res = new ArrayList<>();
+            for (Long aLong : nowoffline) {
+                list.add(aLong.toString());
+                NoticeMessageLoggingDto fhr = new NoticeMessageLoggingDto();
+                BeanUtils.copyProperties(common,fhr);
+                fhr.setUserId(aLong);
+                res.add(fhr);
+            }
+            param.setNoticeList(res);
+            systemServiceFeign.addMessageLoggingList(param);
+            asyncJPushApplicationService.pushAndroidIndividualByAlias(NoticeConstants.exception_offline,NoticeConstants.app_location_exception, list, 0);
+            //根据szwlUserId推送前端
+            wlhyServiceFeign.pushNowOffLine(nowoffline);
+        }
+
+
+    }
+
+    /**
+     * 获取两个集合的差集
+     */
+    public static List<Long> getLongSubList(List<Long> list1, List<Long> list2) {
+        if (CollectionUtil.isEmpty(list1)  || list1.get(list1.size() -1) == null) {
+            return null;
+        }
+        if (CollectionUtil.isEmpty(list2)  || list2.get(list2.size() -1) == null) {
+            return list1;
+        }
+        return list1.stream().filter(e -> {
+            return !list2.contains(e);
+        }).collect(Collectors.toList());
+    }
+
+
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/task/BiddingTask.java

@@ -0,0 +1,37 @@
+package com.mhd.job.task;
+
+import cn.hutool.core.date.DateUtil;
+import com.mhd.job.feign.WlhyServiceFeign;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 网货竞价定时任务
+ */
+@Slf4j
+@Component("biddingTask")
+public class BiddingTask {
+
+    @Autowired
+    private WlhyServiceFeign wlhyServiceFeign;
+
+    /**
+     * 首次竞价
+     */
+    public void pollingBiding() {
+        log.info("首次竞价定时任务开始调用，时间{}", DateUtil.date());
+        wlhyServiceFeign.pollingBiding();
+        log.info("首次竞价定时任务结束调用，时间{}", DateUtil.date());
+
+    }
+
+    /**
+     * 二次竞价
+     */
+    public void pollingSecondBidding() {
+        log.info("首次竞价定时任务开始调用，时间{}", DateUtil.date());
+        wlhyServiceFeign.pollingSecondBidding();
+        log.info("首次竞价定时任务结束调用，时间{}", DateUtil.date());
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/task/RefuseInvoiceTask.java

@@ -0,0 +1,35 @@
+package com.mhd.job.task;
+
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.mhd.job.feign.TicketServiceFeign;
+import com.mhd.common.core.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component("refuseInvoiceTask")
+public class RefuseInvoiceTask {
+
+
+    @Autowired
+    private TicketServiceFeign ticketServiceFeign;
+
+    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
+    {
+        System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
+    }
+
+    public void ryParams(String params)
+    {
+        System.out.println("执行有参方法：" + params);
+    }
+
+    public void refuseAll()
+    {
+        ticketServiceFeign.refuseAll();
+        System.out.println("执行票务系统定时任务：" + DateUtil.format(new DateTime(), "yyyy年MM月dd日 HH时mm分ss秒"));
+    }
+
+
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/task/RyTask.java

@@ -0,0 +1,40 @@
+package com.mhd.job.task;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONObject;
+import com.mhd.job.feign.LogisticsServiceFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import com.mhd.common.core.utils.StringUtils;
+
+/**
+ * 定时任务调度测试
+ * 
+ * @author mhd
+ */
+@Component("ryTask")
+public class RyTask
+{
+
+    @Autowired
+    private LogisticsServiceFeign logisticsServiceFeign;
+
+    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
+    {
+        System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
+    }
+
+    public void ryParams(String params)
+    {
+        System.out.println("执行有参方法：" + params);
+    }
+
+    public void ryNoParams()
+    {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.set("waybillId","202309141102");
+        logisticsServiceFeign.testJob(jsonObject);
+        System.out.println("执行无参方法" + DateUtil.format(new DateTime(), "yyyy年MM月dd日 HH时mm分ss秒"));
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/task/TenantsOutOfDataTask.java

@@ -0,0 +1,19 @@
+package com.mhd.job.task;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.mhd.job.feign.ProductServiceFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component("tenantsOutOfDataTask")
+public class TenantsOutOfDataTask {
+    @Autowired
+    private ProductServiceFeign productServiceFeign;
+
+    public void getAllOut0fDate()
+    {
+        productServiceFeign.getAllOut0fDate();
+        System.out.println("执行租户查询停用的方法：" + DateUtil.format(new DateTime(), "yyyy年MM月dd日 HH时mm分ss秒"));
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/task/TestJob.java

@@ -0,0 +1,23 @@
+package com.mhd.job.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+
+import java.time.LocalDate;
+
+@Slf4j
+public class TestJob extends QuartzJobBean {
+
+
+    @Override
+    protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
+
+
+        log.info("============================定时任务开始执行======================");
+        System.out.println("执行定时任务" + LocalDate.now());
+        log.info("============================定时任务执行完毕======================");
+
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/task/WlhyTask.java

@@ -0,0 +1,32 @@
+package com.mhd.job.task;
+
+import cn.hutool.core.date.DateUtil;
+import com.mhd.job.feign.WlhyServiceFeign;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ZhouGY
+ * @title WlhyTask
+ * @description: 网络货运定时器
+ * @date 2024/3/25 10:28
+ **/
+@Slf4j
+@Component("wlhyTask")
+public class WlhyTask {
+
+    @Autowired
+    private WlhyServiceFeign wlhyServiceFeign;
+
+    /**
+     * @description 每天1点关闭超时批量货
+     * @author ZhouGY
+     * @date 2024/3/25 10:24
+     */
+    public void closeOverrunOrder() {
+        log.info("关闭超时批量货定时任务开始调用，时间{}", DateUtil.date());
+        wlhyServiceFeign.closeOverrunOrder();
+        log.info("关闭超时批量货定时任务结束调用，时间{}", DateUtil.date());
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/util/AbstractQuartzJob.java

@@ -0,0 +1,107 @@
+package com.mhd.job.util;
+
+import java.util.Date;
+
+import com.mhd.job.domain.SysJob;
+import com.mhd.job.domain.SysJobLog;
+import com.mhd.job.service.ISysJobLogService;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.mhd.common.core.constant.ScheduleConstants;
+import com.mhd.common.core.utils.ExceptionUtil;
+import com.mhd.common.core.utils.SpringUtils;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.core.utils.bean.BeanUtils;
+
+/**
+ * 抽象quartz调用
+ *
+ * @author mhd
+ */
+public abstract class AbstractQuartzJob implements Job
+{
+    private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class);
+
+    /**
+     * 线程本地变量
+     */
+    private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
+
+    @Override
+    public void execute(JobExecutionContext context) throws JobExecutionException
+    {
+        SysJob sysJob = new SysJob();
+        BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));
+        try
+        {
+            before(context, sysJob);
+            if (sysJob != null)
+            {
+                doExecute(context, sysJob);
+            }
+            after(context, sysJob, null);
+        }
+        catch (Exception e)
+        {
+            log.error("任务执行异常  - ：", e);
+            after(context, sysJob, e);
+        }
+    }
+
+    /**
+     * 执行前
+     *
+     * @param context 工作执行上下文对象
+     * @param sysJob 系统计划任务
+     */
+    protected void before(JobExecutionContext context, SysJob sysJob)
+    {
+        threadLocal.set(new Date());
+    }
+
+    /**
+     * 执行后
+     *
+     * @param context 工作执行上下文对象
+     * @param sysJob 系统计划任务
+     */
+    protected void after(JobExecutionContext context, SysJob sysJob, Exception e)
+    {
+        Date startTime = threadLocal.get();
+        threadLocal.remove();
+
+        final SysJobLog sysJobLog = new SysJobLog();
+        sysJobLog.setJobName(sysJob.getJobName());
+        sysJobLog.setJobGroup(sysJob.getJobGroup());
+        sysJobLog.setInvokeTarget(sysJob.getInvokeTarget());
+        sysJobLog.setStartTime(startTime);
+        sysJobLog.setStopTime(new Date());
+        long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime();
+        sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
+        if (e != null)
+        {
+            sysJobLog.setStatus("1");
+            String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000);
+            sysJobLog.setExceptionInfo(errorMsg);
+        }
+        else
+        {
+            sysJobLog.setStatus("0");
+        }
+
+        // 写入数据库当中
+        SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog);
+    }
+
+    /**
+     * 执行方法，由子类重载
+     *
+     * @param context 工作执行上下文对象
+     * @param sysJob 系统计划任务
+     * @throws Exception 执行过程中的异常
+     */
+    protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception;
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/util/CronUtils.java

@@ -0,0 +1,63 @@
+package com.mhd.job.util;
+
+import java.text.ParseException;
+import java.util.Date;
+import org.quartz.CronExpression;
+
+/**
+ * cron表达式工具类
+ * 
+ * @author mhd
+ *
+ */
+public class CronUtils
+{
+    /**
+     * 返回一个布尔值代表一个给定的Cron表达式的有效性
+     *
+     * @param cronExpression Cron表达式
+     * @return boolean 表达式是否有效
+     */
+    public static boolean isValid(String cronExpression)
+    {
+        return CronExpression.isValidExpression(cronExpression);
+    }
+
+    /**
+     * 返回一个字符串值,表示该消息无效Cron表达式给出有效性
+     *
+     * @param cronExpression Cron表达式
+     * @return String 无效时返回表达式错误描述,如果有效返回null
+     */
+    public static String getInvalidMessage(String cronExpression)
+    {
+        try
+        {
+            new CronExpression(cronExpression);
+            return null;
+        }
+        catch (ParseException pe)
+        {
+            return pe.getMessage();
+        }
+    }
+
+    /**
+     * 返回下一个执行时间根据给定的Cron表达式
+     *
+     * @param cronExpression Cron表达式
+     * @return Date 下次Cron表达式执行时间
+     */
+    public static Date getNextExecution(String cronExpression)
+    {
+        try
+        {
+            CronExpression cron = new CronExpression(cronExpression);
+            return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis()));
+        }
+        catch (ParseException e)
+        {
+            throw new IllegalArgumentException(e.getMessage());
+        }
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/util/JobInvokeUtil.java

@@ -0,0 +1,183 @@
+package com.mhd.job.util;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.mhd.job.domain.SysJob;
+import com.mhd.common.core.utils.SpringUtils;
+import com.mhd.common.core.utils.StringUtils;
+
+/**
+ * 任务执行工具
+ *
+ * @author mhd
+ */
+public class JobInvokeUtil
+{
+    /**
+     * 执行方法
+     *
+     * @param sysJob 系统任务
+     */
+    public static void invokeMethod(SysJob sysJob) throws Exception
+    {
+        String invokeTarget = sysJob.getInvokeTarget();
+        String beanName = getBeanName(invokeTarget);
+        String methodName = getMethodName(invokeTarget);
+        List<Object[]> methodParams = getMethodParams(invokeTarget);
+
+        if (!isValidClassName(beanName))
+        {
+            Object bean = SpringUtils.getBean(beanName);
+            invokeMethod(bean, methodName, methodParams);
+        }
+        else
+        {
+            Object bean = Class.forName(beanName).newInstance();
+            invokeMethod(bean, methodName, methodParams);
+        }
+    }
+
+    /**
+     * 调用任务方法
+     *
+     * @param bean 目标对象
+     * @param methodName 方法名称
+     * @param methodParams 方法参数
+     */
+    private static void invokeMethod(Object bean, String methodName, List<Object[]> methodParams)
+            throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
+            InvocationTargetException
+    {
+        if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0)
+        {
+            Method method = bean.getClass().getDeclaredMethod(methodName, getMethodParamsType(methodParams));
+            method.invoke(bean, getMethodParamsValue(methodParams));
+        }
+        else
+        {
+            Method method = bean.getClass().getDeclaredMethod(methodName);
+            method.invoke(bean);
+        }
+    }
+
+    /**
+     * 校验是否为为class包名
+     * 
+     * @param invokeTarget 名称
+     * @return true是 false否
+     */
+    public static boolean isValidClassName(String invokeTarget)
+    {
+        return StringUtils.countMatches(invokeTarget, ".") > 1;
+    }
+
+    /**
+     * 获取bean名称
+     * 
+     * @param invokeTarget 目标字符串
+     * @return bean名称
+     */
+    public static String getBeanName(String invokeTarget)
+    {
+        String beanName = StringUtils.substringBefore(invokeTarget, "(");
+        return StringUtils.substringBeforeLast(beanName, ".");
+    }
+
+    /**
+     * 获取bean方法
+     * 
+     * @param invokeTarget 目标字符串
+     * @return method方法
+     */
+    public static String getMethodName(String invokeTarget)
+    {
+        String methodName = StringUtils.substringBefore(invokeTarget, "(");
+        return StringUtils.substringAfterLast(methodName, ".");
+    }
+
+    /**
+     * 获取method方法参数相关列表
+     * 
+     * @param invokeTarget 目标字符串
+     * @return method方法相关参数列表
+     */
+    public static List<Object[]> getMethodParams(String invokeTarget)
+    {
+        String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
+        if (StringUtils.isEmpty(methodStr))
+        {
+            return null;
+        }
+        String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)");
+        List<Object[]> classs = new LinkedList<>();
+        for (int i = 0; i < methodParams.length; i++)
+        {
+            String str = StringUtils.trimToEmpty(methodParams[i]);
+            // String字符串类型，以'或"开头
+            if (StringUtils.startsWithAny(str, "'", "\""))
+            {
+                classs.add(new Object[] { StringUtils.substring(str, 1, str.length() - 1), String.class });
+            }
+            // boolean布尔类型，等于true或者false
+            else if ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str))
+            {
+                classs.add(new Object[] { Boolean.valueOf(str), Boolean.class });
+            }
+            // long长整形，以L结尾
+            else if (StringUtils.endsWith(str, "L"))
+            {
+                classs.add(new Object[] { Long.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Long.class });
+            }
+            // double浮点类型，以D结尾
+            else if (StringUtils.endsWith(str, "D"))
+            {
+                classs.add(new Object[] { Double.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Double.class });
+            }
+            // 其他类型归类为整形
+            else
+            {
+                classs.add(new Object[] { Integer.valueOf(str), Integer.class });
+            }
+        }
+        return classs;
+    }
+
+    /**
+     * 获取参数类型
+     * 
+     * @param methodParams 参数相关列表
+     * @return 参数类型列表
+     */
+    public static Class<?>[] getMethodParamsType(List<Object[]> methodParams)
+    {
+        Class<?>[] classs = new Class<?>[methodParams.size()];
+        int index = 0;
+        for (Object[] os : methodParams)
+        {
+            classs[index] = (Class<?>) os[1];
+            index++;
+        }
+        return classs;
+    }
+
+    /**
+     * 获取参数值
+     * 
+     * @param methodParams 参数相关列表
+     * @return 参数值列表
+     */
+    public static Object[] getMethodParamsValue(List<Object[]> methodParams)
+    {
+        Object[] classs = new Object[methodParams.size()];
+        int index = 0;
+        for (Object[] os : methodParams)
+        {
+            classs[index] = (Object) os[0];
+            index++;
+        }
+        return classs;
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/util/QuartzDisallowConcurrentExecution.java

@@ -0,0 +1,21 @@
+package com.mhd.job.util;
+
+import com.mhd.job.domain.SysJob;
+import org.quartz.DisallowConcurrentExecution;
+import org.quartz.JobExecutionContext;
+
+/**
+ * 定时任务处理（禁止并发执行）
+ * 
+ * @author mhd
+ *
+ */
+@DisallowConcurrentExecution
+public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob
+{
+    @Override
+    protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception
+    {
+        JobInvokeUtil.invokeMethod(sysJob);
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/util/QuartzJobExecution.java

@@ -0,0 +1,19 @@
+package com.mhd.job.util;
+
+import com.mhd.job.domain.SysJob;
+import org.quartz.JobExecutionContext;
+
+/**
+ * 定时任务处理（允许并发执行）
+ * 
+ * @author mhd
+ *
+ */
+public class QuartzJobExecution extends AbstractQuartzJob
+{
+    @Override
+    protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception
+    {
+        JobInvokeUtil.invokeMethod(sysJob);
+    }
+}

mhd-modules/mhd-job/src/main/java/com/mhd/job/util/ScheduleUtils.java

@@ -0,0 +1,134 @@
+package com.mhd.job.util;
+
+import com.mhd.job.domain.SysJob;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.CronTrigger;
+import org.quartz.Job;
+import org.quartz.JobBuilder;
+import org.quartz.JobDetail;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.TriggerBuilder;
+import org.quartz.TriggerKey;
+import com.mhd.common.core.constant.Constants;
+import com.mhd.common.core.constant.ScheduleConstants;
+import com.mhd.common.core.exception.job.TaskException;
+import com.mhd.common.core.exception.job.TaskException.Code;
+import com.mhd.common.core.utils.SpringUtils;
+import com.mhd.common.core.utils.StringUtils;
+
+/**
+ * 定时任务工具类
+ * 
+ * @author mhd
+ *
+ */
+public class ScheduleUtils
+{
+    /**
+     * 得到quartz任务类
+     *
+     * @param sysJob 执行计划
+     * @return 具体执行任务类
+     */
+    private static Class<? extends Job> getQuartzJobClass(SysJob sysJob)
+    {
+        boolean isConcurrent = "0".equals(sysJob.getConcurrent());
+        return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class;
+    }
+
+    /**
+     * 构建任务触发对象
+     */
+    public static TriggerKey getTriggerKey(Long jobId, String jobGroup)
+    {
+        return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
+    }
+
+    /**
+     * 构建任务键对象
+     */
+    public static JobKey getJobKey(Long jobId, String jobGroup)
+    {
+        return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
+    }
+
+    /**
+     * 创建定时任务
+     */
+    public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException
+    {
+        Class<? extends Job> jobClass = getQuartzJobClass(job);
+        // 构建job信息
+        Long jobId = job.getJobId();
+        String jobGroup = job.getJobGroup();
+        JobDetail jobDetail = JobBuilder.newJob(jobClass).withIdentity(getJobKey(jobId, jobGroup)).build();
+
+        // 表达式调度构建器
+        CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression());
+        cronScheduleBuilder = handleCronScheduleMisfirePolicy(job, cronScheduleBuilder);
+
+        // 按新的cronExpression表达式构建一个新的trigger
+        CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(getTriggerKey(jobId, jobGroup))
+                .withSchedule(cronScheduleBuilder).build();
+
+        // 放入参数，运行时的方法可以获取
+        jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job);
+
+        // 判断是否存在
+        if (scheduler.checkExists(getJobKey(jobId, jobGroup)))
+        {
+            // 防止创建时存在数据问题 先移除，然后在执行创建操作
+            scheduler.deleteJob(getJobKey(jobId, jobGroup));
+        }
+
+        scheduler.scheduleJob(jobDetail, trigger);
+
+        // 暂停任务
+        if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue()))
+        {
+            scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
+        }
+    }
+
+    /**
+     * 设置定时任务策略
+     */
+    public static CronScheduleBuilder handleCronScheduleMisfirePolicy(SysJob job, CronScheduleBuilder cb)
+            throws TaskException
+    {
+        switch (job.getMisfirePolicy())
+        {
+            case ScheduleConstants.MISFIRE_DEFAULT:
+                return cb;
+            case ScheduleConstants.MISFIRE_IGNORE_MISFIRES:
+                return cb.withMisfireHandlingInstructionIgnoreMisfires();
+            case ScheduleConstants.MISFIRE_FIRE_AND_PROCEED:
+                return cb.withMisfireHandlingInstructionFireAndProceed();
+            case ScheduleConstants.MISFIRE_DO_NOTHING:
+                return cb.withMisfireHandlingInstructionDoNothing();
+            default:
+                throw new TaskException("The task misfire policy '" + job.getMisfirePolicy()
+                        + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR);
+        }
+    }
+
+    /**
+     * 检查包名是否为白名单配置
+     * 
+     * @param invokeTarget 目标字符串
+     * @return 结果
+     */
+    public static boolean whiteList(String invokeTarget)
+    {
+        String packageName = StringUtils.substringBefore(invokeTarget, "(");
+        int count = StringUtils.countMatches(packageName, ".");
+        if (count > 1)
+        {
+            return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR);
+        }
+        Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
+        return StringUtils.containsAnyIgnoreCase(obj.getClass().getPackage().getName(), Constants.JOB_WHITELIST_STR);
+    }
+}

mhd-modules/mhd-job/src/main/resources/banner.txt

@@ -0,0 +1,10 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+                            _            _         _     
+                           (_)          (_)       | |    
+ _ __  _   _   ___   _   _  _  ______    _   ___  | |__  
+| '__|| | | | / _ \ | | | || ||______|  | | / _ \ | '_ \ 
+| |   | |_| || (_) || |_| || |          | || (_) || |_) |
+|_|    \__,_| \___/  \__, ||_|          | | \___/ |_.__/ 
+                      __/ |            _/ |              
+                     |___/            |__/               

mhd-modules/mhd-job/src/main/resources/bootstrap.yml

@@ -0,0 +1,29 @@
+# Tomcat
+server:
+  port: 9203
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: mhd-job
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        #server-addr: 192.168.0.69:8848
+        server-addr: 127.0.0.1:8848
+        namespace: 4dd3256a-22c0-42db-9af1-de513a05c6a9
+      config:
+          # 配置中心地址
+        #server-addr: 192.168.0.69:8848
+        server-addr: 127.0.0.1:8848
+        # 配置文件格式
+        file-extension: yml
+        namespace: 4dd3256a-22c0-42db-9af1-de513a05c6a9
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

mhd-modules/mhd-job/src/main/resources/logback.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+	<property name="log.path" value="logs/mhd-job" />
+   <!-- 日志输出格式 -->
+	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+    <!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+	</appender>
+
+    <!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+	</appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+	<logger name="com.mhd" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+
+	<root level="info">
+		<appender-ref ref="console" />
+	</root>
+	
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+    </root>
+</configuration>

mhd-modules/mhd-job/src/main/resources/mapper/job/SysJobLogMapper.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mhd.job.mapper.SysJobLogMapper">
+
+	<resultMap type="SysJobLog" id="SysJobLogResult">
+		<id     property="jobLogId"       column="job_log_id"      />
+		<result property="jobName"        column="job_name"        />
+		<result property="jobGroup"       column="job_group"       />
+		<result property="invokeTarget"   column="invoke_target"   />
+		<result property="jobMessage"     column="job_message"     />
+		<result property="status"         column="status"          />
+		<result property="exceptionInfo"  column="exception_info"  />
+		<result property="createTime"     column="create_time"     />
+	</resultMap>
+	
+	<sql id="selectJobLogVo">
+        select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time 
+		from sys_job_log
+    </sql>
+	
+	<select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult">
+		<include refid="selectJobLogVo"/>
+		<where>
+			<if test="jobName != null and jobName != ''">
+				AND job_name like concat('%', #{jobName}, '%')
+			</if>
+			<if test="jobGroup != null and jobGroup != ''">
+				AND job_group = #{jobGroup}
+			</if>
+			<if test="status != null and status != ''">
+				AND status = #{status}
+			</if>
+			<if test="invokeTarget != null and invokeTarget != ''">
+				AND invoke_target like concat('%', #{invokeTarget}, '%')
+			</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="selectJobLogAll" resultMap="SysJobLogResult">
+		<include refid="selectJobLogVo"/>
+	</select>
+	
+	<select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult">
+		<include refid="selectJobLogVo"/>
+		where job_log_id = #{jobLogId}
+	</select>
+	
+	<delete id="deleteJobLogById" parameterType="Long">
+ 		delete from sys_job_log where job_log_id = #{jobLogId}
+ 	</delete>
+ 	
+ 	<delete id="deleteJobLogByIds" parameterType="Long">
+ 		delete from sys_job_log where job_log_id in
+ 		<foreach collection="array" item="jobLogId" open="(" separator="," close=")">
+ 			#{jobLogId}
+        </foreach> 
+ 	</delete>
+ 	
+ 	<update id="cleanJobLog">
+        truncate table sys_job_log
+    </update>
+ 	
+ 	<insert id="insertJobLog" parameterType="SysJobLog">
+ 		insert into sys_job_log(
+ 			<if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
+ 			<if test="jobName != null and jobName != ''">job_name,</if>
+ 			<if test="jobGroup != null and jobGroup != ''">job_group,</if>
+ 			<if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
+ 			<if test="jobMessage != null and jobMessage != ''">job_message,</if>
+ 			<if test="status != null and status != ''">status,</if>
+ 			<if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
+ 			create_time
+ 		)values(
+ 			<if test="jobLogId != null and jobLogId != 0">#{jobLogId},</if>
+ 			<if test="jobName != null and jobName != ''">#{jobName},</if>
+ 			<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
+ 			<if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
+ 			<if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
+ 			<if test="status != null and status != ''">#{status},</if>
+ 			<if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
+ 			sysdate()
+ 		)
+	</insert>
+
+</mapper> 

mhd-modules/mhd-job/src/main/resources/mapper/job/SysJobMapper.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mhd.job.mapper.SysJobMapper">
+
+	<resultMap type="SysJob" id="SysJobResult">
+		<id     property="jobId"          column="job_id"          />
+		<result property="jobName"        column="job_name"        />
+		<result property="jobGroup"       column="job_group"       />
+		<result property="invokeTarget"   column="invoke_target"   />
+		<result property="cronExpression" column="cron_expression" />
+		<result property="misfirePolicy"  column="misfire_policy"  />
+		<result property="concurrent"     column="concurrent"      />
+		<result property="status"         column="status"          />
+		<result property="createBy"       column="create_by"       />
+		<result property="createTime"     column="create_time"     />
+		<result property="updateBy"       column="update_by"       />
+		<result property="updateTime"     column="update_time"     />
+		<result property="remark"         column="remark"          />
+	</resultMap>
+	
+	<sql id="selectJobVo">
+        select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark 
+		from sys_job
+    </sql>
+	
+	<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
+		<include refid="selectJobVo"/>
+		<where>
+			<if test="jobName != null and jobName != ''">
+				AND job_name like concat('%', #{jobName}, '%')
+			</if>
+			<if test="jobGroup != null and jobGroup != ''">
+				AND job_group = #{jobGroup}
+			</if>
+			<if test="status != null and status != ''">
+				AND status = #{status}
+			</if>
+			<if test="invokeTarget != null and invokeTarget != ''">
+				AND invoke_target like concat('%', #{invokeTarget}, '%')
+			</if>
+		</where>
+	</select>
+	
+	<select id="selectJobAll" resultMap="SysJobResult">
+		<include refid="selectJobVo"/>
+	</select>
+	
+	<select id="selectJobById" parameterType="Long" resultMap="SysJobResult">
+		<include refid="selectJobVo"/>
+		where job_id = #{jobId}
+	</select>
+	
+	<delete id="deleteJobById" parameterType="Long">
+ 		delete from sys_job where job_id = #{jobId}
+ 	</delete>
+ 	
+ 	<delete id="deleteJobByIds" parameterType="Long">
+ 		delete from sys_job where job_id in
+ 		<foreach collection="array" item="jobId" open="(" separator="," close=")">
+ 			#{jobId}
+        </foreach> 
+ 	</delete>
+ 	
+ 	<update id="updateJob" parameterType="SysJob">
+ 		update sys_job
+ 		<set>
+ 			<if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
+ 			<if test="jobGroup != null and jobGroup != ''">job_group = #{jobGroup},</if>
+ 			<if test="invokeTarget != null and invokeTarget != ''">invoke_target = #{invokeTarget},</if>
+ 			<if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
+ 			<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy = #{misfirePolicy},</if>
+ 			<if test="concurrent != null and concurrent != ''">concurrent = #{concurrent},</if>
+ 			<if test="status !=null">status = #{status},</if>
+ 			<if test="remark != null and remark != ''">remark = #{remark},</if>
+ 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			update_time = sysdate()
+ 		</set>
+ 		where job_id = #{jobId}
+	</update>
+ 	
+ 	<insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId">
+ 		insert into sys_job(
+ 			<if test="jobId != null and jobId != 0">job_id,</if>
+ 			<if test="jobName != null and jobName != ''">job_name,</if>
+ 			<if test="jobGroup != null and jobGroup != ''">job_group,</if>
+ 			<if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
+ 			<if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
+ 			<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy,</if>
+ 			<if test="concurrent != null and concurrent != ''">concurrent,</if>
+ 			<if test="status != null and status != ''">status,</if>
+ 			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			create_time
+ 		)values(
+ 			<if test="jobId != null and jobId != 0">#{jobId},</if>
+ 			<if test="jobName != null and jobName != ''">#{jobName},</if>
+ 			<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
+ 			<if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
+ 			<if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
+ 			<if test="misfirePolicy != null and misfirePolicy != ''">#{misfirePolicy},</if>
+ 			<if test="concurrent != null and concurrent != ''">#{concurrent},</if>
+ 			<if test="status != null and status != ''">#{status},</if>
+ 			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			sysdate()
+ 		)
+	</insert>
+
+</mapper> 

mhd-modules/mhd-system/Dockerfile

@@ -0,0 +1,17 @@
+# 基础镜像
+FROM  kdvolder/jdk8
+# author
+MAINTAINER manhuoda
+#指定东八区时区
+ENV TZ Asia/Shanghai
+#指定utf-8编码格
+ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
+# VOLUME 指定了临时文件目录为/tmp。
+# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp
+VOLUME /tmp
+#将当前jar 复制到容器根目录下
+ADD mhd-modules-system.jar mhd-modules-system.jar
+#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
+EXPOSE 9201
+# 运行jar包
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd-modules-system.jar"]

mhd-modules/mhd-system/pom.xml

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.mhd</groupId>
+        <artifactId>mhd-modules</artifactId>
+        <version>3.6.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mhd-modules-system</artifactId>
+
+    <description>
+        mhd-modules-system系统模块
+    </description>
+
+    <dependencies>
+
+    	<!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+    	<!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-context</artifactId>
+        </dependency>
+
+    	<!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- Mhd Common DataSource -->
+        <dependency>
+            <groupId>com.mhd</groupId>
+            <artifactId>mhd-common-datasource</artifactId>
+        </dependency>
+
+        <!-- Mhd Common DataScope -->
+        <dependency>
+            <groupId>com.mhd</groupId>
+            <artifactId>mhd-common-datascope</artifactId>
+        </dependency>
+
+        <!-- Mhd Common Log -->
+        <dependency>
+            <groupId>com.mhd</groupId>
+            <artifactId>mhd-common-log</artifactId>
+        </dependency>
+
+        <!-- Mhd Common Swagger -->
+        <dependency>
+            <groupId>com.mhd</groupId>
+            <artifactId>mhd-common-swagger</artifactId>
+        </dependency>
+
+        <!-- Lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+
+        <!-- websocket -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+
+        <!-- JPush推送 -->
+        <!-- jpush极光推送导入start -->
+<!--        <dependency>-->
+<!--            <groupId>cn.jpush.api</groupId>-->
+<!--            <artifactId>jiguang-common</artifactId>-->
+<!--            <version>1.1.10</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>cn.jpush.api</groupId>-->
+<!--            <artifactId>jpush-client</artifactId>-->
+<!--            <version>3.3.10</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>io.netty</groupId>-->
+<!--            <artifactId>netty-all</artifactId>-->
+<!--            <version>4.1.6.Final</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
+        <!-- end -->
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

mhd-modules/mhd-system/src/main/java/com/mhd/MhdSystemApplication.java

@@ -0,0 +1,36 @@
+package com.mhd;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.mhd.common.security.annotation.EnableCustomConfig;
+import com.mhd.common.security.annotation.EnableRyFeignClients;
+import com.mhd.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+/**
+ * 系统模块
+ * 
+ * @author mhd
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+@EnableAsync
+public class MhdSystemApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(MhdSystemApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  系统模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/BasicAgreementApplicationService.java

@@ -0,0 +1,221 @@
+package com.mhd.basic.application.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.mhd.basic.domain.basicAgreementAggregate.entity.BasicAgreementEntity;
+import com.mhd.basic.domain.basicAgreementAggregate.factory.BasicAgreementFactory;
+import com.mhd.basic.domain.basicAgreementAggregate.repository.po.BasicAgreementPO;
+import com.mhd.basic.domain.basicAgreementAggregate.repository.todo.BasicAgreementDO;
+import com.mhd.basic.domain.basicAgreementAggregate.service.BasicAgreementDomainService;
+import com.mhd.basic.interfaces.dto.BasicAgreementDTO;
+import com.mhd.basic.infrastructure.feign.ProductServiceFeign;
+import com.mhd.common.core.domain.po.OrganizationPo;
+import com.mhd.common.core.domain.po.SysTenantsPo;
+import com.mhd.common.core.domain.po.UserPo;
+import com.mhd.common.core.enums.DictCode;
+import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.domain.SysDictData;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.system.service.ISysDictTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@Slf4j
+public class BasicAgreementApplicationService {
+
+    @Resource
+    private BasicAgreementDomainService basicAgreementDomainService;
+    @Resource
+    private ISysDictTypeService sysDictTypeService;
+    @Autowired
+    private ProductServiceFeign productServiceFeign;
+
+    public List<BasicAgreementEntity> selectList(BasicAgreementDO basicAgreementDO) {
+        //只查询当前组织下的
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        basicAgreementDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+        return basicAgreementDomainService.selectList(basicAgreementDO);
+    }
+
+    public BasicAgreementPO findAgreement(BasicAgreementDO basicAgreementDO) {
+        return basicAgreementDomainService.findAgreement(basicAgreementDO);
+    }
+
+    public int addAgreement(BasicAgreementDO basicAgreementDO) {
+        BasicAgreementEntity basicAgreementEntity = new BasicAgreementFactory().getAgreementEntity(basicAgreementDO);
+        //查询选中的组织信息
+        if(basicAgreementEntity.getOrganizationId()==null){
+            throw new ServiceException("所属组织机构不能为空");
+        }
+        //判断协议有没有添加过
+        BasicAgreementDO basicAgreementDO1 = new BasicAgreementDO();
+        List<BasicAgreementEntity> basicAgreementEntities = basicAgreementDomainService.selectList(basicAgreementDO1);
+        if (basicAgreementEntities != null && !basicAgreementEntities.isEmpty()) {
+            throw new ServiceException("当前组织协议类型已存在");
+        }
+
+        //获取当前组织
+        AjaxResult organizationInfo = productServiceFeign.getOrganizationInfo(basicAgreementEntity.getOrganizationId());
+        if("200".equals(String.valueOf(organizationInfo.get("code")))){
+           OrganizationPo organizationPo = JSONObject.parseObject(JSONObject.toJSONString(organizationInfo.get("data")), OrganizationPo.class);
+           basicAgreementEntity.setTenantsId(organizationPo.getTenantsId());
+           basicAgreementEntity.setOrganizationId(organizationPo.getOrganizationId());
+           basicAgreementEntity.setOrganizationName(organizationPo.getOrganizationName());
+           basicAgreementEntity.setTopOrganizationId(organizationPo.getOrganizationId());
+        }
+        //填充数据
+        basicAgreementEntity.setBasicAgreementStatus(1);
+        //填充数据字典信息
+        if(StringUtils.isNotBlank(basicAgreementEntity.getBasicAgreementTypeCode())){
+            List<SysDictData> agreementList = sysDictTypeService.selectDictDataByType(DictCode.protocol.getCode());
+            if(null != agreementList && agreementList.size()>0){
+                Optional<SysDictData> sysDictDataVo = agreementList.stream().filter(item -> ObjectUtil.equal(item.getDictValue(),basicAgreementDO.getBasicAgreementTypeCode())).findAny();
+                if(sysDictDataVo.isPresent()){
+                    SysDictData sysDictDataVo1 = sysDictDataVo.get();
+                    basicAgreementEntity.setBasicAgreementTypeId(String.valueOf(sysDictDataVo1.getDictCode()));
+                    basicAgreementEntity.setBasicAgreementTypeCode(sysDictDataVo1.getDictValue());
+                    basicAgreementEntity.setBasicAgreementTypeName(sysDictDataVo1.getDictLabel());
+                }
+            }
+        }
+        return basicAgreementDomainService.addAgreement(basicAgreementEntity);
+    }
+
+    public int updateAgreement(BasicAgreementDO basicAgreementDO) {
+        //获取登录人
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        BasicAgreementEntity basicAgreementEntity = basicAgreementDomainService.selectByAgreementId(basicAgreementDO.getBasicAgreementId());
+        if (ObjectUtil.isNull(basicAgreementEntity)) {
+            throw new ServiceException("协议不存在");
+        }
+        basicAgreementEntity.setBasicAgreementContent(basicAgreementDO.getBasicAgreementContent());
+        basicAgreementEntity.setDisplayName(basicAgreementDO.getDisplayName());
+        basicAgreementEntity.setRemark(basicAgreementDO.getRemark());
+        basicAgreementEntity.setUpdateBy(loginUser.getUserid());
+        basicAgreementEntity.setUpdateTime(new Date());
+        basicAgreementEntity.setUpdateByName(loginUser.getUsername());
+        return basicAgreementDomainService.updateAgreement(basicAgreementEntity);
+    }
+
+    public int deleteByIds(List<Long> ids) {
+        return basicAgreementDomainService.deleteByIds(ids);
+    }
+
+
+    /**
+     * 根据code获取协议内容
+     * @param basicAgreementDTO
+     * @return
+     */
+    public BasicAgreementPO getAgreementByCode(BasicAgreementDTO basicAgreementDTO) {
+        if(StringUtils.isBlank(basicAgreementDTO.getAgreementCode())){
+            throw new ServiceException("协议编码不能为空");
+        }
+
+        Long organizationId = null;
+        //根据域名查询当前组织信息，如果当前组织没有配置协议，则使用平台配置的协议
+        if(StringUtils.isNotBlank(basicAgreementDTO.getPath())){
+            AjaxResult topOrganizationIdR = productServiceFeign.getOrganizationByPath(basicAgreementDTO.getPath());
+            if (ObjectUtil.isNull(topOrganizationIdR) || ObjectUtil.isNull(topOrganizationIdR.get("data"))) {
+                throw new ServiceException("组织不存在");
+            }
+            //租户一级组织ID
+            SysTenantsPo sysTenantsPo = JSONObject.parseObject(JSONObject.toJSONString(topOrganizationIdR.get("data")), SysTenantsPo.class);
+            organizationId = sysTenantsPo.getOrganizationId();
+        }
+        BasicAgreementDO basicAgreementDO = new BasicAgreementDO();
+        basicAgreementDO.setBasicAgreementTypeCode(basicAgreementDTO.getAgreementCode());
+        if(null == organizationId){
+            organizationId = 1L;
+        }
+        basicAgreementDO.setOrganizationId(organizationId);
+        BasicAgreementEntity basicAgreementEntity = basicAgreementDomainService.getAgreementByCode(basicAgreementDO);
+        BasicAgreementPO basicAgreementPO = new BasicAgreementPO();
+        if(null != basicAgreementEntity){
+            BeanUtils.copyProperties(basicAgreementEntity,basicAgreementPO);
+        }
+        return basicAgreementPO;
+    }
+
+    /**
+     * 根据id删除协议内容
+     * @param basicAgreementId
+     * @return
+     */
+    public int deleteById(Long basicAgreementId) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if(null == basicAgreementId){
+            throw new ServiceException("协议id不能为空");
+        }
+        BasicAgreementEntity basicAgreementEntity = basicAgreementDomainService.selectByAgreementId(basicAgreementId);
+        if(null == basicAgreementEntity){
+            throw new ServiceException("协议不存在");
+        }
+        basicAgreementEntity.setDelFlag(2);
+        basicAgreementEntity.setUpdateBy(loginUser.getUserid());
+        basicAgreementEntity.setUpdateByName(loginUser.getUsername());
+        basicAgreementEntity.setUpdateTime(new Date());
+        return basicAgreementDomainService.updateAgreement(basicAgreementEntity);
+    }
+
+    /**
+     * 根据id查询协议内容
+     * @param basicAgreementDO
+     * @return
+     */
+    public BasicAgreementPO findAgreementById(BasicAgreementDO basicAgreementDO) {
+        if(basicAgreementDO.getBasicAgreementId()==null){
+            throw new ServiceException("协议id不能为空");
+        }
+        BasicAgreementPO basicAgreementPO = new BasicAgreementPO();
+        BasicAgreementEntity basicAgreementEntity = basicAgreementDomainService.selectByAgreementId(basicAgreementDO.getBasicAgreementId());
+        BeanUtils.copyProperties(basicAgreementEntity,basicAgreementPO);
+        return basicAgreementPO;
+    }
+
+    /**
+     * 根据协议code和租户查询系统协议
+     */
+    public BasicAgreementEntity findAgreementByCodeAndOrg(BasicAgreementDO basicAgreementDO) {
+        return basicAgreementDomainService.findAgreementByCodeAndOrg(basicAgreementDO);
+    }
+
+    public BasicAgreementPO findAgreementByCode(BasicAgreementDO basicAgreementDO) {
+        if(StringUtils.isBlank(basicAgreementDO.getBasicAgreementTypeCode())){
+            throw new ServiceException("协议编码不能为空");
+        }
+        //获取当前登录人
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        UserPo userPo = loginUser.getUserPo();
+        Long organizationId = userPo.getOrganizationId();
+        basicAgreementDO.setOrganizationId(organizationId);
+        BasicAgreementEntity basicAgreementEntity = basicAgreementDomainService.getAgreementByCode(basicAgreementDO);
+        BasicAgreementPO basicAgreementPO = new BasicAgreementPO();
+        if (basicAgreementEntity != null){
+            BeanUtils.copyProperties(basicAgreementEntity, basicAgreementPO);
+        }else {
+            basicAgreementDO.setOrganizationId(userPo.getTopOrganizationId());
+            basicAgreementEntity = basicAgreementDomainService.getAgreementByCode(basicAgreementDO);
+            if (basicAgreementEntity != null){
+                BeanUtils.copyProperties(basicAgreementEntity, basicAgreementPO);
+            }
+        }
+        return basicAgreementPO;
+    }
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/MatterApplicationService.java

@@ -0,0 +1,117 @@
+package com.mhd.basic.application.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.basic.domain.matter.repository.po.StatisticalMattersPo;
+import com.mhd.common.core.domain.dto.StatisticalMattersDTO;
+import com.mhd.common.core.domain.todo.StatisticalMattersDo;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.TransportFeign;
+import com.mhd.system.api.UserServiceFeign;
+import com.mhd.system.api.model.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 事项 应用服务层
+ */
+@Service
+public class MatterApplicationService {
+
+    @Autowired
+    private UserServiceFeign userServiceFeign;
+
+    @Autowired
+    private TransportFeign transportFeign;
+
+    /**
+     * 统计代办事项
+     */
+    public StatisticalMattersPo statisticalMatters() {
+        //后期需要添加推送人管理，这里先临时默认查询当前网点的数据
+        //获取当前登录人
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+
+        //暂时只查询待审核承运人、待审核托运人、待审核车辆的待办事项
+
+        //待审核车辆
+        Integer vehicleWaitingReview = 0;
+
+        //待审核承运人
+        Integer driverWaitingReview = 0;
+
+        //待审核托运人
+        Integer shipperWaitingReview = 0;
+
+        StatisticalMattersDTO statisticalMattersDTO = new StatisticalMattersDTO();
+        statisticalMattersDTO.setOrganizationId(loginUser.getOrganizationPo().getOrganizationId());
+
+        AjaxResult userResult = userServiceFeign.getDriverAndShipperWaitingReviewSum(statisticalMattersDTO);
+        if ("200".equals(String.valueOf(userResult.get("code")))) {
+            Map<String, Integer> map = (Map<String, Integer>) userResult.get("data");
+            driverWaitingReview = map.get("driverWaitingReview");
+            shipperWaitingReview = map.get("shipperWaitingReview");
+        }
+
+        //待审核车辆
+        AjaxResult result = transportFeign.vehicleCountByMatter(statisticalMattersDTO);
+        if ("200".equals(String.valueOf(result.get("code")))) {
+            vehicleWaitingReview = (Integer) result.get("data");
+        }
+
+        StatisticalMattersPo statisticalMattersPo = new StatisticalMattersPo();
+        statisticalMattersPo.setDriverWaitingReview(driverWaitingReview);
+        statisticalMattersPo.setShipperWaitingReview(shipperWaitingReview);
+        statisticalMattersPo.setVehicleWaitingReview(vehicleWaitingReview);
+
+        return statisticalMattersPo;
+    }
+
+    /**
+     * 统计代办事项
+     */
+    public StatisticalMattersPo statisticalMatters(Long organizationId) {
+        //后期需要添加推送人管理，这里先临时默认查询当前网点的数据
+
+        //暂时只查询待审核承运人、待审核托运人、待审核车辆的待办事项
+
+        //待审核车辆
+        Integer vehicleWaitingReview = 0;
+
+        //待审核承运人
+        Integer driverWaitingReview = 0;
+
+        //待审核托运人
+        Integer shipperWaitingReview = 0;
+
+        StatisticalMattersDTO statisticalMattersDTO = new StatisticalMattersDTO();
+        statisticalMattersDTO.setOrganizationId(organizationId);
+
+        AjaxResult userResult = userServiceFeign.getDriverAndShipperWaitingReviewSum(statisticalMattersDTO);
+        if ("200".equals(String.valueOf(userResult.get("code")))) {
+            Map<String, Integer> map = (Map<String, Integer>) userResult.get("data");
+            driverWaitingReview = map.get("driverWaitingReview");
+            shipperWaitingReview = map.get("shipperWaitingReview");
+        }
+
+        //待审核车辆
+        AjaxResult result = transportFeign.vehicleCountByMatter(statisticalMattersDTO);
+        if ("200".equals(String.valueOf(result.get("code")))) {
+            vehicleWaitingReview = (Integer) result.get("data");
+        }
+
+        StatisticalMattersPo statisticalMattersPo = new StatisticalMattersPo();
+        statisticalMattersPo.setDriverWaitingReview(driverWaitingReview);
+        statisticalMattersPo.setShipperWaitingReview(shipperWaitingReview);
+        statisticalMattersPo.setVehicleWaitingReview(vehicleWaitingReview);
+
+        return statisticalMattersPo;
+    }
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/MessageManageApplicationService.java

@@ -0,0 +1,774 @@
+package com.mhd.basic.application.service;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.*;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.mhd.basic.interfaces.assember.MessageManageAssember;
+import com.mhd.basic.interfaces.dto.NoticeAnnouncementDto;
+import com.mhd.basic.interfaces.dto.NoticeMessageLoggingDto;
+import com.mhd.basic.domain.common.entity.DataPermission;
+import com.mhd.basic.domain.messageManage.entity.NoticeAnnouncement;
+import com.mhd.basic.domain.messageManage.entity.NoticeMessageLogging;
+import com.mhd.basic.domain.messageManage.entity.NoticeMouldManage;
+import com.mhd.basic.domain.messageManage.repository.po.NoticeAnnouncementPo;
+import com.mhd.basic.domain.messageManage.repository.po.NoticeMessageLoggingAppListPo;
+import com.mhd.basic.domain.messageManage.repository.po.NoticeMessageLoggingPo;
+import com.mhd.basic.domain.messageManage.repository.po.NoticeMouldManagePo;
+import com.mhd.basic.domain.messageManage.repository.todo.NoticeAnnouncementDo;
+import com.mhd.basic.domain.messageManage.repository.todo.NoticeMessageLoggingDo;
+import com.mhd.basic.domain.messageManage.repository.todo.NoticeMouldManageDo;
+import com.mhd.basic.domain.messageManage.service.NoticeAnnouncementDomainService;
+import com.mhd.basic.domain.messageManage.service.NoticeMessageLoggingDomainService;
+import com.mhd.basic.domain.messageManage.service.NoticeMouldManageDomainService;
+import com.mhd.basic.infrastructure.feign.SystemServiceFeign;
+import com.mhd.basic.infrastructure.feign.UserServiceFeign;
+import com.mhd.basic.infrastructure.feign.vo.SysDictDataVo;
+import com.mhd.common.core.domain.po.UserPo;
+import com.mhd.common.core.enums.DictCode;
+import com.mhd.common.core.enums.MessageTypeEnum;
+import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.service.jPush.AsyncJPushApplicationService;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.core.utils.date.DateNowString;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import io.swagger.models.auth.In;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.mhd.common.core.enums.RoleEnum.*;
+import static com.mhd.common.core.enums.RoleEnum.COMPANY;
+
+/**
+ * 消息模板配置Service业务层处理
+ *
+ * @author mhd
+ * @date 2023-03-29
+ */
+@Service
+public class MessageManageApplicationService
+{
+    @Resource
+    private NoticeMouldManageDomainService noticeMouldManageDomainService;
+    @Resource
+    private NoticeMessageLoggingDomainService noticeMessageLoggingDomainService;
+    @Resource
+    private NoticeAnnouncementDomainService noticeAnnouncementDomainService;
+    @Resource
+    private SystemServiceFeign systemServiceFeign;
+    @Resource
+    private UserServiceFeign userServiceFeign;
+    @Resource
+    private AsyncJPushApplicationService asyncJPushApplicationService;
+
+    /**
+     * 查询消息模板配置
+     *
+     * @param noticeMouldManageId 消息模板配置主键
+     * @return 消息模板配置
+     */
+    public NoticeMouldManagePo selectNoticeMouldManageById(Long noticeMouldManageId)
+    {
+        return noticeMouldManageDomainService.selectNoticeMouldManageById(noticeMouldManageId);
+    }
+
+    /**
+     * 查询消息模板配置列表
+     *
+     * @param noticeMouldManageDo 消息模板配置
+     * @return 消息模板配置
+     */
+    public List<NoticeMouldManagePo> selectNoticeMouldManageList(NoticeMouldManageDo noticeMouldManageDo)
+    {
+        return noticeMouldManageDomainService.selectNoticeMouldManageList(noticeMouldManageDo);
+    }
+
+    /**
+     * 查询通知类型模板
+     * @param noticeMouldManageDo
+     * @return
+     */
+    public List<NoticeMouldManagePo> noticeMouldManageList(NoticeMouldManageDo noticeMouldManageDo,DataPermission dataPermission) {
+        if(dataPermission != null){
+            if(dataPermission.getOrganizationIdList() != null && dataPermission.getOrganizationIdList().size() > 0){
+                noticeMouldManageDo.setOrganizationIdList(dataPermission.getOrganizationIdList());
+            }
+            if(dataPermission.getCreateBy() != null){
+                noticeMouldManageDo.setCreateBy(dataPermission.getCreateBy());
+            }
+        }
+        //首先将配置表中的当前最高组织下所有数据全部查询出来
+        Long topOrganizationId = SecurityUtils.getLoginUser().getUserPo().getTopOrganizationId();
+        noticeMouldManageDo.setOrganizationId(topOrganizationId);
+        List<NoticeMouldManagePo> noticeMouldManagePoList = noticeMouldManageDomainService.selectNoticeMouldManageList(noticeMouldManageDo);
+        List<NoticeMouldManagePo> returnList = new ArrayList<>();
+        List<SysDictDataVo> noticeTypeList = new ArrayList<>();
+        List<SysDictDataVo> noticeRoleList = new ArrayList<>();
+        //查询数据字典通知类型中的配置
+        AjaxResult ajaxResult = systemServiceFeign.selectListByDictType(DictCode.NOTICE_TYPE.getCode());
+        if("200".equals(String.valueOf(ajaxResult.get("code")))){
+            noticeTypeList = JSON.parseArray(JSONObject.toJSONString(ajaxResult.get("data")), SysDictDataVo.class);
+        }
+        //查询数据字典通知角色的配置
+        AjaxResult roleRes = systemServiceFeign.selectListByDictType(DictCode.NOTICE_ROLE.getCode());
+        if("200".equals(String.valueOf(roleRes.get("code")))){
+            noticeRoleList = JSON.parseArray(JSONObject.toJSONString(roleRes.get("data")), SysDictDataVo.class);
+        }
+        //封装通知模板list
+        if(noticeTypeList.size()==0){
+            throw new ServiceException("请先维护通知类型数据字典");
+        }
+        if(noticeRoleList.size()==0){
+            throw new ServiceException("请先维护通知角色数据字典");
+        }
+        //编辑通知类型，和通知角色，封装返回的数据列表，如果查询的数据中有，则赋值返回
+        for (SysDictDataVo typeDictData : noticeTypeList) {
+            for (SysDictDataVo roleDictData : noticeRoleList) {
+                List<NoticeMouldManagePo> noticeMouldManagePos = noticeMouldManagePoList.stream().filter(info -> ObjectUtil.equal(info.getNoticeTypeCode(),typeDictData.getDictValue())
+                        && ObjectUtil.equal(info.getNoticeRoleCode(),roleDictData.getDictValue())).collect(Collectors.toList());
+                //如果查询到数据库中有存储，则直接赋值
+                if(noticeMouldManagePos.size()>0){
+                    returnList.add(noticeMouldManagePos.get(0));
+                }else {
+                    //没找到，则给一个空的模板
+                    NoticeMouldManagePo blank = new NoticeMouldManagePo();
+                    //这里前端列表展示需要一个唯一的id，随机生成六位数
+                    blank.setNoticeMouldManageId(Long.valueOf(RandomUtil.randomNumbers(6)));
+                    blank.setNoticeTypeCode(typeDictData.getDictValue());
+                    blank.setNoticeTypeName(typeDictData.getDictLabel());
+                    blank.setNoticeRoleCode(roleDictData.getDictValue());
+                    blank.setNoticeRoleName(roleDictData.getDictLabel());
+                    returnList.add(blank);
+                }
+            }
+        }
+        return returnList;
+    }
+
+    /**
+     * 新增通知模板配置
+     * @param noticeMouldManage
+     * @return
+     */
+    public int addNoticeMould(NoticeMouldManage noticeMouldManage) {
+        //获取当前登录人最高组织
+        Long topOrganizationId = SecurityUtils.getLoginUser().getUserPo().getTopOrganizationId();
+        noticeMouldManage.setOrganizationId(topOrganizationId);
+        //填充数据字典
+//        getDictCodeInfo(noticeMouldManage);
+        return noticeMouldManageDomainService.addNoticeMould(noticeMouldManage);
+    }
+
+    /**
+     * 编辑通知模板配置
+     */
+    public int editNoticeMould(NoticeMouldManage noticeMouldManage) {
+        //获取当前登录人最高组织
+        Long topOrganizationId = SecurityUtils.getLoginUser().getUserPo().getTopOrganizationId();
+        noticeMouldManage.setOrganizationId(topOrganizationId);
+        //因为需要使用跨服务调用，这里最好查询出旧的数据做对比是否改变
+        NoticeMouldManagePo noticeMouldManageOld = noticeMouldManageDomainService.selectNoticeMouldManageById(noticeMouldManage.getNoticeMouldManageId());
+        if(null != noticeMouldManageOld){
+            if(!ObjectUtil.equal(noticeMouldManage.getNoticeTypeCode(),noticeMouldManageOld.getNoticeTypeCode())
+                    || !ObjectUtil.equal(noticeMouldManage.getNoticeRoleCode(),noticeMouldManageOld.getNoticeRoleCode())){
+                //修改填充数据字典
+//                getDictCodeInfo(noticeMouldManage);
+            }
+        }
+        return noticeMouldManageDomainService.editNoticeMould(noticeMouldManage);
+    }
+
+    /**
+     * 填充通知模板数据字典
+     * @param noticeMouldManage
+     */
+    private NoticeMouldManage getDictCodeInfo(NoticeMouldManage noticeMouldManage) {
+        List<SysDictDataVo> noticeTypeList = new ArrayList<>();
+        List<SysDictDataVo> noticeRoleList = new ArrayList<>();
+        //查询数据字典通知类型中的配置
+        AjaxResult ajaxResult = systemServiceFeign.selectListByDictType(DictCode.NOTICE_TYPE.getCode());
+        if("200".equals(String.valueOf(ajaxResult.get("code")))){
+            noticeTypeList = JSON.parseArray(JSONObject.toJSONString(ajaxResult.get("data")), SysDictDataVo.class);
+        }
+        //查询数据字典通知角色的配置
+        AjaxResult roleRes = systemServiceFeign.selectListByDictType(DictCode.NOTICE_ROLE.getCode());
+        if("200".equals(String.valueOf(roleRes.get("code")))){
+            noticeRoleList = JSON.parseArray(JSONObject.toJSONString(roleRes.get("data")), SysDictDataVo.class);
+        }
+        if(noticeTypeList.size()==0){
+            throw new ServiceException("请先维护通知类型数据字典");
+        }
+        if(noticeRoleList.size()==0){
+            throw new ServiceException("请先维护通知角色数据字典");
+        }
+        if(StringUtils.isNotEmpty(noticeMouldManage.getNoticeTypeCode())){
+            Optional<SysDictDataVo> sysDictDataVo = noticeTypeList.stream().filter(info->ObjectUtil.equal(info.getDictValue(),noticeMouldManage.getNoticeTypeCode())).findAny();
+            if(sysDictDataVo.isPresent()){
+                SysDictDataVo sysDictDataVo1 = sysDictDataVo.get();
+                noticeMouldManage.setNoticeTypeName(sysDictDataVo1.getDictLabel());
+            }
+        }
+        if(StringUtils.isNotEmpty(noticeMouldManage.getNoticeRoleCode())){
+            Optional<SysDictDataVo> sysDictDataVo = noticeTypeList.stream().filter(info->ObjectUtil.equal(info.getDictValue(),noticeMouldManage.getNoticeRoleCode())).findAny();
+            if(sysDictDataVo.isPresent()){
+                SysDictDataVo sysDictDataVo1 = sysDictDataVo.get();
+                noticeMouldManage.setNoticeRoleName(sysDictDataVo1.getDictLabel());
+            }
+        }
+        return noticeMouldManage;
+    }
+
+
+    public NoticeMouldManagePo selectMouldInfoByIds(Long noticeMouldManageId) {
+        return noticeMouldManageDomainService.selectMouldInfoByIds(noticeMouldManageId);
+    }
+
+    /**
+     * 消息记录分页列表查询
+     * @param noticeMessageLoggingDo
+     * @return
+     */
+    public List<NoticeMessageLoggingPo> noticeMessageLoggingList(NoticeMessageLoggingDo noticeMessageLoggingDo, DataPermission dataPermission) {
+        if(dataPermission != null){
+            if(dataPermission.getOrganizationIdList() != null && dataPermission.getOrganizationIdList().size() > 0){
+                noticeMessageLoggingDo.setOrganizationIdList(dataPermission.getOrganizationIdList());
+            }
+            if(dataPermission.getCreateBy() != null){
+                noticeMessageLoggingDo.setCreateBy(dataPermission.getCreateBy());
+            }
+        }
+//        noticeMessageLoggingDo.setNoticeQueryType("1");
+        return noticeMessageLoggingDomainService.selectNoticeMessageLoggingList(noticeMessageLoggingDo);
+    }
+
+    /**
+     * 消息记录统计未读消息
+     * @param noticeMessageLoggingDo
+     * @return
+     */
+    public Integer noticeMessageLoggingUnreadSum(NoticeMessageLoggingDo noticeMessageLoggingDo, DataPermission dataPermission) {
+        if(dataPermission != null){
+            if(dataPermission.getOrganizationIdList() != null && dataPermission.getOrganizationIdList().size() > 0){
+                noticeMessageLoggingDo.setOrganizationIdList(dataPermission.getOrganizationIdList());
+            }
+            if(dataPermission.getCreateBy() != null){
+                noticeMessageLoggingDo.setCreateBy(dataPermission.getCreateBy());
+            }
+        }
+//        noticeMessageLoggingDo.setNoticeQueryType("1");
+        noticeMessageLoggingDo.setMessageReadStatus(2);
+        List<NoticeMessageLoggingPo> noticeMessageLoggingPos = noticeMessageLoggingDomainService.selectNoticeMessageLoggingList(noticeMessageLoggingDo);
+        return noticeMessageLoggingPos.size();
+    }
+
+    /**
+     * 新增消息记录
+     * @param noticeMessageLogging
+     * @return
+     */
+    public boolean addMessageLogging(NoticeMessageLogging noticeMessageLogging) {
+        if(noticeMessageLogging.getUserId()!=null){
+            AjaxResult<?> ajaxResult = userServiceFeign.getInfo(noticeMessageLogging.getUserId());
+            if("200".equals(String.valueOf(ajaxResult.get("code")))){
+                Map<String,Object> map = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), Map.class);
+                UserPo userPo = JSONObject.parseObject(JSONObject.toJSONString(map), UserPo.class);
+                //根据当前用户组织信息获取到网点信息
+                if(null != userPo){
+                    noticeMessageLogging.setUserAccount(userPo.getUserAccount());
+                    noticeMessageLogging.setUserName(userPo.getUserName());
+                    noticeMessageLogging.setUserPhone(userPo.getUserPhone());
+                    noticeMessageLogging.setOrganizationId(userPo.getOrganizationId());
+                    noticeMessageLogging.setTopOrganizationId(userPo.getTopOrganizationId());
+                }
+            }
+        }
+        noticeMessageLogging.setMessageReceivingTime(new Date());
+        return noticeMessageLoggingDomainService.addMessageLogging(noticeMessageLogging);
+    }
+
+    /**
+     * 批量已读/全部已读
+     * @param noticeMessageLoggingDo
+     * @return
+     */
+    public boolean operateRead(NoticeMessageLoggingDo noticeMessageLoggingDo,DataPermission dataPermission) {
+        if(noticeMessageLoggingDo.getOperateType()==null || (noticeMessageLoggingDo.getOperateType()!=1 && noticeMessageLoggingDo.getOperateType()!=2)){
+            throw new ServiceException("操作类型未找到");
+        }
+        //批量已读
+        if(noticeMessageLoggingDo.getOperateType()==1){
+            if (ArrayUtil.isEmpty(noticeMessageLoggingDo.getNoticeMessageLoggingIds())) {
+                throw new ServiceException("操作id不能为空");
+            }
+            return noticeMessageLoggingDomainService.batchRead(noticeMessageLoggingDo);
+        } else {
+            //全部已读
+            if(dataPermission != null){
+                if (CollUtil.isNotEmpty(dataPermission.getOrganizationIdList())) {
+                    noticeMessageLoggingDo.setOrganizationIdList(dataPermission.getOrganizationIdList());
+                }
+                if(dataPermission.getCreateBy() != null){
+                    noticeMessageLoggingDo.setCreateBy(dataPermission.getCreateBy());
+                }
+            }
+            return noticeMessageLoggingDomainService.allRead(noticeMessageLoggingDo);
+        }
+    }
+
+    /**
+     * 批量删除
+     * @param noticeMessageLoggingDo
+     * @return
+     */
+    public boolean messageBatchDelete(NoticeMessageLoggingDo noticeMessageLoggingDo) {
+        return noticeMessageLoggingDomainService.messageBatchDelete(noticeMessageLoggingDo);
+    }
+
+    /**
+     * 查询当前登录用户的未读信息数量
+     * @param noticeMessageLoggingDo
+     * @param dataPermission
+     * @return
+     */
+    public Map<String, String> getUnreadInfo(NoticeMessageLoggingDo noticeMessageLoggingDo, DataPermission dataPermission) {
+        Map<String, String> res = new HashMap<>();
+        res.put("system","0");
+        res.put("transport","0");
+        res.put("finance","0");
+        res.put("sms","0");
+        res.put("event","0");
+        res.put("allCount","0");
+        if(dataPermission != null){
+            if(dataPermission.getOrganizationIdList() != null && dataPermission.getOrganizationIdList().size() > 0){
+                noticeMessageLoggingDo.setOrganizationIdList(dataPermission.getOrganizationIdList());
+            }
+            if(dataPermission.getCreateBy() != null){
+                noticeMessageLoggingDo.setCreateBy(dataPermission.getCreateBy());
+            }
+        }
+        noticeMessageLoggingDo.setMessageReadStatus(2);
+        noticeMessageLoggingDo.setNoticeQueryType("1");
+        List<NoticeMessageLoggingPo> noticeMessageLoggingPoList = noticeMessageLoggingDomainService.selectNoticeMessageLoggingList(noticeMessageLoggingDo);
+        //系统消息
+        long system = noticeMessageLoggingPoList.stream().filter(info -> ObjectUtil.equal(info.getNoticeMessageType(), MessageTypeEnum.system_notifications.getCode()) && info.getMessageReadStatus() == 2).count();
+        //物流消息
+        long transport = noticeMessageLoggingPoList.stream().filter(info -> ObjectUtil.equal(info.getNoticeMessageType(), MessageTypeEnum.logistics_assistant.getCode()) && info.getMessageReadStatus() == 2).count();
+        //财务消息
+        long finance = noticeMessageLoggingPoList.stream().filter(info -> ObjectUtil.equal(info.getNoticeMessageType(), MessageTypeEnum.service_notification.getCode()) && info.getMessageReadStatus() == 2).count();
+        //验证码
+        long sms = noticeMessageLoggingPoList.stream().filter(info -> ObjectUtil.equal(info.getNoticeMessageType(), MessageTypeEnum.code_notifications.getCode()) && info.getMessageReadStatus() == 2).count();
+        //活动通知
+        long event = noticeMessageLoggingPoList.stream().filter(info -> ObjectUtil.equal(info.getNoticeMessageType(), MessageTypeEnum.event_notification.getCode()) && info.getMessageReadStatus() == 2).count();
+        res.put("system",String.valueOf(system));
+        res.put("transport",String.valueOf(transport));
+        res.put("finance",String.valueOf(finance));
+        res.put("sms",String.valueOf(sms));
+        res.put("event",String.valueOf(event));
+        res.put("allCount",String.valueOf(noticeMessageLoggingPoList.size()));
+        return res;
+    }
+
+    /**
+     * 通知公告分页列表查询
+     * @param noticeAnnouncementDo
+     * @param dataPermission
+     * @return
+     */
+    public List<NoticeAnnouncementPo> noticeAnnouncementList(NoticeAnnouncementDo noticeAnnouncementDo, DataPermission dataPermission) {
+        if(dataPermission != null){
+            if(dataPermission.getOrganizationIdList() != null && dataPermission.getOrganizationIdList().size() > 0){
+                noticeAnnouncementDo.setOrganizationIdList(dataPermission.getOrganizationIdList());
+            }
+            if(dataPermission.getCreateBy() != null){
+                noticeAnnouncementDo.setCreateBy(dataPermission.getCreateBy());
+            }
+        }
+        return noticeAnnouncementDomainService.selectNoticeAnnouncementList(noticeAnnouncementDo);
+    }
+
+    /**
+     * 新增通知公告
+     * @param noticeAnnouncement
+     * @return
+     */
+    public boolean addNoticeAnnouncement(NoticeAnnouncement noticeAnnouncement) {
+        Long topOrganizationId = SecurityUtils.getLoginUser().getUserPo().getTopOrganizationId();
+        Long organizationId = SecurityUtils.getLoginUser().getUserPo().getOrganizationId();
+        noticeAnnouncement.setOrganizationId(organizationId);
+        noticeAnnouncement.setTopOrganizationId(topOrganizationId);
+        return noticeAnnouncementDomainService.addNoticeAnnouncement(noticeAnnouncement);
+    }
+
+    /**
+     * 编辑通知公告
+     * @param noticeAnnouncement
+     * @return
+     */
+    public boolean editNoticeAnnouncement(NoticeAnnouncement noticeAnnouncement) {
+        return noticeAnnouncementDomainService.editNoticeAnnouncement(noticeAnnouncement);
+    }
+
+    /**
+     * 根据id查询通知公告详情
+     * @param noticeAnnouncementId
+     * @return
+     */
+    public NoticeAnnouncementPo getNoticeAnnouncementInfo(Long noticeAnnouncementId) {
+        return noticeAnnouncementDomainService.selectNoticeAnnouncementById(noticeAnnouncementId);
+    }
+
+    /**
+     * 批量删除
+     * @param noticeAnnouncementDo
+     * @return
+     */
+    public boolean announcementDelete(NoticeAnnouncementDo noticeAnnouncementDo) {
+        return noticeAnnouncementDomainService.announcementDelete(noticeAnnouncementDo);
+    }
+
+
+    /**
+     * APP获取当前用户消息通知
+     * @return
+     */
+    public List<NoticeMessageLoggingPo> getAppUserNotice(NoticeMessageLoggingDo noticeMessageLoggingDo) {
+        //获取当前登录人
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if(null == loginUser){
+            throw new ServiceException("获取登录人失败");
+        }
+        noticeMessageLoggingDo.setUserId(loginUser.getUserid());
+        return noticeMessageLoggingDomainService.getAppUserNotice(noticeMessageLoggingDo);
+    }
+
+    /**
+     * APP消息中心列表查询
+     * @return
+     */
+    public NoticeMessageLoggingAppListPo getAppNoticeList() {
+        NoticeMessageLoggingAppListPo result = new NoticeMessageLoggingAppListPo();
+        NoticeMessageLoggingDo noticeMessageLoggingDo = new NoticeMessageLoggingDo();
+        //获取当前登录人
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if(null == loginUser){
+            throw new ServiceException("获取登录人失败");
+        }
+        noticeMessageLoggingDo.setUserId(loginUser.getUserid());
+        //获取每种类型的最新一条
+        List<NoticeMessageLoggingPo> noticeMessageLoggingPoList = noticeMessageLoggingDomainService.getAppNoticeList(noticeMessageLoggingDo);
+        long serviceNoticeCount = 0L;
+        long actionNoticeCount = 0L;
+        long logisticsNoticeCount = 0L;
+        long systemNoticeCount = 0L;
+        //查询用户所有未读消息
+        List<NoticeMessageLoggingPo> messageLoggingPoList = noticeMessageLoggingDomainService.getAppUserNoticeByType(noticeMessageLoggingDo);
+        messageLoggingPoList = messageLoggingPoList.stream().filter(item -> item.getMessageReadStatus()==2).collect(Collectors.toList());
+        if(messageLoggingPoList.size()>0){
+            serviceNoticeCount = messageLoggingPoList.stream().filter(item -> ObjectUtil.equal(item.getNoticeMessageType(), MessageTypeEnum.service_notification.getCode())).count();
+            actionNoticeCount = messageLoggingPoList.stream().filter(item -> ObjectUtil.equal(item.getNoticeMessageType(), MessageTypeEnum.event_notification.getCode())).count();
+            logisticsNoticeCount = messageLoggingPoList.stream().filter(item -> ObjectUtil.equal(item.getNoticeMessageType(), MessageTypeEnum.logistics_assistant.getCode())).count();
+            systemNoticeCount = messageLoggingPoList.stream().filter(item -> ObjectUtil.equal(item.getNoticeMessageType(), MessageTypeEnum.system_notifications.getCode())).count();
+        }
+        //服务通知
+        NoticeMessageLoggingAppListPo.CommonNotice serviceNotice = new NoticeMessageLoggingAppListPo.CommonNotice();
+        NoticeMessageLoggingPo noticeMessageLoggingPo = noticeMessageLoggingPoList.stream().filter(item -> ObjectUtil.equal(item.getNoticeMessageType(), MessageTypeEnum.service_notification.getCode())).findAny().orElse(null);
+        serviceNotice.setUnreadNum(String.valueOf(serviceNoticeCount));
+        if(null != noticeMessageLoggingPo){
+            serviceNotice.setNoticeMessageContent(noticeMessageLoggingPo.getNoticeMessageContent());
+            String time = DateNowString.getDateNowString(new Date(),noticeMessageLoggingPo.getMessageReceivingTime());
+            serviceNotice.setMessageReceivingTime(time);
+        }
+        //活动通知
+        NoticeMessageLoggingAppListPo.CommonNotice activityNotice = new NoticeMessageLoggingAppListPo.CommonNotice();
+        activityNotice.setUnreadNum(String.valueOf(actionNoticeCount));
+        NoticeMessageLoggingPo activityNoticeLogging = noticeMessageLoggingPoList.stream().filter(item -> ObjectUtil.equal(item.getNoticeMessageType(), MessageTypeEnum.event_notification.getCode())).findAny().orElse(null);
+        if(null != activityNoticeLogging){
+            activityNotice.setNoticeMessageContent(activityNoticeLogging.getNoticeMessageContent());
+            String time = DateNowString.getDateNowString(new Date(),activityNoticeLogging.getMessageReceivingTime());
+            activityNotice.setMessageReceivingTime(time);
+        }
+        //物流助手
+        NoticeMessageLoggingAppListPo.CommonNotice logisticsNotice = new NoticeMessageLoggingAppListPo.CommonNotice();
+        logisticsNotice.setUnreadNum(String.valueOf(logisticsNoticeCount));
+        NoticeMessageLoggingPo logisticsNoticeLogging = noticeMessageLoggingPoList.stream().filter(item -> ObjectUtil.equal(item.getNoticeMessageType(), MessageTypeEnum.logistics_assistant.getCode())).findAny().orElse(null);
+        if(null != logisticsNoticeLogging){
+            logisticsNotice.setNoticeMessageContent(logisticsNoticeLogging.getNoticeMessageContent());
+            String time = DateNowString.getDateNowString(new Date(),logisticsNoticeLogging.getMessageReceivingTime());
+            logisticsNotice.setMessageReceivingTime(time);
+        }
+        //系统消息
+        NoticeMessageLoggingAppListPo.CommonNotice systemNotice = new NoticeMessageLoggingAppListPo.CommonNotice();
+        systemNotice.setUnreadNum(String.valueOf(systemNoticeCount));
+        NoticeMessageLoggingPo systemNoticeLogging = noticeMessageLoggingPoList.stream().filter(item -> ObjectUtil.equal(item.getNoticeMessageType(), MessageTypeEnum.system_notifications.getCode())).findAny().orElse(null);
+        if(null != systemNoticeLogging){
+            systemNotice.setNoticeMessageContent(systemNoticeLogging.getNoticeMessageContent());
+            String time = DateNowString.getDateNowString(new Date(),systemNoticeLogging.getMessageReceivingTime());
+            systemNotice.setMessageReceivingTime(time);
+        }
+        result.setServiceNotice(serviceNotice);
+        result.setActivityNotice(activityNotice);
+        result.setLogisticsNotice(logisticsNotice);
+        result.setSystemNotice(systemNotice);
+        return result;
+    }
+
+    /**
+     * APP根据类型获取消息通知
+     * @param noticeMessageLoggingDo
+     * @return
+     */
+    public List<NoticeMessageLoggingPo> getAppUserNoticeByType(NoticeMessageLoggingDo noticeMessageLoggingDo) {
+        if(noticeMessageLoggingDo.getNoticeMessageType()==null){
+            throw new ServiceException("消息类型不能为空");
+        }
+        //获取当前登录人
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if(null == loginUser){
+            throw new ServiceException("获取登录人失败");
+        }
+        noticeMessageLoggingDo.setUserId(loginUser.getUserid());
+        return noticeMessageLoggingDomainService.getAppUserNoticeByType(noticeMessageLoggingDo);
+    }
+
+    /**
+     * 清除未读消息
+     * @param noticeMessageLoggingDo
+     * @return
+     */
+    public void clearUnread(NoticeMessageLoggingDo noticeMessageLoggingDo) {
+        //获取当前登录人
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if(null == loginUser){
+            throw new ServiceException("获取登录人失败");
+        }
+        LambdaUpdateWrapper<NoticeMessageLogging> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(NoticeMessageLogging::getMessageReadStatus,1);
+        updateWrapper.set(NoticeMessageLogging::getMessageReadTime,new Date());
+        updateWrapper.set(NoticeMessageLogging::getUpdateBy,loginUser.getUserid());
+        updateWrapper.set(NoticeMessageLogging::getUpdateTime,new Date());
+        updateWrapper.set(NoticeMessageLogging::getUpdateByName,loginUser.getUsername());
+
+        updateWrapper.eq(NoticeMessageLogging::getUserId,loginUser.getUserid());
+        updateWrapper.eq(NoticeMessageLogging::getMessageReadStatus,2);
+        updateWrapper.eq(NoticeMessageLogging::getDelFlag,1);
+        if(noticeMessageLoggingDo.getNoticeMessageLoggingId() != null){
+            updateWrapper.eq(NoticeMessageLogging::getNoticeMessageLoggingId,noticeMessageLoggingDo.getNoticeMessageLoggingId());
+        }else{
+            if(noticeMessageLoggingDo.getNoticeMessageType() != null){
+                updateWrapper.eq(NoticeMessageLogging::getNoticeMessageType,noticeMessageLoggingDo.getNoticeMessageType());
+            }
+        }
+        noticeMessageLoggingDomainService.updateByLambda(updateWrapper);
+    }
+
+
+    /**
+     * 批量插入消息记录
+     * @param noticeMessageLoggingDto
+     * @return
+     */
+    public boolean addMessageLoggingList(NoticeMessageLoggingDto noticeMessageLoggingDto) {
+        //获取当前登录人
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        List<NoticeMessageLogging> noticeMessageLoggingList = new ArrayList<>();
+        List<NoticeMessageLoggingDto> messageLoggingDtoList = noticeMessageLoggingDto.getNoticeList();
+        if(messageLoggingDtoList==null || messageLoggingDtoList.size()==0){
+            throw new ServiceException("插入消息实体不能为空");
+        }
+        for (NoticeMessageLoggingDto messageLoggingDto : messageLoggingDtoList) {
+            NoticeMessageLogging noticeMessageLogging = new MessageManageAssember().toNoticeMessageDo(messageLoggingDto);
+            if(messageLoggingDto.getUserId()==null){
+                noticeMessageLogging.setUserId(loginUser.getUserid());
+            }
+            AjaxResult<?> ajaxResult = userServiceFeign.getInfo(noticeMessageLogging.getUserId());
+            if("200".equals(String.valueOf(ajaxResult.get("code")))){
+                Map<String,Object> map = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), Map.class);
+                UserPo userPo = JSONObject.parseObject(JSONObject.toJSONString(map), UserPo.class);
+                //根据当前用户组织信息获取到网点信息
+                if(null != userPo){
+                    noticeMessageLogging.setUserAccount(userPo.getUserAccount());
+                    noticeMessageLogging.setUserName(userPo.getUserName());
+                    noticeMessageLogging.setUserPhone(userPo.getUserPhone());
+                    noticeMessageLogging.setOrganizationId(userPo.getOrganizationId());
+                    noticeMessageLogging.setTopOrganizationId(userPo.getTopOrganizationId());
+                    noticeMessageLogging.setMessageReceivingTime(DateUtil.date());
+                }
+            }
+            noticeMessageLoggingList.add(noticeMessageLogging);
+        }
+        return noticeMessageLoggingDomainService.addMessageLoggingList(noticeMessageLoggingList);
+    }
+
+    /**
+     * APP获取消息未读数量
+     * @return
+     */
+    public int getAppNoticeListNum() {
+        int num = 0;
+        NoticeMessageLoggingAppListPo noticeMessageLoggingAppListPo = getAppNoticeList();
+        if(null != noticeMessageLoggingAppListPo){
+            NoticeMessageLoggingAppListPo.CommonNotice one = noticeMessageLoggingAppListPo.getActivityNotice();
+            NoticeMessageLoggingAppListPo.CommonNotice two = noticeMessageLoggingAppListPo.getLogisticsNotice();
+            NoticeMessageLoggingAppListPo.CommonNotice three = noticeMessageLoggingAppListPo.getServiceNotice();
+            NoticeMessageLoggingAppListPo.CommonNotice four = noticeMessageLoggingAppListPo.getSystemNotice();
+            num = Integer.parseInt(one.getUnreadNum()) + Integer.parseInt(two.getUnreadNum()) + Integer.parseInt(three.getUnreadNum()) + Integer.parseInt(four.getUnreadNum());
+        }
+        return num;
+    }
+
+
+    /**
+     * pc 回复消息
+     *
+     * @param noticeMessageLoggingDto
+     * @return
+     */
+    public Boolean replyModal(NoticeMessageLoggingDto noticeMessageLoggingDto) {
+        //获取当前登录人
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+
+        if (ObjectUtil.isNull(noticeMessageLoggingDto.getNoticeMessageLoggingId())) {
+            throw new ServiceException("消息记录ID不能为空");
+        }
+
+        NoticeMessageLoggingPo noticeMessageLoggingPo = noticeMessageLoggingDomainService.selectNoticeMessageLoggingById(noticeMessageLoggingDto.getNoticeMessageLoggingId());
+        if (ObjectUtil.isNull(noticeMessageLoggingPo)) {
+            throw new ServiceException("消息记录不存在");
+        }
+
+        NoticeMessageLogging noticeMessageLogging = new NoticeMessageLogging();
+
+        noticeMessageLogging.setNoticeMessageLoggingId(noticeMessageLoggingDto.getNoticeMessageLoggingId());
+        noticeMessageLogging.setReplyContent(noticeMessageLoggingDto.getReplyContent());
+        noticeMessageLogging.setReplyBy(loginUser.getUserid().toString());
+        noticeMessageLogging.setReplyByName(loginUser.getUsername());
+        noticeMessageLogging.setReplyTime(DateUtil.date());
+        noticeMessageLogging.setUpdateBy(loginUser.getUserid());
+        noticeMessageLogging.setUpdateByName(loginUser.getUsername());
+        noticeMessageLogging.setUpdateTime(DateUtil.date());
+        noticeMessageLogging.setMessageReadStatus(3);
+
+        boolean b = noticeMessageLoggingDomainService.updateById(noticeMessageLogging);
+
+        if (ObjectUtil.isNotNull(noticeMessageLoggingPo.getUserId())) {
+            asyncJPushApplicationService.pushAndroidIndividualByAlia("投诉意见回复", noticeMessageLoggingDto.getReplyContent(), noticeMessageLoggingPo.getUserId().toString(), 0);
+        }
+
+        return b;
+    }
+
+    public boolean noticeAnnouncementInfoPush(NoticeAnnouncementDto noticeAnnouncementDto) {
+        Long id = noticeAnnouncementDto.getNoticeAnnouncementId();
+
+        String type = noticeAnnouncementDto.getPushType();
+
+        if (ObjUtil.isNull(id) || StrUtil.isEmpty(type)) {
+            throw new ServiceException("缺少必要参数");
+        }
+
+        List<String> roles = new ArrayList<>();
+        Integer userType = null;
+        //通知角色类型 1-全部 2-承运人 3-托运人
+        switch (type) {
+            case "1":
+                roles = Arrays.asList(SHIPPER.getCode(), COMPANY.getCode(), DRIVER.getCode(), CARRIER.getCode(), CAPTAIN.getCode());
+                break;
+            case "2":
+                userType = 0;
+                roles = Arrays.asList(DRIVER.getCode(), CARRIER.getCode(), CAPTAIN.getCode());
+                break;
+            case "3":
+                userType = 1;
+                roles = Arrays.asList(SHIPPER.getCode(), COMPANY.getCode());
+                break;
+            default:
+                throw new ServiceException("推送类型错误");
+        }
+
+        NoticeAnnouncementPo noticeAnnouncementPo = noticeAnnouncementDomainService.selectNoticeAnnouncementById(id);
+        if (ObjUtil.isNull(noticeAnnouncementPo)) {
+            throw new ServiceException("公告不存在");
+        }
+
+        String title = noticeAnnouncementPo.getNoticeAnnouncementTitle();
+
+        String content = noticeAnnouncementPo.getNoticeAnnouncementContent();
+
+        //获取相应用户ID
+        AjaxResult result = userServiceFeign.getUserIdByRoleCode(roles);
+        if (!"200".equals(String.valueOf(result.get("code")))) {
+            throw new ServiceException("获取推送用户失败");
+        }
+        List<String> list = JSONUtil.toList(JSONObject.toJSONString(result.get("data")), String.class);
+
+        if (userType != null){
+            asyncJPushApplicationService.pushAndroidIndividualByAlias(title, content, list, userType);
+        }else {
+            asyncJPushApplicationService.pushAndroidIndividualByAlias(title, content, list, 0);
+            asyncJPushApplicationService.pushAndroidIndividualByAlias(title, content, list, 1);
+        }
+
+        return true;
+    }
+
+    public List<NoticeAnnouncementPo> announcementHomeList() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        NoticeAnnouncementDo noticeAnnouncementDo = new NoticeAnnouncementDo();
+        List<Long> organizationIdList = new ArrayList<>();
+        organizationIdList.add(loginUser.getUserPo().getOrganizationId());
+        noticeAnnouncementDo.setOrganizationIdList(organizationIdList);
+        return noticeAnnouncementDomainService.selectNoticeAnnouncementList(noticeAnnouncementDo);
+    }
+
+    public List<NoticeMessageLoggingPo> noticeHomeList() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        NoticeMessageLoggingDo noticeMessageLoggingDo = new NoticeMessageLoggingDo();
+        noticeMessageLoggingDo.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+        noticeMessageLoggingDo.setUserId(loginUser.getUserid());
+        noticeMessageLoggingDo.setNoticeMessageType("-1");
+        return noticeMessageLoggingDomainService.selectNoticeMessageLoggingList(noticeMessageLoggingDo);
+    }
+
+    public List<NoticeMessageLoggingPo> taskHomeList() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        NoticeMessageLoggingDo noticeMessageLoggingDo = new NoticeMessageLoggingDo();
+        noticeMessageLoggingDo.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+        noticeMessageLoggingDo.setUserId(loginUser.getUserid());
+        noticeMessageLoggingDo.setNoticeMessageType("7");
+        return noticeMessageLoggingDomainService.selectNoticeMessageLoggingList(noticeMessageLoggingDo);
+    }
+
+    public Map<String, String> noticeAnnouncementHomeListCount() {
+        Map<String, String> map = new HashMap<>();
+        List<NoticeMessageLoggingPo> noticeMessageLoggingPoList =noticeHomeList();
+        noticeMessageLoggingPoList = noticeMessageLoggingPoList.stream().filter(item -> item.getMessageReadStatus()==2).collect(Collectors.toList());
+        String notice = String.valueOf(noticeMessageLoggingPoList.size());
+        String announcement = String.valueOf(announcementHomeList().size());
+        List<NoticeMessageLoggingPo> noticeMessageLoggingPoListTwo =taskHomeList();
+        noticeMessageLoggingPoListTwo = noticeMessageLoggingPoListTwo.stream().filter(item -> item.getMessageReadStatus()==2).collect(Collectors.toList());
+        String task = String.valueOf(noticeMessageLoggingPoListTwo.size());
+        map.put("notice",notice);
+        map.put("announcement",announcement);
+        map.put("task",task);
+        return map;
+    }
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/SysAppVersionManageApplicationService.java

@@ -0,0 +1,133 @@
+package com.mhd.basic.application.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.basic.domain.common.entity.DataPermission;
+import com.mhd.basic.domain.sysAppVersionManage.entity.SysAppVersionManage;
+import com.mhd.basic.domain.sysAppVersionManage.repository.po.SysAppVersionManagePo;
+import com.mhd.basic.domain.sysAppVersionManage.repository.po.SysAppVersionUpdatePo;
+import com.mhd.basic.domain.sysAppVersionManage.repository.todo.SysAppVersionManageDo;
+import com.mhd.basic.domain.sysAppVersionManage.service.SysAppVersionManageDomainService;
+import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.system.service.ISysDictDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * APP版本管理Service业务层处理
+ *
+ * @author mhd
+ * @date 2023-03-22
+ */
+@Service
+public class SysAppVersionManageApplicationService
+{
+    @Autowired
+    private SysAppVersionManageDomainService sysAppVersionManageDomainService;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+
+    /**
+     * 查询APP版本管理
+     *
+     * @param sysAppVersionManageId APP版本管理主键
+     * @return APP版本管理
+     */
+    public SysAppVersionManagePo selectSysAppVersionManageBySysAppVersionManageId(Long sysAppVersionManageId)
+    {
+        return sysAppVersionManageDomainService.selectSysAppVersionManageBySysAppVersionManageId(sysAppVersionManageId);
+    }
+
+    /**
+     * 查询APP版本管理列表
+     *
+     * @param sysAppVersionManageDo APP版本管理
+     * @return APP版本管理
+     */
+    public List<SysAppVersionManagePo> selectSysAppVersionManageList(SysAppVersionManageDo sysAppVersionManageDo)
+    {
+        return sysAppVersionManageDomainService.selectSysAppVersionManageList(sysAppVersionManageDo);
+    }
+
+    /**
+     * 新增APP版本管理
+     * @param sysAppVersionManage
+     * @return
+     */
+    public boolean addAppVersionManage(SysAppVersionManage sysAppVersionManage) {
+        //获取当前登录人，获取当前登录人的租户
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        sysAppVersionManage.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+        sysAppVersionManage.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+        sysAppVersionManage.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+        return sysAppVersionManageDomainService.addAppVersionManage(sysAppVersionManage);
+    }
+
+    /**
+     * 编辑APP版本管理
+     * @param sysAppVersionManage
+     * @return
+     */
+    public boolean updateAppVersionManage(SysAppVersionManage sysAppVersionManage) {
+        return sysAppVersionManageDomainService.updateAppVersionManage(sysAppVersionManage);
+    }
+
+    /**
+     * 根据id查询版本管理详情
+     * @param sysAppVersionManageId
+     * @return
+     */
+    public SysAppVersionManagePo getAppVersionManage(Long sysAppVersionManageId) {
+        return sysAppVersionManageDomainService.selectSysAppVersionManageBySysAppVersionManageId(sysAppVersionManageId);
+    }
+
+    /**
+     * 根据id删除
+     * @param sysAppVersionManageDo
+     * @return
+     */
+    public boolean deleteAppVersionManage(SysAppVersionManageDo sysAppVersionManageDo) {
+        return sysAppVersionManageDomainService.deleteAppVersionManage(sysAppVersionManageDo);
+    }
+
+    /**
+     * APP版本管理分页列表查询
+     * @param sysAppVersionManageDo
+     * @param dataPermission
+     * @return
+     */
+    public List<SysAppVersionManagePo> selectAppVersionManageList(SysAppVersionManageDo sysAppVersionManageDo, DataPermission dataPermission) {
+        return sysAppVersionManageDomainService.selectSysAppVersionManageList(sysAppVersionManageDo);
+    }
+
+    /**
+     * 查询APP升级记录
+     * @param sysAppVersionManageDo
+     * @param dataPermission
+     * @return
+     */
+    public List<SysAppVersionManagePo> selectAppVersionHistoryList(SysAppVersionManageDo sysAppVersionManageDo, DataPermission dataPermission) {
+        return sysAppVersionManageDomainService.selectAppVersionHistoryList(sysAppVersionManageDo);
+    }
+
+    /**
+     * 根据APP包名查询APP版本更新信息
+     * @param sysAppVersionManageDo
+     * @return
+     */
+    public SysAppVersionUpdatePo getAppVersionManageInfo(SysAppVersionManageDo sysAppVersionManageDo) {
+        if(StringUtils.isEmpty(sysAppVersionManageDo.getAppMark())){
+            throw new ServiceException("APP包名不能为空");
+        }
+        return sysAppVersionManageDomainService.getAppVersionManageInfo(sysAppVersionManageDo.getAppMark());
+    }
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/SysMultistageDictApplicationService.java

@@ -0,0 +1,243 @@
+package com.mhd.basic.application.service;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.basic.infrastructure.feign.ProductServiceFeign;
+import com.mhd.basic.interfaces.dto.SysMultistageDictDto;
+import com.mhd.basic.domain.common.entity.DataPermission;
+import com.mhd.basic.domain.sysMultistageDict.entity.SysMultistageDict;
+import com.mhd.basic.domain.sysMultistageDict.repository.po.SysMultistageDictPo;
+import com.mhd.basic.domain.sysMultistageDict.repository.todo.SysMultistageDictDo;
+import com.mhd.basic.domain.sysMultistageDict.service.SysMultistageDictDomainService;
+import com.mhd.common.core.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 多级分类字典Service业务层处理
+ *
+ * @author mhd
+ * @date 2023-03-21
+ */
+@Service
+public class SysMultistageDictApplicationService
+{
+    @Autowired
+    private SysMultistageDictDomainService sysMultistageDictDomainService;
+    @Resource
+    private ProductServiceFeign productServiceFeign;
+
+
+    /**
+     * 查询多级分类字典
+     *
+     * @param sysMultistageDictId 多级分类字典主键
+     * @return 多级分类字典
+     */
+    public SysMultistageDictPo selectSysMultistageDictById(Long sysMultistageDictId)
+    {
+        return sysMultistageDictDomainService.selectSysMultistageDictById(sysMultistageDictId);
+    }
+
+    /**
+     * 查询多级分类字典列表
+     *
+     * @param sysMultistageDictDo 多级分类字典
+     * @return 多级分类字典
+     */
+    public List<SysMultistageDictPo> selectSysMultistageDictList(SysMultistageDictDo sysMultistageDictDo)
+    {
+        return sysMultistageDictDomainService.selectSysMultistageDictList(sysMultistageDictDo);
+    }
+
+    /**
+     * 查询多级分类字典
+     * @param sysMultistageDictDo
+     * @return
+     */
+    public List<SysMultistageDictPo> selectMultistageDictList(SysMultistageDictDo sysMultistageDictDo, DataPermission dataPermission) {
+//        if(ObjectUtil.isNotEmpty(dataPermission)){
+//            if(dataPermission.getOrganizationIdList() != null && dataPermission.getOrganizationIdList().size() > 0){
+//                sysMultistageDictDo.setOrganizationIdList(dataPermission.getOrganizationIdList());
+//            }
+//            if(dataPermission.getCreateBy() != null){
+//                sysMultistageDictDo.setCreateBy(dataPermission.getCreateBy());
+//            }
+//        }
+        return sysMultistageDictDomainService.selectSysMultistageDictList(sysMultistageDictDo);
+    }
+
+    /**
+     * 查询多级分类字典
+     * @param sysMultistageDictDo
+     * @return
+     */
+    public List<SysMultistageDictPo> getMultistageDictList(SysMultistageDictDo sysMultistageDictDo) {
+        return sysMultistageDictDomainService.selectSysMultistageDictList(sysMultistageDictDo);
+    }
+
+    /**
+     * 查询多级分类字典（app）
+     * @param sysMultistageDictDo
+     * @return
+     */
+    public List<SysMultistageDictPo> selectAppMultistageDictList(SysMultistageDictDo sysMultistageDictDo) {
+        sysMultistageDictDo.setTopParentDictCode("goods_name");
+        if(StringUtils.isNotEmpty(sysMultistageDictDo.getMultistageDictName())){
+            sysMultistageDictDo.setNotParentCode("goods_name");
+        }
+        return sysMultistageDictDomainService.selectSysMultistageDictList(sysMultistageDictDo);
+    }
+
+    /**
+     * 新增多级分类字典
+     * @param sysMultistageDict
+     * @return
+     */
+    public boolean addMultistageDict(SysMultistageDict sysMultistageDict) {
+        return sysMultistageDictDomainService.addMultistageDict(sysMultistageDict);
+    }
+
+    /**
+     * 新增多级分类字典 - 开放接口
+     */
+    public boolean addMultistageDictByOpen(SysMultistageDict sysMultistageDict) {
+        return sysMultistageDictDomainService.addMultistageDictByOpen(sysMultistageDict);
+    }
+
+    /**
+     * 编辑多级分类字典
+     * @param sysMultistageDict
+     * @return
+     */
+    public boolean updateMultistageDict(SysMultistageDict sysMultistageDict) {
+        return sysMultistageDictDomainService.updateMultistageDict(sysMultistageDict);
+    }
+
+    /**
+     * 根据id查询多级字典信息
+     * @param sysMultistageDictId
+     * @return
+     */
+    public SysMultistageDictPo getMultistageDictInfo(Long sysMultistageDictId) {
+        return sysMultistageDictDomainService.getMultistageDictInfo(sysMultistageDictId);
+    }
+
+    /**
+     * 根据id删除字典数据
+     * @param sysMultistageDictDo
+     * @return
+     */
+    public boolean deleteMultistageDictById(SysMultistageDictDo sysMultistageDictDo) {
+        return sysMultistageDictDomainService.deleteMultistageDictById(sysMultistageDictDo);
+    }
+
+    /**
+     * 字典启用停用
+     * @param sysMultistageDictDo
+     * @return
+     */
+    public boolean changeDictStatus(SysMultistageDictDo sysMultistageDictDo) {
+        return sysMultistageDictDomainService.changeDictStatus(sysMultistageDictDo);
+    }
+
+    /**
+     * 查询多级分类字典，树状 (只能从顶级开始)
+     * @param sysMultistageDictDo
+     * @param dataPermission
+     * @return
+     */
+    public List<SysMultistageDictPo> selectMultistageDictTreeList(SysMultistageDictDo sysMultistageDictDo, DataPermission dataPermission) {
+        //查询出所有数据
+        if(ObjectUtil.isNotEmpty(dataPermission)){
+            if(dataPermission.getOrganizationIdList() != null && dataPermission.getOrganizationIdList().size() > 0){
+                sysMultistageDictDo.setOrganizationIdList(dataPermission.getOrganizationIdList());
+            }
+            if(dataPermission.getCreateBy() != null){
+                sysMultistageDictDo.setCreateBy(dataPermission.getCreateBy());
+            }
+        }
+        List<SysMultistageDictPo> treeList = new ArrayList<>();
+        List<SysMultistageDictPo> sysMultistageDictPoList = sysMultistageDictDomainService.selectSysMultistageDictList(sysMultistageDictDo);
+        if (CollectionUtil.isNotEmpty(sysMultistageDictPoList)){
+            Map<String, List<SysMultistageDictPo>> collect = sysMultistageDictPoList.stream().collect(Collectors.groupingBy(SysMultistageDictPo::getParentDictCode));
+            treeList = recursionMethod(treeList,collect);
+        }
+        return treeList;
+    }
+
+    /**
+     * 递归方法转换成树形结构
+     * @param treeList
+     * @return
+     */
+    public List<SysMultistageDictPo> recursionMethod(List<SysMultistageDictPo> treeList, Map<String, List<SysMultistageDictPo>> collect) {
+        if (treeList != null && !treeList.isEmpty()){
+            for (SysMultistageDictPo sysMultistageDictPo : treeList) {
+                String parentDictList = sysMultistageDictPo.getParentDictList();
+                if (StringUtils.isNotBlank(parentDictList)){
+                    sysMultistageDictPo.setGrade(parentDictList.split(",").length);
+                }else {
+                    sysMultistageDictPo.setGrade(0);
+                }
+                List<SysMultistageDictPo> sysMultistageDictPos = collect.get(sysMultistageDictPo.getMultistageDictCode());
+                 if (ObjectUtil.isNotEmpty(sysMultistageDictPos)){
+                     collect.remove(sysMultistageDictPo.getMultistageDictCode());
+                     sysMultistageDictPos = recursionMethod(sysMultistageDictPos, collect);
+                     sysMultistageDictPo.setSysMultistageDictPoList(sysMultistageDictPos);
+                 }
+            }
+            return treeList;
+        }else {
+            List<SysMultistageDictPo> sysMultistageDictPos = collect.get("");
+            if (CollectionUtil.isNotEmpty(sysMultistageDictPos)){
+                collect.remove("");
+                treeList = recursionMethod(sysMultistageDictPos, collect);
+            }
+            return treeList;
+        }
+    }
+
+    /**
+     * 递归方法
+     *
+     * @param tree     父节点对象
+     * @param treeList 所有的List
+     */
+    public static SysMultistageDictPo findChildren(SysMultistageDictPo tree, List<SysMultistageDictPo> treeList) {
+        List<SysMultistageDictPo> trees = treeList.stream().filter(e -> ObjectUtil.equal(e.getParentDictCode(),tree.getMultistageDictCode())).collect(Collectors.toList());
+        if (!trees.isEmpty()){
+            List<SysMultistageDictPo> list = new ArrayList<>();
+            for (SysMultistageDictPo sysMultistageDictPo : trees) {
+                SysMultistageDictPo children = findChildren(sysMultistageDictPo, treeList);
+                list.add(children);
+            }
+            tree.setSysMultistageDictPoList(list);
+        }
+        return tree;
+    }
+
+
+    /**
+     * 根据字典code,父级字典code 查询字典信息
+     * @param sysMultistageDictDto
+     * @return
+     */
+    public SysMultistageDictPo getMultistageDictInfoByCode(SysMultistageDictDto sysMultistageDictDto) {
+        return sysMultistageDictDomainService.getMultistageDictInfoByCode(sysMultistageDictDto);
+    }
+
+    public SysMultistageDictPo getSysMultistageDictByCodeAndTopOrgId(String code, Long topOrgId) {
+          return sysMultistageDictDomainService.getSysMultistageDictByCodeAndTopOrgId(code,topOrgId);
+    }
+
+    public List<SysMultistageDict> getMultistageDictListByTopCodeAndTopOrgId(String topCode, Long topOrgId) {
+        return sysMultistageDictDomainService.getMultistageDictListByTopCodeAndTopOrgId(topCode,topOrgId);
+    }
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/SysPictureManageApplicationService.java

@@ -0,0 +1,217 @@
+package com.mhd.basic.application.service;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.mhd.basic.domain.common.entity.DataPermission;
+import com.mhd.basic.domain.sysMultistageDict.repository.po.SysMultistageDictPo;
+import com.mhd.basic.domain.sysPictureManage.entity.SysPictureManage;
+import com.mhd.basic.domain.sysPictureManage.repository.po.SysPictureManagePo;
+import com.mhd.basic.domain.sysPictureManage.repository.todo.SysPictureManageDo;
+import com.mhd.basic.domain.sysPictureManage.service.SysPictureManageDomainService;
+import com.mhd.basic.infrastructure.feign.ProductServiceFeign;
+import com.mhd.basic.infrastructure.feign.vo.SysDictDataVo;
+import com.mhd.common.core.domain.dto.SysMultistageDictDto;
+import com.mhd.common.core.domain.po.OrganizationPo;
+import com.mhd.common.core.enums.DictCode;
+import com.mhd.common.core.enums.PageBelongImgEnum;
+import com.mhd.common.core.enums.PictureTypeEnum;
+import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.SystemServiceFeign;
+import com.mhd.system.api.model.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 图片管理Service业务层处理
+ *
+ * @author mhd
+ * @date 2023-03-22
+ */
+@Service
+public class SysPictureManageApplicationService
+{
+    @Autowired
+    private SysPictureManageDomainService sysPictureManageDomainService;
+    @Resource
+    private SystemServiceFeign systemServiceFeign;
+
+    /**
+     * 查询图片管理
+     *
+     * @param sysPictureManageId 图片管理主键
+     * @return 图片管理
+     */
+    public SysPictureManagePo selectSysPictureManageBySysPictureManageId(Long sysPictureManageId)
+    {
+        return sysPictureManageDomainService.selectSysPictureManageBySysPictureManageId(sysPictureManageId);
+    }
+
+    /**
+     * 查询图片管理列表
+     *
+     * @param sysPictureManageDo 图片管理
+     * @return 图片管理
+     */
+    public List<SysPictureManagePo> selectSysPictureManageList(SysPictureManageDo sysPictureManageDo,DataPermission dataPermission)
+    {
+        //查询当前租户配置的
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        sysPictureManageDo.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+        return sysPictureManageDomainService.selectSysPictureManageList(sysPictureManageDo);
+    }
+
+    /**
+     * 新增图片管理
+     * @param sysPictureManage
+     * @return
+     */
+    public boolean addPictureManage(SysPictureManage sysPictureManage) {
+        //查询当前租户配置的
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+
+        //补全数据字典信息
+        completionDictionary(sysPictureManage);
+
+        sysPictureManage.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+        return sysPictureManageDomainService.addPictureManage(sysPictureManage);
+    }
+
+    /**
+     * 编辑图片管理
+     * @param sysPictureManage
+     * @return
+     */
+    public boolean updatePictureManage(SysPictureManage sysPictureManage) {
+
+        //补全数据字典信息
+        completionDictionary(sysPictureManage);
+
+        return sysPictureManageDomainService.updatePictureManage(sysPictureManage);
+    }
+
+    /**
+     * 补全数据字典信息
+     */
+    public void completionDictionary(SysPictureManage sysPictureManage) {
+        //补全所属门面
+        SysMultistageDictDto sysMultistageDictDto = new SysMultistageDictDto();
+        sysMultistageDictDto.setParentDictCode(PageBelongImgEnum.picture_management.getCode());
+        AjaxResult belongPage = systemServiceFeign.selectMultistageDictList(sysMultistageDictDto);
+        if ("200".equals(String.valueOf(belongPage.get("code")))) {
+            List<SysMultistageDictPo> sysDictDataVoList = JSON.parseArray(JSONObject.toJSONString(belongPage.get("data")), SysMultistageDictPo.class);
+            sysDictDataVoList.stream().filter(item -> ObjectUtil.equal(item.getMultistageDictCode(), sysPictureManage.getBelongPageCode())).findAny().ifPresent(belongDict -> sysPictureManage.setBelongPageValue(belongDict.getMultistageDictName()));
+        }
+        //补全图片类型
+        sysMultistageDictDto.setParentDictCode(sysPictureManage.getBelongPageCode());
+        AjaxResult pictureType = systemServiceFeign.selectMultistageDictList(sysMultistageDictDto);
+        if ("200".equals(String.valueOf(pictureType.get("code")))) {
+            List<SysMultistageDictPo> sysDictDataVoList = JSON.parseArray(JSONObject.toJSONString(pictureType.get("data")), SysMultistageDictPo.class);
+            sysDictDataVoList.stream().filter(item -> ObjectUtil.equal(item.getMultistageDictCode(), sysPictureManage.getPictureTypeCode())).findAny().ifPresent(item -> sysPictureManage.setPictureTypeValue(item.getMultistageDictName()));
+        }
+
+    }
+
+    /**
+     * 根据图片id查询详情
+     * @param sysPictureManageId
+     * @return
+     */
+    public SysPictureManagePo getPictureManageInfo(Long sysPictureManageId) {
+        return sysPictureManageDomainService.getPictureManageInfo(sysPictureManageId);
+    }
+
+    /**
+     * 删除图片管理信息
+     * @param sysPictureManageDo
+     * @return
+     */
+    public boolean deletePictureManage(SysPictureManageDo sysPictureManageDo) {
+        return sysPictureManageDomainService.deletePictureManage(sysPictureManageDo);
+    }
+
+    /**
+     * 启用/停用
+     * @param sysPictureManageDo
+     * @return
+     */
+    public boolean changePictureStatus(SysPictureManageDo sysPictureManageDo) {
+        return sysPictureManageDomainService.changePictureStatus(sysPictureManageDo);
+    }
+
+    /**
+     * 获取app首页轮播图
+     */
+    public List<SysPictureManagePo> getAppHomeBannerList() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysPictureManageDo sysPictureManageDo = new SysPictureManageDo();
+        sysPictureManageDo.setBelongPageCode(PageBelongImgEnum.app_home.getCode());
+        sysPictureManageDo.setPictureTypeCode(PictureTypeEnum.app_banner.getCode());
+        sysPictureManageDo.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());//24-06-18 app轮播图根据所属组织来查询
+        return sysPictureManageDomainService.selectSysPictureManageList(sysPictureManageDo);
+    }
+
+    /**
+     * 获取专线流程图列表
+     */
+    public List<SysPictureManagePo> getLogisticsFlowChartList() {
+        //查询当前租户配置的
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+
+        //租户配置流程图
+        SysPictureManageDo sysPictureManageDo = new SysPictureManageDo();
+        sysPictureManageDo.setBelongPageCode(PageBelongImgEnum.logistics_flow_chart.getCode());
+        sysPictureManageDo.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+        sysPictureManageDo.setPictureStatus(1);
+        List<SysPictureManagePo> tenantPictures = sysPictureManageDomainService.selectSysPictureManageList(sysPictureManageDo);
+        return tenantPictures;
+
+        //系统默认流程图
+//        sysPictureManageDo.setTopOrganizationId(0L);
+//        List<SysPictureManagePo> sysPictures = sysPictureManageDomainService.selectSysPictureManageList(sysPictureManageDo);
+//
+//        if (CollUtil.isEmpty(tenantPictures)) {
+//            if (CollUtil.isEmpty(sysPictures)) {
+//                throw new ServiceException("未设置系统默认流程图");
+//            }
+//            return sysPictures;
+//        }
+//
+//        Map<String, SysPictureManagePo> sys = sysPictures.stream().collect(Collectors.toMap(SysPictureManagePo::getPictureTypeCode, Function.identity(), (key1, key2) -> key2));
+//
+//        Map<String, SysPictureManagePo> tenant = tenantPictures.stream().collect(Collectors.toMap(SysPictureManagePo::getPictureTypeCode, Function.identity(), (key1, key2) -> key2));
+//
+//        if (sys.size() == tenant.size()) {
+//            return tenantPictures;
+//        }
+//
+//        List<SysPictureManagePo> sysPictureManagePos = new ArrayList<>();
+//        sys.forEach((key, value) -> {
+//            sysPictureManagePos.add(tenant.getOrDefault(key, value));
+//        });
+//
+//        return sysPictureManagePos;
+    }
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/SysProvinceCityCountyApplicationService.java

@@ -0,0 +1,324 @@
+package com.mhd.basic.application.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.basic.interfaces.dto.SysProvinceCityCountyDTO;
+import com.mhd.basic.interfaces.facade.vo.SysAreaVO;
+import com.mhd.basic.domain.areaAggregate.repository.po.SysAreaPO;
+import com.mhd.basic.domain.areaAggregate.repository.todo.SysProvinceCityCountyDO;
+import com.mhd.basic.domain.areaAggregate.service.SysProvinceCityCountyDomainService;
+import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @Description 维护省市县
+ * @Author Alex
+ * @Date 2022/12/21 14:10
+ */
+@Service
+@Slf4j
+public class SysProvinceCityCountyApplicationService {
+
+    @Resource
+    private SysProvinceCityCountyDomainService sysProvinceCityCountyDomainService;
+
+    /**
+     * @Description 查询省列表
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public List<SysAreaPO> selectProvinceList(SysProvinceCityCountyDO sysProvinceDO) {
+        return sysProvinceCityCountyDomainService.selectProvinceAreaList(sysProvinceDO);
+    }
+
+    /**
+     * @Description 新增省
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public Boolean addProvince(SysProvinceCityCountyDO sysProvinceDO) {
+        sysProvinceCityCountyDomainService.addProvince(sysProvinceDO);
+        return true;
+    }
+
+    /**
+     * @Description 修改省
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public Boolean updateProvince(SysProvinceCityCountyDO sysProvinceDO) {
+        sysProvinceCityCountyDomainService.updateProvince(sysProvinceDO);
+        return true;
+    }
+
+    /**
+     * @Description 删除省
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public int deleteProvinceByIds(List<Long> ids) {
+        return sysProvinceCityCountyDomainService.deleteProvinceByIds(ids);
+    }
+
+    /**
+     * @Description 查询城市list
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public List<SysAreaPO> selectCityList(SysProvinceCityCountyDO sysProvinceDO) {
+        return sysProvinceCityCountyDomainService.selectCityAreaList(sysProvinceDO);
+    }
+
+    /**
+     * @Description 新增城市
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public Boolean addCity(SysProvinceCityCountyDO sysProvinceDO) {
+        sysProvinceCityCountyDomainService.addCity(sysProvinceDO);
+        return true;
+    }
+
+    /**
+     * @Description 修改城市
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public Boolean updateCity(SysProvinceCityCountyDO sysProvinceDO) {
+        sysProvinceCityCountyDomainService.updateCity(sysProvinceDO);
+        return true;
+    }
+
+    /**
+     * @Description 删除城市
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public int deleteCityByIds(List<Long> ids) {
+        return sysProvinceCityCountyDomainService.deleteCityByIds(ids);
+    }
+
+    /**
+     * @Description 查询区县list
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public List<SysAreaPO> selectCountyList(SysProvinceCityCountyDO sysProvinceDO) {
+        return sysProvinceCityCountyDomainService.selectCountyAreaList(sysProvinceDO);
+    }
+
+    /**
+     * @Description 先增区县
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public Boolean addCounty(SysProvinceCityCountyDO sysProvinceDO) {
+        sysProvinceCityCountyDomainService.addCounty(sysProvinceDO);
+        return true;
+    }
+
+    /**
+     * @Description 修改区县
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public Boolean updateCounty(SysProvinceCityCountyDO sysProvinceDO) {
+        sysProvinceCityCountyDomainService.updateCounty(sysProvinceDO);
+        return true;
+    }
+
+
+    /**
+     * @Description 查询省市县三级
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public List<SysAreaVO> selectAreaChildrenList(SysProvinceCityCountyDO sysProvinceDO) {
+        //数据查询全部数据
+        List<SysAreaPO> list = sysProvinceCityCountyDomainService.selectAreaChildrenList(sysProvinceDO);
+        //存储所有的地区
+        Map<Long, SysAreaVO> areaTree = new HashMap<>();
+        //查询所有地区列表
+        List<SysAreaVO> arr = new ArrayList<>();
+        for (SysAreaPO roleItrm : list) {
+            SysAreaVO sysAreaVO = new SysAreaVO();
+            BeanUtils.copyProperties(roleItrm, sysAreaVO);
+            //将所有地区添加到 map 中
+            areaTree.put(roleItrm.getAreaCode(), sysAreaVO);
+        }
+        areaTree.entrySet().forEach(item -> {
+            //获取到当前节点
+            SysAreaVO sysAreaVO = item.getValue();
+            if (sysAreaVO.getParentAreaCode() != null && sysAreaVO.getParentAreaCode() != 0) {
+                //根据当前节点查询去map获取父级节点
+                SysAreaVO vo = areaTree.get(sysAreaVO.getParentAreaCode());
+                //判断是否有父级节点
+                if (vo != null) {
+                    //给父级节点添加当前子
+                    vo.getChildren().add(sysAreaVO);
+                }
+            } else {
+                // 所有一级节点
+                arr.add(sysAreaVO);
+            }
+        });
+        for (SysAreaVO vo : arr) {
+            // 同步子数据
+            vo.setChildren(areaTree.get(vo.getAreaCode()).getChildren());
+        }
+        return arr;
+    }
+
+    /**
+     * @Description 查询省市县三级
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public List<SysAreaVO> selectBranchAreaChildrenList(SysProvinceCityCountyDO sysProvinceDO) {
+        //数据查询全部数据
+        List<SysAreaPO> list = sysProvinceCityCountyDomainService.selectBranchAreaChildrenList(sysProvinceDO);
+        //存储所有的地区
+        Map<Long, SysAreaVO> areaTree = new HashMap<>();
+        //查询所有地区列表
+        List<SysAreaVO> arr = new ArrayList<>();
+        for (SysAreaPO roleItrm : list) {
+            SysAreaVO sysAreaVO = new SysAreaVO();
+            BeanUtils.copyProperties(roleItrm, sysAreaVO);
+            //将所有地区添加到 map 中
+            areaTree.put(roleItrm.getAreaCode(), sysAreaVO);
+        }
+        areaTree.entrySet().forEach(item -> {
+            //获取到当前节点
+            SysAreaVO sysAreaVO = item.getValue();
+            if (sysAreaVO.getParentAreaCode() != null && sysAreaVO.getParentAreaCode() != 0) {
+                //根据当前节点查询去map获取父级节点
+                SysAreaVO vo = areaTree.get(sysAreaVO.getParentAreaCode());
+                //判断是否有父级节点
+                if (vo != null) {
+                    //给父级节点添加当前子
+                    vo.getChildren().add(sysAreaVO);
+                }
+            } else {
+                // 所有一级节点
+                arr.add(sysAreaVO);
+            }
+        });
+        for (SysAreaVO vo : arr) {
+            // 同步子数据
+            vo.setChildren(areaTree.get(vo.getAreaCode()).getChildren());
+        }
+        return arr;
+    }
+
+    /**
+     * @Description 查询省市县三级
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public List<SysAreaVO> selectAreaChildrenListApp(SysProvinceCityCountyDO sysProvinceDO) {
+        //数据查询全部数据
+        List<SysAreaPO> list = sysProvinceCityCountyDomainService.selectAreaChildrenList(sysProvinceDO);
+        //存储所有的地区
+        Map<Long, SysAreaVO> areaTree = new HashMap<>();
+        //查询所有地区列表
+        List<SysAreaVO> arr = new ArrayList<>();
+        for (SysAreaPO roleItrm : list) {
+            SysAreaVO sysAreaVO = new SysAreaVO();
+            BeanUtils.copyProperties(roleItrm, sysAreaVO);
+            //将所有地区添加到 map 中
+            areaTree.put(roleItrm.getAreaCode(), sysAreaVO);
+        }
+        areaTree.entrySet().forEach(item -> {
+            //获取到当前节点
+            SysAreaVO sysAreaVO = item.getValue();
+            if (sysAreaVO.getParentAreaCode() != null && sysAreaVO.getParentAreaCode() != 0) {
+                //根据当前节点查询去map获取父级节点
+                SysAreaVO vo = areaTree.get(sysAreaVO.getParentAreaCode());
+                //判断是否有父级节点
+                if (vo != null) {
+                    //给父级节点添加当前子
+                    vo.getChildren().add(sysAreaVO);
+                }
+            } else {
+                // 所有一级节点
+                arr.add(sysAreaVO);
+            }
+        });
+        for (SysAreaVO vo : arr) {
+            // 同步子数据
+            vo.setChildren(areaTree.get(vo.getAreaCode()).getChildren());
+        }
+
+        return arr;
+    }
+
+    /**
+     * @Description 查询省市县一级
+     * @Author Alex
+     * @Date 2022/12/21 16:52
+     */
+    public List<SysAreaPO> selectAllAreaList(SysProvinceCityCountyDO sysProvinceDO) {
+        return sysProvinceCityCountyDomainService.selectAllAreaList(sysProvinceDO);
+    }
+
+    public SysAreaPO findAreaInfo(SysProvinceCityCountyDO sysProvinceDO) {
+        if(ObjectUtil.isNotEmpty(sysProvinceDO.getCountyCode()) && sysProvinceDO.getCountyCode()!=0){
+            return sysProvinceCityCountyDomainService.findAreaInfo(sysProvinceDO);
+        }else{
+            return null;
+        }
+    }
+
+    public SysAreaPO findAreaInfoByCityCode(SysProvinceCityCountyDO sysProvinceDO) {
+        return sysProvinceCityCountyDomainService.findAreaInfoByCityCode(sysProvinceDO);
+    }
+
+    public SysAreaPO findAreaInfoByProvince(SysProvinceCityCountyDO sysProvinceDO) {
+        return sysProvinceCityCountyDomainService.findAreaInfoByProvince(sysProvinceDO);
+    }
+
+    public Map<String, String> selectSsqhList() {
+        //数据查询全部数据
+        List<SysAreaPO> list = sysProvinceCityCountyDomainService.selectSsqhList();
+        Map<String, String> map = new HashMap<>();
+        list.forEach(e-> map.put(e.getAreaCode().toString(), e.getAreaName()));
+        return map;
+    }
+
+    /**
+     * 根据code编码删除省市县
+     */
+    @Transactional
+    public void deleteCountyByCodes(SysProvinceCityCountyDTO sysProvinceDTO) {
+        if(!StringUtils.isNotEmpty(sysProvinceDTO.getAreaCodes())){
+            throw new ServiceException("省市县编码不能为空");
+        }
+        List<String> codes = Stream.of(sysProvinceDTO.getAreaCodes().split(",")).collect(Collectors.toList());
+        for (String code : codes) {
+            //判断省市县编码
+            if(code.length()==2){
+                //删除省份
+                sysProvinceCityCountyDomainService.deleteprovinceByCode(code);
+            }else if(code.length()==4){
+                //删除市
+                sysProvinceCityCountyDomainService.deleteCityByCode(code);
+            }else if(code.length()==6){
+                //删除县区
+                sysProvinceCityCountyDomainService.deleteCountryByCode(code);
+            }else {
+                throw new ServiceException("省市县编码格式不正确");
+            }
+        }
+    }
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/UserConfigSwitchApplicationService.java

@@ -0,0 +1,279 @@
+package com.mhd.basic.application.service;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.mhd.basic.domain.userConfigSwitch.repository.po.UserConfigSwitchAuthAppPo;
+import com.mhd.basic.domain.userConfigSwitch.repository.po.UserConfigSwitchPo;
+import com.mhd.basic.domain.userConfigSwitch.repository.todo.UserConfigSwitchDo;
+import com.mhd.basic.domain.userConfigSwitch.service.UserConfigSwitchDomainService;
+import com.mhd.basic.infrastructure.feign.ProductServiceFeign;
+import com.mhd.common.core.constant.CacheConstants;
+import com.mhd.common.core.constant.Constants;
+import com.mhd.common.core.domain.entity.OrgProductConfig;
+import com.mhd.common.core.domain.entity.R;
+import com.mhd.common.core.domain.entity.SysConfigSwitch;
+import com.mhd.common.core.domain.po.ConfigSwitchPO;
+import com.mhd.common.core.domain.po.UserPo;
+import com.mhd.common.core.domain.po.thirdparty.SysDepartInterfaceInfoPo;
+import com.mhd.common.core.domain.thirdparty.SysDepartInterfaceInfoDTO;
+import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.feign.ThirdPartyServiceFeign;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.redis.service.RedisService;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.WlhyServiceFeign;
+import com.mhd.system.api.model.LoginUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+/**
+ * 开关配置ApplicationService
+ *
+ * @author ???
+ * @date 2023-05-12
+ */
+@Service
+@Slf4j
+public class UserConfigSwitchApplicationService {
+    @Autowired
+    private UserConfigSwitchDomainService userConfigSwitchDomainService;
+    @Resource
+    private RedisService redisService;
+
+    @Autowired
+    private ProductServiceFeign productServiceFeign;
+    @Autowired
+    private WlhyServiceFeign wlhyServiceFeign;
+    @Autowired
+    private ThirdPartyServiceFeign thirdPartyServiceFeign;
+
+
+    /**
+     * 分页查询开关配置列表
+     */
+
+    public List<UserConfigSwitchPo> queryList(UserConfigSwitchDo userConfigSwitchDo) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null){
+            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+            if (topOrganizationId != null && topOrganizationId != 1){
+                userConfigSwitchDo.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            }
+        }
+        return userConfigSwitchDomainService.queryList(userConfigSwitchDo);
+    }
+
+
+    /**
+     * 新增开关配置
+     */
+    public Boolean insert(UserConfigSwitchDo userConfigSwitchDo) {
+        //获取登录人
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+
+        UserConfigSwitchPo userConfigSwitchInfo = getUserConfigSwitchInfo();
+        if (ObjectUtil.isNotNull(userConfigSwitchInfo) && ObjectUtil.equal(userConfigSwitchInfo.getOrganizationId(), loginUser.getUserPo().getOrganizationId())) {
+            userConfigSwitchDo.setUserConfigSwitchId(userConfigSwitchInfo.getUserConfigSwitchId());
+            return userConfigSwitchDomainService.update(userConfigSwitchDo);
+        } else {
+            userConfigSwitchDo.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            userConfigSwitchDo.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            return userConfigSwitchDomainService.insert(userConfigSwitchDo);
+        }
+    }
+
+    /**
+     * 修改开关配置
+     */
+    public Boolean update(UserConfigSwitchDo userConfigSwitchDo) {
+        //获取登录人
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        UserConfigSwitchPo userConfigSwitchInfo = getUserConfigSwitchInfo();
+        if (ObjectUtil.isNull(userConfigSwitchInfo)) {
+            throw new ServiceException("获取开关配置信息失败");
+        }
+        boolean flag;
+        //判断是否是当前组织配置,如果是，则修改当前信息，如果不是，则新增
+        if (ObjectUtil.equal(userConfigSwitchInfo.getOrganizationId(), loginUser.getUserPo().getOrganizationId())) {
+            flag = userConfigSwitchDomainService.update(userConfigSwitchDo);
+        } else {
+            flag = userConfigSwitchDomainService.insert(userConfigSwitchDo);
+        }
+        UserConfigSwitchPo userConfigSwitchPo = userConfigSwitchDomainService.getInfo(userConfigSwitchDo.getUserConfigSwitchId());
+
+        //使用通用类保存到redis，防止转换报错
+        com.mhd.common.core.domain.po.UserConfigSwitchPo newUserConfigSwitchPo = new com.mhd.common.core.domain.po.UserConfigSwitchPo();
+        BeanUtils.copyProperties(userConfigSwitchPo, newUserConfigSwitchPo);
+        //这里将修改后的配置文件，更新到redis中
+        redisService.setCacheObject(CacheConstants.USER_COMFIG_SWITCH_KEY + loginUser.getUserPo().getOrganizationId(), newUserConfigSwitchPo);
+        return flag;
+    }
+
+    /**
+     * 批量删除开关配置
+     */
+    public Boolean delete(Long[] userConfigSwitchIds) {
+        return userConfigSwitchDomainService.delete(userConfigSwitchIds);
+    }
+
+    /**
+     * 获取开关配置详细信息
+     */
+    public UserConfigSwitchPo getInfo(Long userConfigSwitchId)
+    {
+        return userConfigSwitchDomainService.getInfo(userConfigSwitchId);
+    }
+
+
+    /**
+     * 获取当前租户开关配置信息
+     * @return
+     */
+    public UserConfigSwitchPo getUserConfigSwitchInfo() {
+        UserConfigSwitchDo userConfigSwitchDo = new UserConfigSwitchDo();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+
+        //先获取当前组织配置，没有则向上查询
+        Long organizationId = loginUser.getUserPo().getOrganizationId();
+        userConfigSwitchDo.setOrganizationId(organizationId);
+        UserConfigSwitchPo userConfigSwitchInfo = userConfigSwitchDomainService.getUserConfigSwitchInfo(userConfigSwitchDo);
+        if (ObjectUtil.isNull(userConfigSwitchInfo)) {
+            AjaxResult result = productServiceFeign.selectTopOrganizationList(organizationId);
+            List<Long> orgList = new ArrayList<>();
+            if ("200".equals(String.valueOf(result.get("code")))) {
+                orgList = JSON.parseArray(JSONObject.toJSONString(result.get("data")), Long.class);
+            }
+            if (CollUtil.isNotEmpty(orgList)) {
+                for (Long aLong : orgList) {
+                    userConfigSwitchInfo = userConfigSwitchDomainService.getUserConfigSwitchInfoByOrganizationId(aLong);
+                    if (ObjectUtil.isNotNull(userConfigSwitchInfo) && userConfigSwitchInfo.getUserConfigSwitchId() != null) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        return userConfigSwitchInfo;
+    }
+
+    /**
+     * 获取当前租户开关配置信息
+     * @return
+     */
+    public UserConfigSwitchPo getUserConfigSwitchInfo(Long organizationId) {
+        UserConfigSwitchDo userConfigSwitchDo = new UserConfigSwitchDo();
+        userConfigSwitchDo.setOrganizationId(organizationId);
+        UserConfigSwitchPo userConfigSwitchInfo = userConfigSwitchDomainService.getUserConfigSwitchInfo(userConfigSwitchDo);
+        if (ObjectUtil.isNull(userConfigSwitchInfo)){
+            throw new ServiceException("获取开关配置信息失败");
+        }
+        return userConfigSwitchInfo;
+    }
+
+    /**
+     * APP获取当前用户对应租户的开关配置信息
+     * @return
+     */
+    public UserConfigSwitchAuthAppPo getAppUserConfigSwitchInfo() {
+        UserConfigSwitchDo userConfigSwitchDo = new UserConfigSwitchDo();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        UserPo userPo = loginUser.getUserPo();
+//        userConfigSwitchDo.setTopOrganizationId(2L);
+        userConfigSwitchDo.setTopOrganizationId(userPo.getTopOrganizationId());
+        UserConfigSwitchAuthAppPo userConfigSwitchAuthAppPo=userConfigSwitchDomainService.getAppUserConfigSwitchInfo(userConfigSwitchDo);
+        userConfigSwitchAuthAppPo.setIsDriverBidding(userPo.getIsDriverBidding());
+        return userConfigSwitchAuthAppPo;
+    }
+
+    public ConfigSwitchPO getConfigSwitchByLogin() {
+        ConfigSwitchPO configSwitchPO = new ConfigSwitchPO();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        //先获取当前组织配置，没有则向上查询
+        Long organizationId = loginUser.getUserPo().getOrganizationId();
+        Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+        UserConfigSwitchDo userConfigSwitchDo = new UserConfigSwitchDo();
+        userConfigSwitchDo.setOrganizationId(organizationId);
+        UserConfigSwitchPo userConfigSwitchInfo = userConfigSwitchDomainService.getUserConfigSwitchInfo(userConfigSwitchDo);
+        if (ObjectUtil.isNull(userConfigSwitchInfo)) {
+            userConfigSwitchInfo = userConfigSwitchDomainService.getUserConfigSwitchInfoByOrganizationId(topOrganizationId);
+            if (userConfigSwitchInfo == null) {
+                throw new ServiceException("未获取到配置信息，请联系管理员进行配置！");
+            }
+        }
+        BeanUtils.copyProperties(userConfigSwitchInfo, configSwitchPO);
+        //检查是否开启网货
+        boolean flag = checkSwitch();
+        if(!flag){
+            //如果未配置网货产品,返回跳过
+            return configSwitchPO;
+        }
+        R<SysConfigSwitch> configByLogin = wlhyServiceFeign.getConfigByLogin();
+        if (configByLogin.getCode() == Constants.SUCCESS) {
+            SysConfigSwitch data = configByLogin.getData();
+            org.springframework.beans.BeanUtils.copyProperties(data, configSwitchPO, IgnoreNullUtil.getNullPropertyNames(data));
+        }else {
+            throw new ServiceException("获取网货配置信息失败："+configByLogin.getMsg());
+        }
+        //查询电子围栏的半径信息
+        SysDepartInterfaceInfoDTO sysDepartInterfaceInfoDTO = new SysDepartInterfaceInfoDTO();
+        sysDepartInterfaceInfoDTO.setInterfaceType("electronic_fence");
+        sysDepartInterfaceInfoDTO.setInterfaceTypeKey("electronic_fence");
+        List<SysDepartInterfaceInfoPo> sysDepartInterfaceInfoPos = thirdPartyServiceFeign.queryListByFeign(sysDepartInterfaceInfoDTO);
+        if (CollUtil.isEmpty(sysDepartInterfaceInfoPos) || sysDepartInterfaceInfoPos.size() < 1) {
+            configSwitchPO.setElectronicFence(BigDecimal.ZERO);
+        } else {
+            String interfaceTypeValue = sysDepartInterfaceInfoPos.get(0).getInterfaceTypeValue();
+            BigDecimal electronicFence = new BigDecimal(interfaceTypeValue);
+            configSwitchPO.setElectronicFence(electronicFence);
+        }
+
+        sysDepartInterfaceInfoDTO.setInterfaceType("electronic_fence");
+        sysDepartInterfaceInfoDTO.setInterfaceTypeKey("electronic_fence_load");
+        List<SysDepartInterfaceInfoPo> sysDepartInterfaceInfoPosLoad = thirdPartyServiceFeign.queryListByFeign(sysDepartInterfaceInfoDTO);
+        if (CollUtil.isEmpty(sysDepartInterfaceInfoPosLoad) || sysDepartInterfaceInfoPosLoad.size() < 1) {
+            configSwitchPO.setElectronicFenceLoad(BigDecimal.ZERO);
+        } else {
+            String interfaceTypeValue = sysDepartInterfaceInfoPosLoad.get(0).getInterfaceTypeValue();
+            BigDecimal electronicFenceLoad = new BigDecimal(interfaceTypeValue);
+            configSwitchPO.setElectronicFenceLoad(electronicFenceLoad);
+        }
+        return configSwitchPO;
+    }
+
+
+    /**
+     * 校验是否配置网货产品
+     * @return true-开启，false-关闭
+     */
+    private boolean checkSwitch() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String key = CacheConstants.ORG_PRODUCT_KEY + loginUser.getUserPo().getTopOrganizationId();
+        OrgProductConfig orgProductConfig = redisService.getCacheObject(key);
+        if(null == orgProductConfig) {
+            return false;
+        }
+        //配置网货
+        return orgProductConfig.getWlhyFlag() == 1;
+    }
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/UserFormConfigApplicationService.java

@@ -0,0 +1,169 @@
+package com.mhd.basic.application.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.mhd.basic.domain.userConfigSwitch.repository.po.UserConfigSwitchPo;
+import com.mhd.basic.interfaces.dto.UserFormConfigDto;
+import com.mhd.basic.domain.userFormConfig.entity.UserFormConfig;
+import com.mhd.basic.domain.userFormConfig.repository.po.UserFormConfigJsonPo;
+import com.mhd.basic.domain.userFormConfig.repository.po.UserFormConfigPo;
+import com.mhd.basic.domain.userFormConfig.repository.todo.UserFormConfigDo;
+import com.mhd.basic.domain.userFormConfig.service.UserFormConfigDomainService;
+import com.mhd.common.core.domain.po.UserPo;
+import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户自定义单配置ApplicationService
+ *
+ * @author ???
+ * @date 2023-05-13
+ */
+@Service
+@Slf4j
+public class UserFormConfigApplicationService {
+    @Autowired
+    private UserFormConfigDomainService userFormConfigDomainService;
+    @Autowired
+    private UserConfigSwitchApplicationService userConfigSwitchApplicationService;
+
+
+    /**
+     * 分页查询用户自定义单配置列表
+     */
+
+    public List<UserFormConfigPo> queryList(UserFormConfigDo userFormConfigDo) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null){
+            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+            if (topOrganizationId != null && topOrganizationId != 1){
+                userFormConfigDo.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            }
+        }
+        return userFormConfigDomainService.queryList(userFormConfigDo);
+    }
+
+
+    /**
+     * 新增用户自定义单配置
+     */
+    public Boolean insert(UserFormConfigDo userFormConfigDo) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null){
+            userFormConfigDo.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            userFormConfigDo.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+        }
+        return userFormConfigDomainService.insert(userFormConfigDo);
+    }
+
+    /**
+     * 修改用户自定义单配置
+     */
+    public Boolean update(UserFormConfigDo userFormConfigDo) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null){
+            userFormConfigDo.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            userFormConfigDo.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+        }
+        return userFormConfigDomainService.update(userFormConfigDo);
+    }
+
+    /**
+     * 批量删除用户自定义单配置
+     */
+    public Boolean delete(UserFormConfigDto userFormConfigDto) {
+        return userFormConfigDomainService.delete(userFormConfigDto.getUserFormConfigId());
+    }
+
+    /**
+     * 获取用户自定义单配置详细信息
+     */
+    public UserFormConfigPo getInfo(Long userFormConfigId)
+    {
+        return userFormConfigDomainService.getInfo(userFormConfigId);
+    }
+
+
+    /**
+     *APP获取租户自定义单配置
+     * @param userFormConfigDto
+     * @return
+     */
+    public Map<String,Object> getUserFromConfig(UserFormConfigDto userFormConfigDto) {
+        if(userFormConfigDto.getFormType()==null){
+            throw new ServiceException("表单类型不能为空");
+        }
+        Map<String,Object> res = new HashMap<>();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        //查询当前登录人所在的租户
+        UserPo userPo = loginUser.getUserPo();
+        UserFormConfigDo userFormConfigDo = new UserFormConfigDo();
+        BeanUtils.copyProperties(userFormConfigDto,userFormConfigDo);
+        userFormConfigDo.setTopOrganizationId(userPo.getTopOrganizationId());
+        UserFormConfig userFormConfig = userFormConfigDomainService.selectConfigByIdAndType(userFormConfigDo);
+        if(null == userFormConfig){
+            //如果当前租户没有配置，则查询平台的
+            userFormConfigDo.setTopOrganizationId(0L);
+            userFormConfig = userFormConfigDomainService.selectConfigByIdAndType(userFormConfigDo);
+        }
+        String jsonString = userFormConfig.getFormJson();
+        //json转对象
+        JSONArray jsonArray = JSONArray.parseArray(jsonString);
+        List<UserFormConfigJsonPo> formList = jsonArray.toJavaList(UserFormConfigJsonPo.class);
+        if(formList != null && formList.size()>0){
+            for (UserFormConfigJsonPo userFormConfigJsonPo : formList) {
+                res.put(userFormConfigJsonPo.getField(),JSON.toJSON(userFormConfigJsonPo));
+            }
+        }
+        //只有承运人才显示该字段
+        if (userFormConfigDto.getFormType() != null && ObjectUtil.equal(userFormConfigDto.getFormType(),1)){
+            //获取配置判断是否开启推广码
+            UserConfigSwitchPo userConfigSwitchInfo = userConfigSwitchApplicationService.getUserConfigSwitchInfo();
+            //开启则添加推广码字段
+            if (userConfigSwitchInfo != null && userConfigSwitchInfo.getIsPromoCode() == 1){
+                UserFormConfigJsonPo userFormConfigJsonPo = new UserFormConfigJsonPo();
+                userFormConfigJsonPo.setAuth("");
+                userFormConfigJsonPo.setField("promoCode");
+                userFormConfigJsonPo.setNotNull("2");
+                userFormConfigJsonPo.setPcShow("");
+                userFormConfigJsonPo.setRule("2");
+                userFormConfigJsonPo.setShow("1");
+                userFormConfigJsonPo.setTitle("推广码");
+                res.put(userFormConfigJsonPo.getField(),JSON.toJSON(userFormConfigJsonPo));
+            }
+        }
+        return res;
+    }
+
+    /**
+     * 获取PC端租户表单配置
+     * @param userFormConfigDto
+     * @return
+     */
+    public String getPcUserFromConfig(UserFormConfigDto userFormConfigDto) {
+        if(userFormConfigDto.getFormType()==null){
+            throw new ServiceException("表单类型不能为空");
+        }
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        //查询当前登录人所在的租户
+        UserPo userPo = loginUser.getUserPo();
+        UserFormConfigDo userFormConfigDo = new UserFormConfigDo();
+        BeanUtils.copyProperties(userFormConfigDto,userFormConfigDo);
+        userFormConfigDo.setTopOrganizationId(userPo.getTopOrganizationId());
+        UserFormConfig userFormConfig = userFormConfigDomainService.selectConfigByIdAndType(userFormConfigDo);
+        if(null == userFormConfig){
+            throw new ServiceException("租户表单配置信息未找到");
+        }
+        return userFormConfig.getFormJson();
+    }
+}