修改ruoyi-改为sgd

fuyongxin

2026-06-03 1fd34350ea68fe820c4b62881b13c9f01082e6c0

修改ruoyi-改为sgd

 pom.xml

@@ -4,16 +4,16 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <modelVersion>4.0.0</modelVersion>



    <groupId>com.ruoyi</groupId>

    <artifactId>ruoyi</artifactId>

    <groupId>com.sgd</groupId>

    <artifactId>sgd</artifactId>

    <version>3.6.8</version>



    <name>ruoyi</name>

    <url>http://www.ruoyi.vip</url>

    <description>若依微服务系统</description>

    <name>sgd</name>

    <url>http://www.sgd.vip</url>

    <description>sgd微服务系统</description>



    <properties>

        <ruoyi.version>3.6.8</ruoyi.version>

        <sgd.version>3.6.8</sgd.version>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

        <java.version>17</java.version>

@@ -144,84 +144,84 @@


            <!-- 核心模块 -->

            <dependency>

                <groupId>com.ruoyi</groupId>

                <artifactId>ruoyi-common-core</artifactId>

                <version>${ruoyi.version}</version>

                <groupId>com.sgd</groupId>

                <artifactId>sgd-common-core</artifactId>

                <version>${sgd.version}</version>

            </dependency>



            <!-- 接口模块 -->

            <dependency>

                <groupId>com.ruoyi</groupId>

                <artifactId>ruoyi-common-swagger</artifactId>

                <version>${ruoyi.version}</version>

                <groupId>com.sgd</groupId>

                <artifactId>sgd-common-swagger</artifactId>

                <version>${sgd.version}</version>

            </dependency>



            <!-- 安全模块 -->

            <dependency>

                <groupId>com.ruoyi</groupId>

                <artifactId>ruoyi-common-security</artifactId>

                <version>${ruoyi.version}</version>

                <groupId>com.sgd</groupId>

                <artifactId>sgd-common-security</artifactId>

                <version>${sgd.version}</version>

            </dependency>



            <!-- 数据脱敏 -->

            <dependency>

                <groupId>com.ruoyi</groupId>

                <artifactId>ruoyi-common-sensitive</artifactId>

                <version>${ruoyi.version}</version>

                <groupId>com.sgd</groupId>

                <artifactId>sgd-common-sensitive</artifactId>

                <version>${sgd.version}</version>

            </dependency>



            <!-- 权限范围 -->

            <dependency>

                <groupId>com.ruoyi</groupId>

                <artifactId>ruoyi-common-datascope</artifactId>

                <version>${ruoyi.version}</version>

                <groupId>com.sgd</groupId>

                <artifactId>sgd-common-datascope</artifactId>

                <version>${sgd.version}</version>

            </dependency>



            <!-- 多数据源 -->

            <dependency>

                <groupId>com.ruoyi</groupId>

                <artifactId>ruoyi-common-datasource</artifactId>

                <version>${ruoyi.version}</version>

                <groupId>com.sgd</groupId>

                <artifactId>sgd-common-datasource</artifactId>

                <version>${sgd.version}</version>

            </dependency>



            <!-- 分布式事务 -->

            <dependency>

                <groupId>com.ruoyi</groupId>

                <artifactId>ruoyi-common-seata</artifactId>

                <version>${ruoyi.version}</version>

                <groupId>com.sgd</groupId>

                <artifactId>sgd-common-seata</artifactId>

                <version>${sgd.version}</version>

            </dependency>



            <!-- 日志记录 -->

            <dependency>

                <groupId>com.ruoyi</groupId>

                <artifactId>ruoyi-common-log</artifactId>

                <version>${ruoyi.version}</version>

                <groupId>com.sgd</groupId>

                <artifactId>sgd-common-log</artifactId>

                <version>${sgd.version}</version>

            </dependency>



            <!-- 缓存服务 -->

            <dependency>

                <groupId>com.ruoyi</groupId>

                <artifactId>ruoyi-common-redis</artifactId>

                <version>${ruoyi.version}</version>

                <groupId>com.sgd</groupId>

                <artifactId>sgd-common-redis</artifactId>

                <version>${sgd.version}</version>

            </dependency>



            <!-- 系统接口 -->

            <dependency>

                <groupId>com.ruoyi</groupId>

                <artifactId>ruoyi-api-system</artifactId>

                <version>${ruoyi.version}</version>

                <groupId>com.sgd</groupId>

                <artifactId>sgd-api-system</artifactId>

                <version>${sgd.version}</version>

            </dependency>



        </dependencies>

    </dependencyManagement>



    <modules>

        <module>ruoyi-auth</module>

        <module>ruoyi-gateway</module>

        <module>ruoyi-visual</module>

        <module>ruoyi-modules</module>

        <module>ruoyi-api</module>

        <module>ruoyi-common</module>

        <module>sgd-auth</module>

        <module>sgd-gateway</module>

        <module>sgd-visual</module>

        <module>sgd-modules</module>

        <module>sgd-api</module>

        <module>sgd-common</module>

    </modules>

    <packaging>pom</packaging>




 ruoyi-common/pom.xml

File was deleted

 ruoyi-common/ruoyi-common-datascope/pom.xml

File was deleted

 ruoyi-modules/pom.xml

File was deleted

 sgd-api/pom.xml

File was renamed from ruoyi-api/pom.xml
@@ -1,22 +1,22 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <modules>

        <module>ruoyi-api-system</module>

    </modules>



    <artifactId>ruoyi-api</artifactId>

    <packaging>pom</packaging>



    <description>

        ruoyi-api系统接口

    </description>



</project>

<?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.sgd</groupId>
        <artifactId>sgd</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <modules>
        <module>sgd-api-system</module>
    </modules>

    <artifactId>sgd-api</artifactId>
    <packaging>pom</packaging>

    <description>
        sgd-api系统接口
    </description>

</project>

 sgd-auth/pom.xml

File was renamed from ruoyi-auth/pom.xml
@@ -1,74 +1,74 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"

         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <parent>

        <groupId>com.ruoyi</groupId>

        <artifactId>ruoyi</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

    
    <artifactId>ruoyi-auth</artifactId>

	
    <description>

        ruoyi-auth认证授权中心

    </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 Web -->

        <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-webmvc</artifactId>

        </dependency>

        
        <!-- SpringBoot Actuator -->

        <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-actuator</artifactId>

        </dependency>

		
        <!-- RuoYi Common Security-->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-security</artifactId>

        </dependency>

        
    </dependencies>

	
    <build>

        <finalName>${project.artifactId}</finalName>

        <plugins>

            <plugin>

                <groupId>org.springframework.boot</groupId>

                <artifactId>spring-boot-maven-plugin</artifactId>

                <executions>

                    <execution>

                        <goals>

                            <goal>repackage</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

        </plugins>

    </build>

   
</project>

<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sgd</groupId>
        <artifactId>sgd</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
    <artifactId>sgd-auth</artifactId>
	
    <description>
        sgd-auth认证授权中心
    </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 Web -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-webmvc</artifactId>
        </dependency>
        
        <!-- SpringBoot Actuator -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
		
        <!-- sgd Common Security-->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-security</artifactId>
        </dependency>
        
    </dependencies>
	
    <build>
        <finalName>${project.artifactId}</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>
   
</project>

 sgd-common/pom.xml

New file
@@ -0,0 +1,30 @@
<?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.sgd</groupId>
        <artifactId>sgd</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <modules>
        <module>sgd-common-log</module>
        <module>sgd-common-core</module>
        <module>sgd-common-redis</module>
        <module>sgd-common-seata</module>
        <module>sgd-common-swagger</module>
        <module>sgd-common-security</module>
        <module>sgd-common-sensitive</module>
        <module>sgd-common-datascope</module>
        <module>sgd-common-datasource</module>
    </modules>

    <artifactId>sgd-common</artifactId>
    <packaging>pom</packaging>

    <description>
        sgd-common通用模块
    </description>

</project>

 sgd-common/sgd-common-core/pom.xml

File was renamed from ruoyi-common/ruoyi-common-core/pom.xml
@@ -1,125 +1,125 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi-common</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>ruoyi-common-core</artifactId>

    
    <description>

        ruoyi-common-core核心模块

    </description>



    <dependencies>



        <!-- SpringCloud Openfeign -->

        <dependency>

            <groupId>org.springframework.cloud</groupId>

            <artifactId>spring-cloud-starter-openfeign</artifactId>

        </dependency>

        
        <!-- SpringCloud Loadbalancer -->

        <dependency>

            <groupId>org.springframework.cloud</groupId>

            <artifactId>spring-cloud-starter-loadbalancer</artifactId>

        </dependency>



        <!-- Spring Context Support -->

        <dependency>

            <groupId>org.springframework</groupId>

            <artifactId>spring-context-support</artifactId>

        </dependency>



        <!-- Spring Web -->

        <dependency>

            <groupId>org.springframework</groupId>

            <artifactId>spring-web</artifactId>

        </dependency>



        <!-- Transmittable ThreadLocal -->

        <dependency>

            <groupId>com.alibaba</groupId>

            <artifactId>transmittable-thread-local</artifactId>

        </dependency>



        <!-- Pagehelper -->

        <dependency>

            <groupId>com.github.pagehelper</groupId>

            <artifactId>pagehelper-spring-boot-starter</artifactId>

        </dependency>



        <!-- Mybatis Spring -->

        <dependency>

            <groupId>org.mybatis.spring.boot</groupId>

            <artifactId>mybatis-spring-boot-starter</artifactId>

        </dependency>



        <!-- Hibernate Validator -->

        <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-validation</artifactId>

        </dependency>



        <!-- Spring Aop -->

        <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-aspectj</artifactId>

        </dependency>



        <!-- Jackson -->

        <dependency>

            <groupId>tools.jackson.core</groupId>

            <artifactId>jackson-databind</artifactId>

        </dependency>



        <!-- Alibaba Fastjson -->

        <dependency>

            <groupId>com.alibaba.fastjson2</groupId>

            <artifactId>fastjson2</artifactId>

        </dependency>



        <!-- Jwt -->

        <dependency>

            <groupId>io.jsonwebtoken</groupId>

            <artifactId>jjwt</artifactId>

        </dependency>



        <!-- Jaxb -->

        <dependency>

            <groupId>javax.xml.bind</groupId>

            <artifactId>jaxb-api</artifactId>

            <version>2.3.1</version>

        </dependency>



        <!-- Apache Lang3 -->

        <dependency>

            <groupId>org.apache.commons</groupId>

            <artifactId>commons-lang3</artifactId>

        </dependency>



        <!-- Commons Io -->

        <dependency>

            <groupId>commons-io</groupId>

            <artifactId>commons-io</artifactId>

        </dependency>



        <!-- excel工具 -->

        <dependency>

            <groupId>org.apache.poi</groupId>

            <artifactId>poi-ooxml</artifactId>

        </dependency>



        <!-- Java Servlet -->

        <dependency>

            <groupId>jakarta.servlet</groupId>

            <artifactId>jakarta.servlet-api</artifactId>

        </dependency>



    </dependencies>



</project>

<?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.sgd</groupId>
        <artifactId>sgd-common</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>sgd-common-core</artifactId>
    
    <description>
        sgd-common-core核心模块
    </description>

    <dependencies>

        <!-- SpringCloud Openfeign -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>
        
        <!-- SpringCloud Loadbalancer -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
        </dependency>

        <!-- Spring Context Support -->
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-context-support</artifactId>
        </dependency>

        <!-- Spring Web -->
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>
        </dependency>

        <!-- Transmittable ThreadLocal -->
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>transmittable-thread-local</artifactId>
        </dependency>

        <!-- Pagehelper -->
        <dependency>
            <groupId>com.github.pagehelper</groupId>
            <artifactId>pagehelper-spring-boot-starter</artifactId>
        </dependency>

        <!-- Mybatis Spring -->
        <dependency>
            <groupId>org.mybatis.spring.boot</groupId>
            <artifactId>mybatis-spring-boot-starter</artifactId>
        </dependency>

        <!-- Hibernate Validator -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-validation</artifactId>
        </dependency>

        <!-- Spring Aop -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aspectj</artifactId>
        </dependency>

        <!-- Jackson -->
        <dependency>
            <groupId>tools.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>

        <!-- Alibaba Fastjson -->
        <dependency>
            <groupId>com.alibaba.fastjson2</groupId>
            <artifactId>fastjson2</artifactId>
        </dependency>

        <!-- Jwt -->
        <dependency>
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt</artifactId>
        </dependency>

        <!-- Jaxb -->
        <dependency>
            <groupId>javax.xml.bind</groupId>
            <artifactId>jaxb-api</artifactId>
            <version>2.3.1</version>
        </dependency>

        <!-- Apache Lang3 -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
        </dependency>

        <!-- Commons Io -->
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
        </dependency>

        <!-- excel工具 -->
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
        </dependency>

        <!-- Java Servlet -->
        <dependency>
            <groupId>jakarta.servlet</groupId>
            <artifactId>jakarta.servlet-api</artifactId>
        </dependency>

    </dependencies>

</project>

 sgd-common/sgd-common-datascope/pom.xml

File was renamed from ruoyi-common/ruoyi-common-log/pom.xml
@@ -1,27 +1,27 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi-common</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

    
    <artifactId>ruoyi-common-log</artifactId>

	
    <description>

        ruoyi-common-log日志记录

    </description>



    <dependencies>

		
        <!-- RuoYi Common Security -->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-security</artifactId>

        </dependency>

        
    </dependencies>

<?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.sgd</groupId>
        <artifactId>sgd-common</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
    <artifactId>sgd-common-datascope</artifactId>
	
    <description>
        sgd-common-datascope权限范围
    </description>

    <dependencies>
		
        <!-- sgd Common Security -->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-security</artifactId>
        </dependency>
        
    </dependencies>
</project>

 sgd-common/sgd-common-datasource/pom.xml

File was renamed from ruoyi-common/ruoyi-common-datasource/pom.xml
@@ -1,41 +1,41 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi-common</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

    
    <artifactId>ruoyi-common-datasource</artifactId>



    <description>

        ruoyi-common-datasource多数据源

    </description>



    <dependencies>



        <!-- Druid -->

        <dependency>

            <groupId>com.alibaba</groupId>

            <artifactId>druid-spring-boot-4-starter</artifactId>

            <version>${druid.version}</version>

        </dependency>



        <!-- Dynamic DataSource -->

        <dependency>

            <groupId>com.baomidou</groupId>

            <artifactId>dynamic-datasource-spring-boot4-starter</artifactId>

            <version>${dynamic-ds.version}</version>

            <exclusions>

                <exclusion>

                    <artifactId>mybatis-spring</artifactId>

                    <groupId>org.mybatis</groupId>

                </exclusion>

            </exclusions>

        </dependency>



    </dependencies>

<?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.sgd</groupId>
        <artifactId>sgd-common</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
    <artifactId>sgd-common-datasource</artifactId>

    <description>
        sgd-common-datasource多数据源
    </description>

    <dependencies>

        <!-- Druid -->
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid-spring-boot-4-starter</artifactId>
            <version>${druid.version}</version>
        </dependency>

        <!-- Dynamic DataSource -->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>dynamic-datasource-spring-boot4-starter</artifactId>
            <version>${dynamic-ds.version}</version>
            <exclusions>
                <exclusion>
                    <artifactId>mybatis-spring</artifactId>
                    <groupId>org.mybatis</groupId>
                </exclusion>
            </exclusions>
        </dependency>

    </dependencies>
</project>

 sgd-common/sgd-common-log/pom.xml

copy from ruoyi-common/ruoyi-common-log/pom.xml
copy to sgd-common/sgd-common-log/pom.xml
File was copied from ruoyi-common/ruoyi-common-log/pom.xml
@@ -1,27 +1,27 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi-common</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

    
    <artifactId>ruoyi-common-log</artifactId>

	
    <description>

        ruoyi-common-log日志记录

    </description>



    <dependencies>

		
        <!-- RuoYi Common Security -->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-security</artifactId>

        </dependency>

        
    </dependencies>

<?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.sgd</groupId>
        <artifactId>sgd-common</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
    <artifactId>sgd-common-log</artifactId>
	
    <description>
        sgd-common-log日志记录
    </description>

    <dependencies>
		
        <!-- sgd Common Security -->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-security</artifactId>
        </dependency>
        
    </dependencies>
</project>

 sgd-common/sgd-common-redis/pom.xml

File was renamed from ruoyi-common/ruoyi-common-redis/pom.xml
@@ -1,33 +1,33 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi-common</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

    
    <artifactId>ruoyi-common-redis</artifactId>

	
    <description>

        ruoyi-common-redis缓存服务

    </description>



    <dependencies>

		
        <!-- SpringBoot Boot Redis -->

        <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-data-redis</artifactId>

        </dependency>

        
        <!-- RuoYi Common Core-->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-core</artifactId>

        </dependency>

        
    </dependencies>

<?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.sgd</groupId>
        <artifactId>sgd-common</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
    <artifactId>sgd-common-redis</artifactId>
	
    <description>
        sgd-common-redis缓存服务
    </description>

    <dependencies>
		
        <!-- SpringBoot Boot Redis -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
        
        <!-- sgd Common Core-->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-core</artifactId>
        </dependency>
        
    </dependencies>
