wsy182
/
RuoYi-Cloud
mirror of https://gitee.com/y_project/RuoYi-Cloud.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

框架集成MyBatis-Plus使得编码更加方便

pull/371/head
wuyibo 2023-08-30 16:20:17 +08:00
parent 3c42eee7bf
commit 6653d88b69
162 changed files with 464 additions and 554 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -192,11 +192,11 @@
<artifactId>hutool-all</artifactId>
<version>5.7.12</version>
</dependency>
<!-- <dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.3.1</version>
</dependency>-->
<version>3.5.3.2</version>
</dependency>
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
@ -247,11 +247,11 @@
<version>${ruoyi.version}</version>
</dependency>
<!-- mybatis-flex -->
<dependency>
<!-- <dependency>
<groupId>com.mybatis-flex</groupId>
<artifactId>mybatis-flex-spring-boot-starter</artifactId>
<version>${mybatis-flex.version}</version>
</dependency>
</dependency>-->
<!-- 多数据源 -->
<dependency>
<groupId>com.ruoyi</groupId>

9
ruoyi-common/ruoyi-common-core/pom.xml
View File

@ -116,11 +116,16 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<!-- mybatis-flex -->
<!-- mybatis-plus-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<!-- mybatis-flex -->
<!-- <dependency>
<groupId>com.mybatis-flex</groupId>
<artifactId>mybatis-flex-spring-boot-starter</artifactId>
</dependency>
</dependency>-->
<!-- Swagger -->
<dependency>
<groupId>io.swagger</groupId>

11
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.common.core.web.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Column;
/**
* Entity基类
@ -17,7 +18,7 @@ public class BaseEntity implements Serializable
private static final long serialVersionUID = 1L;
/** 搜索值 */
@Column(ignore = true)
@TableField(exist = false)
private String searchValue;
/** 创建者 */
@ -25,7 +26,6 @@ public class BaseEntity implements Serializable
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(onInsertValue = "now()")
private Date createTime;
/** 更新者 */
@ -33,14 +33,13 @@ public class BaseEntity implements Serializable
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(onUpdateValue = "now()", onInsertValue = "now()")
private Date updateTime;
/** 备注 */
private String remark;
/** 请求参数 */
@Column(ignore = true)
@TableField(exist = false)
private Map<String, Object> params;
public String getSearchValue()

6
ruoyi-common/ruoyi-common-security/pom.xml
View File

@ -34,9 +34,13 @@
<artifactId>ruoyi-common-redis</artifactId>
</dependency>
<!-- mybatis-flex -->
<dependency>
<!-- <dependency>
<groupId>com.mybatis-flex</groupId>
<artifactId>mybatis-flex-spring-boot-starter</artifactId>
</dependency>-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
</dependencies>

4
ruoyi-modules/ruoyi-gen/pom.xml
View File

@ -82,10 +82,10 @@
<artifactId>lombok</artifactId>
</dependency>
<!-- mybatis-flex -->
<dependency>
<!-- <dependency>
<groupId>com.mybatis-flex</groupId>
<artifactId>mybatis-flex-spring-boot-starter</artifactId>
</dependency>
</dependency>-->
</dependencies>
<build>

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

