忽略

.claude/settings.local.json

@@ -1,7 +1,9 @@
 {
   "permissions": {
     "allow": [
-      "mcp__ide__getDiagnostics"
+      "mcp__ide__getDiagnostics",
+      "Read(//mnt/e/QtwCode/foodie/**)",
+      "Bash(cat .gitignore)"
     ]
   }
 }

.gitignore

@@ -11,3 +11,106 @@
 target/
 *.class
 /nul
+/ruoyi-admin/target/classes/META-INF/*.properties
+/ruoyi-admin/target/classes/*.yml
+/ruoyi-admin/target/classes/*.txt
+/ruoyi-admin/target/classes/*.xml
+/ruoyi-admin/target/classes/mybatis/*.xml
+/ruoyi-generator/target/classes/*.yml
+/ruoyi-generator/target/classes/mapper/generator/*.xml
+/ruoyi-generator/target/classes/vm/java/*.vm
+/ruoyi-generator/target/classes/vm/js/*.vm
+/ruoyi-generator/target/classes/vm/sql/*.vm
+/ruoyi-generator/target/classes/vm/vue/*.vm
+/ruoyi-generator/target/classes/vm/vue/v3/*.vm
+/ruoyi-generator/target/classes/vm/vue/v3/*.txt
+/ruoyi-generator/target/classes/vm/xml/*.vm
+/ruoyi-quartz/target/classes/mapper/quartz/*.xml
+/ruoyi-system/target/classes/mapper/Billing/*.xml
+/ruoyi-system/target/classes/mapper/feeds/*.xml
+/ruoyi-system/target/classes/mapper/infouser/*.xml
+/ruoyi-system/target/classes/mapper/system/*.xml
+/.claude/*.json
+/ruoyi-admin/target/classes
+/ruoyi-admin/target/classes/META-INF
+/ruoyi-admin/target/classes/META-INF/spring-devtools.properties
+/ruoyi-admin/target/classes/application-druid.yml
+/ruoyi-admin/target/classes/banner.txt
+/ruoyi-admin/target/classes/logback.xml
+/ruoyi-admin/target/classes/mybatis/mybatis-config.xml
+/ruoyi-generator/target/classes/generator.yml
+/ruoyi-generator/target/classes/mapper/generator/GenTableColumnMapper.xml
+/ruoyi-generator/target/classes/mapper/generator/GenTableMapper.xml
+/ruoyi-generator/target/classes/vm/java/controller.java.vm
+/ruoyi-generator/target/classes/vm/java/domain.java.vm
+/ruoyi-generator/target/classes/vm/java/mapper.java.vm
+/ruoyi-generator/target/classes/vm/java/service.java.vm
+/ruoyi-generator/target/classes/vm/java/serviceImpl.java.vm
+/ruoyi-generator/target/classes/vm/java/sub-domain.java.vm
+/ruoyi-generator/target/classes/vm/js/api.js.vm
+/ruoyi-generator/target/classes/vm/sql/sql.vm
+/ruoyi-generator/target/classes/vm/vue/index-tree.vue.vm
+/ruoyi-generator/target/classes/vm/vue/index.vue.vm
+/ruoyi-generator/target/classes/vm/vue/v3/index-tree.vue.vm
+/ruoyi-generator/target/classes/vm/vue/v3/index.vue.vm
+/ruoyi-generator/target/classes/vm/vue/v3/readme.txt
+/ruoyi-generator/target/classes/vm/xml/mapper.xml.vm
+/ruoyi-quartz/target/classes/mapper/quartz/SysJobLogMapper.xml
+/ruoyi-quartz/target/classes/mapper/quartz/SysJobMapper.xml
+/ruoyi-system/target/classes/mapper/Billing/UserBillingMapper.xml
+/ruoyi-system/target/classes/mapper/feeds/SocialFeedbackMapper.xml
+/ruoyi-system/target/classes/mapper/infouser/InfoUserMapper.xml
+/ruoyi-system/target/classes/mapper/system/AppDownloadMapper.xml
+/ruoyi-system/target/classes/mapper/system/AppVersionMapper.xml
+/ruoyi-system/target/classes/mapper/system/BankCardMapper.xml
+/ruoyi-system/target/classes/mapper/system/DistanceMultiplierMapper.xml
+/ruoyi-system/target/classes/mapper/system/FoodStatisticsMapper.xml
+/ruoyi-system/target/classes/mapper/system/InfoAddressMapper.xml
+/ruoyi-system/target/classes/mapper/system/IpnLogMapper.xml
+/ruoyi-system/target/classes/mapper/system/NightMarketMapper.xml
+/ruoyi-system/target/classes/mapper/system/OperatingHoursMapper.xml
+/ruoyi-system/target/classes/mapper/system/OrderParentMapper.xml
+/ruoyi-system/target/classes/mapper/system/PosCollectMapper.xml
+/ruoyi-system/target/classes/mapper/system/PosFreightMapper.xml
+/ruoyi-system/target/classes/mapper/system/PosMarginMapper.xml
+/ruoyi-system/target/classes/mapper/system/PosOrderRatingMapper.xml
+/ruoyi-system/target/classes/mapper/system/PosReviewMapper.xml
+/ruoyi-system/target/classes/mapper/system/PoseOrderZalopayMapper.xml
+/ruoyi-system/target/classes/mapper/system/PushMessageMapper.xml
+/ruoyi-system/target/classes/mapper/system/RiderPositionMapper.xml
+/ruoyi-system/target/classes/mapper/system/SalesPromotionMapper.xml
+/ruoyi-system/target/classes/mapper/system/ServiceTypeMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysAdsMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysConfigMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysDictTypeMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysFeedbackMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysHelpMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysLogininforMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysMenuMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysNoticeMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysOperLogMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysPointControlMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysPointTierMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysPostMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysQiyejieshaoMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysRoleDeptMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysRoleMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysRoleMenuMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysUserPostMapper.xml
+/ruoyi-system/target/classes/mapper/system/SysUserRoleMapper.xml
+/ruoyi-system/target/classes/mapper/system/TaxiOrderMapper.xml
+/ruoyi-system/target/classes/mapper/system/TaxiPricesMapper.xml
+/ruoyi-system/target/classes/mapper/system/UserFootprintMapper.xml
+/ruoyi-system/target/classes/mapper/system/UserMarginMapper.xml
+/ruoyi-system/target/classes/mapper/system/UserWalletMapper.xml
+/ruoyi-system/target/classes/mapper/system/VideoCallMapper.xml
+/ruoyi-system/target/classes/mapper/system/VipMembershipMapper.xml
+/ruoyi-system/target/classes/mapper/system/VipQuanyiMapper.xml
+/ruoyi-system/target/classes/mapper/system/VipUserMapper.xml
+/ruoyi-system/target/classes/mapper/system/VipUserQuanyiMapper.xml
+/ruoyi-system/target/classes/mapper/system/WalletTransactionMapper.xml
+/.claude/settings.local.json
+/.gitignore

ruoyi-admin/target/classes/META-INF/spring-devtools.properties

@@ -1 +0,0 @@
-restart.include.json=/com.alibaba.fastjson.*.jar

ruoyi-admin/target/classes/application-druid.yml

@@ -1,69 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
-            master:
-                # 正式连接
-#                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: "!!112345"
-#                url: jdbc:mysql://localhost:3306/CTE2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: "123456"
-                # 测试站点连接
-                url: jdbc:mysql://8.216.38.112:3306/foodie?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: foodie
-                password: "rRBNprjBdN2Ms2Rt"
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url:
-                username:
-                password:
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置连接超时时间
-            connectTimeout: 30000
-            # 配置网络超时时间
-            socketTimeout: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter:
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: ruoyi
-                login-password: 123456
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true

ruoyi-admin/target/classes/banner.txt

@@ -1,24 +0,0 @@
-Application Version: ${ruoyi.version}
-Spring Boot Version: ${spring-boot.version}
-////////////////////////////////////////////////////////////////////
-//                          _ooOoo_                               //
-//                         o8888888o                              //
-//                         88" . "88                              //
-//                         (| ^_^ |)                              //
-//                         O\  =  /O                              //
-//                      ____/`---'\____                           //
-//                    .'  \\|     |//  `.                         //
-//                   /  \\|||  :  |||//  \                        //
-//                  /  _||||| -:- |||||-  \                       //
-//                  |   | \\\  -  /// |   |                       //
-//                  | \_|  ''\---/''  |   |                       //
-//                  \  .-\__  `-`  ___/-. /                       //
-//                ___`. .'  /--.--\  `. . ___                     //
-//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
-//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
-//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
-//      ========`-.____`-.___\_____/___.-`____.-'========         //
-//                           `=---='                              //
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
-//             佛祖保佑       永不宕机      永无BUG               //
-////////////////////////////////////////////////////////////////////

ruoyi-admin/target/classes/logback.xml

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

ruoyi-admin/target/classes/mybatis/mybatis-config.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration
-PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
-    <!-- 全局参数 -->
-    <settings>
-        <!-- 使全局的映射器启用或禁用缓存 -->
-        <setting name="cacheEnabled"             value="true"   />
-        <!-- 允许JDBC 支持自动生成主键 -->
-        <setting name="useGeneratedKeys"         value="true"   />
-        <!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
-        <setting name="defaultExecutorType"      value="SIMPLE" />
-		<!-- 指定 MyBatis 所用日志的具体实现 -->
-        <setting name="logImpl"                  value="SLF4J"  />
-        <!-- 使用驼峰命名法转换字段 -->
-		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
-	</settings>
-	
-</configuration>

ruoyi-generator/target/classes/generator.yml

@@ -1,10 +0,0 @@
-# 代码生成
-gen: 
-  # 作者
-  author: ruoyi
-  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.system
-  # 自动去除表前缀，默认是false
-  autoRemovePre: false
-  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: sys_

ruoyi-generator/target/classes/mapper/generator/GenTableColumnMapper.xml

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

ruoyi-generator/target/classes/mapper/generator/GenTableMapper.xml

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

ruoyi-generator/target/classes/vm/java/controller.java.vm

@@ -1,115 +0,0 @@
-package ${packageName}.controller;
-
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import ${packageName}.domain.${ClassName};
-import ${packageName}.service.I${ClassName}Service;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-#if($table.crud || $table.sub)
-import com.ruoyi.common.core.page.TableDataInfo;
-#elseif($table.tree)
-#end
-
-/**
- * ${functionName}Controller
- *
- * @author ${author}
- * @date ${datetime}
- */
-@RestController
-@RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController
-{
-    @Autowired
-    private I${ClassName}Service ${className}Service;
-
-    /**
-     * 查询${functionName}列表
-     */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
-    @GetMapping("/list")
-#if($table.crud || $table.sub)
-    public TableDataInfo list(${ClassName} ${className})
-    {
-        startPage();
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
-        return getDataTable(list);
-    }
-#elseif($table.tree)
-    public AjaxResult list(${ClassName} ${className})
-    {
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
-        return success(list);
-    }
-#end
-
-    /**
-     * 导出${functionName}列表
-     */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
-    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, ${ClassName} ${className})
-    {
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
-        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
-        util.exportExcel(response, list, "${functionName}数据");
-    }
-
-    /**
-     * 获取${functionName}详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
-    @GetMapping(value = "/{${pkColumn.javaField}}")
-    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
-    {
-        return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
-    }
-
-    /**
-     * 新增${functionName}
-     */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
-    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody ${ClassName} ${className})
-    {
-        return toAjax(${className}Service.insert${ClassName}(${className}));
-    }
-
-    /**
-     * 修改${functionName}
-     */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
-    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody ${ClassName} ${className})
-    {
-        return toAjax(${className}Service.update${ClassName}(${className}));
-    }
-
-    /**
-     * 删除${functionName}
-     */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
-    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{${pkColumn.javaField}s}")
-    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
-    {
-        return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
-    }
-}

ruoyi-generator/target/classes/vm/java/domain.java.vm

@@ -1,101 +0,0 @@
-package ${packageName}.domain;
-
-#foreach ($import in $importList)
-import ${import};
-#end
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.GeneratedValue;
-#if($table.crud || $table.sub)
-import com.ruoyi.common.core.domain.BaseEntity;
-#elseif($table.tree)
-import com.ruoyi.common.core.domain.TreeEntity;
-#end
-
-/**
- * ${functionName}对象 ${tableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-#if($table.crud || $table.sub)
-#set($Entity="BaseEntity")
-#elseif($table.tree)
-#set($Entity="TreeEntity")
-#end
-@Data
-@TableName(value = "${tableName}")
-@EqualsAndHashCode(callSuper = false)
-public class ${ClassName}
-{
-    private static final long serialVersionUID = 1L;
-
-    @TableId(type = IdType.AUTO)
-    @GeneratedValue
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-    /** $column.columnComment */
-#if($column.list)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($parentheseIndex != -1)
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
-#else
-    @Excel(name = "${comment}")
-#end
-#end
-    private $column.javaType $column.javaField;
-
-#end
-#end
-#if($table.sub)
-    /** $table.subTable.functionName信息 */
-    private List<${subClassName}> ${subclassName}List;
-
-#end
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-    public void set${AttrName}($column.javaType $column.javaField)
-    {
-        this.$column.javaField = $column.javaField;
-    }
-
-    public $column.javaType get${AttrName}()
-    {
-        return $column.javaField;
-    }
-#end
-#end
-
-#if($table.sub)
-    public List<${subClassName}> get${subClassName}List()
-    {
-        return ${subclassName}List;
-    }
-
-    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
-    {
-        this.${subclassName}List = ${subclassName}List;
-    }
-
-#end
-}

ruoyi-generator/target/classes/vm/java/mapper.java.vm

@@ -1,92 +0,0 @@
-package ${packageName}.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import ${packageName}.domain.${ClassName};
-#if($table.sub)
-import ${packageName}.domain.${subClassName};
-#end
-
-/**
- * ${functionName}Mapper接口
- * 
- * @author ${author}
- * @date ${datetime}
- */
-public interface ${ClassName}Mapper  extends BaseMapper<${ClassName}>
-{
-    /**
-     * 查询${functionName}
-     * 
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return ${functionName}
-     */
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-
-    /**
-     * 查询${functionName}列表
-     * 
-     * @param ${className} ${functionName}
-     * @return ${functionName}集合
-     */
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
-
-    /**
-     * 新增${functionName}
-     * 
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    public int insert${ClassName}(${ClassName} ${className});
-
-    /**
-     * 修改${functionName}
-     * 
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    public int update${ClassName}(${ClassName} ${className});
-
-    /**
-     * 删除${functionName}
-     * 
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return 结果
-     */
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-
-    /**
-     * 批量删除${functionName}
-     * 
-     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-#if($table.sub)
-
-    /**
-     * 批量删除${subTable.functionName}
-     * 
-     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-    
-    /**
-     * 批量新增${subTable.functionName}
-     * 
-     * @param ${subclassName}List ${subTable.functionName}列表
-     * @return 结果
-     */
-    public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
-    
-
-    /**
-     * 通过${functionName}主键删除${subTable.functionName}信息
-     * 
-     * @param ${pkColumn.javaField} ${functionName}ID
-     * @return 结果
-     */
-    public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
-#end
-}

ruoyi-generator/target/classes/vm/java/service.java.vm

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

ruoyi-generator/target/classes/vm/java/serviceImpl.java.vm

@@ -1,171 +0,0 @@
-package ${packageName}.service.impl;
-
-import java.util.List;
-#foreach ($column in $columns)
-#if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
-import com.ruoyi.common.utils.DateUtils;
-#break
-#end
-#end
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-#if($table.sub)
-import java.util.ArrayList;
-import com.ruoyi.common.utils.StringUtils;
-import org.springframework.transaction.annotation.Transactional;
-import ${packageName}.domain.${subClassName};
-#end
-import ${packageName}.mapper.${ClassName}Mapper;
-import ${packageName}.domain.${ClassName};
-import ${packageName}.service.I${ClassName}Service;
-
-/**
- * ${functionName}Service业务层处理
- * 
- * @author ${author}
- * @date ${datetime}
- */
-@Service
-public class ${ClassName}ServiceImpl extends ServiceImpl<BaseMapper<${ClassName}>,${ClassName}> implements I${ClassName}Service
-{
-    @Autowired
-    private ${ClassName}Mapper ${className}Mapper;
-
-    /**
-     * 查询${functionName}
-     * 
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return ${functionName}
-     */
-    @Override
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
-        return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
-    }
-
-    /**
-     * 查询${functionName}列表
-     * 
-     * @param ${className} ${functionName}
-     * @return ${functionName}
-     */
-    @Override
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
-    {
-        return ${className}Mapper.select${ClassName}List(${className});
-    }
-
-    /**
-     * 新增${functionName}
-     * 
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-#if($table.sub)
-    @Transactional
-#end
-    @Override
-    public int insert${ClassName}(${ClassName} ${className})
-    {
-#foreach ($column in $columns)
-#if($column.javaField == 'createTime')
-        ${className}.setCreateTime(DateUtils.getNowDate());
-#end
-#end
-#if($table.sub)
-        int rows = ${className}Mapper.insert${ClassName}(${className});
-        insert${subClassName}(${className});
-        return rows;
-#else
-        return ${className}Mapper.insert${ClassName}(${className});
-#end
-    }
-
-    /**
-     * 修改${functionName}
-     * 
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-#if($table.sub)
-    @Transactional
-#end
-    @Override
-    public int update${ClassName}(${ClassName} ${className})
-    {
-#foreach ($column in $columns)
-#if($column.javaField == 'updateTime')
-        ${className}.setUpdateTime(DateUtils.getNowDate());
-#end
-#end
-#if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
-        insert${subClassName}(${className});
-#end
-        return ${className}Mapper.update${ClassName}(${className});
-    }
-
-    /**
-     * 批量删除${functionName}
-     * 
-     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
-     * @return 结果
-     */
-#if($table.sub)
-    @Transactional
-#end
-    @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
-    {
-#if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
-#end
-        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
-    }
-
-    /**
-     * 删除${functionName}信息
-     * 
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return 结果
-     */
-#if($table.sub)
-    @Transactional
-#end
-    @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
-#if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
-#end
-        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
-    }
-#if($table.sub)
-
-    /**
-     * 新增${subTable.functionName}信息
-     * 
-     * @param ${className} ${functionName}对象
-     */
-    public void insert${subClassName}(${ClassName} ${className})
-    {
-        List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
-        ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
-        if (StringUtils.isNotNull(${subclassName}List))
-        {
-            List<${subClassName}> list = new ArrayList<${subClassName}>();
-            for (${subClassName} ${subclassName} : ${subclassName}List)
-            {
-                ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
-                list.add(${subclassName});
-            }
-            if (list.size() > 0)
-            {
-                ${className}Mapper.batch${subClassName}(list);
-            }
-        }
-    }
-#end
-}

ruoyi-generator/target/classes/vm/java/sub-domain.java.vm

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

ruoyi-generator/target/classes/vm/js/api.js.vm

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

ruoyi-generator/target/classes/vm/sql/sql.vm

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

ruoyi-generator/target/classes/vm/vue/index-tree.vue.vm

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

ruoyi-generator/target/classes/vm/vue/index.vue.vm

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

ruoyi-generator/target/classes/vm/vue/v3/index-tree.vue.vm

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

ruoyi-generator/target/classes/vm/vue/v3/index.vue.vm

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

ruoyi-generator/target/classes/vm/vue/v3/readme.txt

@@ -1 +0,0 @@
-如果使用的是RuoYi-Vue3前端，那么需要覆盖一下此目录的模板index.vue.vm、index-tree.vue.vm文件到上级vue目录。

ruoyi-generator/target/classes/vm/xml/mapper.xml.vm