</project>

 sgd-common/sgd-common-seata/pom.xml

File was renamed from ruoyi-common/ruoyi-common-seata/pom.xml
@@ -1,27 +1,27 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi-common</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>ruoyi-common-seata</artifactId>



    <description>

        ruoyi-common-seata分布式事务

    </description>



    <dependencies>



        <!-- SpringBoot Seata -->

        <dependency>

            <groupId>com.alibaba.cloud</groupId>

            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>

        </dependency>



    </dependencies>

<?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.sgd</groupId>
        <artifactId>sgd-common</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>sgd-common-seata</artifactId>

    <description>
        sgd-common-seata分布式事务
    </description>

    <dependencies>

        <!-- SpringBoot Seata -->
        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
        </dependency>

    </dependencies>
</project>

 sgd-common/sgd-common-security/pom.xml

File was renamed from ruoyi-common/ruoyi-common-security/pom.xml
@@ -1,39 +1,39 @@
<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">

    <parent>

        <groupId>com.ruoyi</groupId>

        <artifactId>ruoyi-common</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

    
    <artifactId>ruoyi-common-security</artifactId>



    <description>

        ruoyi-common-security安全模块

    </description>



    <dependencies>



        <!-- Spring Web -->

        <dependency>

            <groupId>org.springframework</groupId>

            <artifactId>spring-webmvc</artifactId>

        </dependency>



        <!-- RuoYi Api System -->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-api-system</artifactId>

        </dependency>



        <!-- RuoYi Common Redis-->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-redis</artifactId>

        </dependency>



    </dependencies>



</project>

<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sgd</groupId>
        <artifactId>sgd-common</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
    <artifactId>sgd-common-security</artifactId>

    <description>
        sgd-common-security安全模块
    </description>

    <dependencies>

        <!-- Spring Web -->
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-webmvc</artifactId>
        </dependency>

        <!-- sgd Api System -->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-api-system</artifactId>
        </dependency>

        <!-- sgd Common Redis-->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-redis</artifactId>
        </dependency>

    </dependencies>

</project>

 sgd-common/sgd-common-security/src/main/java/com/sgd/common/security/aspect/PreAuthorizeAspect.java

File was renamed from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
@@ -1,89 +1,89 @@
package com.ruoyi.common.security.aspect;



import java.lang.reflect.Method;

import org.aspectj.lang.ProceedingJoinPoint;

import org.aspectj.lang.annotation.Around;

import org.aspectj.lang.annotation.Aspect;

import org.aspectj.lang.annotation.Pointcut;

import org.aspectj.lang.reflect.MethodSignature;

import org.springframework.stereotype.Component;

import com.ruoyi.common.security.annotation.RequiresLogin;

import com.ruoyi.common.security.annotation.RequiresPermissions;

import com.ruoyi.common.security.annotation.RequiresRoles;

import com.ruoyi.common.security.auth.AuthUtil;



/**

 * 基于 Spring Aop 的注解鉴权

 * 
 * @author kong

 */

@Aspect

@Component

public class PreAuthorizeAspect

{

    /**

     * 构建

     */

    public PreAuthorizeAspect()

    {

    }



    /**

     * 定义AOP签名 (切入所有使用鉴权注解的方法)

     */

    public static final String POINTCUT_SIGN = " @annotation(com.ruoyi.common.security.annotation.RequiresLogin) || "

            + "@annotation(com.ruoyi.common.security.annotation.RequiresPermissions) || "

            + "@annotation(com.ruoyi.common.security.annotation.RequiresRoles)";



    /**

     * 声明AOP签名

     */

    @Pointcut(POINTCUT_SIGN)

    public void pointcut()

    {

    }



    /**

     * 环绕切入

     * 
     * @param joinPoint 切面对象

     * @return 底层方法执行后的返回值

     * @throws Throwable 底层方法抛出的异常

     */

    @Around("pointcut()")

    public Object around(ProceedingJoinPoint joinPoint) throws Throwable

    {

        // 注解鉴权

        MethodSignature signature = (MethodSignature) joinPoint.getSignature();

        checkMethodAnnotation(signature.getMethod());

        // 执行原有逻辑

        return joinPoint.proceed();

    }



    /**

     * 对一个Method对象进行注解检查

     */

    public void checkMethodAnnotation(Method method)

    {

        // 校验 @RequiresLogin 注解

        RequiresLogin requiresLogin = method.getAnnotation(RequiresLogin.class);

        if (requiresLogin != null)

        {

            AuthUtil.checkLogin();

        }



        // 校验 @RequiresRoles 注解

        RequiresRoles requiresRoles = method.getAnnotation(RequiresRoles.class);

        if (requiresRoles != null)

        {

            AuthUtil.checkRole(requiresRoles);

        }



        // 校验 @RequiresPermissions 注解

        RequiresPermissions requiresPermissions = method.getAnnotation(RequiresPermissions.class);

        if (requiresPermissions != null)

        {

            AuthUtil.checkPermi(requiresPermissions);

        }

    }

}

package com.sgd.common.security.aspect;

import java.lang.reflect.Method;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.stereotype.Component;
import com.sgd.common.security.annotation.RequiresLogin;
import com.sgd.common.security.annotation.RequiresPermissions;
import com.sgd.common.security.annotation.RequiresRoles;
import com.sgd.common.security.auth.AuthUtil;

/**
 * 基于 Spring Aop 的注解鉴权
 * 
 * @author kong
 */
@Aspect
@Component
public class PreAuthorizeAspect
{
    /**
     * 构建
     */
    public PreAuthorizeAspect()
    {
    }

    /**
     * 定义AOP签名 (切入所有使用鉴权注解的方法)
     */
    public static final String POINTCUT_SIGN = " @annotation(com.sgd.common.security.annotation.RequiresLogin) || "
            + "@annotation(com.sgd.common.security.annotation.RequiresPermissions) || "
            + "@annotation(com.sgd.common.security.annotation.RequiresRoles)";

    /**
     * 声明AOP签名
     */
    @Pointcut(POINTCUT_SIGN)
    public void pointcut()
    {
    }

    /**
     * 环绕切入
     * 
     * @param joinPoint 切面对象
     * @return 底层方法执行后的返回值
     * @throws Throwable 底层方法抛出的异常
     */
    @Around("pointcut()")
    public Object around(ProceedingJoinPoint joinPoint) throws Throwable
    {
        // 注解鉴权
        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
        checkMethodAnnotation(signature.getMethod());
        // 执行原有逻辑
        return joinPoint.proceed();
    }

    /**
     * 对一个Method对象进行注解检查
     */
    public void checkMethodAnnotation(Method method)
    {
        // 校验 @RequiresLogin 注解
        RequiresLogin requiresLogin = method.getAnnotation(RequiresLogin.class);
        if (requiresLogin != null)
        {
            AuthUtil.checkLogin();
        }

        // 校验 @RequiresRoles 注解
        RequiresRoles requiresRoles = method.getAnnotation(RequiresRoles.class);
        if (requiresRoles != null)
        {
            AuthUtil.checkRole(requiresRoles);
        }

        // 校验 @RequiresPermissions 注解
        RequiresPermissions requiresPermissions = method.getAnnotation(RequiresPermissions.class);
        if (requiresPermissions != null)
        {
            AuthUtil.checkPermi(requiresPermissions);
        }
    }
}

 sgd-common/sgd-common-security/src/main/java/com/sgd/common/security/service/TokenService.java

File was renamed from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
@@ -1,4 +1,4 @@
package com.ruoyi.common.security.service;
package com.sgd.common.security.service;

import java.util.HashMap;
import java.util.Map;
@@ -8,16 +8,16 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.ip.IpUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.model.LoginUser;
import com.sgd.common.core.constant.CacheConstants;
import com.sgd.common.core.constant.SecurityConstants;
import com.sgd.common.core.utils.JwtUtils;
import com.sgd.common.core.utils.ServletUtils;
import com.sgd.common.core.utils.StringUtils;
import com.sgd.common.core.utils.ip.IpUtils;
import com.sgd.common.core.utils.uuid.IdUtils;
import com.sgd.common.redis.service.RedisService;
import com.sgd.common.security.utils.SecurityUtils;
import com.sgd.system.api.model.LoginUser;