@ -1,18 +1,21 @@
package com.ruoyi.gen.domain;
import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import org.apache.commons.lang3.ArrayUtils;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.constant.GenConstants;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.ArrayUtils;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
* 业务表 gen_table
*
* @author ruoyi
*/
@TableName("gen_table")
public class GenTable extends BaseEntity
{
private static final long serialVersionUID = 1L;

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

@ -1,15 +1,18 @@
package com.ruoyi.gen.domain;
import javax.validation.constraints.NotBlank;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* 代码生成业务字段表 gen_table_column
*
* @author ruoyi
*/
@TableName("gen_table_column")
public class GenTableColumn extends BaseEntity
{
private static final long serialVersionUID = 1L;

8
ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.gen.mapper.GenTableColumnMapper">
<resultMap type="GenTableColumn" id="GenTableColumnResult">
<resultMap type="com.ruoyi.gen.domain.GenTableColumn" id="GenTableColumnResult">
<id property="columnId" column="column_id" />
<result property="tableId" column="table_id" />
<result property="columnName" column="column_name" />
@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
</sql>
<select id="selectGenTableColumnListByTableId" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
<select id="selectGenTableColumnListByTableId" parameterType="com.ruoyi.gen.domain.GenTableColumn" resultMap="GenTableColumnResult">
<include refid="selectGenTableColumnVo"/>
where table_id = #{tableId}
order by sort
@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by ordinal_position
</select>
<insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
<insert id="insertGenTableColumn" parameterType="com.ruoyi.gen.domain.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>
@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<update id="updateGenTableColumn" parameterType="GenTableColumn">
<update id="updateGenTableColumn" parameterType="com.ruoyi.gen.domain.GenTableColumn">
update gen_table_column
<set>
column_comment = #{columnComment},

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

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.gen.mapper.GenTableMapper">
<resultMap type="GenTable" id="GenTableResult">
<resultMap type="com.ruoyi.gen.domain.GenTable" id="GenTableResult">
<id property="tableId" column="table_id" />
<result property="tableName" column="table_name" />
<result property="tableComment" column="table_comment" />
@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult" />
</resultMap>
<resultMap type="GenTableColumn" id="GenTableColumnResult">
<resultMap type="com.ruoyi.gen.domain.GenTableColumn" id="GenTableColumnResult">
<id property="columnId" column="column_id" />
<result property="tableId" column="table_id" />
<result property="columnName" column="column_name" />
@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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">
<select id="selectGenTableList" parameterType="com.ruoyi.gen.domain.GenTable" resultMap="GenTableResult">
<include refid="selectGenTableVo"/>
<where>
<if test="tableName != null and tableName != ''">
@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
<select id="selectDbTableList" parameterType="com.ruoyi.gen.domain.GenTable" resultMap="GenTableResult">
select table_name, table_comment, create_time, update_time from information_schema.tables
where table_schema = (select database())
AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by c.sort
</select>
<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
<insert id="insertGenTable" parameterType="com.ruoyi.gen.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
insert into gen_table (
<if test="tableName != null">table_name,</if>
<if test="tableComment != null and tableComment != ''">table_comment,</if>
@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<update id="updateGenTable" parameterType="GenTable">
<update id="updateGenTable" parameterType="com.ruoyi.gen.domain.GenTable">
update gen_table
<set>
<if test="tableName != null">table_name = #{tableName},</if>

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

@ -6,7 +6,7 @@ import ${import};
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
import com.mybatisflex.annotation.Table;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
#if($table.crud || $table.sub)
import com.ruoyi.common.core.web.domain.BaseEntity;
@ -26,7 +26,7 @@ import com.ruoyi.common.core.web.domain.TreeEntity;
#set($Entity="TreeEntity")
#end
@Data
@Table("${tableName}")
@TableName("${tableName}")
public class ${ClassName} extends ${Entity}
{
private static final long serialVersionUID = 1L;

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

@ -2,6 +2,7 @@ package ${packageName}.mapper;
import java.util.List;
import ${packageName}.domain.${ClassName};
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
#if($table.sub)
import ${packageName}.domain.${subClassName};
#end
@ -12,7 +13,7 @@ import ${packageName}.domain.${subClassName};
* @author ${author}
* @date ${datetime}
*/
public interface ${ClassName}Mapper
public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
{
/**
* 查询${functionName}

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

@ -2,7 +2,7 @@ package ${packageName}.service;
import java.util.List;
import ${packageName}.domain.${ClassName};
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* ${functionName}Service接口
*

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

@ -9,7 +9,7 @@ import com.ruoyi.common.core.utils.DateUtils;
#end
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
#if($table.sub)
import java.util.ArrayList;
import com.ruoyi.common.core.utils.StringUtils;

12
ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm
View File

@ -4,18 +4,18 @@ 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">
<resultMap type="${packageName}.domain.${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">
<resultMap id="${ClassName}${subClassName}Result" type="${packageName}.domain.${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">
<resultMap type="${packageName}.domain.${subClassName}" id="${subClassName}Result">
#foreach ($column in $subTable.columns)
<result property="${column.javaField}" column="sub_${column.columnName}" />
#end
@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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">
<select id="select${ClassName}List" parameterType="${packageName}.domain.${ClassName}" resultMap="${ClassName}Result">
<include refid="select${ClassName}Vo"/>
<where>
#foreach($column in $columns)
@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#end
</select>
<insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
<insert id="insert${ClassName}" parameterType="${packageName}.domain.${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
insert into ${tableName}
<trim prefix="(" suffix=")" suffixOverrides=",">
#foreach($column in $columns)
@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<update id="update${ClassName}" parameterType="${ClassName}">
<update id="update${ClassName}" parameterType="${packageName}.domain.${ClassName}">
update ${tableName}
<trim prefix="SET" suffixOverrides=",">
#foreach($column in $columns)

13
ruoyi-modules/ruoyi-system/pom.xml
View File

@ -59,11 +59,16 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-datasource</artifactId>
</dependency>
<!-- mybatis-flex -->
<!-- mybatis-plus-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<!-- mybatis-flex -->
<!-- <dependency>
<groupId>com.mybatis-flex</groupId>
<artifactId>mybatis-flex-spring-boot-starter</artifactId>
</dependency>
</dependency>-->
<!-- RuoYi Common DataScope -->
<dependency>
<groupId>com.ruoyi</groupId>
@ -109,7 +114,7 @@
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
@ -127,7 +132,7 @@
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugin>-->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingInfoDetail.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.domain;
import com.mybatisflex.annotation.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.*;
@ -19,12 +21,12 @@ import java.util.Date;
@Builder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@Table("building_info_detail")
@TableName("building_info_detail")
public class BuildingInfoDetail extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@TableId(type = IdType.AUTO)
private Long id;
/** $column.columnComment */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingLabel.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.domain;
import com.mybatisflex.annotation.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -14,12 +16,12 @@ import java.util.Date;
* @date 2023-07-04
*/
@Data
@Table("building_label")
@TableName("building_label")
public class BuildingLabel extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@TableId(type = IdType.AUTO)
private Long id;
/** $column.columnComment */

15
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingTeamRel.java
View File

@ -1,13 +1,12 @@
package com.ruoyi.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
import java.util.Date;
/**
* 【请填写功能名称】对象 building_team_rel
@ -16,12 +15,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
* @date 2023-07-04
*/
@Data
@Table("building_team_rel")
@TableName("building_team_rel")
public class BuildingTeamRel extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@TableId(type = IdType.AUTO)
private Long id;
/** $column.columnComment */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CameraInfo.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.domain;
import com.mybatisflex.annotation.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -14,12 +16,12 @@ import java.util.Date;
* @date 2023-07-04
*/
@Data
@Table("camera_info")
@TableName("camera_info")
public class CameraInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@TableId(type = IdType.AUTO)
private Long id;
/** $column.columnComment */

9
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Competition.java
View File

@ -1,12 +1,13 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.math.BigDecimal;
import java.util.Date;
@ -22,12 +23,12 @@ import java.util.Date;
@Builder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@Table("competition")
@TableName("competition")
public class Competition extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
@TableId(type = IdType.AUTO)
private Long id;
/** 主队ID */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java
View File

@ -1,7 +1,9 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -16,12 +18,12 @@ import java.util.Date;
* @date 2022-11-03
*/
@Data
@Table("competition_members")
@TableName("competition_members")
public class CompetitionMembers extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** ID */
@TableId(type = IdType.AUTO)
private Long id;
/** 用户ID */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java
View File

@ -1,7 +1,9 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
@ -16,12 +18,12 @@ import java.util.Date;
* @date 2022-11-03
*/
@Data
@Table("competition_members_score")
@TableName("competition_members_score")
public class CompetitionMembersScore extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
@TableId(type = IdType.AUTO)
private Long id;
/** 赛事id(competition的ID) */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java
View File

@ -1,7 +1,9 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -15,12 +17,12 @@ import java.util.Date;
* @date 2022-11-03
*/
@Data
@Table("competition_of_team")
@TableName("competition_of_team")
public class CompetitionOfTeam extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
@TableId(type = IdType.AUTO)
private Long id;
/** 赛事id(competition的ID) */

10
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionResult.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
@ -18,13 +18,13 @@ import java.util.Date;
* @date 2022-11-03
*/
@Data
@Table("competition_result")
@TableName("competition_result")
public class CompetitionResult extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
@Id(keyType = KeyType.Auto)
@TableId(type = IdType.AUTO)
private Long id;
/** 赛事id(competition的ID) */

7
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionSharePermissions.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.domain;
import com.mybatisflex.annotation.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -12,12 +14,13 @@ import lombok.Data;
* @date 2023-07-20
*/
@Data
@Table("competition_share_permissions")
@TableName("competition_share_permissions")
public class CompetitionSharePermissions extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
@TableId(type = IdType.AUTO)
private Long id;
/** 赛事id(competition的ID) */

7
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamGroup.java
View File

@ -1,7 +1,9 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.*;
@ -20,12 +22,13 @@ import java.util.Date;
@Builder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@Table("competition_team_group")
@TableName("competition_team_group")
public class CompetitionTeamGroup extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
@TableId(type = IdType.AUTO)
private Long id;
/** 赛事id(competition的ID) */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamVsTeam.java
View File

@ -1,7 +1,9 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -15,12 +17,12 @@ import java.util.Date;
* @date 2022-11-03
*/
@Data
@Table("competition_team_vs_team")
@TableName("competition_team_vs_team")
public class CompetitionTeamVsTeam extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
@TableId(type = IdType.AUTO)
private Long id;
/** 赛事id(competition的ID) */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FeatureLabel.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.domain;
import com.mybatisflex.annotation.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -14,12 +16,12 @@ import java.util.Date;
* @date 2023-07-06
*/
@Data
@Table("feature_label")
@TableName("feature_label")
public class FeatureLabel extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@TableId(type = IdType.AUTO)
private Long id;
/** $column.columnComment */

17
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FollowUp.java
View File

@ -1,15 +1,14 @@
package com.ruoyi.system.domain;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
import java.util.Date;
/**
* 跟进模块-客户跟进记录对象 f_follow_up
@ -18,13 +17,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
* @date 2023-05-07
*/
@Data
@Table("f_follow_up")
@TableName("f_follow_up")
public class FollowUp extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
@Id(keyType = KeyType.Auto)
@TableId(type = IdType.AUTO)
private Integer id;
/** 客户id */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GlobalAttachment.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.domain;
import com.mybatisflex.annotation.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -14,12 +16,12 @@ import java.util.Date;
* @date 2023-07-04
*/
@Data
@Table("global_attachment")
@TableName("global_attachment")
public class GlobalAttachment extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键id */
@TableId(type = IdType.AUTO)
private Long id;
/** 单据类型 */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWechat.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.domain;
import com.mybatisflex.annotation.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -14,12 +16,12 @@ import java.util.Date;
* @date 2023-07-04
*/
@Data
@Table("group_wechat")
@TableName("group_wechat")
public class GroupWechat extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@TableId(type = IdType.AUTO)
private Long id;
/** $column.columnComment */

156
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Message.java
View File

@ -1,12 +1,12 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
@ -17,12 +17,12 @@ import java.util.Date;
* @date 2023-07-04
*/
@Data
@Table("message")
@TableName("message")
public class Message extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@TableId(type = IdType.AUTO)
private Long id;
/** $column.columnComment */
@ -78,150 +78,4 @@ public class Message extends BaseEntity
@Excel(name = "流程参数【json】")
private String flowEntity;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setCreatedBy(String createdBy)
{
this.createdBy = createdBy;
}
public String getCreatedBy()
{
return createdBy;
}
public void setCreatedTime(Date createdTime)
{
this.createdTime = createdTime;
}
public Date getCreatedTime()
{
return createdTime;
}
public void setModifiedBy(String modifiedBy)
{
this.modifiedBy = modifiedBy;
}
public String getModifiedBy()
{
return modifiedBy;
}
public void setLastUpdatedTime(Date lastUpdatedTime)
{
this.lastUpdatedTime = lastUpdatedTime;
}
public Date getLastUpdatedTime()
{
return lastUpdatedTime;
}
public void setIsDeleted(Integer isDeleted)
{
this.isDeleted = isDeleted;
}
public Integer getIsDeleted()
{
return isDeleted;
}
public void setMessageTitle(String messageTitle)
{
this.messageTitle = messageTitle;
}
public String getMessageTitle()
{
return messageTitle;
}
public void setMessageType(String messageType)
{
this.messageType = messageType;
}
public String getMessageType()
{
return messageType;
}
public void setFlowType(String flowType)
{
this.flowType = flowType;
}
public String getFlowType()
{
return flowType;
}
public void setAuditor(Long auditor)
{
this.auditor = auditor;
}
public Long getAuditor()
{
return auditor;
}
public void setAuditDate(Date auditDate)
{
this.auditDate = auditDate;
}
public Date getAuditDate()
{
return auditDate;
}
public void setSourceId(Long sourceId)
{
this.sourceId = sourceId;
}
public Long getSourceId()
{
return sourceId;
}
public void setAgreeFlag(Integer agreeFlag)
{
this.agreeFlag = agreeFlag;
}
public Integer getAgreeFlag()
{
return agreeFlag;
}
public void setFlowEntity(String flowEntity)
{
this.flowEntity = flowEntity;
}
public String getFlowEntity()
{
return flowEntity;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("createdBy", getCreatedBy())
.append("createdTime", getCreatedTime())
.append("modifiedBy", getModifiedBy())
.append("lastUpdatedTime", getLastUpdatedTime())
.append("isDeleted", getIsDeleted())
.append("messageTitle", getMessageTitle())
.append("messageType", getMessageType())
.append("flowType", getFlowType())
.append("auditor", getAuditor())
.append("auditDate", getAuditDate())
.append("sourceId", getSourceId())
.append("agreeFlag", getAgreeFlag())
.append("flowEntity", getFlowEntity())
.toString();
}
}

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java
View File

@ -1,7 +1,9 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.*;
@ -20,12 +22,12 @@ import java.util.Date;
@Builder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@Table("team_members")
@TableName("team_members")
public class TeamMembers extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** ID */
@TableId(type = IdType.AUTO)
private Long id;
/** 球队ID */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrainingInfo.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.domain;
import com.mybatisflex.annotation.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -14,12 +16,12 @@ import java.util.Date;
* @date 2023-07-04
*/
@Data
@Table("training_info")
@TableName("training_info")
public class TrainingInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@TableId(type = IdType.AUTO)
private Long id;
/** $column.columnComment */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserBuildingRel.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.domain;
import com.mybatisflex.annotation.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -14,12 +16,12 @@ import java.util.Date;
* @date 2023-07-04
*/
@Data
@Table("user_building_rel")
@TableName("user_building_rel")
public class UserBuildingRel extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@TableId(type = IdType.AUTO)
private Long id;
/** $column.columnComment */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserRole.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.domain;
import com.mybatisflex.annotation.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.*;
@ -19,12 +21,12 @@ import java.util.Date;
@Builder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@Table("user_role")
@TableName("user_role")
public class UserRole extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@TableId(type = IdType.AUTO)
private Long id;
/** 用户id */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java
View File

@ -1,7 +1,9 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -15,12 +17,12 @@ import java.util.Date;
* @date 2022-10-20
*/
@Data
@Table("user_wx_aqr_code")
@TableName("user_wx_aqr_code")
public class UserWxAqrCode extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键ID */
@TableId(type = IdType.AUTO)
private Long id;
/** 删除表示 */

7
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBasketballTeam.java
View File

@ -1,7 +1,9 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -15,13 +17,14 @@ import java.util.Date;
* @date 2022-08-30
*/
@Data
@Table("basketball_team")
@TableName("basketball_team")
public class WxBasketballTeam extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** ID */
@Excel(name = "ID")
@TableId(type = IdType.AUTO)
private Long id;
/** 删除 */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBuildingInfo.java
View File

@ -1,7 +1,9 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -16,12 +18,12 @@ import java.util.Date;
* @date 2022-08-30
*/
@Data
@Table("building_info")
@TableName("building_info")
public class WxBuildingInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** ID */
@TableId(type = IdType.AUTO)
private Long id;
/** 删除 */

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java
View File

@ -1,7 +1,9 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Table;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
@ -16,12 +18,12 @@ import java.util.Date;
* @date 2022-08-30
*/
@Data
@Table("user_info")
@TableName("user_info")
public class WxUser extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键ID */
@TableId(type = IdType.AUTO)
private Long id;
/** 删除 */

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingInfoDetailMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.BuildingInfoDetail;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingLabelMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.BuildingLabel;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingTeamRelMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.BuildingTeamRel;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CameraInfoMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.CameraInfo;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.Competition;
import com.ruoyi.system.domain.vo.CompetitionExcleVo;
import com.ruoyi.system.domain.vo.CompetitionVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.CompetitionMembers;
import com.ruoyi.system.domain.vo.CompetitionMembersVo;
import org.apache.ibatis.annotations.Param;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.CompetitionMembersScore;
import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo;
import org.apache.ibatis.annotations.Param;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionOfTeamMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.CompetitionOfTeam;
import com.ruoyi.system.domain.vo.CompetitionOfTeamVo;
import org.apache.ibatis.annotations.Param;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.CompetitionResult;
import com.ruoyi.system.domain.vo.CompetitionResultVo;
import org.apache.ibatis.annotations.Param;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionSharePermissionsMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.CompetitionSharePermissions;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamGroupMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.CompetitionTeamGroup;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamVsTeamMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.CompetitionTeamVsTeam;
import com.ruoyi.system.domain.vo.CompetitionTeamIntegralVo;
import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo;

6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerOrderMapper.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.system.mapper;
import java.util.List;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.CustomerOrder;
import com.ruoyi.system.domain.vo.CustomerOrderVo;
import java.util.List;
/**
* 客户-订车Mapper接口
*

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FeatureLabelMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.FeatureLabel;
import java.util.List;

6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FollowUpMapper.java
View File

@ -1,10 +1,10 @@
package com.ruoyi.system.mapper;
import java.util.List;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.FollowUp;
import java.util.List;
/**
* 跟进模块-客户跟进记录Mapper接口
*

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalAttachmentMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.GlobalAttachment;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GroupWechatMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.GroupWechat;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MessageMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.Message;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TeamMembersMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.TeamMembers;
import com.ruoyi.system.domain.vo.TeamMembersResponse;
import com.ruoyi.system.domain.vo.TeamMembersVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrainingInfoMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.TrainingInfo;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserBuildingRelMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.UserBuildingRel;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserRoleMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.UserRole;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWxAqrCodeMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.UserWxAqrCode;
import com.ruoyi.system.domain.vo.UserWxAqrCodeVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBasketballTeamMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.WxBasketballTeam;
import org.apache.ibatis.annotations.Param;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBuildingInfoMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.WxBuildingInfo;
import com.ruoyi.system.domain.vo.BuildingInfoRequest;
import com.ruoyi.system.domain.vo.BuildingInfoResponse;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxUserMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.mybatisflex.core.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.WxUser;
import org.apache.ibatis.annotations.Param;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingInfoDetailService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.BuildingInfoDetail;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingLabelService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.BuildingLabel;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingTeamRelService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.BuildingTeamRel;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICameraInfoService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.CameraInfo;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.CompetitionMembersScore;
import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.CompetitionMembers;
import com.ruoyi.system.domain.vo.CompetitionMembersVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionOfTeamService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.CompetitionOfTeam;
import com.ruoyi.system.domain.vo.CompetitionOfTeamVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.CompetitionResult;
import com.ruoyi.system.domain.vo.CompetitionResultVo;
import com.ruoyi.system.domain.vo.CompetitionVsRecordVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
import com.ruoyi.system.domain.Competition;
import com.ruoyi.system.domain.vo.CompetitionExcleVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionSharePermissionsService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.CompetitionSharePermissions;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamGroupService.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.service;
import java.util.List;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.CompetitionSharePermissions;
import com.ruoyi.system.domain.CompetitionTeamGroup;
import com.ruoyi.system.domain.vo.TeamGroupRequest;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.CompetitionResult;
import com.ruoyi.system.domain.CompetitionTeamVsTeam;
import com.ruoyi.system.domain.vo.*;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerOrderService.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.service;
import java.util.List;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.CustomerOrder;
import com.ruoyi.system.domain.vo.CustomerOrderVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFeatureLabelService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.FeatureLabel;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFollowUpService.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.service;
import java.util.List;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.FollowUp;
/**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalAttachmentService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.GlobalAttachment;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGroupWechatService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.GroupWechat;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMessageService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.Message;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.TeamMembers;
import com.ruoyi.system.domain.vo.TeamMembersResponse;
import com.ruoyi.system.domain.vo.TeamMembersVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITrainingInfoService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.TrainingInfo;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserBuildingRelService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.UserBuildingRel;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserRoleService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.UserRole;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWxAqrCodeService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.UserWxAqrCode;
import com.ruoyi.system.domain.vo.UserWxAqrCodeVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBasketballTeamService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.WxBasketballTeam;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBuildingInfoService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.WxBuildingInfo;
import com.ruoyi.system.domain.vo.BuildingInfoRequest;
import com.ruoyi.system.domain.vo.BuildingInfoResponse;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
import com.mybatisflex.core.service.IService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.WxUser;
import java.util.List;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingInfoDetailServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service.impl;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.BuildingInfoDetail;
import com.ruoyi.system.mapper.BuildingInfoDetailMapper;
import com.ruoyi.system.service.IBuildingInfoDetailService;
@ -16,7 +16,7 @@ import java.util.List;
* @date 2023-07-06
*/
@Service
public class BuildingInfoDetailServiceImpl extends ServiceImpl<BuildingInfoDetailMapper, BuildingInfoDetail> implements IBuildingInfoDetailService
public class BuildingInfoDetailServiceImpl extends ServiceImpl<BuildingInfoDetailMapper, BuildingInfoDetail> implements IBuildingInfoDetailService
{
@Autowired
private BuildingInfoDetailMapper buildingInfoDetailMapper;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingLabelServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service.impl;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.BuildingLabel;
import com.ruoyi.system.mapper.BuildingLabelMapper;
import com.ruoyi.system.service.IBuildingLabelService;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingTeamRelServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service.impl;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.BuildingTeamRel;
import com.ruoyi.system.mapper.BuildingTeamRelMapper;
import com.ruoyi.system.service.IBuildingTeamRelService;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CameraInfoServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service.impl;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.CameraInfo;
import com.ruoyi.system.mapper.CameraInfoMapper;
import com.ruoyi.system.service.ICameraInfoService;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service.impl;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.CompetitionMembersScore;
import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo;
import com.ruoyi.system.mapper.CompetitionMembersScoreMapper;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.Competition;
import com.ruoyi.system.domain.CompetitionMembers;
import com.ruoyi.system.domain.CompetitionOfTeam;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionOfTeamServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service.impl;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.domain.CompetitionOfTeam;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service.impl;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.domain.CompetitionResult;
import com.ruoyi.system.domain.CompetitionTeamVsTeam;

Some files were not shown because too many files have changed in this diff Show More