@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${packageName}.mapper.${ClassName}Mapper">
-    
-    <resultMap type="${ClassName}" id="${ClassName}Result">
-#foreach ($column in $columns)
-        <result property="${column.javaField}"    column="${column.columnName}"    />
-#end
-    </resultMap>
-#if($table.sub)
-
-    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
-        <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
-    </resultMap>
-
-    <resultMap type="${subClassName}" id="${subClassName}Result">
-#foreach ($column in $subTable.columns)
-        <result property="${column.javaField}"    column="sub_${column.columnName}"    />
-#end
-    </resultMap>
-#end
-
-    <sql id="select${ClassName}Vo">
-        select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
-    </sql>
-
-    <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
-        <include refid="select${ClassName}Vo"/>
-        <where>  
-#foreach($column in $columns)
-#set($queryType=$column.queryType)
-#set($javaField=$column.javaField)
-#set($javaType=$column.javaType)
-#set($columnName=$column.columnName)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#if($column.query)
-#if($column.queryType == "EQ")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName = #{$javaField}</if>
-#elseif($queryType == "NE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName != #{$javaField}</if>
-#elseif($queryType == "GT")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt; #{$javaField}</if>
-#elseif($queryType == "GTE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt;= #{$javaField}</if>
-#elseif($queryType == "LT")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt; #{$javaField}</if>
-#elseif($queryType == "LTE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt;= #{$javaField}</if>
-#elseif($queryType == "LIKE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName like concat('%', #{$javaField}, '%')</if>
-#elseif($queryType == "BETWEEN")
-            <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
-#end
-#end
-#end
-        </where>
-    </select>
-    
-    <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
-#if($table.crud || $table.tree)
-        <include refid="select${ClassName}Vo"/>
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-#elseif($table.sub)
-        select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
-           #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
-
-        from ${tableName} a
-        left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
-        where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
-#end
-    </select>
-        
-    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
-        insert into ${tableName}
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
-            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if>
-#end
-#end
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
-            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if>
-#end
-#end
-         </trim>
-    </insert>
-
-    <update id="update${ClassName}" parameterType="${ClassName}">
-        update ${tableName}
-        <trim prefix="SET" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName)
-            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if>
-#end
-#end
-        </trim>
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-    </update>
-
-    <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
-        delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-    </delete>
-
-    <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
-        delete from ${tableName} where ${pkColumn.columnName} in 
-        <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
-            #{${pkColumn.javaField}}
-        </foreach>
-    </delete>
-#if($table.sub)
-    
-    <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="String">
-        delete from ${subTableName} where ${subTableFkName} in 
-        <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
-            #{${subTableFkclassName}}
-        </foreach>
-    </delete>
-
-    <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
-        delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
-    </delete>
-
-    <insert id="batch${subClassName}">
-        insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
-		<foreach item="item" index="index" collection="list" separator=",">
-            (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
-        </foreach>
-    </insert>
-#end
-</mapper>

ruoyi-quartz/target/classes/mapper/quartz/SysJobLogMapper.xml

@@ -1,93 +0,0 @@
-<?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.quartz.mapper.SysJobLogMapper">
-
-	<resultMap type="SysJobLog" id="SysJobLogResult">
-		<id     property="jobLogId"       column="job_log_id"      />
-		<result property="jobName"        column="job_name"        />
-		<result property="jobGroup"       column="job_group"       />
-		<result property="invokeTarget"   column="invoke_target"   />
-		<result property="jobMessage"     column="job_message"     />
-		<result property="status"         column="status"          />
-		<result property="exceptionInfo"  column="exception_info"  />
-		<result property="createTime"     column="create_time"     />
-	</resultMap>
-	
-	<sql id="selectJobLogVo">
-        select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time 
-		from sys_job_log
-    </sql>
-	
-	<select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult">
-		<include refid="selectJobLogVo"/>
-		<where>
-			<if test="jobName != null and jobName != ''">
-				AND job_name like concat('%', #{jobName}, '%')
-			</if>
-			<if test="jobGroup != null and jobGroup != ''">
-				AND job_group = #{jobGroup}
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="invokeTarget != null and invokeTarget != ''">
-				AND invoke_target like concat('%', #{invokeTarget}, '%')
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
-		</where>
-	</select>
-	
-	<select id="selectJobLogAll" resultMap="SysJobLogResult">
-		<include refid="selectJobLogVo"/>
-	</select>
-	
-	<select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult">
-		<include refid="selectJobLogVo"/>
-		where job_log_id = #{jobLogId}
-	</select>
-	
-	<delete id="deleteJobLogById" parameterType="Long">
- 		delete from sys_job_log where job_log_id = #{jobLogId}
- 	</delete>
- 	
- 	<delete id="deleteJobLogByIds" parameterType="Long">
- 		delete from sys_job_log where job_log_id in
- 		<foreach collection="array" item="jobLogId" open="(" separator="," close=")">
- 			#{jobLogId}
-        </foreach> 
- 	</delete>
- 	
- 	<update id="cleanJobLog">
-        truncate table sys_job_log
-    </update>
- 	
- 	<insert id="insertJobLog" parameterType="SysJobLog">
- 		insert into sys_job_log(
- 			<if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
- 			<if test="jobName != null and jobName != ''">job_name,</if>
- 			<if test="jobGroup != null and jobGroup != ''">job_group,</if>
- 			<if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
- 			<if test="jobMessage != null and jobMessage != ''">job_message,</if>
- 			<if test="status != null and status != ''">status,</if>
- 			<if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
- 			create_time
- 		)values(
- 			<if test="jobLogId != null and jobLogId != 0">#{jobLogId},</if>
- 			<if test="jobName != null and jobName != ''">#{jobName},</if>
- 			<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
- 			<if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
- 			<if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
- 			<if test="status != null and status != ''">#{status},</if>
- 			<if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
- 			sysdate()
- 		)
-	</insert>
-
-</mapper> 

ruoyi-quartz/target/classes/mapper/quartz/SysJobMapper.xml

@@ -1,111 +0,0 @@
-<?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.quartz.mapper.SysJobMapper">
-
-	<resultMap type="SysJob" id="SysJobResult">
-		<id     property="jobId"          column="job_id"          />
-		<result property="jobName"        column="job_name"        />
-		<result property="jobGroup"       column="job_group"       />
-		<result property="invokeTarget"   column="invoke_target"   />
-		<result property="cronExpression" column="cron_expression" />
-		<result property="misfirePolicy"  column="misfire_policy"  />
-		<result property="concurrent"     column="concurrent"      />
-		<result property="status"         column="status"          />
-		<result property="createBy"       column="create_by"       />
-		<result property="createTime"     column="create_time"     />
-		<result property="updateBy"       column="update_by"       />
-		<result property="updateTime"     column="update_time"     />
-		<result property="remark"         column="remark"          />
-	</resultMap>
-	
-	<sql id="selectJobVo">
-        select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark 
-		from sys_job
-    </sql>
-	
-	<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
-		<include refid="selectJobVo"/>
-		<where>
-			<if test="jobName != null and jobName != ''">
-				AND job_name like concat('%', #{jobName}, '%')
-			</if>
-			<if test="jobGroup != null and jobGroup != ''">
-				AND job_group = #{jobGroup}
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="invokeTarget != null and invokeTarget != ''">
-				AND invoke_target like concat('%', #{invokeTarget}, '%')
-			</if>
-		</where>
-	</select>
-	
-	<select id="selectJobAll" resultMap="SysJobResult">
-		<include refid="selectJobVo"/>
-	</select>
-	
-	<select id="selectJobById" parameterType="Long" resultMap="SysJobResult">
-		<include refid="selectJobVo"/>
-		where job_id = #{jobId}
-	</select>
-	
-	<delete id="deleteJobById" parameterType="Long">
- 		delete from sys_job where job_id = #{jobId}
- 	</delete>
- 	
- 	<delete id="deleteJobByIds" parameterType="Long">
- 		delete from sys_job where job_id in
- 		<foreach collection="array" item="jobId" open="(" separator="," close=")">
- 			#{jobId}
-        </foreach> 
- 	</delete>
- 	
- 	<update id="updateJob" parameterType="SysJob">
- 		update sys_job
- 		<set>
- 			<if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
- 			<if test="jobGroup != null and jobGroup != ''">job_group = #{jobGroup},</if>
- 			<if test="invokeTarget != null and invokeTarget != ''">invoke_target = #{invokeTarget},</if>
- 			<if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
- 			<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy = #{misfirePolicy},</if>
- 			<if test="concurrent != null and concurrent != ''">concurrent = #{concurrent},</if>
- 			<if test="status !=null">status = #{status},</if>
- 			<if test="remark != null and remark != ''">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where job_id = #{jobId}
-	</update>
- 	
- 	<insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId">
- 		insert into sys_job(
- 			<if test="jobId != null and jobId != 0">job_id,</if>
- 			<if test="jobName != null and jobName != ''">job_name,</if>
- 			<if test="jobGroup != null and jobGroup != ''">job_group,</if>
- 			<if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
- 			<if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
- 			<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy,</if>
- 			<if test="concurrent != null and concurrent != ''">concurrent,</if>
- 			<if test="status != null and status != ''">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="jobId != null and jobId != 0">#{jobId},</if>
- 			<if test="jobName != null and jobName != ''">#{jobName},</if>
- 			<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
- 			<if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
- 			<if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
- 			<if test="misfirePolicy != null and misfirePolicy != ''">#{misfirePolicy},</if>
- 			<if test="concurrent != null and concurrent != ''">#{concurrent},</if>
- 			<if test="status != null and status != ''">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-
-</mapper> 

ruoyi-system/target/classes/mapper/Billing/UserBillingMapper.xml

@@ -1,152 +0,0 @@
-<?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.UserBillingMapper">
-
-    <resultMap type="UserBilling" id="UserBillingResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="type"    column="type"    />
-        <result property="ddId"    column="dd_id"    />
-        <result property="amount"    column="amount"    />
-        <result property="state"    column="state"    />
-        <result property="illustrate"    column="illustrate"    />
-        <result property="paymentMethod"    column="payment_method"    />
-        <result property="accountNumber"    column="account_number"    />
-        <result property="mdId"    column="md_id"    />
-        <result property="divvy"    column="divvy"    />
-        <result property="balancePay"    column="balance_pay"    />
-        <result property="userType"    column="user_type"    />
-        <result property="cretim" column="cretim" />
-        <result property="divvyRate"    column="divvy_rate"    />
-        <result property="behalfAmount"    column="behalf_amount"    />
-        <result property="walletBalance"    column="wallet_balance"    />
-        <result property="tax"    column="tax"    />
-        <result property="taxRate"    column="tax_rate"    />
-    </resultMap>
-
-    <sql id="selectUserBillingVo">
-        select b.id, b.user_id, b.type, b.dd_id, b.md_id,b.amount, b.divvy,b.state, b.illustrate, b.payment_method, b.account_number,b.balance_pay, b.user_type,b.cretim, b.divvy_rate, b.behalf_amount, b.wallet_balance, b.tax, b.tax_rate from user_billing b
-    </sql>
-
-    <select id="selectUserBillingList" parameterType="UserBilling" resultMap="UserBillingResult">
-        <include refid="selectUserBillingVo"/>
-        <if test="(userName !=null and userName!='') or (userType!=null and userType!='') ">
-            left join info_user u on b.user_id=u.user_id
-        </if>
-        <where>
-            <if test="userId != null "> and b.user_id = #{userId}</if>
-            <if test="type != null  and type != ''"> and b.type = #{type}</if>
-            <if test="ddId != null  and ddId != ''"> and b.dd_id = #{ddId}</if>
-            <if test="state != null  and state != ''"> and b.state = #{state}</if>
-            <if test="mdId != null  and mdId != ''"> and b.md_id = #{mdId}</if>
-            <if test="paymentMethod != null  and paymentMethod != ''"> and b.payment_method like concat('%', #{paymentMethod}, '%')</if>
-            <if test="accountNumber != null  and accountNumber != ''"> and b.account_number like concat('%', #{accountNumber}, '%')</if>
-            <if test="balancePay != null  and balancePay != ''"> and b.balance_pay = #{balancePay}</if>
-            <if test="userName != null and userName != ''"> and (u.user_name like concat('%', #{userName}, '%') or u.phone like concat('%', #{userName}, '%'))</if>
-            <if test="userType != null and userType != ''"> and u.user_type = #{userType}</if>
-            <if test="cretimStart != null and cretimStart != ''"> and b.cretim &gt;= #{cretimStart}</if>
-            <if test="cretimEnd != null and cretimEnd != ''"> and b.cretim &lt;= #{cretimEnd}</if>
-        </where>
-        order by id desc
-    </select>
-
-    <select id="selectUserWithdrawList" parameterType="UserBilling" resultMap="UserBillingResult">
-        <include refid="selectUserBillingVo"/>
-        <where>
-            type='2'
-            <if test="userId != null "> and b.user_id = #{userId}</if>
-            <if test="ddId != null  and ddId != ''"> and b.dd_id = #{ddId}</if>
-            <if test="state != null  and state != ''"> and b.state = #{state}</if>
-            <if test="mdId != null  and mdId != ''"> and b.md_id = #{mdId}</if>
-            <if test="paymentMethod != null  and paymentMethod != ''"> and b.payment_method like concat('%', #{paymentMethod}, '%')</if>
-            <if test="accountNumber != null  and accountNumber != ''"> and b.account_number like concat('%', #{accountNumber}, '%')</if>
-            <if test="balancePay != null  and balancePay != ''"> and b.balance_pay = #{balancePay}</if>
-            <if test="userType != null  and userType != ''"> and b.user_type = #{userType}</if>
-        </where>
-        order by b.cretim desc
-    </select>
-
-    <select id="selectUserBillingById" parameterType="Long" resultMap="UserBillingResult">
-        <include refid="selectUserBillingVo"/>
-        where b.id = #{id}
-    </select>
-
-    <insert id="insertUserBilling" parameterType="UserBilling" useGeneratedKeys="true" keyProperty="id">
-        insert into user_billing
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="type != null">type,</if>
-            <if test="ddId != null">dd_id,</if>
-            <if test="amount != null">amount,</if>
-            <if test="state != null">state,</if>
-            <if test="illustrate != null">illustrate,</if>
-            <if test="paymentMethod != null">payment_method,</if>
-            <if test="accountNumber != null">account_number,</if>
-            <if test="mdId != null">md_id,</if>
-            <if test="divvy != null">divvy,</if>
-            <if test="balancePay != null">balance_pay,</if>
-            <if test="userType != null">user_type,</if>
-            <if test="divvyRate != null">divvy_rate,</if>
-            <if test="behalfAmount != null">behalf_amount,</if>
-            <if test="walletBalance != null">wallet_balance,</if>
-            <if test="tax != null">tax,</if>
-            <if test="taxRate != null and taxRate != ''">tax_rate,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="type != null">#{type},</if>
-            <if test="ddId != null">#{ddId},</if>
-            <if test="amount != null">#{amount},</if>
-            <if test="state != null">#{state},</if>
-            <if test="illustrate != null">#{illustrate},</if>
-            <if test="paymentMethod != null">#{paymentMethod},</if>
-            <if test="accountNumber != null">#{accountNumber},</if>
-            <if test="mdId != null">#{mdId},</if>
-            <if test="divvy != null">#{divvy},</if>
-            <if test="balancePay != null">#{balancePay},</if>
-            <if test="userType != null">#{userType},</if>
-            <if test="divvyRate != null">#{divvyRate},</if>
-            <if test="behalfAmount != null">#{behalfAmount},</if>
-            <if test="walletBalance != null">#{walletBalance},</if>
-            <if test="tax != null">#{tax},</if>
-            <if test="taxRate != null and taxRate != ''">#{taxRate},</if>
-        </trim>
-    </insert>
-
-    <update id="updateUserBilling" parameterType="UserBilling">
-        update user_billing
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="ddId != null">dd_id = #{ddId},</if>
-            <if test="amount != null">amount = #{amount},</if>
-            <if test="state != null">state = #{state},</if>
-            <if test="illustrate != null">illustrate = #{illustrate},</if>
-            <if test="paymentMethod != null">payment_method = #{paymentMethod},</if>
-            <if test="accountNumber != null">account_number = #{accountNumber},</if>
-            <if test="mdId != null">md_id = #{mdId},</if>
-            <if test="divvy != null">divvy = #{divvy},</if>
-            <if test="balancePay != null">balance_pay = #{balancePay},</if>
-            <if test="userType != null">user_type = #{userType},</if>
-            <if test="divvyRate != null">divvy_rate = #{divvyRate},</if>
-            <if test="behalfAmount != null">behalf_amount = #{behalfAmount},</if>
-            <if test="walletBalance != null">wallet_balance = #{walletBalance},</if>
-            <if test="tax != null">tax = #{tax},</if>
-            <if test="taxRate != null and taxRate != ''">tax_rate = #{taxRate},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteUserBillingById" parameterType="Long">
-        delete from user_billing where id = #{id}
-    </delete>
-
-    <delete id="deleteUserBillingByIds" parameterType="String">
-        delete from user_billing where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/feeds/SocialFeedbackMapper.xml

@@ -1,87 +0,0 @@
-<?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.SocialFeedbackMapper">
-    
-    <resultMap type="SocialFeedback" id="SocialFeedbackResult">
-        <result property="id"    column="id"    />
-        <result property="nameThe"    column="name_the"    />
-        <result property="address"    column="address"    />
-        <result property="contactDetails"    column="contact_details"    />
-        <result property="sellersName"    column="sellers_name"    />
-        <result property="feedback"    column="feedback"    />
-        <result property="annexes"    column="annexes"    />
-        <result property="auditStatus"    column="audit_status"    />
-        <result property="feedbackTime"    column="feedback_time"    />
-    </resultMap>
-
-    <sql id="selectSocialFeedbackVo">
-        select id, name_the, address, contact_details, sellers_name, feedback, annexes, audit_status, feedback_time from social_feedback
-    </sql>
-
-    <select id="selectSocialFeedbackList" parameterType="SocialFeedback" resultMap="SocialFeedbackResult">
-        <include refid="selectSocialFeedbackVo"/>
-        <where>  
-            <if test="nameThe != null  and nameThe != ''"> and name_the = #{nameThe}</if>
-            <if test="sellersName != null  and sellersName != ''"> and sellers_name like concat('%', #{sellersName}, '%')</if>
-            <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
-            <if test="feedbackTime != null "> and feedback_time = #{feedbackTime}</if>
-        </where>
-    </select>
-    
-    <select id="selectSocialFeedbackById" parameterType="Long" resultMap="SocialFeedbackResult">
-        <include refid="selectSocialFeedbackVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertSocialFeedback" parameterType="SocialFeedback" useGeneratedKeys="true" keyProperty="id">
-        insert into social_feedback
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="nameThe != null">name_the,</if>
-            <if test="address != null">address,</if>
-            <if test="contactDetails != null">contact_details,</if>
-            <if test="sellersName != null">sellers_name,</if>
-            <if test="feedback != null">feedback,</if>
-            <if test="annexes != null">annexes,</if>
-            <if test="auditStatus != null">audit_status,</if>
-            <if test="feedbackTime != null">feedback_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="nameThe != null">#{nameThe},</if>
-            <if test="address != null">#{address},</if>
-            <if test="contactDetails != null">#{contactDetails},</if>
-            <if test="sellersName != null">#{sellersName},</if>
-            <if test="feedback != null">#{feedback},</if>
-            <if test="annexes != null">#{annexes},</if>
-            <if test="auditStatus != null">#{auditStatus},</if>
-            <if test="feedbackTime != null">#{feedbackTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updateSocialFeedback" parameterType="SocialFeedback">
-        update social_feedback
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="nameThe != null">name_the = #{nameThe},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="contactDetails != null">contact_details = #{contactDetails},</if>
-            <if test="sellersName != null">sellers_name = #{sellersName},</if>
-            <if test="feedback != null">feedback = #{feedback},</if>
-            <if test="annexes != null">annexes = #{annexes},</if>
-            <if test="auditStatus != null">audit_status = #{auditStatus},</if>
-            <if test="feedbackTime != null">feedback_time = #{feedbackTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSocialFeedbackById" parameterType="Long">
-        delete from social_feedback where id = #{id}
-    </delete>
-
-    <delete id="deleteSocialFeedbackByIds" parameterType="String">
-        delete from social_feedback where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/infouser/InfoUserMapper.xml

@@ -1,215 +0,0 @@
-<?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.InfoUserMapper">
-
-    <resultMap type="InfoUser" id="InfoUserResult">
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="phone"    column="phone"    />
-        <result property="nickName"    column="nick_name"    />
-        <result property="userType"    column="user_type"    />
-        <result property="email"    column="email"    />
-        <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="cid"    column="cid"    />
-        <result property="mycode"    column="mycode"    />
-        <result property="thiscode"    column="thiscode"    />
-        <result property="commission"    column="commission"    />
-        <result property="annex"    column="annex"    />
-        <result property="auditStatus"    column="audit_status"    />
-        <result property="telPhone"    column="tel_Phone"    />
-        <result property="shijStatus"    column="shij_status"    />
-        <result property="driversLicense"    column="drivers_license"    />
-        <result property="drivingLicense"    column="driving_license"    />
-        <result property="vehiclePhotos"    column="vehicle_photos"    />
-        <result property="licensePlate"    column="license_plate"    />
-        <result property="fullName"    column="full_name"    />
-        <result property="idNumber"    column="id_number"    />
-        <result property="merchantType"    column="merchant_type"    />
-        <result property="bankAccount"    column="bank_account"    />
-        <result property="passportPhoto"    column="passport_photo"    />
-        <result property="bankPhoto"    column="bank_photo"    />
-        <result property="merchantIntroduction"    column="merchant_introduction"    />
-        <result property="offline"    column="offline"    />
-        <result property="address"    column="address"    />
-        <result property="longitude"    column="longitude"    />
-        <result property="latitude"    column="latitude"    />
-    </resultMap>
-
-    <sql id="selectInfoUserVo">
-        select * from info_user
-    </sql>
-
-    <select id="selectInfoUserList" parameterType="InfoUser" resultMap="InfoUserResult">
-        <include refid="selectInfoUserVo"/>
-        <where>
-            <if test="userName != null  and userName != ''"> and BINARY user_name like concat('%', #{userName}, '%') </if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="nickName != null  and nickName != ''"> and BINARY nick_name like concat('%', #{nickName}, '%')</if>
-            <if test="userType != null  and userType != ''"> and user_type = #{userType}</if>
-            <if test="email != null  and email != ''"> and email = #{email}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="delFlag != null  and delFlag != ''"> and del_flag = #{delFlag}</if>
-            <if test="mycode != null  and mycode != ''"> and mycode = #{mycode}</if>
-            <if test="thiscode != null  and thiscode != ''"> and thiscode = #{thiscode}</if>
-            <if test="commission != null  and commission != ''"> and commission = #{commission}</if>
-            <if test="annex != null  and annex != ''"> and annex = #{annex}</if>
-            <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
-            <if test="telPhone != null  and telPhone != ''"> and tel_phone = #{telPhone}</if>
-            <if test="shijStatus != null  and shijStatus != ''"> and shij_status = #{shijStatus}</if>
-            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
-            <if test="longitude != null"> and longitude = #{longitude}</if>
-            <if test="latitude != null"> and latitude = #{latitude}</if>
-        </where>
-        order by user_id desc
-    </select>
-
-    <select id="selectInfoUserByUserId" parameterType="Long" resultMap="InfoUserResult">
-        <include refid="selectInfoUserVo"/>
-        where user_id = #{userId}
-    </select>
-
-    <insert id="insertInfoUser" parameterType="InfoUser" useGeneratedKeys="true" keyProperty="userId">
-        insert into info_user
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userName != null and userName != ''">user_name,</if>
-            <if test="phone != null and phone != ''">phone,</if>
-            <if test="nickName != null and nickName != ''">nick_name,</if>
-            <if test="userType != null and userType != ''">user_type,</if>
-            <if test="email != null">email,</if>
-            <if test="sex != null">sex,</if>
-            <if test="avatar != null and avatar != ''">avatar,</if>
-            <if test="password != null">password,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="cid != null">cid,</if>
-            <if test="mycode != null">mycode,</if>
-            <if test="thiscode != null">thiscode,</if>
-            <if test="commission != null">commission,</if>
-            <if test="annex != null">annex,</if>
-            <if test="auditStatus != null">audit_status,</if>
-            <if test="telPhone != null">tel_phone,</if>
-            <if test="shijStatus != null">shij_status,</if>
-            <if test="driversLicense != null">drivers_license,</if>
-            <if test="drivingLicense != null">driving_license,</if>
-            <if test="vehiclePhotos != null">vehicle_photos,</if>
-            <if test="passportPhoto != null">passport_photo,</if>
-            <if test="bankPhoto != null">bank_photo,</if>
-            <if test="merchantIntroduction != null">merchant_introduction,</if>
-            <if test="offline != null">offline,</if>
-            <if test="address != null and address != ''">address,</if>
-            <if test="longitude != null">longitude,</if>
-            <if test="latitude != null">latitude</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userName != null and userName != ''">#{userName},</if>
-            <if test="phone != null and phone != ''">#{phone},</if>
-            <if test="nickName != null and nickName != ''">#{nickName},</if>
-            <if test="userType != null and userType != ''">#{userType},</if>
-            <if test="email != null">#{email},</if>
-            <if test="sex != null">#{sex},</if>
-            <if test="avatar != null and avatar != ''">#{avatar},</if>
-            <if test="password != null">#{password},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="cid != null">#{cid},</if>
-            <if test="mycode != null">#{mycode},</if>
-            <if test="thiscode != null">#{thiscode},</if>
-            <if test="commission != null">#{commission},</if>
-            <if test="annex != null">#{annex},</if>
-            <if test="auditStatus != null">#{auditStatus},</if>
-            <if test="telPhone != null">#{telPhone},</if>
-            <if test="shijStatus != null">#{shijStatus},</if>
-            <if test="driversLicense != null">#{driversLicense},</if>
-            <if test="drivingLicense != null">#{drivingLicense},</if>
-            <if test="vehiclePhotos != null">#{vehiclePhotos},</if>
-            <if test="passportPhoto != null">#{passportPhoto},</if>
-            <if test="bankPhoto != null">#{bankPhoto},</if>
-            <if test="merchantIntroduction != null">#{merchantIntroduction},</if>
-            <if test="offline !=null">#{offline},</if>
-            <if test="address != null and address != ''">#{address},</if>
-            <if test="longitude != null">#{longitude},</if>
-            <if test="latitude != null">#{latitude}</if>
-         </trim>
-    </insert>
-
-    <update id="updateInfoUser" parameterType="InfoUser">
-        update info_user
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userName != null and userName != ''">user_name = #{userName},</if>
-            <if test="phone != null and phone != ''">phone = #{phone},</if>
-            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
-            <if test="userType != null and userType != ''">user_type = #{userType},</if>
-            <if test="email != null">email = #{email},</if>
-            <if test="sex != null">sex = #{sex},</if>
-            <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
-            <if test="password != null">password = #{password},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="cid != null">cid = #{cid},</if>
-            <if test="mycode != null">mycode = #{mycode},</if>
-            <if test="thiscode != null">thiscode = #{thiscode},</if>
-            <if test="commission != null">commission = #{commission},</if>
-            <if test="annex != null">annex = #{annex},</if>
-            <if test="auditStatus != null">audit_status = #{auditStatus},</if>
-            <if test="telPhone != null">tel_phone = #{telPhone},</if>
-            <if test="shijStatus != null">shij_status = #{shijStatus},</if>
-            <if test="driversLicense != null">drivers_license = #{driversLicense},</if>
-            <if test="drivingLicense != null">driving_license = #{drivingLicense},</if>
-            <if test="vehiclePhotos != null">vehicle_photos = #{vehiclePhotos},</if>
-            <if test="passportPhoto != null">passport_photo = #{passportPhoto},</if>
-            <if test="bankPhoto != null">bank_photo = #{bankPhoto},</if>
-            <if test="merchantIntroduction != null">merchant_introduction = #{merchantIntroduction},</if>
-            <if test="offline != null">offline =#{offline},</if>
-            <if test="address != null and address != ''">address = #{address},</if>
-            <if test="longitude != null">longitude = #{longitude},</if>
-            <if test="latitude != null">latitude = #{latitude}</if>
-        </trim>
-        where user_id = #{userId}
-    </update>
-
-    <update id="deleteInfoUserByUserId" parameterType="Long">
-        update info_user SET del_flag=1 where user_id = #{userId}
-    </update>
-
-    <update id="deleteInfoUserByUserIds" parameterType="String">
-        update info_user SET del_flag=1 where user_id in
-        <foreach item="userId" collection="array" open="(" separator="," close=")">
-            #{userId}
-        </foreach>
-    </update>
-
-    <select id="countUsersByUserTypeAndCreatedAt" resultType="int">
-        SELECT COUNT(*)
-        FROM info_user
-        <where>
-            user_type = #{userType}
-            AND status = 0
-            AND del_flag = 0
-            <if test="createdAt != null">
-                AND created_at &gt; #{createdAt}
-            </if>
-        </where>
-    </select>
-    <select id="getUserSum" resultType="int" >
-        SELECT IFNULL(COUNT(*),0)  FROM info_user
-        <where>
-            user_type=#{userType}
-            <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
-                 and created_at between #{startDate} and #{endDate}
-           </if>
-            <if test="startDate != null and startDate != '' and (endDate == null or endDate == '')">
-                and created_at >= #{startDate}
-            </if>
-            <if test="(startDate == null or startDate == '') and (endDate != null and endDate != '')">
-                and created_at &lt;= #{endDate}
-            </if>
-        </where>
-    </select>
-
-</mapper>

ruoyi-system/target/classes/mapper/system/AppDownloadMapper.xml

@@ -1,61 +0,0 @@
-<?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.AppDownloadMapper">
-
-    <resultMap type="AppDownload" id="AppDownloadResult">
-        <result property="id"    column="id"    />
-        <result property="androidUrl"    column="android_url"    />
-        <result property="iosUrl"    column="ios_url"    />
-    </resultMap>
-
-    <sql id="selectAppDownloadVo">
-        select id, android_url, ios_url from app_download
-    </sql>
-
-    <select id="selectAppDownloadList" parameterType="AppDownload" resultMap="AppDownloadResult">
-        <include refid="selectAppDownloadVo"/>
-        <where>
-            <if test="androidUrl != null  and androidUrl != ''"> and android_url = #{androidUrl}</if>
-            <if test="iosUrl != null  and iosUrl != ''"> and ios_url = #{iosUrl}</if>
-        </where>
-    </select>
-
-    <select id="selectAppDownloadById" parameterType="Long" resultMap="AppDownloadResult">
-        <include refid="selectAppDownloadVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertAppDownload" parameterType="AppDownload" useGeneratedKeys="true" keyProperty="id">
-        insert into app_download
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="androidUrl != null">android_url,</if>
-            <if test="iosUrl != null">ios_url,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="androidUrl != null">#{androidUrl},</if>
-            <if test="iosUrl != null">#{iosUrl},</if>
-        </trim>
-    </insert>
-
-    <update id="updateAppDownload" parameterType="AppDownload">
-        update app_download
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="androidUrl != null">android_url = #{androidUrl},</if>
-            <if test="iosUrl != null">ios_url = #{iosUrl},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteAppDownloadById" parameterType="Long">
-        delete from app_download where id = #{id}
-    </delete>
-
-    <delete id="deleteAppDownloadByIds" parameterType="String">
-        delete from app_download where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/AppVersionMapper.xml

@@ -1,89 +0,0 @@
-<?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.AppVersionMapper">
-    
-    <resultMap type="AppVersion" id="AppVersionResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="versionName"    column="version_name"    />
-        <result property="version"    column="version"    />
-        <result property="platform"    column="platform"    />
-        <result property="downloadUrl"    column="download_url"    />
-        <result property="introduce"    column="introduce"    />
-        <result property="renew"    column="renew"    />
-    </resultMap>
-
-    <sql id="selectAppVersionVo">
-        select id, name, version_name, version, platform, download_url, introduce, renew from app_version
-    </sql>
-
-    <select id="selectAppVersionList" parameterType="AppVersion" resultMap="AppVersionResult">
-        <include refid="selectAppVersionVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="versionName != null  and versionName != ''"> and version_name like concat('%', #{versionName}, '%')</if>
-            <if test="version != null  and version != ''"> and version = #{version}</if>
-            <if test="platform != null "> and platform = #{platform}</if>
-            <if test="downloadUrl != null  and downloadUrl != ''"> and download_url = #{downloadUrl}</if>
-            <if test="introduce != null  and introduce != ''"> and introduce = #{introduce}</if>
-            <if test="renew != null "> and renew = #{renew}</if>
-        </where>
-        order by id desc
-    </select>
-    
-    <select id="selectAppVersionById" parameterType="Long" resultMap="AppVersionResult">
-        <include refid="selectAppVersionVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertAppVersion" parameterType="AppVersion">
-        insert into app_version
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="name != null and name != ''">name,</if>
-            <if test="versionName != null and versionName != ''">version_name,</if>
-            <if test="version != null and version != ''">version,</if>
-            <if test="platform != null">platform,</if>
-            <if test="downloadUrl != null and downloadUrl != ''">download_url,</if>
-            <if test="introduce != null">introduce,</if>
-            <if test="renew != null">renew,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="name != null and name != ''">#{name},</if>
-            <if test="versionName != null and versionName != ''">#{versionName},</if>
-            <if test="version != null and version != ''">#{version},</if>
-            <if test="platform != null">#{platform},</if>
-            <if test="downloadUrl != null and downloadUrl != ''">#{downloadUrl},</if>
-            <if test="introduce != null">#{introduce},</if>
-            <if test="renew != null">#{renew},</if>
-         </trim>
-    </insert>
-
-    <update id="updateAppVersion" parameterType="AppVersion">
-        update app_version
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null and name != ''">name = #{name},</if>
-            <if test="versionName != null and versionName != ''">version_name = #{versionName},</if>
-            <if test="version != null and version != ''">version = #{version},</if>
-            <if test="platform != null">platform = #{platform},</if>
-            <if test="downloadUrl != null and downloadUrl != ''">download_url = #{downloadUrl},</if>
-            <if test="introduce != null">introduce = #{introduce},</if>
-            <if test="renew != null">renew = #{renew},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteAppVersionById" parameterType="Long">
-        delete from app_version where id = #{id}
-    </delete>
-
-    <delete id="deleteAppVersionByIds" parameterType="String">
-        delete from app_version where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/BankCardMapper.xml

@@ -1,79 +0,0 @@
-<?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.BankCardMapper">
-
-    <resultMap type="BankCard" id="BankCardResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="number"    column="number"    />
-        <result property="bankName"    column="bank_name"    />
-        <result property="accountName"    column="account_name"    />
-        <result property="type"    column="type"    />
-        <result property="img"    column="img"    />
-    </resultMap>
-
-    <sql id="selectBankCardVo">
-        select id, user_id, number, bank_name, account_name, type, img from bank_card
-    </sql>
-
-    <select id="selectBankCardList" parameterType="BankCard" resultMap="BankCardResult">
-        <include refid="selectBankCardVo"/>
-        <where>
-            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
-            <if test="number != null  and number != ''"> and BINARY number like concat('%', #{number}, '%')</if>
-            <if test="bankName != null  and bankName != ''"> and BINARY bank_name like concat('%', #{bankName}, '%')</if>
-            <if test="accountName != null  and accountName != ''"> and BINARY account_name like concat('%', #{accountName}, '%')</if>
-        </where>
-    </select>
-
-    <select id="selectBankCardById" parameterType="Long" resultMap="BankCardResult">
-        <include refid="selectBankCardVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertBankCard" parameterType="BankCard" useGeneratedKeys="true" keyProperty="id">
-        insert into bank_card
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="number != null">number,</if>
-            <if test="bankName != null">bank_name,</if>
-            <if test="accountName != null">account_name,</if>
-            <if test="type != null">type,</if>
-            <if test="img != null">img,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="number != null">#{number},</if>
-            <if test="bankName != null">#{bankName},</if>
-            <if test="accountName != null">#{accountName},</if>
-            <if test="type != null">#{type},</if>
-            <if test="img != null">#{img},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBankCard" parameterType="BankCard">
-        update bank_card
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="number != null">number = #{number},</if>
-            <if test="bankName != null">bank_name = #{bankName},</if>
-            <if test="accountName != null">account_name = #{accountName},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="img != null">img = #{img},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBankCardById" parameterType="Long">
-        delete from bank_card where id = #{id}
-    </delete>
-
-    <delete id="deleteBankCardByIds" parameterType="String">
-        delete from bank_card where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/DistanceMultiplierMapper.xml

@@ -1,56 +0,0 @@
-<?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.DistanceMultiplierMapper">
-    
-    <resultMap type="DistanceMultiplier" id="DistanceMultiplierResult">
-        <result property="id"    column="id"    />
-        <result property="multiple"    column="multiple"    />
-    </resultMap>
-
-    <sql id="selectDistanceMultiplierVo">
-        select id, multiple from distance_multiplier
-    </sql>
-
-    <select id="selectDistanceMultiplierList" parameterType="DistanceMultiplier" resultMap="DistanceMultiplierResult">
-        <include refid="selectDistanceMultiplierVo"/>
-        <where>  
-            <if test="multiple != null "> and multiple = #{multiple}</if>
-        </where>
-    </select>
-    
-    <select id="selectDistanceMultiplierById" parameterType="Long" resultMap="DistanceMultiplierResult">
-        <include refid="selectDistanceMultiplierVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertDistanceMultiplier" parameterType="DistanceMultiplier" useGeneratedKeys="true" keyProperty="id">
-        insert into distance_multiplier
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="multiple != null">multiple,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="multiple != null">#{multiple},</if>
-         </trim>
-    </insert>
-
-    <update id="updateDistanceMultiplier" parameterType="DistanceMultiplier">
-        update distance_multiplier
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="multiple != null">multiple = #{multiple},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteDistanceMultiplierById" parameterType="Long">
-        delete from distance_multiplier where id = #{id}
-    </delete>
-
-    <delete id="deleteDistanceMultiplierByIds" parameterType="String">
-        delete from distance_multiplier where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/FoodStatisticsMapper.xml

@@ -1,60 +0,0 @@
-<?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.FoodStatisticsMapper">
-
-    <resultMap type="FoodStatistics" id="FoodStatisticsResult">
-        <result property="id"    column="id"    />
-        <result property="foodId"    column="food_id"    />
-        <result property="number"    column="number"    />
-    </resultMap>
-
-    <sql id="selectFoodStatisticsVo">
-        select id, food_id, number from food_statistics
-    </sql>
-
-    <select id="selectFoodStatisticsList" parameterType="FoodStatistics" resultMap="FoodStatisticsResult">
-        <include refid="selectFoodStatisticsVo"/>
-        <where>
-            <if test="number != null "> and number = #{number}</if>
-        </where>
-    </select>
-
-    <select id="selectFoodStatisticsById" parameterType="Long" resultMap="FoodStatisticsResult">
-        <include refid="selectFoodStatisticsVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertFoodStatistics" parameterType="FoodStatistics" useGeneratedKeys="true" keyProperty="id">
-        insert into food_statistics
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="foodId != null">food_id,</if>
-            <if test="number != null">number,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="foodId != null">#{foodId},</if>
-            <if test="number != null">#{number},</if>
-        </trim>
-    </insert>
-
-    <update id="updateFoodStatistics" parameterType="FoodStatistics">
-        update food_statistics
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="foodId != null">food_id = #{foodId},</if>
-            <if test="number != null">number = #{number},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteFoodStatisticsById" parameterType="Long">
-        delete from food_statistics where id = #{id}
-    </delete>
-
-    <delete id="deleteFoodStatisticsByIds" parameterType="String">
-        delete from food_statistics where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/InfoAddressMapper.xml

@@ -1,103 +0,0 @@
-<?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.InfoAddressMapper">
-    
-    <resultMap type="InfoAddress" id="InfoAddressResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="name"    column="name"    />
-        <result property="phone"    column="phone"    />
-        <result property="address"    column="address"    />
-        <result property="addressDetail"    column="address_detail"    />
-        <result property="longitude"    column="longitude"    />
-        <result property="latitude"    column="latitude"    />
-        <result property="country"    column="country"    />
-        <result property="province"    column="province"    />
-        <result property="city"    column="city"    />
-        <result property="area"    column="area"    />
-    </resultMap>
-
-    <sql id="selectInfoAddressVo">
-        select id, user_id, name, phone, address, address_detail, longitude, latitude, country, province, city, area from info_address
-    </sql>
-
-    <select id="selectInfoAddressList" parameterType="InfoAddress" resultMap="InfoAddressResult">
-        <include refid="selectInfoAddressVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="country != null  and country != ''"> and country = #{country}</if>
-            <if test="province != null  and province != ''"> and province = #{province}</if>
-            <if test="city != null  and city != ''"> and city = #{city}</if>
-            <if test="area != null  and area != ''"> and area = #{area}</if>
-        </where>
-        order by id desc
-    </select>
-    
-    <select id="selectInfoAddressById" parameterType="Long" resultMap="InfoAddressResult">
-        <include refid="selectInfoAddressVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertInfoAddress" parameterType="InfoAddress" useGeneratedKeys="true" keyProperty="id">
-        insert into info_address
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="name != null and name != ''">name,</if>
-            <if test="phone != null and phone != ''">phone,</if>
-            <if test="address != null and address != ''">address,</if>
-            <if test="addressDetail != null and addressDetail != ''">address_detail,</if>
-            <if test="longitude != null">longitude,</if>
-            <if test="latitude != null">latitude,</if>
-            <if test="country != null">country,</if>
-            <if test="province != null">province,</if>
-            <if test="city != null">city,</if>
-            <if test="area != null">area,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="name != null and name != ''">#{name},</if>
-            <if test="phone != null and phone != ''">#{phone},</if>
-            <if test="address != null and address != ''">#{address},</if>
-            <if test="addressDetail != null and addressDetail != ''">#{addressDetail},</if>
-            <if test="longitude != null">#{longitude},</if>
-            <if test="latitude != null">#{latitude},</if>
-            <if test="country != null">#{country},</if>
-            <if test="province != null">#{province},</if>
-            <if test="city != null">#{city},</if>
-            <if test="area != null">#{area},</if>
-         </trim>
-    </insert>
-
-    <update id="updateInfoAddress" parameterType="InfoAddress">
-        update info_address
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="name != null and name != ''">name = #{name},</if>
-            <if test="phone != null and phone != ''">phone = #{phone},</if>
-            <if test="address != null and address != ''">address = #{address},</if>
-            <if test="addressDetail != null and addressDetail != ''">address_detail = #{addressDetail},</if>
-            <if test="longitude != null">longitude = #{longitude},</if>
-            <if test="latitude != null">latitude = #{latitude},</if>
-            <if test="country != null">country = #{country},</if>
-            <if test="province != null">province = #{province},</if>
-            <if test="city != null">city = #{city},</if>
-            <if test="area != null">area = #{area},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteInfoAddressById" parameterType="Long">
-        delete from info_address where id = #{id}
-    </delete>
-
-    <delete id="deleteInfoAddressByIds" parameterType="String">
-        delete from info_address where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/IpnLogMapper.xml

@@ -1,65 +0,0 @@
-<?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.IpnLogMapper">
-    
-    <resultMap type="IpnLog" id="IpnLogResult">
-        <result property="id"    column="id"    />
-        <result property="ip"    column="ip"    />
-        <result property="cretim"    column="cretim"    />
-        <result property="ipnLog"    column="ipn_log"    />
-    </resultMap>
-
-    <sql id="selectIpnLogVo">
-        select id, ip, cretim, ipn_log from ipn_log
-    </sql>
-
-    <select id="selectIpnLogList" parameterType="IpnLog" resultMap="IpnLogResult">
-        <include refid="selectIpnLogVo"/>
-        <where>  
-            <if test="ip != null  and ip != ''"> and ip = #{ip}</if>
-            <if test="cretim != null "> and cretim = #{cretim}</if>
-        </where>
-    </select>
-    
-    <select id="selectIpnLogById" parameterType="Long" resultMap="IpnLogResult">
-        <include refid="selectIpnLogVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertIpnLog" parameterType="IpnLog" useGeneratedKeys="true" keyProperty="id">
-        insert into ipn_log
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ip != null">ip,</if>
-            <if test="cretim != null">cretim,</if>
-            <if test="ipnLog != null">ipn_log,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ip != null">#{ip},</if>
-            <if test="cretim != null">#{cretim},</if>
-            <if test="ipnLog != null">#{ipnLog},</if>
-         </trim>
-    </insert>
-
-    <update id="updateIpnLog" parameterType="IpnLog">
-        update ipn_log
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="ip != null">ip = #{ip},</if>
-            <if test="cretim != null">cretim = #{cretim},</if>
-            <if test="ipnLog != null">ipn_log = #{ipnLog},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteIpnLogById" parameterType="Long">
-        delete from ipn_log where id = #{id}
-    </delete>
-
-    <delete id="deleteIpnLogByIds" parameterType="String">
-        delete from ipn_log where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/NightMarketMapper.xml

@@ -1,141 +0,0 @@
-<?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.NightMarketMapper">
-
-    <resultMap type="NightMarket" id="NightMarketResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="image"    column="image"    />
-        <result property="area"    column="area"    />
-        <result property="address"    column="address"    />
-        <result property="longitude"    column="longitude"    />
-        <result property="latitude"    column="latitude"    />
-        <result property="briefIntroduction"    column="brief_introduction"    />
-        <result property="openBusiness"    column="open_business"    />
-        <result property="windingUp"    column="winding_up"    />
-        <result property="sort"    column="sort"    />
-        <result property="userId"    column="user_id"    />
-        <result property="cretim"    column="cretim"    />
-        <result property="state"    column="state"    />
-        <result property="telephone"    column="telephone"    />
-        <result property="userName"    column="user_name"    />
-        <result property="logo"    column="logo"    />
-        <result property="offShelf"    column="off_shelf"    />
-        <result property="hygieneLicence"    column="hygiene_licence"    />
-    </resultMap>
-
-    <sql id="selectNightMarketVo">
-        select id, name, image, area, address, longitude, latitude, brief_introduction, open_business, winding_up, sort, user_id, cretim, state, telephone, user_name, logo, off_shelf, hygiene_licence from night_market
-    </sql>
-
-    <select id="selectNightMarketList" parameterType="NightMarket" resultMap="NightMarketResult">
-        <include refid="selectNightMarketVo"/>
-        <where>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="image != null  and image != ''"> and image = #{image}</if>
-            <if test="area != null  and area != ''"> and area = #{area}</if>
-            <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="longitude != null "> and longitude = #{longitude}</if>
-            <if test="latitude != null "> and latitude = #{latitude}</if>
-            <if test="briefIntroduction != null  and briefIntroduction != ''"> and brief_introduction = #{briefIntroduction}</if>
-            <if test="openBusiness != null  and openBusiness != ''"> and open_business = #{openBusiness}</if>
-            <if test="windingUp != null  and windingUp != ''"> and winding_up = #{windingUp}</if>
-            <if test="sort != null "> and sort = #{sort}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="cretim != null "> and cretim = #{cretim}</if>
-            <if test="state != null "> and state = #{state}</if>
-            <if test="telephone != null  and telephone != ''"> and telephone = #{telephone}</if>
-            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-            <if test="logo != null  and logo != ''"> and logo = #{logo}</if>
-            <if test="offShelf != null  and offShelf != ''"> and off_shelf = #{offShelf}</if>
-            <if test="hygieneLicence != null  and hygieneLicence != ''"> and hygiene_licence = #{hygieneLicence}</if>
-        </where>
-    </select>
-
-    <select id="selectNightMarketById" parameterType="Long" resultMap="NightMarketResult">
-        <include refid="selectNightMarketVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertNightMarket" parameterType="NightMarket" useGeneratedKeys="true" keyProperty="id">
-        insert into night_market
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null">name,</if>
-            <if test="image != null">image,</if>
-            <if test="area != null">area,</if>
-            <if test="address != null">address,</if>
-            <if test="longitude != null">longitude,</if>
-            <if test="latitude != null">latitude,</if>
-            <if test="briefIntroduction != null">brief_introduction,</if>
-            <if test="openBusiness != null">open_business,</if>
-            <if test="windingUp != null">winding_up,</if>
-            <if test="sort != null">sort,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="cretim != null">cretim,</if>
-            <if test="state != null">state,</if>
-            <if test="telephone != null">telephone,</if>
-            <if test="userName != null">user_name,</if>
-            <if test="logo != null">logo,</if>
-            <if test="offShelf != null">off_shelf,</if>
-            <if test="hygieneLicence != null">hygiene_licence,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null">#{name},</if>
-            <if test="image != null">#{image},</if>
-            <if test="area != null">#{area},</if>
-            <if test="address != null">#{address},</if>
-            <if test="longitude != null">#{longitude},</if>
-            <if test="latitude != null">#{latitude},</if>
-            <if test="briefIntroduction != null">#{briefIntroduction},</if>
-            <if test="openBusiness != null">#{openBusiness},</if>
-            <if test="windingUp != null">#{windingUp},</if>
-            <if test="sort != null">#{sort},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="cretim != null">#{cretim},</if>
-            <if test="state != null">#{state},</if>
-            <if test="telephone != null">#{telephone},</if>
-            <if test="userName != null">#{userName},</if>
-            <if test="logo != null">#{logo},</if>
-            <if test="offShelf != null">#{offShelf},</if>
-            <if test="hygieneLicence != null">#{hygieneLicence},</if>
-        </trim>
-    </insert>
-
-    <update id="updateNightMarket" parameterType="NightMarket">
-        update night_market
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null">name = #{name},</if>
-            <if test="image != null">image = #{image},</if>
-            <if test="area != null">area = #{area},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="longitude != null">longitude = #{longitude},</if>
-            <if test="latitude != null">latitude = #{latitude},</if>
-            <if test="briefIntroduction != null">brief_introduction = #{briefIntroduction},</if>
-            <if test="openBusiness != null">open_business = #{openBusiness},</if>
-            <if test="windingUp != null">winding_up = #{windingUp},</if>
-            <if test="sort != null">sort = #{sort},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="cretim != null">cretim = #{cretim},</if>
-            <if test="state != null">state = #{state},</if>
-            <if test="telephone != null">telephone = #{telephone},</if>
-            <if test="userName != null">user_name = #{userName},</if>
-            <if test="logo != null">logo = #{logo},</if>
-            <if test="offShelf != null">off_shelf = #{offShelf},</if>
-            <if test="hygieneLicence != null">hygiene_licence = #{hygieneLicence},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteNightMarketById" parameterType="Long">
-        delete from night_market where id = #{id}
-    </delete>
-
-    <delete id="deleteNightMarketByIds" parameterType="String">
-        delete from night_market where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/OperatingHoursMapper.xml

@@ -1,75 +0,0 @@
-<?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.OperatingHoursMapper">
-
-    <resultMap type="OperatingHours" id="OperatingHoursResult">
-        <result property="id"    column="id"    />
-        <result property="mdId"    column="md_id"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="endTime"    column="end_time"    />
-        <result property="dayOfWeek"    column="day_of_week"    />
-        <result property="isOpen"    column="is_open"    />
-    </resultMap>
-
-    <sql id="selectOperatingHoursVo">
-        select id, md_id, start_time, end_time, day_of_week, is_open from operating_hours
-    </sql>
-
-    <select id="selectOperatingHoursList" parameterType="OperatingHours" resultMap="OperatingHoursResult">
-        <include refid="selectOperatingHoursVo"/>
-        <where>
-            <if test="id != null "> and id = #{id}</if>
-            <if test="mdId != null "> and md_id = #{mdId}</if>
-            <if test="dayOfWeek != null "> and day_of_week = #{dayOfWeek}</if>
-            <if test="isOpen != null "> and is_open = #{isOpen}</if>
-        </where>
-    </select>
-
-    <select id="selectOperatingHoursById" parameterType="Long" resultMap="OperatingHoursResult">
-        <include refid="selectOperatingHoursVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertOperatingHours" parameterType="OperatingHours" useGeneratedKeys="true" keyProperty="id">
-        insert into operating_hours
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="mdId != null">md_id,</if>
-            <if test="startTime != null">start_time,</if>
-            <if test="endTime != null">end_time,</if>
-            <if test="dayOfWeek != null">day_of_week,</if>
-            <if test="isOpen != null">is_open,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="mdId != null">#{mdId},</if>
-            <if test="startTime != null">#{startTime},</if>
-            <if test="endTime != null">#{endTime},</if>
-            <if test="dayOfWeek != null">#{dayOfWeek},</if>
-            <if test="isOpen != null">#{isOpen},</if>
-         </trim>
-    </insert>
-
-    <update id="updateOperatingHours" parameterType="OperatingHours">
-        update operating_hours
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="mdId != null">md_id = #{mdId},</if>
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="endTime != null">end_time = #{endTime},</if>
-            <if test="dayOfWeek != null">day_of_week = #{dayOfWeek},</if>
-            <if test="isOpen != null">is_open = #{isOpen},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteOperatingHoursById" parameterType="Long">
-        delete from operating_hours where id = #{id}
-    </delete>
-
-    <delete id="deleteOperatingHoursByIds" parameterType="String">
-        delete from operating_hours where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/OrderParentMapper.xml

@@ -1,121 +0,0 @@
-<?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.OrderParentMapper">
-
-    <resultMap type="OrderParent" id="OrderParentResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="orderStatus"    column="order_status"    />
-        <result property="totalAmount"    column="total_amount"    />
-        <result property="totalDiscount"    column="total_discount"    />
-        <result property="actualPayAmount"    column="actual_pay_amount"    />
-        <result property="paymentMethod"    column="payment_method"    />
-        <result property="paymentTime"    column="payment_time"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="ddId"    column="dd_id"    />
-        <result property="tableNum"    column="table_num"    />
-        <result property="shdzId"    column="shdz_id"    />
-        <result property="shAddress"    column="sh_address"    />
-        <result property="remarks"    column="remarks"    />
-    </resultMap>
-
-    <sql id="selectOrderParentVo">
-        select id, user_id, order_status, total_amount, total_discount, actual_pay_amount, payment_method, payment_time, create_time, update_time, dd_id, table_num, shdz_id, sh_address, remarks from order_parent
-    </sql>
-
-    <select id="selectOrderParentList" parameterType="OrderParent" resultMap="OrderParentResult">
-        <include refid="selectOrderParentVo"/>
-        <where>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="orderStatus != null "> and order_status = #{orderStatus}</if>
-            <if test="totalAmount != null "> and total_amount = #{totalAmount}</if>
-            <if test="totalDiscount != null "> and total_discount = #{totalDiscount}</if>
-            <if test="actualPayAmount != null "> and actual_pay_amount = #{actualPayAmount}</if>
-            <if test="paymentMethod != null  and paymentMethod != ''"> and payment_method = #{paymentMethod}</if>
-            <if test="paymentTime != null "> and payment_time = #{paymentTime}</if>
-            <if test="ddId != null  and ddId != ''"> and dd_id = #{ddId}</if>
-            <if test="tableNum != null  and tableNum != ''"> and table_num = #{tableNum}</if>
-            <if test="shdzId != null"> and shdz_id = #{shdzId}</if>
-            <if test="shAddress != null  and shAddress != ''"> and sh_address = #{shAddress}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-        </where>
-    </select>
-
-    <select id="selectOrderParentById" parameterType="Long" resultMap="OrderParentResult">
-        <include refid="selectOrderParentVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertOrderParent" parameterType="OrderParent">
-        insert into order_parent
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="orderStatus != null">order_status,</if>
-            <if test="totalAmount != null">total_amount,</if>
-            <if test="totalDiscount != null">total_discount,</if>
-            <if test="actualPayAmount != null">actual_pay_amount,</if>
-            <if test="paymentMethod != null">payment_method,</if>
-            <if test="paymentTime != null">payment_time,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="ddId != null">dd_id,</if>
-            <if test="tableNum != null and tableNum != ''">table_num,</if>
-            <if test="shdzId != null">shdz_id,</if>
-            <if test="shAddress != null and shAddress != ''">sh_address,</if>
-            <if test="remarks != null and remarks != ''">remarks,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="orderStatus != null">#{orderStatus},</if>
-            <if test="totalAmount != null">#{totalAmount},</if>
-            <if test="totalDiscount != null">#{totalDiscount},</if>
-            <if test="actualPayAmount != null">#{actualPayAmount},</if>
-            <if test="paymentMethod != null">#{paymentMethod},</if>
-            <if test="paymentTime != null">#{paymentTime},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="ddId != null">#{ddId},</if>
-            <if test="tableNum != null and tableNum != ''">#{tableNum},</if>
-            <if test="shdzId != null">#{shdzId},</if>
-            <if test="shAddress != null and shAddress != ''">#{shAddress},</if>
-            <if test="remarks != null and remarks != ''">#{remarks},</if>
-        </trim>
-    </insert>
-
-    <update id="updateOrderParent" parameterType="OrderParent">
-        update order_parent
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="orderStatus != null">order_status = #{orderStatus},</if>
-            <if test="totalAmount != null">total_amount = #{totalAmount},</if>
-            <if test="totalDiscount != null">total_discount = #{totalDiscount},</if>
-            <if test="actualPayAmount != null">actual_pay_amount = #{actualPayAmount},</if>
-            <if test="paymentMethod != null">payment_method = #{paymentMethod},</if>
-            <if test="paymentTime != null">payment_time = #{paymentTime},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="ddId != null">dd_id = #{ddId},</if>
-            <if test="tableNum != null and tableNum != ''">table_num = #{tableNum},</if>
-            <if test="shdzId != null">shdz_id = #{shdzId},</if>
-            <if test="shAddress != null and shAddress != ''">sh_address = #{shAddress},</if>
-            <if test="remarks != null and remarks != ''">remarks = #{remarks},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteOrderParentById" parameterType="Long">
-        delete from order_parent where id = #{id}
-    </delete>
-
-    <delete id="deleteOrderParentByIds" parameterType="String">
-        delete from order_parent where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/PosCollectMapper.xml

@@ -1,66 +0,0 @@
-<?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.PosCollectMapper">
-    
-    <resultMap type="PosCollect" id="PosCollectResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="mdId"    column="md_id"    />
-        <result property="cretim"    column="cretim"    />
-    </resultMap>
-
-    <sql id="selectPosCollectVo">
-        select id, user_id, md_id, cretim from pos_collect
-    </sql>
-
-    <select id="selectPosCollectList" parameterType="PosCollect" resultMap="PosCollectResult">
-        <include refid="selectPosCollectVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="mdId != null "> and md_id = #{mdId}</if>
-        </where>
-        order by id desc
-    </select>
-    
-    <select id="selectPosCollectById" parameterType="Long" resultMap="PosCollectResult">
-        <include refid="selectPosCollectVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertPosCollect" parameterType="PosCollect" useGeneratedKeys="true" keyProperty="id">
-        insert into pos_collect
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="mdId != null">md_id,</if>
-            <if test="cretim != null">cretim,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="mdId != null">#{mdId},</if>
-            <if test="cretim != null">#{cretim},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePosCollect" parameterType="PosCollect">
-        update pos_collect
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="mdId != null">md_id = #{mdId},</if>
-            <if test="cretim != null">cretim = #{cretim},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePosCollectById" parameterType="Long">
-        delete from pos_collect where id = #{id}
-    </delete>
-
-    <delete id="deletePosCollectByIds" parameterType="String">
-        delete from pos_collect where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/PosFreightMapper.xml

@@ -1,77 +0,0 @@
-<?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.PosFreightMapper">
-    
-    <resultMap type="PosFreight" id="PosFreightResult">
-        <result property="id"    column="id"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="endTime"    column="end_time"    />
-        <result property="freight"    column="freight"    />
-        <result property="distance"    column="distance"    />
-        <result property="startingFare"    column="starting_fare"    />
-        <result property="startingDistance"    column="starting_distance"    />
-    </resultMap>
-
-    <sql id="selectPosFreightVo">
-        select id, start_time, end_time, freight, distance,starting_fare,starting_distance from pos_freight
-    </sql>
-
-    <select id="selectPosFreightList" parameterType="PosFreight" resultMap="PosFreightResult">
-        <include refid="selectPosFreightVo"/>
-        <where>  
-            <if test="freight != null "> and freight = #{freight}</if>
-        </where>
-        order by id desc
-    </select>
-    
-    <select id="selectPosFreightById" parameterType="Long" resultMap="PosFreightResult">
-        <include refid="selectPosFreightVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertPosFreight" parameterType="PosFreight" useGeneratedKeys="true" keyProperty="id">
-        insert into pos_freight
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="startTime != null">start_time,</if>
-            <if test="endTime != null">end_time,</if>
-            <if test="freight != null">freight,</if>
-            <if test="distance != null">distance,</if>
-            <if test="startingFare != null">starting_fare,</if>
-            <if test="startingDistance != null">starting_distance,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="startTime != null">#{startTime},</if>
-            <if test="endTime != null">#{endTime},</if>
-            <if test="freight != null">#{freight},</if>
-            <if test="distance != null">#{distance},</if>
-            <if test="startingFare != null">#{startingFare},</if>
-            <if test="startingDistance != null">#{startingDistance},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePosFreight" parameterType="PosFreight">
-        update pos_freight
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="endTime != null">end_time = #{endTime},</if>
-            <if test="freight != null">freight = #{freight},</if>
-            <if test="distance != null">distance = #{distance},</if>
-            <if test="startingFare != null">starting_fare = #{startingFare},</if>
-            <if test="startingDistance != null">starting_distance = #{startingDistance},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePosFreightById" parameterType="Long">
-        delete from pos_freight where id = #{id}
-    </delete>
-
-    <delete id="deletePosFreightByIds" parameterType="String">
-        delete from pos_freight where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/PosMarginMapper.xml

@@ -1,66 +0,0 @@
-<?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.PosMarginMapper">
-    
-    <resultMap type="PosMargin" id="PosMarginResult">
-        <result property="id"    column="id"    />
-        <result property="type"    column="type"    />
-        <result property="amount"    column="amount"    />
-        <result property="illustrate"    column="illustrate"    />
-    </resultMap>
-
-    <sql id="selectPosMarginVo">
-        select id, type, amount, illustrate from pos_margin
-    </sql>
-
-    <select id="selectPosMarginList" parameterType="PosMargin" resultMap="PosMarginResult">
-        <include refid="selectPosMarginVo"/>
-        <where>  
-            <if test="type != null "> and type = #{type}</if>
-            <if test="amount != null "> and amount = #{amount}</if>
-            <if test="illustrate != null  and illustrate != ''"> and illustrate = #{illustrate}</if>
-        </where>
-    </select>
-    
-    <select id="selectPosMarginById" parameterType="Long" resultMap="PosMarginResult">
-        <include refid="selectPosMarginVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertPosMargin" parameterType="PosMargin" useGeneratedKeys="true" keyProperty="id">
-        insert into pos_margin
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="type != null">type,</if>
-            <if test="amount != null">amount,</if>
-            <if test="illustrate != null">illustrate,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="type != null">#{type},</if>
-            <if test="amount != null">#{amount},</if>
-            <if test="illustrate != null">#{illustrate},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePosMargin" parameterType="PosMargin">
-        update pos_margin
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="type != null">type = #{type},</if>
-            <if test="amount != null">amount = #{amount},</if>
-            <if test="illustrate != null">illustrate = #{illustrate},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePosMarginById" parameterType="Long">
-        delete from pos_margin where id = #{id}
-    </delete>
-
-    <delete id="deletePosMarginByIds" parameterType="String">
-        delete from pos_margin where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/PosOrderRatingMapper.xml

@@ -1,105 +0,0 @@
-<?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.PosOrderRatingMapper">
-
-    <resultMap type="PosOrderRating" id="PosOrderRatingResult">
-        <result property="id"    column="id"    />
-        <result property="ddId"    column="dd_id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="qsId"    column="qs_id"    />
-        <result property="qsStars"    column="qs_stars"    />
-        <result property="qsComment"    column="qs_comment"    />
-        <result property="qsImage"    column="qs_image"    />
-        <result property="mdId"    column="md_id"    />
-        <result property="mdStars"    column="md_stars"    />
-        <result property="mdComment"    column="md_comment"    />
-        <result property="mdImage"    column="md_image"    />
-        <result property="createTime"    column="create_time"    />
-    </resultMap>
-
-    <sql id="selectPosOrderRatingVo">
-        select id, dd_id, user_id, qs_id, qs_stars, qs_comment, qs_image, md_id, md_stars, md_comment, md_image, create_time from pos_order_rating
-    </sql>
-
-    <select id="selectPosOrderRatingList" parameterType="PosOrderRating" resultMap="PosOrderRatingResult">
-        <include refid="selectPosOrderRatingVo"/>
-        <where>
-            <if test="ddId != null "> and dd_id = #{ddId}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="qsId != null "> and qs_id = #{qsId}</if>
-            <if test="qsStars != null  and qsStars != ''"> and qs_stars = #{qsStars}</if>
-            <if test="qsComment != null  and qsComment != ''"> and qs_comment = #{qsComment}</if>
-            <if test="qsImage != null  and qsImage != ''"> and qs_image = #{qsImage}</if>
-            <if test="mdId != null "> and md_id = #{mdId}</if>
-            <if test="mdStars != null  and mdStars != ''"> and md_stars = #{mdStars}</if>
-            <if test="mdComment != null  and mdComment != ''"> and md_comment = #{mdComment}</if>
-            <if test="mdImage != null  and mdImage != ''"> and md_image = #{mdImage}</if>
-        </where>
-    </select>
-
-    <select id="selectPosOrderRatingById" parameterType="Long" resultMap="PosOrderRatingResult">
-        <include refid="selectPosOrderRatingVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertPosOrderRating" parameterType="PosOrderRating" useGeneratedKeys="true" keyProperty="id">
-        insert into pos_order_rating
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ddId != null">dd_id,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="qsId != null">qs_id,</if>
-            <if test="qsStars != null">qs_stars,</if>
-            <if test="qsComment != null">qs_comment,</if>
-            <if test="qsImage != null">qs_image,</if>
-            <if test="mdId != null">md_id,</if>
-            <if test="mdStars != null">md_stars,</if>
-            <if test="mdComment != null">md_comment,</if>
-            <if test="mdImage != null">md_image,</if>
-            <if test="createTime != null">create_time,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ddId != null">#{ddId},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="qsId != null">#{qsId},</if>
-            <if test="qsStars != null">#{qsStars},</if>
-            <if test="qsComment != null">#{qsComment},</if>
-            <if test="qsImage != null">#{qsImage},</if>
-            <if test="mdId != null">#{mdId},</if>
-            <if test="mdStars != null">#{mdStars},</if>
-            <if test="mdComment != null">#{mdComment},</if>
-            <if test="mdImage != null">#{mdImage},</if>
-            <if test="createTime != null">#{createTime},</if>
-        </trim>
-    </insert>
-
-    <update id="updatePosOrderRating" parameterType="PosOrderRating">
-        update pos_order_rating
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="ddId != null">dd_id = #{ddId},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="qsId != null">qs_id = #{qsId},</if>
-            <if test="qsStars != null">qs_stars = #{qsStars},</if>
-            <if test="qsComment != null">qs_comment = #{qsComment},</if>
-            <if test="qsImage != null">qs_image = #{qsImage},</if>
-            <if test="mdId != null">md_id = #{mdId},</if>
-            <if test="mdStars != null">md_stars = #{mdStars},</if>
-            <if test="mdComment != null">md_comment = #{mdComment},</if>
-            <if test="mdImage != null">md_image = #{mdImage},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePosOrderRatingById" parameterType="Long">
-        delete from pos_order_rating where id = #{id}
-    </delete>
-
-    <delete id="deletePosOrderRatingByIds" parameterType="String">
-        delete from pos_order_rating where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/PosReviewMapper.xml

@@ -1,98 +0,0 @@
-<?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.PosReviewMapper">
-
-    <resultMap type="PosReview" id="PosReviewResult">
-        <result property="id" column="id"/>
-        <result property="ddId" column="dd_id"/>
-        <result property="score" column="score"/>
-        <result property="cretim" column="cretim"/>
-        <result property="content" column="content"/>
-        <result property="userId" column="user_id"/>
-        <result property="anonymous" column="anonymous"/>
-        <result property="images" column="images"/>
-    </resultMap>
-
-    <sql id="selectPosReviewVo">
-        select id,
-               dd_id,
-               score,
-               cretim,
-               content,
-               user_id,
-               anonymous,
-               images
-        from pos_review
-    </sql>
-
-    <select id="selectPosReviewList" parameterType="PosReview" resultMap="PosReviewResult">
-        <include refid="selectPosReviewVo"/>
-        <where>
-            <if test="ddId != null ">and dd_id = #{ddId}</if>
-            <if test="score != null ">and score = #{score}</if>
-            <if test="cretim != null ">
-                AND DATE(cretim) = DATE(#{cretim})
-            </if>
-            <if test="content != null  and content != ''">and content = #{content}</if>
-            <if test="userId != null ">and user_id = #{userId}</if>
-            <if test="anonymous != null ">and anonymous = #{anonymous}</if>
-            <if test="images != null ">and images = #{images}</if>
-        </where>
-    </select>
-
-    <select id="selectPosReviewById" parameterType="Long" resultMap="PosReviewResult">
-        <include refid="selectPosReviewVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertPosReview" parameterType="PosReview" useGeneratedKeys="true" keyProperty="id">
-        insert into pos_review
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ddId != null">dd_id,</if>
-            <if test="score != null">score,</if>
-            <if test="cretim != null">cretim,</if>
-            <if test="content != null">content,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="anonymous != null">anonymous,</if>
-            <if test="images != null">images,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ddId != null">#{ddId},</if>
-            <if test="score != null">#{score},</if>
-            <if test="cretim != null">#{cretim},</if>
-            <if test="content != null">#{content},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="anonymous != null">#{anonymous},</if>
-            <if test="images != null">#{images},</if>
-        </trim>
-    </insert>
-
-    <update id="updatePosReview" parameterType="PosReview">
-        update pos_review
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="ddId != null">dd_id = #{ddId},</if>
-            <if test="score != null">score = #{score},</if>
-            <if test="cretim != null">cretim = #{cretim},</if>
-            <if test="content != null">content = #{content},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="anonymous != null">anonymous = #{anonymous},</if>
-            <if test="images != null">images = #{images},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePosReviewById" parameterType="Long">
-        delete
-        from pos_review
-        where id = #{id}
-    </delete>
-
-    <delete id="deletePosReviewByIds" parameterType="String">
-        delete from pos_review where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/PoseOrderZalopayMapper.xml

@@ -1,89 +0,0 @@
-<?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.PoseOrderZalopayMapper">
-
-    <resultMap type="PoseOrderZalopay" id="PoseOrderZalopayResult">
-        <result property="id"    column="id"    />
-        <result property="ddId"    column="dd_id"    />
-        <result property="callbackResponse"    column="callback_response"    />
-        <result property="refundResponse"    column="refund_response"    />
-        <result property="callbackResponseTime"    column="callback_response_time"    />
-        <result property="refundResponseTime"    column="refund_response_time"    />
-        <result property="createResponse"    column="create_response"    />
-        <result property="createResponseTime"    column="create_response_time"    />
-        <result property="mRefundId"    column="m_refund_id"    />
-    </resultMap>
-
-    <sql id="selectPoseOrderZalopayVo">
-        select id, dd_id, callback_response, refund_response, callback_response_time, refund_response_time, create_response, create_response_time,m_refund_id from pose_order_zaloPay
-    </sql>
-
-    <select id="selectPoseOrderZalopayList" parameterType="PoseOrderZalopay" resultMap="PoseOrderZalopayResult">
-        <include refid="selectPoseOrderZalopayVo"/>
-        <where>
-            <if test="callbackResponse != null  and callbackResponse != ''"> and callback_response = #{callbackResponse}</if>
-            <if test="refundResponse != null  and refundResponse != ''"> and refund_response = #{refundResponse}</if>
-            <if test="callbackResponseTime != null "> and callback_response_time = #{callbackResponseTime}</if>
-            <if test="refundResponseTime != null "> and refund_response_time = #{refundResponseTime}</if>
-            <if test="createResponse != null  and createResponse != ''"> and create_response = #{createResponse}</if>
-            <if test="createResponseTime != null "> and create_response_time = #{createResponseTime}</if>
-        </where>
-    </select>
-
-    <select id="selectPoseOrderZalopayById" parameterType="Long" resultMap="PoseOrderZalopayResult">
-        <include refid="selectPoseOrderZalopayVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertPoseOrderZalopay" parameterType="PoseOrderZalopay" useGeneratedKeys="true" keyProperty="id">
-        insert into pose_order_zaloPay
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ddId != null">dd_id,</if>
-            <if test="callbackResponse != null">callback_response,</if>
-            <if test="refundResponse != null">refund_response,</if>
-            <if test="callbackResponseTime != null">callback_response_time,</if>
-            <if test="refundResponseTime != null">refund_response_time,</if>
-            <if test="createResponse != null">create_response,</if>
-            <if test="createResponseTime != null">create_response_time,</if>
-            <if test="mRefundId != null">m_refund_id,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ddId != null">#{ddId},</if>
-            <if test="callbackResponse != null">#{callbackResponse},</if>
-            <if test="refundResponse != null">#{refundResponse},</if>
-            <if test="callbackResponseTime != null">#{callbackResponseTime},</if>
-            <if test="refundResponseTime != null">#{refundResponseTime},</if>
-            <if test="createResponse != null">#{createResponse},</if>
-            <if test="createResponseTime != null">#{createResponseTime},</if>
-            <if test="mRefundId != null">#{mRefundId},</if>
-        </trim>
-    </insert>
-
-    <update id="updatePoseOrderZalopay" parameterType="PoseOrderZalopay">
-        update pose_order_zaloPay
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="ddId != null">dd_id = #{ddId},</if>
-            <if test="callbackResponse != null">callback_response = #{callbackResponse},</if>
-            <if test="refundResponse != null">refund_response = #{refundResponse},</if>
-            <if test="callbackResponseTime != null">callback_response_time = #{callbackResponseTime},</if>
-            <if test="refundResponseTime != null">refund_response_time = #{refundResponseTime},</if>
-            <if test="createResponse != null">create_response = #{createResponse},</if>
-            <if test="createResponseTime != null">create_response_time = #{createResponseTime},</if>
-            <if test="mRefundId != null">m_refund_id = #{mRefundId},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePoseOrderZalopayById" parameterType="Long">
-        delete from pose_order_zaloPay where id = #{id}
-    </delete>
-
-    <delete id="deletePoseOrderZalopayByIds" parameterType="String">
-        delete from pose_order_zaloPay where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/PushMessageMapper.xml

@@ -1,76 +0,0 @@
-<?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.PushMessageMapper">
-
-    <resultMap type="PushMessage" id="PushMessageResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="title"    column="title"    />
-        <result property="content"    column="content"    />
-        <result property="body"    column="body"    />
-        <result property="time"    column="time"    />
-    </resultMap>
-
-    <sql id="selectPushMessageVo">
-        select id, user_id, title, content, body, time from push_message
-    </sql>
-
-    <select id="selectPushMessageList" parameterType="PushMessage" resultMap="PushMessageResult">
-        <include refid="selectPushMessageVo"/>
-        <where>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="title != null  and title != ''"> and title = #{title}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="body != null  and body != ''"> and body = #{body}</if>
-            <if test="time != null "> and time = #{time}</if>
-        </where>
-    </select>
-
-    <select id="selectPushMessageById" parameterType="Long" resultMap="PushMessageResult">
-        <include refid="selectPushMessageVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertPushMessage" parameterType="PushMessage" useGeneratedKeys="true" keyProperty="id">
-        insert into push_message
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="title != null">title,</if>
-            <if test="content != null">content,</if>
-            <if test="body != null">body,</if>
-            <if test="time != null">time,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="title != null">#{title},</if>
-            <if test="content != null">#{content},</if>
-            <if test="body != null">#{body},</if>
-            <if test="time != null">#{time},</if>
-        </trim>
-    </insert>
-
-    <update id="updatePushMessage" parameterType="PushMessage">
-        update push_message
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="title != null">title = #{title},</if>
-            <if test="content != null">content = #{content},</if>
-            <if test="body != null">body = #{body},</if>
-            <if test="time != null">time = #{time},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePushMessageById" parameterType="Long">
-        delete from push_message where id = #{id}
-    </delete>
-
-    <delete id="deletePushMessageByIds" parameterType="String">
-        delete from push_message where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/RiderPositionMapper.xml

@@ -1,78 +0,0 @@
-<?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.RiderPositionMapper">
-    
-    <resultMap type="RiderPosition" id="RiderPositionResult">
-        <result property="id"    column="id"    />
-        <result property="riderId"    column="rider_id"    />
-        <result property="longitude"    column="longitude"    />
-        <result property="latitude"    column="latitude"    />
-        <result property="notes"    column="notes"    />
-        <result property="cid"    column="cid"    />
-    </resultMap>
-
-    <sql id="selectRiderPositionVo">
-        select id, rider_id, longitude, latitude, notes,cid from rider_position
-    </sql>
-
-    <select id="selectRiderPositionList" parameterType="RiderPosition" resultMap="RiderPositionResult">
-        <include refid="selectRiderPositionVo"/>
-        <where>  
-            <if test="riderId != null "> and rider_id = #{riderId}</if>
-            <if test="longitude != null "> and longitude = #{longitude}</if>
-            <if test="latitude != null "> and latitude = #{latitude}</if>
-            <if test="notes != null  and notes != ''"> and notes = #{notes}</if>
-            <if test="cid != null  and cid != ''"> and cid = #{cid}</if>
-        </where>
-    </select>
-    
-    <select id="selectRiderPositionById" parameterType="Long" resultMap="RiderPositionResult">
-        <include refid="selectRiderPositionVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertRiderPosition" parameterType="RiderPosition">
-        insert into rider_position
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="riderId != null">rider_id,</if>
-            <if test="longitude != null">longitude,</if>
-            <if test="latitude != null">latitude,</if>
-            <if test="notes != null">notes,</if>
-            <if test="cid != null">cid,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="riderId != null">#{riderId},</if>
-            <if test="longitude != null">#{longitude},</if>
-            <if test="latitude != null">#{latitude},</if>
-            <if test="notes != null">#{notes},</if>
-            <if test="cid != null">#{cid},</if>
-         </trim>
-    </insert>
-
-    <update id="updateRiderPosition" parameterType="RiderPosition">
-        update rider_position
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="riderId != null">rider_id = #{riderId},</if>
-            <if test="longitude != null">longitude = #{longitude},</if>
-            <if test="latitude != null">latitude = #{latitude},</if>
-            <if test="notes != null">notes = #{notes},</if>
-            <if test="cid != null">cid = #{cid},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteRiderPositionById" parameterType="Long">
-        delete from rider_position where id = #{id}
-    </delete>
-
-    <delete id="deleteRiderPositionByIds" parameterType="String">
-        delete from rider_position where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/SalesPromotionMapper.xml

@@ -1,128 +0,0 @@
-<?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.SalesPromotionMapper">
-
-    <resultMap type="SalesPromotion" id="SalesPromotionResult">
-        <result property="id"    column="id"    />
-        <result property="salesName"    column="sales_name"    />
-        <result property="salesType"    column="sales_type"    />
-        <result property="salesReduction"    column="sales_reduction"    />
-        <result property="shId"    column="sh_id"    />
-        <result property="spId"    column="sp_id"    />
-        <result property="salesCondition"    column="sales_condition"    />
-        <result property="salesFund"    column="sales_fund"    />
-        <result property="endTime"    column="end_time"    />
-        <result property="salesState"    column="sales_state"    />
-        <result property="illustrate"    column="illustrate"    />
-        <result property="poster"    column="poster"    />
-        <result property="language"    column="language"    />
-        <result property="deleted"    column="deleted"    />
-        <result property="type"    column="type"    />
-    </resultMap>
-
-    <sql id="selectSalesPromotionVo">
-        select id, sales_name, sales_type, sales_reduction, sh_id, sp_id, sales_condition, sales_fund,
-               end_time, sales_state, illustrate, poster, language, deleted,type
-        from sales_promotion
-    </sql>
-
-    <select id="selectSalesPromotionList" parameterType="SalesPromotion" resultMap="SalesPromotionResult">
-        <include refid="selectSalesPromotionVo"/>
-        <where>
-            deleted !='1' and  type='0'
-            <if test="salesName != null  and salesName != ''"> and BINARY sales_name like concat('%', #{salesName}, '%')</if>
-            <if test="salesType != null  and salesType != ''"> and sales_type = #{salesType}</if>
-            <if test="salesReduction != null "> and sales_reduction = #{salesReduction}</if>
-            <if test="shId != null "> and sh_id = #{shId}</if>
-            <if test="spId != null "> and sp_id = #{spId}</if>
-            <if test="salesCondition != null "> and sales_condition = #{salesCondition}</if>
-            <if test="salesFund != null "> and sales_fund = #{salesFund}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
-            <if test="salesState != null  and salesState != ''"> and sales_state = #{salesState}</if>
-            <if test="illustrate != null  and illustrate != ''"> and illustrate = #{illustrate}</if>
-            <if test="poster != null  and poster != ''"> and poster = #{poster}</if>
-            <if test="language != null  and language != ''"> and language = #{language}</if>
-            <if test="deleted != null  and deleted != ''"> and deleted = #{deleted}</if>
-            <!-- 默认查询未删除的数据 -->
-            <if test="deleted == null or deleted == ''"> and (deleted = '0' or deleted is null)</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-        </where>
-    </select>
-
-    <select id="selectSalesPromotionById" parameterType="Long" resultMap="SalesPromotionResult">
-        <include refid="selectSalesPromotionVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertSalesPromotion" parameterType="SalesPromotion" useGeneratedKeys="true" keyProperty="id">
-        insert into sales_promotion
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="salesName != null">sales_name,</if>
-            <if test="salesType != null">sales_type,</if>
-            <if test="salesReduction != null">sales_reduction,</if>
-            <if test="shId != null">sh_id,</if>
-            <if test="spId != null">sp_id,</if>
-            <if test="salesCondition != null">sales_condition,</if>
-            <if test="salesFund != null">sales_fund,</if>
-            <if test="endTime != null">end_time,</if>
-            <if test="salesState != null">sales_state,</if>
-            <if test="illustrate != null">illustrate,</if>
-            <if test="poster != null">poster,</if>
-            <if test="language != null">language,</if>
-            <if test="deleted != null">deleted,</if>
-            <if test="type != null">type,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="salesName != null">#{salesName},</if>
-            <if test="salesType != null">#{salesType},</if>
-            <if test="salesReduction != null">#{salesReduction},</if>
-            <if test="shId != null">#{shId},</if>
-            <if test="spId != null">#{spId},</if>
-            <if test="salesCondition != null">#{salesCondition},</if>
-            <if test="salesFund != null">#{salesFund},</if>
-            <if test="endTime != null">#{endTime},</if>
-            <if test="salesState != null">#{salesState},</if>
-            <if test="illustrate != null">#{illustrate},</if>
-            <if test="poster != null">#{poster},</if>
-            <if test="language != null">#{language},</if>
-            <if test="deleted != null">#{deleted},</if>
-            <if test="type != null">#{type},</if>
-        </trim>
-    </insert>
-
-    <update id="updateSalesPromotion" parameterType="SalesPromotion">
-        update sales_promotion
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="salesName != null">sales_name = #{salesName},</if>
-            <if test="salesType != null">sales_type = #{salesType},</if>
-            <if test="salesReduction != null">sales_reduction = #{salesReduction},</if>
-            <if test="shId != null">sh_id = #{shId},</if>
-            <if test="spId != null">sp_id = #{spId},</if>
-            <if test="salesCondition != null">sales_condition = #{salesCondition},</if>
-            <if test="salesFund != null">sales_fund = #{salesFund},</if>
-            <if test="endTime != null">end_time = #{endTime},</if>
-            <if test="salesState != null">sales_state = #{salesState},</if>
-            <if test="illustrate != null">illustrate = #{illustrate},</if>
-            <if test="poster != null">poster = #{poster},</if>
-            <if test="language != null">language = #{language},</if>
-            <if test="deleted != null">deleted = #{deleted},</if>
-            <if test="type != null">type = #{type},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <!-- 修改为逻辑删除，将deleted设置为"1" -->
-    <update id="deleteSalesPromotionById" parameterType="Long">
-        update sales_promotion set deleted = '1' where id = #{id}
-    </update>
-
-    <!-- 修改为逻辑删除，将deleted设置为"1" -->
-    <update id="deleteSalesPromotionByIds" parameterType="String">
-        update sales_promotion set deleted = '1' where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-</mapper>

ruoyi-system/target/classes/mapper/system/ServiceTypeMapper.xml

@@ -1,99 +0,0 @@
-<?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.ServiceTypeMapper">
-    
-    <resultMap type="ServiceType" id="ServiceTypeResult">
-        <result property="id"    column="id"    />
-        <result property="image"    column="image"    />
-        <result property="nameCn"    column="name_cn"    />
-        <result property="illustrateCn"    column="illustrate_cn"    />
-        <result property="nameVi"    column="name_vi"    />
-        <result property="illustrateVi"    column="illustrate_vi"    />
-        <result property="nameEn"    column="name_en"    />
-        <result property="illustrateEn"    column="illustrate_en"    />
-        <result property="nameTw"    column="name_tw"    />
-        <result property="illustrateTw"    column="illustrate_tw"    />
-        <result property="width"    column="width"    />
-        <result property="height"    column="height"    />
-    </resultMap>
-
-    <sql id="selectServiceTypeVo">
-        select id, image, name_cn, illustrate_cn, name_vi, illustrate_vi, name_en, illustrate_en, name_tw, illustrate_tw, width, height from service_type
-    </sql>
-
-    <select id="selectServiceTypeList" parameterType="ServiceType" resultMap="ServiceTypeResult">
-        <include refid="selectServiceTypeVo"/>
-        <where>  
-            <if test="nameCn != null  and nameCn != ''"> and name_cn = #{nameCn}</if>
-            <if test="nameVi != null  and nameVi != ''"> and name_vi = #{nameVi}</if>
-            <if test="nameEn != null  and nameEn != ''"> and name_en = #{nameEn}</if>
-            <if test="nameTw != null  and nameTw != ''"> and name_tw = #{nameTw}</if>
-        </where>
-    </select>
-    
-    <select id="selectServiceTypeById" parameterType="Long" resultMap="ServiceTypeResult">
-        <include refid="selectServiceTypeVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertServiceType" parameterType="ServiceType" useGeneratedKeys="true" keyProperty="id">
-        insert into service_type
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="image != null">image,</if>
-            <if test="nameCn != null">name_cn,</if>
-            <if test="illustrateCn != null">illustrate_cn,</if>
-            <if test="nameVi != null">name_vi,</if>
-            <if test="illustrateVi != null">illustrate_vi,</if>
-            <if test="nameEn != null">name_en,</if>
-            <if test="illustrateEn != null">illustrate_en,</if>
-            <if test="nameTw != null">name_tw,</if>
-            <if test="illustrateTw != null">illustrate_tw,</if>
-            <if test="width != null">width,</if>
-            <if test="height != null">height,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="image != null">#{image},</if>
-            <if test="nameCn != null">#{nameCn},</if>
-            <if test="illustrateCn != null">#{illustrateCn},</if>
-            <if test="nameVi != null">#{nameVi},</if>
-            <if test="illustrateVi != null">#{illustrateVi},</if>
-            <if test="nameEn != null">#{nameEn},</if>
-            <if test="illustrateEn != null">#{illustrateEn},</if>
-            <if test="nameTw != null">#{nameTw},</if>
-            <if test="illustrateTw != null">#{illustrateTw},</if>
-            <if test="width != null">#{width},</if>
-            <if test="height != null">#{height},</if>
-         </trim>
-    </insert>
-
-    <update id="updateServiceType" parameterType="ServiceType">
-        update service_type
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="image != null">image = #{image},</if>
-            <if test="nameCn != null">name_cn = #{nameCn},</if>
-            <if test="illustrateCn != null">illustrate_cn = #{illustrateCn},</if>
-            <if test="nameVi != null">name_vi = #{nameVi},</if>
-            <if test="illustrateVi != null">illustrate_vi = #{illustrateVi},</if>
-            <if test="nameEn != null">name_en = #{nameEn},</if>
-            <if test="illustrateEn != null">illustrate_en = #{illustrateEn},</if>
-            <if test="nameTw != null">name_tw = #{nameTw},</if>
-            <if test="illustrateTw != null">illustrate_tw = #{illustrateTw},</if>
-            <if test="width != null">width = #{width},</if>
-            <if test="height != null">height = #{height},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteServiceTypeById" parameterType="Long">
-        delete from service_type where id = #{id}
-    </delete>
-
-    <delete id="deleteServiceTypeByIds" parameterType="String">
-        delete from service_type where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/SysAdsMapper.xml

@@ -1,89 +0,0 @@
-<?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.SysAdsMapper">
-
-    <resultMap type="SysAds" id="SysAdsResult">
-        <result property="id"    column="id"    />
-        <result property="poster"    column="poster"    />
-        <result property="redirect"    column="redirect"    />
-        <result property="status"    column="status"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="deleted"    column="deleted"    />
-        <result property="remark"    column="remark"    />
-        <result property="sort"    column="sort"    />
-    </resultMap>
-
-    <sql id="selectSysAdsVo">
-        select id, poster, redirect, status, create_time, update_time, deleted, remark,sort from sys_ads
-    </sql>
-
-    <select id="selectSysAdsList" parameterType="SysAds" resultMap="SysAdsResult">
-        <include refid="selectSysAdsVo"/>
-        <where>
-            <if test="poster != null  and poster != ''"> and poster = #{poster}</if>
-            <if test="redirect != null  and redirect != ''"> and redirect = #{redirect}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="deleted != null  and deleted != ''"> and deleted = #{deleted}</if>
-        </where>
-    </select>
-
-    <select id="selectSysAdsById" parameterType="Long" resultMap="SysAdsResult">
-        <include refid="selectSysAdsVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertSysAds" parameterType="SysAds">
-        insert into sys_ads
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="poster != null and poster != ''">poster,</if>
-            <if test="redirect != null">redirect,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="deleted != null and deleted != ''">deleted,</if>
-            <if test="remark != null">remark,</if>
-            <if test="sort != null">sort,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="poster != null and poster != ''">#{poster},</if>
-            <if test="redirect != null">#{redirect},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="deleted != null and deleted != ''">#{deleted},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="sort != null">#{sort},</if>
-        </trim>
-    </insert>
-
-    <update id="updateSysAds" parameterType="SysAds">
-        update sys_ads
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="poster != null and poster != ''">poster = #{poster},</if>
-            <if test="redirect != null">redirect = #{redirect},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="deleted != null and deleted != ''">deleted = #{deleted},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="sort != null">sort = #{sort},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSysAdsById" parameterType="Long">
-        update sys_ads set deleted = '1' where id = #{id}
-    </delete>
-
-    <delete id="deleteSysAdsByIds" parameterType="String">
-        update sys_ads set deleted = '1' where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/SysConfigMapper.xml

@@ -1,117 +0,0 @@
-<?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>
-    
-</mapper>

ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml

@@ -1,159 +0,0 @@
-<?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">
-		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
-			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
-		from sys_dept d
-		where d.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>
-	
-	<delete id="deleteDeptById" parameterType="Long">
-		update sys_dept set del_flag = '2' where dept_id = #{deptId}
-	</delete>
-
-</mapper> 

ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml

@@ -1,124 +0,0 @@
-<?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="SysDictData" 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> 

ruoyi-system/target/classes/mapper/system/SysDictTypeMapper.xml

@@ -1,105 +0,0 @@
-<?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>
-	
-</mapper> 

ruoyi-system/target/classes/mapper/system/SysFeedbackMapper.xml

@@ -1,99 +0,0 @@
-<?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.SysFeedbackMapper">
-    
-    <resultMap type="SysFeedback" id="SysFeedbackResult">
-        <result property="id"    column="id"    />
-        <result property="cretim"    column="cretim"    />
-        <result property="userId"    column="user_id"    />
-        <result property="content"    column="content"    />
-    </resultMap>
-
-    <resultMap id="SysFeedbackSysResponseResult" type="SysFeedback" extends="SysFeedbackResult">
-        <collection property="sysResponseList" notNullColumn="sub_id" javaType="java.util.List" resultMap="SysResponseResult" />
-    </resultMap>
-
-    <resultMap type="SysResponse" id="SysResponseResult">
-        <result property="id"    column="sub_id"    />
-        <result property="cretim"    column="sub_cretim"    />
-        <result property="feId"    column="sub_fe_id"    />
-        <result property="content"    column="sub_content"    />
-    </resultMap>
-
-    <sql id="selectSysFeedbackVo">
-        select id, cretim, user_id, content from sys_feedback
-    </sql>
-
-    <select id="selectSysFeedbackList" parameterType="SysFeedback" resultMap="SysFeedbackResult">
-        <include refid="selectSysFeedbackVo"/>
-        <where>  
-            <if test="cretim != null "> and cretim = #{cretim}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-        </where>
-        order by id desc
-    </select>
-    
-    <select id="selectSysFeedbackById" parameterType="Long" resultMap="SysFeedbackSysResponseResult">
-        select a.id, a.cretim, a.user_id, a.content,
- b.id as sub_id, b.cretim as sub_cretim, b.fe_id as sub_fe_id, b.content as sub_content
-        from sys_feedback a
-        left join sys_response b on b.fe_id = a.id
-        where a.id = #{id}
-    </select>
-        
-    <insert id="insertSysFeedback" parameterType="SysFeedback" useGeneratedKeys="true" keyProperty="id">
-        insert into sys_feedback
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="cretim != null">cretim,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="content != null and content != ''">content,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="cretim != null">#{cretim},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="content != null and content != ''">#{content},</if>
-         </trim>
-    </insert>
-
-    <update id="updateSysFeedback" parameterType="SysFeedback">
-        update sys_feedback
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="cretim != null">cretim = #{cretim},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="content != null and content != ''">content = #{content},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSysFeedbackById" parameterType="Long">
-        delete from sys_feedback where id = #{id}
-    </delete>
-
-    <delete id="deleteSysFeedbackByIds" parameterType="String">
-        delete from sys_feedback where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-    
-    <delete id="deleteSysResponseByFeIds" parameterType="String">
-        delete from sys_response where fe_id in 
-        <foreach item="feId" collection="array" open="(" separator="," close=")">
-            #{feId}
-        </foreach>
-    </delete>
-
-    <delete id="deleteSysResponseByFeId" parameterType="Long">
-        delete from sys_response where fe_id = #{feId}
-    </delete>
-
-    <insert id="batchSysResponse">
-        insert into sys_response( id, cretim, fe_id, content) values
-		<foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.id}, #{item.cretim}, #{item.feId}, #{item.content})
-        </foreach>
-    </insert>
-</mapper>

ruoyi-system/target/classes/mapper/system/SysHelpMapper.xml

@@ -1,62 +0,0 @@
-<?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.SysHelpMapper">
-    
-    <resultMap type="SysHelp" id="SysHelpResult">
-        <result property="id"    column="id"    />
-        <result property="title"    column="title"    />
-        <result property="content"    column="content"    />
-    </resultMap>
-
-    <sql id="selectSysHelpVo">
-        select id, title, content from sys_help
-    </sql>
-
-    <select id="selectSysHelpList" parameterType="SysHelp" resultMap="SysHelpResult">
-        <include refid="selectSysHelpVo"/>
-        <where>  
-            <if test="title != null  and title != ''"> and title = #{title}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-        </where>
-        order by id desc
-    </select>
-    
-    <select id="selectSysHelpById" parameterType="Long" resultMap="SysHelpResult">
-        <include refid="selectSysHelpVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertSysHelp" parameterType="SysHelp" useGeneratedKeys="true" keyProperty="id">
-        insert into sys_help
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="title != null">title,</if>
-            <if test="content != null">content,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="title != null">#{title},</if>
-            <if test="content != null">#{content},</if>
-         </trim>
-    </insert>
-
-    <update id="updateSysHelp" parameterType="SysHelp">
-        update sys_help
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="title != null">title = #{title},</if>
-            <if test="content != null">content = #{content},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSysHelpById" parameterType="Long">
-        delete from sys_help where id = #{id}
-    </delete>
-
-    <delete id="deleteSysHelpByIds" parameterType="String">
-        delete from sys_help where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/SysLogininforMapper.xml

@@ -1,57 +0,0 @@
-<?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="loginLocation" column="login_location"    />
-		<result property="browser"       column="browser"           />
-		<result property="os"            column="os"                />
-		<result property="msg"           column="msg"               />
-		<result property="loginTime"     column="login_time"        />
-	</resultMap>
-
-	<insert id="insertLogininfor" parameterType="SysLogininfor">
-		insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
-		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
-	</insert>
-	
-	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
-		select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_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 login_time &gt;= #{params.beginTime}
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND login_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> 

ruoyi-system/target/classes/mapper/system/SysMenuMapper.xml

@@ -1,202 +0,0 @@
-<?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="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`, 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.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.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.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>
-	
-	<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="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="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="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>
-	
-	<delete id="deleteMenuById" parameterType="Long">
-	    delete from sys_menu where menu_id = #{menuId}
-	</delete>
-
-</mapper> 

ruoyi-system/target/classes/mapper/system/SysNoticeMapper.xml

@@ -1,90 +0,0 @@
-<?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>
-    
-</mapper>

ruoyi-system/target/classes/mapper/system/SysOperLogMapper.xml

@@ -1,84 +0,0 @@
-<?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="operLocation"   column="oper_location"  />
-		<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_location, 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_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
-        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
-	</insert>
-	
-	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
-		<include refid="selectOperLogVo"/>
-		<where>
-			<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> 

ruoyi-system/target/classes/mapper/system/SysPointControlMapper.xml

@@ -1,80 +0,0 @@
-<?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.SysPointControlMapper">
-
-    <resultMap type="SysPointControl" id="SysReviewControlResult">
-        <result property="id"    column="id"    />
-        <result property="reviewEnable"    column="review_enable"    />
-        <result property="orderCondition"    column="order_condition"    />
-        <result property="reviewPoints"    column="review_points"    />
-        <result property="vndPerpoint"    column="vnd_perpoint"    />
-        <result property="orderUseEnable"    column="order_use_enable"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectSysReviewControlVo">
-        select id, review_enable, order_condition, review_points, vnd_perpoint, order_use_enable, update_time from sys_point_control
-    </sql>
-
-    <select id="selectSysReviewControlList" parameterType="SysPointControl" resultMap="SysReviewControlResult">
-        <include refid="selectSysReviewControlVo"/>
-        <where>
-            <if test="reviewEnable != null "> and review_enable = #{reviewEnable}</if>
-            <if test="orderCondition != null "> and order_condition = #{orderCondition}</if>
-            <if test="reviewPoints != null "> and review_points = #{reviewPoints}</if>
-            <if test="vndPerpoint != null "> and vnd_perpoint = #{vndPerpoint}</if>
-            <if test="orderUseEnable != null "> and order_use_enable = #{orderUseEnable}</if>
-        </where>
-    </select>
-
-    <select id="selectSysReviewControlById" parameterType="Long" resultMap="SysReviewControlResult">
-        <include refid="selectSysReviewControlVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertSysReviewControl" parameterType="SysPointControl" useGeneratedKeys="true" keyProperty="id">
-        insert into sys_point_control
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="reviewEnable != null">review_enable,</if>
-            <if test="orderCondition != null">order_condition,</if>
-            <if test="reviewPoints != null">review_points,</if>
-            <if test="vndPerpoint != null">vnd_perpoint,</if>
-            <if test="orderUseEnable != null">order_use_enable,</if>
-            <if test="updateTime != null">update_time,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="reviewEnable != null">#{reviewEnable},</if>
-            <if test="orderCondition != null">#{orderCondition},</if>
-            <if test="reviewPoints != null">#{reviewPoints},</if>
-            <if test="vndPerpoint != null">#{vndPerpoint},</if>
-            <if test="orderUseEnable != null">#{orderUseEnable},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-        </trim>
-    </insert>
-
-    <update id="updateSysReviewControl" parameterType="SysPointControl">
-        update sys_point_control
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="reviewEnable != null">review_enable = #{reviewEnable},</if>
-            <if test="orderCondition != null">order_condition = #{orderCondition},</if>
-            <if test="reviewPoints != null">review_points = #{reviewPoints},</if>
-            <if test="vndPerpoint != null">vnd_perpoint = #{vndPerpoint},</if>
-            <if test="orderUseEnable != null">order_use_enable = #{orderUseEnable},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSysReviewControlById" parameterType="Long">
-        delete from sys_point_control where id = #{id}
-    </delete>
-
-    <delete id="deleteSysReviewControlByIds" parameterType="String">
-        delete from sys_point_control where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/SysPointTierMapper.xml

@@ -1,79 +0,0 @@
-<?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.SysPointTierMapper">
-
-    <resultMap type="SysPointTier" id="SysPointTierResult">
-        <result property="id"    column="id"    />
-        <result property="points"    column="points"    />
-        <result property="orderCondition"    column="order_condition"    />
-        <result property="isEnabled"    column="is_enabled"    />
-        <result property="isDeleted"    column="is_deleted"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectSysPointTierVo">
-        select id, points, order_condition, is_enabled, is_deleted, create_time, update_time from sys_point_tier
-    </sql>
-
-    <select id="selectSysPointTierList" parameterType="SysPointTier" resultMap="SysPointTierResult">
-        <include refid="selectSysPointTierVo"/>
-        <where>
-            <if test="points != null "> and points = #{points}</if>
-            <if test="orderCondition != null "> and order_condition = #{orderCondition}</if>
-            <if test="isEnabled != null "> and is_enabled = #{isEnabled}</if>
-            <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
-        </where>
-    </select>
-
-    <select id="selectSysPointTierById" parameterType="Long" resultMap="SysPointTierResult">
-        <include refid="selectSysPointTierVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertSysPointTier" parameterType="SysPointTier" useGeneratedKeys="true" keyProperty="id">
-        insert into sys_point_tier
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="points != null">points,</if>
-            <if test="orderCondition != null">order_condition,</if>
-            <if test="isEnabled != null">is_enabled,</if>
-            <if test="isDeleted != null">is_deleted,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="points != null">#{points},</if>
-            <if test="orderCondition != null">#{orderCondition},</if>
-            <if test="isEnabled != null">#{isEnabled},</if>
-            <if test="isDeleted != null">#{isDeleted},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-        </trim>
-    </insert>
-
-    <update id="updateSysPointTier" parameterType="SysPointTier">
-        update sys_point_tier
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="points != null">points = #{points},</if>
-            <if test="orderCondition != null">order_condition = #{orderCondition},</if>
-            <if test="isEnabled != null">is_enabled = #{isEnabled},</if>
-            <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSysPointTierById" parameterType="Long">
-        update sys_point_tier set isDeleted = '1' where id = #{id}
-    </delete>
-
-    <delete id="deleteSysPointTierByIds" parameterType="String">
-        update sys_point_tier set isDeleted = '1' where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/SysPostMapper.xml

@@ -1,122 +0,0 @@
-<?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>
-
-</mapper> 

ruoyi-system/target/classes/mapper/system/SysQiyejieshaoMapper.xml

@@ -1,59 +0,0 @@
-<?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.SysQiyejieshaoMapper">
-    
-    <resultMap type="SysQiyejieshao" id="SysQiyejieshaoResult">
-        <result property="id"    column="id"    />
-        <result property="qiyejiesho"    column="qiyejiesho"    />
-    </resultMap>
-
-    <sql id="selectSysQiyejieshaoVo">
-        select id, qiyejiesho from sys_qiyejieshao
-    </sql>
-
-    <select id="selectSysQiyejieshaoList" parameterType="SysQiyejieshao" resultMap="SysQiyejieshaoResult">
-        <include refid="selectSysQiyejieshaoVo"/>
-        <where>  
-            <if test="qiyejiesho != null  and qiyejiesho != ''"> and qiyejiesho = #{qiyejiesho}</if>
-        </where>
-        order by id desc
-    </select>
-    
-    <select id="selectSysQiyejieshaoById" parameterType="Long" resultMap="SysQiyejieshaoResult">
-        <include refid="selectSysQiyejieshaoVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertSysQiyejieshao" parameterType="SysQiyejieshao">
-        insert into sys_qiyejieshao
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="qiyejiesho != null and qiyejiesho != ''">qiyejiesho,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="qiyejiesho != null and qiyejiesho != ''">#{qiyejiesho},</if>
-         </trim>
-    </insert>
-
-    <update id="updateSysQiyejieshao" parameterType="SysQiyejieshao">
-        update sys_qiyejieshao
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="qiyejiesho != null and qiyejiesho != ''">qiyejiesho = #{qiyejiesho},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSysQiyejieshaoById" parameterType="Long">
-        delete from sys_qiyejieshao where id = #{id}
-    </delete>
-
-    <delete id="deleteSysQiyejieshaoByIds" parameterType="String">
-        delete from sys_qiyejieshao where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/SysRoleDeptMapper.xml

@@ -1,34 +0,0 @@
-<?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>
-	
-</mapper> 

ruoyi-system/target/classes/mapper/system/SysRoleMapper.xml

@@ -1,152 +0,0 @@
-<?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>
- 	
-</mapper> 

ruoyi-system/target/classes/mapper/system/SysRoleMenuMapper.xml

@@ -1,34 +0,0 @@
-<?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>
-	
-</mapper> 

ruoyi-system/target/classes/mapper/system/SysUserMapper.xml

@@ -1,221 +0,0 @@
-<?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="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"    column="dept_id" 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.create_by, u.create_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="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="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 != null and deptId != 0">dept_id = #{deptId},</if>
- 			<if test="userName != null and userName != ''">user_name = #{userName},</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} where user_id = #{userId}
-	</update>
-	
-	<update id="updateUserAvatar" parameterType="SysUser">
- 		update sys_user set avatar = #{avatar} where user_name = #{userName}
-	</update>
-	
-	<update id="resetUserPwd" parameterType="SysUser">
- 		update sys_user set password = #{password} where user_name = #{userName}
-	</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> 

ruoyi-system/target/classes/mapper/system/SysUserPostMapper.xml

@@ -1,34 +0,0 @@
-<?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>
-	
-</mapper> 

ruoyi-system/target/classes/mapper/system/SysUserRoleMapper.xml

@@ -1,44 +0,0 @@
-<?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>
-</mapper> 

ruoyi-system/target/classes/mapper/system/TaxiOrderMapper.xml

@@ -1,145 +0,0 @@
-<?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.TaxiOrderMapper">
-    
-    <resultMap type="TaxiOrder" id="TaxiOrderResult">
-        <result property="id"    column="id"    />
-        <result property="ddId"    column="dd_id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="driverId"    column="driver_id"    />
-        <result property="boardingAddress"    column="boarding_address"    />
-        <result property="intoLongitude"    column="into_longitude"    />
-        <result property="intoLatitude"    column="into_latitude"    />
-        <result property="downAddress"    column="down_address"    />
-        <result property="downLongitude"    column="down_longitude"    />
-        <result property="downLatitude"    column="down_latitude"    />
-        <result property="distance"    column="distance"    />
-        <result property="state"    column="state"    />
-        <result property="taxiType"    column="taxi_type"    />
-        <result property="releaseId"    column="release_id"    />
-        <result property="orderTime"    column="order_time"    />
-        <result property="boardingTime"    column="boarding_time"    />
-        <result property="alightingTime"    column="alighting_time"    />
-        <result property="appointmentTime"    column="appointment_time"    />
-        <result property="fare"    column="fare"    />
-        <result property="highwayCosts"    column="highway_costs"    />
-        <result property="amount"    column="amount"    />
-        <result property="estimatedDuration"    column="estimated_duration"    />
-        <result property="notes"    column="notes"    />
-        <result property="coupon"    column="coupon"    />
-    </resultMap>
-
-    <sql id="selectTaxiOrderVo">
-        select id, dd_id, user_id, driver_id, boarding_address, into_longitude, into_latitude, down_address, down_longitude, down_latitude, distance, state, taxi_type, release_id, order_time, boarding_time, alighting_time, appointment_time, fare, highway_costs, amount, estimated_duration, notes, coupon from taxi_order
-    </sql>
-
-    <select id="selectTaxiOrderList" parameterType="TaxiOrder" resultMap="TaxiOrderResult">
-        <include refid="selectTaxiOrderVo"/>
-        <where>  
-            <if test="ddId != null "> and dd_id = #{ddId}</if>
-            <if test="orderTime != null "> and order_time = #{orderTime}</if>
-        </where>
-    </select>
-    
-    <select id="selectTaxiOrderById" parameterType="Long" resultMap="TaxiOrderResult">
-        <include refid="selectTaxiOrderVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertTaxiOrder" parameterType="TaxiOrder" useGeneratedKeys="true" keyProperty="id">
-        insert into taxi_order
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ddId != null">dd_id,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="driverId != null">driver_id,</if>
-            <if test="boardingAddress != null">boarding_address,</if>
-            <if test="intoLongitude != null">into_longitude,</if>
-            <if test="intoLatitude != null">into_latitude,</if>
-            <if test="downAddress != null">down_address,</if>
-            <if test="downLongitude != null">down_longitude,</if>
-            <if test="downLatitude != null">down_latitude,</if>
-            <if test="distance != null">distance,</if>
-            <if test="state != null">state,</if>
-            <if test="taxiType != null">taxi_type,</if>
-            <if test="releaseId != null">release_id,</if>
-            <if test="orderTime != null">order_time,</if>
-            <if test="boardingTime != null">boarding_time,</if>
-            <if test="alightingTime != null">alighting_time,</if>
-            <if test="appointmentTime != null">appointment_time,</if>
-            <if test="fare != null">fare,</if>
-            <if test="highwayCosts != null">highway_costs,</if>
-            <if test="amount != null">amount,</if>
-            <if test="estimatedDuration != null">estimated_duration,</if>
-            <if test="notes != null">notes,</if>
-            <if test="coupon != null">coupon,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ddId != null">#{ddId},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="driverId != null">#{driverId},</if>
-            <if test="boardingAddress != null">#{boardingAddress},</if>
-            <if test="intoLongitude != null">#{intoLongitude},</if>
-            <if test="intoLatitude != null">#{intoLatitude},</if>
-            <if test="downAddress != null">#{downAddress},</if>
-            <if test="downLongitude != null">#{downLongitude},</if>
-            <if test="downLatitude != null">#{downLatitude},</if>
-            <if test="distance != null">#{distance},</if>
-            <if test="state != null">#{state},</if>
-            <if test="taxiType != null">#{taxiType},</if>
-            <if test="releaseId != null">#{releaseId},</if>
-            <if test="orderTime != null">#{orderTime},</if>
-            <if test="boardingTime != null">#{boardingTime},</if>
-            <if test="alightingTime != null">#{alightingTime},</if>
-            <if test="appointmentTime != null">#{appointmentTime},</if>
-            <if test="fare != null">#{fare},</if>
-            <if test="highwayCosts != null">#{highwayCosts},</if>
-            <if test="amount != null">#{amount},</if>
-            <if test="estimatedDuration != null">#{estimatedDuration},</if>
-            <if test="notes != null">#{notes},</if>
-            <if test="coupon != null">#{coupon},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTaxiOrder" parameterType="TaxiOrder">
-        update taxi_order
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="ddId != null">dd_id = #{ddId},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="driverId != null">driver_id = #{driverId},</if>
-            <if test="boardingAddress != null">boarding_address = #{boardingAddress},</if>
-            <if test="intoLongitude != null">into_longitude = #{intoLongitude},</if>
-            <if test="intoLatitude != null">into_latitude = #{intoLatitude},</if>
-            <if test="downAddress != null">down_address = #{downAddress},</if>
-            <if test="downLongitude != null">down_longitude = #{downLongitude},</if>
-            <if test="downLatitude != null">down_latitude = #{downLatitude},</if>
-            <if test="distance != null">distance = #{distance},</if>
-            <if test="state != null">state = #{state},</if>
-            <if test="taxiType != null">taxi_type = #{taxiType},</if>
-            <if test="releaseId != null">release_id = #{releaseId},</if>
-            <if test="orderTime != null">order_time = #{orderTime},</if>
-            <if test="boardingTime != null">boarding_time = #{boardingTime},</if>
-            <if test="alightingTime != null">alighting_time = #{alightingTime},</if>
-            <if test="appointmentTime != null">appointment_time = #{appointmentTime},</if>
-            <if test="fare != null">fare = #{fare},</if>
-            <if test="highwayCosts != null">highway_costs = #{highwayCosts},</if>
-            <if test="amount != null">amount = #{amount},</if>
-            <if test="estimatedDuration != null">estimated_duration = #{estimatedDuration},</if>
-            <if test="notes != null">notes = #{notes},</if>
-            <if test="coupon != null">coupon = #{coupon},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTaxiOrderById" parameterType="Long">
-        delete from taxi_order where id = #{id}
-    </delete>
-
-    <delete id="deleteTaxiOrderByIds" parameterType="String">
-        delete from taxi_order where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/TaxiPricesMapper.xml

@@ -1,67 +0,0 @@
-<?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.TaxiPricesMapper">
-    
-    <resultMap type="TaxiPrices" id="TaxiPricesResult">
-        <result property="id"    column="id"    />
-        <result property="startingPrice"    column="starting_price"    />
-        <result property="startingDistance"    column="starting_distance"    />
-        <result property="skipPrice"    column="skip_price"    />
-        <result property="skipDistance"    column="skip_distance"    />
-    </resultMap>
-
-    <sql id="selectTaxiPricesVo">
-        select id, starting_price, starting_distance, skip_price, skip_distance from taxi_prices
-    </sql>
-
-    <select id="selectTaxiPricesList" parameterType="TaxiPrices" resultMap="TaxiPricesResult">
-        <include refid="selectTaxiPricesVo"/>
-        <where>  
-        </where>
-    </select>
-    
-    <select id="selectTaxiPricesById" parameterType="Long" resultMap="TaxiPricesResult">
-        <include refid="selectTaxiPricesVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertTaxiPrices" parameterType="TaxiPrices" useGeneratedKeys="true" keyProperty="id">
-        insert into taxi_prices
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="startingPrice != null">starting_price,</if>
-            <if test="startingDistance != null">starting_distance,</if>
-            <if test="skipPrice != null">skip_price,</if>
-            <if test="skipDistance != null">skip_distance,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="startingPrice != null">#{startingPrice},</if>
-            <if test="startingDistance != null">#{startingDistance},</if>
-            <if test="skipPrice != null">#{skipPrice},</if>
-            <if test="skipDistance != null">#{skipDistance},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTaxiPrices" parameterType="TaxiPrices">
-        update taxi_prices
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="startingPrice != null">starting_price = #{startingPrice},</if>
-            <if test="startingDistance != null">starting_distance = #{startingDistance},</if>
-            <if test="skipPrice != null">skip_price = #{skipPrice},</if>
-            <if test="skipDistance != null">skip_distance = #{skipDistance},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTaxiPricesById" parameterType="Long">
-        delete from taxi_prices where id = #{id}
-    </delete>
-
-    <delete id="deleteTaxiPricesByIds" parameterType="String">
-        delete from taxi_prices where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/UserFootprintMapper.xml

@@ -1,67 +0,0 @@
-<?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.UserFootprintMapper">
-    
-    <resultMap type="UserFootprint" id="UserFootprintResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="mdId"    column="md_id"    />
-        <result property="cretim"    column="cretim"    />
-    </resultMap>
-
-    <sql id="selectUserFootprintVo">
-        select id, user_id, md_id, cretim from user_footprint
-    </sql>
-
-    <select id="selectUserFootprintList" parameterType="UserFootprint" resultMap="UserFootprintResult">
-        <include refid="selectUserFootprintVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="mdId != null "> and md_id = #{mdId}</if>
-            <if test="cretim != null "> and cretim = #{cretim}</if>
-        </where>
-        order by id desc
-    </select>
-    
-    <select id="selectUserFootprintById" parameterType="Long" resultMap="UserFootprintResult">
-        <include refid="selectUserFootprintVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertUserFootprint" parameterType="UserFootprint" useGeneratedKeys="true" keyProperty="id">
-        insert into user_footprint
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="mdId != null">md_id,</if>
-            <if test="cretim != null">cretim,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="mdId != null">#{mdId},</if>
-            <if test="cretim != null">#{cretim},</if>
-         </trim>
-    </insert>
-
-    <update id="updateUserFootprint" parameterType="UserFootprint">
-        update user_footprint
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="mdId != null">md_id = #{mdId},</if>
-            <if test="cretim != null">cretim = #{cretim},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteUserFootprintById" parameterType="Long">
-        delete from user_footprint where id = #{id}
-    </delete>
-
-    <delete id="deleteUserFootprintByIds" parameterType="String">
-        delete from user_footprint where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/UserMarginMapper.xml

@@ -1,71 +0,0 @@
-<?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.UserMarginMapper">
-    
-    <resultMap type="UserMargin" id="UserMarginResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="type"    column="type"    />
-        <result property="amount"    column="amount"    />
-        <result property="cretim"    column="cretim"    />
-    </resultMap>
-
-    <sql id="selectUserMarginVo">
-        select id, user_id, type, amount, cretim from user_margin
-    </sql>
-
-    <select id="selectUserMarginList" parameterType="UserMargin" resultMap="UserMarginResult">
-        <include refid="selectUserMarginVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="amount != null "> and amount = #{amount}</if>
-            <if test="cretim != null "> and cretim = #{cretim}</if>
-        </where>
-    </select>
-    
-    <select id="selectUserMarginById" parameterType="Long" resultMap="UserMarginResult">
-        <include refid="selectUserMarginVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertUserMargin" parameterType="UserMargin" useGeneratedKeys="true" keyProperty="id">
-        insert into user_margin
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="type != null">type,</if>
-            <if test="amount != null">amount,</if>
-            <if test="cretim != null">cretim,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="type != null">#{type},</if>
-            <if test="amount != null">#{amount},</if>
-            <if test="cretim != null">#{cretim},</if>
-         </trim>
-    </insert>
-
-    <update id="updateUserMargin" parameterType="UserMargin">
-        update user_margin
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="amount != null">amount = #{amount},</if>
-            <if test="cretim != null">cretim = #{cretim},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteUserMarginById" parameterType="Long">
-        delete from user_margin where id = #{id}
-    </delete>
-
-    <delete id="deleteUserMarginByIds" parameterType="String">
-        delete from user_margin where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/UserWalletMapper.xml

@@ -1,131 +0,0 @@
-<?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.UserWalletMapper">
-
-    <resultMap type="UserWallet" id="UserWalletResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="pointsWallet"    column="points_wallet"    />
-        <result property="balanceWallet"    column="balance_wallet"    />
-        <result property="blockedFunds"    column="blocked_funds"    />
-        <result property="version"    column="version"   />
-    </resultMap>
-
-    <sql id="selectUserWalletVo">
-        select id, user_id, points_wallet, balance_wallet, blocked_funds, version from user_wallet
-    </sql>
-
-    <select id="selectUserWalletList" parameterType="UserWallet" resultMap="UserWalletResult">
-        <include refid="selectUserWalletVo"/>
-        <where>
-            <if test="pointsWallet != null "> and points_wallet = #{pointsWallet}</if>
-            <if test="balanceWallet != null "> and balance_wallet = #{balanceWallet}</if>
-        </where>
-    </select>
-
-    <select id="selectUserWalletById" parameterType="Long" resultMap="UserWalletResult">
-        <include refid="selectUserWalletVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertUserWallet" parameterType="UserWallet" useGeneratedKeys="true" keyProperty="id">
-        insert into user_wallet
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="pointsWallet != null">points_wallet,</if>
-            <if test="balanceWallet != null">balance_wallet,</if>
-            <if test="blockedFunds != null">blocked_funds,</if>
-            <if test="version != null">version,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="pointsWallet != null">#{pointsWallet},</if>
-            <if test="balanceWallet != null">#{balanceWallet},</if>
-            <if test="blockedFunds != null">#{blockedFunds},</if>
-            <if test="version != null">#{version},</if>
-        </trim>
-    </insert>
-
-    <update id="updateUserWallet" parameterType="UserWallet">
-        update user_wallet
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="pointsWallet != null">points_wallet = #{pointsWallet},</if>
-            <if test="balanceWallet != null">balance_wallet = #{balanceWallet},</if>
-            <if test="blockedFunds != null">blocked_funds = #{blockedFunds},</if>
-            <if test="version != null">version = #{version},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <!-- 检查余额是否足够 -->
-    <select id="checkBalanceSufficient" resultType="boolean">
-        select
-        <if test="pointsWallet != null and balanceWallet != null">
-            (points_wallet + (#{pointsWallet}) >= 0) and (balance_wallet + (#{balanceWallet}) >= 0)
-        </if>
-        <if test="pointsWallet != null and balanceWallet == null">
-            points_wallet + (#{pointsWallet}) >= 0
-        </if>
-        <if test="pointsWallet == null and balanceWallet != null">
-            balance_wallet + (#{balanceWallet}) >= 0
-        </if>
-        from user_wallet
-        where id = #{id} and version = #{version}
-    </select>
-
-    <!-- 获取余额检查结果详情 -->
-    <select id="getBalanceCheckResult" resultType="map">
-        select
-            id,
-            points_wallet as currentPointsWallet,
-            balance_wallet as currentBalanceWallet,
-            version,
-            <if test="pointsWallet != null">
-                points_wallet + (#{pointsWallet}) as afterPointsWallet,
-                (points_wallet + (#{pointsWallet}) >= 0) as pointsWalletSufficient,
-            </if>
-            <if test="balanceWallet != null">
-                balance_wallet + (#{balanceWallet}) as afterBalanceWallet,
-                (balance_wallet + (#{balanceWallet}) >= 0) as balanceWalletSufficient,
-            </if>
-            <if test="pointsWallet != null and balanceWallet != null">
-                ((points_wallet + (#{pointsWallet}) >= 0) and (balance_wallet + (#{balanceWallet}) >= 0)) as allSufficient
-            </if>
-            <if test="pointsWallet != null and balanceWallet == null">
-                (points_wallet + (#{pointsWallet}) >= 0) as allSufficient
-            </if>
-            <if test="pointsWallet == null and balanceWallet != null">
-                (balance_wallet + (#{balanceWallet}) >= 0) as allSufficient
-            </if>
-        from user_wallet
-        where id = #{id} and version = #{version}
-    </select>
-
-    <update id="updateUserWalletWithLock">
-        update user_wallet
-        <set>
-            version = version+1,
-            <if test="pointsWallet != null">points_wallet = points_wallet + (#{pointsWallet}),</if>
-            <if test="balanceWallet != null">balance_wallet = balance_wallet + (#{balanceWallet}),</if>
-        </set>
-        <where>
-            id = #{id} and version = #{version}
-            <if test="pointsWallet != null">and points_wallet + (#{pointsWallet}) >= 0</if>
-            <if test="balanceWallet != null">and balance_wallet + (#{balanceWallet}) >= 0</if>
-        </where>
-    </update>
-
-    <delete id="deleteUserWalletById" parameterType="Long">
-        delete from user_wallet where id = #{id}
-    </delete>
-
-    <delete id="deleteUserWalletByIds" parameterType="String">
-        delete from user_wallet where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/VideoCallMapper.xml

@@ -1,71 +0,0 @@
-<?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.VideoCallMapper">
-    
-    <resultMap type="VideoCall" id="VideoCallResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="callId"    column="call_id"    />
-        <result property="content"    column="content"    />
-        <result property="answer"    column="answer"    />
-    </resultMap>
-
-    <sql id="selectVideoCallVo">
-        select id, user_id,call_id, content,answer from video_call
-    </sql>
-
-    <select id="selectVideoCallList" parameterType="VideoCall" resultMap="VideoCallResult">
-        <include refid="selectVideoCallVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="callId != null "> and call_id = #{callId}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="answer != null  and answer != ''"> and answer = #{answer}</if>
-        </where>
-    </select>
-    
-    <select id="selectVideoCallById" parameterType="Long" resultMap="VideoCallResult">
-        <include refid="selectVideoCallVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertVideoCall" parameterType="VideoCall" useGeneratedKeys="true" keyProperty="id">
-        insert into video_call
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="callId != null">call_id,</if>
-            <if test="content != null">content,</if>
-            <if test="answer != null">answer,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="callId != null">#{callId},</if>
-            <if test="content != null">#{content},</if>
-            <if test="answer != null">#{answer},</if>
-         </trim>
-    </insert>
-
-    <update id="updateVideoCall" parameterType="VideoCall">
-        update video_call
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="callId != null">call_id = #{callId},</if>
-            <if test="content != null">content = #{content},</if>
-            <if test="answer != null">answer = #{answer},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteVideoCallById" parameterType="Long">
-        delete from video_call where id = #{id}
-    </delete>
-
-    <delete id="deleteVideoCallByIds" parameterType="String">
-        delete from video_call where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/VipMembershipMapper.xml

@@ -1,74 +0,0 @@
-<?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.VipMembershipMapper">
-    
-    <resultMap type="VipMembership" id="VipMembershipResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="shupm"    column="shupm"    />
-        <result property="price"    column="price"    />
-        <result property="duration"    column="duration"    />
-        <result property="state"    column="state"    />
-    </resultMap>
-
-    <sql id="selectVipMembershipVo">
-        select id, name, shupm, price, duration, state from vip_membership
-    </sql>
-
-    <select id="selectVipMembershipList" parameterType="VipMembership" resultMap="VipMembershipResult">
-        <include refid="selectVipMembershipVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="state != null "> and state = #{state}</if>
-        </where>
-        order by id desc
-    </select>
-    
-    <select id="selectVipMembershipById" parameterType="Long" resultMap="VipMembershipResult">
-        <include refid="selectVipMembershipVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertVipMembership" parameterType="VipMembership" useGeneratedKeys="true" keyProperty="id">
-        insert into vip_membership
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null and name != ''">name,</if>
-            <if test="shupm != null">shupm,</if>
-            <if test="price != null">price,</if>
-            <if test="duration != null">duration,</if>
-            <if test="state != null">state,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null and name != ''">#{name},</if>
-            <if test="shupm != null">#{shupm},</if>
-            <if test="price != null">#{price},</if>
-            <if test="duration != null">#{duration},</if>
-            <if test="state != null">#{state},</if>
-         </trim>
-    </insert>
-
-    <update id="updateVipMembership" parameterType="VipMembership">
-        update vip_membership
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null and name != ''">name = #{name},</if>
-            <if test="shupm != null">shupm = #{shupm},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="duration != null">duration = #{duration},</if>
-            <if test="state != null">state = #{state},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteVipMembershipById" parameterType="Long">
-        delete from vip_membership where id = #{id}
-    </delete>
-
-    <delete id="deleteVipMembershipByIds" parameterType="String">
-        delete from vip_membership where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/VipQuanyiMapper.xml

@@ -1,175 +0,0 @@
-<?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.VipQuanyiMapper">
-
-    <resultMap type="VipQuanyi" id="VipQuanyiResult">
-        <result property="id"    column="id"    />
-        <result property="vip"    column="vip"    />
-        <result property="yhfangs"    column="yhfangs"    />
-        <result property="yhnum"    column="yhnum"    />
-        <result property="name"    column="name"    />
-        <result property="shuoming"    column="shuoming"    />
-        <result property="tiaojian"    column="tiaojian"    />
-        <result property="num"    column="num"    />
-        <result property="total"    column="total"    />
-        <result property="validity"    column="validity"    />
-        <result property="lqxz"    column="lqxz"    />
-        <result property="state"    column="state"    />
-        <result property="shId"    column="sh_id"    />
-        <result property="spId"    column="sp_id"    />
-        <result property="claimedCount"    column="claimed_count"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="deleted"    column="deleted"    />
-        <result property="language"    column="language"    />
-        <result property="poster"    column="poster"    />
-        <result property="type" column="type"/>
-        <result property="merchantId" column="merchant_id"/>
-    </resultMap>
-
-
-
-    <sql id="selectVipQuanyiVo">
-        select id, vip, yhfangs, yhnum, name, shuoming, tiaojian, num,
-               total, validity, lqxz, state, sh_id, sp_id, claimed_count, create_time, update_time, deleted, language, poster,type,merchant_id
-        from vip_quanyi
-    </sql>
-    <select id="userUnclaimedList" resultMap="VipQuanyiResult">
-        select * from vip_quanyi v  LEFT JOIN (SELECT
-                                                   user_id,
-                                                   quanyi_id,
-                                                   COUNT(*) AS receive_count
-                                               FROM vip_user_quanyi
-                                               WHERE deleted = '0' and user_id=#{userId}
-                                               GROUP BY user_id, quanyi_id) u  on v.id=u.quanyi_id  where v.state='0' and v.deleted='0' and v.total> v.claimed_count and v.language=#{language} and (u.receive_count IS NULL OR v.lqxz > u.receive_count)
-                                                                                                    <if test="mdId != null and mdId != ''">
-                                                                                                      and (v.sh_id = #{mdId} or v.sh_id is null)
-                                                                                                    </if>
-                                                                                                    ORDER BY create_time
-    </select>
-    <select id="selectVipQuanyiList" parameterType="VipQuanyi" resultMap="VipQuanyiResult">
-        <include refid="selectVipQuanyiVo"/>
-        <where>
-            deleted != '1'
-            <if test="vip != null "> and vip = #{vip}</if>
-            <if test="yhfangs != null "> and yhfangs = #{yhfangs}</if>
-            <if test="yhnum != null "> and yhnum = #{yhnum}</if>
-            <if test="name != null  and name != ''"> and BINARY  name like concat('%', #{name}, '%')</if>
-            <if test="shuoming != null  and shuoming != ''"> and shuoming = #{shuoming}</if>
-            <if test="tiaojian != null "> and tiaojian = #{tiaojian}</if>
-            <if test="num != null "> and num = #{num}</if>
-            <if test="total != null and total!=''"> and total = #{total}</if>
-            <if test="validity != null and validity!='' "> and validity = #{validity}</if>
-            <if test="lqxz != null and lqxz !='' "> and lqxz = #{lqxz}</if>
-            <if test="state != null and state != ''"> and state = #{state}</if>
-            <if test="shId != null"> and sh_id = #{shId}</if>
-            <if test="spId != null"> and sp_id = #{spId}</if>
-            <if test="claimedCount != null and claimedCount !='' "> and claimed_count = #{claimedCount}</if>
-            <if test="createTime != null and createTime !='' "> and create_time = #{createTime}</if>
-            <if test="updateTime != null and updateTime != '' "> and update_time = #{updateTime}</if>
-            <if test="deleted != null and deleted!=''"> and deleted = #{deleted}</if>
-            <if test="language != null and language != ''"> and language = #{language}</if>
-            <if test="poster != null and poster != ''"> and poster = #{poster}</if>
-            <if test="type != null and type != ''"> and type = #{type}</if>
-            <if test="merchantId != null and merchantId != ''"> and merchant_id = #{merchantId}</if>
-        </where>
-        order by id desc
-    </select>
-
-    <select id="selectVipQuanyiById" parameterType="Long" resultMap="VipQuanyiResult">
-        <include refid="selectVipQuanyiVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertVipQuanyi" parameterType="VipQuanyi" useGeneratedKeys="true" keyProperty="id">
-        insert into vip_quanyi
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="vip != null">vip,</if>
-            <if test="yhfangs != null">yhfangs,</if>
-            <if test="yhnum != null">yhnum,</if>
-            <if test="name != null and name != ''">name,</if>
-            <if test="shuoming != null">shuoming,</if>
-            <if test="tiaojian != null">tiaojian,</if>
-            <if test="num != null">num,</if>
-            <if test="total != null">total,</if>
-            <if test="validity != null">validity,</if>
-            <if test="lqxz != null">lqxz,</if>
-            <if test="state != null">state,</if>
-            <if test="shId != null">sh_id,</if>
-            <if test="spId != null">sp_id,</if>
-            <if test="claimedCount != null">claimed_count,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="deleted != null">deleted,</if>
-            <if test="language != null and language != ''">language,</if>
-            <if test="poster != null and poster != ''">poster,</if>
-            <if test="type != null and type != ''">type,</if>
-            <if test="merchantId != null and merchantId != ''">merchant_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="vip != null">#{vip},</if>
-            <if test="yhfangs != null">#{yhfangs},</if>
-            <if test="yhnum != null">#{yhnum},</if>
-            <if test="name != null and name != ''">#{name},</if>
-            <if test="shuoming != null">#{shuoming},</if>
-            <if test="tiaojian != null">#{tiaojian},</if>
-            <if test="num != null">#{num},</if>
-            <if test="total != null">#{total},</if>
-            <if test="validity != null">#{validity},</if>
-            <if test="lqxz != null">#{lqxz},</if>
-            <if test="state != null">#{state},</if>
-            <if test="shId != null">#{shId},</if>
-            <if test="spId != null">#{spId},</if>
-            <if test="claimedCount != null">#{claimedCount},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="deleted != null">#{deleted},</if>
-            <if test="language != null and language != ''">#{language},</if>
-            <if test="poster != null and poster != ''">#{poster},</if>
-            <if test="type != null and type != ''">#{type},</if>
-            <if test="merchantId != null and merchantId != ''">#{merchantId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateVipQuanyi" parameterType="VipQuanyi">
-        update vip_quanyi
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="vip != null">vip = #{vip},</if>
-            <if test="yhfangs != null">yhfangs = #{yhfangs},</if>
-            <if test="yhnum != null">yhnum = #{yhnum},</if>
-            <if test="name != null and name != ''">name = #{name},</if>
-            <if test="shuoming != null">shuoming = #{shuoming},</if>
-            <if test="tiaojian != null">tiaojian = #{tiaojian},</if>
-            <if test="num != null">num = #{num},</if>
-            <if test="total != null">total = #{total},</if>
-            <if test="validity != null">validity = #{validity},</if>
-            <if test="lqxz != null">lqxz = #{lqxz},</if>
-            <if test="state != null">state = #{state},</if>
-            <if test="shId != null">sh_id = #{shId},</if>
-            <if test="spId != null">sp_id = #{spId},</if>
-            <if test="claimedCount != null">claimed_count = #{claimedCount},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="deleted != null">deleted = #{deleted},</if>
-            <if test="language != null and language != ''">language = #{language},</if>
-            <if test="poster != null and poster != ''">poster = #{poster},</if>
-            <if test="type != null and type != ''">type = #{type},</if>
-            <if test="merchantId != null and merchantId != ''">merchant_id = #{merchantId},</if>
-
-        </trim>
-        where id = #{id}
-    </update>
-
-    <update id="deleteVipQuanyiById" parameterType="Long">
-        update vip_quanyi set deleted = '1' where id = #{id}
-    </update>
-
-    <update id="deleteVipQuanyiByIds" parameterType="String">
-        update vip_quanyi set deleted = '1' where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-</mapper>

ruoyi-system/target/classes/mapper/system/VipUserMapper.xml

@@ -1,74 +0,0 @@
-<?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.VipUserMapper">
-    
-    <resultMap type="VipUser" id="VipUserResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="yxtim"    column="yxtim"    />
-        <result property="phone"    column="phone"    />
-        <result property="name"    column="name"    />
-    </resultMap>
-
-    <sql id="selectVipUserVo">
-        select id, user_id, yxtim, phone, name from vip_user
-    </sql>
-
-    <select id="selectVipUserList" parameterType="VipUser" resultMap="VipUserResult">
-        <include refid="selectVipUserVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="yxtim != null "> and yxtim = #{yxtim}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-        </where>
-        order by id desc
-    </select>
-    
-    <select id="selectVipUserById" parameterType="Long" resultMap="VipUserResult">
-        <include refid="selectVipUserVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertVipUser" parameterType="VipUser">
-        insert into vip_user
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="yxtim != null">yxtim,</if>
-            <if test="phone != null">phone,</if>
-            <if test="name != null">name,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="yxtim != null">#{yxtim},</if>
-            <if test="phone != null">#{phone},</if>
-            <if test="name != null">#{name},</if>
-         </trim>
-    </insert>
-
-    <update id="updateVipUser" parameterType="VipUser">
-        update vip_user
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="yxtim != null">yxtim = #{yxtim},</if>
-            <if test="phone != null">phone = #{phone},</if>
-            <if test="name != null">name = #{name},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteVipUserById" parameterType="Long">
-        delete from vip_user where id = #{id}
-    </delete>
-
-    <delete id="deleteVipUserByIds" parameterType="String">
-        delete from vip_user where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/VipUserQuanyiMapper.xml

@@ -1,158 +0,0 @@
-<?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.VipUserQuanyiMapper">
-
-    <resultMap type="VipUserQuanyi" id="VipUserQuanyiResult">
-        <result property="id" column="id" />
-        <result property="quanyiId" column="quanyi_id" />
-        <result property="userId" column="user_id" />
-        <result property="yhfangs" column="yhfangs" />
-        <result property="yhnum" column="yhnum" />
-        <result property="name" column="name" />
-        <result property="shuoming" column="shuoming" />
-        <result property="tiaojian" column="tiaojian" />
-        <result property="validity" column="validity" />
-        <result property="deleted" column="deleted" />
-        <result property="createTime" column="create_time" />
-        <result property="updateTime" column="update_time" />
-        <result property="state" column="state" />
-        <result property="shId" column="sh_id" />
-        <result property="spId" column="sp_id" />
-        <result property="language" column="language" />
-        <result property="poster" column="poster" />
-        <!-- 新增字段映射 -->
-        <result property="type" column="type" />
-        <result property="code" column="code" />
-        <result property="orderId" column="order_id" />
-        <result property="merchantId" column="merchant_id" />
-    </resultMap>
-
-    <sql id="selectVipUserQuanyiVo">
-        SELECT
-        id, quanyi_id, user_id, yhfangs, yhnum, name,
-        shuoming, tiaojian, validity, deleted, create_time,
-        update_time, state, sh_id, sp_id, language, poster,
-        type, code,order_id,merchant_id
-        FROM vip_user_quanyi
-    </sql>
-
-    <select id="selectVipUserQuanyiList" parameterType="VipUserQuanyi" resultMap="VipUserQuanyiResult">
-        <include refid="selectVipUserQuanyiVo"/>
-        <where>
-            <if test="yhfangs != null"> AND yhfangs = #{yhfangs}</if>
-            <if test="yhnum != null"> AND yhnum = #{yhnum}</if>
-            <if test="quanyiId != null"> AND quanyi_id = #{quanyiId}</if>
-            <if test="userId != null"> AND user_id = #{userId}</if>
-            <if test="name != null and name != ''"> AND name LIKE CONCAT('%', #{name}, '%')</if>
-            <if test="shuoming != null and shuoming != ''"> AND shuoming = #{shuoming}</if>
-            <if test="tiaojian != null"> AND tiaojian = #{tiaojian}</if>
-            <if test="validity != null"> AND validity = #{validity}</if>
-            <if test="deleted != null and deleted != ''"> AND deleted = #{deleted}</if>
-            <if test="state != null and state != ''"> AND state = #{state}</if>
-            <if test="shId != null"> AND sh_id = #{shId}</if>
-            <if test="spId != null"> AND sp_id = #{spId}</if>
-            <if test="language != null and language != ''"> AND language = #{language}</if>
-            <if test="poster != null and poster != ''"> AND poster = #{poster}</if>
-            <!-- 新增查询条件 -->
-            <if test="type != null and type != ''"> AND type = #{type}</if>
-            <if test="code != null and code != ''"> AND code = #{code}</if>
-            <if test="orderId != null and orderId != ''"> AND order_id = #{orderId}</if>
-            <if test="merchantId != null and merchantId != ''"> AND merchant_id = #{merchantId}</if>
-
-        </where>
-    </select>
-
-    <insert id="insertVipUserQuanyi" parameterType="VipUserQuanyi" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO vip_user_quanyi
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <!-- 原有字段 -->
-            <if test="yhfangs != null">yhfangs,</if>
-            <if test="yhnum != null">yhnum,</if>
-            <if test="quanyiId != null">quanyi_id,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="name != null">name,</if>
-            <if test="shuoming != null">shuoming,</if>
-            <if test="tiaojian != null">tiaojian,</if>
-            <if test="validity != null">validity,</if>
-            <if test="deleted != null">deleted,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="state != null">state,</if>
-            <if test="shId != null">sh_id,</if>
-            <if test="spId != null">sp_id,</if>
-            <if test="language != null">language,</if>
-            <if test="poster != null">poster,</if>
-            <!-- 新增字段 -->
-            <if test="type != null">type,</if>
-            <if test="code != null">code,</if>
-            <if test="orderId != null">order_id,</if>
-            <if test="merchantId != null">merchant_id,</if>
-        </trim>
-        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
-            <!-- 原有字段 -->
-            <if test="yhfangs != null">#{yhfangs},</if>
-            <if test="yhnum != null">#{yhnum},</if>
-            <if test="quanyiId != null">#{quanyiId},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="name != null">#{name},</if>
-            <if test="shuoming != null">#{shuoming},</if>
-            <if test="tiaojian != null">#{tiaojian},</if>
-            <if test="validity != null">#{validity},</if>
-            <if test="deleted != null">#{deleted},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="state != null">#{state},</if>
-            <if test="shId != null">#{shId},</if>
-            <if test="spId != null">#{spId},</if>
-            <if test="language != null">#{language},</if>
-            <if test="poster != null">#{poster},</if>
-            <!-- 新增字段 -->
-            <if test="type != null">#{type},</if>
-            <if test="code != null">#{code},</if>
-            <if test="orderId != null">#{orderId},</if>
-            <if test="merchantId != null">#{merchantId},</if>
-        </trim>
-    </insert>
-
-    <update id="updateVipUserQuanyi" parameterType="VipUserQuanyi">
-        UPDATE vip_user_quanyi
-        <trim prefix="SET" suffixOverrides=",">
-            <!-- 原有字段 -->
-            <if test="yhfangs != null">yhfangs = #{yhfangs},</if>
-            <if test="yhnum != null">yhnum = #{yhnum},</if>
-            <if test="quanyiId != null">quanyi_id = #{quanyiId},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="name != null">name = #{name},</if>
-            <if test="shuoming != null">shuoming = #{shuoming},</if>
-            <if test="tiaojian != null">tiaojian = #{tiaojian},</if>
-            <if test="validity != null">validity = #{validity},</if>
-            <if test="deleted != null">deleted = #{deleted},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="state != null">state = #{state},</if>
-            <if test="shId != null">sh_id = #{shId},</if>
-            <if test="spId != null">sp_id = #{spId},</if>
-            <if test="language != null">language = #{language},</if>
-            <if test="poster != null">poster = #{poster},</if>
-            <!-- 新增字段 -->
-            <if test="type != null">type = #{type},</if>
-            <if test="code != null">code = #{code},</if>
-            <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="merchantId != null">merchant_id = #{merchantId},</if>
-        </trim>
-        WHERE id = #{id}
-    </update>
-
-    <delete id="deleteVipUserQuanyiById" parameterType="Long">
-        delete from vip_user_quanyi where id = #{id}
-    </delete>
-
-    <delete id="deleteVipUserQuanyiByIds" parameterType="String">
-        delete from vip_user_quanyi where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/target/classes/mapper/system/WalletTransactionMapper.xml

@@ -1,88 +0,0 @@
-<?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.WalletTransactionMapper">
-
-    <resultMap type="WalletTransaction" id="PointsTransactionResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="ddId"    column="dd_id"    />
-        <result property="type"    column="type"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="change"    column="change"    />
-        <result property="currentBalance"    column="current_balance"    />
-    </resultMap>
-
-    <sql id="selectPointsTransactionVo">
-        select id, user_id, dd_id, type, create_time, update_time, remark, change, current_balance from wallet_transaction
-    </sql>
-
-    <select id="selectPointsTransactionList" parameterType="WalletTransaction" resultMap="PointsTransactionResult">
-        <include refid="selectPointsTransactionVo"/>
-        <where>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="ddId != null "> and dd_id = #{ddId}</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="change != null  and change != ''"> and change = #{change}</if>
-            <if test="currentBalance != null  and currentBalance != ''"> and current_balance = #{currentBalance}</if>
-        </where>
-    </select>
-
-    <select id="selectPointsTransactionById" parameterType="Long" resultMap="PointsTransactionResult">
-        <include refid="selectPointsTransactionVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertPointsTransaction" parameterType="WalletTransaction" useGeneratedKeys="true" keyProperty="id">
-        insert into wallet_transaction
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="ddId != null">dd_id,</if>
-            <if test="type != null and type != ''">type,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-            <if test="change != null and change != ''">change,</if>
-            <if test="currentBalance != null and currentBalance != ''">current_balance,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="ddId != null">#{ddId},</if>
-            <if test="type != null and type != ''">#{type},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="change != null and change != ''">#{change},</if>
-            <if test="currentBalance != null and currentBalance != ''">#{currentBalance},</if>
-        </trim>
-    </insert>
-
-    <update id="updatePointsTransaction" parameterType="WalletTransaction">
-        update wallet_transaction
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="ddId != null">dd_id = #{ddId},</if>
-            <if test="type != null and type != ''">type = #{type},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="change != null and change != ''">change = #{change},</if>
-            <if test="currentBalance != null and currentBalance != ''">current_balance = #{currentBalance},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePointsTransactionById" parameterType="Long">
-        delete from wallet_transaction where id = #{id}
-    </delete>
-
-    <delete id="deletePointsTransactionByIds" parameterType="String">
-        delete from wallet_transaction where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>