/**
 * token验证处理

 sgd-common/sgd-common-security/src/main/java/com/sgd/common/security/utils/SecurityUtils.java

File was renamed from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
@@ -1,13 +1,13 @@
package com.ruoyi.common.security.utils;
package com.sgd.common.security.utils;

import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.TokenConstants;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.context.SecurityContextHolder;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.api.model.LoginUser;
import com.sgd.common.core.constant.SecurityConstants;
import com.sgd.common.core.constant.TokenConstants;
import com.sgd.common.core.constant.UserConstants;
import com.sgd.common.core.context.SecurityContextHolder;
import com.sgd.common.core.utils.ServletUtils;
import com.sgd.common.core.utils.StringUtils;
import com.sgd.system.api.model.LoginUser;
import jakarta.servlet.http.HttpServletRequest;

/**

 sgd-common/sgd-common-sensitive/pom.xml

File was renamed from ruoyi-common/ruoyi-common-sensitive/pom.xml
@@ -3,24 +3,24 @@
         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.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
        <groupId>com.sgd</groupId>
        <artifactId>sgd-common</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
    <artifactId>ruoyi-common-sensitive</artifactId>
    <artifactId>sgd-common-sensitive</artifactId>

    <description>
        ruoyi-common-sensitive数据脱敏
        sgd-common-sensitive数据脱敏
    </description>

    <dependencies>

        <!-- RuoYi Common Core -->
        <!-- sgd Common Core -->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common-core</artifactId>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-core</artifactId>
        </dependency>

    </dependencies>

 sgd-common/sgd-common-swagger/pom.xml

File was renamed from ruoyi-common/ruoyi-common-swagger/pom.xml
@@ -1,33 +1,33 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi-common</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

    
    <artifactId>ruoyi-common-swagger</artifactId>

	
    <description>

        ruoyi-common-swagger系统接口

    </description>



    <dependencies>



        <!-- SpringBoot Web -->

        <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-webmvc</artifactId>

        </dependency>



        <!-- SpringDoc webmvc -->

        <dependency>

            <groupId>org.springdoc</groupId>

            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>

        </dependency>



    </dependencies>

</project>

<?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.sgd</groupId>
        <artifactId>sgd-common</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
    <artifactId>sgd-common-swagger</artifactId>
	
    <description>
        sgd-common-swagger系统接口
    </description>

    <dependencies>

        <!-- SpringBoot Web -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-webmvc</artifactId>
        </dependency>

        <!-- SpringDoc webmvc -->
        <dependency>
            <groupId>org.springdoc</groupId>
            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
        </dependency>

    </dependencies>
</project>

 sgd-gateway/pom.xml

File was renamed from ruoyi-gateway/pom.xml
@@ -1,105 +1,105 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"

         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <parent>

        <groupId>com.ruoyi</groupId>

        <artifactId>ruoyi</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>ruoyi-gateway</artifactId>



    <description>

        ruoyi-gateway网关模块

    </description>



    <dependencies>



        <!-- SpringCloud Gateway -->

        <dependency>

            <groupId>org.springframework.cloud</groupId>

            <artifactId>spring-cloud-starter-gateway-server-webflux</artifactId>

        </dependency>



        <!-- 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>



        <!-- SpringCloud Alibaba Sentinel Gateway -->

        <dependency>

            <groupId>com.alibaba.cloud</groupId>

            <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>

        </dependency>



        <!-- Sentinel Datasource Nacos -->

        <dependency>

            <groupId>com.alibaba.csp</groupId>

            <artifactId>sentinel-datasource-nacos</artifactId>

        </dependency>



        <!-- SpringBoot Actuator -->

        <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-actuator</artifactId>

        </dependency>



        <!-- SpringCloud Loadbalancer -->

        <dependency>

            <groupId>org.springframework.cloud</groupId>

            <artifactId>spring-cloud-loadbalancer</artifactId>

        </dependency>



        <!--验证码 -->

        <dependency>

            <groupId>pro.fessional</groupId>

            <artifactId>kaptcha</artifactId>

        </dependency>



        <!-- RuoYi Common Redis-->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-redis</artifactId>

        </dependency>



        <!-- Springdoc -->

        <dependency>

            <groupId>org.springdoc</groupId>

            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>

            <version>${springdoc.version}</version>

        </dependency>



    </dependencies>



    <build>

        <finalName>${project.artifactId}</finalName>

        <plugins>

            <plugin>

                <groupId>org.springframework.boot</groupId>

                <artifactId>spring-boot-maven-plugin</artifactId>

                <executions>

                    <execution>

                        <goals>

                            <goal>repackage</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

        </plugins>

    </build>



</project>

<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.sgd</groupId>
        <artifactId>sgd</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>sgd-gateway</artifactId>

    <description>
        sgd-gateway网关模块
    </description>

    <dependencies>

        <!-- SpringCloud Gateway -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-gateway-server-webflux</artifactId>
        </dependency>

        <!-- 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>

        <!-- SpringCloud Alibaba Sentinel Gateway -->
        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
        </dependency>

        <!-- Sentinel Datasource Nacos -->
        <dependency>
            <groupId>com.alibaba.csp</groupId>
            <artifactId>sentinel-datasource-nacos</artifactId>
        </dependency>

        <!-- SpringBoot Actuator -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>

        <!-- SpringCloud Loadbalancer -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-loadbalancer</artifactId>
        </dependency>

        <!--验证码 -->
        <dependency>
            <groupId>pro.fessional</groupId>
            <artifactId>kaptcha</artifactId>
        </dependency>

        <!-- sgd Common Redis-->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-redis</artifactId>
        </dependency>

        <!-- Springdoc -->
        <dependency>
            <groupId>org.springdoc</groupId>
            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
            <version>${springdoc.version}</version>
        </dependency>

    </dependencies>

    <build>
        <finalName>${project.artifactId}</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>

</project>

 sgd-modules/pom.xml

File was renamed from ruoyi-visual/pom.xml
@@ -1,22 +1,25 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <modules>

        <module>ruoyi-monitor</module>

    </modules>



    <artifactId>ruoyi-visual</artifactId>

    <packaging>pom</packaging>



    <description>

        ruoyi-visual图形化管理模块

    </description>



</project>

<?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.sgd</groupId>
        <artifactId>sgd</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <modules>
        <module>sgd-system</module>
        <module>sgd-gen</module>
        <module>sgd-job</module>
        <module>sgd-file</module>
    </modules>

    <artifactId>sgd-modules</artifactId>
    <packaging>pom</packaging>

    <description>
        sgd-modules业务模块
    </description>

</project>

 sgd-modules/sgd-file/pom.xml

File was renamed from ruoyi-modules/ruoyi-file/pom.xml
@@ -1,82 +1,82 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi-modules</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>ruoyi-modules-file</artifactId>



    <description>

        ruoyi-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>

        
        <!-- SpringBoot Web -->

        <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-webmvc</artifactId>

        </dependency>

        
        <!-- Minio -->

        <dependency>

            <groupId>io.minio</groupId>

            <artifactId>minio</artifactId>

            <version>${minio.version}</version>

        </dependency>

        
        <!-- RuoYi Api System -->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-api-system</artifactId>

        </dependency>

        
    </dependencies>



    <build>

        <finalName>${project.artifactId}</finalName>

        <plugins>

            <plugin>

                <groupId>org.springframework.boot</groupId>

                <artifactId>spring-boot-maven-plugin</artifactId>

                <executions>

                    <execution>

                        <goals>

                            <goal>repackage</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

        </plugins>

    </build>

   
<?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.sgd</groupId>
        <artifactId>sgd-modules</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>sgd-modules-file</artifactId>

    <description>
        sgd-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>
        
        <!-- SpringBoot Web -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-webmvc</artifactId>
        </dependency>
        
        <!-- Minio -->
        <dependency>
            <groupId>io.minio</groupId>
            <artifactId>minio</artifactId>
            <version>${minio.version}</version>
        </dependency>
        
        <!-- sgd Api System -->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-api-system</artifactId>
        </dependency>
        
    </dependencies>

    <build>
        <finalName>${project.artifactId}</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>
   
</project>

 sgd-modules/sgd-gen/pom.xml

File was renamed from ruoyi-modules/ruoyi-gen/pom.xml
@@ -1,87 +1,87 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi-modules</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>ruoyi-modules-gen</artifactId>



    <description>

        ruoyi-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>

        
        <!-- Apache Velocity -->

        <dependency>

            <groupId>org.apache.velocity</groupId>

            <artifactId>velocity-engine-core</artifactId>

        </dependency>

        
        <!-- Mysql Connector -->

        <dependency>

            <groupId>com.mysql</groupId>

            <artifactId>mysql-connector-j</artifactId>

        </dependency>

        
        <!-- RuoYi Common Log -->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-log</artifactId>

        </dependency>

        
        <!-- RuoYi Common Swagger -->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-swagger</artifactId>

        </dependency>



    </dependencies>



    <build>

        <finalName>${project.artifactId}</finalName>

        <plugins>

            <plugin>

                <groupId>org.springframework.boot</groupId>

                <artifactId>spring-boot-maven-plugin</artifactId>

                <executions>

                    <execution>

                        <goals>

                            <goal>repackage</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

        </plugins>

    </build>

   
<?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.sgd</groupId>
        <artifactId>sgd-modules</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>sgd-modules-gen</artifactId>

    <description>
        sgd-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>
        
        <!-- Apache Velocity -->
        <dependency>
            <groupId>org.apache.velocity</groupId>
            <artifactId>velocity-engine-core</artifactId>
        </dependency>
        
        <!-- Mysql Connector -->
        <dependency>
            <groupId>com.mysql</groupId>
            <artifactId>mysql-connector-j</artifactId>
        </dependency>
        
        <!-- sgd Common Log -->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-log</artifactId>
        </dependency>
        
        <!-- sgd Common Swagger -->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-swagger</artifactId>
        </dependency>

    </dependencies>

    <build>
        <finalName>${project.artifactId}</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>
   
</project>

 sgd-modules/sgd-job/pom.xml

File was renamed from ruoyi-modules/ruoyi-job/pom.xml
@@ -1,87 +1,87 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi-modules</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>ruoyi-modules-job</artifactId>



    <description>

        ruoyi-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>

        
        <!-- Quartz -->

        <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-quartz</artifactId>

        </dependency>

        
        <!-- Mysql Connector -->

        <dependency>

            <groupId>com.mysql</groupId>

            <artifactId>mysql-connector-j</artifactId>

        </dependency>

        
        <!-- RuoYi Common Log -->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-log</artifactId>

        </dependency>

        
        <!-- RuoYi Common Swagger -->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-swagger</artifactId>

        </dependency>

        
    </dependencies>



    <build>

        <finalName>${project.artifactId}</finalName>

        <plugins>

            <plugin>

                <groupId>org.springframework.boot</groupId>

                <artifactId>spring-boot-maven-plugin</artifactId>

                <executions>

                    <execution>

                        <goals>

                            <goal>repackage</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

        </plugins>

    </build>

   
<?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.sgd</groupId>
        <artifactId>sgd-modules</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>sgd-modules-job</artifactId>

    <description>
        sgd-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>
        
        <!-- Quartz -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-quartz</artifactId>
        </dependency>
        
        <!-- Mysql Connector -->
        <dependency>
            <groupId>com.mysql</groupId>
            <artifactId>mysql-connector-j</artifactId>
        </dependency>
        
        <!-- sgd Common Log -->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-log</artifactId>
        </dependency>
        
        <!-- sgd Common Swagger -->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-swagger</artifactId>
        </dependency>
        
    </dependencies>

    <build>
        <finalName>${project.artifactId}</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>
   
</project>

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

File was renamed from ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml
@@ -1,100 +1,100 @@
<?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.ruoyi.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="startTime"      column="start_time"      />

        <result property="endTime"        column="end_time"        />

        <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, start_time, end_time, 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>

        order by create_time desc

    </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>

             <if test="startTime != null">start_time,</if>

             <if test="endTime != null">end_time,</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>

             <if test="startTime != null">#{startTime},</if>

             <if test="endTime != null">#{endTime},</if>

             sysdate()

         )

    </insert>



<?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.sgd.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="startTime"      column="start_time"      />
        <result property="endTime"        column="end_time"        />
        <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, start_time, end_time, 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>
        order by create_time desc
    </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>
             <if test="startTime != null">start_time,</if>
             <if test="endTime != null">end_time,</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>
             <if test="startTime != null">#{startTime},</if>
             <if test="endTime != null">#{endTime},</if>
             sysdate()
         )
    </insert>

</mapper> 

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

File was renamed from ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml
@@ -1,111 +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.ruoyi.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, update_by, update_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>



<?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.sgd.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, update_by, update_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> 

 sgd-modules/sgd-system/pom.xml

File was renamed from ruoyi-modules/ruoyi-system/pom.xml
@@ -1,93 +1,93 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi-modules</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

	
    <artifactId>ruoyi-modules-system</artifactId>



    <description>

        ruoyi-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>

        
        <!-- SpringBoot Actuator -->

        <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-actuator</artifactId>

        </dependency>

        
        <!-- Mysql Connector -->

        <dependency>

            <groupId>com.mysql</groupId>

            <artifactId>mysql-connector-j</artifactId>

        </dependency>

        
        <!-- RuoYi Common DataSource -->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-datasource</artifactId>

        </dependency>

        
        <!-- RuoYi Common DataScope -->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-datascope</artifactId>

        </dependency>

        
        <!-- RuoYi Common Log -->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-log</artifactId>

        </dependency>

        
        <!-- RuoYi Common Swagger -->

        <dependency>

            <groupId>com.ruoyi</groupId>

            <artifactId>ruoyi-common-swagger</artifactId>

        </dependency>



    </dependencies>



    <build>

        <finalName>${project.artifactId}</finalName>

        <plugins>

            <plugin>

                <groupId>org.springframework.boot</groupId>

                <artifactId>spring-boot-maven-plugin</artifactId>

                <executions>

                    <execution>

                        <goals>

                            <goal>repackage</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

        </plugins>

    </build>

   
<?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.sgd</groupId>
        <artifactId>sgd-modules</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
	
    <artifactId>sgd-modules-system</artifactId>

    <description>
        sgd-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>
        
        <!-- SpringBoot Actuator -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
        
        <!-- Mysql Connector -->
        <dependency>
            <groupId>com.mysql</groupId>
            <artifactId>mysql-connector-j</artifactId>
        </dependency>
        
        <!-- sgd Common DataSource -->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-datasource</artifactId>
        </dependency>
        
        <!-- sgd Common DataScope -->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-datascope</artifactId>
        </dependency>
        
        <!-- sgd Common Log -->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-log</artifactId>
        </dependency>
        
        <!-- sgd Common Swagger -->
        <dependency>
            <groupId>com.sgd</groupId>
            <artifactId>sgd-common-swagger</artifactId>
        </dependency>

    </dependencies>

    <build>
        <finalName>${project.artifactId}</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>
   
</project>

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysConfigMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -1,117 +1,117 @@
<?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.ruoyi.system.mapper.SysConfigMapper">

    
    <resultMap type="SysConfig" id="SysConfigResult">

        <id     property="configId"      column="config_id"      />

        <result property="configName"    column="config_name"    />

        <result property="configKey"     column="config_key"     />

        <result property="configValue"   column="config_value"   />

        <result property="configType"    column="config_type"    />

        <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="selectConfigVo">

        select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark 
        from sys_config

    </sql>

    
    <!-- 查询条件 -->

    <sql id="sqlwhereSearch">

        <where>

            <if test="configId !=null">

                and config_id = #{configId}

            </if>

            <if test="configKey !=null and configKey != ''">

                and config_key = #{configKey}

            </if>

        </where>

    </sql>

    
    <select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">

        <include refid="selectConfigVo"/>

        <include refid="sqlwhereSearch"/>

    </select>

    
    <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">

        <include refid="selectConfigVo"/>

        <where>

            <if test="configName != null and configName != ''">

                AND config_name like concat('%', #{configName}, '%')

            </if>

            <if test="configType != null and configType != ''">

                AND config_type = #{configType}

            </if>

            <if test="configKey != null and configKey != ''">

                AND config_key like concat('%', #{configKey}, '%')

            </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="selectConfigById" parameterType="Long" resultMap="SysConfigResult">

        <include refid="selectConfigVo"/>

        where config_id = #{configId}

    </select>

    
    <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">

        <include refid="selectConfigVo"/>

        where config_key = #{configKey} limit 1

    </select>

    
    <insert id="insertConfig" parameterType="SysConfig">

        insert into sys_config (

            <if test="configName != null and configName != '' ">config_name,</if>

            <if test="configKey != null and configKey != '' ">config_key,</if>

            <if test="configValue != null and configValue != '' ">config_value,</if>

            <if test="configType != null and configType != '' ">config_type,</if>

            <if test="createBy != null and createBy != ''">create_by,</if>

            <if test="remark != null and remark != ''">remark,</if>

             create_time

        )values(

            <if test="configName != null and configName != ''">#{configName},</if>

            <if test="configKey != null and configKey != ''">#{configKey},</if>

            <if test="configValue != null and configValue != ''">#{configValue},</if>

            <if test="configType != null and configType != ''">#{configType},</if>

            <if test="createBy != null and createBy != ''">#{createBy},</if>

            <if test="remark != null and remark != ''">#{remark},</if>

             sysdate()

        )

    </insert>

	 
    <update id="updateConfig" parameterType="SysConfig">

        update sys_config 
        <set>

            <if test="configName != null and configName != ''">config_name = #{configName},</if>

            <if test="configKey != null and configKey != ''">config_key = #{configKey},</if>

            <if test="configValue != null and configValue != ''">config_value = #{configValue},</if>

            <if test="configType != null and configType != ''">config_type = #{configType},</if>

            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

            <if test="remark != null">remark = #{remark},</if>

             update_time = sysdate()

        </set>

        where config_id = #{configId}

    </update>

	
    <delete id="deleteConfigById" parameterType="Long">

        delete from sys_config where config_id = #{configId}

    </delete>

    
    <delete id="deleteConfigByIds" parameterType="Long">

        delete from sys_config where config_id in 
        <foreach item="configId" collection="array" open="(" separator="," close=")">

            #{configId}

        </foreach>

    </delete>

    
<?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.sgd.system.mapper.SysConfigMapper">
    
    <resultMap type="SysConfig" id="SysConfigResult">
        <id     property="configId"      column="config_id"      />
        <result property="configName"    column="config_name"    />
        <result property="configKey"     column="config_key"     />
        <result property="configValue"   column="config_value"   />
        <result property="configType"    column="config_type"    />
        <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="selectConfigVo">
        select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark 
        from sys_config
    </sql>
    
    <!-- 查询条件 -->
    <sql id="sqlwhereSearch">
        <where>
            <if test="configId !=null">
                and config_id = #{configId}
            </if>
            <if test="configKey !=null and configKey != ''">
                and config_key = #{configKey}
            </if>
        </where>
    </sql>
    
    <select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
        <include refid="selectConfigVo"/>
        <include refid="sqlwhereSearch"/>
    </select>
    
    <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
        <include refid="selectConfigVo"/>
        <where>
            <if test="configName != null and configName != ''">
                AND config_name like concat('%', #{configName}, '%')
            </if>
            <if test="configType != null and configType != ''">
                AND config_type = #{configType}
            </if>
            <if test="configKey != null and configKey != ''">
                AND config_key like concat('%', #{configKey}, '%')
            </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="selectConfigById" parameterType="Long" resultMap="SysConfigResult">
        <include refid="selectConfigVo"/>
        where config_id = #{configId}
    </select>
    
    <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
        <include refid="selectConfigVo"/>
        where config_key = #{configKey} limit 1
    </select>
    
    <insert id="insertConfig" parameterType="SysConfig">
        insert into sys_config (
            <if test="configName != null and configName != '' ">config_name,</if>
            <if test="configKey != null and configKey != '' ">config_key,</if>
            <if test="configValue != null and configValue != '' ">config_value,</if>
            <if test="configType != null and configType != '' ">config_type,</if>
            <if test="createBy != null and createBy != ''">create_by,</if>
            <if test="remark != null and remark != ''">remark,</if>
             create_time
        )values(
            <if test="configName != null and configName != ''">#{configName},</if>
            <if test="configKey != null and configKey != ''">#{configKey},</if>
            <if test="configValue != null and configValue != ''">#{configValue},</if>
            <if test="configType != null and configType != ''">#{configType},</if>
            <if test="createBy != null and createBy != ''">#{createBy},</if>
            <if test="remark != null and remark != ''">#{remark},</if>
             sysdate()
        )
    </insert>
	 
    <update id="updateConfig" parameterType="SysConfig">
        update sys_config 
        <set>
            <if test="configName != null and configName != ''">config_name = #{configName},</if>
            <if test="configKey != null and configKey != ''">config_key = #{configKey},</if>
            <if test="configValue != null and configValue != ''">config_value = #{configValue},</if>
            <if test="configType != null and configType != ''">config_type = #{configType},</if>
            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
            <if test="remark != null">remark = #{remark},</if>
             update_time = sysdate()
        </set>
        where config_id = #{configId}
    </update>
	
    <delete id="deleteConfigById" parameterType="Long">
        delete from sys_config where config_id = #{configId}
    </delete>
    
    <delete id="deleteConfigByIds" parameterType="Long">
        delete from sys_config where config_id in 
        <foreach item="configId" collection="array" open="(" separator="," close=")">
            #{configId}
        </foreach>
    </delete>
    
</mapper>

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysDeptMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -1,161 +1,161 @@
<?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.ruoyi.system.mapper.SysDeptMapper">



    <resultMap type="SysDept" id="SysDeptResult">

        <id     property="deptId"     column="dept_id"     />

        <result property="parentId"   column="parent_id"   />

        <result property="ancestors"  column="ancestors"   />

        <result property="deptName"   column="dept_name"   />

        <result property="orderNum"   column="order_num"   />

        <result property="leader"     column="leader"      />

        <result property="phone"      column="phone"       />

        <result property="email"      column="email"       />

        <result property="status"     column="status"      />

        <result property="delFlag"    column="del_flag"    />

        <result property="parentName" column="parent_name" />

        <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="selectDeptVo">

        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
        from sys_dept d

    </sql>

    
    <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">

        <include refid="selectDeptVo"/>

        where d.del_flag = '0'

        <if test="deptId != null and deptId != 0">

            AND dept_id = #{deptId}

        </if>

        <if test="parentId != null and parentId != 0">

            AND parent_id = #{parentId}

        </if>

        <if test="deptName != null and deptName != ''">

            AND dept_name like concat('%', #{deptName}, '%')

        </if>

        <if test="status != null and status != ''">

            AND status = #{status}

        </if>

        <!-- 数据范围过滤 -->

        ${params.dataScope}

        order by d.parent_id, d.order_num

    </select>

    
    <select id="selectDeptListByRoleId" resultType="Long">

        select d.dept_id

        from sys_dept d

            left join sys_role_dept rd on d.dept_id = rd.dept_id

        where rd.role_id = #{roleId}

            <if test="deptCheckStrictly">

              and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})

            </if>

        order by d.parent_id, d.order_num

    </select>

    
    <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">

        <include refid="selectDeptVo"/>

        where dept_id = #{deptId}

    </select>

    
    <select id="checkDeptExistUser" parameterType="Long" resultType="int">

        select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'

    </select>

	
    <select id="hasChildByDeptId" parameterType="Long" resultType="int">

        select count(1) from sys_dept

        where del_flag = '0' and parent_id = #{deptId} limit 1

    </select>

	
    <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">

        select * from sys_dept where find_in_set(#{deptId}, ancestors)

    </select>

	
    <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">

        select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)

    </select>

	
    <select id="checkDeptNameUnique" resultMap="SysDeptResult">

        <include refid="selectDeptVo"/>

        where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1

    </select>

    
    <insert id="insertDept" parameterType="SysDept">

         insert into sys_dept(

             <if test="deptId != null and deptId != 0">dept_id,</if>

             <if test="parentId != null and parentId != 0">parent_id,</if>

             <if test="deptName != null and deptName != ''">dept_name,</if>

             <if test="ancestors != null and ancestors != ''">ancestors,</if>

             <if test="orderNum != null">order_num,</if>

             <if test="leader != null and leader != ''">leader,</if>

             <if test="phone != null and phone != ''">phone,</if>

             <if test="email != null and email != ''">email,</if>

             <if test="status != null">status,</if>

             <if test="createBy != null and createBy != ''">create_by,</if>

             create_time

         )values(

             <if test="deptId != null and deptId != 0">#{deptId},</if>

             <if test="parentId != null and parentId != 0">#{parentId},</if>

             <if test="deptName != null and deptName != ''">#{deptName},</if>

             <if test="ancestors != null and ancestors != ''">#{ancestors},</if>

             <if test="orderNum != null">#{orderNum},</if>

             <if test="leader != null and leader != ''">#{leader},</if>

             <if test="phone != null and phone != ''">#{phone},</if>

             <if test="email != null and email != ''">#{email},</if>

             <if test="status != null">#{status},</if>

             <if test="createBy != null and createBy != ''">#{createBy},</if>

             sysdate()

         )

    </insert>

	
    <update id="updateDept" parameterType="SysDept">

         update sys_dept

         <set>

             <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>

             <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>

             <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>

             <if test="orderNum != null">order_num = #{orderNum},</if>

             <if test="leader != null">leader = #{leader},</if>

             <if test="phone != null">phone = #{phone},</if>

             <if test="email != null">email = #{email},</if>

             <if test="status != null and status != ''">status = #{status},</if>

             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

             update_time = sysdate()

         </set>

         where dept_id = #{deptId}

    </update>

	
    <update id="updateDeptChildren" parameterType="java.util.List">

        update sys_dept set ancestors =

        <foreach collection="depts" item="item" index="index"

            separator=" " open="case dept_id" close="end">

            when #{item.deptId} then #{item.ancestors}

        </foreach>

        where dept_id in

        <foreach collection="depts" item="item" index="index"

            separator="," open="(" close=")">

            #{item.deptId}

        </foreach>

    </update>

	 
    <update id="updateDeptStatusNormal" parameterType="Long">

         update sys_dept set status = '0' where dept_id in 
         <foreach collection="array" item="deptId" open="(" separator="," close=")">

            #{deptId}

        </foreach>

    </update>

	
    <update id="updateDeptSort" parameterType="SysDept">

        update sys_dept set order_num = #{orderNum} where dept_id = #{deptId}

    </update>

	
    <delete id="deleteDeptById" parameterType="Long">

        update sys_dept set del_flag = '2' where dept_id = #{deptId}

    </delete>



<?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.sgd.system.mapper.SysDeptMapper">

    <resultMap type="SysDept" id="SysDeptResult">
        <id     property="deptId"     column="dept_id"     />
        <result property="parentId"   column="parent_id"   />
        <result property="ancestors"  column="ancestors"   />
        <result property="deptName"   column="dept_name"   />
        <result property="orderNum"   column="order_num"   />
        <result property="leader"     column="leader"      />
        <result property="phone"      column="phone"       />
        <result property="email"      column="email"       />
        <result property="status"     column="status"      />
        <result property="delFlag"    column="del_flag"    />
        <result property="parentName" column="parent_name" />
        <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="selectDeptVo">
        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
        from sys_dept d
    </sql>
    
    <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
        <include refid="selectDeptVo"/>
        where d.del_flag = '0'
        <if test="deptId != null and deptId != 0">
            AND dept_id = #{deptId}
        </if>
        <if test="parentId != null and parentId != 0">
            AND parent_id = #{parentId}
        </if>
        <if test="deptName != null and deptName != ''">
            AND dept_name like concat('%', #{deptName}, '%')
        </if>
        <if test="status != null and status != ''">
            AND status = #{status}
        </if>
        <!-- 数据范围过滤 -->
        ${params.dataScope}
        order by d.parent_id, d.order_num
    </select>
    
    <select id="selectDeptListByRoleId" resultType="Long">
        select d.dept_id
        from sys_dept d
            left join sys_role_dept rd on d.dept_id = rd.dept_id
        where rd.role_id = #{roleId}
            <if test="deptCheckStrictly">
              and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
            </if>
        order by d.parent_id, d.order_num
    </select>
    
    <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
        <include refid="selectDeptVo"/>
        where dept_id = #{deptId}
    </select>
    
    <select id="checkDeptExistUser" parameterType="Long" resultType="int">
        select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
    </select>
	
    <select id="hasChildByDeptId" parameterType="Long" resultType="int">
        select count(1) from sys_dept
        where del_flag = '0' and parent_id = #{deptId} limit 1
    </select>
	
    <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
        select * from sys_dept where find_in_set(#{deptId}, ancestors)
    </select>
	
    <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
        select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
    </select>
	
    <select id="checkDeptNameUnique" resultMap="SysDeptResult">
        <include refid="selectDeptVo"/>
        where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
    </select>
    
    <insert id="insertDept" parameterType="SysDept">
         insert into sys_dept(
             <if test="deptId != null and deptId != 0">dept_id,</if>
             <if test="parentId != null and parentId != 0">parent_id,</if>
             <if test="deptName != null and deptName != ''">dept_name,</if>
             <if test="ancestors != null and ancestors != ''">ancestors,</if>
             <if test="orderNum != null">order_num,</if>
             <if test="leader != null and leader != ''">leader,</if>
             <if test="phone != null and phone != ''">phone,</if>
             <if test="email != null and email != ''">email,</if>
             <if test="status != null">status,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             create_time
         )values(
             <if test="deptId != null and deptId != 0">#{deptId},</if>
             <if test="parentId != null and parentId != 0">#{parentId},</if>
             <if test="deptName != null and deptName != ''">#{deptName},</if>
             <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
             <if test="orderNum != null">#{orderNum},</if>
             <if test="leader != null and leader != ''">#{leader},</if>
             <if test="phone != null and phone != ''">#{phone},</if>
             <if test="email != null and email != ''">#{email},</if>
             <if test="status != null">#{status},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             sysdate()
         )
    </insert>
	
    <update id="updateDept" parameterType="SysDept">
         update sys_dept
         <set>
             <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
             <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
             <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
             <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="leader != null">leader = #{leader},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="email != null">email = #{email},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
         </set>
         where dept_id = #{deptId}
    </update>
	
    <update id="updateDeptChildren" parameterType="java.util.List">
        update sys_dept set ancestors =
        <foreach collection="depts" item="item" index="index"
            separator=" " open="case dept_id" close="end">
            when #{item.deptId} then #{item.ancestors}
        </foreach>
        where dept_id in
        <foreach collection="depts" item="item" index="index"
            separator="," open="(" close=")">
            #{item.deptId}
        </foreach>
    </update>
	 
    <update id="updateDeptStatusNormal" parameterType="Long">
         update sys_dept set status = '0' where dept_id in 
         <foreach collection="array" item="deptId" open="(" separator="," close=")">
            #{deptId}
        </foreach>
    </update>
	
    <update id="updateDeptSort" parameterType="SysDept">
        update sys_dept set order_num = #{orderNum} where dept_id = #{deptId}
    </update>
	
    <delete id="deleteDeptById" parameterType="Long">
        update sys_dept set del_flag = '2' where dept_id = #{deptId}
    </delete>

</mapper>

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysDictDataMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -1,124 +1,124 @@
<?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.ruoyi.system.mapper.SysDictDataMapper">

	
    <resultMap type="SysDictData" id="SysDictDataResult">

        <id     property="dictCode"   column="dict_code"   />

        <result property="dictSort"   column="dict_sort"   />

        <result property="dictLabel"  column="dict_label"  />

        <result property="dictValue"  column="dict_value"  />

        <result property="dictType"   column="dict_type"   />

        <result property="cssClass"   column="css_class"   />

        <result property="listClass"  column="list_class"  />

        <result property="isDefault"  column="is_default"  />

        <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" />

    </resultMap>

	
    <sql id="selectDictDataVo">

        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark 
        from sys_dict_data

    </sql>



    <select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">

        <include refid="selectDictDataVo"/>

        <where>

            <if test="dictType != null and dictType != ''">

                AND dict_type = #{dictType}

            </if>

            <if test="dictLabel != null and dictLabel != ''">

                AND dict_label like concat('%', #{dictLabel}, '%')

            </if>

            <if test="status != null and status != ''">

                AND status = #{status}

            </if>

        </where>

        order by dict_sort asc

    </select>

	
    <select id="selectDictDataByType" parameterType="String" resultMap="SysDictDataResult">

        <include refid="selectDictDataVo"/>

        where status = '0' and dict_type = #{dictType} order by dict_sort asc

    </select>

	
    <select id="selectDictLabel" resultType="String">

        select dict_label from sys_dict_data

        where dict_type = #{dictType} and dict_value = #{dictValue}

    </select>

	
    <select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">

        <include refid="selectDictDataVo"/>

        where dict_code = #{dictCode}

    </select>

	
    <select id="countDictDataByType" resultType="Integer">

        select count(1) from sys_dict_data where dict_type=#{dictType}  
    </select>

	
    <delete id="deleteDictDataById" parameterType="Long">

         delete from sys_dict_data where dict_code = #{dictCode}

     </delete>

 	
     <delete id="deleteDictDataByIds" parameterType="Long">

         delete from sys_dict_data where dict_code in

         <foreach collection="array" item="dictCode" open="(" separator="," close=")">

             #{dictCode}

        </foreach> 
     </delete>

	
    <update id="updateDictData" parameterType="SysDictData">

         update sys_dict_data

         <set>

             <if test="dictSort != null">dict_sort = #{dictSort},</if>

             <if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>

             <if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>

             <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>

             <if test="cssClass != null">css_class = #{cssClass},</if>

             <if test="listClass != null">list_class = #{listClass},</if>

             <if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>

             <if test="status != null">status = #{status},</if>

             <if test="remark != null">remark = #{remark},</if>

             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

             update_time = sysdate()

         </set>

         where dict_code = #{dictCode}

    </update>

	
    <update id="updateDictDataType" parameterType="String">

         update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}

    </update>

 	
     <insert id="insertDictData" parameterType="SysDictData">

         insert into sys_dict_data(

             <if test="dictSort != null">dict_sort,</if>

             <if test="dictLabel != null and dictLabel != ''">dict_label,</if>

             <if test="dictValue != null and dictValue != ''">dict_value,</if>

             <if test="dictType != null and dictType != ''">dict_type,</if>

             <if test="cssClass != null and cssClass != ''">css_class,</if>

             <if test="listClass != null and listClass != ''">list_class,</if>

             <if test="isDefault != null and isDefault != ''">is_default,</if>

             <if test="status != null">status,</if>

             <if test="remark != null and remark != ''">remark,</if>

             <if test="createBy != null and createBy != ''">create_by,</if>

             create_time

         )values(

             <if test="dictSort != null">#{dictSort},</if>

             <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>

             <if test="dictValue != null and dictValue != ''">#{dictValue},</if>

             <if test="dictType != null and dictType != ''">#{dictType},</if>

             <if test="cssClass != null and cssClass != ''">#{cssClass},</if>

             <if test="listClass != null and listClass != ''">#{listClass},</if>

             <if test="isDefault != null and isDefault != ''">#{isDefault},</if>

             <if test="status != null">#{status},</if>

             <if test="remark != null and remark != ''">#{remark},</if>

             <if test="createBy != null and createBy != ''">#{createBy},</if>

             sysdate()

         )

    </insert>

	
<?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.sgd.system.mapper.SysDictDataMapper">
	
    <resultMap type="SysDictData" id="SysDictDataResult">
        <id     property="dictCode"   column="dict_code"   />
        <result property="dictSort"   column="dict_sort"   />
        <result property="dictLabel"  column="dict_label"  />
        <result property="dictValue"  column="dict_value"  />
        <result property="dictType"   column="dict_type"   />
        <result property="cssClass"   column="css_class"   />
        <result property="listClass"  column="list_class"  />
        <result property="isDefault"  column="is_default"  />
        <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" />
    </resultMap>
	
    <sql id="selectDictDataVo">
        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark 
        from sys_dict_data
    </sql>

    <select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
        <include refid="selectDictDataVo"/>
        <where>
            <if test="dictType != null and dictType != ''">
                AND dict_type = #{dictType}
            </if>
            <if test="dictLabel != null and dictLabel != ''">
                AND dict_label like concat('%', #{dictLabel}, '%')
            </if>
            <if test="status != null and status != ''">
                AND status = #{status}
            </if>
        </where>
        order by dict_sort asc
    </select>
	
    <select id="selectDictDataByType" parameterType="String" resultMap="SysDictDataResult">
        <include refid="selectDictDataVo"/>
        where status = '0' and dict_type = #{dictType} order by dict_sort asc
    </select>
	
    <select id="selectDictLabel" resultType="String">
        select dict_label from sys_dict_data
        where dict_type = #{dictType} and dict_value = #{dictValue}
    </select>
	
    <select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">
        <include refid="selectDictDataVo"/>
        where dict_code = #{dictCode}
    </select>
	
    <select id="countDictDataByType" resultType="Integer">
        select count(1) from sys_dict_data where dict_type=#{dictType}  
    </select>
	
    <delete id="deleteDictDataById" parameterType="Long">
         delete from sys_dict_data where dict_code = #{dictCode}
     </delete>
 	
     <delete id="deleteDictDataByIds" parameterType="Long">
         delete from sys_dict_data where dict_code in
         <foreach collection="array" item="dictCode" open="(" separator="," close=")">
             #{dictCode}
        </foreach> 
     </delete>
	
    <update id="updateDictData" parameterType="SysDictData">
         update sys_dict_data
         <set>
             <if test="dictSort != null">dict_sort = #{dictSort},</if>
             <if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
             <if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
             <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
             <if test="cssClass != null">css_class = #{cssClass},</if>
             <if test="listClass != null">list_class = #{listClass},</if>
             <if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
             <if test="status != null">status = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
         </set>
         where dict_code = #{dictCode}
    </update>
	
    <update id="updateDictDataType" parameterType="String">
         update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
    </update>
 	
     <insert id="insertDictData" parameterType="SysDictData">
         insert into sys_dict_data(
             <if test="dictSort != null">dict_sort,</if>
             <if test="dictLabel != null and dictLabel != ''">dict_label,</if>
             <if test="dictValue != null and dictValue != ''">dict_value,</if>
             <if test="dictType != null and dictType != ''">dict_type,</if>
             <if test="cssClass != null and cssClass != ''">css_class,</if>
             <if test="listClass != null and listClass != ''">list_class,</if>
             <if test="isDefault != null and isDefault != ''">is_default,</if>
             <if test="status != null">status,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             create_time
         )values(
             <if test="dictSort != null">#{dictSort},</if>
             <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
             <if test="dictValue != null and dictValue != ''">#{dictValue},</if>
             <if test="dictType != null and dictType != ''">#{dictType},</if>
             <if test="cssClass != null and cssClass != ''">#{cssClass},</if>
             <if test="listClass != null and listClass != ''">#{listClass},</if>
             <if test="isDefault != null and isDefault != ''">#{isDefault},</if>
             <if test="status != null">#{status},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             sysdate()
         )
    </insert>
	
</mapper> 

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -1,105 +1,105 @@
<?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.ruoyi.system.mapper.SysDictTypeMapper">



    <resultMap type="SysDictType" id="SysDictTypeResult">

        <id     property="dictId"     column="dict_id"     />

        <result property="dictName"   column="dict_name"   />

        <result property="dictType"   column="dict_type"   />

        <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" />

    </resultMap>

	
    <sql id="selectDictTypeVo">

        select dict_id, dict_name, dict_type, status, create_by, create_time, remark 
        from sys_dict_type

    </sql>



    <select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">

        <include refid="selectDictTypeVo"/>

        <where>

            <if test="dictName != null and dictName != ''">

                AND dict_name like concat('%', #{dictName}, '%')

            </if>

            <if test="status != null and status != ''">

                AND status = #{status}

            </if>

            <if test="dictType != null and dictType != ''">

                AND dict_type like concat('%', #{dictType}, '%')

            </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="selectDictTypeAll" resultMap="SysDictTypeResult">

        <include refid="selectDictTypeVo"/>

    </select>

	
    <select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">

        <include refid="selectDictTypeVo"/>

        where dict_id = #{dictId}

    </select>

	
    <select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">

        <include refid="selectDictTypeVo"/>

        where dict_type = #{dictType}

    </select>

	
    <select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">

        <include refid="selectDictTypeVo"/>

        where dict_type = #{dictType} limit 1

    </select>

	
    <delete id="deleteDictTypeById" parameterType="Long">

         delete from sys_dict_type where dict_id = #{dictId}

     </delete>

 	
     <delete id="deleteDictTypeByIds" parameterType="Long">

         delete from sys_dict_type where dict_id in

         <foreach collection="array" item="dictId" open="(" separator="," close=")">

             #{dictId}

        </foreach> 
     </delete>



     <update id="updateDictType" parameterType="SysDictType">

         update sys_dict_type

         <set>

             <if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>

             <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>

             <if test="status != null">status = #{status},</if>

             <if test="remark != null">remark = #{remark},</if>

             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

             update_time = sysdate()

         </set>

         where dict_id = #{dictId}

    </update>

 	
     <insert id="insertDictType" parameterType="SysDictType">

         insert into sys_dict_type(

             <if test="dictName != null and dictName != ''">dict_name,</if>

             <if test="dictType != null and dictType != ''">dict_type,</if>

             <if test="status != null">status,</if>

             <if test="remark != null and remark != ''">remark,</if>

             <if test="createBy != null and createBy != ''">create_by,</if>

             create_time

         )values(

             <if test="dictName != null and dictName != ''">#{dictName},</if>

             <if test="dictType != null and dictType != ''">#{dictType},</if>

             <if test="status != null">#{status},</if>

             <if test="remark != null and remark != ''">#{remark},</if>

             <if test="createBy != null and createBy != ''">#{createBy},</if>

             sysdate()

         )

    </insert>

	
<?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.sgd.system.mapper.SysDictTypeMapper">

    <resultMap type="SysDictType" id="SysDictTypeResult">
        <id     property="dictId"     column="dict_id"     />
        <result property="dictName"   column="dict_name"   />
        <result property="dictType"   column="dict_type"   />
        <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" />
    </resultMap>
	
    <sql id="selectDictTypeVo">
        select dict_id, dict_name, dict_type, status, create_by, create_time, remark 
        from sys_dict_type
    </sql>

    <select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
        <include refid="selectDictTypeVo"/>
        <where>
            <if test="dictName != null and dictName != ''">
                AND dict_name like concat('%', #{dictName}, '%')
            </if>
            <if test="status != null and status != ''">
                AND status = #{status}
            </if>
            <if test="dictType != null and dictType != ''">
                AND dict_type like concat('%', #{dictType}, '%')
            </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="selectDictTypeAll" resultMap="SysDictTypeResult">
        <include refid="selectDictTypeVo"/>
    </select>
	
    <select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
        <include refid="selectDictTypeVo"/>
        where dict_id = #{dictId}
    </select>
	
    <select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
        <include refid="selectDictTypeVo"/>
        where dict_type = #{dictType}
    </select>
	
    <select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
        <include refid="selectDictTypeVo"/>
        where dict_type = #{dictType} limit 1
    </select>
	
    <delete id="deleteDictTypeById" parameterType="Long">
         delete from sys_dict_type where dict_id = #{dictId}
     </delete>
 	
     <delete id="deleteDictTypeByIds" parameterType="Long">
         delete from sys_dict_type where dict_id in
         <foreach collection="array" item="dictId" open="(" separator="," close=")">
             #{dictId}
        </foreach> 
     </delete>

     <update id="updateDictType" parameterType="SysDictType">
         update sys_dict_type
         <set>
             <if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
             <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
             <if test="status != null">status = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
         </set>
         where dict_id = #{dictId}
    </update>
 	
     <insert id="insertDictType" parameterType="SysDictType">
         insert into sys_dict_type(
             <if test="dictName != null and dictName != ''">dict_name,</if>
             <if test="dictType != null and dictType != ''">dict_type,</if>
             <if test="status != null">status,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             create_time
         )values(
             <if test="dictName != null and dictName != ''">#{dictName},</if>
             <if test="dictType != null and dictType != ''">#{dictType},</if>
             <if test="status != null">#{status},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             sysdate()
         )
    </insert>
	
</mapper> 

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysLogininforMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -1,54 +1,54 @@
<?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.ruoyi.system.mapper.SysLogininforMapper">



    <resultMap type="SysLogininfor" id="SysLogininforResult">

        <id     property="infoId"        column="info_id"           />

        <result property="userName"      column="user_name"         />

        <result property="status"        column="status"            />

        <result property="ipaddr"        column="ipaddr"            />

        <result property="msg"           column="msg"               />

        <result property="accessTime"    column="access_time"       />

    </resultMap>



    <insert id="insertLogininfor" parameterType="SysLogininfor">

        insert into sys_logininfor (user_name, status, ipaddr, msg, access_time)

        values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate())

    </insert>

	
    <select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">

        select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor

        <where>

            <if test="ipaddr != null and ipaddr != ''">

                AND ipaddr like concat('%', #{ipaddr}, '%')

            </if>

            <if test="status != null and status != ''">

                AND status = #{status}

            </if>

            <if test="userName != null and userName != ''">

                AND user_name like concat('%', #{userName}, '%')

            </if>

            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->

                AND access_time &gt;= #{params.beginTime}

            </if>

            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->

                AND access_time &lt;= #{params.endTime}

            </if>

        </where>

        order by info_id desc

    </select>

	
    <delete id="deleteLogininforByIds" parameterType="Long">

         delete from sys_logininfor where info_id in

         <foreach collection="array" item="infoId" open="(" separator="," close=")">

             #{infoId}

        </foreach> 
     </delete>

    
    <update id="cleanLogininfor">

        truncate table sys_logininfor

    </update>

    
<?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.sgd.system.mapper.SysLogininforMapper">

    <resultMap type="SysLogininfor" id="SysLogininforResult">
        <id     property="infoId"        column="info_id"           />
        <result property="userName"      column="user_name"         />
        <result property="status"        column="status"            />
        <result property="ipaddr"        column="ipaddr"            />
        <result property="msg"           column="msg"               />
        <result property="accessTime"    column="access_time"       />
    </resultMap>

    <insert id="insertLogininfor" parameterType="SysLogininfor">
        insert into sys_logininfor (user_name, status, ipaddr, msg, access_time)
        values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate())
    </insert>
	
    <select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
        select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor
        <where>
            <if test="ipaddr != null and ipaddr != ''">
                AND ipaddr like concat('%', #{ipaddr}, '%')
            </if>
            <if test="status != null and status != ''">
                AND status = #{status}
            </if>
            <if test="userName != null and userName != ''">
                AND user_name like concat('%', #{userName}, '%')
            </if>
            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                AND access_time &gt;= #{params.beginTime}
            </if>
            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                AND access_time &lt;= #{params.endTime}
            </if>
        </where>
        order by info_id desc
    </select>
	
    <delete id="deleteLogininforByIds" parameterType="Long">
         delete from sys_logininfor where info_id in
         <foreach collection="array" item="infoId" open="(" separator="," close=")">
             #{infoId}
        </foreach> 
     </delete>
    
    <update id="cleanLogininfor">
        truncate table sys_logininfor
    </update>
    
</mapper> 

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysMenuMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -1,215 +1,215 @@
<?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.ruoyi.system.mapper.SysMenuMapper">



    <resultMap type="SysMenu" id="SysMenuResult">

        <id     property="menuId"         column="menu_id"        />

        <result property="menuName"       column="menu_name"      />

        <result property="parentName"     column="parent_name"    />

        <result property="parentId"       column="parent_id"      />

        <result property="orderNum"       column="order_num"      />

        <result property="path"           column="path"           />

        <result property="component"      column="component"      />

        <result property="query"          column="query"          />

        <result property="routeName"      column="route_name"     />

        <result property="isFrame"        column="is_frame"       />

        <result property="isCache"        column="is_cache"       />

        <result property="menuType"       column="menu_type"      />

        <result property="visible"        column="visible"        />

        <result property="status"         column="status"         />

        <result property="perms"          column="perms"          />

        <result property="icon"           column="icon"           />

        <result property="createBy"       column="create_by"      />

        <result property="createTime"     column="create_time"    />

        <result property="updateTime"     column="update_time"    />

        <result property="updateBy"       column="update_by"      />

        <result property="remark"         column="remark"         />

    </resultMap>



    <sql id="selectMenuVo">

        select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
        from sys_menu

    </sql>

    
    <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">

        <include refid="selectMenuVo"/>

        <where>

            <if test="menuName != null and menuName != ''">

                AND menu_name like concat('%', #{menuName}, '%')

            </if>

            <if test="visible != null and visible != ''">

                AND visible = #{visible}

            </if>

            <if test="status != null and status != ''">

                AND status = #{status}

            </if>

        </where>

        order by parent_id, order_num

    </select>

	
    <select id="selectMenuTreeAll" resultMap="SysMenuResult">

        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time

        from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0

        order by m.parent_id, m.order_num

    </select>

	
    <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">

        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time

        from sys_menu m

        left join sys_role_menu rm on m.menu_id = rm.menu_id

        left join sys_user_role ur on rm.role_id = ur.role_id

        left join sys_role ro on ur.role_id = ro.role_id

        where ur.user_id = #{params.userId}

        <if test="menuName != null and menuName != ''">

            AND m.menu_name like concat('%', #{menuName}, '%')

        </if>

        <if test="visible != null and visible != ''">

            AND m.visible = #{visible}

        </if>

        <if test="status != null and status != ''">

            AND m.status = #{status}

        </if>

        order by m.parent_id, m.order_num

    </select>

    
    <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">

        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time

        from sys_menu m

             left join sys_role_menu rm on m.menu_id = rm.menu_id

             left join sys_user_role ur on rm.role_id = ur.role_id

             left join sys_role ro on ur.role_id = ro.role_id

             left join sys_user u on ur.user_id = u.user_id

        where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0

        order by m.parent_id, m.order_num

    </select>

	
    <select id="selectMenuListByRoleId" resultType="Long">

        select m.menu_id

        from sys_menu m

            left join sys_role_menu rm on m.menu_id = rm.menu_id

        where rm.role_id = #{roleId}

            <if test="menuCheckStrictly">

              and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})

            </if>

        order by m.parent_id, m.order_num

    </select>

	
    <select id="selectMenuPerms" resultType="String">

        select distinct m.perms

        from sys_menu m

             left join sys_role_menu rm on m.menu_id = rm.menu_id

             left join sys_user_role ur on rm.role_id = ur.role_id

    </select>



    <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">

        select distinct m.perms

        from sys_menu m

             left join sys_role_menu rm on m.menu_id = rm.menu_id

             left join sys_user_role ur on rm.role_id = ur.role_id

             left join sys_role r on r.role_id = ur.role_id

        where m.status = '0' and r.status = '0' and ur.user_id = #{userId}

    </select>

	
    <select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">

        select distinct m.perms

        from sys_menu m

             left join sys_role_menu rm on m.menu_id = rm.menu_id

        where m.status = '0' and rm.role_id = #{roleId}

    </select>

	
    <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">

        <include refid="selectMenuVo"/>

        where menu_id = #{menuId}

    </select>

	
    <select id="hasChildByMenuId" resultType="Integer">

        select count(1) from sys_menu where parent_id = #{menuId}  
    </select>

	
    <select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">

        <include refid="selectMenuVo"/>

        where menu_name= #{menuName} and parent_id = #{parentId} limit 1

    </select>

	
    <select id="selectMenusByPathOrRouteName" parameterType="SysMenu" resultMap="SysMenuResult">

        <include refid="selectMenuVo"/>

        where menu_type in ('M', 'C') and (path = #{path} or path = #{routeName} or route_name = #{path} or route_name = #{routeName})

    </select>

	
    <update id="updateMenu" parameterType="SysMenu">

        update sys_menu

        <set>

            <if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>

            <if test="parentId != null">parent_id = #{parentId},</if>

            <if test="orderNum != null">order_num = #{orderNum},</if>

            <if test="path != null and path != ''">path = #{path},</if>

            <if test="component != null">component = #{component},</if>

            <if test="query != null">`query` = #{query},</if>

            <if test="routeName != null">route_name = #{routeName},</if>

            <if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>

            <if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>

            <if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>

            <if test="visible != null">visible = #{visible},</if>

            <if test="status != null">status = #{status},</if>

            <if test="perms !=null">perms = #{perms},</if>

            <if test="icon !=null and icon != ''">icon = #{icon},</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 menu_id = #{menuId}

    </update>



    <insert id="insertMenu" parameterType="SysMenu">

        insert into sys_menu(

        <if test="menuId != null and menuId != 0">menu_id,</if>

        <if test="parentId != null and parentId != 0">parent_id,</if>

        <if test="menuName != null and menuName != ''">menu_name,</if>

        <if test="orderNum != null">order_num,</if>

        <if test="path != null and path != ''">path,</if>

        <if test="component != null and component != ''">component,</if>

        <if test="query != null and query != ''">`query`,</if>

        <if test="routeName != null">route_name,</if>

        <if test="isFrame != null and isFrame != ''">is_frame,</if>

        <if test="isCache != null and isCache != ''">is_cache,</if>

        <if test="menuType != null and menuType != ''">menu_type,</if>

        <if test="visible != null">visible,</if>

        <if test="status != null">status,</if>

        <if test="perms !=null and perms != ''">perms,</if>

        <if test="icon != null and icon != ''">icon,</if>

        <if test="remark != null and remark != ''">remark,</if>

        <if test="createBy != null and createBy != ''">create_by,</if>

        create_time

        )values(

        <if test="menuId != null and menuId != 0">#{menuId},</if>

        <if test="parentId != null and parentId != 0">#{parentId},</if>

        <if test="menuName != null and menuName != ''">#{menuName},</if>

        <if test="orderNum != null">#{orderNum},</if>

        <if test="path != null and path != ''">#{path},</if>

        <if test="component != null and component != ''">#{component},</if>

        <if test="query != null and query != ''">#{query},</if>

        <if test="routeName != null">#{routeName},</if>

        <if test="isFrame != null and isFrame != ''">#{isFrame},</if>

        <if test="isCache != null and isCache != ''">#{isCache},</if>

        <if test="menuType != null and menuType != ''">#{menuType},</if>

        <if test="visible != null">#{visible},</if>

        <if test="status != null">#{status},</if>

        <if test="perms !=null and perms != ''">#{perms},</if>

        <if test="icon != null and icon != ''">#{icon},</if>

        <if test="remark != null and remark != ''">#{remark},</if>

        <if test="createBy != null and createBy != ''">#{createBy},</if>

        sysdate()

        )

    </insert>

	
    <update id="updateMenuSort" parameterType="SysMenu">

        update sys_menu set order_num = #{orderNum} where menu_id = #{menuId}

    </update>



    <delete id="deleteMenuById" parameterType="Long">

        delete from sys_menu where menu_id = #{menuId}

    </delete>



<?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.sgd.system.mapper.SysMenuMapper">

    <resultMap type="SysMenu" id="SysMenuResult">
        <id     property="menuId"         column="menu_id"        />
        <result property="menuName"       column="menu_name"      />
        <result property="parentName"     column="parent_name"    />
        <result property="parentId"       column="parent_id"      />
        <result property="orderNum"       column="order_num"      />
        <result property="path"           column="path"           />
        <result property="component"      column="component"      />
        <result property="query"          column="query"          />
        <result property="routeName"      column="route_name"     />
        <result property="isFrame"        column="is_frame"       />
        <result property="isCache"        column="is_cache"       />
        <result property="menuType"       column="menu_type"      />
        <result property="visible"        column="visible"        />
        <result property="status"         column="status"         />
        <result property="perms"          column="perms"          />
        <result property="icon"           column="icon"           />
        <result property="createBy"       column="create_by"      />
        <result property="createTime"     column="create_time"    />
        <result property="updateTime"     column="update_time"    />
        <result property="updateBy"       column="update_by"      />
        <result property="remark"         column="remark"         />
    </resultMap>

    <sql id="selectMenuVo">
        select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
        from sys_menu
    </sql>
    
    <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
        <include refid="selectMenuVo"/>
        <where>
            <if test="menuName != null and menuName != ''">
                AND menu_name like concat('%', #{menuName}, '%')
            </if>
            <if test="visible != null and visible != ''">
                AND visible = #{visible}
            </if>
            <if test="status != null and status != ''">
                AND status = #{status}
            </if>
        </where>
        order by parent_id, order_num
    </select>
	
    <select id="selectMenuTreeAll" resultMap="SysMenuResult">
        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
        from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
        order by m.parent_id, m.order_num
    </select>
	
    <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
        from sys_menu m
        left join sys_role_menu rm on m.menu_id = rm.menu_id
        left join sys_user_role ur on rm.role_id = ur.role_id
        left join sys_role ro on ur.role_id = ro.role_id
        where ur.user_id = #{params.userId}
        <if test="menuName != null and menuName != ''">
            AND m.menu_name like concat('%', #{menuName}, '%')
        </if>
        <if test="visible != null and visible != ''">
            AND m.visible = #{visible}
        </if>
        <if test="status != null and status != ''">
            AND m.status = #{status}
        </if>
        order by m.parent_id, m.order_num
    </select>
    
    <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
        from sys_menu m
             left join sys_role_menu rm on m.menu_id = rm.menu_id
             left join sys_user_role ur on rm.role_id = ur.role_id
             left join sys_role ro on ur.role_id = ro.role_id
             left join sys_user u on ur.user_id = u.user_id
        where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
        order by m.parent_id, m.order_num
    </select>
	
    <select id="selectMenuListByRoleId" resultType="Long">
        select m.menu_id
        from sys_menu m
            left join sys_role_menu rm on m.menu_id = rm.menu_id
        where rm.role_id = #{roleId}
            <if test="menuCheckStrictly">
              and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
            </if>
        order by m.parent_id, m.order_num
    </select>
	
    <select id="selectMenuPerms" resultType="String">
        select distinct m.perms
        from sys_menu m
             left join sys_role_menu rm on m.menu_id = rm.menu_id
             left join sys_user_role ur on rm.role_id = ur.role_id
    </select>

    <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
        select distinct m.perms
        from sys_menu m
             left join sys_role_menu rm on m.menu_id = rm.menu_id
             left join sys_user_role ur on rm.role_id = ur.role_id
             left join sys_role r on r.role_id = ur.role_id
        where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
    </select>
	
    <select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
        select distinct m.perms
        from sys_menu m
             left join sys_role_menu rm on m.menu_id = rm.menu_id
        where m.status = '0' and rm.role_id = #{roleId}
    </select>
	
    <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
        <include refid="selectMenuVo"/>
        where menu_id = #{menuId}
    </select>
	
    <select id="hasChildByMenuId" resultType="Integer">
        select count(1) from sys_menu where parent_id = #{menuId}  
    </select>
	
    <select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
        <include refid="selectMenuVo"/>
        where menu_name= #{menuName} and parent_id = #{parentId} limit 1
    </select>
	
    <select id="selectMenusByPathOrRouteName" parameterType="SysMenu" resultMap="SysMenuResult">
        <include refid="selectMenuVo"/>
        where menu_type in ('M', 'C') and (path = #{path} or path = #{routeName} or route_name = #{path} or route_name = #{routeName})
    </select>
	
    <update id="updateMenu" parameterType="SysMenu">
        update sys_menu
        <set>
            <if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
            <if test="parentId != null">parent_id = #{parentId},</if>
            <if test="orderNum != null">order_num = #{orderNum},</if>
            <if test="path != null and path != ''">path = #{path},</if>
            <if test="component != null">component = #{component},</if>
            <if test="query != null">`query` = #{query},</if>
            <if test="routeName != null">route_name = #{routeName},</if>
            <if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
            <if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
            <if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
            <if test="visible != null">visible = #{visible},</if>
            <if test="status != null">status = #{status},</if>
            <if test="perms !=null">perms = #{perms},</if>
            <if test="icon !=null and icon != ''">icon = #{icon},</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 menu_id = #{menuId}
    </update>

    <insert id="insertMenu" parameterType="SysMenu">
        insert into sys_menu(
        <if test="menuId != null and menuId != 0">menu_id,</if>
        <if test="parentId != null and parentId != 0">parent_id,</if>
        <if test="menuName != null and menuName != ''">menu_name,</if>
        <if test="orderNum != null">order_num,</if>
        <if test="path != null and path != ''">path,</if>
        <if test="component != null and component != ''">component,</if>
        <if test="query != null and query != ''">`query`,</if>
        <if test="routeName != null">route_name,</if>
        <if test="isFrame != null and isFrame != ''">is_frame,</if>
        <if test="isCache != null and isCache != ''">is_cache,</if>
        <if test="menuType != null and menuType != ''">menu_type,</if>
        <if test="visible != null">visible,</if>
        <if test="status != null">status,</if>
        <if test="perms !=null and perms != ''">perms,</if>
        <if test="icon != null and icon != ''">icon,</if>
        <if test="remark != null and remark != ''">remark,</if>
        <if test="createBy != null and createBy != ''">create_by,</if>
        create_time
        )values(
        <if test="menuId != null and menuId != 0">#{menuId},</if>
        <if test="parentId != null and parentId != 0">#{parentId},</if>
        <if test="menuName != null and menuName != ''">#{menuName},</if>
        <if test="orderNum != null">#{orderNum},</if>
        <if test="path != null and path != ''">#{path},</if>
        <if test="component != null and component != ''">#{component},</if>
        <if test="query != null and query != ''">#{query},</if>
        <if test="routeName != null">#{routeName},</if>
        <if test="isFrame != null and isFrame != ''">#{isFrame},</if>
        <if test="isCache != null and isCache != ''">#{isCache},</if>
        <if test="menuType != null and menuType != ''">#{menuType},</if>
        <if test="visible != null">#{visible},</if>
        <if test="status != null">#{status},</if>
        <if test="perms !=null and perms != ''">#{perms},</if>
        <if test="icon != null and icon != ''">#{icon},</if>
        <if test="remark != null and remark != ''">#{remark},</if>
        <if test="createBy != null and createBy != ''">#{createBy},</if>
        sysdate()
        )
    </insert>
	
    <update id="updateMenuSort" parameterType="SysMenu">
        update sys_menu set order_num = #{orderNum} where menu_id = #{menuId}
    </update>

    <delete id="deleteMenuById" parameterType="Long">
        delete from sys_menu where menu_id = #{menuId}
    </delete>

</mapper> 

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysNoticeMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -1,90 +1,90 @@
<?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.ruoyi.system.mapper.SysNoticeMapper">

    
    <resultMap type="SysNotice" id="SysNoticeResult">

        <result property="noticeId"       column="notice_id"       />

        <result property="noticeTitle"    column="notice_title"    />

        <result property="noticeType"     column="notice_type"     />

        <result property="noticeContent"  column="notice_content"  />

        <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="selectNoticeVo">

        select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark 
        from sys_notice

    </sql>

    
    <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">

        <include refid="selectNoticeVo"/>

        where notice_id = #{noticeId}

    </select>

    
    <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">

        <include refid="selectNoticeVo"/>

        <where>

            <if test="noticeTitle != null and noticeTitle != ''">

                AND notice_title like concat('%', #{noticeTitle}, '%')

            </if>

            <if test="noticeType != null and noticeType != ''">

                AND notice_type = #{noticeType}

            </if>

            <if test="createBy != null and createBy != ''">

                AND create_by like concat('%', #{createBy}, '%')

            </if>

        </where>

        order by notice_id desc

    </select>

    
    <insert id="insertNotice" parameterType="SysNotice">

        insert into sys_notice (

            <if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>

            <if test="noticeType != null and noticeType != '' ">notice_type, </if>

            <if test="noticeContent != null and noticeContent != '' ">notice_content, </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="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>

            <if test="noticeType != null and noticeType != ''">#{noticeType}, </if>

            <if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </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>

	 
    <update id="updateNotice" parameterType="SysNotice">

        update sys_notice 
        <set>

            <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>

            <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>

            <if test="noticeContent != null">notice_content = #{noticeContent}, </if>

            <if test="status != null and status != ''">status = #{status}, </if>

            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

             update_time = sysdate()

        </set>

        where notice_id = #{noticeId}

    </update>

	
    <delete id="deleteNoticeById" parameterType="Long">

        delete from sys_notice where notice_id = #{noticeId}

    </delete>

    
    <delete id="deleteNoticeByIds" parameterType="Long">

        delete from sys_notice where notice_id in 
        <foreach item="noticeId" collection="array" open="(" separator="," close=")">

            #{noticeId}

        </foreach>

    </delete>

    
<?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.sgd.system.mapper.SysNoticeMapper">
    
    <resultMap type="SysNotice" id="SysNoticeResult">
        <result property="noticeId"       column="notice_id"       />
        <result property="noticeTitle"    column="notice_title"    />
        <result property="noticeType"     column="notice_type"     />
        <result property="noticeContent"  column="notice_content"  />
        <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="selectNoticeVo">
        select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark 
        from sys_notice
    </sql>
    
    <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">
        <include refid="selectNoticeVo"/>
        where notice_id = #{noticeId}
    </select>
    
    <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
        <include refid="selectNoticeVo"/>
        <where>
            <if test="noticeTitle != null and noticeTitle != ''">
                AND notice_title like concat('%', #{noticeTitle}, '%')
            </if>
            <if test="noticeType != null and noticeType != ''">
                AND notice_type = #{noticeType}
            </if>
            <if test="createBy != null and createBy != ''">
                AND create_by like concat('%', #{createBy}, '%')
            </if>
        </where>
        order by notice_id desc
    </select>
    
    <insert id="insertNotice" parameterType="SysNotice">
        insert into sys_notice (
            <if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
            <if test="noticeType != null and noticeType != '' ">notice_type, </if>
            <if test="noticeContent != null and noticeContent != '' ">notice_content, </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="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
            <if test="noticeType != null and noticeType != ''">#{noticeType}, </if>
            <if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </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>
	 
    <update id="updateNotice" parameterType="SysNotice">
        update sys_notice 
        <set>
            <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
            <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>
            <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
            <if test="status != null and status != ''">status = #{status}, </if>
            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
        </set>
        where notice_id = #{noticeId}
    </update>
	
    <delete id="deleteNoticeById" parameterType="Long">
        delete from sys_notice where notice_id = #{noticeId}
    </delete>
    
    <delete id="deleteNoticeByIds" parameterType="Long">
        delete from sys_notice where notice_id in 
        <foreach item="noticeId" collection="array" open="(" separator="," close=")">
            #{noticeId}
        </foreach>
    </delete>
    
</mapper>

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysNoticeReadMapper">
<mapper namespace="com.sgd.system.mapper.SysNoticeReadMapper">

    <resultMap type="SysNoticeRead" id="SysNoticeReadResult">
        <id     property="readId"   column="read_id"     />

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysOperLogMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -1,86 +1,86 @@
<?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.ruoyi.system.mapper.SysOperLogMapper">



    <resultMap type="SysOperLog" id="SysOperLogResult">

        <id     property="operId"         column="oper_id"        />

        <result property="title"          column="title"          />

        <result property="businessType"   column="business_type"  />

        <result property="method"         column="method"         />

        <result property="requestMethod"  column="request_method" />

        <result property="operatorType"   column="operator_type"  />

        <result property="operName"       column="oper_name"      />

        <result property="deptName"       column="dept_name"      />

        <result property="operUrl"        column="oper_url"       />

        <result property="operIp"         column="oper_ip"        />

        <result property="operParam"      column="oper_param"     />

        <result property="jsonResult"     column="json_result"    />

        <result property="status"         column="status"         />

        <result property="errorMsg"       column="error_msg"      />

        <result property="operTime"       column="oper_time"      />

        <result property="costTime"       column="cost_time"      />

    </resultMap>



    <sql id="selectOperLogVo">

        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time, cost_time

        from sys_oper_log

    </sql>

    
    <insert id="insertOperlog" parameterType="SysOperLog">

        insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, cost_time, oper_time)

        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())

    </insert>

	
    <select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">

        <include refid="selectOperLogVo"/>

        <where>

            <if test="operIp != null and operIp != ''">

                AND oper_ip like concat('%', #{operIp}, '%')

            </if>

            <if test="title != null and title != ''">

                AND title like concat('%', #{title}, '%')

            </if>

            <if test="businessType != null">

                AND business_type = #{businessType}

            </if>

            <if test="businessTypes != null and businessTypes.length > 0">

                AND business_type in

                <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">

                     #{businessType}

                </foreach> 
            </if>

            <if test="status != null">

                AND status = #{status}

            </if>

            <if test="operName != null and operName != ''">

                AND oper_name like concat('%', #{operName}, '%')

            </if>

            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->

                AND oper_time &gt;= #{params.beginTime}

            </if>

            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->

                AND oper_time &lt;= #{params.endTime}

            </if>

        </where>

        order by oper_id desc

    </select>

	
    <delete id="deleteOperLogByIds" parameterType="Long">

         delete from sys_oper_log where oper_id in

         <foreach collection="array" item="operId" open="(" separator="," close=")">

             #{operId}

        </foreach> 
     </delete>

 	
     <select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">

        <include refid="selectOperLogVo"/>

        where oper_id = #{operId}

    </select>

	
    <update id="cleanOperLog">

        truncate table sys_oper_log

    </update>



<?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.sgd.system.mapper.SysOperLogMapper">

    <resultMap type="SysOperLog" id="SysOperLogResult">
        <id     property="operId"         column="oper_id"        />
        <result property="title"          column="title"          />
        <result property="businessType"   column="business_type"  />
        <result property="method"         column="method"         />
        <result property="requestMethod"  column="request_method" />
        <result property="operatorType"   column="operator_type"  />
        <result property="operName"       column="oper_name"      />
        <result property="deptName"       column="dept_name"      />
        <result property="operUrl"        column="oper_url"       />
        <result property="operIp"         column="oper_ip"        />
        <result property="operParam"      column="oper_param"     />
        <result property="jsonResult"     column="json_result"    />
        <result property="status"         column="status"         />
        <result property="errorMsg"       column="error_msg"      />
        <result property="operTime"       column="oper_time"      />
        <result property="costTime"       column="cost_time"      />
    </resultMap>

    <sql id="selectOperLogVo">
        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time, cost_time
        from sys_oper_log
    </sql>
    
    <insert id="insertOperlog" parameterType="SysOperLog">
        insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, cost_time, oper_time)
        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
    </insert>
	
    <select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
        <include refid="selectOperLogVo"/>
        <where>
            <if test="operIp != null and operIp != ''">
                AND oper_ip like concat('%', #{operIp}, '%')
            </if>
            <if test="title != null and title != ''">
                AND title like concat('%', #{title}, '%')
            </if>
            <if test="businessType != null">
                AND business_type = #{businessType}
            </if>
            <if test="businessTypes != null and businessTypes.length > 0">
                AND business_type in
                <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
                     #{businessType}
                </foreach> 
            </if>
            <if test="status != null">
                AND status = #{status}
            </if>
            <if test="operName != null and operName != ''">
                AND oper_name like concat('%', #{operName}, '%')
            </if>
            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                AND oper_time &gt;= #{params.beginTime}
            </if>
            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                AND oper_time &lt;= #{params.endTime}
            </if>
        </where>
        order by oper_id desc
    </select>
	
    <delete id="deleteOperLogByIds" parameterType="Long">
         delete from sys_oper_log where oper_id in
         <foreach collection="array" item="operId" open="(" separator="," close=")">
             #{operId}
        </foreach> 
     </delete>
 	
     <select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
        <include refid="selectOperLogVo"/>
        where oper_id = #{operId}
    </select>
	
    <update id="cleanOperLog">
        truncate table sys_oper_log
    </update>

</mapper> 

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysPostMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -1,122 +1,122 @@
<?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.ruoyi.system.mapper.SysPostMapper">



    <resultMap type="SysPost" id="SysPostResult">

        <id     property="postId"        column="post_id"       />

        <result property="postCode"      column="post_code"     />

        <result property="postName"      column="post_name"     />

        <result property="postSort"      column="post_sort"     />

        <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="selectPostVo">

        select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark 
        from sys_post

    </sql>

	
    <select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">

        <include refid="selectPostVo"/>

        <where>

            <if test="postCode != null and postCode != ''">

                AND post_code like concat('%', #{postCode}, '%')

            </if>

            <if test="status != null and status != ''">

                AND status = #{status}

            </if>

            <if test="postName != null and postName != ''">

                AND post_name like concat('%', #{postName}, '%')

            </if>

        </where>

    </select>

	
    <select id="selectPostAll" resultMap="SysPostResult">

        <include refid="selectPostVo"/>

    </select>

	
    <select id="selectPostById" parameterType="Long" resultMap="SysPostResult">

        <include refid="selectPostVo"/>

        where post_id = #{postId}

    </select>

	
    <select id="selectPostListByUserId" parameterType="Long" resultType="Long">

        select p.post_id

        from sys_post p

            left join sys_user_post up on up.post_id = p.post_id

            left join sys_user u on u.user_id = up.user_id

        where u.user_id = #{userId}

    </select>

	
    <select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">

        select p.post_id, p.post_name, p.post_code

        from sys_post p

             left join sys_user_post up on up.post_id = p.post_id

             left join sys_user u on u.user_id = up.user_id

        where u.user_name = #{userName}

    </select>

	
    <select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">

        <include refid="selectPostVo"/>

         where post_name=#{postName} limit 1

    </select>

	
    <select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">

        <include refid="selectPostVo"/>

         where post_code=#{postCode} limit 1

    </select>

	
    <update id="updatePost" parameterType="SysPost">

         update sys_post

         <set>

             <if test="postCode != null and postCode != ''">post_code = #{postCode},</if>

             <if test="postName != null and postName != ''">post_name = #{postName},</if>

             <if test="postSort != null">post_sort = #{postSort},</if>

             <if test="status != null and status != ''">status = #{status},</if>

             <if test="remark != null">remark = #{remark},</if>

             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

             update_time = sysdate()

         </set>

         where post_id = #{postId}

    </update>

 	
     <insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">

         insert into sys_post(

             <if test="postId != null and postId != 0">post_id,</if>

             <if test="postCode != null and postCode != ''">post_code,</if>

             <if test="postName != null and postName != ''">post_name,</if>

             <if test="postSort != null">post_sort,</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="postId != null and postId != 0">#{postId},</if>

             <if test="postCode != null and postCode != ''">#{postCode},</if>

             <if test="postName != null and postName != ''">#{postName},</if>

             <if test="postSort != null">#{postSort},</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>

	
    <delete id="deletePostById" parameterType="Long">

        delete from sys_post where post_id = #{postId}

    </delete>

	
    <delete id="deletePostByIds" parameterType="Long">

         delete from sys_post where post_id in

         <foreach collection="array" item="postId" open="(" separator="," close=")">

             #{postId}

        </foreach> 
     </delete>



<?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.sgd.system.mapper.SysPostMapper">

    <resultMap type="SysPost" id="SysPostResult">
        <id     property="postId"        column="post_id"       />
        <result property="postCode"      column="post_code"     />
        <result property="postName"      column="post_name"     />
        <result property="postSort"      column="post_sort"     />
        <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="selectPostVo">
        select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark 
        from sys_post
    </sql>
	
    <select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
        <include refid="selectPostVo"/>
        <where>
            <if test="postCode != null and postCode != ''">
                AND post_code like concat('%', #{postCode}, '%')
            </if>
            <if test="status != null and status != ''">
                AND status = #{status}
            </if>
            <if test="postName != null and postName != ''">
                AND post_name like concat('%', #{postName}, '%')
            </if>
        </where>
    </select>
	
    <select id="selectPostAll" resultMap="SysPostResult">
        <include refid="selectPostVo"/>
    </select>
	
    <select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
        <include refid="selectPostVo"/>
        where post_id = #{postId}
    </select>
	
    <select id="selectPostListByUserId" parameterType="Long" resultType="Long">
        select p.post_id
        from sys_post p
            left join sys_user_post up on up.post_id = p.post_id
            left join sys_user u on u.user_id = up.user_id
        where u.user_id = #{userId}
    </select>
	
    <select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
        select p.post_id, p.post_name, p.post_code
        from sys_post p
             left join sys_user_post up on up.post_id = p.post_id
             left join sys_user u on u.user_id = up.user_id
        where u.user_name = #{userName}
    </select>
	
    <select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">
        <include refid="selectPostVo"/>
         where post_name=#{postName} limit 1
    </select>
	
    <select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">
        <include refid="selectPostVo"/>
         where post_code=#{postCode} limit 1
    </select>
	
    <update id="updatePost" parameterType="SysPost">
         update sys_post
         <set>
             <if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
             <if test="postName != null and postName != ''">post_name = #{postName},</if>
             <if test="postSort != null">post_sort = #{postSort},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
         </set>
         where post_id = #{postId}
    </update>
 	
     <insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
         insert into sys_post(
             <if test="postId != null and postId != 0">post_id,</if>
             <if test="postCode != null and postCode != ''">post_code,</if>
             <if test="postName != null and postName != ''">post_name,</if>
             <if test="postSort != null">post_sort,</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="postId != null and postId != 0">#{postId},</if>
             <if test="postCode != null and postCode != ''">#{postCode},</if>
             <if test="postName != null and postName != ''">#{postName},</if>
             <if test="postSort != null">#{postSort},</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>
	
    <delete id="deletePostById" parameterType="Long">
        delete from sys_post where post_id = #{postId}
    </delete>
	
    <delete id="deletePostByIds" parameterType="Long">
         delete from sys_post where post_id in
         <foreach collection="array" item="postId" open="(" separator="," close=")">
             #{postId}
        </foreach> 
     </delete>

</mapper> 

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@@ -1,34 +1,34 @@
<?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.ruoyi.system.mapper.SysRoleDeptMapper">



    <resultMap type="SysRoleDept" id="SysRoleDeptResult">

        <result property="roleId"     column="role_id"      />

        <result property="deptId"     column="dept_id"      />

    </resultMap>



    <delete id="deleteRoleDeptByRoleId" parameterType="Long">

        delete from sys_role_dept where role_id=#{roleId}

    </delete>

	
    <select id="selectCountRoleDeptByDeptId" resultType="Integer">

        select count(1) from sys_role_dept where dept_id=#{deptId}

    </select>

	
    <delete id="deleteRoleDept" parameterType="Long">

         delete from sys_role_dept where role_id in

         <foreach collection="array" item="roleId" open="(" separator="," close=")">

             #{roleId}

        </foreach> 
     </delete>

	
    <insert id="batchRoleDept">

        insert into sys_role_dept(role_id, dept_id) values

        <foreach item="item" index="index" collection="list" separator=",">

            (#{item.roleId},#{item.deptId})

        </foreach>

    </insert>

	
<?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.sgd.system.mapper.SysRoleDeptMapper">

    <resultMap type="SysRoleDept" id="SysRoleDeptResult">
        <result property="roleId"     column="role_id"      />
        <result property="deptId"     column="dept_id"      />
    </resultMap>

    <delete id="deleteRoleDeptByRoleId" parameterType="Long">
        delete from sys_role_dept where role_id=#{roleId}
    </delete>
	
    <select id="selectCountRoleDeptByDeptId" resultType="Integer">
        select count(1) from sys_role_dept where dept_id=#{deptId}
    </select>
	
    <delete id="deleteRoleDept" parameterType="Long">
         delete from sys_role_dept where role_id in
         <foreach collection="array" item="roleId" open="(" separator="," close=")">
             #{roleId}
        </foreach> 
     </delete>
	
    <insert id="batchRoleDept">
        insert into sys_role_dept(role_id, dept_id) values
        <foreach item="item" index="index" collection="list" separator=",">
            (#{item.roleId},#{item.deptId})
        </foreach>
    </insert>
	
</mapper> 

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysRoleMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -1,152 +1,152 @@
<?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.ruoyi.system.mapper.SysRoleMapper">



    <resultMap type="SysRole" id="SysRoleResult">

        <id     property="roleId"             column="role_id"               />

        <result property="roleName"           column="role_name"             />

        <result property="roleKey"            column="role_key"              />

        <result property="roleSort"           column="role_sort"             />

        <result property="dataScope"          column="data_scope"            />

        <result property="menuCheckStrictly"  column="menu_check_strictly"   />

        <result property="deptCheckStrictly"  column="dept_check_strictly"   />

        <result property="status"             column="status"                />

        <result property="delFlag"            column="del_flag"              />

        <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="selectRoleVo">

        select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,

            r.status, r.del_flag, r.create_time, r.remark 
        from sys_role r

            left join sys_user_role ur on ur.role_id = r.role_id

            left join sys_user u on u.user_id = ur.user_id

            left join sys_dept d on u.dept_id = d.dept_id

    </sql>

    
    <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">

        <include refid="selectRoleVo"/>

        where r.del_flag = '0'

        <if test="roleId != null and roleId != 0">

            AND r.role_id = #{roleId}

        </if>

        <if test="roleName != null and roleName != ''">

            AND r.role_name like concat('%', #{roleName}, '%')

        </if>

        <if test="status != null and status != ''">

            AND r.status = #{status}

        </if>

        <if test="roleKey != null and roleKey != ''">

            AND r.role_key like concat('%', #{roleKey}, '%')

        </if>

        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->

            and date_format(r.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(r.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')

        </if>

        <!-- 数据范围过滤 -->

        ${params.dataScope}

        order by r.role_sort

    </select>

    
    <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">

        <include refid="selectRoleVo"/>

        WHERE r.del_flag = '0' and ur.user_id = #{userId}

    </select>

	
    <select id="selectRoleAll" resultMap="SysRoleResult">

        <include refid="selectRoleVo"/>

    </select>

	
    <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">

        select r.role_id

        from sys_role r

            left join sys_user_role ur on ur.role_id = r.role_id

            left join sys_user u on u.user_id = ur.user_id

        where u.user_id = #{userId}

    </select>

	
    <select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">

        <include refid="selectRoleVo"/>

        where r.role_id = #{roleId}

    </select>

	
    <select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">

        <include refid="selectRoleVo"/>

        WHERE r.del_flag = '0' and u.user_name = #{userName}

    </select>

	
    <select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">

        <include refid="selectRoleVo"/>

         where r.role_name=#{roleName} and r.del_flag = '0' limit 1

    </select>

	
    <select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">

        <include refid="selectRoleVo"/>

         where r.role_key=#{roleKey} and r.del_flag = '0' limit 1

    </select>

	
     <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">

         insert into sys_role(

             <if test="roleId != null and roleId != 0">role_id,</if>

             <if test="roleName != null and roleName != ''">role_name,</if>

             <if test="roleKey != null and roleKey != ''">role_key,</if>

             <if test="roleSort != null">role_sort,</if>

             <if test="dataScope != null and dataScope != ''">data_scope,</if>

             <if test="menuCheckStrictly != null">menu_check_strictly,</if>

             <if test="deptCheckStrictly != null">dept_check_strictly,</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="roleId != null and roleId != 0">#{roleId},</if>

             <if test="roleName != null and roleName != ''">#{roleName},</if>

             <if test="roleKey != null and roleKey != ''">#{roleKey},</if>

             <if test="roleSort != null">#{roleSort},</if>

             <if test="dataScope != null and dataScope != ''">#{dataScope},</if>

             <if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>

             <if test="deptCheckStrictly != null">#{deptCheckStrictly},</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>

	
    <update id="updateRole" parameterType="SysRole">

         update sys_role

         <set>

             <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>

             <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>

             <if test="roleSort != null">role_sort = #{roleSort},</if>

             <if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>

             <if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>

             <if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>

             <if test="status != null and status != ''">status = #{status},</if>

             <if test="remark != null">remark = #{remark},</if>

             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

             update_time = sysdate()

         </set>

         where role_id = #{roleId}

    </update>

	
    <delete id="deleteRoleById" parameterType="Long">

         update sys_role set del_flag = '2' where role_id = #{roleId}

     </delete>

 	
     <delete id="deleteRoleByIds" parameterType="Long">

         update sys_role set del_flag = '2' where role_id in

         <foreach collection="array" item="roleId" open="(" separator="," close=")">

             #{roleId}

        </foreach> 
     </delete>

 	
<?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.sgd.system.mapper.SysRoleMapper">

    <resultMap type="SysRole" id="SysRoleResult">
        <id     property="roleId"             column="role_id"               />
        <result property="roleName"           column="role_name"             />
        <result property="roleKey"            column="role_key"              />
        <result property="roleSort"           column="role_sort"             />
        <result property="dataScope"          column="data_scope"            />
        <result property="menuCheckStrictly"  column="menu_check_strictly"   />
        <result property="deptCheckStrictly"  column="dept_check_strictly"   />
        <result property="status"             column="status"                />
        <result property="delFlag"            column="del_flag"              />
        <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="selectRoleVo">
        select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
            r.status, r.del_flag, r.create_time, r.remark 
        from sys_role r
            left join sys_user_role ur on ur.role_id = r.role_id
            left join sys_user u on u.user_id = ur.user_id
            left join sys_dept d on u.dept_id = d.dept_id
    </sql>
    
    <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
        <include refid="selectRoleVo"/>
        where r.del_flag = '0'
        <if test="roleId != null and roleId != 0">
            AND r.role_id = #{roleId}
        </if>
        <if test="roleName != null and roleName != ''">
            AND r.role_name like concat('%', #{roleName}, '%')
        </if>
        <if test="status != null and status != ''">
            AND r.status = #{status}
        </if>
        <if test="roleKey != null and roleKey != ''">
            AND r.role_key like concat('%', #{roleKey}, '%')
        </if>
        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
            and date_format(r.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(r.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
        </if>
        <!-- 数据范围过滤 -->
        ${params.dataScope}
        order by r.role_sort
    </select>
    
    <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
        <include refid="selectRoleVo"/>
        WHERE r.del_flag = '0' and ur.user_id = #{userId}
    </select>
	
    <select id="selectRoleAll" resultMap="SysRoleResult">
        <include refid="selectRoleVo"/>
    </select>
	
    <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
        select r.role_id
        from sys_role r
            left join sys_user_role ur on ur.role_id = r.role_id
            left join sys_user u on u.user_id = ur.user_id
        where u.user_id = #{userId}
    </select>
	
    <select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
        <include refid="selectRoleVo"/>
        where r.role_id = #{roleId}
    </select>
	
    <select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
        <include refid="selectRoleVo"/>
        WHERE r.del_flag = '0' and u.user_name = #{userName}
    </select>
	
    <select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
        <include refid="selectRoleVo"/>
         where r.role_name=#{roleName} and r.del_flag = '0' limit 1
    </select>
	
    <select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
        <include refid="selectRoleVo"/>
         where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
    </select>
	
     <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
         insert into sys_role(
             <if test="roleId != null and roleId != 0">role_id,</if>
             <if test="roleName != null and roleName != ''">role_name,</if>
             <if test="roleKey != null and roleKey != ''">role_key,</if>
             <if test="roleSort != null">role_sort,</if>
             <if test="dataScope != null and dataScope != ''">data_scope,</if>
             <if test="menuCheckStrictly != null">menu_check_strictly,</if>
             <if test="deptCheckStrictly != null">dept_check_strictly,</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="roleId != null and roleId != 0">#{roleId},</if>
             <if test="roleName != null and roleName != ''">#{roleName},</if>
             <if test="roleKey != null and roleKey != ''">#{roleKey},</if>
             <if test="roleSort != null">#{roleSort},</if>
             <if test="dataScope != null and dataScope != ''">#{dataScope},</if>
             <if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
             <if test="deptCheckStrictly != null">#{deptCheckStrictly},</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>
	
    <update id="updateRole" parameterType="SysRole">
         update sys_role
         <set>
             <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
             <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
             <if test="roleSort != null">role_sort = #{roleSort},</if>
             <if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
             <if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
             <if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
         </set>
         where role_id = #{roleId}
    </update>
	
    <delete id="deleteRoleById" parameterType="Long">
         update sys_role set del_flag = '2' where role_id = #{roleId}
     </delete>
 	
     <delete id="deleteRoleByIds" parameterType="Long">
         update sys_role set del_flag = '2' where role_id in
         <foreach collection="array" item="roleId" open="(" separator="," close=")">
             #{roleId}
        </foreach> 
     </delete>
 	
</mapper> 

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -1,34 +1,34 @@
<?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.ruoyi.system.mapper.SysRoleMenuMapper">



    <resultMap type="SysRoleMenu" id="SysRoleMenuResult">

        <result property="roleId"     column="role_id"      />

        <result property="menuId"     column="menu_id"      />

    </resultMap>

	
    <select id="checkMenuExistRole" resultType="Integer">

        select count(1) from sys_role_menu where menu_id = #{menuId}

    </select>



    <delete id="deleteRoleMenuByRoleId" parameterType="Long">

        delete from sys_role_menu where role_id=#{roleId}

    </delete>

	
    <delete id="deleteRoleMenu" parameterType="Long">

         delete from sys_role_menu where role_id in

         <foreach collection="array" item="roleId" open="(" separator="," close=")">

             #{roleId}

        </foreach> 
     </delete>

	
    <insert id="batchRoleMenu">

        insert into sys_role_menu(role_id, menu_id) values

        <foreach item="item" index="index" collection="list" separator=",">

            (#{item.roleId},#{item.menuId})

        </foreach>

    </insert>

	
<?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.sgd.system.mapper.SysRoleMenuMapper">

    <resultMap type="SysRoleMenu" id="SysRoleMenuResult">
        <result property="roleId"     column="role_id"      />
        <result property="menuId"     column="menu_id"      />
    </resultMap>
	
    <select id="checkMenuExistRole" resultType="Integer">
        select count(1) from sys_role_menu where menu_id = #{menuId}
    </select>

    <delete id="deleteRoleMenuByRoleId" parameterType="Long">
        delete from sys_role_menu where role_id=#{roleId}
    </delete>
	
    <delete id="deleteRoleMenu" parameterType="Long">
         delete from sys_role_menu where role_id in
         <foreach collection="array" item="roleId" open="(" separator="," close=")">
             #{roleId}
        </foreach> 
     </delete>
	
    <insert id="batchRoleMenu">
        insert into sys_role_menu(role_id, menu_id) values
        <foreach item="item" index="index" collection="list" separator=",">
            (#{item.roleId},#{item.menuId})
        </foreach>
    </insert>
	
</mapper> 

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysUserMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -1,227 +1,227 @@
<?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.ruoyi.system.mapper.SysUserMapper">



    <resultMap type="SysUser" id="SysUserResult">

        <id     property="userId"        column="user_id"         />

        <result property="deptId"        column="dept_id"         />

        <result property="userName"      column="user_name"       />

        <result property="nickName"      column="nick_name"       />

        <result property="email"         column="email"           />

        <result property="phonenumber"   column="phonenumber"     />

        <result property="sex"           column="sex"             />

        <result property="avatar"        column="avatar"          />

        <result property="password"      column="password"        />

        <result property="status"        column="status"          />

        <result property="delFlag"       column="del_flag"        />

        <result property="loginIp"       column="login_ip"        />

        <result property="loginDate"     column="login_date"      />

        <result property="pwdUpdateDate" column="pwd_update_date" />

        <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"          />

        <association property="dept"     javaType="SysDept"         resultMap="deptResult" />

        <collection  property="roles"    javaType="java.util.List"  resultMap="RoleResult" />

    </resultMap>

	
    <resultMap id="deptResult" type="SysDept">

        <id     property="deptId"    column="dept_id"     />

        <result property="parentId"  column="parent_id"   />

        <result property="deptName"  column="dept_name"   />

        <result property="ancestors" column="ancestors"   />

        <result property="orderNum"  column="order_num"   />

        <result property="leader"    column="leader"      />

        <result property="status"    column="dept_status" />

    </resultMap>

	
    <resultMap id="RoleResult" type="SysRole">

        <id     property="roleId"       column="role_id"        />

        <result property="roleName"     column="role_name"      />

        <result property="roleKey"      column="role_key"       />

        <result property="roleSort"     column="role_sort"      />

        <result property="dataScope"    column="data_scope"     />

        <result property="status"       column="role_status"    />

    </resultMap>

	
    <sql id="selectUserVo">

        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.update_by, u.update_time, u.remark, 
        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,

        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status

        from sys_user u

            left join sys_dept d on u.dept_id = d.dept_id

            left join sys_user_role ur on u.user_id = ur.user_id

            left join sys_role r on r.role_id = ur.role_id

    </sql>

    
    <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">

        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u

        left join sys_dept d on u.dept_id = d.dept_id

        where u.del_flag = '0'

        <if test="userId != null and userId != 0">

            AND u.user_id = #{userId}

        </if>

        <if test="userName != null and userName != ''">

            AND u.user_name like concat('%', #{userName}, '%')

        </if>

        <if test="status != null and status != ''">

            AND u.status = #{status}

        </if>

        <if test="phonenumber != null and phonenumber != ''">

            AND u.phonenumber like concat('%', #{phonenumber}, '%')

        </if>

        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->

            AND date_format(u.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(u.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')

        </if>

        <if test="deptId != null and deptId != 0">

            AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))

        </if>

        <!-- 数据范围过滤 -->

        ${params.dataScope}

    </select>

	
    <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">

        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time

        from sys_user u

             left join sys_dept d on u.dept_id = d.dept_id

             left join sys_user_role ur on u.user_id = ur.user_id

             left join sys_role r on r.role_id = ur.role_id

        where u.del_flag = '0' and r.role_id = #{roleId}

        <if test="userName != null and userName != ''">

            AND u.user_name like concat('%', #{userName}, '%')

        </if>

        <if test="phonenumber != null and phonenumber != ''">

            AND u.phonenumber like concat('%', #{phonenumber}, '%')

        </if>

        <!-- 数据范围过滤 -->

        ${params.dataScope}

    </select>

	
    <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">

        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time

        from sys_user u

             left join sys_dept d on u.dept_id = d.dept_id

             left join sys_user_role ur on u.user_id = ur.user_id

             left join sys_role r on r.role_id = ur.role_id

        where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)

        and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})

        <if test="userName != null and userName != ''">

            AND u.user_name like concat('%', #{userName}, '%')

        </if>

        <if test="phonenumber != null and phonenumber != ''">

            AND u.phonenumber like concat('%', #{phonenumber}, '%')

        </if>

        <!-- 数据范围过滤 -->

        ${params.dataScope}

    </select>

	
    <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">

        <include refid="selectUserVo"/>

        where u.user_name = #{userName} and u.del_flag = '0'

    </select>

	
    <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">

        <include refid="selectUserVo"/>

        where u.user_id = #{userId}

    </select>

	
    <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">

        select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1

    </select>

	
    <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">

        select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1

    </select>

	
    <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">

        select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1

    </select>

	
    <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">

         insert into sys_user(

             <if test="userId != null and userId != 0">user_id,</if>

             <if test="deptId != null and deptId != 0">dept_id,</if>

             <if test="userName != null and userName != ''">user_name,</if>

             <if test="nickName != null and nickName != ''">nick_name,</if>

             <if test="email != null and email != ''">email,</if>

             <if test="avatar != null and avatar != ''">avatar,</if>

             <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>

             <if test="sex != null and sex != ''">sex,</if>

             <if test="password != null and password != ''">password,</if>

             <if test="status != null and status != ''">status,</if>

             <if test="pwdUpdateDate != null">pwd_update_date,</if>

             <if test="createBy != null and createBy != ''">create_by,</if>

             <if test="remark != null and remark != ''">remark,</if>

             create_time

         )values(

             <if test="userId != null and userId != ''">#{userId},</if>

             <if test="deptId != null and deptId != ''">#{deptId},</if>

             <if test="userName != null and userName != ''">#{userName},</if>

             <if test="nickName != null and nickName != ''">#{nickName},</if>

             <if test="email != null and email != ''">#{email},</if>

             <if test="avatar != null and avatar != ''">#{avatar},</if>

             <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>

             <if test="sex != null and sex != ''">#{sex},</if>

             <if test="password != null and password != ''">#{password},</if>

             <if test="status != null and status != ''">#{status},</if>

             <if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>

             <if test="createBy != null and createBy != ''">#{createBy},</if>

             <if test="remark != null and remark != ''">#{remark},</if>

             sysdate()

         )

    </insert>

	
    <update id="updateUser" parameterType="SysUser">

         update sys_user

         <set>

             <if test="deptId != 0">dept_id = #{deptId},</if>

             <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>

             <if test="email != null ">email = #{email},</if>

             <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>

             <if test="sex != null and sex != ''">sex = #{sex},</if>

             <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>

             <if test="password != null and password != ''">password = #{password},</if>

             <if test="status != null and status != ''">status = #{status},</if>

             <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>

             <if test="loginDate != null">login_date = #{loginDate},</if>

             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

             <if test="remark != null">remark = #{remark},</if>

             update_time = sysdate()

         </set>

         where user_id = #{userId}

    </update>

	
    <update id="updateUserStatus" parameterType="SysUser">

         update sys_user set status = #{status}, update_time = sysdate() where user_id = #{userId}

    </update>

	
    <update id="updateUserAvatar" parameterType="SysUser">

         update sys_user set avatar = #{avatar}, update_time = sysdate() where user_id = #{userId}

    </update>

	
      <update id="updateLoginInfo" parameterType="SysUser">

         update sys_user set login_ip = #{loginIp}, login_date = #{loginDate} where user_id = #{userId}

    </update>

	
    <update id="resetUserPwd" parameterType="SysUser">

         update sys_user set pwd_update_date = sysdate(), password = #{password}, update_time = sysdate() where user_id = #{userId}

    </update>

	
    <delete id="deleteUserById" parameterType="Long">

         update sys_user set del_flag = '2' where user_id = #{userId}

     </delete>

 	
     <delete id="deleteUserByIds" parameterType="Long">

         update sys_user set del_flag = '2' where user_id in

         <foreach collection="array" item="userId" open="(" separator="," close=")">

             #{userId}

        </foreach> 
     </delete>

	
<?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.sgd.system.mapper.SysUserMapper">

    <resultMap type="SysUser" id="SysUserResult">
        <id     property="userId"        column="user_id"         />
        <result property="deptId"        column="dept_id"         />
        <result property="userName"      column="user_name"       />
        <result property="nickName"      column="nick_name"       />
        <result property="email"         column="email"           />
        <result property="phonenumber"   column="phonenumber"     />
        <result property="sex"           column="sex"             />
        <result property="avatar"        column="avatar"          />
        <result property="password"      column="password"        />
        <result property="status"        column="status"          />
        <result property="delFlag"       column="del_flag"        />
        <result property="loginIp"       column="login_ip"        />
        <result property="loginDate"     column="login_date"      />
        <result property="pwdUpdateDate" column="pwd_update_date" />
        <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"          />
        <association property="dept"     javaType="SysDept"         resultMap="deptResult" />
        <collection  property="roles"    javaType="java.util.List"  resultMap="RoleResult" />
    </resultMap>
	
    <resultMap id="deptResult" type="SysDept">
        <id     property="deptId"    column="dept_id"     />
        <result property="parentId"  column="parent_id"   />
        <result property="deptName"  column="dept_name"   />
        <result property="ancestors" column="ancestors"   />
        <result property="orderNum"  column="order_num"   />
        <result property="leader"    column="leader"      />
        <result property="status"    column="dept_status" />
    </resultMap>
	
    <resultMap id="RoleResult" type="SysRole">
        <id     property="roleId"       column="role_id"        />
        <result property="roleName"     column="role_name"      />
        <result property="roleKey"      column="role_key"       />
        <result property="roleSort"     column="role_sort"      />
        <result property="dataScope"    column="data_scope"     />
        <result property="status"       column="role_status"    />
    </resultMap>
	
    <sql id="selectUserVo">
        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.update_by, u.update_time, u.remark, 
        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
        from sys_user u
            left join sys_dept d on u.dept_id = d.dept_id
            left join sys_user_role ur on u.user_id = ur.user_id
            left join sys_role r on r.role_id = ur.role_id
    </sql>
    
    <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
        left join sys_dept d on u.dept_id = d.dept_id
        where u.del_flag = '0'
        <if test="userId != null and userId != 0">
            AND u.user_id = #{userId}
        </if>
        <if test="userName != null and userName != ''">
            AND u.user_name like concat('%', #{userName}, '%')
        </if>
        <if test="status != null and status != ''">
            AND u.status = #{status}
        </if>
        <if test="phonenumber != null and phonenumber != ''">
            AND u.phonenumber like concat('%', #{phonenumber}, '%')
        </if>
        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
            AND date_format(u.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(u.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
        </if>
        <if test="deptId != null and deptId != 0">
            AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
        </if>
        <!-- 数据范围过滤 -->
        ${params.dataScope}
    </select>
	
    <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
        from sys_user u
             left join sys_dept d on u.dept_id = d.dept_id
             left join sys_user_role ur on u.user_id = ur.user_id
             left join sys_role r on r.role_id = ur.role_id
        where u.del_flag = '0' and r.role_id = #{roleId}
        <if test="userName != null and userName != ''">
            AND u.user_name like concat('%', #{userName}, '%')
        </if>
        <if test="phonenumber != null and phonenumber != ''">
            AND u.phonenumber like concat('%', #{phonenumber}, '%')
        </if>
        <!-- 数据范围过滤 -->
        ${params.dataScope}
    </select>
	
    <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
        from sys_user u
             left join sys_dept d on u.dept_id = d.dept_id
             left join sys_user_role ur on u.user_id = ur.user_id
             left join sys_role r on r.role_id = ur.role_id
        where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
        and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
        <if test="userName != null and userName != ''">
            AND u.user_name like concat('%', #{userName}, '%')
        </if>
        <if test="phonenumber != null and phonenumber != ''">
            AND u.phonenumber like concat('%', #{phonenumber}, '%')
        </if>
        <!-- 数据范围过滤 -->
        ${params.dataScope}
    </select>
	
    <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
        <include refid="selectUserVo"/>
        where u.user_name = #{userName} and u.del_flag = '0'
    </select>
	
    <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
        <include refid="selectUserVo"/>
        where u.user_id = #{userId}
    </select>
	
    <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
        select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
    </select>
	
    <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
        select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
    </select>
	
    <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
        select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
    </select>
	
    <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
         insert into sys_user(
             <if test="userId != null and userId != 0">user_id,</if>
             <if test="deptId != null and deptId != 0">dept_id,</if>
             <if test="userName != null and userName != ''">user_name,</if>
             <if test="nickName != null and nickName != ''">nick_name,</if>
             <if test="email != null and email != ''">email,</if>
             <if test="avatar != null and avatar != ''">avatar,</if>
             <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
             <if test="sex != null and sex != ''">sex,</if>
             <if test="password != null and password != ''">password,</if>
             <if test="status != null and status != ''">status,</if>
             <if test="pwdUpdateDate != null">pwd_update_date,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="remark != null and remark != ''">remark,</if>
             create_time
         )values(
             <if test="userId != null and userId != ''">#{userId},</if>
             <if test="deptId != null and deptId != ''">#{deptId},</if>
             <if test="userName != null and userName != ''">#{userName},</if>
             <if test="nickName != null and nickName != ''">#{nickName},</if>
             <if test="email != null and email != ''">#{email},</if>
             <if test="avatar != null and avatar != ''">#{avatar},</if>
             <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
             <if test="sex != null and sex != ''">#{sex},</if>
             <if test="password != null and password != ''">#{password},</if>
             <if test="status != null and status != ''">#{status},</if>
             <if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             sysdate()
         )
    </insert>
	
    <update id="updateUser" parameterType="SysUser">
         update sys_user
         <set>
             <if test="deptId != 0">dept_id = #{deptId},</if>
             <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
             <if test="email != null ">email = #{email},</if>
             <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
             <if test="sex != null and sex != ''">sex = #{sex},</if>
             <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
             <if test="password != null and password != ''">password = #{password},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
             <if test="loginDate != null">login_date = #{loginDate},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}
    </update>
	
    <update id="updateUserStatus" parameterType="SysUser">
         update sys_user set status = #{status}, update_time = sysdate() where user_id = #{userId}
    </update>
	
    <update id="updateUserAvatar" parameterType="SysUser">
         update sys_user set avatar = #{avatar}, update_time = sysdate() where user_id = #{userId}
    </update>
	
      <update id="updateLoginInfo" parameterType="SysUser">
         update sys_user set login_ip = #{loginIp}, login_date = #{loginDate} where user_id = #{userId}
    </update>
	
    <update id="resetUserPwd" parameterType="SysUser">
         update sys_user set pwd_update_date = sysdate(), password = #{password}, update_time = sysdate() where user_id = #{userId}
    </update>
	
    <delete id="deleteUserById" parameterType="Long">
         update sys_user set del_flag = '2' where user_id = #{userId}
     </delete>
 	
     <delete id="deleteUserByIds" parameterType="Long">
         update sys_user set del_flag = '2' where user_id in
         <foreach collection="array" item="userId" open="(" separator="," close=")">
             #{userId}
        </foreach> 
     </delete>
	
</mapper> 

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysUserPostMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -1,34 +1,34 @@
<?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.ruoyi.system.mapper.SysUserPostMapper">



    <resultMap type="SysUserPost" id="SysUserPostResult">

        <result property="userId"     column="user_id"      />

        <result property="postId"     column="post_id"      />

    </resultMap>



    <delete id="deleteUserPostByUserId" parameterType="Long">

        delete from sys_user_post where user_id=#{userId}

    </delete>

	
    <select id="countUserPostById" resultType="Integer">

        select count(1) from sys_user_post where post_id=#{postId}  
    </select>

	
    <delete id="deleteUserPost" parameterType="Long">

         delete from sys_user_post where user_id in

         <foreach collection="array" item="userId" open="(" separator="," close=")">

             #{userId}

        </foreach> 
     </delete>

	
    <insert id="batchUserPost">

        insert into sys_user_post(user_id, post_id) values

        <foreach item="item" index="index" collection="list" separator=",">

            (#{item.userId},#{item.postId})

        </foreach>

    </insert>

	
<?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.sgd.system.mapper.SysUserPostMapper">

    <resultMap type="SysUserPost" id="SysUserPostResult">
        <result property="userId"     column="user_id"      />
        <result property="postId"     column="post_id"      />
    </resultMap>

    <delete id="deleteUserPostByUserId" parameterType="Long">
        delete from sys_user_post where user_id=#{userId}
    </delete>
	
    <select id="countUserPostById" resultType="Integer">
        select count(1) from sys_user_post where post_id=#{postId}  
    </select>
	
    <delete id="deleteUserPost" parameterType="Long">
         delete from sys_user_post where user_id in
         <foreach collection="array" item="userId" open="(" separator="," close=")">
             #{userId}
        </foreach> 
     </delete>
	
    <insert id="batchUserPost">
        insert into sys_user_post(user_id, post_id) values
        <foreach item="item" index="index" collection="list" separator=",">
            (#{item.userId},#{item.postId})
        </foreach>
    </insert>
	
</mapper> 

 sgd-modules/sgd-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -1,44 +1,44 @@
<?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.ruoyi.system.mapper.SysUserRoleMapper">



    <resultMap type="SysUserRole" id="SysUserRoleResult">

        <result property="userId"     column="user_id"      />

        <result property="roleId"     column="role_id"      />

    </resultMap>



    <delete id="deleteUserRoleByUserId" parameterType="Long">

        delete from sys_user_role where user_id=#{userId}

    </delete>

	
    <select id="countUserRoleByRoleId" resultType="Integer">

        select count(1) from sys_user_role where role_id=#{roleId}  
    </select>

	
    <delete id="deleteUserRole" parameterType="Long">

         delete from sys_user_role where user_id in

         <foreach collection="array" item="userId" open="(" separator="," close=")">

             #{userId}

        </foreach> 
     </delete>

	
    <insert id="batchUserRole">

        insert into sys_user_role(user_id, role_id) values

        <foreach item="item" index="index" collection="list" separator=",">

            (#{item.userId},#{item.roleId})

        </foreach>

    </insert>

	
    <delete id="deleteUserRoleInfo" parameterType="SysUserRole">

        delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}

    </delete>

	
    <delete id="deleteUserRoleInfos">

        delete from sys_user_role where role_id=#{roleId} and user_id in

         <foreach collection="userIds" item="userId" open="(" separator="," close=")">

             #{userId}

            </foreach> 
    </delete>

<?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.sgd.system.mapper.SysUserRoleMapper">

    <resultMap type="SysUserRole" id="SysUserRoleResult">
        <result property="userId"     column="user_id"      />
        <result property="roleId"     column="role_id"      />
    </resultMap>

    <delete id="deleteUserRoleByUserId" parameterType="Long">
        delete from sys_user_role where user_id=#{userId}
    </delete>
	
    <select id="countUserRoleByRoleId" resultType="Integer">
        select count(1) from sys_user_role where role_id=#{roleId}  
    </select>
	
    <delete id="deleteUserRole" parameterType="Long">
         delete from sys_user_role where user_id in
         <foreach collection="array" item="userId" open="(" separator="," close=")">
             #{userId}
        </foreach> 
     </delete>
	
    <insert id="batchUserRole">
        insert into sys_user_role(user_id, role_id) values
        <foreach item="item" index="index" collection="list" separator=",">
            (#{item.userId},#{item.roleId})
        </foreach>
    </insert>
	
    <delete id="deleteUserRoleInfo" parameterType="SysUserRole">
        delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
    </delete>
	
    <delete id="deleteUserRoleInfos">
        delete from sys_user_role where role_id=#{roleId} and user_id in
         <foreach collection="userIds" item="userId" open="(" separator="," close=")">
             #{userId}
            </foreach> 
    </delete>
</mapper> 

 sgd-visual/pom.xml

copy from ruoyi-api/pom.xml
copy to sgd-visual/pom.xml
File was copied from ruoyi-api/pom.xml
@@ -1,22 +1,22 @@
<?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.ruoyi</groupId>

        <artifactId>ruoyi</artifactId>

        <version>3.6.8</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <modules>

        <module>ruoyi-api-system</module>

    </modules>



    <artifactId>ruoyi-api</artifactId>

    <packaging>pom</packaging>



    <description>

        ruoyi-api系统接口

    </description>



</project>

<?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.sgd</groupId>
        <artifactId>sgd</artifactId>
        <version>3.6.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <modules>
        <module>sgd-monitor</module>
    </modules>

    <artifactId>sgd-visual</artifactId>
    <packaging>pom</packaging>

    <description>
        sgd-visual图形化管理模块
    </description>

</project>