From 64a59f7ddb888332f8719c5d99bdd77de04a8204 Mon Sep 17 00:00:00 2001 From: zhaonengzhi Date: Mon, 2 Aug 2021 21:04:34 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=95=B4=E7=90=86pom=E6=96=87=E4=BB=B6,?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 76 ++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index d408e1c..81845de 100644 --- a/pom.xml +++ b/pom.xml @@ -21,18 +21,33 @@ 1.8 1.3.3 2.7 + 1.3.2 + 2.0.7 + 1.2.68 + 1.2.5 + 1.2.6 + 1.7.0 + 2.0.0 + 2.4 + 4.1.12 + 1.7 + 1.10 + 1.4.7 + 1.6.2 + 1.11.543 + 1.3.7 - org.springframework.boot spring-boot-starter-data-redis + - org.apache.commons - commons-pool2 + org.apache.commons + commons-pool2 @@ -44,7 +59,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 1.3.2 + ${mybatis-spring.version} @@ -56,7 +71,7 @@ com.github.xiaoymin knife4j-spring-boot-starter - 2.0.7 + ${knife4j-spring.version} @@ -67,13 +82,13 @@ com.alibaba fastjson - 1.2.68 + ${fastjson.version} com.github.pagehelper pagehelper-spring-boot-starter - 1.2.5 + ${pagehelper-spring.version} @@ -93,13 +108,13 @@ com.alibaba druid-spring-boot-starter - 1.2.6 + ${druid-spring.version} org.apache.shiro shiro-spring - 1.7.0 + ${shiro-spring.version} org.springframework.boot @@ -109,7 +124,7 @@ com.github.theborakompanioni thymeleaf-extras-shiro - 2.0.0 + ${thymeleaf-extras-shiro.version} @@ -126,7 +141,7 @@ commons-lang commons-lang - 2.4 + ${commons-lang.version} @@ -141,9 +156,14 @@ commons-fileupload commons-fileupload ${commons.fileupload.version} + + + commons-io + commons-io + + - org.springframework.boot @@ -155,13 +175,19 @@ cn.hutool hutool-all - 4.1.12 + ${hutool-all.version} org.apache.velocity velocity - 1.7 + ${velocity.version} + + + commons-collections + commons-collections + + @@ -172,7 +198,13 @@ commons-configuration commons-configuration - 1.10 + ${commons-configuration.version} + + + commons-lang + commons-lang + + @@ -185,7 +217,7 @@ javax.mail mail - 1.4.7 + ${mail.version} @@ -199,13 +231,19 @@ com.github.whvcse easy-captcha - 1.6.2 + ${easy-captcha.version} com.amazonaws aws-java-sdk-s3 - 1.11.543 + ${aws-java-sdk-s3.version} + + + commons-logging + commons-logging + + @@ -227,7 +265,7 @@ org.mybatis.generator mybatis-generator-maven-plugin - 1.3.7 + ${mybatis-generator-maven-plugin.version} false -- Gitee From 1a13a869b0b7f9187b95bd873f17bf9a164eb46f Mon Sep 17 00:00:00 2001 From: zhaonengzhi Date: Mon, 2 Aug 2021 23:11:18 +0800 Subject: [PATCH 2/7] =?UTF-8?q?mybatis=E5=8D=87=E7=BA=A7=E4=B8=BAmybatis-p?= =?UTF-8?q?lus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 32 +++++++++++--- .../com/fc/v2/common/base/BaseService.java | 4 +- .../java/com/fc/v2/common/base/PageInfo.java | 2 +- ...atisConfig.java => MybatisPlusConfig.java} | 44 ++++++++++++++++--- .../fc/v2/mapper/auto/GeneratorMapper.java | 3 +- .../com/fc/v2/mapper/auto/SysAreaMapper.java | 3 +- .../com/fc/v2/mapper/auto/SysCityMapper.java | 3 +- .../v2/mapper/auto/SysDepartmentMapper.java | 3 +- .../com/fc/v2/mapper/auto/SysFileMapper.java | 3 +- .../fc/v2/mapper/auto/SysInterUrlMapper.java | 3 +- .../fc/v2/mapper/auto/SysNoticeMapper.java | 3 +- .../v2/mapper/auto/SysNoticeUserMapper.java | 3 +- .../fc/v2/mapper/auto/SysPositionMapper.java | 3 +- .../fc/v2/mapper/auto/SysProvinceMapper.java | 3 +- .../v2/mapper/auto/SysQuartzJobLogMapper.java | 3 +- .../fc/v2/mapper/auto/SysQuartzJobMapper.java | 3 +- .../fc/v2/mapper/auto/SysStreetMapper.java | 3 +- .../fc/v2/mapper/auto/TSysDictDataMapper.java | 3 +- .../fc/v2/mapper/auto/TSysDictTypeMapper.java | 3 +- .../fc/v2/mapper/auto/TSysEmailMapper.java | 3 +- .../fc/v2/mapper/auto/TSysRoleUserMapper.java | 3 +- .../fc/v2/mapper/auto/TsysOperLogMapper.java | 3 +- .../v2/mapper/auto/TsysPermissionMapper.java | 3 +- .../mapper/auto/TsysPermissionRoleMapper.java | 3 +- .../com/fc/v2/mapper/auto/TsysRoleMapper.java | 3 +- .../com/fc/v2/mapper/auto/TsysUserMapper.java | 3 +- .../fc/v2/mapper/custom/PermissionDao.java | 3 +- .../java/com/fc/v2/mapper/custom/RoleDao.java | 4 +- .../com/fc/v2/mapper/custom/TsysUserDao.java | 3 +- .../java/com/fc/v2/model/auto/SysArea.java | 6 +++ .../java/com/fc/v2/model/auto/SysCity.java | 6 +++ .../com/fc/v2/model/auto/SysDepartment.java | 6 +++ .../java/com/fc/v2/model/auto/SysFile.java | 6 +++ .../com/fc/v2/model/auto/SysInterUrl.java | 5 +++ .../java/com/fc/v2/model/auto/SysNotice.java | 5 +++ .../com/fc/v2/model/auto/SysNoticeUser.java | 6 +++ .../com/fc/v2/model/auto/SysPosition.java | 6 +++ .../com/fc/v2/model/auto/SysProvince.java | 6 +++ .../com/fc/v2/model/auto/SysQuartzJob.java | 6 +++ .../fc/v2/model/auto/SysQuartzJobExample.java | 3 ++ .../com/fc/v2/model/auto/SysQuartzJobLog.java | 5 +++ .../java/com/fc/v2/model/auto/SysStreet.java | 5 +++ .../com/fc/v2/model/auto/TSysDictData.java | 5 +++ .../com/fc/v2/model/auto/TSysDictType.java | 6 +++ .../java/com/fc/v2/model/auto/TSysEmail.java | 6 +++ .../com/fc/v2/model/auto/TSysRoleUser.java | 7 +++ .../com/fc/v2/model/auto/TsysOperLog.java | 6 +++ .../com/fc/v2/model/auto/TsysPermission.java | 7 +++ .../fc/v2/model/auto/TsysPermissionRole.java | 7 +++ .../java/com/fc/v2/model/auto/TsysRole.java | 7 +++ .../java/com/fc/v2/model/auto/TsysUser.java | 5 +++ .../java/com/fc/v2/service/DictService.java | 1 + .../com/fc/v2/service/GeneratorService.java | 4 +- .../com/fc/v2/service/SysAreaService.java | 4 +- .../com/fc/v2/service/SysCityService.java | 4 +- .../fc/v2/service/SysDepartmentService.java | 3 +- .../com/fc/v2/service/SysDictDataService.java | 3 +- .../com/fc/v2/service/SysDictTypeService.java | 3 +- .../com/fc/v2/service/SysFileService.java | 3 +- .../com/fc/v2/service/SysInterUrlService.java | 3 +- .../com/fc/v2/service/SysNoticeService.java | 3 +- .../fc/v2/service/SysNoticeUserService.java | 3 +- .../com/fc/v2/service/SysOperLogService.java | 3 +- .../fc/v2/service/SysPermissionService.java | 3 +- .../com/fc/v2/service/SysPositionService.java | 3 +- .../com/fc/v2/service/SysProvinceService.java | 4 +- .../fc/v2/service/SysQuartzJobLogService.java | 3 +- .../fc/v2/service/SysQuartzJobService.java | 3 +- .../com/fc/v2/service/SysRoleService.java | 3 +- .../com/fc/v2/service/SysStreetService.java | 3 +- .../com/fc/v2/service/SysUserService.java | 3 +- .../com/fc/v2/service/SysUtilService.java | 1 + .../com/fc/v2/service/TSysEmailService.java | 4 +- src/main/resources/application.yml | 17 +++++++ 74 files changed, 310 insertions(+), 59 deletions(-) rename src/main/java/com/fc/v2/common/conf/{MybatisConfig.java => MybatisPlusConfig.java} (68%) diff --git a/pom.xml b/pom.xml index 81845de..77fb7d2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ 1.8 1.3.3 2.7 - 1.3.2 + 2.1.4 2.0.7 1.2.68 - 1.2.5 + 1.3.1 1.2.6 1.7.0 2.0.0 @@ -36,10 +36,19 @@ 1.6.2 1.11.543 1.3.7 + 3.4.2 + + + com.h2database + h2 + 1.4.200 + runtime + + org.springframework.boot spring-boot-starter-data-redis @@ -55,11 +64,12 @@ org.springframework.boot spring-boot-starter-web - + + - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis-spring.version} + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} @@ -89,6 +99,16 @@ com.github.pagehelper pagehelper-spring-boot-starter ${pagehelper-spring.version} + + + org.mybatis + mybatis + + + org.mybatis + mybatis-spring + + diff --git a/src/main/java/com/fc/v2/common/base/BaseService.java b/src/main/java/com/fc/v2/common/base/BaseService.java index efa3f2a..7f916d2 100644 --- a/src/main/java/com/fc/v2/common/base/BaseService.java +++ b/src/main/java/com/fc/v2/common/base/BaseService.java @@ -1,6 +1,8 @@ package com.fc.v2.common.base; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; /** * 抽象类BaseService @@ -10,7 +12,7 @@ import org.apache.ibatis.annotations.Param; * @date 2018年6月3日 * */ -public interface BaseService { +public interface BaseService extends IService { int deleteByPrimaryKey(String id); diff --git a/src/main/java/com/fc/v2/common/base/PageInfo.java b/src/main/java/com/fc/v2/common/base/PageInfo.java index a512c45..73fc4aa 100644 --- a/src/main/java/com/fc/v2/common/base/PageInfo.java +++ b/src/main/java/com/fc/v2/common/base/PageInfo.java @@ -80,7 +80,7 @@ public class PageInfo implements Serializable { this.startRow = 0; this.endRow = 0; } else { - this.startRow = page.getStartRow() + 1; + this.startRow = (int) (page.getStartRow() + 1); //计算实际的endRow（最后一页的时候特殊） this.endRow = this.startRow - 1 + this.size; } diff --git a/src/main/java/com/fc/v2/common/conf/MybatisConfig.java b/src/main/java/com/fc/v2/common/conf/MybatisPlusConfig.java similarity index 68% rename from src/main/java/com/fc/v2/common/conf/MybatisConfig.java rename to src/main/java/com/fc/v2/common/conf/MybatisPlusConfig.java index 3b73d28..01bfc66 100644 --- a/src/main/java/com/fc/v2/common/conf/MybatisConfig.java +++ b/src/main/java/com/fc/v2/common/conf/MybatisPlusConfig.java @@ -2,11 +2,15 @@ package com.fc.v2.common.conf; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.core.config.GlobalConfig; +import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import com.fc.v2.common.dataSources.DataSourceType; import com.fc.v2.common.dataSources.DynamicDataSource; import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.annotation.MapperScan; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -16,9 +20,10 @@ import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.PlatformTransactionManager; + +import javax.sql.DataSource; import java.util.HashMap; import java.util.Map; -import javax.sql.DataSource; /** * Mybatis多数据源配置 @@ -28,8 +33,8 @@ import javax.sql.DataSource; * @date 2019-12-06 21:11 */ @Configuration -@MapperScan(basePackages = "com.fc.v2.mapper") -public class MybatisConfig { +@MapperScan(basePackages = {"com.fc.v2.mapper.auto","com.fc.v2.mapper.custom"}) +public class MybatisPlusConfig { @Bean @ConfigurationProperties("spring.datasource.druid.master") @@ -46,6 +51,30 @@ public class MybatisConfig { return DruidDataSourceBuilder.create().build(); } + @Bean + @ConfigurationProperties("mybatis-plus.configuration") + public MybatisConfiguration mybatisConfiguration(){ + return new MybatisConfiguration(); + } + + @Bean + @ConfigurationProperties("mybatis-plus.global-config") + public GlobalConfig globalConfig(){ + return new GlobalConfig(); + } + + @Autowired + private MybatisConfiguration mybatisConfiguration; + + @Autowired + private GlobalConfig globalConfig; + + @Value("${mybatis-plus.mapper-locations}") + private String locationPattern; + + @Value("${mybatis-plus.type-aliases-package}") + private String typeAliasesPackage; + @Bean(name = "dynamicDataSource") @Primary public DynamicDataSource dataSource(DataSource masterDataSource, DataSource slaveDataSource) @@ -58,12 +87,15 @@ public class MybatisConfig { @Bean public SqlSessionFactory sqlSessionFactory(DynamicDataSource dynamicDataSource) throws Exception { - SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean(); + MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); factoryBean.setDataSource(dynamicDataSource); // factoryBean.setTypeAliasesPackage(); // 设置mapper.xml的位置路径 - Resource[] resources = new PathMatchingResourcePatternResolver().getResources("classpath*:mybatis/*/*.xml"); + Resource[] resources = new PathMatchingResourcePatternResolver().getResources(locationPattern); factoryBean.setMapperLocations(resources); + factoryBean.setTypeAliasesPackage(typeAliasesPackage); + factoryBean.setConfiguration(mybatisConfiguration); + factoryBean.setGlobalConfig(globalConfig); return factoryBean.getObject(); } diff --git a/src/main/java/com/fc/v2/mapper/auto/GeneratorMapper.java b/src/main/java/com/fc/v2/mapper/auto/GeneratorMapper.java index a0843bc..2bc7617 100644 --- a/src/main/java/com/fc/v2/mapper/auto/GeneratorMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/GeneratorMapper.java @@ -1,5 +1,6 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.custom.TsysTables; import com.fc.v2.model.custom.autocode.BeanColumn; @@ -14,7 +15,7 @@ import java.util.Map; * @date 2019年5月9日 上午12:31:13  * @version V1.0    */ -public interface GeneratorMapper { +public interface GeneratorMapper extends BaseMapper { /** * 查询当前所有表 * @param tableName 条件搜索 diff --git a/src/main/java/com/fc/v2/mapper/auto/SysAreaMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysAreaMapper.java index 173061a..cace6f1 100644 --- a/src/main/java/com/fc/v2/mapper/auto/SysAreaMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/SysAreaMapper.java @@ -1,12 +1,13 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.SysArea; import com.fc.v2.model.auto.SysAreaExample; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface SysAreaMapper { +public interface SysAreaMapper extends BaseMapper { long countByExample(SysAreaExample example); int deleteByExample(SysAreaExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/SysCityMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysCityMapper.java index f83b92c..342ee5b 100644 --- a/src/main/java/com/fc/v2/mapper/auto/SysCityMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/SysCityMapper.java @@ -1,12 +1,13 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.SysCity; import com.fc.v2.model.auto.SysCityExample; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface SysCityMapper { +public interface SysCityMapper extends BaseMapper { long countByExample(SysCityExample example); int deleteByExample(SysCityExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/SysDepartmentMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysDepartmentMapper.java index b895a2f..ee440ef 100644 --- a/src/main/java/com/fc/v2/mapper/auto/SysDepartmentMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/SysDepartmentMapper.java @@ -1,5 +1,6 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.SysDepartment; import com.fc.v2.model.auto.SysDepartmentExample; import org.apache.ibatis.annotations.Param; @@ -12,7 +13,7 @@ import java.util.List; * @email 115889198@qq.com * @date 2020-04-17 13:12:58 */ -public interface SysDepartmentMapper { +public interface SysDepartmentMapper extends BaseMapper { long countByExample(SysDepartmentExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/SysFileMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysFileMapper.java index d7c23ba..4c2caa3 100644 --- a/src/main/java/com/fc/v2/mapper/auto/SysFileMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/SysFileMapper.java @@ -1,12 +1,13 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.SysFile; import com.fc.v2.model.auto.SysFileExample; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface SysFileMapper { +public interface SysFileMapper extends BaseMapper { int countByExample(SysFileExample example); int deleteByExample(SysFileExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/SysInterUrlMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysInterUrlMapper.java index b90ebe2..544df79 100644 --- a/src/main/java/com/fc/v2/mapper/auto/SysInterUrlMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/SysInterUrlMapper.java @@ -1,5 +1,6 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.SysInterUrl; import com.fc.v2.model.auto.SysInterUrlExample; import org.apache.ibatis.annotations.Param; @@ -12,7 +13,7 @@ import java.util.List; * @email 115889198@qq.com * @date 2020-01-05 01:48:22 */ -public interface SysInterUrlMapper { +public interface SysInterUrlMapper extends BaseMapper { long countByExample(SysInterUrlExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/SysNoticeMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysNoticeMapper.java index da1b7b7..534dc54 100644 --- a/src/main/java/com/fc/v2/mapper/auto/SysNoticeMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/SysNoticeMapper.java @@ -1,5 +1,6 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.SysNotice; import com.fc.v2.model.auto.SysNoticeExample; import org.apache.ibatis.annotations.Param; @@ -12,7 +13,7 @@ import java.util.List; * @email 115889198@qq.com * @date 2019-09-08 01:38:44 */ -public interface SysNoticeMapper { +public interface SysNoticeMapper extends BaseMapper { long countByExample(SysNoticeExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/SysNoticeUserMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysNoticeUserMapper.java index e2760ba..ea9c14f 100644 --- a/src/main/java/com/fc/v2/mapper/auto/SysNoticeUserMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/SysNoticeUserMapper.java @@ -1,5 +1,6 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.SysNoticeUser; import com.fc.v2.model.auto.SysNoticeUserExample; import org.apache.ibatis.annotations.Param; @@ -12,7 +13,7 @@ import java.util.List; * @email 115889198@qq.com * @date 2019-09-08 02:12:54 */ -public interface SysNoticeUserMapper { +public interface SysNoticeUserMapper extends BaseMapper { long countByExample(SysNoticeUserExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/SysPositionMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysPositionMapper.java index e12ca4d..09fdf6d 100644 --- a/src/main/java/com/fc/v2/mapper/auto/SysPositionMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/SysPositionMapper.java @@ -1,5 +1,6 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.SysPosition; import com.fc.v2.model.auto.SysPositionExample; import org.apache.ibatis.annotations.Param; @@ -12,7 +13,7 @@ import java.util.List; * @email 115889198@qq.com * @date 2020-04-16 23:46:24 */ -public interface SysPositionMapper { +public interface SysPositionMapper extends BaseMapper { long countByExample(SysPositionExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/SysProvinceMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysProvinceMapper.java index d99aad8..5033413 100644 --- a/src/main/java/com/fc/v2/mapper/auto/SysProvinceMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/SysProvinceMapper.java @@ -1,12 +1,13 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.SysProvince; import com.fc.v2.model.auto.SysProvinceExample; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface SysProvinceMapper { +public interface SysProvinceMapper extends BaseMapper { long countByExample(SysProvinceExample example); int deleteByExample(SysProvinceExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobLogMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobLogMapper.java index a72e470..4ae9d54 100644 --- a/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobLogMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobLogMapper.java @@ -1,5 +1,6 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.SysQuartzJobLog; import com.fc.v2.model.auto.SysQuartzJobLogExample; import org.apache.ibatis.annotations.Param; @@ -12,7 +13,7 @@ import java.util.List; * @email 115889198@qq.com * @date 2019-09-13 00:03:42 */ -public interface SysQuartzJobLogMapper { +public interface SysQuartzJobLogMapper extends BaseMapper { long countByExample(SysQuartzJobLogExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobMapper.java index 2c24c2a..c3ba82e 100644 --- a/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobMapper.java @@ -1,5 +1,6 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.SysQuartzJob; import com.fc.v2.model.auto.SysQuartzJobExample; import org.apache.ibatis.annotations.Param; @@ -12,7 +13,7 @@ import java.util.List; * @email 115889198@qq.com * @date 2019-09-13 00:03:35 */ -public interface SysQuartzJobMapper { +public interface SysQuartzJobMapper extends BaseMapper { long countByExample(SysQuartzJobExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/SysStreetMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysStreetMapper.java index feed6ac..2f35c1c 100644 --- a/src/main/java/com/fc/v2/mapper/auto/SysStreetMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/SysStreetMapper.java @@ -1,5 +1,6 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.SysStreet; import com.fc.v2.model.auto.SysStreetExample; import org.apache.ibatis.annotations.Param; @@ -12,7 +13,7 @@ import java.util.List; * @email 115889198@qq.com * @date 2019-10-05 01:02:28 */ -public interface SysStreetMapper { +public interface SysStreetMapper extends BaseMapper { long countByExample(SysStreetExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysDictDataMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysDictDataMapper.java index d3bf7f6..ad72640 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TSysDictDataMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TSysDictDataMapper.java @@ -1,5 +1,6 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TSysDictData; import com.fc.v2.model.auto.TSysDictDataExample; import org.apache.ibatis.annotations.Param; @@ -13,7 +14,7 @@ import java.util.List; * @email 438081243@qq.com * @date 2019-09-08 00:10:43 */ -public interface TSysDictDataMapper { +public interface TSysDictDataMapper extends BaseMapper { long countByExample(TSysDictDataExample example); int deleteByExample(TSysDictDataExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysDictTypeMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysDictTypeMapper.java index a76997f..0501272 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TSysDictTypeMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TSysDictTypeMapper.java @@ -1,5 +1,6 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TSysDictType; import com.fc.v2.model.auto.TSysDictTypeExample; import org.apache.ibatis.annotations.Param; @@ -13,7 +14,7 @@ import java.util.List; * @email 438081243@qq.com * @date 2019-09-05 12:34:25 */ -public interface TSysDictTypeMapper { +public interface TSysDictTypeMapper extends BaseMapper { long countByExample(TSysDictTypeExample example); int deleteByExample(TSysDictTypeExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysEmailMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysEmailMapper.java index 69e237c..871fb22 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TSysEmailMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TSysEmailMapper.java @@ -1,12 +1,13 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TSysEmail; import com.fc.v2.model.auto.TSysEmailExample; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface TSysEmailMapper { +public interface TSysEmailMapper extends BaseMapper { long countByExample(TSysEmailExample example); int deleteByExample(TSysEmailExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysRoleUserMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysRoleUserMapper.java index 39bbfc9..72b2919 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TSysRoleUserMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TSysRoleUserMapper.java @@ -1,12 +1,13 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TSysRoleUser; import com.fc.v2.model.auto.TSysRoleUserExample; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface TSysRoleUserMapper { +public interface TSysRoleUserMapper extends BaseMapper { int countByExample(TSysRoleUserExample example); int deleteByExample(TSysRoleUserExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/TsysOperLogMapper.java b/src/main/java/com/fc/v2/mapper/auto/TsysOperLogMapper.java index 37b0ecc..96afa90 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TsysOperLogMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TsysOperLogMapper.java @@ -1,12 +1,13 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TsysOperLog; import com.fc.v2.model.auto.TsysOperLogExample; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface TsysOperLogMapper { +public interface TsysOperLogMapper extends BaseMapper { int countByExample(TsysOperLogExample example); int deleteByExample(TsysOperLogExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/TsysPermissionMapper.java b/src/main/java/com/fc/v2/mapper/auto/TsysPermissionMapper.java index b4e1ed9..ee5a58a 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TsysPermissionMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TsysPermissionMapper.java @@ -1,12 +1,13 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TsysPermission; import com.fc.v2.model.auto.TsysPermissionExample; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface TsysPermissionMapper { +public interface TsysPermissionMapper extends BaseMapper { long countByExample(TsysPermissionExample example); int deleteByExample(TsysPermissionExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/TsysPermissionRoleMapper.java b/src/main/java/com/fc/v2/mapper/auto/TsysPermissionRoleMapper.java index 9ad5e05..718db92 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TsysPermissionRoleMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TsysPermissionRoleMapper.java @@ -1,12 +1,13 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TsysPermissionRole; import com.fc.v2.model.auto.TsysPermissionRoleExample; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface TsysPermissionRoleMapper { +public interface TsysPermissionRoleMapper extends BaseMapper { int countByExample(TsysPermissionRoleExample example); int deleteByExample(TsysPermissionRoleExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/TsysRoleMapper.java b/src/main/java/com/fc/v2/mapper/auto/TsysRoleMapper.java index f3dd108..69a7a52 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TsysRoleMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TsysRoleMapper.java @@ -1,12 +1,13 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TsysRole; import com.fc.v2.model.auto.TsysRoleExample; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface TsysRoleMapper { +public interface TsysRoleMapper extends BaseMapper { int countByExample(TsysRoleExample example); int deleteByExample(TsysRoleExample example); diff --git a/src/main/java/com/fc/v2/mapper/auto/TsysUserMapper.java b/src/main/java/com/fc/v2/mapper/auto/TsysUserMapper.java index bedbc5d..118bde2 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TsysUserMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TsysUserMapper.java @@ -1,12 +1,13 @@ package com.fc.v2.mapper.auto; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TsysUser; import com.fc.v2.model.auto.TsysUserExample; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface TsysUserMapper { +public interface TsysUserMapper extends BaseMapper { long countByExample(TsysUserExample example); int deleteByExample(TsysUserExample example); diff --git a/src/main/java/com/fc/v2/mapper/custom/PermissionDao.java b/src/main/java/com/fc/v2/mapper/custom/PermissionDao.java index 698f620..e22194b 100644 --- a/src/main/java/com/fc/v2/mapper/custom/PermissionDao.java +++ b/src/main/java/com/fc/v2/mapper/custom/PermissionDao.java @@ -1,10 +1,11 @@ package com.fc.v2.mapper.custom; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TsysPermission; import java.util.List; -public interface PermissionDao { +public interface PermissionDao extends BaseMapper { /** * 查询全部权限 * @return diff --git a/src/main/java/com/fc/v2/mapper/custom/RoleDao.java b/src/main/java/com/fc/v2/mapper/custom/RoleDao.java index dfcbf92..cf6eab4 100644 --- a/src/main/java/com/fc/v2/mapper/custom/RoleDao.java +++ b/src/main/java/com/fc/v2/mapper/custom/RoleDao.java @@ -1,6 +1,8 @@ package com.fc.v2.mapper.custom; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TsysRole; + import java.util.List; /** @@ -10,7 +12,7 @@ import java.util.List; * @date 2018年8月25日 * */ -public interface RoleDao { +public interface RoleDao extends BaseMapper { /** * 根据用户id查询角色 * @param userid diff --git a/src/main/java/com/fc/v2/mapper/custom/TsysUserDao.java b/src/main/java/com/fc/v2/mapper/custom/TsysUserDao.java index 2610a0e..db03a12 100644 --- a/src/main/java/com/fc/v2/mapper/custom/TsysUserDao.java +++ b/src/main/java/com/fc/v2/mapper/custom/TsysUserDao.java @@ -1,5 +1,6 @@ package com.fc.v2.mapper.custom; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TsysUser; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * @date 2018年8月25日 * */ -public interface TsysUserDao { +public interface TsysUserDao extends BaseMapper { /** * 根据用户名字查询用户 * @param username diff --git a/src/main/java/com/fc/v2/model/auto/SysArea.java b/src/main/java/com/fc/v2/model/auto/SysArea.java index c7862da..9ee18df 100644 --- a/src/main/java/com/fc/v2/model/auto/SysArea.java +++ b/src/main/java/com/fc/v2/model/auto/SysArea.java @@ -3,9 +3,15 @@ package com.fc.v2.model.auto; import java.io.Serializable; 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; +@TableName(value = "t_sys_area") public class SysArea implements Serializable { + + @TableId(type = IdType.ASSIGN_ID) private Integer id; private String areaCode; diff --git a/src/main/java/com/fc/v2/model/auto/SysCity.java b/src/main/java/com/fc/v2/model/auto/SysCity.java index 0d19b6e..1e977e0 100644 --- a/src/main/java/com/fc/v2/model/auto/SysCity.java +++ b/src/main/java/com/fc/v2/model/auto/SysCity.java @@ -3,9 +3,15 @@ package com.fc.v2.model.auto; import java.io.Serializable; 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; +@TableName(value = "t_sys_city") public class SysCity implements Serializable { + + @TableId(type = IdType.ASSIGN_ID) private Integer id; private String cityCode; diff --git a/src/main/java/com/fc/v2/model/auto/SysDepartment.java b/src/main/java/com/fc/v2/model/auto/SysDepartment.java index 6a38a5a..fb0b570 100644 --- a/src/main/java/com/fc/v2/model/auto/SysDepartment.java +++ b/src/main/java/com/fc/v2/model/auto/SysDepartment.java @@ -1,6 +1,10 @@ package com.fc.v2.model.auto; import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -13,12 +17,14 @@ import java.lang.Integer; * @email 115889198@qq.com * @date 2020-04-17 13:12:58 */ +@TableName(value = "t_sys_department") @ApiModel(value = "SysDepartment", description = "部门表") public class SysDepartment implements Serializable { private static final long serialVersionUID = 1L; /** id **/ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") private Integer id; diff --git a/src/main/java/com/fc/v2/model/auto/SysFile.java b/src/main/java/com/fc/v2/model/auto/SysFile.java index e5a53ad..07fb899 100644 --- a/src/main/java/com/fc/v2/model/auto/SysFile.java +++ b/src/main/java/com/fc/v2/model/auto/SysFile.java @@ -1,10 +1,16 @@ package com.fc.v2.model.auto; +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 java.util.Date; +@TableName(value = "t_sys_file") public class SysFile { + + @TableId(type = IdType.ASSIGN_ID) private String id; private String fileName; diff --git a/src/main/java/com/fc/v2/model/auto/SysInterUrl.java b/src/main/java/com/fc/v2/model/auto/SysInterUrl.java index 9614744..aa66f2e 100644 --- a/src/main/java/com/fc/v2/model/auto/SysInterUrl.java +++ b/src/main/java/com/fc/v2/model/auto/SysInterUrl.java @@ -1,5 +1,8 @@ package com.fc.v2.model.auto; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -11,6 +14,7 @@ import java.io.Serializable; * @email 115889198@qq.com * @date 2020-01-05 01:48:22 */ +@TableName(value = "t_sys_inter_url") @ApiModel(value="SysInterUrl", description="拦截url表") public class SysInterUrl implements Serializable { @@ -18,6 +22,7 @@ public class SysInterUrl implements Serializable { /** 主键 **/ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private String id; diff --git a/src/main/java/com/fc/v2/model/auto/SysNotice.java b/src/main/java/com/fc/v2/model/auto/SysNotice.java index 14bcb10..3df99a4 100644 --- a/src/main/java/com/fc/v2/model/auto/SysNotice.java +++ b/src/main/java/com/fc/v2/model/auto/SysNotice.java @@ -1,5 +1,8 @@ package com.fc.v2.model.auto; +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.fc.v2.util.DateUtils; @@ -12,12 +15,14 @@ import java.util.Date; * @email 115889198@qq.com * @date 2019-09-08 01:38:44 */ +@TableName(value = "t_sys_notice") public class SysNotice implements Serializable { private static final long serialVersionUID = 1L; /** 主键 **/ + @TableId(type = IdType.ASSIGN_ID) private String id; /** 标题 **/ diff --git a/src/main/java/com/fc/v2/model/auto/SysNoticeUser.java b/src/main/java/com/fc/v2/model/auto/SysNoticeUser.java index 2d428e4..794dfa2 100644 --- a/src/main/java/com/fc/v2/model/auto/SysNoticeUser.java +++ b/src/main/java/com/fc/v2/model/auto/SysNoticeUser.java @@ -1,5 +1,9 @@ package com.fc.v2.model.auto; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; import java.lang.Integer; @@ -9,12 +13,14 @@ import java.lang.Integer; * @email 115889198@qq.com * @date 2019-09-08 02:12:54 */ +@TableName(value = "t_sys_notice_user") public class SysNoticeUser implements Serializable { private static final long serialVersionUID = 1L; /** 主键 **/ + @TableId(type = IdType.ASSIGN_ID) private String id; /** 公告id **/ diff --git a/src/main/java/com/fc/v2/model/auto/SysPosition.java b/src/main/java/com/fc/v2/model/auto/SysPosition.java index 07e2009..83ae68f 100644 --- a/src/main/java/com/fc/v2/model/auto/SysPosition.java +++ b/src/main/java/com/fc/v2/model/auto/SysPosition.java @@ -1,6 +1,10 @@ package com.fc.v2.model.auto; import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -13,12 +17,14 @@ import java.lang.Integer; * @email 115889198@qq.com * @date 2020-04-16 23:46:24 */ +@TableName(value = "t_sys_position") @ApiModel(value = "SysPosition", description = "岗位表") public class SysPosition implements Serializable { private static final long serialVersionUID = 1L; /** 主键 **/ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private String id; diff --git a/src/main/java/com/fc/v2/model/auto/SysProvince.java b/src/main/java/com/fc/v2/model/auto/SysProvince.java index a903226..bef1f60 100644 --- a/src/main/java/com/fc/v2/model/auto/SysProvince.java +++ b/src/main/java/com/fc/v2/model/auto/SysProvince.java @@ -3,9 +3,15 @@ package com.fc.v2.model.auto; import java.io.Serializable; 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; +@TableName(value = "t_sys_province") public class SysProvince implements Serializable { + + @TableId(type = IdType.ASSIGN_ID) private Integer id; private String provinceCode; diff --git a/src/main/java/com/fc/v2/model/auto/SysQuartzJob.java b/src/main/java/com/fc/v2/model/auto/SysQuartzJob.java index 1966781..102a2f9 100644 --- a/src/main/java/com/fc/v2/model/auto/SysQuartzJob.java +++ b/src/main/java/com/fc/v2/model/auto/SysQuartzJob.java @@ -1,5 +1,9 @@ package com.fc.v2.model.auto; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; import java.lang.Integer; @@ -9,12 +13,14 @@ import java.lang.Integer; * @email 115889198@qq.com * @date 2019-09-13 00:03:35 */ +@TableName(value = "t_sys_quartz_job") public class SysQuartzJob implements Serializable { private static final long serialVersionUID = 1L; /** id **/ + @TableId(type = IdType.ASSIGN_ID) private String id; /** 任务名称 **/ diff --git a/src/main/java/com/fc/v2/model/auto/SysQuartzJobExample.java b/src/main/java/com/fc/v2/model/auto/SysQuartzJobExample.java index a765243..343c73e 100644 --- a/src/main/java/com/fc/v2/model/auto/SysQuartzJobExample.java +++ b/src/main/java/com/fc/v2/model/auto/SysQuartzJobExample.java @@ -1,5 +1,7 @@ package com.fc.v2.model.auto; +import com.baomidou.mybatisplus.annotation.TableName; + import java.util.ArrayList; import java.util.List; @@ -9,6 +11,7 @@ import java.util.List; * @email 115889198@qq.com * @date 2019-09-13 00:03:35 */ +@TableName(value = "t_sys_quartz_job") public class SysQuartzJobExample { protected String orderByClause; diff --git a/src/main/java/com/fc/v2/model/auto/SysQuartzJobLog.java b/src/main/java/com/fc/v2/model/auto/SysQuartzJobLog.java index 6099593..590efa6 100644 --- a/src/main/java/com/fc/v2/model/auto/SysQuartzJobLog.java +++ b/src/main/java/com/fc/v2/model/auto/SysQuartzJobLog.java @@ -1,5 +1,8 @@ package com.fc.v2.model.auto; +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.fc.v2.util.DateUtils; @@ -12,12 +15,14 @@ import java.util.Date; * @email 115889198@qq.com * @date 2019-09-13 00:03:42 */ +@TableName(value = "t_sys_quartz_job_log") public class SysQuartzJobLog implements Serializable { private static final long serialVersionUID = 1L; /** 主键 **/ + @TableId(type = IdType.ASSIGN_ID) private String id; /** 任务名称 **/ diff --git a/src/main/java/com/fc/v2/model/auto/SysStreet.java b/src/main/java/com/fc/v2/model/auto/SysStreet.java index 2786fdb..0d8531d 100644 --- a/src/main/java/com/fc/v2/model/auto/SysStreet.java +++ b/src/main/java/com/fc/v2/model/auto/SysStreet.java @@ -1,5 +1,8 @@ package com.fc.v2.model.auto; +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 java.io.Serializable; @@ -11,12 +14,14 @@ import java.util.Date; * @email 115889198@qq.com * @date 2019-10-05 01:02:28 */ +@TableName(value = "t_sys_street") public class SysStreet implements Serializable { private static final long serialVersionUID = 1L; /** 自增列 **/ + @TableId(type = IdType.ASSIGN_ID) private Integer id; /** 街道代码 **/ diff --git a/src/main/java/com/fc/v2/model/auto/TSysDictData.java b/src/main/java/com/fc/v2/model/auto/TSysDictData.java index 5349c05..9a86365 100644 --- a/src/main/java/com/fc/v2/model/auto/TSysDictData.java +++ b/src/main/java/com/fc/v2/model/auto/TSysDictData.java @@ -3,6 +3,9 @@ package com.fc.v2.model.auto; import java.io.Serializable; import java.util.Date; +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; @@ -15,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @email 438081243@qq.com * @date 2019-09-08 00:10:43 */ +@TableName(value = "t_sys_dict_data") public class TSysDictData implements Serializable { private static final long serialVersionUID = 1L; @@ -22,6 +26,7 @@ public class TSysDictData implements Serializable { /** * 字典数据表id */ + @TableId(type = IdType.ASSIGN_ID) private String id; /** diff --git a/src/main/java/com/fc/v2/model/auto/TSysDictType.java b/src/main/java/com/fc/v2/model/auto/TSysDictType.java index 9e1b97c..141e973 100644 --- a/src/main/java/com/fc/v2/model/auto/TSysDictType.java +++ b/src/main/java/com/fc/v2/model/auto/TSysDictType.java @@ -3,6 +3,10 @@ package com.fc.v2.model.auto; import java.io.Serializable; 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; /** * 字典类型表 @@ -11,11 +15,13 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @email 438081243@qq.com * @date 2019-09-05 12:34:25 */ +@TableName(value = "t_sys_dict_type") public class TSysDictType implements Serializable { private static final long serialVersionUID = 1L; /** 主键 **/ + @TableId(type = IdType.ASSIGN_ID) private String id; /** 字典名称 **/ diff --git a/src/main/java/com/fc/v2/model/auto/TSysEmail.java b/src/main/java/com/fc/v2/model/auto/TSysEmail.java index 4fb0fab..d05cd85 100644 --- a/src/main/java/com/fc/v2/model/auto/TSysEmail.java +++ b/src/main/java/com/fc/v2/model/auto/TSysEmail.java @@ -3,9 +3,15 @@ package com.fc.v2.model.auto; import java.io.Serializable; 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; +@TableName(value = "t_sys_email") public class TSysEmail implements Serializable { + + @TableId(type = IdType.ASSIGN_ID) private String id; private String receiversEmail; diff --git a/src/main/java/com/fc/v2/model/auto/TSysRoleUser.java b/src/main/java/com/fc/v2/model/auto/TSysRoleUser.java index f96617f..fcc1f8e 100644 --- a/src/main/java/com/fc/v2/model/auto/TSysRoleUser.java +++ b/src/main/java/com/fc/v2/model/auto/TSysRoleUser.java @@ -1,8 +1,15 @@ package com.fc.v2.model.auto; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; +@TableName(value = "t_sys_role_user") public class TSysRoleUser implements Serializable { + + @TableId(type = IdType.ASSIGN_ID) private String id; private String sysUserId; diff --git a/src/main/java/com/fc/v2/model/auto/TsysOperLog.java b/src/main/java/com/fc/v2/model/auto/TsysOperLog.java index c13307c..1e8105f 100644 --- a/src/main/java/com/fc/v2/model/auto/TsysOperLog.java +++ b/src/main/java/com/fc/v2/model/auto/TsysOperLog.java @@ -1,11 +1,17 @@ package com.fc.v2.model.auto; +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.fc.v2.util.DateUtils; import java.util.Date; +@TableName(value = "t_sys_oper_log") public class TsysOperLog { + + @TableId(type = IdType.ASSIGN_ID) private String id; private String title; diff --git a/src/main/java/com/fc/v2/model/auto/TsysPermission.java b/src/main/java/com/fc/v2/model/auto/TsysPermission.java index 2e02015..63ee472 100644 --- a/src/main/java/com/fc/v2/model/auto/TsysPermission.java +++ b/src/main/java/com/fc/v2/model/auto/TsysPermission.java @@ -1,8 +1,15 @@ package com.fc.v2.model.auto; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; +@TableName(value = "t_sys_permission") public class TsysPermission implements Serializable { + + @TableId(type = IdType.ASSIGN_ID) private String id; private String name; diff --git a/src/main/java/com/fc/v2/model/auto/TsysPermissionRole.java b/src/main/java/com/fc/v2/model/auto/TsysPermissionRole.java index 7686281..152dde2 100644 --- a/src/main/java/com/fc/v2/model/auto/TsysPermissionRole.java +++ b/src/main/java/com/fc/v2/model/auto/TsysPermissionRole.java @@ -1,8 +1,15 @@ package com.fc.v2.model.auto; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; +@TableName(value = "t_sys_permission_role") public class TsysPermissionRole implements Serializable { + + @TableId(type = IdType.ASSIGN_ID) private String id; private String roleId; diff --git a/src/main/java/com/fc/v2/model/auto/TsysRole.java b/src/main/java/com/fc/v2/model/auto/TsysRole.java index e2c47cc..d8b7d5b 100644 --- a/src/main/java/com/fc/v2/model/auto/TsysRole.java +++ b/src/main/java/com/fc/v2/model/auto/TsysRole.java @@ -1,8 +1,15 @@ package com.fc.v2.model.auto; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; +@TableName(value = "t_sys_role") public class TsysRole implements Serializable { + + @TableId(type = IdType.ASSIGN_ID) private String id; private String name; diff --git a/src/main/java/com/fc/v2/model/auto/TsysUser.java b/src/main/java/com/fc/v2/model/auto/TsysUser.java index 9a8bf23..40cf685 100644 --- a/src/main/java/com/fc/v2/model/auto/TsysUser.java +++ b/src/main/java/com/fc/v2/model/auto/TsysUser.java @@ -2,13 +2,18 @@ package com.fc.v2.model.auto; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; +@TableName(value = "t_sys_user") public class TsysUser implements Serializable { private static final long serialVersionUID = 1L; /** 主键 **/ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private String id; diff --git a/src/main/java/com/fc/v2/service/DictService.java b/src/main/java/com/fc/v2/service/DictService.java index 26b2d9b..be8af77 100644 --- a/src/main/java/com/fc/v2/service/DictService.java +++ b/src/main/java/com/fc/v2/service/DictService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.mapper.auto.TSysDictDataMapper; import com.fc.v2.mapper.auto.TSysDictTypeMapper; import com.fc.v2.model.auto.TSysDictData; diff --git a/src/main/java/com/fc/v2/service/GeneratorService.java b/src/main/java/com/fc/v2/service/GeneratorService.java index 2c24847..bb2745d 100644 --- a/src/main/java/com/fc/v2/service/GeneratorService.java +++ b/src/main/java/com/fc/v2/service/GeneratorService.java @@ -1,6 +1,8 @@ package com.fc.v2.service; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.mapper.auto.GeneratorMapper; import com.fc.v2.model.custom.Tablepar; import com.fc.v2.model.custom.TsysTables; @@ -21,7 +23,7 @@ import java.util.List; * @version V1.0 */ @Service -public class GeneratorService { +public class GeneratorService extends ServiceImpl implements IService { @Autowired private GeneratorMapper generatorMapper; /** diff --git a/src/main/java/com/fc/v2/service/SysAreaService.java b/src/main/java/com/fc/v2/service/SysAreaService.java index bd1d908..646fddc 100644 --- a/src/main/java/com/fc/v2/service/SysAreaService.java +++ b/src/main/java/com/fc/v2/service/SysAreaService.java @@ -1,5 +1,7 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.SysAreaMapper; import com.fc.v2.model.auto.SysArea; @@ -22,7 +24,7 @@ import java.util.List; * @date 2019-10-04 21:47:38 **/ @Service -public class SysAreaService { +public class SysAreaService extends ServiceImpl implements IService { @Autowired private SysAreaMapper sysAreaMapper; diff --git a/src/main/java/com/fc/v2/service/SysCityService.java b/src/main/java/com/fc/v2/service/SysCityService.java index 620eb45..eb0fc77 100644 --- a/src/main/java/com/fc/v2/service/SysCityService.java +++ b/src/main/java/com/fc/v2/service/SysCityService.java @@ -1,5 +1,7 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.SysCityMapper; import com.fc.v2.model.auto.SysCity; @@ -22,7 +24,7 @@ import java.util.List; * @date 2019-10-04 21:15:13 **/ @Service -public class SysCityService { +public class SysCityService extends ServiceImpl implements IService { @Autowired private SysCityMapper sysCityMapper; diff --git a/src/main/java/com/fc/v2/service/SysDepartmentService.java b/src/main/java/com/fc/v2/service/SysDepartmentService.java index d943d94..d5e8609 100644 --- a/src/main/java/com/fc/v2/service/SysDepartmentService.java +++ b/src/main/java/com/fc/v2/service/SysDepartmentService.java @@ -1,6 +1,7 @@ package com.fc.v2.service; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.SysDepartmentMapper; @@ -26,7 +27,7 @@ import java.util.List; * @date 2020-04-17 13:12:58 **/ @Service -public class SysDepartmentService implements BaseService { +public class SysDepartmentService extends ServiceImpl implements BaseService { @Autowired private SysDepartmentMapper sysDepartmentMapper; diff --git a/src/main/java/com/fc/v2/service/SysDictDataService.java b/src/main/java/com/fc/v2/service/SysDictDataService.java index 62784a2..12426d0 100644 --- a/src/main/java/com/fc/v2/service/SysDictDataService.java +++ b/src/main/java/com/fc/v2/service/SysDictDataService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.TSysDictDataMapper; @@ -27,7 +28,7 @@ import java.util.List; * @date 2019-09-08 00:10:43 */ @Service -public class SysDictDataService implements BaseService{ +public class SysDictDataService extends ServiceImpl implements BaseService{ @Autowired private TSysDictDataMapper tSysDictDataMapper; @Autowired diff --git a/src/main/java/com/fc/v2/service/SysDictTypeService.java b/src/main/java/com/fc/v2/service/SysDictTypeService.java index 11b2f70..3a19f63 100644 --- a/src/main/java/com/fc/v2/service/SysDictTypeService.java +++ b/src/main/java/com/fc/v2/service/SysDictTypeService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.TSysDictDataMapper; @@ -29,7 +30,7 @@ import java.util.List; * @date 2019-09-05 12:34:25 */ @Service -public class SysDictTypeService implements BaseService{ +public class SysDictTypeService extends ServiceImpl implements BaseService{ @Autowired private TSysDictTypeMapper tSysDictTypeMapper; @Autowired diff --git a/src/main/java/com/fc/v2/service/SysFileService.java b/src/main/java/com/fc/v2/service/SysFileService.java index a5e634d..1fb4dac 100644 --- a/src/main/java/com/fc/v2/service/SysFileService.java +++ b/src/main/java/com/fc/v2/service/SysFileService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.SysFileMapper; @@ -17,7 +18,7 @@ import java.util.Date; import java.util.List; @Service -public class SysFileService implements BaseService { +public class SysFileService extends ServiceImpl implements BaseService { @Autowired private SysFileMapper sysFileMapper; diff --git a/src/main/java/com/fc/v2/service/SysInterUrlService.java b/src/main/java/com/fc/v2/service/SysInterUrlService.java index 4707cf4..8eea82b 100644 --- a/src/main/java/com/fc/v2/service/SysInterUrlService.java +++ b/src/main/java/com/fc/v2/service/SysInterUrlService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.SysInterUrlMapper; @@ -23,7 +24,7 @@ import java.util.List; * @date 2020-01-05 01:48:22 **/ @Service -public class SysInterUrlService implements BaseService{ +public class SysInterUrlService extends ServiceImpl implements BaseService{ @Autowired private SysInterUrlMapper sysInterUrlMapper; diff --git a/src/main/java/com/fc/v2/service/SysNoticeService.java b/src/main/java/com/fc/v2/service/SysNoticeService.java index 52dba9f..d11bcd8 100644 --- a/src/main/java/com/fc/v2/service/SysNoticeService.java +++ b/src/main/java/com/fc/v2/service/SysNoticeService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.SysNoticeMapper; @@ -28,7 +29,7 @@ import java.util.List; * @date 2019-09-08 01:38:44 **/ @Service -public class SysNoticeService implements BaseService{ +public class SysNoticeService extends ServiceImpl implements BaseService{ @Autowired private SysNoticeMapper sysNoticeMapper; @Autowired diff --git a/src/main/java/com/fc/v2/service/SysNoticeUserService.java b/src/main/java/com/fc/v2/service/SysNoticeUserService.java index 5d0bdb3..05e57dd 100644 --- a/src/main/java/com/fc/v2/service/SysNoticeUserService.java +++ b/src/main/java/com/fc/v2/service/SysNoticeUserService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.SysNoticeUserMapper; @@ -23,7 +24,7 @@ import java.util.List; * @date 2019-09-08 02:12:54 **/ @Service -public class SysNoticeUserService implements BaseService{ +public class SysNoticeUserService extends ServiceImpl implements BaseService{ @Autowired private SysNoticeUserMapper sysNoticeUserMapper; diff --git a/src/main/java/com/fc/v2/service/SysOperLogService.java b/src/main/java/com/fc/v2/service/SysOperLogService.java index 802dc12..474631b 100644 --- a/src/main/java/com/fc/v2/service/SysOperLogService.java +++ b/src/main/java/com/fc/v2/service/SysOperLogService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.TsysOperLogMapper; @@ -14,7 +15,7 @@ import org.springframework.stereotype.Service; import java.util.List; @Service -public class SysOperLogService implements BaseService{ +public class SysOperLogService extends ServiceImpl implements BaseService{ //文件mapper @Autowired diff --git a/src/main/java/com/fc/v2/service/SysPermissionService.java b/src/main/java/com/fc/v2/service/SysPermissionService.java index 766deeb..3aed2a2 100644 --- a/src/main/java/com/fc/v2/service/SysPermissionService.java +++ b/src/main/java/com/fc/v2/service/SysPermissionService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.TsysPermissionMapper; @@ -23,7 +24,7 @@ import java.util.ArrayList; import java.util.List; @Service -public class SysPermissionService implements BaseService{ +public class SysPermissionService extends ServiceImpl implements BaseService{ //权限mapper @Autowired diff --git a/src/main/java/com/fc/v2/service/SysPositionService.java b/src/main/java/com/fc/v2/service/SysPositionService.java index dbbc880..01285e8 100644 --- a/src/main/java/com/fc/v2/service/SysPositionService.java +++ b/src/main/java/com/fc/v2/service/SysPositionService.java @@ -1,6 +1,7 @@ package com.fc.v2.service; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.SysPositionMapper; @@ -25,7 +26,7 @@ import java.util.List; * @date 2020-04-16 23:46:24 **/ @Service -public class SysPositionService implements BaseService{ +public class SysPositionService extends ServiceImpl implements BaseService{ @Autowired private SysPositionMapper sysPositionMapper; diff --git a/src/main/java/com/fc/v2/service/SysProvinceService.java b/src/main/java/com/fc/v2/service/SysProvinceService.java index e3b0964..59b8956 100644 --- a/src/main/java/com/fc/v2/service/SysProvinceService.java +++ b/src/main/java/com/fc/v2/service/SysProvinceService.java @@ -1,5 +1,7 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.SysProvinceMapper; import com.fc.v2.model.auto.SysProvince; @@ -22,7 +24,7 @@ import java.util.List; * @date 2019-10-04 19:56:15 **/ @Service -public class SysProvinceService{ +public class SysProvinceService extends ServiceImpl implements IService { @Autowired private SysProvinceMapper sysProvinceMapper; diff --git a/src/main/java/com/fc/v2/service/SysQuartzJobLogService.java b/src/main/java/com/fc/v2/service/SysQuartzJobLogService.java index 92562a0..babc32d 100644 --- a/src/main/java/com/fc/v2/service/SysQuartzJobLogService.java +++ b/src/main/java/com/fc/v2/service/SysQuartzJobLogService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.SysQuartzJobLogMapper; @@ -23,7 +24,7 @@ import java.util.List; * @date 2019-09-13 00:03:42 **/ @Service -public class SysQuartzJobLogService implements BaseService{ +public class SysQuartzJobLogService extends ServiceImpl implements BaseService{ @Autowired private SysQuartzJobLogMapper sysQuartzJobLogMapper; diff --git a/src/main/java/com/fc/v2/service/SysQuartzJobService.java b/src/main/java/com/fc/v2/service/SysQuartzJobService.java index f7895ea..9f3919c 100644 --- a/src/main/java/com/fc/v2/service/SysQuartzJobService.java +++ b/src/main/java/com/fc/v2/service/SysQuartzJobService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.quartz.QuartzSchedulerUtil; import com.fc.v2.common.quartz.ScheduleConstants; @@ -27,7 +28,7 @@ import java.util.List; * @date 2019-09-13 00:03:35 **/ @Service -public class SysQuartzJobService implements BaseService{ +public class SysQuartzJobService extends ServiceImpl implements BaseService{ @Autowired private SysQuartzJobMapper sysQuartzJobMapper; @Autowired diff --git a/src/main/java/com/fc/v2/service/SysRoleService.java b/src/main/java/com/fc/v2/service/SysRoleService.java index e622fb2..16284e2 100644 --- a/src/main/java/com/fc/v2/service/SysRoleService.java +++ b/src/main/java/com/fc/v2/service/SysRoleService.java @@ -1,6 +1,7 @@ package com.fc.v2.service; import cn.hutool.core.util.RandomUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.TsysPermissionRoleMapper; @@ -21,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; @Service -public class SysRoleService implements BaseService { +public class SysRoleService extends ServiceImpl implements BaseService { //角色mapper @Autowired private TsysRoleMapper tsysRoleMapper; diff --git a/src/main/java/com/fc/v2/service/SysStreetService.java b/src/main/java/com/fc/v2/service/SysStreetService.java index c41656e..afa570d 100644 --- a/src/main/java/com/fc/v2/service/SysStreetService.java +++ b/src/main/java/com/fc/v2/service/SysStreetService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.SysStreetMapper; @@ -23,7 +24,7 @@ import java.util.List; * @date 2019-10-05 01:02:28 **/ @Service -public class SysStreetService implements BaseService{ +public class SysStreetService extends ServiceImpl implements BaseService{ @Autowired private SysStreetMapper sysStreetMapper; diff --git a/src/main/java/com/fc/v2/service/SysUserService.java b/src/main/java/com/fc/v2/service/SysUserService.java index 7087cf0..fe30640 100644 --- a/src/main/java/com/fc/v2/service/SysUserService.java +++ b/src/main/java/com/fc/v2/service/SysUserService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.base.BaseService; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.TSysRoleUserMapper; @@ -30,7 +31,7 @@ import java.util.List; * */ @Service -public class SysUserService implements BaseService{ +public class SysUserService extends ServiceImpl implements BaseService{ //生成的用户dao @Autowired private TsysUserMapper tsysUserMapper; diff --git a/src/main/java/com/fc/v2/service/SysUtilService.java b/src/main/java/com/fc/v2/service/SysUtilService.java index ad1fb77..9ddbba3 100644 --- a/src/main/java/com/fc/v2/service/SysUtilService.java +++ b/src/main/java/com/fc/v2/service/SysUtilService.java @@ -1,5 +1,6 @@ package com.fc.v2.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.mapper.custom.SysUtilDao; import com.fc.v2.model.custom.SQLAdapter; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/fc/v2/service/TSysEmailService.java b/src/main/java/com/fc/v2/service/TSysEmailService.java index 54a7e0f..42f89cd 100644 --- a/src/main/java/com/fc/v2/service/TSysEmailService.java +++ b/src/main/java/com/fc/v2/service/TSysEmailService.java @@ -2,6 +2,8 @@ package com.fc.v2.service; import java.util.Date; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.github.pagehelper.PageHelper; @@ -24,7 +26,7 @@ import com.fc.v2.util.SnowflakeIdWorker; * @date 2019-06-30 00:49:49 */ @Service -public class TSysEmailService implements BaseService{ +public class TSysEmailService extends ServiceImpl implements BaseService{ @Autowired private TSysEmailMapper tSysEmailMapper; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7145aa2..06a4f39 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -95,6 +95,23 @@ spring : # configuration : # map-underscore-to-camel-case : true #pagehelper分页插件 +mybatis-plus: + #config-location: classpath:mybatis/mybatis-config.xml + mapper-locations: classpath:mybatis/**/*Mapper.xml + type-aliases-package: com.fc.v2.model.auto,com.fc.v2.model.custom + configuration: + map-underscore-to-camel-case: true + cache-enabled: true + lazy-loading-enabled: true + multiple-result-sets-enabled: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + call-setters-on-nulls: true + global-config: + banner: false + db-config: + id-type: assign_id + table-underline: true + pagehelper: helperDialect: mysql reasonable: true -- Gitee From 41606c14c8a9aca6e7d457464a5ae119435d7ab8 Mon Sep 17 00:00:00 2001 From: zhaonengzhi Date: Thu, 5 Aug 2021 20:47:38 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9C=81=E4=BB=BD?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9=E4=B8=BAmybatis-plus?= =?UTF-8?q?=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/springbootv2.sql | 133 ++- pom.xml | 8 - .../com/fc/v2/common/base/BaseEntity.java | 90 ++ .../fc/v2/common/conf/MybatisPlusConfig.java | 52 +- .../admin/ProvinceLinkageController.java | 158 +-- .../controller/admin/SysAreaController.java | 259 ++-- .../controller/admin/SysCityController.java | 272 +++-- .../admin/SysProvinceController.java | 262 ++-- .../controller/admin/SysStreetController.java | 268 +++-- .../com/fc/v2/mapper/auto/SysAreaMapper.java | 32 - .../com/fc/v2/mapper/auto/SysCityMapper.java | 32 - .../fc/v2/mapper/auto/SysProvinceMapper.java | 32 - .../fc/v2/mapper/auto/SysStreetMapper.java | 40 - .../com/fc/v2/mapper/auto/TSysAreaMapper.java | 16 + .../com/fc/v2/mapper/auto/TSysCityMapper.java | 17 + .../fc/v2/mapper/auto/TSysProvinceMapper.java | 17 + .../fc/v2/mapper/auto/TSysStreetMapper.java | 17 + .../java/com/fc/v2/model/auto/SysArea.java | 157 --- .../com/fc/v2/model/auto/SysAreaExample.java | 991 --------------- .../java/com/fc/v2/model/auto/SysCity.java | 157 --- .../com/fc/v2/model/auto/SysCityExample.java | 991 --------------- .../com/fc/v2/model/auto/SysProvince.java | 146 --- .../fc/v2/model/auto/SysProvinceExample.java | 921 -------------- .../java/com/fc/v2/model/auto/SysStreet.java | 193 --- .../fc/v2/model/auto/SysStreetExample.java | 1060 ----------------- .../java/com/fc/v2/model/auto/TSysArea.java | 152 +++ .../java/com/fc/v2/model/auto/TSysCity.java | 152 +++ .../com/fc/v2/model/auto/TSysProvince.java | 139 +++ .../java/com/fc/v2/model/auto/TSysStreet.java | 152 +++ .../com/fc/v2/service/ITSysAreaService.java | 74 ++ .../com/fc/v2/service/ITSysCityService.java | 74 ++ .../fc/v2/service/ITSysProvinceService.java | 74 ++ .../com/fc/v2/service/ITSysStreetService.java | 74 ++ .../com/fc/v2/service/SysAreaService.java | 131 -- .../com/fc/v2/service/SysCityService.java | 129 -- .../com/fc/v2/service/SysProvinceService.java | 129 -- .../com/fc/v2/service/SysStreetService.java | 136 --- .../v2/service/impl/TSysAreaServiceImpl.java | 116 ++ .../v2/service/impl/TSysCityServiceImpl.java | 110 ++ .../service/impl/TSysProvinceServiceImpl.java | 115 ++ .../service/impl/TSysStreetServiceImpl.java | 116 ++ src/main/resources/application.yml | 3 +- .../resources/mybatis/auto/SysAreaMapper.xml | 325 ----- .../resources/mybatis/auto/SysCityMapper.xml | 325 ----- .../mybatis/auto/SysProvinceMapper.xml | 308 ----- .../mybatis/auto/SysStreetMapper.xml | 396 ------ .../resources/mybatis/auto/TSysAreaMapper.xml | 27 + .../resources/mybatis/auto/TSysCityMapper.xml | 27 + .../mybatis/auto/TSysProvinceMapper.xml | 26 + .../mybatis/auto/TSysStreetMapper.xml | 27 + 50 files changed, 2357 insertions(+), 7301 deletions(-) create mode 100644 src/main/java/com/fc/v2/common/base/BaseEntity.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/SysAreaMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/SysCityMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/SysProvinceMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/SysStreetMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysAreaMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysCityMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysProvinceMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysStreetMapper.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysArea.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysAreaExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysCity.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysCityExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysProvince.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysProvinceExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysStreet.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysStreetExample.java create mode 100644 src/main/java/com/fc/v2/model/auto/TSysArea.java create mode 100644 src/main/java/com/fc/v2/model/auto/TSysCity.java create mode 100644 src/main/java/com/fc/v2/model/auto/TSysProvince.java create mode 100644 src/main/java/com/fc/v2/model/auto/TSysStreet.java create mode 100644 src/main/java/com/fc/v2/service/ITSysAreaService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysCityService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysProvinceService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysStreetService.java delete mode 100644 src/main/java/com/fc/v2/service/SysAreaService.java delete mode 100644 src/main/java/com/fc/v2/service/SysCityService.java delete mode 100644 src/main/java/com/fc/v2/service/SysProvinceService.java delete mode 100644 src/main/java/com/fc/v2/service/SysStreetService.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysCityServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysProvinceServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysStreetServiceImpl.java delete mode 100644 src/main/resources/mybatis/auto/SysAreaMapper.xml delete mode 100644 src/main/resources/mybatis/auto/SysCityMapper.xml delete mode 100644 src/main/resources/mybatis/auto/SysProvinceMapper.xml delete mode 100644 src/main/resources/mybatis/auto/SysStreetMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysAreaMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysCityMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysProvinceMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysStreetMapper.xml diff --git a/doc/springbootv2.sql b/doc/springbootv2.sql index b095f71..c9e7d7a 100644 --- a/doc/springbootv2.sql +++ b/doc/springbootv2.sql @@ -22,7 +22,7 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- DROP TABLE IF EXISTS `t_sys_area`; CREATE TABLE `t_sys_area` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增列', + `id` bigint(30) NOT NULL COMMENT '主键', `area_code` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '区代码', `city_code` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '父级市代码', `area_name` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '市名称', @@ -30,62 +30,63 @@ CREATE TABLE `t_sys_area` ( `lng` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '经度', `lat` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '纬度', `sort` int(6) NULL DEFAULT NULL COMMENT '排序', - `gmt_create` datetime NULL DEFAULT NULL COMMENT '创建时间', - `gmt_modified` datetime NULL DEFAULT NULL COMMENT '修改时间', - `memo` varchar(250) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', - `data_state` int(11) NULL DEFAULT NULL COMMENT '状态', - PRIMARY KEY (`id`) USING BTREE, + `data_state` bigint(11) NULL DEFAULT NULL COMMENT '状态', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', INDEX `Index_1`(`area_code`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2013 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '地区设置' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '地区设置' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_area -- ---------------------------- -INSERT INTO `t_sys_area` VALUES (1975, '500101', '500100', '万州区', '万州', '108.380249', '30.807808', 28, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1976, '500102', '500100', '涪陵区', '涪陵', '107.394905', '29.703651', 11, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1977, '500103', '500100', '渝中区', '渝中', '106.562881', '29.556742', 37, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1978, '500104', '500100', '大渡口区', '大渡口', '106.48613', '29.481003', 6, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1979, '500105', '500100', '江北区', '江北', '106.532845', '29.575352', 13, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1980, '500106', '500100', '沙坪坝区', '沙坪坝', '106.454201', '29.541224', 24, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1981, '500107', '500100', '九龙坡区', '九龙坡', '106.480988', '29.523493', 15, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1982, '500108', '500100', '南岸区', '南岸', '106.560814', '29.523993', 18, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1983, '500109', '500100', '北碚区', '北碚', '106.437866', '29.82543', 2, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1984, '500112', '500100', '渝北区', '渝北', '106.512848', '29.601452', 35, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1985, '500113', '500100', '巴南区', '巴南', '106.519424', '29.38192', 1, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1986, '500114', '500100', '黔江区', '黔江', '108.782578', '29.527548', 21, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1987, '500115', '500100', '长寿区', '长寿', '107.074852', '29.833672', 4, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1988, '500222', '500100', '綦江区', '綦江', '106.651421', '29.028091', 22, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1989, '500223', '500100', '潼南县', '潼南', '105.84182', '30.189554', 27, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1990, '500224', '500100', '铜梁县', '铜梁', '106.054947', '29.839945', 26, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1991, '500225', '500100', '大足区', '大足', '105.715317', '29.700499', 7, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1992, '500226', '500100', '荣昌县', '荣昌', '105.594063', '29.403627', 23, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1993, '500227', '500100', '璧山县', '璧山', '106.231125', '29.59358', 3, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1994, '500228', '500100', '梁平县', '梁平', '107.800034', '30.672169', 17, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1995, '500229', '500100', '城口县', '城口', '108.664902', '31.946293', 5, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1996, '500230', '500100', '丰都县', '丰都', '107.732483', '29.866425', 9, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1997, '500231', '500100', '垫江县', '垫江', '107.348694', '30.330011', 8, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1998, '500232', '500100', '武隆县', '武隆', '107.756554', '29.323759', 29, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (1999, '500233', '500100', '忠县', '忠县', '108.037521', '30.291536', 38, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2000, '500234', '500100', '开县', '开县', '108.413315', '31.167734', 16, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2001, '500235', '500100', '云阳县', '云阳', '108.697701', '30.930529', 36, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2002, '500236', '500100', '奉节县', '奉节', '109.465775', '31.019966', 10, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2003, '500237', '500100', '巫山县', '巫山', '109.878929', '31.074842', 30, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2004, '500238', '500100', '巫溪县', '巫溪', '109.628914', '31.396601', 31, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2005, '500240', '500100', '石柱土家族自治县', '石柱', '108.11245', '29.998529', 25, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2006, '500241', '500100', '秀山土家族苗族自治县', '秀山', '108.99604', '28.444773', 32, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2007, '500242', '500100', '酉阳土家族苗族自治县', '酉阳', '108.767204', '28.839828', 34, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2008, '500243', '500100', '彭水苗族土家族自治县', '彭水', '108.16655', '29.293856', 20, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2009, '500381', '500100', '江津区', '江津', '106.253159', '29.283386', 14, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2010, '500382', '500100', '合川区', '合川', '106.265556', '29.990993', 12, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2011, '500383', '500100', '永川区', '永川', '105.894714', '29.348747', 33, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); -INSERT INTO `t_sys_area` VALUES (2012, '500384', '500100', '南川区', '南川', '107.098152', '29.156647', 19, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); +INSERT INTO `t_sys_area` VALUES (1975, '500101', '500100', '万州区', '万州', '108.380249', '30.807808', 28, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1976, '500102', '500100', '涪陵区', '涪陵', '107.394905', '29.703651', 11, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1977, '500103', '500100', '渝中区', '渝中', '106.562881', '29.556742', 37, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1978, '500104', '500100', '大渡口区', '大渡口', '106.48613', '29.481003', 6, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1979, '500105', '500100', '江北区', '江北', '106.532845', '29.575352', 13, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1980, '500106', '500100', '沙坪坝区', '沙坪坝', '106.454201', '29.541224', 24, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1981, '500107', '500100', '九龙坡区', '九龙坡', '106.480988', '29.523493', 15, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1982, '500108', '500100', '南岸区', '南岸', '106.560814', '29.523993', 18, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1983, '500109', '500100', '北碚区', '北碚', '106.437866', '29.82543', 2, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1984, '500112', '500100', '渝北区', '渝北', '106.512848', '29.601452', 35, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1985, '500113', '500100', '巴南区', '巴南', '106.519424', '29.38192', 1, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1986, '500114', '500100', '黔江区', '黔江', '108.782578', '29.527548', 21, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1987, '500115', '500100', '长寿区', '长寿', '107.074852', '29.833672', 4, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1988, '500222', '500100', '綦江区', '綦江', '106.651421', '29.028091', 22, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1989, '500223', '500100', '潼南县', '潼南', '105.84182', '30.189554', 27, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1990, '500224', '500100', '铜梁县', '铜梁', '106.054947', '29.839945', 26, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1991, '500225', '500100', '大足区', '大足', '105.715317', '29.700499', 7, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1992, '500226', '500100', '荣昌县', '荣昌', '105.594063', '29.403627', 23, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1993, '500227', '500100', '璧山县', '璧山', '106.231125', '29.59358', 3, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1994, '500228', '500100', '梁平县', '梁平', '107.800034', '30.672169', 17, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1995, '500229', '500100', '城口县', '城口', '108.664902', '31.946293', 5, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1996, '500230', '500100', '丰都县', '丰都', '107.732483', '29.866425', 9, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1997, '500231', '500100', '垫江县', '垫江', '107.348694', '30.330011', 8, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1998, '500232', '500100', '武隆县', '武隆', '107.756554', '29.323759', 29, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (1999, '500233', '500100', '忠县', '忠县', '108.037521', '30.291536', 38, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2000, '500234', '500100', '开县', '开县', '108.413315', '31.167734', 16, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2001, '500235', '500100', '云阳县', '云阳', '108.697701', '30.930529', 36, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2002, '500236', '500100', '奉节县', '奉节', '109.465775', '31.019966', 10, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2003, '500237', '500100', '巫山县', '巫山', '109.878929', '31.074842', 30, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2004, '500238', '500100', '巫溪县', '巫溪', '109.628914', '31.396601', 31, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2005, '500240', '500100', '石柱土家族自治县', '石柱', '108.11245', '29.998529', 25, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2006, '500241', '500100', '秀山土家族苗族自治县', '秀山', '108.99604', '28.444773', 32, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2007, '500242', '500100', '酉阳土家族苗族自治县', '酉阳', '108.767204', '28.839828', 34, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2008, '500243', '500100', '彭水苗族土家族自治县', '彭水', '108.16655', '29.293856', 20, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2009, '500381', '500100', '江津区', '江津', '106.253159', '29.283386', 14, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2010, '500382', '500100', '合川区', '合川', '106.265556', '29.990993', 12, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2011, '500383', '500100', '永川区', '永川', '105.894714', '29.348747', 33, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); +INSERT INTO `t_sys_area` VALUES (2012, '500384', '500100', '南川区', '南川', '107.098152', '29.156647', 19, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); -- ---------------------------- -- Table structure for t_sys_city -- ---------------------------- DROP TABLE IF EXISTS `t_sys_city`; CREATE TABLE `t_sys_city` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增列', + `id` bigint(30) NOT NULL COMMENT '主键', `city_code` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '市代码', `city_name` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '市名称', `short_name` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '简称', @@ -93,18 +94,20 @@ CREATE TABLE `t_sys_city` ( `lng` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '经度', `lat` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '纬度', `sort` int(6) NULL DEFAULT NULL COMMENT '排序', - `gmt_create` datetime NULL DEFAULT NULL COMMENT '创建时间', - `gmt_modified` datetime NULL DEFAULT NULL COMMENT '修改时间', - `memo` varchar(250) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', `data_state` int(11) NULL DEFAULT NULL COMMENT '状态', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE, INDEX `Index_1`(`city_code`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 256 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '城市设置' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '城市设置' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_city -- ---------------------------- -INSERT INTO `t_sys_city` VALUES (255, '500100', '重庆市', '重庆', '500000', '106.504959', '29.533155', 1, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); +INSERT INTO `t_sys_city` VALUES (255, '500100', '重庆市', '重庆', '500000', '106.504959', '29.533155', 1, 0, '', '2019-02-28 17:16:58', '', '2019-02-28 17:17:05', NULL); -- ---------------------------- -- Table structure for t_sys_department @@ -714,25 +717,27 @@ INSERT INTO `t_sys_position` VALUES ('411477874382606336', '员工', 4, 1); -- ---------------------------- DROP TABLE IF EXISTS `t_sys_province`; CREATE TABLE `t_sys_province` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增列', + `id` bigint(30) NOT NULL COMMENT '主键', `province_code` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '省份代码', `province_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '省份名称', `short_name` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '简称', `lng` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '经度', `lat` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '纬度', `sort` int(6) NULL DEFAULT NULL COMMENT '排序', - `gmt_create` datetime NULL DEFAULT NULL COMMENT '创建时间', - `gmt_modified` datetime NULL DEFAULT NULL COMMENT '修改时间', - `memo` varchar(250) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', - `data_state` int(11) NULL DEFAULT NULL COMMENT '状态', + `data_state` bigint(11) NULL DEFAULT NULL COMMENT '状态', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE, INDEX `Index_1`(`province_code`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 23 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '省份表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '省份表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_province -- ---------------------------- -INSERT INTO `t_sys_province` VALUES (22, '500000', '重庆', '重庆', '106.504959', '29.533155', 22, '2019-02-28 17:16:58', '2019-02-28 17:17:05', '', 0); +INSERT INTO `t_sys_province` VALUES (22, '500000', '重庆', '重庆', '106.504959', '29.533155', 22, 0, NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_quartz_job @@ -1020,7 +1025,7 @@ INSERT INTO `t_sys_role_user` VALUES ('612107905537146880', '612107905532952576' -- ---------------------------- DROP TABLE IF EXISTS `t_sys_street`; CREATE TABLE `t_sys_street` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增列', + `id` bigint(30) NOT NULL COMMENT '主键', `street_code` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '街道代码', `area_code` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '父级区代码', `street_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '街道名称', @@ -1028,13 +1033,15 @@ CREATE TABLE `t_sys_street` ( `lng` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '经度', `lat` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '纬度', `sort` int(6) NULL DEFAULT NULL COMMENT '排序', - `gmt_create` datetime NULL DEFAULT NULL COMMENT '创建时间', - `gmt_modified` datetime NULL DEFAULT NULL COMMENT '修改时间', - `memo` varchar(250) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', `data_state` int(11) NULL DEFAULT NULL COMMENT '状态', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE, INDEX `Index_1`(`street_code`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '街道设置' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '街道设置' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_street diff --git a/pom.xml b/pom.xml index 77fb7d2..d67b73e 100644 --- a/pom.xml +++ b/pom.xml @@ -41,14 +41,6 @@ - - - com.h2database - h2 - 1.4.200 - runtime - - org.springframework.boot spring-boot-starter-data-redis diff --git a/src/main/java/com/fc/v2/common/base/BaseEntity.java b/src/main/java/com/fc/v2/common/base/BaseEntity.java new file mode 100644 index 0000000..58e233d --- /dev/null +++ b/src/main/java/com/fc/v2/common/base/BaseEntity.java @@ -0,0 +1,90 @@ +package com.fc.v2.common.base; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * Entity基类 + * + * @author zhaonz + */ +public class BaseEntity implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 创建者 */ + @TableField(value = "create_by", fill = FieldFill.INSERT) + private String createBy; + + /** 创建时间 */ + @TableField(value = "create_time",fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date createTime; + + /** 更新者 */ + @TableField(value = "update_by", fill = FieldFill.UPDATE) + private String updateBy; + + /** 更新时间 */ + @TableField(value = "update_time",fill = FieldFill.UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date updateTime; + + /** 备注 */ + @TableField(value = "remark") + private String remark; + + public String getCreateBy() + { + return createBy; + } + + public void setCreateBy(String createBy) + { + this.createBy = createBy; + } + + public Date getCreateTime() + { + return createTime; + } + + public void setCreateTime(Date createTime) + { + this.createTime = createTime; + } + + public String getUpdateBy() + { + return updateBy; + } + + public void setUpdateBy(String updateBy) + { + this.updateBy = updateBy; + } + + public Date getUpdateTime() + { + return updateTime; + } + + public void setUpdateTime(Date updateTime) + { + this.updateTime = updateTime; + } + + public String getRemark() + { + return remark; + } + + public void setRemark(String remark) + { + this.remark = remark; + } +} diff --git a/src/main/java/com/fc/v2/common/conf/MybatisPlusConfig.java b/src/main/java/com/fc/v2/common/conf/MybatisPlusConfig.java index 01bfc66..be37a2d 100644 --- a/src/main/java/com/fc/v2/common/conf/MybatisPlusConfig.java +++ b/src/main/java/com/fc/v2/common/conf/MybatisPlusConfig.java @@ -4,9 +4,12 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; import com.baomidou.mybatisplus.core.MybatisConfiguration; import com.baomidou.mybatisplus.core.config.GlobalConfig; +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import com.fc.v2.common.dataSources.DataSourceType; import com.fc.v2.common.dataSources.DynamicDataSource; +import com.fc.v2.shiro.util.ShiroUtils; +import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Autowired; @@ -22,66 +25,78 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.PlatformTransactionManager; import javax.sql.DataSource; +import java.util.Date; import java.util.HashMap; import java.util.Map; /** * Mybatis多数据源配置 * 参考文章：https://www.cnblogs.com/geekdc/p/10963476.html - * @ClassName: MybatisConfig + * * @author fuce + * @ClassName: MybatisPlusConfig * @date 2019-12-06 21:11 */ @Configuration -@MapperScan(basePackages = {"com.fc.v2.mapper.auto","com.fc.v2.mapper.custom"}) +@MapperScan(basePackages = {"com.fc.v2.mapper.auto", "com.fc.v2.mapper.custom"}) public class MybatisPlusConfig { - - @Bean + + @Bean @ConfigurationProperties("spring.datasource.druid.master") - public DruidDataSource masterDataSource() - { + public DruidDataSource masterDataSource() { return DruidDataSourceBuilder.create().build(); } @Bean @ConfigurationProperties("spring.datasource.druid.slave") @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true") - public DataSource slaveDataSource() - { + public DataSource slaveDataSource() { return DruidDataSourceBuilder.create().build(); } @Bean @ConfigurationProperties("mybatis-plus.configuration") - public MybatisConfiguration mybatisConfiguration(){ + public MybatisConfiguration mybatisConfiguration() { return new MybatisConfiguration(); } @Bean @ConfigurationProperties("mybatis-plus.global-config") public GlobalConfig globalConfig(){ - return new GlobalConfig(); + return new GlobalConfig().setMetaObjectHandler(new MetaObjectHandler(){ + + @Override + public void insertFill(MetaObject metaObject) { + this.fillStrategy(metaObject, "createBy", ShiroUtils.getUser().getUsername()); + this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); + } + + @Override + public void updateFill(MetaObject metaObject) { + this.fillStrategy(metaObject, "updateBy", ShiroUtils.getUser().getUsername()); + this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date()); + } + }); } @Autowired private MybatisConfiguration mybatisConfiguration; - @Autowired + @Autowired private GlobalConfig globalConfig; - @Value("${mybatis-plus.mapper-locations}") - private String locationPattern; + @Value("${mybatis-plus.mapper-locations}") + private String locationPattern; @Value("${mybatis-plus.type-aliases-package}") private String typeAliasesPackage; @Bean(name = "dynamicDataSource") @Primary - public DynamicDataSource dataSource(DataSource masterDataSource, DataSource slaveDataSource) - { + public DynamicDataSource dataSource(DataSource masterDataSource, DataSource slaveDataSource) { Map targetDataSources = new HashMap<>(); targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource); - targetDataSources.put(DataSourceType.SLAVE.name(),slaveDataSource); + targetDataSources.put(DataSourceType.SLAVE.name(), slaveDataSource); return new DynamicDataSource(masterDataSource(), targetDataSources); } @@ -98,16 +113,17 @@ public class MybatisPlusConfig { factoryBean.setGlobalConfig(globalConfig); return factoryBean.getObject(); } - + /** * 配置@Transactional注解事务 + * * @param dynamicDataSource * @return * @author fuce * @Date 2019年12月7日 上午11:31:33 */ @Bean - public PlatformTransactionManager transactionManager(DynamicDataSource dynamicDataSource){ + public PlatformTransactionManager transactionManager(DynamicDataSource dynamicDataSource) { return new DataSourceTransactionManager(dynamicDataSource); } } diff --git a/src/main/java/com/fc/v2/controller/admin/ProvinceLinkageController.java b/src/main/java/com/fc/v2/controller/admin/ProvinceLinkageController.java index 6c75dfd..9b1ed1c 100644 --- a/src/main/java/com/fc/v2/controller/admin/ProvinceLinkageController.java +++ b/src/main/java/com/fc/v2/controller/admin/ProvinceLinkageController.java @@ -1,11 +1,12 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.model.auto.*; -import com.fc.v2.service.SysAreaService; -import com.fc.v2.service.SysCityService; -import com.fc.v2.service.SysProvinceService; -import com.fc.v2.service.SysStreetService; +import com.fc.v2.service.ITSysAreaService; +import com.fc.v2.service.ITSysCityService; +import com.fc.v2.service.ITSysProvinceService; +import com.fc.v2.service.ITSysStreetService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -19,84 +20,87 @@ import java.util.List; /** * 省份联动controller - * @ClassName: ProvinceLinkageController + * * @author fuce + * @ClassName: ProvinceLinkageController * @date 2019-10-05 11:19 */ @Api(value = "省份联动controller") @Controller @RequestMapping("/ProvinceLinkageController") -public class ProvinceLinkageController extends BaseController{ - @Autowired - private SysProvinceService sysProvinceService; - @Autowired - private SysCityService sysCityService; - @Autowired - private SysAreaService sysAreaService; - - @Autowired - private SysStreetService sysStreetService; - - private String prefix = "admin/province"; - - /** - * 分页list页面 - * @param model - * @param dictId - * @return - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - public String view(ModelMap model) - { - model.addAttribute("provinceList",sysProvinceService.selectByExample(new SysProvinceExample())); - return prefix + "/list"; +public class ProvinceLinkageController extends BaseController { + @Autowired + private ITSysProvinceService sysProvinceService; + @Autowired + private ITSysCityService sysCityService; + @Autowired + private ITSysAreaService sysAreaService; + + @Autowired + private ITSysStreetService sysStreetService; + + private String prefix = "admin/province"; + + /** + * 分页list页面 + * + * @param model + * @return + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + public String view(ModelMap model) { + model.addAttribute("provinceList", sysProvinceService.selectTSysProvinceList(null)); + return prefix + "/list"; + } + + /** + * 市查询 + * + * @param pid + * @return + */ + @ApiOperation(value = "市查询", notes = "市查询") + @GetMapping("/getCity") + @ResponseBody + public List getCity(String pid) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("province_code", pid); + return sysCityService.selectTSysCityList(queryWrapper); + } - - /** - * 市查询 - * @param pid - * @return - */ - @ApiOperation(value = "市查询", notes = "市查询") - @GetMapping("/getCity") - @ResponseBody - public List getCity(String pid){ - SysCityExample example=new SysCityExample(); - example.createCriteria().andProvinceCodeEqualTo(pid); - return sysCityService.selectByExample(example); - - } - - /** - * 区查询 - * @param pid - * @return - */ - @ApiOperation(value = "区查询", notes = "区查询") - @GetMapping("/getArea") - @ResponseBody - public List getArea(String pid){ - SysAreaExample example=new SysAreaExample(); - example.createCriteria().andCityCodeEqualTo(pid); - return sysAreaService.selectByExample(example); - - } - - /** - * 街道查询 - * @param pid - * @return - */ - @ApiOperation(value = "街道查询", notes = "街道查询") - @GetMapping("/getStreet") - @ResponseBody - public List getStreet(String pid){ - SysStreetExample example=new SysStreetExample(); - example.createCriteria().andAreaCodeEqualTo(pid); - return sysStreetService.selectByExample(example); - - } - - + + /** + * 区查询 + * + * @param pid + * @return + */ + @ApiOperation(value = "区查询", notes = "区查询") + @GetMapping("/getArea") + @ResponseBody + public List getArea(String pid) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("city_code", pid); + return sysAreaService.selectTSysAreaList(queryWrapper); + + } + + /** + * 街道查询 + * + * @param pid + * @return + */ + @ApiOperation(value = "街道查询", notes = "街道查询") + @GetMapping("/getStreet") + @ResponseBody + public List getStreet(String pid) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("area_code", pid); + return sysStreetService.selectTSysStreetList(queryWrapper); + + } + + } diff --git a/src/main/java/com/fc/v2/controller/admin/SysAreaController.java b/src/main/java/com/fc/v2/controller/admin/SysAreaController.java index 374daaf..7597d43 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysAreaController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysAreaController.java @@ -1,12 +1,14 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; -import com.fc.v2.model.auto.SysArea; -import com.fc.v2.model.auto.SysCity; +import com.fc.v2.model.auto.TSysArea; +import com.fc.v2.model.auto.TSysCity; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysAreaService; -import com.fc.v2.service.SysCityService; +import com.fc.v2.service.ITSysAreaService; +import com.fc.v2.service.ITSysCityService; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,156 +23,165 @@ import org.springframework.web.bind.annotation.*; /** * 地区Controller - * @ClassName: SysAreaController + * * @author fuce + * @ClassName: SysAreaController * @date 2019-11-20 22:34 */ @Api(value = "地区设置") @Controller @RequestMapping("/SysAreaController") -public class SysAreaController extends BaseController{ - - private String prefix = "admin/province/sysArea"; - @Autowired - private SysAreaService sysAreaService; - - @Autowired - private SysCityService sysCityService; - - /** - * 地区页面展示 - * @param model - * @return - * @author fuce - * @Date 2019年11月11日 下午4:05:04 - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("gen:sysArea:view") - public String view(ModelMap model) - { +public class SysAreaController extends BaseController { + + private String prefix = "admin/province/sysArea"; + @Autowired + private ITSysAreaService sysAreaService; + + @Autowired + private ITSysCityService sysCityService; + + /** + * 地区页面展示 + * + * @param model + * @return + * @author fuce + * @Date 2019年11月11日 下午4:05:04 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("gen:sysArea:view") + public String view(ModelMap model) { return prefix + "/list"; } - - /** - * list集合 - * @param tablepar - * @param searchText - * @return - * @author fuce - * @Date 2019年11月11日 下午4:04:53 - */ - //@Log(title = "地区设置集合查询", action = "111") - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/list") - @RequiresPermissions("gen:sysArea:list") - @ResponseBody - public Object list(Tablepar tablepar,String searchText){ - PageInfo page=sysAreaService.list(tablepar,searchText) ; - return pageTable(page.getList(),page.getTotal()); - } - - /** + + /** + * list集合 + * + * @param tablepar + * @param searchText + * @return + * @author fuce + * @Date 2019年11月11日 下午4:04:53 + */ + //@Log(title = "地区设置集合查询", action = "111") + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/list") + @RequiresPermissions("gen:sysArea:list") + @ResponseBody + public Object list(Tablepar tablepar, String searchText) { + + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("id"); + if (searchText != null && !"".equals(searchText)){ + queryWrapper.like("area_name", searchText); + } + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + + PageInfo page = new PageInfo(sysAreaService.selectTSysAreaList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); + } + + /** * 新增跳转 */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add(ModelMap modelMap) - { - List sysCities=sysCityService.selectByExample(null); - modelMap.put("sysCities", sysCities); + public String add(ModelMap modelMap) { + List sysCities = sysCityService.selectTSysCityList(null); + modelMap.put("sysCities", sysCities); return prefix + "/add"; } - + /** * 新增保存 + * * @param sysArea * @return * @author fuce * @Date 2019年11月11日 下午4:04:41 */ - //@Log(title = "地区设置新增", action = "111") - @ApiOperation(value = "新增", notes = "新增") - @PostMapping("/add") - @RequiresPermissions("gen:sysArea:add") - @ResponseBody - public AjaxResult add(SysArea sysArea){ - int b=sysAreaService.insertSelective(sysArea); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 地区设置删除 - * @param ids - * @return - */ - //@Log(title = "地区设置删除", action = "111") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("gen:sysArea:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysAreaService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 检查 - * @param SysArea - * @return - */ - @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") - @PostMapping("/checkNameUnique") - @ResponseBody - public int checkNameUnique(SysArea sysArea){ - int b=sysAreaService.checkNameUnique(sysArea); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - - /** - * 修改跳转 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") Integer id, ModelMap mmap) - { - mmap.put("SysArea", sysAreaService.selectByPrimaryKey(id)); - List sysCities=sysCityService.selectByExample(null); + //@Log(title = "地区设置新增", action = "111") + @ApiOperation(value = "新增", notes = "新增") + @PostMapping("/add") + @RequiresPermissions("gen:sysArea:add") + @ResponseBody + public AjaxResult add(TSysArea sysArea) { + int b = sysAreaService.insertTSysArea(sysArea); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 地区设置删除 + * + * @param ids + * @return + */ + //@Log(title = "地区设置删除", action = "111") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("gen:sysArea:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysAreaService.deleteTSysAreaByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 检查 + * + * @param sysArea + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(TSysArea sysArea) { + int b = sysAreaService.checkNameUnique(sysArea); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + + /** + * 修改跳转 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put("SysArea", sysAreaService.selectTSysAreaById(id)); + List sysCities = sysCityService.selectTSysCityList(null); mmap.put("sysCities", sysCities); return prefix + "/edit"; } - - /** + + /** * 修改保存 */ //@Log(title = "地区设置修改", action = "111") - @ApiOperation(value = "修改保存", notes = "修改保存") + @ApiOperation(value = "修改保存", notes = "修改保存") @RequiresPermissions("gen:sysArea:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(SysArea record) - { - return toAjax(sysAreaService.updateByPrimaryKeySelective(record)); + public AjaxResult editSave(TSysArea record) { + return toAjax(sysAreaService.updateTSysArea(record)); } - - - } diff --git a/src/main/java/com/fc/v2/controller/admin/SysCityController.java b/src/main/java/com/fc/v2/controller/admin/SysCityController.java index 87fe6b7..8d00003 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysCityController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysCityController.java @@ -2,6 +2,12 @@ package com.fc.v2.controller.admin; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.fc.v2.model.auto.TSysCity; +import com.fc.v2.model.auto.TSysProvince; +import com.fc.v2.service.ITSysCityService; +import com.fc.v2.service.ITSysProvinceService; +import com.github.pagehelper.PageHelper; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -10,163 +16,169 @@ import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; -import com.fc.v2.model.auto.SysCity; -import com.fc.v2.model.auto.SysProvince; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysCityService; -import com.fc.v2.service.SysProvinceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** * 城市Controller - * @ClassName: SysCityController + * * @author fuce + * @ClassName: SysCityController * @date 2019-11-20 22:31 */ @Api(value = "城市设置") @Controller @RequestMapping("/SysCityController") -public class SysCityController extends BaseController{ - - private String prefix = "admin/province/sysCity"; - @Autowired - private SysCityService sysCityService; - - @Autowired - private SysProvinceService sysProvinceService; - - /** - * 城市设置展示跳转 - * - * @param model - * @return - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("gen:sysCity:view") - public String view(ModelMap model) - { +public class SysCityController extends BaseController { + + private String prefix = "admin/province/sysCity"; + @Autowired + private ITSysCityService sysCityService; + + @Autowired + private ITSysProvinceService sysProvinceService; + + /** + * 城市设置展示跳转 + * + * @param model + * @return + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("gen:sysCity:view") + public String view(ModelMap model) { return prefix + "/list"; } - - /** - * 城市设置list - * @param tablepar - * @param searchText - * @return - */ - //@Log(title = "城市设置集合查询", action = "111") - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/list") - @RequiresPermissions("gen:sysCity:list") - @ResponseBody - public Object list(Tablepar tablepar,String searchText){ - PageInfo page=sysCityService.list(tablepar,searchText) ; - return pageTable(page.getList(),page.getTotal()); - } - - /** - * 新增跳转 - * @param modelMap - * @return - */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + + /** + * 城市设置list + * + * @param tablepar + * @param searchText + * @return + */ + //@Log(title = "城市设置集合查询", action = "111") + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/list") + @RequiresPermissions("gen:sysCity:list") + @ResponseBody + public Object list(Tablepar tablepar, String searchText) { + + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("id"); + if (searchText != null && !"".equals(searchText)) { + queryWrapper.like("city_name", searchText); + } + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + + PageInfo page = new PageInfo(sysCityService.selectTSysCityList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); + } + + /** + * 新增跳转 + * + * @param modelMap + * @return + */ + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add(ModelMap modelMap) - { - List sysProvinces=sysProvinceService.selectByExample(null); - modelMap.put("sysProvinces", sysProvinces); + public String add(ModelMap modelMap) { + List sysProvinces = sysProvinceService.selectTSysProvinceList(null); + modelMap.put("sysProvinces", sysProvinces); return prefix + "/add"; } - /** - * 新增保存 - * @param sysCity - * @return - */ - //@Log(title = "城市设置新增", action = "111") - @ApiOperation(value = "新增", notes = "新增") - @PostMapping("/add") - @RequiresPermissions("gen:sysCity:add") - @ResponseBody - public AjaxResult add(SysCity sysCity){ - int b=sysCityService.insertSelective(sysCity); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 删除 - * @param ids - * @return - */ - //@Log(title = "城市设置删除", action = "111") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("gen:sysCity:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysCityService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 检查 - * @param tsysUser - * @return - */ - @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") - @PostMapping("/checkNameUnique") - @ResponseBody - public int checkNameUnique(SysCity sysCity){ - int b=sysCityService.checkNameUnique(sysCity); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - - /** - * 修改跳转 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") Integer id, ModelMap mmap) - { - List sysProvinces=sysProvinceService.selectByExample(null); - mmap.put("sysProvinces", sysProvinces); - mmap.put("SysCity", sysCityService.selectByPrimaryKey(id)); + + /** + * 新增保存 + * + * @param sysCity + * @return + */ + //@Log(title = "城市设置新增", action = "111") + @ApiOperation(value = "新增", notes = "新增") + @PostMapping("/add") + @RequiresPermissions("gen:sysCity:add") + @ResponseBody + public AjaxResult add(TSysCity sysCity) { + int b = sysCityService.insertTSysCity(sysCity); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 删除 + * + * @param ids + * @return + */ + //@Log(title = "城市设置删除", action = "111") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("gen:sysCity:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysCityService.deleteTSysCityByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 检查 + * + * @param tsysUser + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(TSysCity sysCity) { + int b = sysCityService.checkNameUnique(sysCity); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + + /** + * 修改跳转 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + List sysProvinces = sysProvinceService.selectTSysProvinceList(null); + mmap.put("sysProvinces", sysProvinces); + mmap.put("SysCity", sysCityService.selectTSysCityById(id)); return prefix + "/edit"; } - - /** + + /** * 修改保存 */ //@Log(title = "城市设置修改", action = "111") - @ApiOperation(value = "修改保存", notes = "修改保存") + @ApiOperation(value = "修改保存", notes = "修改保存") @RequiresPermissions("gen:sysCity:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(SysCity record) - { - return toAjax(sysCityService.updateByPrimaryKeySelective(record)); + public AjaxResult editSave(TSysCity record) { + return toAjax(sysCityService.updateTSysCity(record)); } - - - } diff --git a/src/main/java/com/fc/v2/controller/admin/SysProvinceController.java b/src/main/java/com/fc/v2/controller/admin/SysProvinceController.java index 18cb627..af4a9ed 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysProvinceController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysProvinceController.java @@ -1,5 +1,9 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.fc.v2.model.auto.TSysProvince; +import com.fc.v2.service.ITSysProvinceService; +import com.github.pagehelper.PageHelper; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -8,154 +12,168 @@ import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; -import com.fc.v2.model.auto.SysProvince; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysProvinceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** * 省份Controller - * @ClassName: SysProvinceController + * * @author fuce + * @ClassName: SysProvinceController * @date 2019-11-20 22:32 */ @Api(value = "省份表") @Controller @RequestMapping("/SysProvinceController") -public class SysProvinceController extends BaseController{ - - private String prefix = "admin/province/sysProvince"; - @Autowired - private SysProvinceService sysProvinceService; - /** - * 展示页面跳转 - * @param model - * @return - * @author fuce - * @Date 2019年11月11日 下午4:10:48 - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("gen:sysProvince:view") - public String view(ModelMap model) - { +public class SysProvinceController extends BaseController { + + private String prefix = "admin/province/sysProvince"; + @Autowired + private ITSysProvinceService sysProvinceService; + + /** + * 展示页面跳转 + * + * @param model + * @return + * @author fuce + * @Date 2019年11月11日 下午4:10:48 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("gen:sysProvince:view") + public String view(ModelMap model) { return prefix + "/list"; } - /** - *list查询 - * @param tablepar - * @param searchText - * @return - * @author fuce - * @Date 2019年11月11日 下午4:10:39 - */ - //@Log(title = "省份表集合查询", action = "111") - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/list") - @RequiresPermissions("gen:sysProvince:list") - @ResponseBody - public Object list(Tablepar tablepar,String searchText){ - PageInfo page=sysProvinceService.list(tablepar,searchText) ; - return pageTable(page.getList(),page.getTotal()); - } - /** - * 新增跳转 - * @param modelMap - * @return - * @author fuce - * @Date 2019年11月11日 下午4:10:20 - */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + + /** + * list查询 + * + * @param tablepar + * @param searchText + * @return + * @author fuce + * @Date 2019年11月11日 下午4:10:39 + */ + //@Log(title = "省份表集合查询", action = "111") + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/list") + @RequiresPermissions("gen:sysProvince:list") + @ResponseBody + public Object list(Tablepar tablepar, String searchText) { + + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("id"); + if (searchText != null && !"".equals(searchText)){ + queryWrapper.like("province_name", searchText); + } + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + + PageInfo page = new PageInfo(sysProvinceService.selectTSysProvinceList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); + } + + /** + * 新增跳转 + * + * @param modelMap + * @return + * @author fuce + * @Date 2019年11月11日 下午4:10:20 + */ + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add(ModelMap modelMap) - { + public String add(ModelMap modelMap) { return prefix + "/add"; } - - /** - * 新增保存 - * @param sysProvince - * @return - * @author fuce - * @Date 2019年11月11日 下午4:10:26 - */ - //@Log(title = "省份表新增", action = "111") + + /** + * 新增保存 + * + * @param sysProvince + * @return + * @author fuce + * @Date 2019年11月11日 下午4:10:26 + */ + //@Log(title = "省份表新增", action = "111") @ApiOperation(value = "新增", notes = "新增") - @PostMapping("/add") - @RequiresPermissions("gen:sysProvince:add") - @ResponseBody - public AjaxResult add(SysProvince sysProvince){ - int b=sysProvinceService.insertSelective(sysProvince); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 删除 - * @param ids - * @return - */ - //@Log(title = "省份表删除", action = "111") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("gen:sysProvince:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysProvinceService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 检查 - * @param tsysUser - * @return - */ - @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") - @PostMapping("/checkNameUnique") - @ResponseBody - public int checkNameUnique(SysProvince sysProvince){ - int b=sysProvinceService.checkNameUnique(sysProvince); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - - /** - * 修改跳转 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") Integer id, ModelMap mmap) - { - mmap.put("SysProvince", sysProvinceService.selectByPrimaryKey(id)); + @PostMapping("/add") + @RequiresPermissions("gen:sysProvince:add") + @ResponseBody + public AjaxResult add(TSysProvince sysProvince) { + int b = sysProvinceService.insertTSysProvince(sysProvince); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 删除 + * + * @param ids + * @return + */ + //@Log(title = "省份表删除", action = "111") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("gen:sysProvince:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysProvinceService.deleteTSysProvinceByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 检查 + * + * @param sysProvince + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(TSysProvince sysProvince) { + int b = sysProvinceService.checkNameUnique(sysProvince); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + + /** + * 修改跳转 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put("SysProvince", sysProvinceService.selectTSysProvinceById(id)); return prefix + "/edit"; } - - /** + + /** * 修改保存 */ //@Log(title = "省份表修改", action = "111") - @ApiOperation(value = "修改保存", notes = "修改保存") + @ApiOperation(value = "修改保存", notes = "修改保存") @RequiresPermissions("gen:sysProvince:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(SysProvince record) - { - return toAjax(sysProvinceService.updateByPrimaryKeySelective(record)); + public AjaxResult editSave(TSysProvince record) { + return toAjax(sysProvinceService.updateTSysProvince(record)); } } diff --git a/src/main/java/com/fc/v2/controller/admin/SysStreetController.java b/src/main/java/com/fc/v2/controller/admin/SysStreetController.java index d1d3b49..e422555 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysStreetController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysStreetController.java @@ -2,6 +2,12 @@ package com.fc.v2.controller.admin; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.fc.v2.model.auto.TSysArea; +import com.fc.v2.model.auto.TSysStreet; +import com.fc.v2.service.ITSysAreaService; +import com.fc.v2.service.ITSysStreetService; +import com.github.pagehelper.PageHelper; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -10,164 +16,172 @@ import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; -import com.fc.v2.model.auto.SysArea; -import com.fc.v2.model.auto.SysStreet; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysAreaService; -import com.fc.v2.service.SysStreetService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** * 街道Controller - * @ClassName: SysStreetController + * * @author fuce + * @ClassName: SysStreetController * @date 2019-11-20 22:32 */ @Api(value = "街道设置") @Controller @RequestMapping("/SysStreetController") -public class SysStreetController extends BaseController{ - - private String prefix = "admin/province/sysStreet"; - @Autowired - private SysStreetService sysStreetService; - @Autowired - private SysAreaService sysAreaService; - - /** - * 展示跳转 - * @param model - * @return - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("gen:sysStreet:view") - public String view(ModelMap model) - { +public class SysStreetController extends BaseController { + + private String prefix = "admin/province/sysStreet"; + @Autowired + private ITSysStreetService sysStreetService; + @Autowired + private ITSysAreaService sysAreaService; + + /** + * 展示跳转 + * + * @param model + * @return + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("gen:sysStreet:view") + public String view(ModelMap model) { return prefix + "/list"; } - - /** - * list查询 - * @param tablepar - * @param searchText - * @return - */ - //@Log(title = "街道设置集合查询", action = "111") - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/list") - @RequiresPermissions("gen:sysStreet:list") - @ResponseBody - public Object list(Tablepar tablepar,String searchText){ - PageInfo page=sysStreetService.list(tablepar,searchText); - return pageTable(page.getList(),page.getTotal()); - } - - /** - * 新增跳转 - * @param modelMap - * @return - */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + + /** + * list查询 + * + * @param tablepar + * @param searchText + * @return + */ + //@Log(title = "街道设置集合查询", action = "111") + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/list") + @RequiresPermissions("gen:sysStreet:list") + @ResponseBody + public Object list(Tablepar tablepar, String searchText) { + + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("id"); + if (searchText != null && !"".equals(searchText)) { + queryWrapper.like("street_name", searchText); + } + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + + PageInfo page = new PageInfo(sysStreetService.selectTSysStreetList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); + } + + /** + * 新增跳转 + * + * @param modelMap + * @return + */ + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add(ModelMap modelMap) - { - List sysAreas=sysAreaService.selectByExample(null); - modelMap.put("sysAreas",sysAreas); + public String add(ModelMap modelMap) { + List sysAreas = sysAreaService.selectTSysAreaList(null); + modelMap.put("sysAreas", sysAreas); return prefix + "/add"; } - + /** * 新增保存 + * * @param sysStreet * @return * @author fuce * @Date 2019年11月11日 下午4:13:37 */ - //@Log(title = "街道设置新增", action = "111") - @ApiOperation(value = "新增", notes = "新增") - @PostMapping("/add") - @RequiresPermissions("gen:sysStreet:add") - @ResponseBody - public AjaxResult add(SysStreet sysStreet){ - int b=sysStreetService.insertSelective(sysStreet); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 删除 - * @param ids - * @return - */ - //@Log(title = "街道设置删除", action = "111") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("gen:sysStreet:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysStreetService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 检查 - * @param tsysUser - * @return - */ - @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") - @PostMapping("/checkNameUnique") - @ResponseBody - public int checkNameUnique(SysStreet sysStreet){ - int b=sysStreetService.checkNameUnique(sysStreet); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - - /** - * 修改跳转 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { - List sysAreas=sysAreaService.selectByExample(null); - mmap.put("SysStreet", sysStreetService.selectByPrimaryKey(id)); - mmap.put("sysAreas",sysAreas); + //@Log(title = "街道设置新增", action = "111") + @ApiOperation(value = "新增", notes = "新增") + @PostMapping("/add") + @RequiresPermissions("gen:sysStreet:add") + @ResponseBody + public AjaxResult add(TSysStreet sysStreet) { + int b = sysStreetService.insertTSysStreet(sysStreet); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 删除 + * + * @param ids + * @return + */ + //@Log(title = "街道设置删除", action = "111") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("gen:sysStreet:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysStreetService.deleteTSysStreetByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 检查 + * + * @param sysStreet + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(TSysStreet sysStreet) { + int b = sysStreetService.checkNameUnique(sysStreet); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + + /** + * 修改跳转 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + List sysAreas = sysAreaService.selectTSysAreaList(null); + mmap.put("SysStreet", sysStreetService.selectTSysStreetById(id)); + mmap.put("sysAreas", sysAreas); return prefix + "/edit"; } - /** - * 修改保存 - * @param record - * @return - */ + + /** + * 修改保存 + * + * @param record + * @return + */ //@Log(title = "街道设置修改", action = "111") - @ApiOperation(value = "修改保存", notes = "修改保存") + @ApiOperation(value = "修改保存", notes = "修改保存") @RequiresPermissions("gen:sysStreet:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(SysStreet record) - { - return toAjax(sysStreetService.updateByPrimaryKeySelective(record)); + public AjaxResult editSave(TSysStreet record) { + return toAjax(sysStreetService.updateTSysStreet(record)); } - - - } diff --git a/src/main/java/com/fc/v2/mapper/auto/SysAreaMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysAreaMapper.java deleted file mode 100644 index cace6f1..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/SysAreaMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.SysArea; -import com.fc.v2.model.auto.SysAreaExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface SysAreaMapper extends BaseMapper { - long countByExample(SysAreaExample example); - - int deleteByExample(SysAreaExample example); - - int deleteByPrimaryKey(Integer id); - - int insert(SysArea record); - - int insertSelective(SysArea record); - - List selectByExample(SysAreaExample example); - - SysArea selectByPrimaryKey(Integer id); - - int updateByExampleSelective(@Param("record") SysArea record, @Param("example") SysAreaExample example); - - int updateByExample(@Param("record") SysArea record, @Param("example") SysAreaExample example); - - int updateByPrimaryKeySelective(SysArea record); - - int updateByPrimaryKey(SysArea record); -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/SysCityMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysCityMapper.java deleted file mode 100644 index 342ee5b..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/SysCityMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.SysCity; -import com.fc.v2.model.auto.SysCityExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface SysCityMapper extends BaseMapper { - long countByExample(SysCityExample example); - - int deleteByExample(SysCityExample example); - - int deleteByPrimaryKey(Integer id); - - int insert(SysCity record); - - int insertSelective(SysCity record); - - List selectByExample(SysCityExample example); - - SysCity selectByPrimaryKey(Integer id); - - int updateByExampleSelective(@Param("record") SysCity record, @Param("example") SysCityExample example); - - int updateByExample(@Param("record") SysCity record, @Param("example") SysCityExample example); - - int updateByPrimaryKeySelective(SysCity record); - - int updateByPrimaryKey(SysCity record); -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/SysProvinceMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysProvinceMapper.java deleted file mode 100644 index 5033413..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/SysProvinceMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.SysProvince; -import com.fc.v2.model.auto.SysProvinceExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface SysProvinceMapper extends BaseMapper { - long countByExample(SysProvinceExample example); - - int deleteByExample(SysProvinceExample example); - - int deleteByPrimaryKey(Integer id); - - int insert(SysProvince record); - - int insertSelective(SysProvince record); - - List selectByExample(SysProvinceExample example); - - SysProvince selectByPrimaryKey(Integer id); - - int updateByExampleSelective(@Param("record") SysProvince record, @Param("example") SysProvinceExample example); - - int updateByExample(@Param("record") SysProvince record, @Param("example") SysProvinceExample example); - - int updateByPrimaryKeySelective(SysProvince record); - - int updateByPrimaryKey(SysProvince record); -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/SysStreetMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysStreetMapper.java deleted file mode 100644 index 2f35c1c..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/SysStreetMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.SysStreet; -import com.fc.v2.model.auto.SysStreetExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 街道设置 SysStreetMapper - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-10-05 01:02:28 - */ -public interface SysStreetMapper extends BaseMapper { - - long countByExample(SysStreetExample example); - - int deleteByExample(SysStreetExample example); - - int deleteByPrimaryKey(Integer id); - - int insert(SysStreet record); - - int insertSelective(SysStreet record); - - List selectByExample(SysStreetExample example); - - SysStreet selectByPrimaryKey(Integer id); - - int updateByExampleSelective(@Param("record") SysStreet record, @Param("example") SysStreetExample example); - - int updateByExample(@Param("record") SysStreet record, @Param("example") SysStreetExample example); - - int updateByPrimaryKeySelective(SysStreet record); - - int updateByPrimaryKey(SysStreet record); - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysAreaMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysAreaMapper.java new file mode 100644 index 0000000..2df657f --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysAreaMapper.java @@ -0,0 +1,16 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysArea; + +/** + * 地区设置Mapper接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface TSysAreaMapper extends BaseMapper +{ +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysCityMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysCityMapper.java new file mode 100644 index 0000000..2946f61 --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysCityMapper.java @@ -0,0 +1,17 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysCity; + + +/** + * 城市设置Mapper接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface TSysCityMapper extends BaseMapper +{ +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysProvinceMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysProvinceMapper.java new file mode 100644 index 0000000..a262fa3 --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysProvinceMapper.java @@ -0,0 +1,17 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysProvince; + +/** + * 省份Mapper接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface TSysProvinceMapper extends BaseMapper +{ + +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysStreetMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysStreetMapper.java new file mode 100644 index 0000000..ed246ec --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysStreetMapper.java @@ -0,0 +1,17 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysStreet; + +/** + * 街道设置Mapper接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface TSysStreetMapper extends BaseMapper +{ + +} diff --git a/src/main/java/com/fc/v2/model/auto/SysArea.java b/src/main/java/com/fc/v2/model/auto/SysArea.java deleted file mode 100644 index 9ee18df..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysArea.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.fc.v2.model.auto; - -import java.io.Serializable; -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; - -@TableName(value = "t_sys_area") -public class SysArea implements Serializable { - - @TableId(type = IdType.ASSIGN_ID) - private Integer id; - - private String areaCode; - - private String cityCode; - - private String areaName; - - private String shortName; - - private String lng; - - private String lat; - - private Integer sort; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date gmtCreate; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date gmtModified; - - private String memo; - - private Integer dataState; - - private static final long serialVersionUID = 1L; - - public SysArea(Integer id, String areaCode, String cityCode, String areaName, String shortName, String lng, String lat, Integer sort, Date gmtCreate, Date gmtModified, String memo, Integer dataState) { - this.id = id; - this.areaCode = areaCode; - this.cityCode = cityCode; - this.areaName = areaName; - this.shortName = shortName; - this.lng = lng; - this.lat = lat; - this.sort = sort; - this.gmtCreate = gmtCreate; - this.gmtModified = gmtModified; - this.memo = memo; - this.dataState = dataState; - } - - public SysArea() { - super(); - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getAreaCode() { - return areaCode; - } - - public void setAreaCode(String areaCode) { - this.areaCode = areaCode == null ? null : areaCode.trim(); - } - - public String getCityCode() { - return cityCode; - } - - public void setCityCode(String cityCode) { - this.cityCode = cityCode == null ? null : cityCode.trim(); - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName == null ? null : areaName.trim(); - } - - public String getShortName() { - return shortName; - } - - public void setShortName(String shortName) { - this.shortName = shortName == null ? null : shortName.trim(); - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng == null ? null : lng.trim(); - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat == null ? null : lat.trim(); - } - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - public Date getGmtCreate() { - return gmtCreate; - } - - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - public Date getGmtModified() { - return gmtModified; - } - - public void setGmtModified(Date gmtModified) { - this.gmtModified = gmtModified; - } - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo == null ? null : memo.trim(); - } - - public Integer getDataState() { - return dataState; - } - - public void setDataState(Integer dataState) { - this.dataState = dataState; - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysAreaExample.java b/src/main/java/com/fc/v2/model/auto/SysAreaExample.java deleted file mode 100644 index 0d25f0a..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysAreaExample.java +++ /dev/null @@ -1,991 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class SysAreaExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysAreaExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Integer value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Integer value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Integer value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Integer value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Integer value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Integer value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Integer value1, Integer value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Integer value1, Integer value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andAreaCodeIsNull() { - addCriterion("area_code is null"); - return (Criteria) this; - } - - public Criteria andAreaCodeIsNotNull() { - addCriterion("area_code is not null"); - return (Criteria) this; - } - - public Criteria andAreaCodeEqualTo(String value) { - addCriterion("area_code =", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeNotEqualTo(String value) { - addCriterion("area_code <>", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeGreaterThan(String value) { - addCriterion("area_code >", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeGreaterThanOrEqualTo(String value) { - addCriterion("area_code >=", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeLessThan(String value) { - addCriterion("area_code <", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeLessThanOrEqualTo(String value) { - addCriterion("area_code <=", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeLike(String value) { - addCriterion("area_code like", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeNotLike(String value) { - addCriterion("area_code not like", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeIn(List values) { - addCriterion("area_code in", values, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeNotIn(List values) { - addCriterion("area_code not in", values, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeBetween(String value1, String value2) { - addCriterion("area_code between", value1, value2, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeNotBetween(String value1, String value2) { - addCriterion("area_code not between", value1, value2, "areaCode"); - return (Criteria) this; - } - - public Criteria andCityCodeIsNull() { - addCriterion("city_code is null"); - return (Criteria) this; - } - - public Criteria andCityCodeIsNotNull() { - addCriterion("city_code is not null"); - return (Criteria) this; - } - - public Criteria andCityCodeEqualTo(String value) { - addCriterion("city_code =", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeNotEqualTo(String value) { - addCriterion("city_code <>", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeGreaterThan(String value) { - addCriterion("city_code >", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeGreaterThanOrEqualTo(String value) { - addCriterion("city_code >=", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeLessThan(String value) { - addCriterion("city_code <", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeLessThanOrEqualTo(String value) { - addCriterion("city_code <=", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeLike(String value) { - addCriterion("city_code like", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeNotLike(String value) { - addCriterion("city_code not like", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeIn(List values) { - addCriterion("city_code in", values, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeNotIn(List values) { - addCriterion("city_code not in", values, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeBetween(String value1, String value2) { - addCriterion("city_code between", value1, value2, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeNotBetween(String value1, String value2) { - addCriterion("city_code not between", value1, value2, "cityCode"); - return (Criteria) this; - } - - public Criteria andAreaNameIsNull() { - addCriterion("area_name is null"); - return (Criteria) this; - } - - public Criteria andAreaNameIsNotNull() { - addCriterion("area_name is not null"); - return (Criteria) this; - } - - public Criteria andAreaNameEqualTo(String value) { - addCriterion("area_name =", value, "areaName"); - return (Criteria) this; - } - - public Criteria andAreaNameNotEqualTo(String value) { - addCriterion("area_name <>", value, "areaName"); - return (Criteria) this; - } - - public Criteria andAreaNameGreaterThan(String value) { - addCriterion("area_name >", value, "areaName"); - return (Criteria) this; - } - - public Criteria andAreaNameGreaterThanOrEqualTo(String value) { - addCriterion("area_name >=", value, "areaName"); - return (Criteria) this; - } - - public Criteria andAreaNameLessThan(String value) { - addCriterion("area_name <", value, "areaName"); - return (Criteria) this; - } - - public Criteria andAreaNameLessThanOrEqualTo(String value) { - addCriterion("area_name <=", value, "areaName"); - return (Criteria) this; - } - - public Criteria andAreaNameLike(String value) { - addCriterion("area_name like", value, "areaName"); - return (Criteria) this; - } - - public Criteria andAreaNameNotLike(String value) { - addCriterion("area_name not like", value, "areaName"); - return (Criteria) this; - } - - public Criteria andAreaNameIn(List values) { - addCriterion("area_name in", values, "areaName"); - return (Criteria) this; - } - - public Criteria andAreaNameNotIn(List values) { - addCriterion("area_name not in", values, "areaName"); - return (Criteria) this; - } - - public Criteria andAreaNameBetween(String value1, String value2) { - addCriterion("area_name between", value1, value2, "areaName"); - return (Criteria) this; - } - - public Criteria andAreaNameNotBetween(String value1, String value2) { - addCriterion("area_name not between", value1, value2, "areaName"); - return (Criteria) this; - } - - public Criteria andShortNameIsNull() { - addCriterion("short_name is null"); - return (Criteria) this; - } - - public Criteria andShortNameIsNotNull() { - addCriterion("short_name is not null"); - return (Criteria) this; - } - - public Criteria andShortNameEqualTo(String value) { - addCriterion("short_name =", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotEqualTo(String value) { - addCriterion("short_name <>", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameGreaterThan(String value) { - addCriterion("short_name >", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameGreaterThanOrEqualTo(String value) { - addCriterion("short_name >=", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLessThan(String value) { - addCriterion("short_name <", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLessThanOrEqualTo(String value) { - addCriterion("short_name <=", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLike(String value) { - addCriterion("short_name like", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotLike(String value) { - addCriterion("short_name not like", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameIn(List values) { - addCriterion("short_name in", values, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotIn(List values) { - addCriterion("short_name not in", values, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameBetween(String value1, String value2) { - addCriterion("short_name between", value1, value2, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotBetween(String value1, String value2) { - addCriterion("short_name not between", value1, value2, "shortName"); - return (Criteria) this; - } - - public Criteria andLngIsNull() { - addCriterion("lng is null"); - return (Criteria) this; - } - - public Criteria andLngIsNotNull() { - addCriterion("lng is not null"); - return (Criteria) this; - } - - public Criteria andLngEqualTo(String value) { - addCriterion("lng =", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotEqualTo(String value) { - addCriterion("lng <>", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngGreaterThan(String value) { - addCriterion("lng >", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngGreaterThanOrEqualTo(String value) { - addCriterion("lng >=", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLessThan(String value) { - addCriterion("lng <", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLessThanOrEqualTo(String value) { - addCriterion("lng <=", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLike(String value) { - addCriterion("lng like", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotLike(String value) { - addCriterion("lng not like", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngIn(List values) { - addCriterion("lng in", values, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotIn(List values) { - addCriterion("lng not in", values, "lng"); - return (Criteria) this; - } - - public Criteria andLngBetween(String value1, String value2) { - addCriterion("lng between", value1, value2, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotBetween(String value1, String value2) { - addCriterion("lng not between", value1, value2, "lng"); - return (Criteria) this; - } - - public Criteria andLatIsNull() { - addCriterion("lat is null"); - return (Criteria) this; - } - - public Criteria andLatIsNotNull() { - addCriterion("lat is not null"); - return (Criteria) this; - } - - public Criteria andLatEqualTo(String value) { - addCriterion("lat =", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotEqualTo(String value) { - addCriterion("lat <>", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatGreaterThan(String value) { - addCriterion("lat >", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatGreaterThanOrEqualTo(String value) { - addCriterion("lat >=", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLessThan(String value) { - addCriterion("lat <", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLessThanOrEqualTo(String value) { - addCriterion("lat <=", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLike(String value) { - addCriterion("lat like", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotLike(String value) { - addCriterion("lat not like", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatIn(List values) { - addCriterion("lat in", values, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotIn(List values) { - addCriterion("lat not in", values, "lat"); - return (Criteria) this; - } - - public Criteria andLatBetween(String value1, String value2) { - addCriterion("lat between", value1, value2, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotBetween(String value1, String value2) { - addCriterion("lat not between", value1, value2, "lat"); - return (Criteria) this; - } - - public Criteria andSortIsNull() { - addCriterion("sort is null"); - return (Criteria) this; - } - - public Criteria andSortIsNotNull() { - addCriterion("sort is not null"); - return (Criteria) this; - } - - public Criteria andSortEqualTo(Integer value) { - addCriterion("sort =", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotEqualTo(Integer value) { - addCriterion("sort <>", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortGreaterThan(Integer value) { - addCriterion("sort >", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortGreaterThanOrEqualTo(Integer value) { - addCriterion("sort >=", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortLessThan(Integer value) { - addCriterion("sort <", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortLessThanOrEqualTo(Integer value) { - addCriterion("sort <=", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortIn(List values) { - addCriterion("sort in", values, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotIn(List values) { - addCriterion("sort not in", values, "sort"); - return (Criteria) this; - } - - public Criteria andSortBetween(Integer value1, Integer value2) { - addCriterion("sort between", value1, value2, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotBetween(Integer value1, Integer value2) { - addCriterion("sort not between", value1, value2, "sort"); - return (Criteria) this; - } - - public Criteria andGmtCreateIsNull() { - addCriterion("gmt_create is null"); - return (Criteria) this; - } - - public Criteria andGmtCreateIsNotNull() { - addCriterion("gmt_create is not null"); - return (Criteria) this; - } - - public Criteria andGmtCreateEqualTo(Date value) { - addCriterion("gmt_create =", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotEqualTo(Date value) { - addCriterion("gmt_create <>", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateGreaterThan(Date value) { - addCriterion("gmt_create >", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateGreaterThanOrEqualTo(Date value) { - addCriterion("gmt_create >=", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateLessThan(Date value) { - addCriterion("gmt_create <", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateLessThanOrEqualTo(Date value) { - addCriterion("gmt_create <=", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateIn(List values) { - addCriterion("gmt_create in", values, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotIn(List values) { - addCriterion("gmt_create not in", values, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateBetween(Date value1, Date value2) { - addCriterion("gmt_create between", value1, value2, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotBetween(Date value1, Date value2) { - addCriterion("gmt_create not between", value1, value2, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtModifiedIsNull() { - addCriterion("gmt_modified is null"); - return (Criteria) this; - } - - public Criteria andGmtModifiedIsNotNull() { - addCriterion("gmt_modified is not null"); - return (Criteria) this; - } - - public Criteria andGmtModifiedEqualTo(Date value) { - addCriterion("gmt_modified =", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotEqualTo(Date value) { - addCriterion("gmt_modified <>", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedGreaterThan(Date value) { - addCriterion("gmt_modified >", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedGreaterThanOrEqualTo(Date value) { - addCriterion("gmt_modified >=", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedLessThan(Date value) { - addCriterion("gmt_modified <", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedLessThanOrEqualTo(Date value) { - addCriterion("gmt_modified <=", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedIn(List values) { - addCriterion("gmt_modified in", values, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotIn(List values) { - addCriterion("gmt_modified not in", values, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedBetween(Date value1, Date value2) { - addCriterion("gmt_modified between", value1, value2, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotBetween(Date value1, Date value2) { - addCriterion("gmt_modified not between", value1, value2, "gmtModified"); - return (Criteria) this; - } - - public Criteria andMemoIsNull() { - addCriterion("memo is null"); - return (Criteria) this; - } - - public Criteria andMemoIsNotNull() { - addCriterion("memo is not null"); - return (Criteria) this; - } - - public Criteria andMemoEqualTo(String value) { - addCriterion("memo =", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotEqualTo(String value) { - addCriterion("memo <>", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoGreaterThan(String value) { - addCriterion("memo >", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoGreaterThanOrEqualTo(String value) { - addCriterion("memo >=", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoLessThan(String value) { - addCriterion("memo <", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoLessThanOrEqualTo(String value) { - addCriterion("memo <=", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoLike(String value) { - addCriterion("memo like", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotLike(String value) { - addCriterion("memo not like", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoIn(List values) { - addCriterion("memo in", values, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotIn(List values) { - addCriterion("memo not in", values, "memo"); - return (Criteria) this; - } - - public Criteria andMemoBetween(String value1, String value2) { - addCriterion("memo between", value1, value2, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotBetween(String value1, String value2) { - addCriterion("memo not between", value1, value2, "memo"); - return (Criteria) this; - } - - public Criteria andDataStateIsNull() { - addCriterion("data_state is null"); - return (Criteria) this; - } - - public Criteria andDataStateIsNotNull() { - addCriterion("data_state is not null"); - return (Criteria) this; - } - - public Criteria andDataStateEqualTo(Integer value) { - addCriterion("data_state =", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotEqualTo(Integer value) { - addCriterion("data_state <>", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateGreaterThan(Integer value) { - addCriterion("data_state >", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateGreaterThanOrEqualTo(Integer value) { - addCriterion("data_state >=", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateLessThan(Integer value) { - addCriterion("data_state <", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateLessThanOrEqualTo(Integer value) { - addCriterion("data_state <=", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateIn(List values) { - addCriterion("data_state in", values, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotIn(List values) { - addCriterion("data_state not in", values, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateBetween(Integer value1, Integer value2) { - addCriterion("data_state between", value1, value2, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotBetween(Integer value1, Integer value2) { - addCriterion("data_state not between", value1, value2, "dataState"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysCity.java b/src/main/java/com/fc/v2/model/auto/SysCity.java deleted file mode 100644 index 1e977e0..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysCity.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.fc.v2.model.auto; - -import java.io.Serializable; -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; - -@TableName(value = "t_sys_city") -public class SysCity implements Serializable { - - @TableId(type = IdType.ASSIGN_ID) - private Integer id; - - private String cityCode; - - private String cityName; - - private String shortName; - - private String provinceCode; - - private String lng; - - private String lat; - - private Integer sort; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date gmtCreate; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date gmtModified; - - private String memo; - - private Integer dataState; - - private static final long serialVersionUID = 1L; - - public SysCity(Integer id, String cityCode, String cityName, String shortName, String provinceCode, String lng, String lat, Integer sort, Date gmtCreate, Date gmtModified, String memo, Integer dataState) { - this.id = id; - this.cityCode = cityCode; - this.cityName = cityName; - this.shortName = shortName; - this.provinceCode = provinceCode; - this.lng = lng; - this.lat = lat; - this.sort = sort; - this.gmtCreate = gmtCreate; - this.gmtModified = gmtModified; - this.memo = memo; - this.dataState = dataState; - } - - public SysCity() { - super(); - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getCityCode() { - return cityCode; - } - - public void setCityCode(String cityCode) { - this.cityCode = cityCode == null ? null : cityCode.trim(); - } - - public String getCityName() { - return cityName; - } - - public void setCityName(String cityName) { - this.cityName = cityName == null ? null : cityName.trim(); - } - - public String getShortName() { - return shortName; - } - - public void setShortName(String shortName) { - this.shortName = shortName == null ? null : shortName.trim(); - } - - public String getProvinceCode() { - return provinceCode; - } - - public void setProvinceCode(String provinceCode) { - this.provinceCode = provinceCode == null ? null : provinceCode.trim(); - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng == null ? null : lng.trim(); - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat == null ? null : lat.trim(); - } - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - public Date getGmtCreate() { - return gmtCreate; - } - - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - public Date getGmtModified() { - return gmtModified; - } - - public void setGmtModified(Date gmtModified) { - this.gmtModified = gmtModified; - } - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo == null ? null : memo.trim(); - } - - public Integer getDataState() { - return dataState; - } - - public void setDataState(Integer dataState) { - this.dataState = dataState; - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysCityExample.java b/src/main/java/com/fc/v2/model/auto/SysCityExample.java deleted file mode 100644 index 3ef354c..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysCityExample.java +++ /dev/null @@ -1,991 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class SysCityExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysCityExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Integer value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Integer value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Integer value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Integer value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Integer value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Integer value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Integer value1, Integer value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Integer value1, Integer value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andCityCodeIsNull() { - addCriterion("city_code is null"); - return (Criteria) this; - } - - public Criteria andCityCodeIsNotNull() { - addCriterion("city_code is not null"); - return (Criteria) this; - } - - public Criteria andCityCodeEqualTo(String value) { - addCriterion("city_code =", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeNotEqualTo(String value) { - addCriterion("city_code <>", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeGreaterThan(String value) { - addCriterion("city_code >", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeGreaterThanOrEqualTo(String value) { - addCriterion("city_code >=", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeLessThan(String value) { - addCriterion("city_code <", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeLessThanOrEqualTo(String value) { - addCriterion("city_code <=", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeLike(String value) { - addCriterion("city_code like", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeNotLike(String value) { - addCriterion("city_code not like", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeIn(List values) { - addCriterion("city_code in", values, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeNotIn(List values) { - addCriterion("city_code not in", values, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeBetween(String value1, String value2) { - addCriterion("city_code between", value1, value2, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeNotBetween(String value1, String value2) { - addCriterion("city_code not between", value1, value2, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityNameIsNull() { - addCriterion("city_name is null"); - return (Criteria) this; - } - - public Criteria andCityNameIsNotNull() { - addCriterion("city_name is not null"); - return (Criteria) this; - } - - public Criteria andCityNameEqualTo(String value) { - addCriterion("city_name =", value, "cityName"); - return (Criteria) this; - } - - public Criteria andCityNameNotEqualTo(String value) { - addCriterion("city_name <>", value, "cityName"); - return (Criteria) this; - } - - public Criteria andCityNameGreaterThan(String value) { - addCriterion("city_name >", value, "cityName"); - return (Criteria) this; - } - - public Criteria andCityNameGreaterThanOrEqualTo(String value) { - addCriterion("city_name >=", value, "cityName"); - return (Criteria) this; - } - - public Criteria andCityNameLessThan(String value) { - addCriterion("city_name <", value, "cityName"); - return (Criteria) this; - } - - public Criteria andCityNameLessThanOrEqualTo(String value) { - addCriterion("city_name <=", value, "cityName"); - return (Criteria) this; - } - - public Criteria andCityNameLike(String value) { - addCriterion("city_name like", value, "cityName"); - return (Criteria) this; - } - - public Criteria andCityNameNotLike(String value) { - addCriterion("city_name not like", value, "cityName"); - return (Criteria) this; - } - - public Criteria andCityNameIn(List values) { - addCriterion("city_name in", values, "cityName"); - return (Criteria) this; - } - - public Criteria andCityNameNotIn(List values) { - addCriterion("city_name not in", values, "cityName"); - return (Criteria) this; - } - - public Criteria andCityNameBetween(String value1, String value2) { - addCriterion("city_name between", value1, value2, "cityName"); - return (Criteria) this; - } - - public Criteria andCityNameNotBetween(String value1, String value2) { - addCriterion("city_name not between", value1, value2, "cityName"); - return (Criteria) this; - } - - public Criteria andShortNameIsNull() { - addCriterion("short_name is null"); - return (Criteria) this; - } - - public Criteria andShortNameIsNotNull() { - addCriterion("short_name is not null"); - return (Criteria) this; - } - - public Criteria andShortNameEqualTo(String value) { - addCriterion("short_name =", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotEqualTo(String value) { - addCriterion("short_name <>", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameGreaterThan(String value) { - addCriterion("short_name >", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameGreaterThanOrEqualTo(String value) { - addCriterion("short_name >=", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLessThan(String value) { - addCriterion("short_name <", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLessThanOrEqualTo(String value) { - addCriterion("short_name <=", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLike(String value) { - addCriterion("short_name like", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotLike(String value) { - addCriterion("short_name not like", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameIn(List values) { - addCriterion("short_name in", values, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotIn(List values) { - addCriterion("short_name not in", values, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameBetween(String value1, String value2) { - addCriterion("short_name between", value1, value2, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotBetween(String value1, String value2) { - addCriterion("short_name not between", value1, value2, "shortName"); - return (Criteria) this; - } - - public Criteria andProvinceCodeIsNull() { - addCriterion("province_code is null"); - return (Criteria) this; - } - - public Criteria andProvinceCodeIsNotNull() { - addCriterion("province_code is not null"); - return (Criteria) this; - } - - public Criteria andProvinceCodeEqualTo(String value) { - addCriterion("province_code =", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeNotEqualTo(String value) { - addCriterion("province_code <>", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeGreaterThan(String value) { - addCriterion("province_code >", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeGreaterThanOrEqualTo(String value) { - addCriterion("province_code >=", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeLessThan(String value) { - addCriterion("province_code <", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeLessThanOrEqualTo(String value) { - addCriterion("province_code <=", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeLike(String value) { - addCriterion("province_code like", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeNotLike(String value) { - addCriterion("province_code not like", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeIn(List values) { - addCriterion("province_code in", values, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeNotIn(List values) { - addCriterion("province_code not in", values, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeBetween(String value1, String value2) { - addCriterion("province_code between", value1, value2, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeNotBetween(String value1, String value2) { - addCriterion("province_code not between", value1, value2, "provinceCode"); - return (Criteria) this; - } - - public Criteria andLngIsNull() { - addCriterion("lng is null"); - return (Criteria) this; - } - - public Criteria andLngIsNotNull() { - addCriterion("lng is not null"); - return (Criteria) this; - } - - public Criteria andLngEqualTo(String value) { - addCriterion("lng =", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotEqualTo(String value) { - addCriterion("lng <>", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngGreaterThan(String value) { - addCriterion("lng >", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngGreaterThanOrEqualTo(String value) { - addCriterion("lng >=", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLessThan(String value) { - addCriterion("lng <", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLessThanOrEqualTo(String value) { - addCriterion("lng <=", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLike(String value) { - addCriterion("lng like", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotLike(String value) { - addCriterion("lng not like", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngIn(List values) { - addCriterion("lng in", values, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotIn(List values) { - addCriterion("lng not in", values, "lng"); - return (Criteria) this; - } - - public Criteria andLngBetween(String value1, String value2) { - addCriterion("lng between", value1, value2, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotBetween(String value1, String value2) { - addCriterion("lng not between", value1, value2, "lng"); - return (Criteria) this; - } - - public Criteria andLatIsNull() { - addCriterion("lat is null"); - return (Criteria) this; - } - - public Criteria andLatIsNotNull() { - addCriterion("lat is not null"); - return (Criteria) this; - } - - public Criteria andLatEqualTo(String value) { - addCriterion("lat =", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotEqualTo(String value) { - addCriterion("lat <>", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatGreaterThan(String value) { - addCriterion("lat >", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatGreaterThanOrEqualTo(String value) { - addCriterion("lat >=", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLessThan(String value) { - addCriterion("lat <", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLessThanOrEqualTo(String value) { - addCriterion("lat <=", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLike(String value) { - addCriterion("lat like", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotLike(String value) { - addCriterion("lat not like", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatIn(List values) { - addCriterion("lat in", values, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotIn(List values) { - addCriterion("lat not in", values, "lat"); - return (Criteria) this; - } - - public Criteria andLatBetween(String value1, String value2) { - addCriterion("lat between", value1, value2, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotBetween(String value1, String value2) { - addCriterion("lat not between", value1, value2, "lat"); - return (Criteria) this; - } - - public Criteria andSortIsNull() { - addCriterion("sort is null"); - return (Criteria) this; - } - - public Criteria andSortIsNotNull() { - addCriterion("sort is not null"); - return (Criteria) this; - } - - public Criteria andSortEqualTo(Integer value) { - addCriterion("sort =", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotEqualTo(Integer value) { - addCriterion("sort <>", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortGreaterThan(Integer value) { - addCriterion("sort >", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortGreaterThanOrEqualTo(Integer value) { - addCriterion("sort >=", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortLessThan(Integer value) { - addCriterion("sort <", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortLessThanOrEqualTo(Integer value) { - addCriterion("sort <=", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortIn(List values) { - addCriterion("sort in", values, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotIn(List values) { - addCriterion("sort not in", values, "sort"); - return (Criteria) this; - } - - public Criteria andSortBetween(Integer value1, Integer value2) { - addCriterion("sort between", value1, value2, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotBetween(Integer value1, Integer value2) { - addCriterion("sort not between", value1, value2, "sort"); - return (Criteria) this; - } - - public Criteria andGmtCreateIsNull() { - addCriterion("gmt_create is null"); - return (Criteria) this; - } - - public Criteria andGmtCreateIsNotNull() { - addCriterion("gmt_create is not null"); - return (Criteria) this; - } - - public Criteria andGmtCreateEqualTo(Date value) { - addCriterion("gmt_create =", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotEqualTo(Date value) { - addCriterion("gmt_create <>", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateGreaterThan(Date value) { - addCriterion("gmt_create >", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateGreaterThanOrEqualTo(Date value) { - addCriterion("gmt_create >=", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateLessThan(Date value) { - addCriterion("gmt_create <", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateLessThanOrEqualTo(Date value) { - addCriterion("gmt_create <=", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateIn(List values) { - addCriterion("gmt_create in", values, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotIn(List values) { - addCriterion("gmt_create not in", values, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateBetween(Date value1, Date value2) { - addCriterion("gmt_create between", value1, value2, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotBetween(Date value1, Date value2) { - addCriterion("gmt_create not between", value1, value2, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtModifiedIsNull() { - addCriterion("gmt_modified is null"); - return (Criteria) this; - } - - public Criteria andGmtModifiedIsNotNull() { - addCriterion("gmt_modified is not null"); - return (Criteria) this; - } - - public Criteria andGmtModifiedEqualTo(Date value) { - addCriterion("gmt_modified =", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotEqualTo(Date value) { - addCriterion("gmt_modified <>", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedGreaterThan(Date value) { - addCriterion("gmt_modified >", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedGreaterThanOrEqualTo(Date value) { - addCriterion("gmt_modified >=", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedLessThan(Date value) { - addCriterion("gmt_modified <", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedLessThanOrEqualTo(Date value) { - addCriterion("gmt_modified <=", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedIn(List values) { - addCriterion("gmt_modified in", values, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotIn(List values) { - addCriterion("gmt_modified not in", values, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedBetween(Date value1, Date value2) { - addCriterion("gmt_modified between", value1, value2, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotBetween(Date value1, Date value2) { - addCriterion("gmt_modified not between", value1, value2, "gmtModified"); - return (Criteria) this; - } - - public Criteria andMemoIsNull() { - addCriterion("memo is null"); - return (Criteria) this; - } - - public Criteria andMemoIsNotNull() { - addCriterion("memo is not null"); - return (Criteria) this; - } - - public Criteria andMemoEqualTo(String value) { - addCriterion("memo =", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotEqualTo(String value) { - addCriterion("memo <>", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoGreaterThan(String value) { - addCriterion("memo >", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoGreaterThanOrEqualTo(String value) { - addCriterion("memo >=", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoLessThan(String value) { - addCriterion("memo <", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoLessThanOrEqualTo(String value) { - addCriterion("memo <=", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoLike(String value) { - addCriterion("memo like", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotLike(String value) { - addCriterion("memo not like", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoIn(List values) { - addCriterion("memo in", values, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotIn(List values) { - addCriterion("memo not in", values, "memo"); - return (Criteria) this; - } - - public Criteria andMemoBetween(String value1, String value2) { - addCriterion("memo between", value1, value2, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotBetween(String value1, String value2) { - addCriterion("memo not between", value1, value2, "memo"); - return (Criteria) this; - } - - public Criteria andDataStateIsNull() { - addCriterion("data_state is null"); - return (Criteria) this; - } - - public Criteria andDataStateIsNotNull() { - addCriterion("data_state is not null"); - return (Criteria) this; - } - - public Criteria andDataStateEqualTo(Integer value) { - addCriterion("data_state =", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotEqualTo(Integer value) { - addCriterion("data_state <>", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateGreaterThan(Integer value) { - addCriterion("data_state >", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateGreaterThanOrEqualTo(Integer value) { - addCriterion("data_state >=", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateLessThan(Integer value) { - addCriterion("data_state <", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateLessThanOrEqualTo(Integer value) { - addCriterion("data_state <=", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateIn(List values) { - addCriterion("data_state in", values, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotIn(List values) { - addCriterion("data_state not in", values, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateBetween(Integer value1, Integer value2) { - addCriterion("data_state between", value1, value2, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotBetween(Integer value1, Integer value2) { - addCriterion("data_state not between", value1, value2, "dataState"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysProvince.java b/src/main/java/com/fc/v2/model/auto/SysProvince.java deleted file mode 100644 index bef1f60..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysProvince.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.fc.v2.model.auto; - -import java.io.Serializable; -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; - -@TableName(value = "t_sys_province") -public class SysProvince implements Serializable { - - @TableId(type = IdType.ASSIGN_ID) - private Integer id; - - private String provinceCode; - - private String provinceName; - - private String shortName; - - private String lng; - - private String lat; - - private Integer sort; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date gmtCreate; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date gmtModified; - - private String memo; - - private Integer dataState; - - private static final long serialVersionUID = 1L; - - public SysProvince(Integer id, String provinceCode, String provinceName, String shortName, String lng, String lat, Integer sort, Date gmtCreate, Date gmtModified, String memo, Integer dataState) { - this.id = id; - this.provinceCode = provinceCode; - this.provinceName = provinceName; - this.shortName = shortName; - this.lng = lng; - this.lat = lat; - this.sort = sort; - this.gmtCreate = gmtCreate; - this.gmtModified = gmtModified; - this.memo = memo; - this.dataState = dataState; - } - - public SysProvince() { - super(); - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getProvinceCode() { - return provinceCode; - } - - public void setProvinceCode(String provinceCode) { - this.provinceCode = provinceCode == null ? null : provinceCode.trim(); - } - - public String getProvinceName() { - return provinceName; - } - - public void setProvinceName(String provinceName) { - this.provinceName = provinceName == null ? null : provinceName.trim(); - } - - public String getShortName() { - return shortName; - } - - public void setShortName(String shortName) { - this.shortName = shortName == null ? null : shortName.trim(); - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng == null ? null : lng.trim(); - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat == null ? null : lat.trim(); - } - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - public Date getGmtCreate() { - return gmtCreate; - } - - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - public Date getGmtModified() { - return gmtModified; - } - - public void setGmtModified(Date gmtModified) { - this.gmtModified = gmtModified; - } - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo == null ? null : memo.trim(); - } - - public Integer getDataState() { - return dataState; - } - - public void setDataState(Integer dataState) { - this.dataState = dataState; - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysProvinceExample.java b/src/main/java/com/fc/v2/model/auto/SysProvinceExample.java deleted file mode 100644 index 865265a..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysProvinceExample.java +++ /dev/null @@ -1,921 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class SysProvinceExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysProvinceExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Integer value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Integer value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Integer value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Integer value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Integer value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Integer value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Integer value1, Integer value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Integer value1, Integer value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andProvinceCodeIsNull() { - addCriterion("province_code is null"); - return (Criteria) this; - } - - public Criteria andProvinceCodeIsNotNull() { - addCriterion("province_code is not null"); - return (Criteria) this; - } - - public Criteria andProvinceCodeEqualTo(String value) { - addCriterion("province_code =", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeNotEqualTo(String value) { - addCriterion("province_code <>", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeGreaterThan(String value) { - addCriterion("province_code >", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeGreaterThanOrEqualTo(String value) { - addCriterion("province_code >=", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeLessThan(String value) { - addCriterion("province_code <", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeLessThanOrEqualTo(String value) { - addCriterion("province_code <=", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeLike(String value) { - addCriterion("province_code like", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeNotLike(String value) { - addCriterion("province_code not like", value, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeIn(List values) { - addCriterion("province_code in", values, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeNotIn(List values) { - addCriterion("province_code not in", values, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeBetween(String value1, String value2) { - addCriterion("province_code between", value1, value2, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceCodeNotBetween(String value1, String value2) { - addCriterion("province_code not between", value1, value2, "provinceCode"); - return (Criteria) this; - } - - public Criteria andProvinceNameIsNull() { - addCriterion("province_name is null"); - return (Criteria) this; - } - - public Criteria andProvinceNameIsNotNull() { - addCriterion("province_name is not null"); - return (Criteria) this; - } - - public Criteria andProvinceNameEqualTo(String value) { - addCriterion("province_name =", value, "provinceName"); - return (Criteria) this; - } - - public Criteria andProvinceNameNotEqualTo(String value) { - addCriterion("province_name <>", value, "provinceName"); - return (Criteria) this; - } - - public Criteria andProvinceNameGreaterThan(String value) { - addCriterion("province_name >", value, "provinceName"); - return (Criteria) this; - } - - public Criteria andProvinceNameGreaterThanOrEqualTo(String value) { - addCriterion("province_name >=", value, "provinceName"); - return (Criteria) this; - } - - public Criteria andProvinceNameLessThan(String value) { - addCriterion("province_name <", value, "provinceName"); - return (Criteria) this; - } - - public Criteria andProvinceNameLessThanOrEqualTo(String value) { - addCriterion("province_name <=", value, "provinceName"); - return (Criteria) this; - } - - public Criteria andProvinceNameLike(String value) { - addCriterion("province_name like", value, "provinceName"); - return (Criteria) this; - } - - public Criteria andProvinceNameNotLike(String value) { - addCriterion("province_name not like", value, "provinceName"); - return (Criteria) this; - } - - public Criteria andProvinceNameIn(List values) { - addCriterion("province_name in", values, "provinceName"); - return (Criteria) this; - } - - public Criteria andProvinceNameNotIn(List values) { - addCriterion("province_name not in", values, "provinceName"); - return (Criteria) this; - } - - public Criteria andProvinceNameBetween(String value1, String value2) { - addCriterion("province_name between", value1, value2, "provinceName"); - return (Criteria) this; - } - - public Criteria andProvinceNameNotBetween(String value1, String value2) { - addCriterion("province_name not between", value1, value2, "provinceName"); - return (Criteria) this; - } - - public Criteria andShortNameIsNull() { - addCriterion("short_name is null"); - return (Criteria) this; - } - - public Criteria andShortNameIsNotNull() { - addCriterion("short_name is not null"); - return (Criteria) this; - } - - public Criteria andShortNameEqualTo(String value) { - addCriterion("short_name =", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotEqualTo(String value) { - addCriterion("short_name <>", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameGreaterThan(String value) { - addCriterion("short_name >", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameGreaterThanOrEqualTo(String value) { - addCriterion("short_name >=", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLessThan(String value) { - addCriterion("short_name <", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLessThanOrEqualTo(String value) { - addCriterion("short_name <=", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLike(String value) { - addCriterion("short_name like", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotLike(String value) { - addCriterion("short_name not like", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameIn(List values) { - addCriterion("short_name in", values, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotIn(List values) { - addCriterion("short_name not in", values, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameBetween(String value1, String value2) { - addCriterion("short_name between", value1, value2, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotBetween(String value1, String value2) { - addCriterion("short_name not between", value1, value2, "shortName"); - return (Criteria) this; - } - - public Criteria andLngIsNull() { - addCriterion("lng is null"); - return (Criteria) this; - } - - public Criteria andLngIsNotNull() { - addCriterion("lng is not null"); - return (Criteria) this; - } - - public Criteria andLngEqualTo(String value) { - addCriterion("lng =", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotEqualTo(String value) { - addCriterion("lng <>", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngGreaterThan(String value) { - addCriterion("lng >", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngGreaterThanOrEqualTo(String value) { - addCriterion("lng >=", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLessThan(String value) { - addCriterion("lng <", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLessThanOrEqualTo(String value) { - addCriterion("lng <=", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLike(String value) { - addCriterion("lng like", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotLike(String value) { - addCriterion("lng not like", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngIn(List values) { - addCriterion("lng in", values, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotIn(List values) { - addCriterion("lng not in", values, "lng"); - return (Criteria) this; - } - - public Criteria andLngBetween(String value1, String value2) { - addCriterion("lng between", value1, value2, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotBetween(String value1, String value2) { - addCriterion("lng not between", value1, value2, "lng"); - return (Criteria) this; - } - - public Criteria andLatIsNull() { - addCriterion("lat is null"); - return (Criteria) this; - } - - public Criteria andLatIsNotNull() { - addCriterion("lat is not null"); - return (Criteria) this; - } - - public Criteria andLatEqualTo(String value) { - addCriterion("lat =", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotEqualTo(String value) { - addCriterion("lat <>", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatGreaterThan(String value) { - addCriterion("lat >", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatGreaterThanOrEqualTo(String value) { - addCriterion("lat >=", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLessThan(String value) { - addCriterion("lat <", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLessThanOrEqualTo(String value) { - addCriterion("lat <=", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLike(String value) { - addCriterion("lat like", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotLike(String value) { - addCriterion("lat not like", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatIn(List values) { - addCriterion("lat in", values, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotIn(List values) { - addCriterion("lat not in", values, "lat"); - return (Criteria) this; - } - - public Criteria andLatBetween(String value1, String value2) { - addCriterion("lat between", value1, value2, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotBetween(String value1, String value2) { - addCriterion("lat not between", value1, value2, "lat"); - return (Criteria) this; - } - - public Criteria andSortIsNull() { - addCriterion("sort is null"); - return (Criteria) this; - } - - public Criteria andSortIsNotNull() { - addCriterion("sort is not null"); - return (Criteria) this; - } - - public Criteria andSortEqualTo(Integer value) { - addCriterion("sort =", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotEqualTo(Integer value) { - addCriterion("sort <>", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortGreaterThan(Integer value) { - addCriterion("sort >", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortGreaterThanOrEqualTo(Integer value) { - addCriterion("sort >=", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortLessThan(Integer value) { - addCriterion("sort <", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortLessThanOrEqualTo(Integer value) { - addCriterion("sort <=", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortIn(List values) { - addCriterion("sort in", values, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotIn(List values) { - addCriterion("sort not in", values, "sort"); - return (Criteria) this; - } - - public Criteria andSortBetween(Integer value1, Integer value2) { - addCriterion("sort between", value1, value2, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotBetween(Integer value1, Integer value2) { - addCriterion("sort not between", value1, value2, "sort"); - return (Criteria) this; - } - - public Criteria andGmtCreateIsNull() { - addCriterion("gmt_create is null"); - return (Criteria) this; - } - - public Criteria andGmtCreateIsNotNull() { - addCriterion("gmt_create is not null"); - return (Criteria) this; - } - - public Criteria andGmtCreateEqualTo(Date value) { - addCriterion("gmt_create =", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotEqualTo(Date value) { - addCriterion("gmt_create <>", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateGreaterThan(Date value) { - addCriterion("gmt_create >", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateGreaterThanOrEqualTo(Date value) { - addCriterion("gmt_create >=", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateLessThan(Date value) { - addCriterion("gmt_create <", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateLessThanOrEqualTo(Date value) { - addCriterion("gmt_create <=", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateIn(List values) { - addCriterion("gmt_create in", values, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotIn(List values) { - addCriterion("gmt_create not in", values, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateBetween(Date value1, Date value2) { - addCriterion("gmt_create between", value1, value2, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotBetween(Date value1, Date value2) { - addCriterion("gmt_create not between", value1, value2, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtModifiedIsNull() { - addCriterion("gmt_modified is null"); - return (Criteria) this; - } - - public Criteria andGmtModifiedIsNotNull() { - addCriterion("gmt_modified is not null"); - return (Criteria) this; - } - - public Criteria andGmtModifiedEqualTo(Date value) { - addCriterion("gmt_modified =", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotEqualTo(Date value) { - addCriterion("gmt_modified <>", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedGreaterThan(Date value) { - addCriterion("gmt_modified >", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedGreaterThanOrEqualTo(Date value) { - addCriterion("gmt_modified >=", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedLessThan(Date value) { - addCriterion("gmt_modified <", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedLessThanOrEqualTo(Date value) { - addCriterion("gmt_modified <=", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedIn(List values) { - addCriterion("gmt_modified in", values, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotIn(List values) { - addCriterion("gmt_modified not in", values, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedBetween(Date value1, Date value2) { - addCriterion("gmt_modified between", value1, value2, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotBetween(Date value1, Date value2) { - addCriterion("gmt_modified not between", value1, value2, "gmtModified"); - return (Criteria) this; - } - - public Criteria andMemoIsNull() { - addCriterion("memo is null"); - return (Criteria) this; - } - - public Criteria andMemoIsNotNull() { - addCriterion("memo is not null"); - return (Criteria) this; - } - - public Criteria andMemoEqualTo(String value) { - addCriterion("memo =", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotEqualTo(String value) { - addCriterion("memo <>", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoGreaterThan(String value) { - addCriterion("memo >", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoGreaterThanOrEqualTo(String value) { - addCriterion("memo >=", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoLessThan(String value) { - addCriterion("memo <", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoLessThanOrEqualTo(String value) { - addCriterion("memo <=", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoLike(String value) { - addCriterion("memo like", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotLike(String value) { - addCriterion("memo not like", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoIn(List values) { - addCriterion("memo in", values, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotIn(List values) { - addCriterion("memo not in", values, "memo"); - return (Criteria) this; - } - - public Criteria andMemoBetween(String value1, String value2) { - addCriterion("memo between", value1, value2, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotBetween(String value1, String value2) { - addCriterion("memo not between", value1, value2, "memo"); - return (Criteria) this; - } - - public Criteria andDataStateIsNull() { - addCriterion("data_state is null"); - return (Criteria) this; - } - - public Criteria andDataStateIsNotNull() { - addCriterion("data_state is not null"); - return (Criteria) this; - } - - public Criteria andDataStateEqualTo(Integer value) { - addCriterion("data_state =", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotEqualTo(Integer value) { - addCriterion("data_state <>", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateGreaterThan(Integer value) { - addCriterion("data_state >", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateGreaterThanOrEqualTo(Integer value) { - addCriterion("data_state >=", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateLessThan(Integer value) { - addCriterion("data_state <", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateLessThanOrEqualTo(Integer value) { - addCriterion("data_state <=", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateIn(List values) { - addCriterion("data_state in", values, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotIn(List values) { - addCriterion("data_state not in", values, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateBetween(Integer value1, Integer value2) { - addCriterion("data_state between", value1, value2, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotBetween(Integer value1, Integer value2) { - addCriterion("data_state not between", value1, value2, "dataState"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysStreet.java b/src/main/java/com/fc/v2/model/auto/SysStreet.java deleted file mode 100644 index 0d8531d..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysStreet.java +++ /dev/null @@ -1,193 +0,0 @@ -package com.fc.v2.model.auto; - -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 java.io.Serializable; -import java.util.Date; - -/** - * 街道设置 SysStreet - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-10-05 01:02:28 - */ -@TableName(value = "t_sys_street") -public class SysStreet implements Serializable { - - private static final long serialVersionUID = 1L; - - - /** 自增列 **/ - @TableId(type = IdType.ASSIGN_ID) - private Integer id; - - /** 街道代码 **/ - private String streetCode; - - /** 父级区代码 **/ - private String areaCode; - - /** 街道名称 **/ - private String streetName; - - /** 简称 **/ - private String shortName; - - /** 经度 **/ - private String lng; - - /** 纬度 **/ - private String lat; - - /** 排序 **/ - private Integer sort; - - /** 创建时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date gmtCreate; - - /** 修改时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date gmtModified; - - /** 备注 **/ - private String memo; - - /** 状态 **/ - private Integer dataState; - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - - public String getStreetCode() { - return streetCode; - } - - public void setStreetCode(String streetCode) { - this.streetCode = streetCode; - } - - - public String getAreaCode() { - return areaCode; - } - - public void setAreaCode(String areaCode) { - this.areaCode = areaCode; - } - - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - - public String getShortName() { - return shortName; - } - - public void setShortName(String shortName) { - this.shortName = shortName; - } - - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - - public Date getGmtCreate() { - return gmtCreate; - } - - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - - public Date getGmtModified() { - return gmtModified; - } - - public void setGmtModified(Date gmtModified) { - this.gmtModified = gmtModified; - } - - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo; - } - - - public Integer getDataState() { - return dataState; - } - - public void setDataState(Integer dataState) { - this.dataState = dataState; - } - - - public SysStreet() { - super(); - } - - - public SysStreet(Integer id,String streetCode,String areaCode,String streetName,String shortName,String lng,String lat,Integer sort,Date gmtCreate,Date gmtModified,String memo,Integer dataState) { - - this.id = id; - this.streetCode = streetCode; - this.areaCode = areaCode; - this.streetName = streetName; - this.shortName = shortName; - this.lng = lng; - this.lat = lat; - this.sort = sort; - this.gmtCreate = gmtCreate; - this.gmtModified = gmtModified; - this.memo = memo; - this.dataState = dataState; - - } - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysStreetExample.java b/src/main/java/com/fc/v2/model/auto/SysStreetExample.java deleted file mode 100644 index 80d441e..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysStreetExample.java +++ /dev/null @@ -1,1060 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 街道设置 SysStreetExample - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-10-05 01:02:28 - */ -public class SysStreetExample { - - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysStreetExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Integer value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Integer value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Integer value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Integer value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Integer value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Integer value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(Integer value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(Integer value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Integer value1, Integer value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Integer value1, Integer value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - - public Criteria andStreetCodeIsNull() { - addCriterion("street_code is null"); - return (Criteria) this; - } - - public Criteria andStreetCodeIsNotNull() { - addCriterion("street_code is not null"); - return (Criteria) this; - } - - public Criteria andStreetCodeEqualTo(String value) { - addCriterion("street_code =", value, "streetCode"); - return (Criteria) this; - } - - public Criteria andStreetCodeNotEqualTo(String value) { - addCriterion("street_code <>", value, "streetCode"); - return (Criteria) this; - } - - public Criteria andStreetCodeGreaterThan(String value) { - addCriterion("street_code >", value, "streetCode"); - return (Criteria) this; - } - - public Criteria andStreetCodeGreaterThanOrEqualTo(String value) { - addCriterion("street_code >=", value, "streetCode"); - return (Criteria) this; - } - - public Criteria andStreetCodeLessThan(String value) { - addCriterion("street_code <", value, "streetCode"); - return (Criteria) this; - } - - public Criteria andStreetCodeLessThanOrEqualTo(String value) { - addCriterion("street_code <=", value, "streetCode"); - return (Criteria) this; - } - - public Criteria andStreetCodeLike(String value) { - addCriterion("street_code like", value, "streetCode"); - return (Criteria) this; - } - - public Criteria andStreetCodeNotLike(String value) { - addCriterion("street_code not like", value, "streetCode"); - return (Criteria) this; - } - - public Criteria andStreetCodeIn(List values) { - addCriterion("street_code in", values, "streetCode"); - return (Criteria) this; - } - - public Criteria andStreetCodeNotIn(List values) { - addCriterion("street_code not in", values, "streetCode"); - return (Criteria) this; - } - - public Criteria andStreetCodeBetween(String value1, String value2) { - addCriterion("street_code between", value1, value2, "streetCode"); - return (Criteria) this; - } - - public Criteria andStreetCodeNotBetween(String value1, String value2) { - addCriterion("street_code not between", value1, value2, "streetCode"); - return (Criteria) this; - } - - - public Criteria andAreaCodeIsNull() { - addCriterion("area_code is null"); - return (Criteria) this; - } - - public Criteria andAreaCodeIsNotNull() { - addCriterion("area_code is not null"); - return (Criteria) this; - } - - public Criteria andAreaCodeEqualTo(String value) { - addCriterion("area_code =", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeNotEqualTo(String value) { - addCriterion("area_code <>", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeGreaterThan(String value) { - addCriterion("area_code >", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeGreaterThanOrEqualTo(String value) { - addCriterion("area_code >=", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeLessThan(String value) { - addCriterion("area_code <", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeLessThanOrEqualTo(String value) { - addCriterion("area_code <=", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeLike(String value) { - addCriterion("area_code like", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeNotLike(String value) { - addCriterion("area_code not like", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeIn(List values) { - addCriterion("area_code in", values, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeNotIn(List values) { - addCriterion("area_code not in", values, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeBetween(String value1, String value2) { - addCriterion("area_code between", value1, value2, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeNotBetween(String value1, String value2) { - addCriterion("area_code not between", value1, value2, "areaCode"); - return (Criteria) this; - } - - - public Criteria andStreetNameIsNull() { - addCriterion("street_name is null"); - return (Criteria) this; - } - - public Criteria andStreetNameIsNotNull() { - addCriterion("street_name is not null"); - return (Criteria) this; - } - - public Criteria andStreetNameEqualTo(String value) { - addCriterion("street_name =", value, "streetName"); - return (Criteria) this; - } - - public Criteria andStreetNameNotEqualTo(String value) { - addCriterion("street_name <>", value, "streetName"); - return (Criteria) this; - } - - public Criteria andStreetNameGreaterThan(String value) { - addCriterion("street_name >", value, "streetName"); - return (Criteria) this; - } - - public Criteria andStreetNameGreaterThanOrEqualTo(String value) { - addCriterion("street_name >=", value, "streetName"); - return (Criteria) this; - } - - public Criteria andStreetNameLessThan(String value) { - addCriterion("street_name <", value, "streetName"); - return (Criteria) this; - } - - public Criteria andStreetNameLessThanOrEqualTo(String value) { - addCriterion("street_name <=", value, "streetName"); - return (Criteria) this; - } - - public Criteria andStreetNameLike(String value) { - addCriterion("street_name like", value, "streetName"); - return (Criteria) this; - } - - public Criteria andStreetNameNotLike(String value) { - addCriterion("street_name not like", value, "streetName"); - return (Criteria) this; - } - - public Criteria andStreetNameIn(List values) { - addCriterion("street_name in", values, "streetName"); - return (Criteria) this; - } - - public Criteria andStreetNameNotIn(List values) { - addCriterion("street_name not in", values, "streetName"); - return (Criteria) this; - } - - public Criteria andStreetNameBetween(String value1, String value2) { - addCriterion("street_name between", value1, value2, "streetName"); - return (Criteria) this; - } - - public Criteria andStreetNameNotBetween(String value1, String value2) { - addCriterion("street_name not between", value1, value2, "streetName"); - return (Criteria) this; - } - - - public Criteria andShortNameIsNull() { - addCriterion("short_name is null"); - return (Criteria) this; - } - - public Criteria andShortNameIsNotNull() { - addCriterion("short_name is not null"); - return (Criteria) this; - } - - public Criteria andShortNameEqualTo(String value) { - addCriterion("short_name =", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotEqualTo(String value) { - addCriterion("short_name <>", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameGreaterThan(String value) { - addCriterion("short_name >", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameGreaterThanOrEqualTo(String value) { - addCriterion("short_name >=", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLessThan(String value) { - addCriterion("short_name <", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLessThanOrEqualTo(String value) { - addCriterion("short_name <=", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLike(String value) { - addCriterion("short_name like", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotLike(String value) { - addCriterion("short_name not like", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameIn(List values) { - addCriterion("short_name in", values, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotIn(List values) { - addCriterion("short_name not in", values, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameBetween(String value1, String value2) { - addCriterion("short_name between", value1, value2, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotBetween(String value1, String value2) { - addCriterion("short_name not between", value1, value2, "shortName"); - return (Criteria) this; - } - - - public Criteria andLngIsNull() { - addCriterion("lng is null"); - return (Criteria) this; - } - - public Criteria andLngIsNotNull() { - addCriterion("lng is not null"); - return (Criteria) this; - } - - public Criteria andLngEqualTo(String value) { - addCriterion("lng =", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotEqualTo(String value) { - addCriterion("lng <>", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngGreaterThan(String value) { - addCriterion("lng >", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngGreaterThanOrEqualTo(String value) { - addCriterion("lng >=", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLessThan(String value) { - addCriterion("lng <", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLessThanOrEqualTo(String value) { - addCriterion("lng <=", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLike(String value) { - addCriterion("lng like", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotLike(String value) { - addCriterion("lng not like", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngIn(List values) { - addCriterion("lng in", values, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotIn(List values) { - addCriterion("lng not in", values, "lng"); - return (Criteria) this; - } - - public Criteria andLngBetween(String value1, String value2) { - addCriterion("lng between", value1, value2, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotBetween(String value1, String value2) { - addCriterion("lng not between", value1, value2, "lng"); - return (Criteria) this; - } - - - public Criteria andLatIsNull() { - addCriterion("lat is null"); - return (Criteria) this; - } - - public Criteria andLatIsNotNull() { - addCriterion("lat is not null"); - return (Criteria) this; - } - - public Criteria andLatEqualTo(String value) { - addCriterion("lat =", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotEqualTo(String value) { - addCriterion("lat <>", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatGreaterThan(String value) { - addCriterion("lat >", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatGreaterThanOrEqualTo(String value) { - addCriterion("lat >=", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLessThan(String value) { - addCriterion("lat <", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLessThanOrEqualTo(String value) { - addCriterion("lat <=", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLike(String value) { - addCriterion("lat like", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotLike(String value) { - addCriterion("lat not like", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatIn(List values) { - addCriterion("lat in", values, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotIn(List values) { - addCriterion("lat not in", values, "lat"); - return (Criteria) this; - } - - public Criteria andLatBetween(String value1, String value2) { - addCriterion("lat between", value1, value2, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotBetween(String value1, String value2) { - addCriterion("lat not between", value1, value2, "lat"); - return (Criteria) this; - } - - - public Criteria andSortIsNull() { - addCriterion("sort is null"); - return (Criteria) this; - } - - public Criteria andSortIsNotNull() { - addCriterion("sort is not null"); - return (Criteria) this; - } - - public Criteria andSortEqualTo(Integer value) { - addCriterion("sort =", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotEqualTo(Integer value) { - addCriterion("sort <>", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortGreaterThan(Integer value) { - addCriterion("sort >", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortGreaterThanOrEqualTo(Integer value) { - addCriterion("sort >=", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortLessThan(Integer value) { - addCriterion("sort <", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortLessThanOrEqualTo(Integer value) { - addCriterion("sort <=", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortLike(Integer value) { - addCriterion("sort like", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotLike(Integer value) { - addCriterion("sort not like", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortIn(List values) { - addCriterion("sort in", values, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotIn(List values) { - addCriterion("sort not in", values, "sort"); - return (Criteria) this; - } - - public Criteria andSortBetween(Integer value1, Integer value2) { - addCriterion("sort between", value1, value2, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotBetween(Integer value1, Integer value2) { - addCriterion("sort not between", value1, value2, "sort"); - return (Criteria) this; - } - - - public Criteria andGmtCreateIsNull() { - addCriterion("gmt_create is null"); - return (Criteria) this; - } - - public Criteria andGmtCreateIsNotNull() { - addCriterion("gmt_create is not null"); - return (Criteria) this; - } - - public Criteria andGmtCreateEqualTo(Date value) { - addCriterion("gmt_create =", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotEqualTo(Date value) { - addCriterion("gmt_create <>", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateGreaterThan(Date value) { - addCriterion("gmt_create >", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateGreaterThanOrEqualTo(Date value) { - addCriterion("gmt_create >=", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateLessThan(Date value) { - addCriterion("gmt_create <", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateLessThanOrEqualTo(Date value) { - addCriterion("gmt_create <=", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateLike(Date value) { - addCriterion("gmt_create like", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotLike(Date value) { - addCriterion("gmt_create not like", value, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateIn(List values) { - addCriterion("gmt_create in", values, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotIn(List values) { - addCriterion("gmt_create not in", values, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateBetween(Date value1, Date value2) { - addCriterion("gmt_create between", value1, value2, "gmtCreate"); - return (Criteria) this; - } - - public Criteria andGmtCreateNotBetween(Date value1, Date value2) { - addCriterion("gmt_create not between", value1, value2, "gmtCreate"); - return (Criteria) this; - } - - - public Criteria andGmtModifiedIsNull() { - addCriterion("gmt_modified is null"); - return (Criteria) this; - } - - public Criteria andGmtModifiedIsNotNull() { - addCriterion("gmt_modified is not null"); - return (Criteria) this; - } - - public Criteria andGmtModifiedEqualTo(Date value) { - addCriterion("gmt_modified =", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotEqualTo(Date value) { - addCriterion("gmt_modified <>", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedGreaterThan(Date value) { - addCriterion("gmt_modified >", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedGreaterThanOrEqualTo(Date value) { - addCriterion("gmt_modified >=", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedLessThan(Date value) { - addCriterion("gmt_modified <", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedLessThanOrEqualTo(Date value) { - addCriterion("gmt_modified <=", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedLike(Date value) { - addCriterion("gmt_modified like", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotLike(Date value) { - addCriterion("gmt_modified not like", value, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedIn(List values) { - addCriterion("gmt_modified in", values, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotIn(List values) { - addCriterion("gmt_modified not in", values, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedBetween(Date value1, Date value2) { - addCriterion("gmt_modified between", value1, value2, "gmtModified"); - return (Criteria) this; - } - - public Criteria andGmtModifiedNotBetween(Date value1, Date value2) { - addCriterion("gmt_modified not between", value1, value2, "gmtModified"); - return (Criteria) this; - } - - - public Criteria andMemoIsNull() { - addCriterion("memo is null"); - return (Criteria) this; - } - - public Criteria andMemoIsNotNull() { - addCriterion("memo is not null"); - return (Criteria) this; - } - - public Criteria andMemoEqualTo(String value) { - addCriterion("memo =", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotEqualTo(String value) { - addCriterion("memo <>", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoGreaterThan(String value) { - addCriterion("memo >", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoGreaterThanOrEqualTo(String value) { - addCriterion("memo >=", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoLessThan(String value) { - addCriterion("memo <", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoLessThanOrEqualTo(String value) { - addCriterion("memo <=", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoLike(String value) { - addCriterion("memo like", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotLike(String value) { - addCriterion("memo not like", value, "memo"); - return (Criteria) this; - } - - public Criteria andMemoIn(List values) { - addCriterion("memo in", values, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotIn(List values) { - addCriterion("memo not in", values, "memo"); - return (Criteria) this; - } - - public Criteria andMemoBetween(String value1, String value2) { - addCriterion("memo between", value1, value2, "memo"); - return (Criteria) this; - } - - public Criteria andMemoNotBetween(String value1, String value2) { - addCriterion("memo not between", value1, value2, "memo"); - return (Criteria) this; - } - - - public Criteria andDataStateIsNull() { - addCriterion("data_state is null"); - return (Criteria) this; - } - - public Criteria andDataStateIsNotNull() { - addCriterion("data_state is not null"); - return (Criteria) this; - } - - public Criteria andDataStateEqualTo(Integer value) { - addCriterion("data_state =", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotEqualTo(Integer value) { - addCriterion("data_state <>", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateGreaterThan(Integer value) { - addCriterion("data_state >", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateGreaterThanOrEqualTo(Integer value) { - addCriterion("data_state >=", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateLessThan(Integer value) { - addCriterion("data_state <", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateLessThanOrEqualTo(Integer value) { - addCriterion("data_state <=", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateLike(Integer value) { - addCriterion("data_state like", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotLike(Integer value) { - addCriterion("data_state not like", value, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateIn(List values) { - addCriterion("data_state in", values, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotIn(List values) { - addCriterion("data_state not in", values, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateBetween(Integer value1, Integer value2) { - addCriterion("data_state between", value1, value2, "dataState"); - return (Criteria) this; - } - - public Criteria andDataStateNotBetween(Integer value1, Integer value2) { - addCriterion("data_state not between", value1, value2, "dataState"); - return (Criteria) this; - } - - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/TSysArea.java b/src/main/java/com/fc/v2/model/auto/TSysArea.java new file mode 100644 index 0000000..9963379 --- /dev/null +++ b/src/main/java/com/fc/v2/model/auto/TSysArea.java @@ -0,0 +1,152 @@ + +package com.fc.v2.model.auto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.common.base.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +/** + * 地区设置对象 t_sys_area + * + * @author zhaonz + * @date 2021-08-05 + */ +@TableName("t_sys_area") +public class TSysArea extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 区代码 */ + private String areaCode; + + /** 父级市代码 */ + private String cityCode; + + /** 市名称 */ + private String areaName; + + /** 简称 */ + private String shortName; + + /** 经度 */ + private String lng; + + /** 纬度 */ + private String lat; + + /** 排序 */ + private Integer sort; + + /** 状态 */ + private Integer dataState; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setAreaCode(String areaCode) + { + this.areaCode = areaCode; + } + + public String getAreaCode() + { + return areaCode; + } + public void setCityCode(String cityCode) + { + this.cityCode = cityCode; + } + + public String getCityCode() + { + return cityCode; + } + public void setAreaName(String areaName) + { + this.areaName = areaName; + } + + public String getAreaName() + { + return areaName; + } + public void setShortName(String shortName) + { + this.shortName = shortName; + } + + public String getShortName() + { + return shortName; + } + public void setLng(String lng) + { + this.lng = lng; + } + + public String getLng() + { + return lng; + } + public void setLat(String lat) + { + this.lat = lat; + } + + public String getLat() + { + return lat; + } + public void setSort(Integer sort) + { + this.sort = sort; + } + + public Integer getSort() + { + return sort; + } + public void setDataState(Integer dataState) + { + this.dataState = dataState; + } + + public Integer getDataState() + { + return dataState; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("areaCode", getAreaCode()) + .append("cityCode", getCityCode()) + .append("areaName", getAreaName()) + .append("shortName", getShortName()) + .append("lng", getLng()) + .append("lat", getLat()) + .append("sort", getSort()) + .append("dataState", getDataState()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysCity.java b/src/main/java/com/fc/v2/model/auto/TSysCity.java new file mode 100644 index 0000000..a057c6b --- /dev/null +++ b/src/main/java/com/fc/v2/model/auto/TSysCity.java @@ -0,0 +1,152 @@ + +package com.fc.v2.model.auto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.common.base.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +/** + * 城市设置对象 t_sys_city + * + * @author zhaonz + * @date 2021-08-05 + */ +@TableName("t_sys_city") +public class TSysCity extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 市代码 */ + private String cityCode; + + /** 市名称 */ + private String cityName; + + /** 简称 */ + private String shortName; + + /** 省代码 */ + private String provinceCode; + + /** 经度 */ + private String lng; + + /** 纬度 */ + private String lat; + + /** 排序 */ + private Integer sort; + + /** 状态 */ + private Integer dataState; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setCityCode(String cityCode) + { + this.cityCode = cityCode; + } + + public String getCityCode() + { + return cityCode; + } + public void setCityName(String cityName) + { + this.cityName = cityName; + } + + public String getCityName() + { + return cityName; + } + public void setShortName(String shortName) + { + this.shortName = shortName; + } + + public String getShortName() + { + return shortName; + } + public void setProvinceCode(String provinceCode) + { + this.provinceCode = provinceCode; + } + + public String getProvinceCode() + { + return provinceCode; + } + public void setLng(String lng) + { + this.lng = lng; + } + + public String getLng() + { + return lng; + } + public void setLat(String lat) + { + this.lat = lat; + } + + public String getLat() + { + return lat; + } + public void setSort(Integer sort) + { + this.sort = sort; + } + + public Integer getSort() + { + return sort; + } + public void setDataState(Integer dataState) + { + this.dataState = dataState; + } + + public Integer getDataState() + { + return dataState; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("cityCode", getCityCode()) + .append("cityName", getCityName()) + .append("shortName", getShortName()) + .append("provinceCode", getProvinceCode()) + .append("lng", getLng()) + .append("lat", getLat()) + .append("sort", getSort()) + .append("dataState", getDataState()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysProvince.java b/src/main/java/com/fc/v2/model/auto/TSysProvince.java new file mode 100644 index 0000000..32533cc --- /dev/null +++ b/src/main/java/com/fc/v2/model/auto/TSysProvince.java @@ -0,0 +1,139 @@ + +package com.fc.v2.model.auto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.common.base.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +/** + * 省份对象 t_sys_province + * + * @author zhaonz + * @date 2021-08-05 + */ +@TableName("t_sys_province") +public class TSysProvince extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 省份代码 */ + private String provinceCode; + + /** 省份名称 */ + private String provinceName; + + /** 简称 */ + private String shortName; + + /** 经度 */ + private String lng; + + /** 纬度 */ + private String lat; + + /** 排序 */ + private Integer sort; + + /** 状态 */ + private Integer dataState; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setProvinceCode(String provinceCode) + { + this.provinceCode = provinceCode; + } + + public String getProvinceCode() + { + return provinceCode; + } + public void setProvinceName(String provinceName) + { + this.provinceName = provinceName; + } + + public String getProvinceName() + { + return provinceName; + } + public void setShortName(String shortName) + { + this.shortName = shortName; + } + + public String getShortName() + { + return shortName; + } + public void setLng(String lng) + { + this.lng = lng; + } + + public String getLng() + { + return lng; + } + public void setLat(String lat) + { + this.lat = lat; + } + + public String getLat() + { + return lat; + } + public void setSort(Integer sort) + { + this.sort = sort; + } + + public Integer getSort() + { + return sort; + } + public void setDataState(Integer dataState) + { + this.dataState = dataState; + } + + public Integer getDataState() + { + return dataState; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("provinceCode", getProvinceCode()) + .append("provinceName", getProvinceName()) + .append("shortName", getShortName()) + .append("lng", getLng()) + .append("lat", getLat()) + .append("sort", getSort()) + .append("dataState", getDataState()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysStreet.java b/src/main/java/com/fc/v2/model/auto/TSysStreet.java new file mode 100644 index 0000000..93b5021 --- /dev/null +++ b/src/main/java/com/fc/v2/model/auto/TSysStreet.java @@ -0,0 +1,152 @@ + +package com.fc.v2.model.auto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.common.base.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +/** + * 街道设置对象 t_sys_street + * + * @author zhaonz + * @date 2021-08-05 + */ +@TableName("t_sys_street") +public class TSysStreet extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 街道代码 */ + private String streetCode; + + /** 父级区代码 */ + private String areaCode; + + /** 街道名称 */ + private String streetName; + + /** 简称 */ + private String shortName; + + /** 经度 */ + private String lng; + + /** 纬度 */ + private String lat; + + /** 排序 */ + private Integer sort; + + /** 状态 */ + private Integer dataState; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setStreetCode(String streetCode) + { + this.streetCode = streetCode; + } + + public String getStreetCode() + { + return streetCode; + } + public void setAreaCode(String areaCode) + { + this.areaCode = areaCode; + } + + public String getAreaCode() + { + return areaCode; + } + public void setStreetName(String streetName) + { + this.streetName = streetName; + } + + public String getStreetName() + { + return streetName; + } + public void setShortName(String shortName) + { + this.shortName = shortName; + } + + public String getShortName() + { + return shortName; + } + public void setLng(String lng) + { + this.lng = lng; + } + + public String getLng() + { + return lng; + } + public void setLat(String lat) + { + this.lat = lat; + } + + public String getLat() + { + return lat; + } + public void setSort(Integer sort) + { + this.sort = sort; + } + + public Integer getSort() + { + return sort; + } + public void setDataState(Integer dataState) + { + this.dataState = dataState; + } + + public Integer getDataState() + { + return dataState; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("streetCode", getStreetCode()) + .append("areaCode", getAreaCode()) + .append("streetName", getStreetName()) + .append("shortName", getShortName()) + .append("lng", getLng()) + .append("lat", getLat()) + .append("sort", getSort()) + .append("dataState", getDataState()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/service/ITSysAreaService.java b/src/main/java/com/fc/v2/service/ITSysAreaService.java new file mode 100644 index 0000000..bbcda78 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysAreaService.java @@ -0,0 +1,74 @@ + +package com.fc.v2.service; + +import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.fc.v2.model.auto.TSysArea; + + +/** + * 地区设置Service接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface ITSysAreaService extends IService +{ + /** + * 查询地区设置 + * + * @param id 地区设置ID + * @return 地区设置 + */ + public TSysArea selectTSysAreaById(Long id); + + /** + * 查询地区设置列表 + * + * @param queryWrapper 地区设置 + * @return 地区设置集合 + */ + public List selectTSysAreaList(Wrapper queryWrapper); + + /** + * 新增地区设置 + * + * @param tSysArea 地区设置 + * @return 结果 + */ + public int insertTSysArea(TSysArea tSysArea); + + /** + * 修改地区设置 + * + * @param tSysArea 地区设置 + * @return 结果 + */ + public int updateTSysArea(TSysArea tSysArea); + + /** + * 批量删除地区设置 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysAreaByIds(String ids); + + /** + * 删除地区设置信息 + * + * @param id 地区设置ID + * @return 结果 + */ + public int deleteTSysAreaById(Long id); + + /** + * 检查Name唯一 + * + * @param sysArea + * @return + */ + public int checkNameUnique(TSysArea sysArea); +} diff --git a/src/main/java/com/fc/v2/service/ITSysCityService.java b/src/main/java/com/fc/v2/service/ITSysCityService.java new file mode 100644 index 0000000..2f40129 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysCityService.java @@ -0,0 +1,74 @@ + +package com.fc.v2.service; + +import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.fc.v2.model.auto.TSysCity; + + +/** + * 城市设置Service接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface ITSysCityService extends IService +{ + /** + * 查询城市设置 + * + * @param id 城市设置ID + * @return 城市设置 + */ + public TSysCity selectTSysCityById(Long id); + + /** + * 查询城市设置列表 + * + * @param queryWrapper 城市设置 + * @return 城市设置集合 + */ + public List selectTSysCityList(Wrapper queryWrapper); + + /** + * 新增城市设置 + * + * @param tSysCity 城市设置 + * @return 结果 + */ + public int insertTSysCity(TSysCity tSysCity); + + /** + * 修改城市设置 + * + * @param tSysCity 城市设置 + * @return 结果 + */ + public int updateTSysCity(TSysCity tSysCity); + + /** + * 批量删除城市设置 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysCityByIds(String ids); + + /** + * 删除城市设置信息 + * + * @param id 城市设置ID + * @return 结果 + */ + public int deleteTSysCityById(Long id); + + /** + * 检查Name唯一 + * + * @param sysCity + * @return + */ + int checkNameUnique(TSysCity sysCity); +} diff --git a/src/main/java/com/fc/v2/service/ITSysProvinceService.java b/src/main/java/com/fc/v2/service/ITSysProvinceService.java new file mode 100644 index 0000000..049db85 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysProvinceService.java @@ -0,0 +1,74 @@ + +package com.fc.v2.service; + +import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.fc.v2.model.auto.TSysProvince; + + +/** + * 省份Service接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface ITSysProvinceService extends IService +{ + /** + * 查询省份 + * + * @param id 省份ID + * @return 省份 + */ + public TSysProvince selectTSysProvinceById(Long id); + + /** + * 查询省份列表 + * + * @param queryWrapper 省份 + * @return 省份集合 + */ + public List selectTSysProvinceList(Wrapper queryWrapper); + + /** + * 新增省份 + * + * @param tSysProvince 省份 + * @return 结果 + */ + public int insertTSysProvince(TSysProvince tSysProvince); + + /** + * 修改省份 + * + * @param tSysProvince 省份 + * @return 结果 + */ + public int updateTSysProvince(TSysProvince tSysProvince); + + /** + * 批量删除省份 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysProvinceByIds(String ids); + + /** + * 删除省份信息 + * + * @param id 省份ID + * @return 结果 + */ + public int deleteTSysProvinceById(Long id); + + /** + * 检查Name唯一 + * + * @param sysProvince + * @return + */ + int checkNameUnique(TSysProvince sysProvince); +} diff --git a/src/main/java/com/fc/v2/service/ITSysStreetService.java b/src/main/java/com/fc/v2/service/ITSysStreetService.java new file mode 100644 index 0000000..cd16775 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysStreetService.java @@ -0,0 +1,74 @@ + +package com.fc.v2.service; + +import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.fc.v2.model.auto.TSysStreet; + + +/** + * 街道设置Service接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface ITSysStreetService extends IService +{ + /** + * 查询街道设置 + * + * @param id 街道设置ID + * @return 街道设置 + */ + public TSysStreet selectTSysStreetById(Long id); + + /** + * 查询街道设置列表 + * + * @param queryWrapper 街道设置 + * @return 街道设置集合 + */ + public List selectTSysStreetList(Wrapper queryWrapper); + + /** + * 新增街道设置 + * + * @param tSysStreet 街道设置 + * @return 结果 + */ + public int insertTSysStreet(TSysStreet tSysStreet); + + /** + * 修改街道设置 + * + * @param tSysStreet 街道设置 + * @return 结果 + */ + public int updateTSysStreet(TSysStreet tSysStreet); + + /** + * 批量删除街道设置 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysStreetByIds(String ids); + + /** + * 删除街道设置信息 + * + * @param id 街道设置ID + * @return 结果 + */ + public int deleteTSysStreetById(Long id); + + /** + * 检查Name唯一 + * + * @param sysStreet + * @return + */ + int checkNameUnique(TSysStreet sysStreet); +} diff --git a/src/main/java/com/fc/v2/service/SysAreaService.java b/src/main/java/com/fc/v2/service/SysAreaService.java deleted file mode 100644 index 646fddc..0000000 --- a/src/main/java/com/fc/v2/service/SysAreaService.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.SysAreaMapper; -import com.fc.v2.model.auto.SysArea; -import com.fc.v2.model.auto.SysAreaExample; -import com.fc.v2.model.custom.Tablepar; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - -/** - * 地区设置 SysAreaService - * @Title: SysAreaService.java - * @Package com.fc.v2.service - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-10-04 21:47:38 - **/ -@Service -public class SysAreaService extends ServiceImpl implements IService { - @Autowired - private SysAreaMapper sysAreaMapper; - - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name){ - - SysAreaExample testExample=new SysAreaExample(); - testExample.setOrderByClause("id ASC"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andAreaNameLike("%"+name+"%"); - } - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysAreaMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - - return pageInfo; - } - - - public int deleteByPrimaryKey(String ids) { - Integer[] integers = ConvertUtil.toIntArray(",", ids); - List stringB = Arrays.asList(integers); - SysAreaExample example=new SysAreaExample(); - example.createCriteria().andIdIn(stringB); - return sysAreaMapper.deleteByExample(example); - } - - - - public SysArea selectByPrimaryKey(Integer id) { - - return sysAreaMapper.selectByPrimaryKey(id); - } - - - - public int updateByPrimaryKeySelective(SysArea record) { - return sysAreaMapper.updateByPrimaryKeySelective(record); - } - - /** - * 添加 - */ - - public int insertSelective(SysArea record) { - //添加雪花主键id - record.setId(null); - return sysAreaMapper.insertSelective(record); - } - - - - public int updateByExampleSelective(SysArea record, SysAreaExample example) { - - return sysAreaMapper.updateByExampleSelective(record, example); - } - - - - public int updateByExample(SysArea record, SysAreaExample example) { - - return sysAreaMapper.updateByExample(record, example); - } - - - public List selectByExample(SysAreaExample example) { - - return sysAreaMapper.selectByExample(example); - } - - - - public long countByExample(SysAreaExample example) { - - return sysAreaMapper.countByExample(example); - } - - - - public int deleteByExample(SysAreaExample example) { - - return sysAreaMapper.deleteByExample(example); - } - - /** - * 检查name - * @param sysArea - * @return - */ - public int checkNameUnique(SysArea sysArea){ - SysAreaExample example=new SysAreaExample(); - example.createCriteria().andAreaNameEqualTo(sysArea.getAreaName()); - List list=sysAreaMapper.selectByExample(example); - return list.size(); - } - - -} diff --git a/src/main/java/com/fc/v2/service/SysCityService.java b/src/main/java/com/fc/v2/service/SysCityService.java deleted file mode 100644 index eb0fc77..0000000 --- a/src/main/java/com/fc/v2/service/SysCityService.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.SysCityMapper; -import com.fc.v2.model.auto.SysCity; -import com.fc.v2.model.auto.SysCityExample; -import com.fc.v2.model.custom.Tablepar; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - -/** - * 城市设置 SysCityService - * @Title: SysCityService.java - * @Package com.fc.v2.service - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-10-04 21:15:13 - **/ -@Service -public class SysCityService extends ServiceImpl implements IService { - @Autowired - private SysCityMapper sysCityMapper; - - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name){ - SysCityExample testExample=new SysCityExample(); - testExample.setOrderByClause("id ASC"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andCityNameLike("%"+name+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysCityMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - - public int deleteByPrimaryKey(String ids) { - Integer[] integers = ConvertUtil.toIntArray(",", ids); - List stringB = Arrays.asList(integers); - SysCityExample example=new SysCityExample(); - example.createCriteria().andIdIn(stringB); - return sysCityMapper.deleteByExample(example); - } - - - - public SysCity selectByPrimaryKey(Integer id) { - return sysCityMapper.selectByPrimaryKey(id); - } - - - - public int updateByPrimaryKeySelective(SysCity record) { - return sysCityMapper.updateByPrimaryKeySelective(record); - } - - /** - * 添加 - */ - - public int insertSelective(SysCity record) { - //添加雪花主键id - record.setId(null); - return sysCityMapper.insertSelective(record); - } - - - - public int updateByExampleSelective(SysCity record, SysCityExample example) { - - return sysCityMapper.updateByExampleSelective(record, example); - } - - - - public int updateByExample(SysCity record, SysCityExample example) { - - return sysCityMapper.updateByExample(record, example); - } - - - public List selectByExample(SysCityExample example) { - - return sysCityMapper.selectByExample(example); - } - - - - public long countByExample(SysCityExample example) { - - return sysCityMapper.countByExample(example); - } - - - - public int deleteByExample(SysCityExample example) { - - return sysCityMapper.deleteByExample(example); - } - - /** - * 检查name - * @param sysCity - * @return - */ - public int checkNameUnique(SysCity sysCity){ - SysCityExample example=new SysCityExample(); - example.createCriteria().andCityNameEqualTo(sysCity.getCityName()); - List list=sysCityMapper.selectByExample(example); - return list.size(); - } - - -} diff --git a/src/main/java/com/fc/v2/service/SysProvinceService.java b/src/main/java/com/fc/v2/service/SysProvinceService.java deleted file mode 100644 index 59b8956..0000000 --- a/src/main/java/com/fc/v2/service/SysProvinceService.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.SysProvinceMapper; -import com.fc.v2.model.auto.SysProvince; -import com.fc.v2.model.auto.SysProvinceExample; -import com.fc.v2.model.custom.Tablepar; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - -/** - * 省份表 SysProvinceService - * @Title: SysProvinceService.java - * @Package com.fc.v2.service - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-10-04 19:56:15 - **/ -@Service -public class SysProvinceService extends ServiceImpl implements IService { - @Autowired - private SysProvinceMapper sysProvinceMapper; - - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name){ - SysProvinceExample testExample=new SysProvinceExample(); - testExample.setOrderByClause("id ASC"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andProvinceNameLike("%"+name+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysProvinceMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - - public int deleteByPrimaryKey(String ids) { - Integer[] integers = ConvertUtil.toIntArray(",", ids); - List stringB = Arrays.asList(integers); - SysProvinceExample example=new SysProvinceExample(); - example.createCriteria().andIdIn(stringB); - return sysProvinceMapper.deleteByExample(example); - } - - - - public SysProvince selectByPrimaryKey(Integer id) { - - return sysProvinceMapper.selectByPrimaryKey(id); - } - - - - public int updateByPrimaryKeySelective(SysProvince record) { - return sysProvinceMapper.updateByPrimaryKeySelective(record); - } - - /** - * 添加 - */ - public int insertSelective(SysProvince record) { - //添加主键id - record.setId(null); - return sysProvinceMapper.insertSelective(record); - } - - - - public int updateByExampleSelective(SysProvince record, SysProvinceExample example) { - - return sysProvinceMapper.updateByExampleSelective(record, example); - } - - - - public int updateByExample(SysProvince record, SysProvinceExample example) { - - return sysProvinceMapper.updateByExample(record, example); - } - - - public List selectByExample(SysProvinceExample example) { - - return sysProvinceMapper.selectByExample(example); - } - - - - public long countByExample(SysProvinceExample example) { - - return sysProvinceMapper.countByExample(example); - } - - - - public int deleteByExample(SysProvinceExample example) { - - return sysProvinceMapper.deleteByExample(example); - } - - /** - * 检查name - * @param sysProvince - * @return - */ - public int checkNameUnique(SysProvince sysProvince){ - SysProvinceExample example=new SysProvinceExample(); - example.createCriteria().andProvinceNameEqualTo(sysProvince.getProvinceName()); - List list=sysProvinceMapper.selectByExample(example); - return list.size(); - } - - -} diff --git a/src/main/java/com/fc/v2/service/SysStreetService.java b/src/main/java/com/fc/v2/service/SysStreetService.java deleted file mode 100644 index afa570d..0000000 --- a/src/main/java/com/fc/v2/service/SysStreetService.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.SysStreetMapper; -import com.fc.v2.model.auto.SysStreet; -import com.fc.v2.model.auto.SysStreetExample; -import com.fc.v2.model.custom.Tablepar; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - -/** - * 街道设置 SysStreetService - * @Title: SysStreetService.java - * @Package com.fc.v2.service - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-10-05 01:02:28 - **/ -@Service -public class SysStreetService extends ServiceImpl implements BaseService{ - @Autowired - private SysStreetMapper sysStreetMapper; - - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name){ - SysStreetExample testExample=new SysStreetExample(); - testExample.setOrderByClause("id ASC"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andStreetNameLike("%"+name+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysStreetMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - @Override - public int deleteByPrimaryKey(String ids) { - - Integer[] integers = ConvertUtil.toIntArray(",", ids); - List stringB = Arrays.asList(integers); - SysStreetExample example=new SysStreetExample(); - example.createCriteria().andIdIn(stringB); - return sysStreetMapper.deleteByExample(example); - - - } - - - @Override - public SysStreet selectByPrimaryKey(String id) { - - Integer id1 = Integer.valueOf(id); - return sysStreetMapper.selectByPrimaryKey(id1); - - } - - - @Override - public int updateByPrimaryKeySelective(SysStreet record) { - return sysStreetMapper.updateByPrimaryKeySelective(record); - } - - - /** - * 添加 - */ - @Override - public int insertSelective(SysStreet record) { - record.setId(null); - - return sysStreetMapper.insertSelective(record); - } - - - @Override - public int updateByExampleSelective(SysStreet record, SysStreetExample example) { - - return sysStreetMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(SysStreet record, SysStreetExample example) { - - return sysStreetMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(SysStreetExample example) { - - return sysStreetMapper.selectByExample(example); - } - - - @Override - public long countByExample(SysStreetExample example) { - - return sysStreetMapper.countByExample(example); - } - - - @Override - public int deleteByExample(SysStreetExample example) { - - return sysStreetMapper.deleteByExample(example); - } - - /** - * 检查name - * @param sysStreet - * @return - */ - public int checkNameUnique(SysStreet sysStreet){ - SysStreetExample example=new SysStreetExample(); - example.createCriteria().andStreetNameEqualTo(sysStreet.getStreetName()); - List list=sysStreetMapper.selectByExample(example); - return list.size(); - } - - -} diff --git a/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java new file mode 100644 index 0000000..696906c --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java @@ -0,0 +1,116 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.common.support.ConvertUtil; +import com.fc.v2.mapper.auto.TSysAreaMapper; +import com.fc.v2.model.auto.TSysArea; +import com.fc.v2.service.ITSysAreaService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 地区设置Service业务层处理 + * + * @author zhaonz + * @date 2021-08-05 + */ +@Service +public class TSysAreaServiceImpl extends ServiceImpl implements ITSysAreaService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysAreaServiceImpl.class); + + @Autowired + private TSysAreaMapper tSysAreaMapper; + + /** + * 查询地区设置 + * + * @param id 地区设置ID + * @return 地区设置 + */ + @Override + public TSysArea selectTSysAreaById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询地区设置列表 + * + * @param queryWrapper 地区设置 + * @return 地区设置 + */ + @Override + public List selectTSysAreaList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增地区设置 + * + * @param tSysArea 地区设置 + * @return 结果 + */ + @Override + public int insertTSysArea(TSysArea tSysArea) + { + return this.baseMapper.insert(tSysArea); + } + + /** + * 修改地区设置 + * + * @param tSysArea 地区设置 + * @return 结果 + */ + @Override + public int updateTSysArea(TSysArea tSysArea) + { + return this.baseMapper.updateById(tSysArea); + } + + /** + * 删除地区设置对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysAreaByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除地区设置信息 + * + * @param id 地区设置ID + * @return 结果 + */ + @Override + public int deleteTSysAreaById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * 检查Name唯一 + * + * @param sysArea + * @return + */ + @Override + public int checkNameUnique(TSysArea sysArea) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("area_name", sysArea.getAreaName()); + return this.selectTSysAreaList(queryWrapper).size(); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysCityServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysCityServiceImpl.java new file mode 100644 index 0000000..d7a6b5f --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysCityServiceImpl.java @@ -0,0 +1,110 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.common.support.ConvertUtil; +import com.fc.v2.mapper.auto.TSysCityMapper; +import com.fc.v2.model.auto.TSysCity; +import com.fc.v2.service.ITSysCityService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 城市设置Service业务层处理 + * + * @author zhaonz + * @date 2021-08-05 + */ +@Service +public class TSysCityServiceImpl extends ServiceImpl implements ITSysCityService { + private static final Logger logger = LoggerFactory.getLogger(TSysCityServiceImpl.class); + + @Autowired + private TSysCityMapper tSysCityMapper; + + /** + * 查询城市设置 + * + * @param id 城市设置ID + * @return 城市设置 + */ + @Override + public TSysCity selectTSysCityById(Long id) { + return this.baseMapper.selectById(id); + } + + /** + * 查询城市设置列表 + * + * @param queryWrapper 城市设置 + * @return 城市设置 + */ + @Override + public List selectTSysCityList(Wrapper queryWrapper) { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增城市设置 + * + * @param tSysCity 城市设置 + * @return 结果 + */ + @Override + public int insertTSysCity(TSysCity tSysCity) { + return this.baseMapper.insert(tSysCity); + } + + /** + * 修改城市设置 + * + * @param tSysCity 城市设置 + * @return 结果 + */ + @Override + public int updateTSysCity(TSysCity tSysCity) { + return this.baseMapper.updateById(tSysCity); + } + + /** + * 删除城市设置对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysCityByIds(String ids) { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除城市设置信息 + * + * @param id 城市设置ID + * @return 结果 + */ + @Override + public int deleteTSysCityById(Long id) { + return this.baseMapper.deleteById(id); + } + + /** + * 检查Name唯一 + * + * @param sysCity + * @return + */ + @Override + public int checkNameUnique(TSysCity sysCity) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("city_name", sysCity.getCityName()); + return this.selectTSysCityList(queryWrapper).size(); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysProvinceServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysProvinceServiceImpl.java new file mode 100644 index 0000000..b6dc557 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysProvinceServiceImpl.java @@ -0,0 +1,115 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.common.support.ConvertUtil; +import com.fc.v2.mapper.auto.TSysProvinceMapper; +import com.fc.v2.model.auto.TSysProvince; +import com.fc.v2.service.ITSysProvinceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 省份Service业务层处理 + * + * @author zhaonz + * @date 2021-08-05 + */ +@Service +public class TSysProvinceServiceImpl extends ServiceImpl implements ITSysProvinceService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysProvinceServiceImpl.class); + + @Autowired + private TSysProvinceMapper tSysProvinceMapper; + + /** + * 查询省份 + * + * @param id 省份ID + * @return 省份 + */ + @Override + public TSysProvince selectTSysProvinceById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询省份列表 + * + * @param queryWrapper 省份 + * @return 省份 + */ + @Override + public List selectTSysProvinceList(Wrapper queryWrapper) { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增省份 + * + * @param tSysProvince 省份 + * @return 结果 + */ + @Override + public int insertTSysProvince(TSysProvince tSysProvince) + { + return this.baseMapper.insert(tSysProvince); + } + + /** + * 修改省份 + * + * @param tSysProvince 省份 + * @return 结果 + */ + @Override + public int updateTSysProvince(TSysProvince tSysProvince) + { + return this.baseMapper.updateById(tSysProvince); + } + + /** + * 删除省份对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysProvinceByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除省份信息 + * + * @param id 省份ID + * @return 结果 + */ + @Override + public int deleteTSysProvinceById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * 检查Name唯一 + * + * @param sysCity + * @return + */ + @Override + public int checkNameUnique(TSysProvince sysProvince) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("province_name", sysProvince.getProvinceName()); + return this.selectTSysProvinceList(queryWrapper).size(); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysStreetServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysStreetServiceImpl.java new file mode 100644 index 0000000..a4af127 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysStreetServiceImpl.java @@ -0,0 +1,116 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.common.support.ConvertUtil; +import com.fc.v2.mapper.auto.TSysStreetMapper; +import com.fc.v2.model.auto.TSysStreet; +import com.fc.v2.service.ITSysStreetService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 街道设置Service业务层处理 + * + * @author zhaonz + * @date 2021-08-05 + */ +@Service +public class TSysStreetServiceImpl extends ServiceImpl implements ITSysStreetService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysStreetServiceImpl.class); + + @Autowired + private TSysStreetMapper tSysStreetMapper; + + /** + * 查询街道设置 + * + * @param id 街道设置ID + * @return 街道设置 + */ + @Override + public TSysStreet selectTSysStreetById(Long id) + { + return this.baseMapper.selectById(id); + } + + + /** + * 查询街道设置列表 + * + * @param queryWrapper 街道设置 + * @return 街道设置 + */ + @Override + public List selectTSysStreetList(Wrapper queryWrapper) { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增街道设置 + * + * @param tSysStreet 街道设置 + * @return 结果 + */ + @Override + public int insertTSysStreet(TSysStreet tSysStreet) + { + return this.baseMapper.insert(tSysStreet); + } + + /** + * 修改街道设置 + * + * @param tSysStreet 街道设置 + * @return 结果 + */ + @Override + public int updateTSysStreet(TSysStreet tSysStreet) + { + return this.baseMapper.updateById(tSysStreet); + } + + /** + * 删除街道设置对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysStreetByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除街道设置信息 + * + * @param id 街道设置ID + * @return 结果 + */ + @Override + public int deleteTSysStreetById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * 检查Name唯一 + * + * @param sysStreet + * @return + */ + @Override + public int checkNameUnique(TSysStreet sysStreet) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("street_name", sysStreet.getStreetName()); + return this.selectTSysStreetList(queryWrapper).size(); + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 06a4f39..299e559 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -94,7 +94,7 @@ spring : # #该配置项就是指将带有下划线的表字段映射为驼峰格式的实体类属性。 # configuration : # map-underscore-to-camel-case : true -#pagehelper分页插件 + mybatis-plus: #config-location: classpath:mybatis/mybatis-config.xml mapper-locations: classpath:mybatis/**/*Mapper.xml @@ -112,6 +112,7 @@ mybatis-plus: id-type: assign_id table-underline: true +#pagehelper分页插件 pagehelper: helperDialect: mysql reasonable: true diff --git a/src/main/resources/mybatis/auto/SysAreaMapper.xml b/src/main/resources/mybatis/auto/SysAreaMapper.xml deleted file mode 100644 index 9d37a0a..0000000 --- a/src/main/resources/mybatis/auto/SysAreaMapper.xml +++ /dev/null @@ -1,325 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, area_code, city_code, area_name, short_name, lng, lat, sort, gmt_create, gmt_modified, - memo, data_state - - - - - delete from t_sys_area - where id = #{id,jdbcType=INTEGER} - - - delete from t_sys_area - - - - - - insert into t_sys_area (id, area_code, city_code, - area_name, short_name, lng, - lat, sort, gmt_create, - gmt_modified, memo, data_state - ) - values (#{id,jdbcType=INTEGER}, #{areaCode,jdbcType=VARCHAR}, #{cityCode,jdbcType=VARCHAR}, - #{areaName,jdbcType=VARCHAR}, #{shortName,jdbcType=VARCHAR}, #{lng,jdbcType=VARCHAR}, - #{lat,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, - #{gmtModified,jdbcType=TIMESTAMP}, #{memo,jdbcType=VARCHAR}, #{dataState,jdbcType=INTEGER} - ) - - - insert into t_sys_area - - - id, - - - area_code, - - - city_code, - - - area_name, - - - short_name, - - - lng, - - - lat, - - - sort, - - - gmt_create, - - - gmt_modified, - - - memo, - - - data_state, - - - - - #{id,jdbcType=INTEGER}, - - - #{areaCode,jdbcType=VARCHAR}, - - - #{cityCode,jdbcType=VARCHAR}, - - - #{areaName,jdbcType=VARCHAR}, - - - #{shortName,jdbcType=VARCHAR}, - - - #{lng,jdbcType=VARCHAR}, - - - #{lat,jdbcType=VARCHAR}, - - - #{sort,jdbcType=INTEGER}, - - - #{gmtCreate,jdbcType=TIMESTAMP}, - - - #{gmtModified,jdbcType=TIMESTAMP}, - - - #{memo,jdbcType=VARCHAR}, - - - #{dataState,jdbcType=INTEGER}, - - - - - - update t_sys_area - - - id = #{record.id,jdbcType=INTEGER}, - - - area_code = #{record.areaCode,jdbcType=VARCHAR}, - - - city_code = #{record.cityCode,jdbcType=VARCHAR}, - - - area_name = #{record.areaName,jdbcType=VARCHAR}, - - - short_name = #{record.shortName,jdbcType=VARCHAR}, - - - lng = #{record.lng,jdbcType=VARCHAR}, - - - lat = #{record.lat,jdbcType=VARCHAR}, - - - sort = #{record.sort,jdbcType=INTEGER}, - - - gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP}, - - - gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP}, - - - memo = #{record.memo,jdbcType=VARCHAR}, - - - data_state = #{record.dataState,jdbcType=INTEGER}, - - - - - - - - update t_sys_area - set id = #{record.id,jdbcType=INTEGER}, - area_code = #{record.areaCode,jdbcType=VARCHAR}, - city_code = #{record.cityCode,jdbcType=VARCHAR}, - area_name = #{record.areaName,jdbcType=VARCHAR}, - short_name = #{record.shortName,jdbcType=VARCHAR}, - lng = #{record.lng,jdbcType=VARCHAR}, - lat = #{record.lat,jdbcType=VARCHAR}, - sort = #{record.sort,jdbcType=INTEGER}, - gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP}, - gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP}, - memo = #{record.memo,jdbcType=VARCHAR}, - data_state = #{record.dataState,jdbcType=INTEGER} - - - - - - update t_sys_area - - - area_code = #{areaCode,jdbcType=VARCHAR}, - - - city_code = #{cityCode,jdbcType=VARCHAR}, - - - area_name = #{areaName,jdbcType=VARCHAR}, - - - short_name = #{shortName,jdbcType=VARCHAR}, - - - lng = #{lng,jdbcType=VARCHAR}, - - - lat = #{lat,jdbcType=VARCHAR}, - - - sort = #{sort,jdbcType=INTEGER}, - - - gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, - - - gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, - - - memo = #{memo,jdbcType=VARCHAR}, - - - data_state = #{dataState,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=INTEGER} - - - update t_sys_area - set area_code = #{areaCode,jdbcType=VARCHAR}, - city_code = #{cityCode,jdbcType=VARCHAR}, - area_name = #{areaName,jdbcType=VARCHAR}, - short_name = #{shortName,jdbcType=VARCHAR}, - lng = #{lng,jdbcType=VARCHAR}, - lat = #{lat,jdbcType=VARCHAR}, - sort = #{sort,jdbcType=INTEGER}, - gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, - gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, - memo = #{memo,jdbcType=VARCHAR}, - data_state = #{dataState,jdbcType=INTEGER} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/SysCityMapper.xml b/src/main/resources/mybatis/auto/SysCityMapper.xml deleted file mode 100644 index 406d3a7..0000000 --- a/src/main/resources/mybatis/auto/SysCityMapper.xml +++ /dev/null @@ -1,325 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, city_code, city_name, short_name, province_code, lng, lat, sort, gmt_create, - gmt_modified, memo, data_state - - - - - delete from t_sys_city - where id = #{id,jdbcType=INTEGER} - - - delete from t_sys_city - - - - - - insert into t_sys_city (id, city_code, city_name, - short_name, province_code, lng, - lat, sort, gmt_create, - gmt_modified, memo, data_state - ) - values (#{id,jdbcType=INTEGER}, #{cityCode,jdbcType=VARCHAR}, #{cityName,jdbcType=VARCHAR}, - #{shortName,jdbcType=VARCHAR}, #{provinceCode,jdbcType=VARCHAR}, #{lng,jdbcType=VARCHAR}, - #{lat,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, - #{gmtModified,jdbcType=TIMESTAMP}, #{memo,jdbcType=VARCHAR}, #{dataState,jdbcType=INTEGER} - ) - - - insert into t_sys_city - - - id, - - - city_code, - - - city_name, - - - short_name, - - - province_code, - - - lng, - - - lat, - - - sort, - - - gmt_create, - - - gmt_modified, - - - memo, - - - data_state, - - - - - #{id,jdbcType=INTEGER}, - - - #{cityCode,jdbcType=VARCHAR}, - - - #{cityName,jdbcType=VARCHAR}, - - - #{shortName,jdbcType=VARCHAR}, - - - #{provinceCode,jdbcType=VARCHAR}, - - - #{lng,jdbcType=VARCHAR}, - - - #{lat,jdbcType=VARCHAR}, - - - #{sort,jdbcType=INTEGER}, - - - #{gmtCreate,jdbcType=TIMESTAMP}, - - - #{gmtModified,jdbcType=TIMESTAMP}, - - - #{memo,jdbcType=VARCHAR}, - - - #{dataState,jdbcType=INTEGER}, - - - - - - update t_sys_city - - - id = #{record.id,jdbcType=INTEGER}, - - - city_code = #{record.cityCode,jdbcType=VARCHAR}, - - - city_name = #{record.cityName,jdbcType=VARCHAR}, - - - short_name = #{record.shortName,jdbcType=VARCHAR}, - - - province_code = #{record.provinceCode,jdbcType=VARCHAR}, - - - lng = #{record.lng,jdbcType=VARCHAR}, - - - lat = #{record.lat,jdbcType=VARCHAR}, - - - sort = #{record.sort,jdbcType=INTEGER}, - - - gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP}, - - - gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP}, - - - memo = #{record.memo,jdbcType=VARCHAR}, - - - data_state = #{record.dataState,jdbcType=INTEGER}, - - - - - - - - update t_sys_city - set id = #{record.id,jdbcType=INTEGER}, - city_code = #{record.cityCode,jdbcType=VARCHAR}, - city_name = #{record.cityName,jdbcType=VARCHAR}, - short_name = #{record.shortName,jdbcType=VARCHAR}, - province_code = #{record.provinceCode,jdbcType=VARCHAR}, - lng = #{record.lng,jdbcType=VARCHAR}, - lat = #{record.lat,jdbcType=VARCHAR}, - sort = #{record.sort,jdbcType=INTEGER}, - gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP}, - gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP}, - memo = #{record.memo,jdbcType=VARCHAR}, - data_state = #{record.dataState,jdbcType=INTEGER} - - - - - - update t_sys_city - - - city_code = #{cityCode,jdbcType=VARCHAR}, - - - city_name = #{cityName,jdbcType=VARCHAR}, - - - short_name = #{shortName,jdbcType=VARCHAR}, - - - province_code = #{provinceCode,jdbcType=VARCHAR}, - - - lng = #{lng,jdbcType=VARCHAR}, - - - lat = #{lat,jdbcType=VARCHAR}, - - - sort = #{sort,jdbcType=INTEGER}, - - - gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, - - - gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, - - - memo = #{memo,jdbcType=VARCHAR}, - - - data_state = #{dataState,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=INTEGER} - - - update t_sys_city - set city_code = #{cityCode,jdbcType=VARCHAR}, - city_name = #{cityName,jdbcType=VARCHAR}, - short_name = #{shortName,jdbcType=VARCHAR}, - province_code = #{provinceCode,jdbcType=VARCHAR}, - lng = #{lng,jdbcType=VARCHAR}, - lat = #{lat,jdbcType=VARCHAR}, - sort = #{sort,jdbcType=INTEGER}, - gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, - gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, - memo = #{memo,jdbcType=VARCHAR}, - data_state = #{dataState,jdbcType=INTEGER} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/SysProvinceMapper.xml b/src/main/resources/mybatis/auto/SysProvinceMapper.xml deleted file mode 100644 index 9d2bd98..0000000 --- a/src/main/resources/mybatis/auto/SysProvinceMapper.xml +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, province_code, province_name, short_name, lng, lat, sort, gmt_create, gmt_modified, - memo, data_state - - - - - delete from t_sys_province - where id = #{id,jdbcType=INTEGER} - - - delete from t_sys_province - - - - - - insert into t_sys_province (id, province_code, province_name, - short_name, lng, lat, - sort, gmt_create, gmt_modified, - memo, data_state) - values (#{id,jdbcType=INTEGER}, #{provinceCode,jdbcType=VARCHAR}, #{provinceName,jdbcType=VARCHAR}, - #{shortName,jdbcType=VARCHAR}, #{lng,jdbcType=VARCHAR}, #{lat,jdbcType=VARCHAR}, - #{sort,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, - #{memo,jdbcType=VARCHAR}, #{dataState,jdbcType=INTEGER}) - - - insert into t_sys_province - - - id, - - - province_code, - - - province_name, - - - short_name, - - - lng, - - - lat, - - - sort, - - - gmt_create, - - - gmt_modified, - - - memo, - - - data_state, - - - - - #{id,jdbcType=INTEGER}, - - - #{provinceCode,jdbcType=VARCHAR}, - - - #{provinceName,jdbcType=VARCHAR}, - - - #{shortName,jdbcType=VARCHAR}, - - - #{lng,jdbcType=VARCHAR}, - - - #{lat,jdbcType=VARCHAR}, - - - #{sort,jdbcType=INTEGER}, - - - #{gmtCreate,jdbcType=TIMESTAMP}, - - - #{gmtModified,jdbcType=TIMESTAMP}, - - - #{memo,jdbcType=VARCHAR}, - - - #{dataState,jdbcType=INTEGER}, - - - - - - update t_sys_province - - - id = #{record.id,jdbcType=INTEGER}, - - - province_code = #{record.provinceCode,jdbcType=VARCHAR}, - - - province_name = #{record.provinceName,jdbcType=VARCHAR}, - - - short_name = #{record.shortName,jdbcType=VARCHAR}, - - - lng = #{record.lng,jdbcType=VARCHAR}, - - - lat = #{record.lat,jdbcType=VARCHAR}, - - - sort = #{record.sort,jdbcType=INTEGER}, - - - gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP}, - - - gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP}, - - - memo = #{record.memo,jdbcType=VARCHAR}, - - - data_state = #{record.dataState,jdbcType=INTEGER}, - - - - - - - - update t_sys_province - set id = #{record.id,jdbcType=INTEGER}, - province_code = #{record.provinceCode,jdbcType=VARCHAR}, - province_name = #{record.provinceName,jdbcType=VARCHAR}, - short_name = #{record.shortName,jdbcType=VARCHAR}, - lng = #{record.lng,jdbcType=VARCHAR}, - lat = #{record.lat,jdbcType=VARCHAR}, - sort = #{record.sort,jdbcType=INTEGER}, - gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP}, - gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP}, - memo = #{record.memo,jdbcType=VARCHAR}, - data_state = #{record.dataState,jdbcType=INTEGER} - - - - - - update t_sys_province - - - province_code = #{provinceCode,jdbcType=VARCHAR}, - - - province_name = #{provinceName,jdbcType=VARCHAR}, - - - short_name = #{shortName,jdbcType=VARCHAR}, - - - lng = #{lng,jdbcType=VARCHAR}, - - - lat = #{lat,jdbcType=VARCHAR}, - - - sort = #{sort,jdbcType=INTEGER}, - - - gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, - - - gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, - - - memo = #{memo,jdbcType=VARCHAR}, - - - data_state = #{dataState,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=INTEGER} - - - update t_sys_province - set province_code = #{provinceCode,jdbcType=VARCHAR}, - province_name = #{provinceName,jdbcType=VARCHAR}, - short_name = #{shortName,jdbcType=VARCHAR}, - lng = #{lng,jdbcType=VARCHAR}, - lat = #{lat,jdbcType=VARCHAR}, - sort = #{sort,jdbcType=INTEGER}, - gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, - gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, - memo = #{memo,jdbcType=VARCHAR}, - data_state = #{dataState,jdbcType=INTEGER} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/SysStreetMapper.xml b/src/main/resources/mybatis/auto/SysStreetMapper.xml deleted file mode 100644 index c150505..0000000 --- a/src/main/resources/mybatis/auto/SysStreetMapper.xml +++ /dev/null @@ -1,396 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, - street_code, - area_code, - street_name, - short_name, - lng, - lat, - sort, - gmt_create, - gmt_modified, - memo, - data_state - - - - - - delete from t_sys_street - where id = #{id,jdbcType=INTEGER} - - - delete from t_sys_street - - - - - - - insert into t_sys_street ( - id, - street_code, - area_code, - street_name, - short_name, - lng, - lat, - sort, - gmt_create, - gmt_modified, - memo, - data_state - ) - values ( - #{id,jdbcType=INTEGER}, - #{streetCode,jdbcType=VARCHAR}, - #{areaCode,jdbcType=VARCHAR}, - #{streetName,jdbcType=VARCHAR}, - #{shortName,jdbcType=VARCHAR}, - #{lng,jdbcType=VARCHAR}, - #{lat,jdbcType=VARCHAR}, - #{sort,jdbcType=INTEGER}, - #{gmtCreate,jdbcType=TIMESTAMP}, - #{gmtModified,jdbcType=TIMESTAMP}, - #{memo,jdbcType=VARCHAR}, - #{dataState,jdbcType=INTEGER} - ) - - - - insert into t_sys_street - - - - id, - - - - - street_code, - - - - - area_code, - - - - - street_name, - - - - - short_name, - - - - - lng, - - - - - lat, - - - - - sort, - - - - - gmt_create, - - - - - gmt_modified, - - - - - memo, - - - - - data_state, - - - - - - #{id,jdbcType=INTEGER}, - - - #{streetCode,jdbcType=VARCHAR}, - - - #{areaCode,jdbcType=VARCHAR}, - - - #{streetName,jdbcType=VARCHAR}, - - - #{shortName,jdbcType=VARCHAR}, - - - #{lng,jdbcType=VARCHAR}, - - - #{lat,jdbcType=VARCHAR}, - - - #{sort,jdbcType=INTEGER}, - - - #{gmtCreate,jdbcType=TIMESTAMP}, - - - #{gmtModified,jdbcType=TIMESTAMP}, - - - #{memo,jdbcType=VARCHAR}, - - - #{dataState,jdbcType=INTEGER}, - - - - - - - - update t_sys_street - - - id = #{record.id,jdbcType=INTEGER}, - - - street_code = #{record.streetCode,jdbcType=VARCHAR}, - - - area_code = #{record.areaCode,jdbcType=VARCHAR}, - - - street_name = #{record.streetName,jdbcType=VARCHAR}, - - - short_name = #{record.shortName,jdbcType=VARCHAR}, - - - lng = #{record.lng,jdbcType=VARCHAR}, - - - lat = #{record.lat,jdbcType=VARCHAR}, - - - sort = #{record.sort,jdbcType=INTEGER}, - - - gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP}, - - - gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP}, - - - memo = #{record.memo,jdbcType=VARCHAR}, - - - data_state = #{record.dataState,jdbcType=INTEGER}, - - - - - - - - - - - update t_sys_street - set - id = #{record.id,jdbcType=INTEGER}, - street_code = #{record.streetCode,jdbcType=VARCHAR}, - area_code = #{record.areaCode,jdbcType=VARCHAR}, - street_name = #{record.streetName,jdbcType=VARCHAR}, - short_name = #{record.shortName,jdbcType=VARCHAR}, - lng = #{record.lng,jdbcType=VARCHAR}, - lat = #{record.lat,jdbcType=VARCHAR}, - sort = #{record.sort,jdbcType=INTEGER}, - gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP}, - gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP}, - memo = #{record.memo,jdbcType=VARCHAR}, - data_state = #{record.dataState,jdbcType=INTEGER} - - - - - - - - update t_sys_street - - - street_code = #{streetCode,jdbcType=VARCHAR}, - - - area_code = #{areaCode,jdbcType=VARCHAR}, - - - street_name = #{streetName,jdbcType=VARCHAR}, - - - short_name = #{shortName,jdbcType=VARCHAR}, - - - lng = #{lng,jdbcType=VARCHAR}, - - - lat = #{lat,jdbcType=VARCHAR}, - - - sort = #{sort,jdbcType=INTEGER}, - - - gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, - - - gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, - - - memo = #{memo,jdbcType=VARCHAR}, - - - data_state = #{dataState,jdbcType=INTEGER}, - - - where - id = #{id,jdbcType=INTEGER} - - - - - - - update t_sys_street - set - street_code = #{streetCode,jdbcType=VARCHAR}, - area_code = #{areaCode,jdbcType=VARCHAR}, - street_name = #{streetName,jdbcType=VARCHAR}, - short_name = #{shortName,jdbcType=VARCHAR}, - lng = #{lng,jdbcType=VARCHAR}, - lat = #{lat,jdbcType=VARCHAR}, - sort = #{sort,jdbcType=INTEGER}, - gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, - gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, - memo = #{memo,jdbcType=VARCHAR}, - data_state = #{dataState,jdbcType=INTEGER} - where - id = #{id,jdbcType=INTEGER} - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysAreaMapper.xml b/src/main/resources/mybatis/auto/TSysAreaMapper.xml new file mode 100644 index 0000000..6ad1786 --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysAreaMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, area_code, city_code, area_name, short_name, lng, lat, sort, data_state, create_by, create_time, update_by, update_time, remark from t_sys_area + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysCityMapper.xml b/src/main/resources/mybatis/auto/TSysCityMapper.xml new file mode 100644 index 0000000..09b98e5 --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysCityMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, city_code, city_name, short_name, province_code, lng, lat, sort, data_state, create_by, create_time, update_by, update_time, remark from t_sys_city + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysProvinceMapper.xml b/src/main/resources/mybatis/auto/TSysProvinceMapper.xml new file mode 100644 index 0000000..9da3dd4 --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysProvinceMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + select id, province_code, province_name, short_name, lng, lat, sort, data_state, create_by, create_time, update_by, update_time, remark from t_sys_province + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysStreetMapper.xml b/src/main/resources/mybatis/auto/TSysStreetMapper.xml new file mode 100644 index 0000000..921d658 --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysStreetMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, street_code, area_code, street_name, short_name, lng, lat, sort, data_state, create_by, create_time, update_by, update_time, remark from t_sys_street + + \ No newline at end of file -- Gitee From 4d405d547fc90e27a97f7fdd62063c29aad94236 Mon Sep 17 00:00:00 2001 From: zhaonengzhi Date: Sat, 7 Aug 2021 22:18:47 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=97=E9=81=93?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20Signed-off-by:=20zhaonengzhi=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fc/v2/common/conf/MybatisPlusConfig.java | 26 +++-- .../admin/ProvinceLinkageController.java | 2 +- .../controller/admin/SysAreaController.java | 10 +- .../controller/admin/SysCityController.java | 9 +- .../admin/SysProvinceController.java | 8 +- .../controller/admin/SysStreetController.java | 9 +- .../com/fc/v2/service/ITSysAreaService.java | 110 +++++++++--------- .../com/fc/v2/service/ITSysCityService.java | 110 +++++++++--------- .../fc/v2/service/ITSysProvinceService.java | 110 +++++++++--------- .../com/fc/v2/service/ITSysStreetService.java | 110 +++++++++--------- .../v2/service/impl/TSysAreaServiceImpl.java | 18 +++ .../v2/service/impl/TSysCityServiceImpl.java | 19 +++ .../service/impl/TSysProvinceServiceImpl.java | 18 +++ .../service/impl/TSysStreetServiceImpl.java | 19 +++ 14 files changed, 344 insertions(+), 234 deletions(-) diff --git a/src/main/java/com/fc/v2/common/conf/MybatisPlusConfig.java b/src/main/java/com/fc/v2/common/conf/MybatisPlusConfig.java index be37a2d..39d59ce 100644 --- a/src/main/java/com/fc/v2/common/conf/MybatisPlusConfig.java +++ b/src/main/java/com/fc/v2/common/conf/MybatisPlusConfig.java @@ -62,18 +62,24 @@ public class MybatisPlusConfig { @Bean @ConfigurationProperties("mybatis-plus.global-config") - public GlobalConfig globalConfig(){ - return new GlobalConfig().setMetaObjectHandler(new MetaObjectHandler(){ - + public GlobalConfig globalConfig() { + return new GlobalConfig().setMetaObjectHandler(new MetaObjectHandler() { + + /** + * 自动填充 + */ @Override public void insertFill(MetaObject metaObject) { - this.fillStrategy(metaObject, "createBy", ShiroUtils.getUser().getUsername()); + this.fillStrategy(metaObject, "createBy", ShiroUtils.getLoginName()); this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); } - + + /** + * 自动填充 + */ @Override public void updateFill(MetaObject metaObject) { - this.fillStrategy(metaObject, "updateBy", ShiroUtils.getUser().getUsername()); + this.fillStrategy(metaObject, "updateBy", ShiroUtils.getLoginName()); this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date()); } }); @@ -100,11 +106,17 @@ public class MybatisPlusConfig { return new DynamicDataSource(masterDataSource(), targetDataSources); } + /** + * 手动注入Mybatis-plus, 暂不能自动注入 + * + * @param dynamicDataSource + * @return + * @throws Exception + */ @Bean public SqlSessionFactory sqlSessionFactory(DynamicDataSource dynamicDataSource) throws Exception { MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); factoryBean.setDataSource(dynamicDataSource); -// factoryBean.setTypeAliasesPackage(); // 设置mapper.xml的位置路径 Resource[] resources = new PathMatchingResourcePatternResolver().getResources(locationPattern); factoryBean.setMapperLocations(resources); diff --git a/src/main/java/com/fc/v2/controller/admin/ProvinceLinkageController.java b/src/main/java/com/fc/v2/controller/admin/ProvinceLinkageController.java index 9b1ed1c..7611327 100644 --- a/src/main/java/com/fc/v2/controller/admin/ProvinceLinkageController.java +++ b/src/main/java/com/fc/v2/controller/admin/ProvinceLinkageController.java @@ -50,7 +50,7 @@ public class ProvinceLinkageController extends BaseController { @ApiOperation(value = "分页跳转", notes = "分页跳转") @GetMapping("/view") public String view(ModelMap model) { - model.addAttribute("provinceList", sysProvinceService.selectTSysProvinceList(null)); + model.addAttribute("provinceList", sysProvinceService.selectTSysProvinceList(new QueryWrapper())); return prefix + "/list"; } diff --git a/src/main/java/com/fc/v2/controller/admin/SysAreaController.java b/src/main/java/com/fc/v2/controller/admin/SysAreaController.java index 7597d43..b8af90a 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysAreaController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysAreaController.java @@ -8,6 +8,7 @@ import com.fc.v2.model.auto.TSysCity; import com.fc.v2.model.custom.Tablepar; import com.fc.v2.service.ITSysAreaService; import com.fc.v2.service.ITSysCityService; +import com.fc.v2.util.StringUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; @@ -73,9 +74,8 @@ public class SysAreaController extends BaseController { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.orderByAsc("id"); - if (searchText != null && !"".equals(searchText)){ - queryWrapper.like("area_name", searchText); - } + + queryWrapper.like(StringUtils.isNotEmpty(searchText), "area_name", searchText); PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); @@ -89,7 +89,7 @@ public class SysAreaController extends BaseController { @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") public String add(ModelMap modelMap) { - List sysCities = sysCityService.selectTSysCityList(null); + List sysCities = sysCityService.selectTSysCityList(new QueryWrapper()); modelMap.put("sysCities", sysCities); return prefix + "/add"; } @@ -166,7 +166,7 @@ public class SysAreaController extends BaseController { @GetMapping("/edit/{id}") public String edit(@PathVariable("id") Long id, ModelMap mmap) { mmap.put("SysArea", sysAreaService.selectTSysAreaById(id)); - List sysCities = sysCityService.selectTSysCityList(null); + List sysCities = sysCityService.selectTSysCityList(new QueryWrapper()); mmap.put("sysCities", sysCities); return prefix + "/edit"; } diff --git a/src/main/java/com/fc/v2/controller/admin/SysCityController.java b/src/main/java/com/fc/v2/controller/admin/SysCityController.java index 8d00003..977daa0 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysCityController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysCityController.java @@ -7,6 +7,7 @@ import com.fc.v2.model.auto.TSysCity; import com.fc.v2.model.auto.TSysProvince; import com.fc.v2.service.ITSysCityService; import com.fc.v2.service.ITSysProvinceService; +import com.fc.v2.util.StringUtils; import com.github.pagehelper.PageHelper; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -69,9 +70,7 @@ public class SysCityController extends BaseController { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.orderByAsc("id"); - if (searchText != null && !"".equals(searchText)) { - queryWrapper.like("city_name", searchText); - } + queryWrapper.like(StringUtils.isNotEmpty(searchText), "city_name", searchText); PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); @@ -88,7 +87,7 @@ public class SysCityController extends BaseController { @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") public String add(ModelMap modelMap) { - List sysProvinces = sysProvinceService.selectTSysProvinceList(null); + List sysProvinces = sysProvinceService.selectTSysProvinceList(new QueryWrapper()); modelMap.put("sysProvinces", sysProvinces); return prefix + "/add"; } @@ -162,7 +161,7 @@ public class SysCityController extends BaseController { @ApiOperation(value = "修改跳转", notes = "修改跳转") @GetMapping("/edit/{id}") public String edit(@PathVariable("id") Long id, ModelMap mmap) { - List sysProvinces = sysProvinceService.selectTSysProvinceList(null); + List sysProvinces = sysProvinceService.selectTSysProvinceList(new QueryWrapper()); mmap.put("sysProvinces", sysProvinces); mmap.put("SysCity", sysCityService.selectTSysCityById(id)); return prefix + "/edit"; diff --git a/src/main/java/com/fc/v2/controller/admin/SysProvinceController.java b/src/main/java/com/fc/v2/controller/admin/SysProvinceController.java index af4a9ed..cef0ddc 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysProvinceController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysProvinceController.java @@ -3,6 +3,7 @@ package com.fc.v2.controller.admin; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.model.auto.TSysProvince; import com.fc.v2.service.ITSysProvinceService; +import com.fc.v2.util.StringUtils; import com.github.pagehelper.PageHelper; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -65,9 +66,7 @@ public class SysProvinceController extends BaseController { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.orderByAsc("id"); - if (searchText != null && !"".equals(searchText)){ - queryWrapper.like("province_name", searchText); - } + queryWrapper.like(StringUtils.isNotEmpty(searchText), "province_name", searchText); PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); @@ -167,6 +166,9 @@ public class SysProvinceController extends BaseController { /** * 修改保存 + * + * @param record + * @return */ //@Log(title = "省份表修改", action = "111") @ApiOperation(value = "修改保存", notes = "修改保存") diff --git a/src/main/java/com/fc/v2/controller/admin/SysStreetController.java b/src/main/java/com/fc/v2/controller/admin/SysStreetController.java index e422555..021e1c2 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysStreetController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysStreetController.java @@ -7,6 +7,7 @@ import com.fc.v2.model.auto.TSysArea; import com.fc.v2.model.auto.TSysStreet; import com.fc.v2.service.ITSysAreaService; import com.fc.v2.service.ITSysStreetService; +import com.fc.v2.util.StringUtils; import com.github.pagehelper.PageHelper; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -67,9 +68,7 @@ public class SysStreetController extends BaseController { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.orderByAsc("id"); - if (searchText != null && !"".equals(searchText)) { - queryWrapper.like("street_name", searchText); - } + queryWrapper.like(StringUtils.isNotEmpty(searchText), "street_name", searchText); PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); @@ -86,7 +85,7 @@ public class SysStreetController extends BaseController { @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") public String add(ModelMap modelMap) { - List sysAreas = sysAreaService.selectTSysAreaList(null); + List sysAreas = sysAreaService.selectTSysAreaList(new QueryWrapper()); modelMap.put("sysAreas", sysAreas); return prefix + "/add"; } @@ -162,7 +161,7 @@ public class SysStreetController extends BaseController { @ApiOperation(value = "修改跳转", notes = "修改跳转") @GetMapping("/edit/{id}") public String edit(@PathVariable("id") Long id, ModelMap mmap) { - List sysAreas = sysAreaService.selectTSysAreaList(null); + List sysAreas = sysAreaService.selectTSysAreaList(new QueryWrapper()); mmap.put("SysStreet", sysStreetService.selectTSysStreetById(id)); mmap.put("sysAreas", sysAreas); return prefix + "/edit"; diff --git a/src/main/java/com/fc/v2/service/ITSysAreaService.java b/src/main/java/com/fc/v2/service/ITSysAreaService.java index bbcda78..963fb32 100644 --- a/src/main/java/com/fc/v2/service/ITSysAreaService.java +++ b/src/main/java/com/fc/v2/service/ITSysAreaService.java @@ -7,68 +7,74 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.fc.v2.model.auto.TSysArea; - /** * 地区设置Service接口 * * @author zhaonz * @date 2021-08-05 */ -public interface ITSysAreaService extends IService -{ - /** - * 查询地区设置 - * - * @param id 地区设置ID - * @return 地区设置 - */ - public TSysArea selectTSysAreaById(Long id); +public interface ITSysAreaService extends IService { + /** + * 查询地区设置 + * + * @param id 地区设置ID + * @return 地区设置 + */ + public TSysArea selectTSysAreaById(Long id); + + /** + * 查询地区设置列表 + * + * @param queryWrapper 地区设置 + * @return 地区设置集合 + */ + public List selectTSysAreaList(Wrapper queryWrapper); - /** - * 查询地区设置列表 - * - * @param queryWrapper 地区设置 - * @return 地区设置集合 - */ - public List selectTSysAreaList(Wrapper queryWrapper); + /** + * 查询地区设置列表 + * + * @param tSysArea 地区设置 + * @return 地区设置集合 + */ + public List selectTSysAreaList(TSysArea tSysArea); - /** - * 新增地区设置 - * - * @param tSysArea 地区设置 - * @return 结果 - */ - public int insertTSysArea(TSysArea tSysArea); + /** + * 新增地区设置 + * + * @param tSysArea 地区设置 + * @return 结果 + */ + public int insertTSysArea(TSysArea tSysArea); - /** - * 修改地区设置 - * - * @param tSysArea 地区设置 - * @return 结果 - */ - public int updateTSysArea(TSysArea tSysArea); + /** + * 修改地区设置 + * + * @param tSysArea 地区设置 + * @return 结果 + */ + public int updateTSysArea(TSysArea tSysArea); - /** - * 批量删除地区设置 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteTSysAreaByIds(String ids); + /** + * 批量删除地区设置 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysAreaByIds(String ids); - /** - * 删除地区设置信息 - * - * @param id 地区设置ID - * @return 结果 - */ - public int deleteTSysAreaById(Long id); + /** + * 删除地区设置信息 + * + * @param id 地区设置ID + * @return 结果 + */ + public int deleteTSysAreaById(Long id); - /** - * 检查Name唯一 - * - * @param sysArea - * @return - */ - public int checkNameUnique(TSysArea sysArea); + /** + * 检查Name唯一 + * + * @param sysArea + * @return + */ + public int checkNameUnique(TSysArea sysArea); } diff --git a/src/main/java/com/fc/v2/service/ITSysCityService.java b/src/main/java/com/fc/v2/service/ITSysCityService.java index 2f40129..3c3312a 100644 --- a/src/main/java/com/fc/v2/service/ITSysCityService.java +++ b/src/main/java/com/fc/v2/service/ITSysCityService.java @@ -7,68 +7,74 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.fc.v2.model.auto.TSysCity; - /** * 城市设置Service接口 * * @author zhaonz * @date 2021-08-05 */ -public interface ITSysCityService extends IService -{ - /** - * 查询城市设置 - * - * @param id 城市设置ID - * @return 城市设置 - */ - public TSysCity selectTSysCityById(Long id); +public interface ITSysCityService extends IService { + /** + * 查询城市设置 + * + * @param id 城市设置ID + * @return 城市设置 + */ + public TSysCity selectTSysCityById(Long id); + + /** + * 查询城市设置列表 + * + * @param queryWrapper 城市设置 + * @return 城市设置集合 + */ + public List selectTSysCityList(Wrapper queryWrapper); - /** - * 查询城市设置列表 - * - * @param queryWrapper 城市设置 - * @return 城市设置集合 - */ - public List selectTSysCityList(Wrapper queryWrapper); + /** + * 查询城市设置列表 + * + * @param tSysCity 城市设置 + * @return 城市设置集合 + */ + public List selectTSysCityList(TSysCity tSysCity); - /** - * 新增城市设置 - * - * @param tSysCity 城市设置 - * @return 结果 - */ - public int insertTSysCity(TSysCity tSysCity); + /** + * 新增城市设置 + * + * @param tSysCity 城市设置 + * @return 结果 + */ + public int insertTSysCity(TSysCity tSysCity); - /** - * 修改城市设置 - * - * @param tSysCity 城市设置 - * @return 结果 - */ - public int updateTSysCity(TSysCity tSysCity); + /** + * 修改城市设置 + * + * @param tSysCity 城市设置 + * @return 结果 + */ + public int updateTSysCity(TSysCity tSysCity); - /** - * 批量删除城市设置 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteTSysCityByIds(String ids); + /** + * 批量删除城市设置 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysCityByIds(String ids); - /** - * 删除城市设置信息 - * - * @param id 城市设置ID - * @return 结果 - */ - public int deleteTSysCityById(Long id); + /** + * 删除城市设置信息 + * + * @param id 城市设置ID + * @return 结果 + */ + public int deleteTSysCityById(Long id); - /** - * 检查Name唯一 - * - * @param sysCity - * @return - */ - int checkNameUnique(TSysCity sysCity); + /** + * 检查Name唯一 + * + * @param sysCity + * @return + */ + int checkNameUnique(TSysCity sysCity); } diff --git a/src/main/java/com/fc/v2/service/ITSysProvinceService.java b/src/main/java/com/fc/v2/service/ITSysProvinceService.java index 049db85..5833e8b 100644 --- a/src/main/java/com/fc/v2/service/ITSysProvinceService.java +++ b/src/main/java/com/fc/v2/service/ITSysProvinceService.java @@ -7,68 +7,74 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.fc.v2.model.auto.TSysProvince; - /** * 省份Service接口 * * @author zhaonz * @date 2021-08-05 */ -public interface ITSysProvinceService extends IService -{ - /** - * 查询省份 - * - * @param id 省份ID - * @return 省份 - */ - public TSysProvince selectTSysProvinceById(Long id); +public interface ITSysProvinceService extends IService { + /** + * 查询省份 + * + * @param id 省份ID + * @return 省份 + */ + public TSysProvince selectTSysProvinceById(Long id); + + /** + * 查询省份列表 + * + * @param queryWrapper 省份 + * @return 省份集合 + */ + public List selectTSysProvinceList(Wrapper queryWrapper); - /** - * 查询省份列表 - * - * @param queryWrapper 省份 - * @return 省份集合 - */ - public List selectTSysProvinceList(Wrapper queryWrapper); + /** + * 查询省份列表 + * + * @param tSysProvince 省份 + * @return 省份集合 + */ + public List selectTSysProvinceList(TSysProvince tSysProvince); - /** - * 新增省份 - * - * @param tSysProvince 省份 - * @return 结果 - */ - public int insertTSysProvince(TSysProvince tSysProvince); + /** + * 新增省份 + * + * @param tSysProvince 省份 + * @return 结果 + */ + public int insertTSysProvince(TSysProvince tSysProvince); - /** - * 修改省份 - * - * @param tSysProvince 省份 - * @return 结果 - */ - public int updateTSysProvince(TSysProvince tSysProvince); + /** + * 修改省份 + * + * @param tSysProvince 省份 + * @return 结果 + */ + public int updateTSysProvince(TSysProvince tSysProvince); - /** - * 批量删除省份 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteTSysProvinceByIds(String ids); + /** + * 批量删除省份 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysProvinceByIds(String ids); - /** - * 删除省份信息 - * - * @param id 省份ID - * @return 结果 - */ - public int deleteTSysProvinceById(Long id); + /** + * 删除省份信息 + * + * @param id 省份ID + * @return 结果 + */ + public int deleteTSysProvinceById(Long id); - /** - * 检查Name唯一 - * - * @param sysProvince - * @return - */ - int checkNameUnique(TSysProvince sysProvince); + /** + * 检查Name唯一 + * + * @param sysProvince + * @return + */ + int checkNameUnique(TSysProvince sysProvince); } diff --git a/src/main/java/com/fc/v2/service/ITSysStreetService.java b/src/main/java/com/fc/v2/service/ITSysStreetService.java index cd16775..313d48d 100644 --- a/src/main/java/com/fc/v2/service/ITSysStreetService.java +++ b/src/main/java/com/fc/v2/service/ITSysStreetService.java @@ -7,68 +7,74 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.fc.v2.model.auto.TSysStreet; - /** * 街道设置Service接口 * * @author zhaonz * @date 2021-08-05 */ -public interface ITSysStreetService extends IService -{ - /** - * 查询街道设置 - * - * @param id 街道设置ID - * @return 街道设置 - */ - public TSysStreet selectTSysStreetById(Long id); +public interface ITSysStreetService extends IService { + /** + * 查询街道设置 + * + * @param id 街道设置ID + * @return 街道设置 + */ + public TSysStreet selectTSysStreetById(Long id); + + /** + * 查询街道设置列表 + * + * @param queryWrapper 街道设置 + * @return 街道设置集合 + */ + public List selectTSysStreetList(Wrapper queryWrapper); - /** - * 查询街道设置列表 - * - * @param queryWrapper 街道设置 - * @return 街道设置集合 - */ - public List selectTSysStreetList(Wrapper queryWrapper); + /** + * 查询街道设置列表 + * + * @param tSysStreet 街道设置 + * @return 街道设置集合 + */ + public List selectTSysStreetList(TSysStreet tSysStreet); - /** - * 新增街道设置 - * - * @param tSysStreet 街道设置 - * @return 结果 - */ - public int insertTSysStreet(TSysStreet tSysStreet); + /** + * 新增街道设置 + * + * @param tSysStreet 街道设置 + * @return 结果 + */ + public int insertTSysStreet(TSysStreet tSysStreet); - /** - * 修改街道设置 - * - * @param tSysStreet 街道设置 - * @return 结果 - */ - public int updateTSysStreet(TSysStreet tSysStreet); + /** + * 修改街道设置 + * + * @param tSysStreet 街道设置 + * @return 结果 + */ + public int updateTSysStreet(TSysStreet tSysStreet); - /** - * 批量删除街道设置 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteTSysStreetByIds(String ids); + /** + * 批量删除街道设置 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysStreetByIds(String ids); - /** - * 删除街道设置信息 - * - * @param id 街道设置ID - * @return 结果 - */ - public int deleteTSysStreetById(Long id); + /** + * 删除街道设置信息 + * + * @param id 街道设置ID + * @return 结果 + */ + public int deleteTSysStreetById(Long id); - /** - * 检查Name唯一 - * - * @param sysStreet - * @return - */ - int checkNameUnique(TSysStreet sysStreet); + /** + * 检查Name唯一 + * + * @param sysStreet + * @return + */ + int checkNameUnique(TSysStreet sysStreet); } diff --git a/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java index 696906c..3ba9fcd 100644 --- a/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java +++ b/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java @@ -2,6 +2,7 @@ package com.fc.v2.service.impl; import java.util.List; +import java.util.Map; import java.util.Arrays; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -11,6 +12,9 @@ import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.TSysAreaMapper; import com.fc.v2.model.auto.TSysArea; import com.fc.v2.service.ITSysAreaService; + +import cn.hutool.core.bean.BeanUtil; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.slf4j.Logger; @@ -53,6 +57,20 @@ public class TSysAreaServiceImpl extends ServiceImpl return this.baseMapper.selectList(queryWrapper); } + /** + * 查询地区设置列表 + * + * @param tSysArea 地区设置 + * @return 地区设置 + */ + @Override + public List selectTSysAreaList(TSysArea tSysArea) { + Map map = BeanUtil.beanToMap(tSysArea, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + /** * 新增地区设置 * diff --git a/src/main/java/com/fc/v2/service/impl/TSysCityServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysCityServiceImpl.java index d7a6b5f..e141dec 100644 --- a/src/main/java/com/fc/v2/service/impl/TSysCityServiceImpl.java +++ b/src/main/java/com/fc/v2/service/impl/TSysCityServiceImpl.java @@ -2,6 +2,7 @@ package com.fc.v2.service.impl; import java.util.List; +import java.util.Map; import java.util.Arrays; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -11,6 +12,9 @@ import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.TSysCityMapper; import com.fc.v2.model.auto.TSysCity; import com.fc.v2.service.ITSysCityService; + +import cn.hutool.core.bean.BeanUtil; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.slf4j.Logger; @@ -24,6 +28,7 @@ import org.slf4j.LoggerFactory; */ @Service public class TSysCityServiceImpl extends ServiceImpl implements ITSysCityService { + private static final Logger logger = LoggerFactory.getLogger(TSysCityServiceImpl.class); @Autowired @@ -51,6 +56,20 @@ public class TSysCityServiceImpl extends ServiceImpl i return this.baseMapper.selectList(queryWrapper); } + /** + * 查询城市设置列表 + * + * @param tSysCity 城市设置 + * @return 城市设置 + */ + @Override + public List selectTSysCityList(TSysCity tSysCity) { + Map map = BeanUtil.beanToMap(tSysCity, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + /** * 新增城市设置 * diff --git a/src/main/java/com/fc/v2/service/impl/TSysProvinceServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysProvinceServiceImpl.java index b6dc557..579230c 100644 --- a/src/main/java/com/fc/v2/service/impl/TSysProvinceServiceImpl.java +++ b/src/main/java/com/fc/v2/service/impl/TSysProvinceServiceImpl.java @@ -2,6 +2,7 @@ package com.fc.v2.service.impl; import java.util.List; +import java.util.Map; import java.util.Arrays; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -11,6 +12,9 @@ import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.TSysProvinceMapper; import com.fc.v2.model.auto.TSysProvince; import com.fc.v2.service.ITSysProvinceService; + +import cn.hutool.core.bean.BeanUtil; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.slf4j.Logger; @@ -52,6 +56,20 @@ public class TSysProvinceServiceImpl extends ServiceImpl selectTSysProvinceList(TSysProvince tSysProvince) { + Map map = BeanUtil.beanToMap(tSysProvince, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + /** * 新增省份 * diff --git a/src/main/java/com/fc/v2/service/impl/TSysStreetServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysStreetServiceImpl.java index a4af127..cfb63f5 100644 --- a/src/main/java/com/fc/v2/service/impl/TSysStreetServiceImpl.java +++ b/src/main/java/com/fc/v2/service/impl/TSysStreetServiceImpl.java @@ -2,6 +2,7 @@ package com.fc.v2.service.impl; import java.util.List; +import java.util.Map; import java.util.Arrays; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -9,8 +10,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.common.support.ConvertUtil; import com.fc.v2.mapper.auto.TSysStreetMapper; +import com.fc.v2.model.auto.TSysRoleUser; import com.fc.v2.model.auto.TSysStreet; import com.fc.v2.service.ITSysStreetService; + +import cn.hutool.core.bean.BeanUtil; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.slf4j.Logger; @@ -53,6 +58,20 @@ public class TSysStreetServiceImpl extends ServiceImpl selectTSysStreetList(TSysStreet tSysStreet) { + Map map = BeanUtil.beanToMap(tSysStreet, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + /** * 新增街道设置 * -- Gitee From 7b5a9e51c797aa24ee135e820c5f9d3d465faa60 Mon Sep 17 00:00:00 2001 From: zhaonengzhi Date: Sun, 8 Aug 2021 00:17:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9=E4=B8=BAmybatis-plus?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=20Signed-off-by:=20zhaonengzhi=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/springbootv2.sql | 688 ++++----- .../com/fc/v2/common/base/BaseController.java | 6 +- .../fc/v2/common/conf/oss/OssEndpoint.java | 413 +++--- .../java/com/fc/v2/common/log/LogAspect.java | 14 +- .../v2/common/quartz/AbstractQuartzJob.java | 18 +- .../QuartzDisallowConcurrentExecution.java | 4 +- .../v2/common/quartz/QuartzJobExecution.java | 4 +- .../v2/common/quartz/QuartzSchedulerUtil.java | 167 ++- .../v2/common/quartz/utils/JobInvokeUtil.java | 4 +- .../com/fc/v2/controller/AdminController.java | 481 +++---- .../controller/admin/AutoCodeController.java | 14 +- .../controller/admin/DictDataController.java | 180 ++- .../controller/admin/DictTypeController.java | 152 +- .../v2/controller/admin/EmailController.java | 247 ++-- .../v2/controller/admin/FileController.java | 221 +-- .../fc/v2/controller/admin/LogController.java | 114 +- .../controller/admin/QuartzJobController.java | 282 ++-- .../admin/QuartzJobLogController.java | 170 +-- .../controller/admin/ServiceController.java | 65 +- .../controller/admin/SysNoticeController.java | 352 ++--- .../com/fc/v2/mapper/auto/SysFileMapper.java | 32 - .../fc/v2/mapper/auto/SysNoticeMapper.java | 40 - .../v2/mapper/auto/SysNoticeUserMapper.java | 40 - .../v2/mapper/auto/SysQuartzJobLogMapper.java | 40 - .../fc/v2/mapper/auto/SysQuartzJobMapper.java | 40 - .../fc/v2/mapper/auto/TSysDictDataMapper.java | 31 +- .../fc/v2/mapper/auto/TSysDictTypeMapper.java | 35 +- .../fc/v2/mapper/auto/TSysEmailMapper.java | 34 +- .../com/fc/v2/mapper/auto/TSysFileMapper.java | 16 + .../fc/v2/mapper/auto/TSysNoticeMapper.java | 15 + .../v2/mapper/auto/TSysNoticeUserMapper.java | 16 + .../mapper/auto/TSysQuartzJobLogMapper.java | 16 + .../v2/mapper/auto/TSysQuartzJobMapper.java | 16 + .../fc/v2/mapper/auto/TsysOperLogMapper.java | 38 +- .../java/com/fc/v2/model/auto/SysFile.java | 143 -- .../com/fc/v2/model/auto/SysFileExample.java | 941 ------------ .../java/com/fc/v2/model/auto/SysNotice.java | 135 -- .../fc/v2/model/auto/SysNoticeExample.java | 705 --------- .../com/fc/v2/model/auto/SysNoticeUser.java | 86 -- .../v2/model/auto/SysNoticeUserExample.java | 491 ------- .../com/fc/v2/model/auto/SysQuartzJob.java | 138 -- .../fc/v2/model/auto/SysQuartzJobExample.java | 778 ---------- .../com/fc/v2/model/auto/SysQuartzJobLog.java | 163 --- .../v2/model/auto/SysQuartzJobLogExample.java | 847 ----------- .../com/fc/v2/model/auto/TSysDictData.java | 361 ++--- .../fc/v2/model/auto/TSysDictDataExample.java | 1275 ----------------- .../com/fc/v2/model/auto/TSysDictType.java | 191 +-- .../fc/v2/model/auto/TSysDictTypeExample.java | 849 ----------- .../java/com/fc/v2/model/auto/TSysEmail.java | 123 +- .../fc/v2/model/auto/TSysEmailExample.java | 681 --------- .../java/com/fc/v2/model/auto/TSysFile.java | 111 ++ .../java/com/fc/v2/model/auto/TSysNotice.java | 97 ++ .../com/fc/v2/model/auto/TSysNoticeUser.java | 88 ++ .../com/fc/v2/model/auto/TSysQuartzJob.java | 140 ++ .../fc/v2/model/auto/TSysQuartzJobLog.java | 167 +++ .../com/fc/v2/model/auto/TsysOperLog.java | 144 +- .../fc/v2/model/auto/TsysOperLogExample.java | 778 ---------- .../java/com/fc/v2/service/DictService.java | 80 -- .../java/com/fc/v2/service/ITDictService.java | 40 + .../fc/v2/service/ITSysDictDataService.java | 80 ++ .../fc/v2/service/ITSysDictTypeService.java | 80 ++ .../com/fc/v2/service/ITSysEmailService.java | 80 ++ .../com/fc/v2/service/ITSysFileService.java | 80 ++ .../com/fc/v2/service/ITSysNoticeService.java | 116 ++ .../fc/v2/service/ITSysNoticeUserService.java | 72 + .../fc/v2/service/ITSysOperLogService.java | 80 ++ .../v2/service/ITSysQuartzJobLogService.java | 72 + .../fc/v2/service/ITSysQuartzJobService.java | 114 ++ .../com/fc/v2/service/SysDictDataService.java | 152 -- .../com/fc/v2/service/SysDictTypeService.java | 154 -- .../com/fc/v2/service/SysFileService.java | 129 -- .../com/fc/v2/service/SysNoticeService.java | 257 ---- .../fc/v2/service/SysNoticeUserService.java | 127 -- .../com/fc/v2/service/SysOperLogService.java | 126 -- .../fc/v2/service/SysQuartzJobLogService.java | 129 -- .../fc/v2/service/SysQuartzJobService.java | 211 --- .../com/fc/v2/service/TSysEmailService.java | 131 -- .../fc/v2/service/impl/DictServiceImpl.java | 82 ++ .../service/impl/TSysDictDataServiceImpl.java | 134 ++ .../service/impl/TSysDictTypeServiceImpl.java | 134 ++ .../v2/service/impl/TSysEmailServiceImpl.java | 134 ++ .../v2/service/impl/TSysFileServiceImpl.java | 129 ++ .../service/impl/TSysNoticeServiceImpl.java | 229 +++ .../impl/TSysNoticeUserServiceImpl.java | 121 ++ .../service/impl/TSysOperLogServiceImpl.java | 135 ++ .../impl/TSysQuartzJobLogServiceImpl.java | 122 ++ .../impl/TSysQuartzJobServiceImpl.java | 199 +++ .../mybatis/auto/SysNoticeMapper.xml | 296 ---- .../mybatis/auto/SysNoticeUserMapper.xml | 236 --- .../mybatis/auto/SysQuartzJobLogMapper.xml | 336 ----- .../mybatis/auto/SysQuartzJobMapper.xml | 314 ---- .../mybatis/auto/TSysDictDataMapper.xml | 458 +----- .../mybatis/auto/TSysDictTypeMapper.xml | 352 +---- .../mybatis/auto/TSysEmailMapper.xml | 263 +--- .../resources/mybatis/auto/TSysFileMapper.xml | 23 + .../mybatis/auto/TSysNoticeMapper.xml | 22 + .../mybatis/auto/TSysNoticeUserMapper.xml | 22 + .../mybatis/auto/TSysQuartzJobLogMapper.xml | 27 + .../mybatis/auto/TSysQuartzJobMapper.xml | 26 + .../mybatis/auto/TsysOperLogMapper.xml | 280 +--- .../resources/mybatis/auto/sysFileMapper.xml | 308 ---- .../resources/templates/admin/email/list.html | 2 +- .../resources/templates/admin/file/list.html | 4 +- .../templates/admin/sysNotice/list.html | 2 +- .../templates/admin/sysNotice/list_view.html | 2 +- 105 files changed, 5390 insertions(+), 14749 deletions(-) delete mode 100644 src/main/java/com/fc/v2/mapper/auto/SysFileMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/SysNoticeMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/SysNoticeUserMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/SysQuartzJobLogMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/SysQuartzJobMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysFileMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysNoticeMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysNoticeUserMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysQuartzJobLogMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysQuartzJobMapper.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysFile.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysFileExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysNotice.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysNoticeExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysNoticeUser.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysNoticeUserExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysQuartzJob.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysQuartzJobExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysQuartzJobLog.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysQuartzJobLogExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/TSysDictDataExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/TSysDictTypeExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/TSysEmailExample.java create mode 100644 src/main/java/com/fc/v2/model/auto/TSysFile.java create mode 100644 src/main/java/com/fc/v2/model/auto/TSysNotice.java create mode 100644 src/main/java/com/fc/v2/model/auto/TSysNoticeUser.java create mode 100644 src/main/java/com/fc/v2/model/auto/TSysQuartzJob.java create mode 100644 src/main/java/com/fc/v2/model/auto/TSysQuartzJobLog.java delete mode 100644 src/main/java/com/fc/v2/model/auto/TsysOperLogExample.java delete mode 100644 src/main/java/com/fc/v2/service/DictService.java create mode 100644 src/main/java/com/fc/v2/service/ITDictService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysDictDataService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysDictTypeService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysEmailService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysFileService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysNoticeService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysNoticeUserService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysOperLogService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysQuartzJobLogService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysQuartzJobService.java delete mode 100644 src/main/java/com/fc/v2/service/SysDictDataService.java delete mode 100644 src/main/java/com/fc/v2/service/SysDictTypeService.java delete mode 100644 src/main/java/com/fc/v2/service/SysFileService.java delete mode 100644 src/main/java/com/fc/v2/service/SysNoticeService.java delete mode 100644 src/main/java/com/fc/v2/service/SysNoticeUserService.java delete mode 100644 src/main/java/com/fc/v2/service/SysOperLogService.java delete mode 100644 src/main/java/com/fc/v2/service/SysQuartzJobLogService.java delete mode 100644 src/main/java/com/fc/v2/service/SysQuartzJobService.java delete mode 100644 src/main/java/com/fc/v2/service/TSysEmailService.java create mode 100644 src/main/java/com/fc/v2/service/impl/DictServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysDictDataServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysDictTypeServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysEmailServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysFileServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysNoticeServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysNoticeUserServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysOperLogServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysQuartzJobServiceImpl.java delete mode 100644 src/main/resources/mybatis/auto/SysNoticeMapper.xml delete mode 100644 src/main/resources/mybatis/auto/SysNoticeUserMapper.xml delete mode 100644 src/main/resources/mybatis/auto/SysQuartzJobLogMapper.xml delete mode 100644 src/main/resources/mybatis/auto/SysQuartzJobMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysFileMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysNoticeMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysNoticeUserMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysQuartzJobLogMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysQuartzJobMapper.xml delete mode 100644 src/main/resources/mybatis/auto/sysFileMapper.xml diff --git a/doc/springbootv2.sql b/doc/springbootv2.sql index c9e7d7a..b1dc067 100644 --- a/doc/springbootv2.sql +++ b/doc/springbootv2.sql @@ -140,7 +140,7 @@ INSERT INTO `t_sys_department` VALUES (6, '5', '销售一组', 'e某某', '13012 -- ---------------------------- DROP TABLE IF EXISTS `t_sys_dict_data`; CREATE TABLE `t_sys_dict_data` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键', + `id` bigint(30) NOT NULL COMMENT '主键', `dict_sort` int(4) NULL DEFAULT 0 COMMENT '字典排序', `dict_label` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '字典标签', `dict_value` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '字典键值', @@ -150,108 +150,109 @@ CREATE TABLE `t_sys_dict_data` ( `is_default` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'N' COMMENT '是否默认（Y是 N否）', `status` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '状态（0正常 1停用）', `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '备注', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '字典数据表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '字典数据表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_dict_data -- ---------------------------- -INSERT INTO `t_sys_dict_data` VALUES ('331043380933038080', 1, '一般', '1', 'sys_notice_type', '', 'info', 'Y', '0', 'admin', '2019-09-09 22:15:03', 'admin', '2019-09-09 22:15:43', ''); -INSERT INTO `t_sys_dict_data` VALUES ('331043525137403904', 2, '重要', '2', 'sys_notice_type', '', 'important', 'N', '0', 'admin', '2019-09-09 22:15:37', 'admin', '2020-12-27 13:57:22', ''); -INSERT INTO `t_sys_dict_data` VALUES ('340080322395901952', 1, '开启', '0', 'sys_province_state', '', 'info', 'Y', '0', 'admin', '2019-10-04 20:44:37', 'admin', '2019-10-04 20:46:41', ''); -INSERT INTO `t_sys_dict_data` VALUES ('340080779201744896', 2, '关闭', '-1', 'sys_province_state', '', 'important', 'N', '0', 'admin', '2019-10-04 20:46:26', 'admin', '2020-12-27 13:57:46', ''); -INSERT INTO `t_sys_dict_data` VALUES ('373494384659927040', 0, 'GET请求', '1', 'sys_inter_url_type', '', 'primary', 'Y', '0', 'admin', '2020-01-05 01:40:11', 'admin', '2020-12-27 14:27:28', ''); -INSERT INTO `t_sys_dict_data` VALUES ('373494483465146368', 1, 'POST请求', '2', 'sys_inter_url_type', '', 'info', 'N', '0', 'admin', '2020-01-05 01:40:34', 'admin', '2020-12-27 14:26:59', ''); -INSERT INTO `t_sys_dict_data` VALUES ('506431838588375040', 0, 'DELETE请求', '3', 'sys_inter_url_type', '', 'default', 'N', '0', 'admin', '2021-01-05 13:46:10', 'admin', '2021-01-05 13:48:43', ''); -INSERT INTO `t_sys_dict_data` VALUES ('506432620712824832', 0, 'PUT请求', '4', 'sys_inter_url_type', '', 'default', 'N', '0', 'admin', '2021-01-05 13:49:16', 'admin', '2021-01-05 13:49:20', ''); -INSERT INTO `t_sys_dict_data` VALUES ('563746747239763968', 0, '微信', '1', 'payment_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:35:09', 'admin', '2021-06-12 17:37:14', ''); -INSERT INTO `t_sys_dict_data` VALUES ('563746783184949248', 0, '支付宝', '2', 'payment_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:35:17', 'admin', '2021-06-12 17:37:18', ''); -INSERT INTO `t_sys_dict_data` VALUES ('563746818496794624', 0, '水滴筹', '3', 'payment_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:35:26', 'admin', '2021-06-12 17:37:21', ''); -INSERT INTO `t_sys_dict_data` VALUES ('563747125104611328', 0, '火锅底料', '1', 'gift_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:36:39', 'admin', '2021-06-12 17:36:50', ''); -INSERT INTO `t_sys_dict_data` VALUES ('563747405598691328', 0, '冒菜底料', '2', 'gift_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:37:46', '', '2021-06-12 17:37:46', ''); -INSERT INTO `t_sys_dict_data` VALUES ('563747459235450880', 0, '重庆小面佐料', '3', 'gift_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:37:58', '', '2021-06-12 17:37:58', ''); -INSERT INTO `t_sys_dict_data` VALUES ('563747480336994304', 0, '其他', '4', 'gift_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:38:03', '', '2021-06-12 17:38:03', ''); -INSERT INTO `t_sys_dict_data` VALUES ('571366029360500736', 0, '是', '1', 'yes_or_no', '', 'default', 'Y', '0', 'admin', '2021-07-03 18:11:27', '', '2021-07-03 18:11:27', ''); -INSERT INTO `t_sys_dict_data` VALUES ('571366105029939200', 0, '否', '-1', 'yes_or_no', '', 'info', 'Y', '0', 'admin', '2021-07-03 18:11:45', '', '2021-07-03 18:11:45', ''); +INSERT INTO `t_sys_dict_data` VALUES (331043380933038080, 1, '一般', '1', 'sys_notice_type', '', 'info', 'Y', '0', 'admin', '2019-09-09 22:15:03', 'admin', '2019-09-09 22:15:43', ''); +INSERT INTO `t_sys_dict_data` VALUES (331043525137403904, 2, '重要', '2', 'sys_notice_type', '', 'important', 'N', '0', 'admin', '2019-09-09 22:15:37', 'admin', '2020-12-27 13:57:22', ''); +INSERT INTO `t_sys_dict_data` VALUES (340080322395901952, 1, '开启', '0', 'sys_province_state', '', 'info', 'Y', '0', 'admin', '2019-10-04 20:44:37', 'admin', '2019-10-04 20:46:41', ''); +INSERT INTO `t_sys_dict_data` VALUES (340080779201744896, 2, '关闭', '-1', 'sys_province_state', '', 'important', 'N', '0', 'admin', '2019-10-04 20:46:26', 'admin', '2020-12-27 13:57:46', ''); +INSERT INTO `t_sys_dict_data` VALUES (373494384659927040, 0, 'GET请求', '1', 'sys_inter_url_type', '', 'primary', 'Y', '0', 'admin', '2020-01-05 01:40:11', 'admin', '2020-12-27 14:27:28', ''); +INSERT INTO `t_sys_dict_data` VALUES (373494483465146368, 1, 'POST请求', '2', 'sys_inter_url_type', '', 'info', 'N', '0', 'admin', '2020-01-05 01:40:34', 'admin', '2020-12-27 14:26:59', ''); +INSERT INTO `t_sys_dict_data` VALUES (506431838588375040, 0, 'DELETE请求', '3', 'sys_inter_url_type', '', 'default', 'N', '0', 'admin', '2021-01-05 13:46:10', 'admin', '2021-01-05 13:48:43', ''); +INSERT INTO `t_sys_dict_data` VALUES (506432620712824832, 0, 'PUT请求', '4', 'sys_inter_url_type', '', 'default', 'N', '0', 'admin', '2021-01-05 13:49:16', 'admin', '2021-01-05 13:49:20', ''); +INSERT INTO `t_sys_dict_data` VALUES (563746747239763968, 0, '微信', '1', 'payment_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:35:09', 'admin', '2021-06-12 17:37:14', ''); +INSERT INTO `t_sys_dict_data` VALUES (563746783184949248, 0, '支付宝', '2', 'payment_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:35:17', 'admin', '2021-06-12 17:37:18', ''); +INSERT INTO `t_sys_dict_data` VALUES (563746818496794624, 0, '水滴筹', '3', 'payment_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:35:26', 'admin', '2021-06-12 17:37:21', ''); +INSERT INTO `t_sys_dict_data` VALUES (563747125104611328, 0, '火锅底料', '1', 'gift_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:36:39', 'admin', '2021-06-12 17:36:50', ''); +INSERT INTO `t_sys_dict_data` VALUES (563747405598691328, 0, '冒菜底料', '2', 'gift_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:37:46', '', '2021-06-12 17:37:46', ''); +INSERT INTO `t_sys_dict_data` VALUES (563747459235450880, 0, '重庆小面佐料', '3', 'gift_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:37:58', '', '2021-06-12 17:37:58', ''); +INSERT INTO `t_sys_dict_data` VALUES (563747480336994304, 0, '其他', '4', 'gift_type', '', 'default', 'Y', '0', 'admin', '2021-06-12 17:38:03', '', '2021-06-12 17:38:03', ''); +INSERT INTO `t_sys_dict_data` VALUES (571366029360500736, 0, '是', '1', 'yes_or_no', '', 'default', 'Y', '0', 'admin', '2021-07-03 18:11:27', '', '2021-07-03 18:11:27', ''); +INSERT INTO `t_sys_dict_data` VALUES (571366105029939200, 0, '否', '-1', 'yes_or_no', '', 'info', 'Y', '0', 'admin', '2021-07-03 18:11:45', '', '2021-07-03 18:11:45', ''); -- ---------------------------- -- Table structure for t_sys_dict_type -- ---------------------------- DROP TABLE IF EXISTS `t_sys_dict_type`; CREATE TABLE `t_sys_dict_type` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键', + `id` bigint(30) NOT NULL COMMENT '主键', `dict_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '字典名称', `dict_type` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '字典类型', `status` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '状态（0正常 1停用）', `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '备注', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `dict_type`(`dict_type`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '字典类型表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '字典类型表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_dict_type -- ---------------------------- -INSERT INTO `t_sys_dict_type` VALUES ('340079827459641344', '省份状态', 'sys_province_state', '0', 'admin', '2019-10-04 20:42:39', '', '2019-10-04 20:42:39', '省份状态'); -INSERT INTO `t_sys_dict_type` VALUES ('373493952487231488', '拦截器类型', 'sys_inter_url_type', '0', 'admin', '2020-01-05 01:38:28', 'admin', '2020-03-29 23:23:43', '拦截器类型'); -INSERT INTO `t_sys_dict_type` VALUES ('563746635880992768', '捐款类型', 'payment_type', '0', 'admin', '2021-06-12 17:34:42', '', '2021-06-12 17:34:42', ''); -INSERT INTO `t_sys_dict_type` VALUES ('563747016396640256', '礼物类型', 'gift_type', '0', 'admin', '2021-06-12 17:36:13', '', '2021-06-12 17:36:13', ''); -INSERT INTO `t_sys_dict_type` VALUES ('571365854613213184', '是与否', 'yes_or_no', '0', 'admin', '2021-07-03 18:10:45', '', '2021-07-03 18:10:45', '用于select'); -INSERT INTO `t_sys_dict_type` VALUES ('6', '通知类型', 'sys_notice_type', '0', 'admin', '2018-03-16 11:33:00', 'admin', '2020-12-27 14:26:42', '通知类型列表'); +INSERT INTO `t_sys_dict_type` VALUES (6, '通知类型', 'sys_notice_type', '0', 'admin', '2018-03-16 11:33:00', 'admin', '2020-12-27 14:26:42', '通知类型列表'); +INSERT INTO `t_sys_dict_type` VALUES (340079827459641344, '省份状态', 'sys_province_state', '0', 'admin', '2019-10-04 20:42:39', '', '2019-10-04 20:42:39', '省份状态'); +INSERT INTO `t_sys_dict_type` VALUES (373493952487231488, '拦截器类型', 'sys_inter_url_type', '0', 'admin', '2020-01-05 01:38:28', 'admin', '2020-03-29 23:23:43', '拦截器类型'); +INSERT INTO `t_sys_dict_type` VALUES (563746635880992768, '捐款类型', 'payment_type', '0', 'admin', '2021-06-12 17:34:42', '', '2021-06-12 17:34:42', ''); +INSERT INTO `t_sys_dict_type` VALUES (563747016396640256, '礼物类型', 'gift_type', '0', 'admin', '2021-06-12 17:36:13', '', '2021-06-12 17:36:13', ''); +INSERT INTO `t_sys_dict_type` VALUES (571365854613213184, '是与否', 'yes_or_no', '0', 'admin', '2021-07-03 18:10:45', '', '2021-07-03 18:10:45', '用于select'); -- ---------------------------- -- Table structure for t_sys_email -- ---------------------------- DROP TABLE IF EXISTS `t_sys_email`; CREATE TABLE `t_sys_email` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '主键', + `id` bigint(30) NOT NULL COMMENT '主键', `receivers_email` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '接收人电子邮件', `title` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '邮件标题', `content` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT '内容', - `send_user_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '发送人id', - `send_user_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '发送人账号', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '电子邮件' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_email -- ---------------------------- -INSERT INTO `t_sys_email` VALUES ('503928650819833856', '87766867@qq.com', '87766867@qq.com', 'fffffff\"[委屈]\"', '1', 'admin', '2020-12-29 15:59:23'); -INSERT INTO `t_sys_email` VALUES ('503928914918379520', '87766867@qq.com', '87766867@qq.com', 'ssssssfsdfsdfsdf\"[抓狂]\"\"[蛋糕]\"', '1', 'admin', '2020-12-29 16:00:26'); -INSERT INTO `t_sys_email` VALUES ('595001021625794560', '87766867@qq.com', 'springbootv2测试邮件', '

测试测测测

', '1', 'admin', '2019-06-30 21:21:38'); +INSERT INTO `t_sys_email` VALUES (503928650819833856, '87766867@qq.com', '87766867@qq.com', 'fffffff\"[委屈]\"', 'admin', '2021-08-07 23:59:41', NULL, NULL, NULL); +INSERT INTO `t_sys_email` VALUES (503928914918379520, '87766867@qq.com', '87766867@qq.com', 'ssssssfsdfsdfsdf\"[抓狂]\"\"[蛋糕]\"', 'admin', '2021-08-07 23:59:41', NULL, NULL, NULL); +INSERT INTO `t_sys_email` VALUES (595001021625794560, '87766867@qq.com', 'springbootv2测试邮件', '

测试测测测

', 'admin', '2021-08-07 23:59:41', NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_file -- ---------------------------- DROP TABLE IF EXISTS `t_sys_file`; CREATE TABLE `t_sys_file` ( - `id` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '主键', + `id` bigint(30) NOT NULL COMMENT '主键', `file_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '文件名字', `bucket_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '桶名', `file_size` bigint(50) NULL DEFAULT NULL COMMENT '文件大小', `file_suffix` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '后缀', - `create_user_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '创建人id', - `create_user_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '创建人名字', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_user_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '修改人', - `update_user_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '修改人名字', - `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '文件信息表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_file -- ---------------------------- -INSERT INTO `t_sys_file` VALUES ('503885495013609472', '503895116063313920.png', 'v2-cloud', 48831, 'image/png', '1', 'admin', '2020-12-29 13:07:54', '1', 'admin', '2020-12-29 13:46:08'); -INSERT INTO `t_sys_file` VALUES ('503885528857448448', '503895039806672896.png', 'v2-cloud', 71460, 'image/png', '1', 'admin', '2020-12-29 13:08:02', '1', 'admin', '2020-12-29 13:45:50'); +INSERT INTO `t_sys_file` VALUES (503885495013609472, '503895116063313920.png', 'v2-cloud', 48831, 'image/png', 'admin', '2021-08-07 23:59:24', 'admin', '2021-08-06 23:46:29', NULL); +INSERT INTO `t_sys_file` VALUES (503885528857448448, '503895039806672896.png', 'v2-cloud', 71460, 'image/png', 'admin', '2021-08-07 23:59:24', 'admin', '2021-08-06 23:46:29', NULL); -- ---------------------------- -- Table structure for t_sys_inter_url @@ -332,70 +333,77 @@ INSERT INTO `t_sys_inter_url` VALUES ('506444610625736704', '拦截器url复制' -- ---------------------------- DROP TABLE IF EXISTS `t_sys_notice`; CREATE TABLE `t_sys_notice` ( - `id` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '主键', + `id` bigint(30) NOT NULL COMMENT '主键', `title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '标题', `content` varchar(1000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '内容', `type` int(5) NULL DEFAULT NULL COMMENT '类型', - `create_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人id', - `create_username` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '创建人name', - `create_time` datetime NULL DEFAULT NULL COMMENT '发信时间', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '公告' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_notice -- ---------------------------- -INSERT INTO `t_sys_notice` VALUES ('330381411007729664', '测试公告', '

啊啊啊

', 1, '1', 'admin', '2019-09-08 02:24:37'); -INSERT INTO `t_sys_notice` VALUES ('330381806358630400', '鲜花视频', '

哈哈哈哈

', 2, '1', 'admin', '2019-09-08 02:26:11'); -INSERT INTO `t_sys_notice` VALUES ('373478036928073728', '顶顶顶顶顶顶顶顶顶', '

顶顶顶顶顶顶顶顶顶顶

', 1, '1', 'admin', '2020-01-05 00:35:13'); +INSERT INTO `t_sys_notice` VALUES (330381411007729664, '测试公告', '

啊啊啊

', 1, 'admin', '2021-08-07 23:56:52', NULL, NULL, NULL); +INSERT INTO `t_sys_notice` VALUES (330381806358630400, '鲜花视频', '

哈哈哈哈

', 2, 'admin', '2021-08-07 23:56:52', NULL, NULL, NULL); +INSERT INTO `t_sys_notice` VALUES (373478036928073728, '顶顶顶顶顶顶顶顶顶', '

顶顶顶顶顶顶顶顶顶顶

', 1, 'admin', '2021-08-07 23:56:52', NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_notice_user -- ---------------------------- DROP TABLE IF EXISTS `t_sys_notice_user`; CREATE TABLE `t_sys_notice_user` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键', - `notice_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '公告id', - `user_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户id', - `state` int(2) NULL DEFAULT NULL COMMENT '0未阅读 1 阅读', + `id` bigint(30) NOT NULL COMMENT '主键', + `notice_id` bigint(30) NULL DEFAULT NULL COMMENT '公告id', + `user_id` bigint(30) NULL DEFAULT NULL COMMENT '用户id', + `state` bigint(2) NULL DEFAULT NULL COMMENT '0未阅读 1 阅读', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '公告_用户外键' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_notice_user -- ---------------------------- -INSERT INTO `t_sys_notice_user` VALUES ('330381411037089792', '330381411007729664', '1', 1); -INSERT INTO `t_sys_notice_user` VALUES ('330381411045478400', '330381411007729664', '488294747442511872', 0); -INSERT INTO `t_sys_notice_user` VALUES ('330381806375407616', '330381806358630400', '1', 1); -INSERT INTO `t_sys_notice_user` VALUES ('330381806379601920', '330381806358630400', '488294747442511872', 0); -INSERT INTO `t_sys_notice_user` VALUES ('330622143622680576', '330622143597514752', '1', 1); -INSERT INTO `t_sys_notice_user` VALUES ('330622143626874880', '330622143597514752', '488294747442511872', 0); -INSERT INTO `t_sys_notice_user` VALUES ('354984345649418240', '354984345632641024', '1', 1); -INSERT INTO `t_sys_notice_user` VALUES ('373478037158760448', '373478036928073728', '1', 1); -INSERT INTO `t_sys_notice_user` VALUES ('373478037162954752', '373478036928073728', '368026921239449600', 0); -INSERT INTO `t_sys_notice_user` VALUES ('373478037171343360', '373478036928073728', '368026937181999104', 0); -INSERT INTO `t_sys_notice_user` VALUES ('373478037175537664', '373478036928073728', '368027013392502784', 0); -INSERT INTO `t_sys_notice_user` VALUES ('373478037183926272', '373478036928073728', '368027030899527680', 0); -INSERT INTO `t_sys_notice_user` VALUES ('373478037192314880', '373478036928073728', '368027048402358272', 0); -INSERT INTO `t_sys_notice_user` VALUES ('373478037204897792', '373478036928073728', '368027066563694592', 0); -INSERT INTO `t_sys_notice_user` VALUES ('373478037213286400', '373478036928073728', '368027087866564608', 0); -INSERT INTO `t_sys_notice_user` VALUES ('373478037217480704', '373478036928073728', '368027104895438848', 0); -INSERT INTO `t_sys_notice_user` VALUES ('373478037225869312', '373478036928073728', '368027130728157184', 0); -INSERT INTO `t_sys_notice_user` VALUES ('373478037230063616', '373478036928073728', '368027151624179712', 0); -INSERT INTO `t_sys_notice_user` VALUES ('373478037238452224', '373478036928073728', '368382463233363968', 0); -INSERT INTO `t_sys_notice_user` VALUES ('502750147499921408', '502750147395063808', '1', 0); -INSERT INTO `t_sys_notice_user` VALUES ('502750147508310016', '502750147395063808', '433236479427350528', 0); -INSERT INTO `t_sys_notice_user` VALUES ('502758207983325184', '502758207907827712', '1', 0); -INSERT INTO `t_sys_notice_user` VALUES ('502758207991713792', '502758207907827712', '433236479427350528', 0); -INSERT INTO `t_sys_notice_user` VALUES ('502820822130495488', '502820822042415104', '1', 0); -INSERT INTO `t_sys_notice_user` VALUES ('502820822138884096', '502820822042415104', '433236479427350528', 0); +INSERT INTO `t_sys_notice_user` VALUES (330381411037089792, 330381411007729664, 1, 1, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (330381411045478400, 330381411007729664, 488294747442511872, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (330381806375407616, 330381806358630400, 1, 1, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (330381806379601920, 330381806358630400, 488294747442511872, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (330622143622680576, 330622143597514752, 1, 1, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (330622143626874880, 330622143597514752, 488294747442511872, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (354984345649418240, 354984345632641024, 1, 1, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (373478037158760448, 373478036928073728, 1, 1, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (373478037162954752, 373478036928073728, 368026921239449600, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (373478037171343360, 373478036928073728, 368026937181999104, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (373478037175537664, 373478036928073728, 368027013392502784, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (373478037183926272, 373478036928073728, 368027030899527680, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (373478037192314880, 373478036928073728, 368027048402358272, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (373478037204897792, 373478036928073728, 368027066563694592, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (373478037213286400, 373478036928073728, 368027087866564608, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (373478037217480704, 373478036928073728, 368027104895438848, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (373478037225869312, 373478036928073728, 368027130728157184, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (373478037230063616, 373478036928073728, 368027151624179712, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (373478037238452224, 373478036928073728, 368382463233363968, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (502750147499921408, 502750147395063808, 1, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (502750147508310016, 502750147395063808, 433236479427350528, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (502758207983325184, 502758207907827712, 1, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (502758207991713792, 502758207907827712, 433236479427350528, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (502820822130495488, 502820822042415104, 1, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); +INSERT INTO `t_sys_notice_user` VALUES (502820822138884096, 502820822042415104, 433236479427350528, 0, 'admin', '2021-08-07 23:58:36', NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_oper_log -- ---------------------------- DROP TABLE IF EXISTS `t_sys_oper_log`; CREATE TABLE `t_sys_oper_log` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, + `id` bigint(30) NOT NULL COMMENT '主键', `title` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '标题', `method` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '方法', `oper_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '操作人', @@ -403,48 +411,53 @@ CREATE TABLE `t_sys_oper_log` ( `oper_param` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '参数', `error_msg` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, `oper_time` date NULL DEFAULT NULL COMMENT '操作时间', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '日志记录表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_oper_log -- ---------------------------- -INSERT INTO `t_sys_oper_log` VALUES ('354984005894017024', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin22\"],\"password\":[\"admin22\"],\"nickname\":[\"222\"],\"roles\":[\"488243256161730560\"]}', NULL, '2019-11-14'); -INSERT INTO `t_sys_oper_log` VALUES ('354988722611163136', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin222\"],\"password\":[\"admin22\"],\"nickname\":[\"22222\"],\"roles\":[\"488243256161730560\"]}', NULL, '2019-11-15'); -INSERT INTO `t_sys_oper_log` VALUES ('354989789822455808', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin33\"],\"password\":[\"admin33\"],\"nickname\":[\"333\"],\"roles\":[\"488305788310257664\"]}', NULL, '2019-11-15'); -INSERT INTO `t_sys_oper_log` VALUES ('368026921411416064', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin1\"],\"password\":[\"admin1\"],\"nickname\":[\"\"]}', NULL, '2019-12-20'); -INSERT INTO `t_sys_oper_log` VALUES ('368026937215553536', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin2\"],\"password\":[\"admin2\"],\"nickname\":[\"\"]}', NULL, '2019-12-20'); -INSERT INTO `t_sys_oper_log` VALUES ('368026972204437504', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"33333\"],\"password\":[\"3333333\"],\"nickname\":[\"333\"]}', NULL, '2019-12-20'); -INSERT INTO `t_sys_oper_log` VALUES ('368027013421862912', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"44\"],\"password\":[\"444444\"],\"nickname\":[\"444\"]}', NULL, '2019-12-20'); -INSERT INTO `t_sys_oper_log` VALUES ('368027030928887808', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"5555555\"],\"password\":[\"555555555555\"],\"nickname\":[\"5555555555555\"]}', NULL, '2019-12-20'); -INSERT INTO `t_sys_oper_log` VALUES ('368027048427524096', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"66\"],\"password\":[\"666666666\"],\"nickname\":[\"6666666666\"]}', NULL, '2019-12-20'); -INSERT INTO `t_sys_oper_log` VALUES ('368027066593054720', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"2222\"],\"password\":[\"222222222\"],\"nickname\":[\"2222222222222222\"]}', NULL, '2019-12-20'); -INSERT INTO `t_sys_oper_log` VALUES ('368027087887536128', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"4444\"],\"password\":[\"44444444444444\"],\"nickname\":[\"44444444444\"]}', NULL, '2019-12-20'); -INSERT INTO `t_sys_oper_log` VALUES ('368027104924798976', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"5555\"],\"password\":[\"55555555555555\"],\"nickname\":[\"555555555555\"]}', NULL, '2019-12-20'); -INSERT INTO `t_sys_oper_log` VALUES ('368027130757517312', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"666\"],\"password\":[\"66666666666\"],\"nickname\":[\"666666666\"]}', NULL, '2019-12-20'); -INSERT INTO `t_sys_oper_log` VALUES ('368027151649345536', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"33333333333333\"],\"password\":[\"333333333333\"],\"nickname\":[\"33333333333333\"]}', NULL, '2019-12-20'); -INSERT INTO `t_sys_oper_log` VALUES ('368382463388553216', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"adminpppoooo\"],\"password\":[\"adminppp\"],\"nickname\":[\"pppppppppp\"]}', NULL, '2019-12-21'); -INSERT INTO `t_sys_oper_log` VALUES ('433236479515430912', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"fuce\"],\"password\":[\"111111\"],\"nickname\":[\"fuce\"]}', NULL, '2020-06-17'); -INSERT INTO `t_sys_oper_log` VALUES ('495560243967823872', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"手动阀手动阀\"],\"password\":[\"123456\"],\"nickname\":[\"手动阀手动阀\"],\"depId\":[\"3\"],\"positionId\":[\"411477874382606336\"]}', NULL, '2020-12-06'); -INSERT INTO `t_sys_oper_log` VALUES ('495570972590608384', '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"何平\"],\"password\":[\"111111\"],\"nickname\":[\"手动阀手动阀\"],\"depId\":[\"4\"],\"posId\":[\"410792443127140352\"]}', NULL, '2020-12-06'); -INSERT INTO `t_sys_oper_log` VALUES ('501769007083425792', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501772647076597760', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501775645991374848', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501776479886118912', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501779375067369472', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501779625379237888', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501780125961031680', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501782630312841216', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"eeee\"],\"password\":[\"eeeeee\"],\"nickname\":[\"eeeeeeee\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792368778907648\"],\"roleIds\":[\"488243256161730560,488289006124007424\"]}', NULL, '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501783503843758080', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"55555\"],\"password\":[\"5555\"],\"nickname\":[\"555555\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792368778907648\"],\"roleIds\":[\"488243256161730560,488289006124007424\"]}', NULL, '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501783738078859264', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"3\"],\"password\":[\"33333333\"],\"nickname\":[\"3333333333333333333\"],\"depId\":[\"3\"],\"selectParent_select_input\":[\"人事部门\"],\"posId\":[\"410792443127140352\"],\"roleIds\":[\"488289006124007424\"]}', NULL, '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501786177666420736', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"eeee\"],\"password\":[\"eee\"],\"nickname\":[\"eeeee\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792478929719296\"],\"roleIds\":[\"488243256161730560,488289006124007424,488305788310257664\"]}', NULL, '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501786241449201664', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"r\"],\"password\":[\"rrrrrrrrrrr\"],\"nickname\":[\"rrrrrrrrr\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792368778907648\"],\"roleIds\":[\"488243256161730560,488289006124007424,488305788310257664\"]}', NULL, '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501786725912285184', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"rrrrr\"],\"password\":[\"rrrrrrrrrrrrrr\"],\"nickname\":[\"rrrrrrrrrrrrrr\"],\"depId\":[\"3\"],\"selectParent_select_input\":[\"人事部门\"],\"posId\":[\"410792478929719296\"],\"roleIds\":[\"488243256161730560,488289006124007424\"]}', NULL, '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501787814850072576', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"rrrrrwwww\"],\"password\":[\"rrrrrrrrrrrrr\"],\"nickname\":[\"rrrrrrrrrrrrrrrrrr\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792368778907648\"],\"roleIds\":[\"\"]}', NULL, '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501787928188555264', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"yyyy\"],\"password\":[\"yyyyyyyyyyyyy\"],\"nickname\":[\"yyyyyyyyyyyyyy\"],\"depId\":[\"5\"],\"selectParent_select_input\":[\"销售部门\"],\"posId\":[\"410792478929719296\"],\"roleIds\":[\"488243256161730560,488289006124007424,488305788310257664\"]}', NULL, '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501796773694672896', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"tttt\"],\"password\":[\"ttt\"],\"nickname\":[\"tttttt\"],\"depId\":[\"4\"],\"selectParent_select_input\":[\"开发一小组\"],\"posId\":[\"410792443127140352\"],\"roleIds\":[\"488243256161730560,488305788310257664\"]}', NULL, '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501985140440961024', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin\"],\"password\":[\"admin\"],\"nickname\":[\"11111111111\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792368778907648\"],\"roleIds\":[\"488289006124007424,488305788310257664\"]}', NULL, '2020-12-24'); -INSERT INTO `t_sys_oper_log` VALUES ('501986656363089920', '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin\"],\"password\":[\"admin\"],\"nickname\":[\"admin\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792368778907648\"],\"roleIds\":[\"488289006124007424,488305788310257664\"]}', NULL, '2020-12-24'); +INSERT INTO `t_sys_oper_log` VALUES (354984005894017024, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin22\"],\"password\":[\"admin22\"],\"nickname\":[\"222\"],\"roles\":[\"488243256161730560\"]}', NULL, '2019-11-14', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (354988722611163136, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin222\"],\"password\":[\"admin22\"],\"nickname\":[\"22222\"],\"roles\":[\"488243256161730560\"]}', NULL, '2019-11-15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (354989789822455808, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin33\"],\"password\":[\"admin33\"],\"nickname\":[\"333\"],\"roles\":[\"488305788310257664\"]}', NULL, '2019-11-15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (368026921411416064, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin1\"],\"password\":[\"admin1\"],\"nickname\":[\"\"]}', NULL, '2019-12-20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (368026937215553536, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin2\"],\"password\":[\"admin2\"],\"nickname\":[\"\"]}', NULL, '2019-12-20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (368026972204437504, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"33333\"],\"password\":[\"3333333\"],\"nickname\":[\"333\"]}', NULL, '2019-12-20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (368027013421862912, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"44\"],\"password\":[\"444444\"],\"nickname\":[\"444\"]}', NULL, '2019-12-20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (368027030928887808, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"5555555\"],\"password\":[\"555555555555\"],\"nickname\":[\"5555555555555\"]}', NULL, '2019-12-20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (368027048427524096, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"66\"],\"password\":[\"666666666\"],\"nickname\":[\"6666666666\"]}', NULL, '2019-12-20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (368027066593054720, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"2222\"],\"password\":[\"222222222\"],\"nickname\":[\"2222222222222222\"]}', NULL, '2019-12-20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (368027087887536128, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"4444\"],\"password\":[\"44444444444444\"],\"nickname\":[\"44444444444\"]}', NULL, '2019-12-20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (368027104924798976, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"5555\"],\"password\":[\"55555555555555\"],\"nickname\":[\"555555555555\"]}', NULL, '2019-12-20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (368027130757517312, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"666\"],\"password\":[\"66666666666\"],\"nickname\":[\"666666666\"]}', NULL, '2019-12-20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (368027151649345536, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"33333333333333\"],\"password\":[\"333333333333\"],\"nickname\":[\"33333333333333\"]}', NULL, '2019-12-20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (368382463388553216, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"adminpppoooo\"],\"password\":[\"adminppp\"],\"nickname\":[\"pppppppppp\"]}', NULL, '2019-12-21', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (433236479515430912, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"fuce\"],\"password\":[\"111111\"],\"nickname\":[\"fuce\"]}', NULL, '2020-06-17', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (495560243967823872, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"手动阀手动阀\"],\"password\":[\"123456\"],\"nickname\":[\"手动阀手动阀\"],\"depId\":[\"3\"],\"positionId\":[\"411477874382606336\"]}', NULL, '2020-12-06', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (495570972590608384, '用户新增', 'com.fc.test.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"何平\"],\"password\":[\"111111\"],\"nickname\":[\"手动阀手动阀\"],\"depId\":[\"4\"],\"posId\":[\"410792443127140352\"]}', NULL, '2020-12-06', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501769007083425792, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501772647076597760, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501775645991374848, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501776479886118912, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501779375067369472, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501779625379237888, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501780125961031680, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{}', '', '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501782630312841216, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"eeee\"],\"password\":[\"eeeeee\"],\"nickname\":[\"eeeeeeee\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792368778907648\"],\"roleIds\":[\"488243256161730560,488289006124007424\"]}', NULL, '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501783503843758080, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"55555\"],\"password\":[\"5555\"],\"nickname\":[\"555555\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792368778907648\"],\"roleIds\":[\"488243256161730560,488289006124007424\"]}', NULL, '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501783738078859264, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"3\"],\"password\":[\"33333333\"],\"nickname\":[\"3333333333333333333\"],\"depId\":[\"3\"],\"selectParent_select_input\":[\"人事部门\"],\"posId\":[\"410792443127140352\"],\"roleIds\":[\"488289006124007424\"]}', NULL, '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501786177666420736, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"eeee\"],\"password\":[\"eee\"],\"nickname\":[\"eeeee\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792478929719296\"],\"roleIds\":[\"488243256161730560,488289006124007424,488305788310257664\"]}', NULL, '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501786241449201664, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"r\"],\"password\":[\"rrrrrrrrrrr\"],\"nickname\":[\"rrrrrrrrr\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792368778907648\"],\"roleIds\":[\"488243256161730560,488289006124007424,488305788310257664\"]}', NULL, '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501786725912285184, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"rrrrr\"],\"password\":[\"rrrrrrrrrrrrrr\"],\"nickname\":[\"rrrrrrrrrrrrrr\"],\"depId\":[\"3\"],\"selectParent_select_input\":[\"人事部门\"],\"posId\":[\"410792478929719296\"],\"roleIds\":[\"488243256161730560,488289006124007424\"]}', NULL, '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501787814850072576, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"rrrrrwwww\"],\"password\":[\"rrrrrrrrrrrrr\"],\"nickname\":[\"rrrrrrrrrrrrrrrrrr\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792368778907648\"],\"roleIds\":[\"\"]}', NULL, '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501787928188555264, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"yyyy\"],\"password\":[\"yyyyyyyyyyyyy\"],\"nickname\":[\"yyyyyyyyyyyyyy\"],\"depId\":[\"5\"],\"selectParent_select_input\":[\"销售部门\"],\"posId\":[\"410792478929719296\"],\"roleIds\":[\"488243256161730560,488289006124007424,488305788310257664\"]}', NULL, '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501796773694672896, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"tttt\"],\"password\":[\"ttt\"],\"nickname\":[\"tttttt\"],\"depId\":[\"4\"],\"selectParent_select_input\":[\"开发一小组\"],\"posId\":[\"410792443127140352\"],\"roleIds\":[\"488243256161730560,488305788310257664\"]}', NULL, '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501985140440961024, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin\"],\"password\":[\"admin\"],\"nickname\":[\"11111111111\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792368778907648\"],\"roleIds\":[\"488289006124007424,488305788310257664\"]}', NULL, '2020-12-24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_oper_log` VALUES (501986656363089920, '用户新增', 'com.fc.v2.controller.admin.UserController.add()', 'admin', '/UserController/add', '{\"username\":[\"admin\"],\"password\":[\"admin\"],\"nickname\":[\"admin\"],\"depId\":[\"1\"],\"selectParent_select_input\":[\"v2\"],\"posId\":[\"410792368778907648\"],\"roleIds\":[\"488289006124007424,488305788310257664\"]}', NULL, '2020-12-24', NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_permission @@ -744,7 +757,7 @@ INSERT INTO `t_sys_province` VALUES (22, '500000', '重庆', '重庆', '106.5049 -- ---------------------------- DROP TABLE IF EXISTS `t_sys_quartz_job`; CREATE TABLE `t_sys_quartz_job` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '日志id', + `id` bigint(30) NOT NULL COMMENT '主键', `job_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务名称', `job_group` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务组名', `invoke_target` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '调用目标字符串', @@ -752,233 +765,243 @@ CREATE TABLE `t_sys_quartz_job` ( `misfire_policy` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'cron计划策略', `concurrent` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否并发执行（0允许 1禁止）', `status` int(11) NULL DEFAULT NULL COMMENT '任务状态（0正常 1暂停）', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '定时任务调度表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_quartz_job -- ---------------------------- -INSERT INTO `t_sys_quartz_job` VALUES ('332182389491109888', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', '*/5 * * * * ?', '2', '0', 1); +INSERT INTO `t_sys_quartz_job` VALUES (332182389491109888, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', '*/5 * * * * ?', '2', '0', 1, NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_quartz_job_log -- ---------------------------- DROP TABLE IF EXISTS `t_sys_quartz_job_log`; CREATE TABLE `t_sys_quartz_job_log` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键', + `id` bigint(30) NOT NULL COMMENT '主键', `job_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务名称', `job_group` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务组名', `invoke_target` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '调用目标字符串', `job_message` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '日志信息', `status` int(11) NULL DEFAULT NULL COMMENT '执行状态（0正常 1失败）', `exception_info` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '异常信息', - `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间', - `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间', + `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', + `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '定时任务调度日志表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_quartz_job_log -- ---------------------------- -INSERT INTO `t_sys_quartz_job_log` VALUES ('333610566486724608', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2019-09-17 00:16:07', '2019-09-17 00:16:07'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('333610572270669824', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2019-09-17 00:16:09', '2019-09-17 00:16:09'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('354984595927732224', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：3毫秒', 0, NULL, '2019-11-14 23:48:53', '2019-11-14 23:48:53'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('354990312722141184', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2019-11-15 00:11:36', '2019-11-15 00:11:36'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('354996339316232192', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：3毫秒', 0, NULL, '2019-11-15 00:35:33', '2019-11-15 00:35:33'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421274211356672', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：5毫秒', 0, NULL, '2020-04-29 18:22:40', '2020-04-29 18:22:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421274303631360', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:22:40', '2020-04-29 18:22:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421274324602880', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:22:40', '2020-04-29 18:22:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421274366545920', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:22:40', '2020-04-29 18:22:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421315554611200', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:22:50', '2020-04-29 18:22:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421357501845504', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:23:00', '2020-04-29 18:23:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421399453274112', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:23:10', '2020-04-29 18:23:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421441375342592', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:23:20', '2020-04-29 18:23:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421483351937024', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2020-04-29 18:23:30', '2020-04-29 18:23:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421525257228288', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:23:40', '2020-04-29 18:23:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421567233822720', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:23:50', '2020-04-29 18:23:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421609130725376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:24:00', '2020-04-29 18:24:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421648662040576', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:24:09', '2020-04-29 18:24:09'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421651073765376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:24:10', '2020-04-29 18:24:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421693041971200', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:24:20', '2020-04-29 18:24:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421734959845376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:24:30', '2020-04-29 18:24:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421776974188544', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:24:40', '2020-04-29 18:24:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421818862702592', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:24:50', '2020-04-29 18:24:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421860805742592', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:25:00', '2020-04-29 18:25:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415421902736199680', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:25:10', '2020-04-29 18:25:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423552540512256', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：4毫秒', 0, NULL, '2020-04-29 18:31:43', '2020-04-29 18:31:43'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423552636981248', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:31:43', '2020-04-29 18:31:43'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423552670535680', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:31:43', '2020-04-29 18:31:43'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423552687312896', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:31:43', '2020-04-29 18:31:43'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423552716673024', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:31:43', '2020-04-29 18:31:43'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423552741838848', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:31:43', '2020-04-29 18:31:43'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423559536611328', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:31:45', '2020-04-29 18:31:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423580482965504', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:31:50', '2020-04-29 18:31:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423601454485504', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:31:55', '2020-04-29 18:31:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423622405033984', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:32:00', '2020-04-29 18:32:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423643372359680', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:32:05', '2020-04-29 18:32:05'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423664343879680', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:10', '2020-04-29 18:32:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423685311205376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:15', '2020-04-29 18:32:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423706328862720', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:20', '2020-04-29 18:32:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423727325548544', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:25', '2020-04-29 18:32:25'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423748250931200', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:30', '2020-04-29 18:32:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423769188896768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:35', '2020-04-29 18:32:35'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423790227525632', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:40', '2020-04-29 18:32:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423811190657024', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:32:45', '2020-04-29 18:32:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423832178954240', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:32:50', '2020-04-29 18:32:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423853100142592', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:55', '2020-04-29 18:32:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423874054885376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:33:00', '2020-04-29 18:33:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423895026405376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:33:05', '2020-04-29 18:33:05'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423916002119680', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:33:10', '2020-04-29 18:33:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423937015582720', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:33:15', '2020-04-29 18:33:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423957970325504', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:33:20', '2020-04-29 18:33:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423978925068288', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:33:25', '2020-04-29 18:33:25'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415423999942725632', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:33:30', '2020-04-29 18:33:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424020889079808', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:33:35', '2020-04-29 18:33:35'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424041894154240', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:33:40', '2020-04-29 18:33:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424062844702720', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:33:45', '2020-04-29 18:33:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424083803639808', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:33:50', '2020-04-29 18:33:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424104754188288', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:33:55', '2020-04-29 18:33:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424125746679808', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:34:00', '2020-04-29 18:34:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424146726588416', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:05', '2020-04-29 18:34:05'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424167727468544', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:10', '2020-04-29 18:34:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424188678017024', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:15', '2020-04-29 18:34:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424209636954112', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:20', '2020-04-29 18:34:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424230595891200', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:34:25', '2020-04-29 18:34:25'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424251567411200', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:30', '2020-04-29 18:34:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424272559902720', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:35', '2020-04-29 18:34:35'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424293518839808', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:40', '2020-04-29 18:34:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424314507137024', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:45', '2020-04-29 18:34:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424335436713984', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:34:50', '2020-04-29 18:34:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424356404039680', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:34:55', '2020-04-29 18:34:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424377396531200', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:35:00', '2020-04-29 18:35:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424398414188544', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:05', '2020-04-29 18:35:05'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424419326988288', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:35:10', '2020-04-29 18:35:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424440332062720', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:35:15', '2020-04-29 18:35:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424461282611200', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:20', '2020-04-29 18:35:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424482254131200', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:25', '2020-04-29 18:35:25'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424503200485376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:30', '2020-04-29 18:35:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424524163616768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:35', '2020-04-29 18:35:35'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424545135136768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:40', '2020-04-29 18:35:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424566148599808', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:35:45', '2020-04-29 18:35:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424587103342592', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:50', '2020-04-29 18:35:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424608150360064', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:35:55', '2020-04-29 18:35:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424629029605376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:36:00', '2020-04-29 18:36:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424650072428544', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:05', '2020-04-29 18:36:05'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424671035559936', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:10', '2020-04-29 18:36:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424691981914112', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:15', '2020-04-29 18:36:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424712961822720', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:20', '2020-04-29 18:36:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424733899788288', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:25', '2020-04-29 18:36:25'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424754862919680', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:30', '2020-04-29 18:36:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424775888965632', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:36:35', '2020-04-29 18:36:35'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424796797571072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:36:40', '2020-04-29 18:36:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424817836199936', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:36:45', '2020-04-29 18:36:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424838769971200', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:36:50', '2020-04-29 18:36:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424859741491200', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:55', '2020-04-29 18:36:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424880696233984', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:37:00', '2020-04-29 18:37:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424901705502720', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:37:05', '2020-04-29 18:37:05'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424922681217024', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:37:10', '2020-04-29 18:37:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424943690485760', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:37:15', '2020-04-29 18:37:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424964632645632', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:37:20', '2020-04-29 18:37:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415424985562222592', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:37:25', '2020-04-29 18:37:25'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425006516965376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:37:30', '2020-04-29 18:37:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425027484291072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:37:35', '2020-04-29 18:37:35'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425048476782592', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2020-04-29 18:37:40', '2020-04-29 18:37:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425069427331072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:37:45', '2020-04-29 18:37:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425090436599808', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:37:50', '2020-04-29 18:37:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425111412314112', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:37:55', '2020-04-29 18:37:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425132354473984', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:38:00', '2020-04-29 18:38:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425153334382592', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:38:05', '2020-04-29 18:38:05'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425174335262720', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:38:10', '2020-04-29 18:38:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425195290005504', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:38:15', '2020-04-29 18:38:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425216248942592', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:38:20', '2020-04-29 18:38:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425237224656896', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2020-04-29 18:38:25', '2020-04-29 18:38:25'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425258200371200', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:38:30', '2020-04-29 18:38:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425279192862720', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:38:35', '2020-04-29 18:38:35'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425300126633984', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:38:40', '2020-04-29 18:38:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425321089765376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:38:45', '2020-04-29 18:38:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425342082256896', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:38:50', '2020-04-29 18:38:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425363041193984', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:38:55', '2020-04-29 18:38:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425384000131072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:00', '2020-04-29 18:39:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425404967456768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:05', '2020-04-29 18:39:05'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425425997697024', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:39:10', '2020-04-29 18:39:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425446956634112', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:15', '2020-04-29 18:39:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425467902988288', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:20', '2020-04-29 18:39:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425488866119680', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:25', '2020-04-29 18:39:25'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425509825056768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:39:30', '2020-04-29 18:39:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425530800771072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:39:35', '2020-04-29 18:39:35'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425551768096768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:40', '2020-04-29 18:39:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425572743811072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:39:45', '2020-04-29 18:39:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425593706942464', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:50', '2020-04-29 18:39:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425614678462464', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:55', '2020-04-29 18:39:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425635654176768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:40:00', '2020-04-29 18:40:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425656629891072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:40:05', '2020-04-29 18:40:05'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425677597216768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:40:10', '2020-04-29 18:40:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425698568736768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:40:15', '2020-04-29 18:40:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425719540256768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:40:20', '2020-04-29 18:40:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425740515971072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:40:25', '2020-04-29 18:40:25'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425761487491072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:40:30', '2020-04-29 18:40:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425782454816768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:40:35', '2020-04-29 18:40:35'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425803430531072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:40:40', '2020-04-29 18:40:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425824397856768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:40:45', '2020-04-29 18:40:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425845373571072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:40:50', '2020-04-29 18:40:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425866340896768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:40:55', '2020-04-29 18:40:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425887312416768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:00', '2020-04-29 18:41:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425908283936768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:05', '2020-04-29 18:41:05'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425929255456768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:41:10', '2020-04-29 18:41:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425950226976768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:15', '2020-04-29 18:41:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425971198496768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:20', '2020-04-29 18:41:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415425992165822464', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:25', '2020-04-29 18:41:25'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426013141536768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:30', '2020-04-29 18:41:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426034117251072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:41:35', '2020-04-29 18:41:35'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426055088771072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:40', '2020-04-29 18:41:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426076056096768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:45', '2020-04-29 18:41:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426117479043072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：4毫秒', 0, NULL, '2020-04-29 18:41:51', '2020-04-29 18:41:51'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426138983239680', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:42:00', '2020-04-29 18:42:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426180909502464', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:42:10', '2020-04-29 18:42:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426222856736768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:42:20', '2020-04-29 18:42:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426264799776768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:42:30', '2020-04-29 18:42:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426306742816768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:42:40', '2020-04-29 18:42:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426348685856768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:42:50', '2020-04-29 18:42:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426390633091072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:43:00', '2020-04-29 18:43:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426432580325376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:43:10', '2020-04-29 18:43:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426453539262464', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:43:15', '2020-04-29 18:43:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426474519171072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2020-04-29 18:43:20', '2020-04-29 18:43:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426495486496768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:43:25', '2020-04-29 18:43:25'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426516462211072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:43:30', '2020-04-29 18:43:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426537437925376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:43:35', '2020-04-29 18:43:35'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426558417833984', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:43:40', '2020-04-29 18:43:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426579372576768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:43:45', '2020-04-29 18:43:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426600344096768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:43:50', '2020-04-29 18:43:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426789146497024', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：3毫秒', 0, NULL, '2020-04-29 18:44:35', '2020-04-29 18:44:35'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426810071879680', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:44:40', '2020-04-29 18:44:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426831039205376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:44:45', '2020-04-29 18:44:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426851998142464', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:44:50', '2020-04-29 18:44:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426872982245376', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:44:55', '2020-04-29 18:44:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426894041845760', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:45:00', '2020-04-29 18:45:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426914921091072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:45:05', '2020-04-29 18:45:05'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426935888416768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:45:10', '2020-04-29 18:45:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426956864131072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:45:15', '2020-04-29 18:45:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415426977835651072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:45:20', '2020-04-29 18:45:20'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415427019774496768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:45:30', '2020-04-29 18:45:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415427061713342464', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:45:40', '2020-04-29 18:45:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('415427103660576768', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:45:50', '2020-04-29 18:45:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503199187412848640', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：45毫秒', 0, NULL, '2020-12-27 15:40:45', '2020-12-27 15:40:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503200830422388736', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：37毫秒', 0, NULL, '2020-12-27 15:47:17', '2020-12-27 15:47:17'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503205708326637568', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：148毫秒', 0, NULL, '2020-12-27 16:06:40', '2020-12-27 16:06:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503205749506314240', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：10毫秒', 0, NULL, '2020-12-27 16:06:50', '2020-12-27 16:06:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503205791440965632', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：5毫秒', 0, NULL, '2020-12-27 16:07:00', '2020-12-27 16:07:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503205917249114112', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：7毫秒', 0, NULL, '2020-12-27 16:07:30', '2020-12-27 16:07:30'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503205959217319936', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：8毫秒', 0, NULL, '2020-12-27 16:07:40', '2020-12-27 16:07:40'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503218856400130048', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：39毫秒', 0, NULL, '2020-12-27 16:58:55', '2020-12-27 16:58:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503222358929182720', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2020-12-27 17:12:50', '2020-12-27 17:12:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503222379850371072', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-12-27 17:12:55', '2020-12-27 17:12:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503222442806874112', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：3毫秒', 0, NULL, '2020-12-27 17:13:10', '2020-12-27 17:13:10'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503222463786782720', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2020-12-27 17:13:15', '2020-12-27 17:13:15'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503222842696011776', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：5毫秒', 0, NULL, '2020-12-27 17:14:45', '2020-12-27 17:14:45'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503222862266634240', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：4毫秒', 0, NULL, '2020-12-27 17:14:50', '2020-12-27 17:14:50'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503222883204599808', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：3毫秒', 0, NULL, '2020-12-27 17:14:55', '2020-12-27 17:14:55'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503222904176119808', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：3毫秒', 1, 'ewrwerwer', '2020-12-27 17:15:00', '2020-12-30 17:15:00'); -INSERT INTO `t_sys_quartz_job_log` VALUES ('503236547471085568', 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：37毫秒', 0, NULL, '2020-12-27 18:09:13', '2020-12-27 18:09:13'); +INSERT INTO `t_sys_quartz_job_log` VALUES (333610566486724608, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2019-09-17 00:16:07', '2019-09-17 00:16:07', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (333610572270669824, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2019-09-17 00:16:09', '2019-09-17 00:16:09', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (354984595927732224, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：3毫秒', 0, NULL, '2019-11-14 23:48:53', '2019-11-14 23:48:53', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (354990312722141184, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2019-11-15 00:11:36', '2019-11-15 00:11:36', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (354996339316232192, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：3毫秒', 0, NULL, '2019-11-15 00:35:33', '2019-11-15 00:35:33', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421274211356672, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：5毫秒', 0, NULL, '2020-04-29 18:22:40', '2020-04-29 18:22:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421274303631360, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:22:40', '2020-04-29 18:22:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421274324602880, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:22:40', '2020-04-29 18:22:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421274366545920, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:22:40', '2020-04-29 18:22:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421315554611200, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:22:50', '2020-04-29 18:22:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421357501845504, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:23:00', '2020-04-29 18:23:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421399453274112, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:23:10', '2020-04-29 18:23:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421441375342592, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:23:20', '2020-04-29 18:23:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421483351937024, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2020-04-29 18:23:30', '2020-04-29 18:23:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421525257228288, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:23:40', '2020-04-29 18:23:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421567233822720, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:23:50', '2020-04-29 18:23:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421609130725376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:24:00', '2020-04-29 18:24:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421648662040576, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:24:09', '2020-04-29 18:24:09', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421651073765376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:24:10', '2020-04-29 18:24:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421693041971200, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:24:20', '2020-04-29 18:24:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421734959845376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:24:30', '2020-04-29 18:24:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421776974188544, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:24:40', '2020-04-29 18:24:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421818862702592, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:24:50', '2020-04-29 18:24:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421860805742592, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:25:00', '2020-04-29 18:25:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415421902736199680, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:25:10', '2020-04-29 18:25:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423552540512256, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：4毫秒', 0, NULL, '2020-04-29 18:31:43', '2020-04-29 18:31:43', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423552636981248, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:31:43', '2020-04-29 18:31:43', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423552670535680, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:31:43', '2020-04-29 18:31:43', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423552687312896, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:31:43', '2020-04-29 18:31:43', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423552716673024, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:31:43', '2020-04-29 18:31:43', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423552741838848, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:31:43', '2020-04-29 18:31:43', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423559536611328, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:31:45', '2020-04-29 18:31:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423580482965504, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:31:50', '2020-04-29 18:31:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423601454485504, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:31:55', '2020-04-29 18:31:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423622405033984, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:32:00', '2020-04-29 18:32:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423643372359680, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:32:05', '2020-04-29 18:32:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423664343879680, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:10', '2020-04-29 18:32:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423685311205376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:15', '2020-04-29 18:32:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423706328862720, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:20', '2020-04-29 18:32:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423727325548544, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:25', '2020-04-29 18:32:25', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423748250931200, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:30', '2020-04-29 18:32:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423769188896768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:35', '2020-04-29 18:32:35', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423790227525632, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:40', '2020-04-29 18:32:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423811190657024, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:32:45', '2020-04-29 18:32:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423832178954240, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:32:50', '2020-04-29 18:32:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423853100142592, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:32:55', '2020-04-29 18:32:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423874054885376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:33:00', '2020-04-29 18:33:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423895026405376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:33:05', '2020-04-29 18:33:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423916002119680, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:33:10', '2020-04-29 18:33:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423937015582720, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:33:15', '2020-04-29 18:33:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423957970325504, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:33:20', '2020-04-29 18:33:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423978925068288, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:33:25', '2020-04-29 18:33:25', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415423999942725632, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:33:30', '2020-04-29 18:33:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424020889079808, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:33:35', '2020-04-29 18:33:35', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424041894154240, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:33:40', '2020-04-29 18:33:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424062844702720, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:33:45', '2020-04-29 18:33:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424083803639808, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:33:50', '2020-04-29 18:33:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424104754188288, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:33:55', '2020-04-29 18:33:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424125746679808, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:34:00', '2020-04-29 18:34:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424146726588416, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:05', '2020-04-29 18:34:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424167727468544, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:10', '2020-04-29 18:34:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424188678017024, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:15', '2020-04-29 18:34:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424209636954112, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:20', '2020-04-29 18:34:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424230595891200, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:34:25', '2020-04-29 18:34:25', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424251567411200, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:30', '2020-04-29 18:34:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424272559902720, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:35', '2020-04-29 18:34:35', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424293518839808, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:40', '2020-04-29 18:34:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424314507137024, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:34:45', '2020-04-29 18:34:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424335436713984, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:34:50', '2020-04-29 18:34:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424356404039680, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:34:55', '2020-04-29 18:34:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424377396531200, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:35:00', '2020-04-29 18:35:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424398414188544, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:05', '2020-04-29 18:35:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424419326988288, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:35:10', '2020-04-29 18:35:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424440332062720, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:35:15', '2020-04-29 18:35:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424461282611200, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:20', '2020-04-29 18:35:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424482254131200, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:25', '2020-04-29 18:35:25', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424503200485376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:30', '2020-04-29 18:35:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424524163616768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:35', '2020-04-29 18:35:35', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424545135136768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:40', '2020-04-29 18:35:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424566148599808, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:35:45', '2020-04-29 18:35:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424587103342592, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:35:50', '2020-04-29 18:35:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424608150360064, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:35:55', '2020-04-29 18:35:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424629029605376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:36:00', '2020-04-29 18:36:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424650072428544, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:05', '2020-04-29 18:36:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424671035559936, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:10', '2020-04-29 18:36:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424691981914112, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:15', '2020-04-29 18:36:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424712961822720, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:20', '2020-04-29 18:36:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424733899788288, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:25', '2020-04-29 18:36:25', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424754862919680, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:30', '2020-04-29 18:36:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424775888965632, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:36:35', '2020-04-29 18:36:35', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424796797571072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:36:40', '2020-04-29 18:36:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424817836199936, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:36:45', '2020-04-29 18:36:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424838769971200, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:36:50', '2020-04-29 18:36:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424859741491200, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:36:55', '2020-04-29 18:36:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424880696233984, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:37:00', '2020-04-29 18:37:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424901705502720, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:37:05', '2020-04-29 18:37:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424922681217024, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:37:10', '2020-04-29 18:37:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424943690485760, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:37:15', '2020-04-29 18:37:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424964632645632, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:37:20', '2020-04-29 18:37:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415424985562222592, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:37:25', '2020-04-29 18:37:25', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425006516965376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:37:30', '2020-04-29 18:37:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425027484291072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:37:35', '2020-04-29 18:37:35', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425048476782592, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2020-04-29 18:37:40', '2020-04-29 18:37:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425069427331072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:37:45', '2020-04-29 18:37:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425090436599808, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:37:50', '2020-04-29 18:37:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425111412314112, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:37:55', '2020-04-29 18:37:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425132354473984, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:38:00', '2020-04-29 18:38:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425153334382592, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:38:05', '2020-04-29 18:38:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425174335262720, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:38:10', '2020-04-29 18:38:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425195290005504, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:38:15', '2020-04-29 18:38:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425216248942592, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:38:20', '2020-04-29 18:38:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425237224656896, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2020-04-29 18:38:25', '2020-04-29 18:38:25', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425258200371200, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:38:30', '2020-04-29 18:38:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425279192862720, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:38:35', '2020-04-29 18:38:35', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425300126633984, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:38:40', '2020-04-29 18:38:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425321089765376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:38:45', '2020-04-29 18:38:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425342082256896, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:38:50', '2020-04-29 18:38:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425363041193984, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:38:55', '2020-04-29 18:38:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425384000131072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:00', '2020-04-29 18:39:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425404967456768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:05', '2020-04-29 18:39:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425425997697024, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:39:10', '2020-04-29 18:39:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425446956634112, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:15', '2020-04-29 18:39:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425467902988288, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:20', '2020-04-29 18:39:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425488866119680, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:25', '2020-04-29 18:39:25', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425509825056768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:39:30', '2020-04-29 18:39:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425530800771072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:39:35', '2020-04-29 18:39:35', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425551768096768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:40', '2020-04-29 18:39:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425572743811072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:39:45', '2020-04-29 18:39:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425593706942464, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:50', '2020-04-29 18:39:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425614678462464, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:39:55', '2020-04-29 18:39:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425635654176768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:40:00', '2020-04-29 18:40:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425656629891072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:40:05', '2020-04-29 18:40:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425677597216768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:40:10', '2020-04-29 18:40:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425698568736768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:40:15', '2020-04-29 18:40:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425719540256768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:40:20', '2020-04-29 18:40:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425740515971072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:40:25', '2020-04-29 18:40:25', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425761487491072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:40:30', '2020-04-29 18:40:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425782454816768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:40:35', '2020-04-29 18:40:35', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425803430531072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:40:40', '2020-04-29 18:40:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425824397856768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:40:45', '2020-04-29 18:40:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425845373571072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:40:50', '2020-04-29 18:40:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425866340896768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:40:55', '2020-04-29 18:40:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425887312416768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:00', '2020-04-29 18:41:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425908283936768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:05', '2020-04-29 18:41:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425929255456768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:41:10', '2020-04-29 18:41:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425950226976768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:15', '2020-04-29 18:41:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425971198496768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:20', '2020-04-29 18:41:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415425992165822464, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:25', '2020-04-29 18:41:25', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426013141536768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:30', '2020-04-29 18:41:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426034117251072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:41:35', '2020-04-29 18:41:35', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426055088771072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:40', '2020-04-29 18:41:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426076056096768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:41:45', '2020-04-29 18:41:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426117479043072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：4毫秒', 0, NULL, '2020-04-29 18:41:51', '2020-04-29 18:41:51', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426138983239680, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:42:00', '2020-04-29 18:42:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426180909502464, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:42:10', '2020-04-29 18:42:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426222856736768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:42:20', '2020-04-29 18:42:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426264799776768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:42:30', '2020-04-29 18:42:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426306742816768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:42:40', '2020-04-29 18:42:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426348685856768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:42:50', '2020-04-29 18:42:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426390633091072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:43:00', '2020-04-29 18:43:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426432580325376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:43:10', '2020-04-29 18:43:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426453539262464, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:43:15', '2020-04-29 18:43:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426474519171072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2020-04-29 18:43:20', '2020-04-29 18:43:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426495486496768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:43:25', '2020-04-29 18:43:25', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426516462211072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:43:30', '2020-04-29 18:43:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426537437925376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:43:35', '2020-04-29 18:43:35', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426558417833984, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:43:40', '2020-04-29 18:43:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426579372576768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:43:45', '2020-04-29 18:43:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426600344096768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:43:50', '2020-04-29 18:43:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426789146497024, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：3毫秒', 0, NULL, '2020-04-29 18:44:35', '2020-04-29 18:44:35', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426810071879680, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:44:40', '2020-04-29 18:44:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426831039205376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:44:45', '2020-04-29 18:44:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426851998142464, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:44:50', '2020-04-29 18:44:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426872982245376, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:44:55', '2020-04-29 18:44:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426894041845760, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:45:00', '2020-04-29 18:45:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426914921091072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:45:05', '2020-04-29 18:45:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426935888416768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:45:10', '2020-04-29 18:45:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426956864131072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:45:15', '2020-04-29 18:45:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415426977835651072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-04-29 18:45:20', '2020-04-29 18:45:20', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415427019774496768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:45:30', '2020-04-29 18:45:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415427061713342464, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:45:40', '2020-04-29 18:45:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (415427103660576768, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：0毫秒', 0, NULL, '2020-04-29 18:45:50', '2020-04-29 18:45:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503199187412848640, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：45毫秒', 0, NULL, '2020-12-27 15:40:45', '2020-12-27 15:40:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503200830422388736, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：37毫秒', 0, NULL, '2020-12-27 15:47:17', '2020-12-27 15:47:17', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503205708326637568, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：148毫秒', 0, NULL, '2020-12-27 16:06:40', '2020-12-27 16:06:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503205749506314240, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：10毫秒', 0, NULL, '2020-12-27 16:06:50', '2020-12-27 16:06:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503205791440965632, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：5毫秒', 0, NULL, '2020-12-27 16:07:00', '2020-12-27 16:07:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503205917249114112, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：7毫秒', 0, NULL, '2020-12-27 16:07:30', '2020-12-27 16:07:30', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503205959217319936, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：8毫秒', 0, NULL, '2020-12-27 16:07:40', '2020-12-27 16:07:40', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503218856400130048, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：39毫秒', 0, NULL, '2020-12-27 16:58:55', '2020-12-27 16:58:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503222358929182720, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2020-12-27 17:12:50', '2020-12-27 17:12:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503222379850371072, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：1毫秒', 0, NULL, '2020-12-27 17:12:55', '2020-12-27 17:12:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503222442806874112, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：3毫秒', 0, NULL, '2020-12-27 17:13:10', '2020-12-27 17:13:10', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503222463786782720, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：2毫秒', 0, NULL, '2020-12-27 17:13:15', '2020-12-27 17:13:15', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503222842696011776, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：5毫秒', 0, NULL, '2020-12-27 17:14:45', '2020-12-27 17:14:45', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503222862266634240, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：4毫秒', 0, NULL, '2020-12-27 17:14:50', '2020-12-27 17:14:50', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503222883204599808, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：3毫秒', 0, NULL, '2020-12-27 17:14:55', '2020-12-27 17:14:55', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503222904176119808, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：3毫秒', 1, 'ewrwerwer', '2020-12-27 17:15:00', '2020-12-30 17:15:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_quartz_job_log` VALUES (503236547471085568, 'v2Task2', 'SYSTEM', 'v2Task.runTask2(1,2l,\'asa\',true,2D)', 'v2Task2 总共耗时：37毫秒', 0, NULL, '2020-12-27 18:09:13', '2020-12-27 18:09:13', NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_role @@ -1072,22 +1095,25 @@ INSERT INTO `t_sys_user` VALUES ('433236479427350528', 'fuce', '21232f297a57a5a7 -- ---------------------------- DROP TABLE IF EXISTS `t_test`; CREATE TABLE `t_test` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键', + `id` bigint(30) NOT NULL COMMENT '主键', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '姓名', `age` int(11) NULL DEFAULT NULL COMMENT '年龄', `sex` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '性别', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `b_c_update` datetime NULL DEFAULT NULL COMMENT '修改时间', `t_cb_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '写个字符串', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '测试表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_test -- ---------------------------- -INSERT INTO `t_test` VALUES ('457067146405613568', '管理员', 2, '1', '2021-01-14 16:00:00', '2021-01-15 16:00:00', '7'); -INSERT INTO `t_test` VALUES ('457067174939463680', '法院用户', 2, '1', '2021-01-12 16:00:00', '2021-01-18 16:00:00', ''); -INSERT INTO `t_test` VALUES ('457067196175224832', 'guest', 1, '3', '2021-01-02 16:00:00', '2021-01-16 16:00:00', ''); -INSERT INTO `t_test` VALUES ('457067220279889920', 'helloword', 1, '3', '2021-01-03 16:00:00', '2021-01-25 16:00:00', ''); +INSERT INTO `t_test` VALUES (457067146405613568, '管理员', 2, '1', '2021-01-14 16:00:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_test` VALUES (457067174939463680, '法院用户', 2, '1', '2021-01-12 16:00:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_test` VALUES (457067196175224832, 'guest', 1, '3', '2021-01-02 16:00:00', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_test` VALUES (457067220279889920, 'helloword', 1, '3', '2021-01-03 16:00:00', NULL, NULL, NULL, NULL, NULL); SET FOREIGN_KEY_CHECKS = 1; diff --git a/src/main/java/com/fc/v2/common/base/BaseController.java b/src/main/java/com/fc/v2/common/base/BaseController.java index 84af2f7..a330aca 100644 --- a/src/main/java/com/fc/v2/common/base/BaseController.java +++ b/src/main/java/com/fc/v2/common/base/BaseController.java @@ -38,16 +38,16 @@ public class BaseController //日志操作 @Autowired - public SysOperLogService sysOperLogService; + public ITSysOperLogService sysOperLogService; //公告 @Autowired - public SysNoticeService sysNoticeService; + public ITSysNoticeService sysNoticeService; /** * 文件上传 */ @Autowired - public SysFileService sysFileService; + public ITSysFileService sysFileService; //配置文件 @Autowired public V2Config v2Config; diff --git a/src/main/java/com/fc/v2/common/conf/oss/OssEndpoint.java b/src/main/java/com/fc/v2/common/conf/oss/OssEndpoint.java index 2f76660..31eb565 100644 --- a/src/main/java/com/fc/v2/common/conf/oss/OssEndpoint.java +++ b/src/main/java/com/fc/v2/common/conf/oss/OssEndpoint.java @@ -6,15 +6,16 @@ import com.amazonaws.services.s3.model.PutObjectResult; import com.amazonaws.services.s3.model.S3Object; import com.amazonaws.services.s3.model.S3ObjectSummary; import com.fc.v2.common.domain.AjaxResult; -import com.fc.v2.model.auto.SysFile; +import com.fc.v2.model.auto.TSysFile; import com.fc.v2.model.auto.TsysUser; -import com.fc.v2.service.SysFileService; +import com.fc.v2.service.ITSysFileService; import com.fc.v2.shiro.util.ShiroUtils; import com.fc.v2.util.SnowflakeIdWorker; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; + import java.util.Date; import java.util.HashMap; import java.util.List; @@ -22,236 +23,244 @@ import java.util.Map; /** * aws 对外提供服务端点 - * @ClassName: OssEndpoint + * * @author fuce + * @ClassName: OssEndpoint * @date 2021-02-28 20:01 */ @RestController @RequestMapping("/oss") public class OssEndpoint { - private final OssTemplate template; - - @Autowired - public SysFileService sysFileService; + private final OssTemplate template; - public OssEndpoint(OssTemplate ossTemplate) { - this.template=ossTemplate; - } + @Autowired + public ITSysFileService sysFileService; + public OssEndpoint(OssTemplate ossTemplate) { + this.template = ossTemplate; + } - /** - * 创建桶 - * @param bucketName - * @return - */ - @PostMapping("/bucket/{bucketName}") - public Bucket createBucker(@PathVariable String bucketName) { - template.createBucket(bucketName); - return template.getBucket(bucketName).get(); + /** + * 创建桶 + * + * @param bucketName + * @return + */ + @PostMapping("/bucket/{bucketName}") + public Bucket createBucker(@PathVariable String bucketName) { - } + template.createBucket(bucketName); + return template.getBucket(bucketName).get(); - /** - * 获取所有桶 - * @return - */ - @GetMapping("/bucket") - public List getBuckets() { - return template.getAllBuckets(); - } + } + /** + * 获取所有桶 + * + * @return + */ + @GetMapping("/bucket") + public List getBuckets() { + return template.getAllBuckets(); + } - /** - * 获取桶 - * @param bucketName 桶名 - * @return - */ - @GetMapping("/bucket/{bucketName}") - public Bucket getBucket(@PathVariable String bucketName) { - return template.getBucket(bucketName).orElseThrow(() -> new IllegalArgumentException("Bucket Name not found!")); - } - /** - * 删除桶 - * @param bucketName 桶名 - */ - @DeleteMapping("/bucket/{bucketName}") - @ResponseStatus(HttpStatus.ACCEPTED) - public void deleteBucket(@PathVariable String bucketName) { - template.removeBucket(bucketName); - } + /** + * 获取桶 + * + * @param bucketName 桶名 + * @return + */ + @GetMapping("/bucket/{bucketName}") + public Bucket getBucket(@PathVariable String bucketName) { + return template.getBucket(bucketName).orElseThrow(() -> new IllegalArgumentException("Bucket Name not found!")); + } - /** - * 上传文件 - * @param object 文件流对象 - * @param bucketName 桶名 - * @return - * @throws Exception - */ - @PostMapping("/object/{bucketName}") - public AjaxResult createObject(@RequestBody MultipartFile object, @PathVariable String bucketName) throws Exception { - String fileName = object.getOriginalFilename(); - String suffixName = fileName.substring(fileName.lastIndexOf(".")).toLowerCase(); - String uuid=SnowflakeIdWorker.getUUID(); - String fileSuffixName=uuid+suffixName; - PutObjectResult putObjectResult=template.putObject(bucketName, fileSuffixName, object.getInputStream(), object.getSize(), object.getContentType()); - if(putObjectResult!=null){ - TsysUser tsysUser=ShiroUtils.getUser(); - SysFile sysFile=null; - if(tsysUser!=null) { - sysFile=new SysFile(uuid, fileSuffixName, bucketName, object.getSize(), object.getContentType(),ShiroUtils.getUserId(), ShiroUtils.getLoginName(), new Date(),null, null, null); - }else { - sysFile=new SysFile(uuid, fileSuffixName, bucketName, object.getSize(), object.getContentType(),"-", "-", new Date(),null, null, null); - } - int i=sysFileService.insertSelective(sysFile); - if(i>0){ - return AjaxResult.successData(200,template.getObjectInfo(bucketName, fileSuffixName)); - } - } - return AjaxResult.error("上传失败"); - } + /** + * 删除桶 + * + * @param bucketName 桶名 + */ + @DeleteMapping("/bucket/{bucketName}") + @ResponseStatus(HttpStatus.ACCEPTED) + public void deleteBucket(@PathVariable String bucketName) { + template.removeBucket(bucketName); + } + /** + * 上传文件 + * + * @param object 文件流对象 + * @param bucketName 桶名 + * @return + * @throws Exception + */ + @PostMapping("/object/{bucketName}") + public AjaxResult createObject(@RequestBody MultipartFile object, @PathVariable String bucketName) throws Exception { + String fileName = object.getOriginalFilename(); + String suffixName = fileName.substring(fileName.lastIndexOf(".")).toLowerCase(); + String uuid = SnowflakeIdWorker.getUUID(); + String fileSuffixName = uuid + suffixName; + PutObjectResult putObjectResult = template.putObject(bucketName, fileSuffixName, object.getInputStream(), object.getSize(), object.getContentType()); + if (putObjectResult != null) { + TsysUser tsysUser = ShiroUtils.getUser(); + TSysFile sysFile = null; + if (tsysUser != null) { + sysFile = new TSysFile(fileSuffixName, bucketName, object.getSize(), object.getContentType()); + } else { + sysFile = new TSysFile(fileSuffixName, bucketName, object.getSize(), object.getContentType()); + } + int i = sysFileService.insertTSysFile(sysFile); + if (i > 0) { + return AjaxResult.successData(200, template.getObjectInfo(bucketName, fileSuffixName)); + } + } + return AjaxResult.error("上传失败"); + } + /** + * 上传文件 + * + * @param object 上传对象 + * @param bucketName 桶名 + * @param objectName 对象名字 + * @return + * @throws Exception + */ + @PostMapping("/object/{bucketName}/{objectName}") + public S3Object createObject(@RequestBody MultipartFile object, @PathVariable String bucketName, + @PathVariable String objectName) throws Exception { + template.putObject(bucketName, objectName, object.getInputStream(), object.getSize(), object.getContentType()); + return template.getObjectInfo(bucketName, objectName); - /** - * 上传文件 - * @param object 上传对象 - * @param bucketName 桶名 - * @param objectName 对象名字 - * @return - * @throws Exception - */ - @PostMapping("/object/{bucketName}/{objectName}") - public S3Object createObject(@RequestBody MultipartFile object, @PathVariable String bucketName, - @PathVariable String objectName) throws Exception{ - template.putObject(bucketName, objectName, object.getInputStream(), object.getSize(), object.getContentType()); - return template.getObjectInfo(bucketName, objectName); + } - } + /** + * 根据文件前置查询文件 + * + * @param bucketName + * @param objectName + * @return + */ + @GetMapping("/object/{bucketName}/{objectName}") + public List filterObject(@PathVariable String bucketName, @PathVariable String objectName) { - /** - * 根据文件前置查询文件 - * @param bucketName - * @param objectName - * @return - */ - @GetMapping("/object/{bucketName}/{objectName}") - public List filterObject(@PathVariable String bucketName, @PathVariable String objectName) { + return template.getAllObjectsByPrefix(bucketName, objectName, true); - return template.getAllObjectsByPrefix(bucketName, objectName, true); + } - } + /** + * 获取文件外链 + * + * @param bucketName 桶名 + * @param objectName 对象名字 + * @param expires 时间 + * @return + */ + @GetMapping("/object/{bucketName}/{objectName}/{expires}") + public Map getObject(@PathVariable String bucketName, @PathVariable String objectName, + @PathVariable Integer expires) { + Map responseBody = new HashMap<>(8); + // Put Object info + responseBody.put("bucket" , bucketName); + responseBody.put("object" , objectName); + responseBody.put("url" , template.getObjectURL(bucketName, objectName, expires)); + responseBody.put("expires" , expires); + return responseBody; + } - /** - * 获取文件外链 - * @param bucketName 桶名 - * @param objectName 对象名字 - * @param expires 时间 - * @return - */ - @GetMapping("/object/{bucketName}/{objectName}/{expires}") - public Map getObject(@PathVariable String bucketName, @PathVariable String objectName, - @PathVariable Integer expires) { - Map responseBody = new HashMap<>(8); - // Put Object info - responseBody.put("bucket", bucketName); - responseBody.put("object", objectName); - responseBody.put("url", template.getObjectURL(bucketName, objectName, expires)); - responseBody.put("expires", expires); - return responseBody; - } + /** + * 删除文件 + * + * @param bucketName 桶名 + * @param objectName 对象名 + */ + @ResponseStatus(HttpStatus.ACCEPTED) + @DeleteMapping("/object/{bucketName}/{objectName}/") + public void deleteObject(@PathVariable String bucketName, @PathVariable String objectName) { - /** - * 删除文件 - * @param bucketName 桶名 - * @param objectName 对象名 - */ - @ResponseStatus(HttpStatus.ACCEPTED) - @DeleteMapping("/object/{bucketName}/{objectName}/") - public void deleteObject(@PathVariable String bucketName, @PathVariable String objectName) { + try { + template.removeObject(bucketName, objectName); + } catch (Exception e) { + e.printStackTrace(); + } + } - try { - template.removeObject(bucketName, objectName); - } catch (Exception e) { - e.printStackTrace(); - } - } + /** + * 修改文件 + * + * @param object 文件流对象 + * @param bucketName 桶名 + * @return + * @throws Exception + */ + @PostMapping("/edit/{id}/{bucketName}") + public AjaxResult createObject(@PathVariable("id") Long id, @RequestBody MultipartFile object, @PathVariable("bucketName") String bucketName) throws Exception { + TSysFile oldSysFile = sysFileService.selectTSysFileById(id); + if (oldSysFile != null) { + String fileName = object.getOriginalFilename(); + String suffixName = fileName.substring(fileName.lastIndexOf(".")).toLowerCase(); + String uuid = SnowflakeIdWorker.getUUID(); + String fileSuffixName = uuid + suffixName; + PutObjectResult putObjectResult = template.putObject(bucketName, fileSuffixName, object.getInputStream(), object.getSize(), object.getContentType()); + if (putObjectResult != null) { + oldSysFile.setFileSize(object.getSize()); + oldSysFile.setUpdateTime(new Date()); + oldSysFile.setFileName(fileSuffixName); + oldSysFile.setBucketName(bucketName); + oldSysFile.setFileSuffix(object.getContentType()); + int i = sysFileService.updateTSysFile(oldSysFile); + if (i > 0) { + return AjaxResult.successData(200, template.getObjectInfo(bucketName, fileSuffixName)); + } + } + } + return AjaxResult.error("修改失败"); + } - /** - * 修改文件 - * @param object 文件流对象 - * @param bucketName 桶名 - * @return - * @throws Exception - */ - @PostMapping("/edit/{id}/{bucketName}") - public AjaxResult createObject(@PathVariable("id") String id,@RequestBody MultipartFile object, @PathVariable("bucketName") String bucketName) throws Exception { - SysFile oldSysFile=sysFileService.selectByPrimaryKey(id); - if(oldSysFile!=null){ - String fileName = object.getOriginalFilename(); - String suffixName = fileName.substring(fileName.lastIndexOf(".")).toLowerCase(); - String uuid=SnowflakeIdWorker.getUUID(); - String fileSuffixName=uuid+suffixName; - PutObjectResult putObjectResult=template.putObject(bucketName, fileSuffixName, object.getInputStream(), object.getSize(), object.getContentType()); - if(putObjectResult!=null){ - oldSysFile.setFileSize(object.getSize()); - oldSysFile.setUpdateUserId(ShiroUtils.getUserId()); - oldSysFile.setUpdateUserName(ShiroUtils.getLoginName()); - oldSysFile.setUpdateTime(new Date()); - oldSysFile.setFileName(fileSuffixName); - oldSysFile.setBucketName(bucketName); - oldSysFile.setFileSuffix(object.getContentType()); - int i=sysFileService.updateByPrimaryKeySelective(oldSysFile); - if(i>0){ - return AjaxResult.successData(200,template.getObjectInfo(bucketName, fileSuffixName)); - } - } - } - return AjaxResult.error("修改失败"); - } - - /** - * 富文本上传文件 - * @param object 文件流对象 - * @param bucketName 桶名 - * @return - * @throws Exception - */ - @PostMapping("/createObjectLayedit/{bucketName}") - public Object createObjectLayedit(@RequestBody MultipartFile file, @PathVariable String bucketName) throws Exception { - Map retmap=new HashMap(); - Map retdatamap=new HashMap(); - String fileName = file.getOriginalFilename(); - String suffixName = fileName.substring(fileName.lastIndexOf(".")).toLowerCase(); - String uuid=SnowflakeIdWorker.getUUID(); - String fileSuffixName=uuid+suffixName; - PutObjectResult putObjectResult=template.putObject(bucketName, fileSuffixName, file.getInputStream(), file.getSize(), file.getContentType()); - if(putObjectResult!=null){ - TsysUser tsysUser=ShiroUtils.getUser(); - SysFile sysFile=null; - if(tsysUser!=null) { - sysFile=new SysFile(uuid, fileSuffixName, bucketName, file.getSize(), file.getContentType(),ShiroUtils.getUserId(), ShiroUtils.getLoginName(), new Date(),null, null, null); - }else { - sysFile=new SysFile(uuid, fileSuffixName, bucketName, file.getSize(), file.getContentType(),"-", "-", new Date(),null, null, null); - } - int i=sysFileService.insertSelective(sysFile); - if(i>0){ - retmap.put("code",0); - retmap.put("msg","上传成功!"); - String bucketURL=template.getOssProperties().getEndpoint()+"/"+template.getOssProperties().getBucketName()+"/"; - retdatamap.put("src",bucketURL+template.getObjectInfo(bucketName, fileSuffixName).getKey()); - retmap.put("data",retdatamap); - return retmap; - } - } - retmap.put("code",500); - retmap.put("msg","上传失败!"); - return retmap; - } + /** + * 富文本上传文件 + * + * @param file 文件流对象 + * @param bucketName 桶名 + * @return + * @throws Exception + */ + @PostMapping("/createObjectLayedit/{bucketName}") + public Object createObjectLayedit(@RequestBody MultipartFile file, @PathVariable String bucketName) throws Exception { + Map retmap = new HashMap(); + Map retdatamap = new HashMap(); + String fileName = file.getOriginalFilename(); + String suffixName = fileName.substring(fileName.lastIndexOf(".")).toLowerCase(); + String uuid = SnowflakeIdWorker.getUUID(); + String fileSuffixName = uuid + suffixName; + PutObjectResult putObjectResult = template.putObject(bucketName, fileSuffixName, file.getInputStream(), file.getSize(), file.getContentType()); + if (putObjectResult != null) { + TsysUser tsysUser = ShiroUtils.getUser(); + TSysFile sysFile = null; + if (tsysUser != null) { + sysFile = new TSysFile(fileSuffixName, bucketName, file.getSize(), file.getContentType()); + } else { + sysFile = new TSysFile(fileSuffixName, bucketName, file.getSize(), file.getContentType()); + } + int i = sysFileService.insertTSysFile(sysFile); + if (i > 0) { + retmap.put("code" , 0); + retmap.put("msg" , "上传成功!"); + String bucketURL = template.getOssProperties().getEndpoint() + "/" + template.getOssProperties().getBucketName() + "/"; + retdatamap.put("src" , bucketURL + template.getObjectInfo(bucketName, fileSuffixName).getKey()); + retmap.put("data" , retdatamap); + return retmap; + } + } + retmap.put("code" , 500); + retmap.put("msg" , "上传失败!"); + return retmap; + } } diff --git a/src/main/java/com/fc/v2/common/log/LogAspect.java b/src/main/java/com/fc/v2/common/log/LogAspect.java index 43650d6..3c006ec 100644 --- a/src/main/java/com/fc/v2/common/log/LogAspect.java +++ b/src/main/java/com/fc/v2/common/log/LogAspect.java @@ -1,8 +1,8 @@ package com.fc.v2.common.log; -import com.fc.v2.model.auto.TsysOperLog; +import com.fc.v2.model.auto.TSysOperLog; import com.fc.v2.model.auto.TsysUser; -import com.fc.v2.service.SysOperLogService; +import com.fc.v2.service.ITSysOperLogService; import com.fc.v2.shiro.util.ShiroUtils; import com.fc.v2.util.ServletUtils; import com.fc.v2.util.StringUtils; @@ -38,7 +38,7 @@ public class LogAspect private static final Logger log = LoggerFactory.getLogger(LogAspect.class); @Autowired - private SysOperLogService operLogService; + private ITSysOperLogService operLogService; // 配置织入点 @Pointcut("@annotation(com.fc.v2.common.log.Log)") @@ -85,7 +85,7 @@ public class LogAspect TsysUser currentUser = ShiroUtils.getUser(); // *========数据库日志=========*// - TsysOperLog operLog = new TsysOperLog(); + TSysOperLog operLog = new TSysOperLog(); //赋值操作 /*String ip = ShiroUtils.getIp(); @@ -121,7 +121,7 @@ public class LogAspect //System.out.println("-----------------"); //System.out.println(new Gson().toJson(operLog)); //System.out.println("-----------------"); - operLogService.insertSelective(operLog); + operLogService.insertTSysOperLog(operLog); } catch (Exception exp) { @@ -139,7 +139,7 @@ public class LogAspect * @return 方法描述 * @throws Exception */ - public void getControllerMethodDescription(Log log, TsysOperLog operLog) throws Exception + public void getControllerMethodDescription(Log log, TSysOperLog operLog) throws Exception { // 设置action动作 // operLog.setAction(log.action()); @@ -161,7 +161,7 @@ public class LogAspect * @param operLog * @param request */ - private void setRequestValue(TsysOperLog operLog) + private void setRequestValue(TSysOperLog operLog) { Map map = ServletUtils.getRequest().getParameterMap(); Gson gson=new Gson(); diff --git a/src/main/java/com/fc/v2/common/quartz/AbstractQuartzJob.java b/src/main/java/com/fc/v2/common/quartz/AbstractQuartzJob.java index 66432d0..93c22b7 100644 --- a/src/main/java/com/fc/v2/common/quartz/AbstractQuartzJob.java +++ b/src/main/java/com/fc/v2/common/quartz/AbstractQuartzJob.java @@ -3,9 +3,9 @@ package com.fc.v2.common.quartz; import cn.hutool.core.exceptions.ExceptionUtil; import com.fc.v2.common.spring.SpringUtils; -import com.fc.v2.model.auto.SysQuartzJob; -import com.fc.v2.model.auto.SysQuartzJobLog; -import com.fc.v2.service.SysQuartzJobLogService; +import com.fc.v2.model.auto.TSysQuartzJob; +import com.fc.v2.model.auto.TSysQuartzJobLog; +import com.fc.v2.service.ITSysQuartzJobLogService; import com.fc.v2.util.StringUtils; import org.quartz.Job; @@ -35,7 +35,7 @@ public abstract class AbstractQuartzJob implements Job { @Override public void execute(JobExecutionContext context) throws JobExecutionException { - SysQuartzJob sysJob = new SysQuartzJob(); + TSysQuartzJob sysJob = new TSysQuartzJob(); BeanUtils.copyProperties(context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES),sysJob); try { @@ -59,7 +59,7 @@ public abstract class AbstractQuartzJob implements Job { * @param context 工作执行上下文对象 * @param sysJob 系统计划任务 */ - protected void before(JobExecutionContext context, SysQuartzJob sysJob) + protected void before(JobExecutionContext context, TSysQuartzJob sysJob) { threadLocal.set(new Date()); } @@ -70,12 +70,12 @@ public abstract class AbstractQuartzJob implements Job { * @param context 工作执行上下文对象 * @param sysJob 系统计划任务 */ - protected void after(JobExecutionContext context, SysQuartzJob sysJob, Exception e) + protected void after(JobExecutionContext context, TSysQuartzJob sysJob, Exception e) { Date startTime = threadLocal.get(); threadLocal.remove(); - final SysQuartzJobLog sysJobLog = new SysQuartzJobLog(); + final TSysQuartzJobLog sysJobLog = new TSysQuartzJobLog(); sysJobLog.setJobName(sysJob.getJobName()); sysJobLog.setJobGroup(sysJob.getJobGroup()); sysJobLog.setInvokeTarget(sysJob.getInvokeTarget()); @@ -94,7 +94,7 @@ public abstract class AbstractQuartzJob implements Job { sysJobLog.setStatus(ScheduleConstants.SUCCESS_STATUS); } // 这里获取service然后插入库中 - SpringUtils.getBean(SysQuartzJobLogService.class).insertSelective(sysJobLog); + SpringUtils.getBean(ITSysQuartzJobLogService.class).insertTSysQuartzJobLog(sysJobLog); } /** @@ -102,5 +102,5 @@ public abstract class AbstractQuartzJob implements Job { * @param jobExecutionContext * @param sysJob */ - protected abstract void doExecute(JobExecutionContext jobExecutionContext, SysQuartzJob sysJob) throws Exception; + protected abstract void doExecute(JobExecutionContext jobExecutionContext, TSysQuartzJob sysJob) throws Exception; } diff --git a/src/main/java/com/fc/v2/common/quartz/QuartzDisallowConcurrentExecution.java b/src/main/java/com/fc/v2/common/quartz/QuartzDisallowConcurrentExecution.java index 72c484d..529eb08 100644 --- a/src/main/java/com/fc/v2/common/quartz/QuartzDisallowConcurrentExecution.java +++ b/src/main/java/com/fc/v2/common/quartz/QuartzDisallowConcurrentExecution.java @@ -1,7 +1,7 @@ package com.fc.v2.common.quartz; import com.fc.v2.common.quartz.utils.JobInvokeUtil; -import com.fc.v2.model.auto.SysQuartzJob; +import com.fc.v2.model.auto.TSysQuartzJob; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; @@ -16,7 +16,7 @@ import org.quartz.JobExecutionContext; public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob { @Override - protected void doExecute(JobExecutionContext context, SysQuartzJob sysJob) throws Exception + protected void doExecute(JobExecutionContext context, TSysQuartzJob sysJob) throws Exception { JobInvokeUtil.invokeMethod(sysJob); } diff --git a/src/main/java/com/fc/v2/common/quartz/QuartzJobExecution.java b/src/main/java/com/fc/v2/common/quartz/QuartzJobExecution.java index aa2425f..61fa683 100644 --- a/src/main/java/com/fc/v2/common/quartz/QuartzJobExecution.java +++ b/src/main/java/com/fc/v2/common/quartz/QuartzJobExecution.java @@ -1,7 +1,7 @@ package com.fc.v2.common.quartz; import com.fc.v2.common.quartz.utils.JobInvokeUtil; -import com.fc.v2.model.auto.SysQuartzJob; +import com.fc.v2.model.auto.TSysQuartzJob; import org.quartz.JobExecutionContext; @@ -14,7 +14,7 @@ import org.quartz.JobExecutionContext; public class QuartzJobExecution extends AbstractQuartzJob { @Override - protected void doExecute(JobExecutionContext context, SysQuartzJob sysJob) throws Exception { + protected void doExecute(JobExecutionContext context, TSysQuartzJob sysJob) throws Exception { JobInvokeUtil.invokeMethod(sysJob); } diff --git a/src/main/java/com/fc/v2/common/quartz/QuartzSchedulerUtil.java b/src/main/java/com/fc/v2/common/quartz/QuartzSchedulerUtil.java index f9ffa72..f08b8b0 100644 --- a/src/main/java/com/fc/v2/common/quartz/QuartzSchedulerUtil.java +++ b/src/main/java/com/fc/v2/common/quartz/QuartzSchedulerUtil.java @@ -1,8 +1,8 @@ package com.fc.v2.common.quartz; -import com.fc.v2.model.auto.SysQuartzJob; -import com.fc.v2.model.auto.SysQuartzJobExample; -import com.fc.v2.service.SysQuartzJobService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.fc.v2.model.auto.TSysQuartzJob; +import com.fc.v2.service.ITSysQuartzJobService; import com.fc.v2.util.StringUtils; import org.quartz.*; import org.quartz.impl.JobDetailImpl; @@ -16,7 +16,7 @@ import java.util.Set; /** * @CLASSNAME QuartzConfig - * @Description Quartz配置类 + * @Description Quartz配置类 * @Auther Jan 橙寂 * @DATE 2019/9/2 0002 15:21 */ @@ -24,13 +24,13 @@ import java.util.Set; public class QuartzSchedulerUtil { @Autowired - private Scheduler scheduler; + private Scheduler scheduler; @Autowired - private SysQuartzJobService sysQuartzJobService; + private ITSysQuartzJobService sysQuartzJobService; //这个东西可以放在配置文件中 //cron表达式 一分钟执行一次 - private final String TEST_CRON="0 0/1 * * * ?"; + private final String TEST_CRON = "0 0/1 * * * ?"; /** * 容器初始化时执行此方法 @@ -38,20 +38,19 @@ public class QuartzSchedulerUtil { */ @PostConstruct public void init() throws SchedulerException { - - List quartzJobs=sysQuartzJobService.selectByExample(new SysQuartzJobExample()); - for (SysQuartzJob job : quartzJobs) { - try { + + List quartzJobs = sysQuartzJobService.selectTSysQuartzJobList(new QueryWrapper()); + for (TSysQuartzJob job : quartzJobs) { + try { //防止因为数据问题重复创建 - if(checkJobExists(job)) - { + if (checkJobExists(job)) { deleteJob(job); } createSchedule(job); - } catch (SchedulerException e) { - e.printStackTrace(); - } - } + } catch (SchedulerException e) { + e.printStackTrace(); + } + } //这一块可以从数据库中查 // for (int i=1;i<=1;i++) // { @@ -85,89 +84,87 @@ public class QuartzSchedulerUtil { /** * 启动定时器 */ - public void start() -{ - try { - scheduler.start(); - } catch (SchedulerException e) { - e.printStackTrace(); - System.out.println("定时任务执行失败"); + public void start() { + try { + scheduler.start(); + } catch (SchedulerException e) { + e.printStackTrace(); + System.out.println("定时任务执行失败"); + } } -} /** * 创建一个定时任务 + * * @param job * @throws SchedulerException */ - private void createSchedule(SysQuartzJob job) throws SchedulerException { + private void createSchedule(TSysQuartzJob job) throws SchedulerException { if (!checkJobExists(job)) { //获取指定的job工作类 Class jobClass = getQuartzJobClass(job); // 通过JobBuilder构建JobDetail实例，JobDetail规定只能是实现Job接口的实例 // JobDetail 是具体Job实例 - JobDetail jobDetail = JobBuilder.newJob((Class) jobClass).withIdentity(ScheduleConstants.TASK_CLASS_NAME+job.getId(),job.getJobGroup()).build(); + JobDetail jobDetail = JobBuilder.newJob((Class) jobClass).withIdentity(ScheduleConstants.TASK_CLASS_NAME + job.getId(), job.getJobGroup()).build(); // 基于表达式构建触发器 - CronScheduleBuilder cronScheduleBuilder =null; - if(StringUtils.isNotEmpty(job.getCronExpression())) { - cronScheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression()); - }else { - cronScheduleBuilder = CronScheduleBuilder.cronSchedule(TEST_CRON); + CronScheduleBuilder cronScheduleBuilder = null; + if (StringUtils.isNotEmpty(job.getCronExpression())) { + cronScheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression()); + } else { + cronScheduleBuilder = CronScheduleBuilder.cronSchedule(TEST_CRON); } - + // CronTrigger表达式触发器 继承于Trigger //cronScheduleBuilder.withMisfireHandlingInstructionDoNothing()错过60分钟后不在补偿 拉下的执行次数 // TriggerBuilder 用于构建触发器实例 - CronTrigger cronTrigger = TriggerBuilder.newTrigger().withIdentity(ScheduleConstants.TASK_CLASS_NAME+job.getId(),job.getJobGroup()) - .withSchedule(cronScheduleBuilder.withMisfireHandlingInstructionDoNothing()).build(); + CronTrigger cronTrigger = TriggerBuilder.newTrigger().withIdentity(ScheduleConstants.TASK_CLASS_NAME + job.getId(), job.getJobGroup()) + .withSchedule(cronScheduleBuilder.withMisfireHandlingInstructionDoNothing()).build(); //放入参数，运行时的方法可以获取 jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job); scheduler.scheduleJob(jobDetail, cronTrigger); - + //如果这个工作的状态为1 - if (job.getStatus().equals(1)) - { + if (job.getStatus().equals(1)) { pauseJob(job); } } } - - /** * 修改定时任务 + * * @param job * @return * @throws SchedulerException */ - public boolean modifyJob(SysQuartzJob job) { + public boolean modifyJob(TSysQuartzJob job) { try { //先删除 - if(checkJobExists(job)) - { + if (checkJobExists(job)) { deleteJob(job); } createSchedule(job); } catch (SchedulerException e) { e.printStackTrace(); - return false; + return false; } - return true; + return true; } /** - * 继续执行定时任务 + * 继续执行定时任务 + * * @param job * @return */ - public boolean resumeJob(SysQuartzJob job) { + public boolean resumeJob(TSysQuartzJob job) { boolean bl = false; try { //JobKey定义了job的名称和组别 - JobKey jobKey = JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME+job.getId(), job.getJobGroup()); + JobKey jobKey = JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + job.getId(), job.getJobGroup()); if (jobKey != null) { //继续任务 scheduler.resumeJob(jobKey); @@ -182,15 +179,16 @@ public class QuartzSchedulerUtil { } /** - * 删除定时任务 + * 删除定时任务 + * * @param job * @return */ - public boolean deleteJob(SysQuartzJob job) { + public boolean deleteJob(TSysQuartzJob job) { boolean bl = false; try { //JobKey定义了job的名称和组别 - JobKey jobKey = JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME+job.getId(), job.getJobGroup()); + JobKey jobKey = JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + job.getId(), job.getJobGroup()); if (jobKey != null) { //删除定时任务 scheduler.deleteJob(jobKey); @@ -203,91 +201,92 @@ public class QuartzSchedulerUtil { } return bl; } - + /** * 获取jobKey */ - public JobKey getJobKey(SysQuartzJob job) - { - return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + job.getId(),job.getJobGroup()); + public JobKey getJobKey(TSysQuartzJob job) { + return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + job.getId(), job.getJobGroup()); } - + /** * 立即执行任务 */ - public void run(SysQuartzJob job) throws SchedulerException - { + public void run(TSysQuartzJob job) throws SchedulerException { // 参数 JobDataMap dataMap = new JobDataMap(); dataMap.put(ScheduleConstants.TASK_PROPERTIES, job); scheduler.triggerJob(getJobKey(job), dataMap); } + /** * 暂停任务 + * * @param job * @return */ - public boolean pauseJob(SysQuartzJob job) { + public boolean pauseJob(TSysQuartzJob job) { boolean bl = false; try { //JobKey定义了job的名称和组别 - JobKey jobKey = JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME+job.getId(), job.getJobGroup()); + JobKey jobKey = JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + job.getId(), job.getJobGroup()); //暂停任务 if (jobKey != null) { scheduler.pauseJob(jobKey); bl = true; } } catch (SchedulerException e) { - System.out.println("暂停调度任务异常:" + e); + System.out.println("暂停调度任务异常:" + e); } catch (Exception e) { - System.out.println("暂停调度任务异常:"+ e); + System.out.println("暂停调度任务异常:" + e); } return bl; } /** * 判断定时任务是否已经存在 + * * @param job * @return * @throws SchedulerException */ - public boolean checkJobExists(SysQuartzJob job) throws SchedulerException { - TriggerKey triggerKey = TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME+job.getId(), job.getJobGroup()); + public boolean checkJobExists(TSysQuartzJob job) throws SchedulerException { + TriggerKey triggerKey = TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + job.getId(), job.getJobGroup()); return scheduler.checkExists(triggerKey); } /** * 获取定时任务的具体执行类 + * * @param sysJob * @return */ - private static Class getQuartzJobClass(SysQuartzJob sysJob) - { + private static Class getQuartzJobClass(TSysQuartzJob sysJob) { boolean isConcurrent = "0".equals(sysJob.getConcurrent()); return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class; } - - - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void getquartzList() throws SchedulerException { + + + @SuppressWarnings({"unchecked" , "rawtypes"}) + public void getquartzList() throws SchedulerException { List triggerGroupNames = scheduler.getTriggerGroupNames(); for (String groupName : triggerGroupNames) { - //组装group的匹配，为了模糊获取所有的triggerKey或者jobKey - GroupMatcher groupMatcher = GroupMatcher.groupEquals(groupName); - //获取所有的triggerKey - Set triggerKeySet = scheduler.getTriggerKeys(groupMatcher); - for (TriggerKey triggerKey : triggerKeySet) { - //通过triggerKey在scheduler中获取trigger对象 - CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey); - //获取trigger拥有的Job - JobKey jobKey =trigger.getJobKey(); - JobDetailImpl jobDetail2 = (JobDetailImpl) scheduler.getJobDetail(jobKey); - System.out.println(groupName); - System.out.println(jobDetail2.getName()); - System.out.println(trigger.getCronExpression()); - } + //组装group的匹配，为了模糊获取所有的triggerKey或者jobKey + GroupMatcher groupMatcher = GroupMatcher.groupEquals(groupName); + //获取所有的triggerKey + Set triggerKeySet = scheduler.getTriggerKeys(groupMatcher); + for (TriggerKey triggerKey : triggerKeySet) { + //通过triggerKey在scheduler中获取trigger对象 + CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey); + //获取trigger拥有的Job + JobKey jobKey = trigger.getJobKey(); + JobDetailImpl jobDetail2 = (JobDetailImpl) scheduler.getJobDetail(jobKey); + System.out.println(groupName); + System.out.println(jobDetail2.getName()); + System.out.println(trigger.getCronExpression()); + } } } } diff --git a/src/main/java/com/fc/v2/common/quartz/utils/JobInvokeUtil.java b/src/main/java/com/fc/v2/common/quartz/utils/JobInvokeUtil.java index 98646c0..fbd2d65 100644 --- a/src/main/java/com/fc/v2/common/quartz/utils/JobInvokeUtil.java +++ b/src/main/java/com/fc/v2/common/quartz/utils/JobInvokeUtil.java @@ -1,7 +1,7 @@ package com.fc.v2.common.quartz.utils; import com.fc.v2.common.spring.SpringUtils; -import com.fc.v2.model.auto.SysQuartzJob; +import com.fc.v2.model.auto.TSysQuartzJob; import com.fc.v2.util.StringUtils; import java.lang.reflect.InvocationTargetException; @@ -21,7 +21,7 @@ public class JobInvokeUtil * * @param sysJob 系统任务 */ - public static void invokeMethod(SysQuartzJob sysJob) throws Exception + public static void invokeMethod(TSysQuartzJob sysJob) throws Exception { String invokeTarget = sysJob.getInvokeTarget(); String beanName = getBeanName(invokeTarget); diff --git a/src/main/java/com/fc/v2/controller/AdminController.java b/src/main/java/com/fc/v2/controller/AdminController.java index 38b902f..b51269f 100644 --- a/src/main/java/com/fc/v2/controller/AdminController.java +++ b/src/main/java/com/fc/v2/controller/AdminController.java @@ -2,7 +2,7 @@ package com.fc.v2.controller; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; -import com.fc.v2.model.auto.SysNotice; +import com.fc.v2.model.auto.TSysNotice; import com.fc.v2.model.auto.TsysUser; import com.fc.v2.model.custom.SysMenu; import com.fc.v2.shiro.util.ShiroUtils; @@ -22,284 +22,281 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.mvc.support.RedirectAttributes; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; /** * 后台方法 - * - * @ClassName: HomeController + * * @author fuce + * @ClassName: HomeController * @date 2019-10-21 00:10 - * */ @Controller @RequestMapping("/admin") public class AdminController extends BaseController { - private static Logger logger = LoggerFactory.getLogger(AdminController.class); - - private String prefix = "admin"; + private static Logger logger = LoggerFactory.getLogger(AdminController.class); - @ApiOperation(value = "首页", notes = "首页") - @GetMapping({"", "/index"}) - public String index(HttpServletRequest request) { - request.getSession().setAttribute("sessionUserName", ShiroUtils.getUser().getNickname()); - // 获取公告信息 - List notices = sysNoticeService.getuserNoticeNotRead(ShiroUtils.getUser(), 0); - request.getSession().setAttribute("notices", notices); - return prefix + "/index"; - } + private String prefix = "admin"; + @ApiOperation(value = "首页" , notes = "首页") + @GetMapping({"" , "/index"}) + public String index(HttpServletRequest request) { + request.getSession().setAttribute("sessionUserName" , ShiroUtils.getUser().getNickname()); + // 获取公告信息 + List notices = sysNoticeService.getuserNoticeNotRead(ShiroUtils.getUser(), 0); + request.getSession().setAttribute("notices" , notices); + return prefix + "/index"; + } + @ApiOperation(value = "获取登录用户菜单栏" , notes = "获取登录用户菜单栏") + @GetMapping("/getUserMenu") + @ResponseBody + public List getUserMenu() { + List sysMenus = sysPermissionService.getSysMenus(ShiroUtils.getUserId()); + return sysMenus; + } - @ApiOperation(value = "获取登录用户菜单栏", notes = "获取登录用户菜单栏") - @GetMapping("/getUserMenu") - @ResponseBody - public List getUserMenu(){ - List sysMenus=sysPermissionService.getSysMenus(ShiroUtils.getUserId()); - return sysMenus; - } + /** + * 请求到登陆界面 + * + * @param request + * @return + */ + @ApiOperation(value = "请求到登陆界面" , notes = "请求到登陆界面") + @GetMapping("/login") + public String login(ModelMap modelMap) { + try { + if ((null != SecurityUtils.getSubject() && SecurityUtils.getSubject().isAuthenticated()) || SecurityUtils.getSubject().isRemembered()) { + return "redirect:/" + prefix + "/index"; + } else { + System.out.println("--进行登录验证..验证开始"); + modelMap.put("RollVerification" , v2Config.getRollVerification()); + System.out.println("V2Config.getRollVerification()>>>" + v2Config.getRollVerification()); + return "login"; + } + } catch (Exception e) { + e.printStackTrace(); + } + return "login"; + } + /** + * 用户登陆验证 + * + * @param user + * @param rcode + * @param redirectAttributes + * @param rememberMe + * @param model + * @param request + * @return + */ + @ApiOperation(value = "用户登陆验证" , notes = "用户登陆验证") + @PostMapping("/login") + @ResponseBody + public AjaxResult login(TsysUser user, String captcha, RedirectAttributes redirectAttributes, boolean rememberMe, + HttpServletRequest request) { + // ModelAndView view =new ModelAndView(); + Boolean yz = false; + // 获取session中的验证码 + String verCode = (String) request.getSession().getAttribute("captcha"); + // 判断验证码 + if (captcha != null && captcha.toLowerCase().equals(verCode.trim().toLowerCase())) { + //清除验证码 + CaptchaUtil.clear(request); // 清除session中的验证码 + yz = true; + } + // 判断验证码 + if (yz) { + String userName = user.getUsername(); + Subject currentUser = SecurityUtils.getSubject(); + // 是否验证通过 + if (!currentUser.isAuthenticated()) { + UsernamePasswordToken token = new UsernamePasswordToken(userName, user.getPassword()); + try { + if (rememberMe) { + token.setRememberMe(true); + } + // 存入用户 + currentUser.login(token); + if (StringUtils.isNotNull(ShiroUtils.getUser())) { + // 若为前后端分离版本，则可把sessionId返回，作为分离版本的请求头authToken + // String authToken = ShiroUtils.getSessionId(); + // return AjaxResult.successData(200, authToken); + return AjaxResult.success(); + } else { + return AjaxResult.error(500, "未知账户"); + } + } catch (UnknownAccountException uae) { + logger.info("对用户[" + userName + "]进行登录验证..验证未通过,未知账户"); + return AjaxResult.error(500, "未知账户"); + } catch (IncorrectCredentialsException ice) { + logger.info("对用户[" + userName + "]进行登录验证..验证未通过,错误的凭证"); + return AjaxResult.error(500, "用户名或密码不正确"); + } catch (LockedAccountException lae) { + logger.info("对用户[" + userName + "]进行登录验证..验证未通过,账户已锁定"); + return AjaxResult.error(500, "账户已锁定"); + } catch (ExcessiveAttemptsException eae) { + logger.info("对用户[" + userName + "]进行登录验证..验证未通过,错误次数过多"); + return AjaxResult.error(500, "用户名或密码错误次数过多"); + } catch (AuthenticationException ae) { + // 通过处理Shiro的运行时AuthenticationException就可以控制用户登录失败或密码错误时的情景 + logger.info("对用户[" + userName + "]进行登录验证..验证未通过,堆栈轨迹如下"); + ae.printStackTrace(); + return AjaxResult.error(500, "用户名或密码不正确"); + } + } else { + if (StringUtils.isNotNull(ShiroUtils.getUser())) { + // 跳转到 get请求的登陆方法 + // view.setViewName("redirect:/"+prefix+"/index"); + return AjaxResult.success(); + } else { + return AjaxResult.error(500, "未知账户"); + } + } + } else { + return AjaxResult.error(500, "验证码不正确!"); + } - /** - * 请求到登陆界面 - * - * @param request - * @return - */ - @ApiOperation(value = "请求到登陆界面", notes = "请求到登陆界面") - @GetMapping("/login") - public String login(ModelMap modelMap) { - try { - if ((null != SecurityUtils.getSubject() && SecurityUtils.getSubject().isAuthenticated()) || SecurityUtils.getSubject().isRemembered()) { - return "redirect:/" + prefix + "/index"; - } else { - System.out.println("--进行登录验证..验证开始"); - modelMap.put("RollVerification", v2Config.getRollVerification()); - System.out.println("V2Config.getRollVerification()>>>" + v2Config.getRollVerification()); - return "login"; - } - } catch (Exception e) { - e.printStackTrace(); - } - return "login"; - } + } - /** - * 用户登陆验证 - * - * @param user - * @param rcode - * @param redirectAttributes - * @param rememberMe - * @param model - * @param request - * @return - */ - @ApiOperation(value = "用户登陆验证", notes = "用户登陆验证") - @PostMapping("/login") - @ResponseBody - public AjaxResult login(TsysUser user, String captcha, RedirectAttributes redirectAttributes, boolean rememberMe, - HttpServletRequest request) { - // ModelAndView view =new ModelAndView(); - Boolean yz = false; - // 获取session中的验证码 - String verCode = (String) request.getSession().getAttribute("captcha"); - // 判断验证码 - if (captcha!=null && captcha.toLowerCase().equals(verCode.trim().toLowerCase())) { - //清除验证码 - CaptchaUtil.clear(request); // 清除session中的验证码 - yz=true; - } - - // 判断验证码 - if (yz) { - String userName = user.getUsername(); - Subject currentUser = SecurityUtils.getSubject(); - // 是否验证通过 - if (!currentUser.isAuthenticated()) { - UsernamePasswordToken token = new UsernamePasswordToken(userName, user.getPassword()); - try { - if (rememberMe) { - token.setRememberMe(true); - } - // 存入用户 - currentUser.login(token); - if (StringUtils.isNotNull(ShiroUtils.getUser())) { - // 若为前后端分离版本，则可把sessionId返回，作为分离版本的请求头authToken - // String authToken = ShiroUtils.getSessionId(); - // return AjaxResult.successData(200, authToken); - return AjaxResult.success(); - } else { - return AjaxResult.error(500, "未知账户"); - } - } catch (UnknownAccountException uae) { - logger.info("对用户[" + userName + "]进行登录验证..验证未通过,未知账户"); - return AjaxResult.error(500, "未知账户"); - } catch (IncorrectCredentialsException ice) { - logger.info("对用户[" + userName + "]进行登录验证..验证未通过,错误的凭证"); - return AjaxResult.error(500, "用户名或密码不正确"); - } catch (LockedAccountException lae) { - logger.info("对用户[" + userName + "]进行登录验证..验证未通过,账户已锁定"); - return AjaxResult.error(500, "账户已锁定"); - } catch (ExcessiveAttemptsException eae) { - logger.info("对用户[" + userName + "]进行登录验证..验证未通过,错误次数过多"); - return AjaxResult.error(500, "用户名或密码错误次数过多"); - } catch (AuthenticationException ae) { - // 通过处理Shiro的运行时AuthenticationException就可以控制用户登录失败或密码错误时的情景 - logger.info("对用户[" + userName + "]进行登录验证..验证未通过,堆栈轨迹如下"); - ae.printStackTrace(); - return AjaxResult.error(500, "用户名或密码不正确"); - } - } else { - if (StringUtils.isNotNull(ShiroUtils.getUser())) { - // 跳转到 get请求的登陆方法 - // view.setViewName("redirect:/"+prefix+"/index"); - return AjaxResult.success(); - } else { - return AjaxResult.error(500, "未知账户"); - } - } - } else { - return AjaxResult.error(500, "验证码不正确!"); - } - } - - - /** - * 手机登录 - * @param user - * @param redirectAttributes - * @param rememberMe - * @param request - * @return - * @author fuce - * @Date 2020年12月7日 上午12:54:28 - */ - @ApiOperation(value = "手机登录", notes = "手机登录") - @PostMapping("/API/login") - @ResponseBody - public AjaxResult APIlogin(TsysUser user,boolean rememberMe,HttpServletRequest request) { - // ModelAndView view =new ModelAndView(); - Boolean yz = true; + /** + * 手机登录 + * + * @param user + * @param redirectAttributes + * @param rememberMe + * @param request + * @return + * @author fuce + * @Date 2020年12月7日 上午12:54:28 + */ + @ApiOperation(value = "手机登录" , notes = "手机登录") + @PostMapping("/API/login") + @ResponseBody + public AjaxResult APIlogin(TsysUser user, boolean rememberMe, HttpServletRequest request) { + // ModelAndView view =new ModelAndView(); + Boolean yz = true; // if (V2Config.getRollVerification()) {// 滚动验证 // yz = true; // } else {// 图片验证 // String scode = (String) request.getSession().getAttribute(Constants.KAPTCHA_SESSION_KEY); // yz = StringUtils.isNotEmpty(scode) && StringUtils.isNotEmpty(code) && scode.equals(code); // } - System.out.println("/API/login手机请求"); - // 判断验证码 - if (yz) { - String userName = user.getUsername(); - Subject currentUser = SecurityUtils.getSubject(); - // 是否验证通过 - if (!currentUser.isAuthenticated()) { - UsernamePasswordToken token = new UsernamePasswordToken(userName, user.getPassword()); - try { - if (rememberMe) { - token.setRememberMe(true); - } - // 存入用户 - currentUser.login(token); - if (StringUtils.isNotNull(ShiroUtils.getUser())) { - // 若为前后端分离版本，则可把sessionId返回，作为分离版本的请求头authToken - String authToken = ShiroUtils.getSessionId(); - return AjaxResult.successData(200, authToken); - //return AjaxResult.success(); - } else { - return AjaxResult.error(500, "未知账户"); - } - } catch (UnknownAccountException uae) { - logger.info("对用户[" + userName + "]进行登录验证..验证未通过,未知账户"); - return AjaxResult.error(500, "未知账户"); - } catch (IncorrectCredentialsException ice) { - logger.info("对用户[" + userName + "]进行登录验证..验证未通过,错误的凭证"); - return AjaxResult.error(500, "用户名或密码不正确"); - } catch (LockedAccountException lae) { - logger.info("对用户[" + userName + "]进行登录验证..验证未通过,账户已锁定"); - return AjaxResult.error(500, "账户已锁定"); - } catch (ExcessiveAttemptsException eae) { - logger.info("对用户[" + userName + "]进行登录验证..验证未通过,错误次数过多"); - return AjaxResult.error(500, "用户名或密码错误次数过多"); - } catch (AuthenticationException ae) { - // 通过处理Shiro的运行时AuthenticationException就可以控制用户登录失败或密码错误时的情景 - logger.info("对用户[" + userName + "]进行登录验证..验证未通过,堆栈轨迹如下"); - ae.printStackTrace(); - return AjaxResult.error(500, "用户名或密码不正确"); - } - } else { - if (StringUtils.isNotNull(ShiroUtils.getUser())) { - // 跳转到 get请求的登陆方法 - // view.setViewName("redirect:/"+prefix+"/index"); - String authToken = ShiroUtils.getSessionId(); - return AjaxResult.successData(200, authToken); - } else { - return AjaxResult.error(500, "未知账户"); - } - } - } else { - return AjaxResult.error(500, "验证码不正确!"); - } + System.out.println("/API/login手机请求"); + // 判断验证码 + if (yz) { + String userName = user.getUsername(); + Subject currentUser = SecurityUtils.getSubject(); + // 是否验证通过 + if (!currentUser.isAuthenticated()) { + UsernamePasswordToken token = new UsernamePasswordToken(userName, user.getPassword()); + try { + if (rememberMe) { + token.setRememberMe(true); + } + // 存入用户 + currentUser.login(token); + if (StringUtils.isNotNull(ShiroUtils.getUser())) { + // 若为前后端分离版本，则可把sessionId返回，作为分离版本的请求头authToken + String authToken = ShiroUtils.getSessionId(); + return AjaxResult.successData(200, authToken); + //return AjaxResult.success(); + } else { + return AjaxResult.error(500, "未知账户"); + } + } catch (UnknownAccountException uae) { + logger.info("对用户[" + userName + "]进行登录验证..验证未通过,未知账户"); + return AjaxResult.error(500, "未知账户"); + } catch (IncorrectCredentialsException ice) { + logger.info("对用户[" + userName + "]进行登录验证..验证未通过,错误的凭证"); + return AjaxResult.error(500, "用户名或密码不正确"); + } catch (LockedAccountException lae) { + logger.info("对用户[" + userName + "]进行登录验证..验证未通过,账户已锁定"); + return AjaxResult.error(500, "账户已锁定"); + } catch (ExcessiveAttemptsException eae) { + logger.info("对用户[" + userName + "]进行登录验证..验证未通过,错误次数过多"); + return AjaxResult.error(500, "用户名或密码错误次数过多"); + } catch (AuthenticationException ae) { + // 通过处理Shiro的运行时AuthenticationException就可以控制用户登录失败或密码错误时的情景 + logger.info("对用户[" + userName + "]进行登录验证..验证未通过,堆栈轨迹如下"); + ae.printStackTrace(); + return AjaxResult.error(500, "用户名或密码不正确"); + } + } else { + if (StringUtils.isNotNull(ShiroUtils.getUser())) { + // 跳转到 get请求的登陆方法 + // view.setViewName("redirect:/"+prefix+"/index"); + String authToken = ShiroUtils.getSessionId(); + return AjaxResult.successData(200, authToken); + } else { + return AjaxResult.error(500, "未知账户"); + } + } + } else { + return AjaxResult.error(500, "验证码不正确!"); + } - } + } - /** - * 退出登陆 - * - * @return - */ - @ApiOperation(value = "退出登陆", notes = "退出登陆") - @GetMapping("/Loginout") - @ResponseBody - public AjaxResult LoginOut(HttpServletRequest request, HttpServletResponse response) { - // 在这里执行退出系统前需要清空的数据 - Subject subject = SecurityUtils.getSubject(); - // 注销 - subject.logout(); - return success(); - } + /** + * 退出登陆 + * + * @return + */ + @ApiOperation(value = "退出登陆" , notes = "退出登陆") + @GetMapping("/Loginout") + @ResponseBody + public AjaxResult LoginOut(HttpServletRequest request, HttpServletResponse response) { + // 在这里执行退出系统前需要清空的数据 + Subject subject = SecurityUtils.getSubject(); + // 注销 + subject.logout(); + return success(); + } - /**** 页面测试 ****/ - @ApiOperation(value = "404页面", notes = "404页面") - @GetMapping("Out404") - public String Out404(HttpServletRequest request, HttpServletResponse response) { + /**** 页面测试 ****/ + @ApiOperation(value = "404页面" , notes = "404页面") + @GetMapping("Out404") + public String Out404(HttpServletRequest request, HttpServletResponse response) { - return "redirect:/error/404"; - } + return "redirect:/error/404"; + } - @GetMapping("Out403") - @ApiOperation(value = "403页面", notes = "403页面") - public String Out403(HttpServletRequest request, HttpServletResponse response) { + @GetMapping("Out403") + @ApiOperation(value = "403页面" , notes = "403页面") + public String Out403(HttpServletRequest request, HttpServletResponse response) { - return "redirect:/error/403"; - } + return "redirect:/error/403"; + } - @ApiOperation(value = "500页面", notes = "500页面") - @GetMapping("Out500") - public String Out500(HttpServletRequest request, HttpServletResponse response) { + @ApiOperation(value = "500页面" , notes = "500页面") + @GetMapping("Out500") + public String Out500(HttpServletRequest request, HttpServletResponse response) { - return "redirect:/error/500"; - } + return "redirect:/error/500"; + } - /** - * 权限测试跳转页面 - * - * @param request - * @param response - * @return - */ - @ApiOperation(value = "权限测试跳转页面", notes = "权限测试跳转页面") - @GetMapping("Outqx") - @RequiresPermissions("system:user:asd") - public String Outqx(HttpServletRequest request, HttpServletResponse response) { + /** + * 权限测试跳转页面 + * + * @param request + * @param response + * @return + */ + @ApiOperation(value = "权限测试跳转页面" , notes = "权限测试跳转页面") + @GetMapping("Outqx") + @RequiresPermissions("system:user:asd") + public String Outqx(HttpServletRequest request, HttpServletResponse response) { - return "redirect:/error/500"; - } - /**** 页面测试EDN ****/ + return "redirect:/error/500"; + } + /**** 页面测试EDN ****/ } diff --git a/src/main/java/com/fc/v2/controller/admin/AutoCodeController.java b/src/main/java/com/fc/v2/controller/admin/AutoCodeController.java index 5540a01..03ce97b 100644 --- a/src/main/java/com/fc/v2/controller/admin/AutoCodeController.java +++ b/src/main/java/com/fc/v2/controller/admin/AutoCodeController.java @@ -7,6 +7,10 @@ import java.util.List; import java.util.Map; import java.util.zip.ZipOutputStream; import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.fc.v2.model.auto.TSysDictType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.fc.v2.common.base.BaseController; @@ -20,9 +24,9 @@ import com.fc.v2.model.custom.autocode.AutoConfigModel; import com.fc.v2.model.custom.autocode.AutoDictType; import com.fc.v2.model.custom.autocode.BeanColumn; import com.fc.v2.model.custom.autocode.TableInfo; -import com.fc.v2.service.DictService; +import com.fc.v2.service.ITDictService; import com.fc.v2.service.GeneratorService; -import com.fc.v2.service.SysDictTypeService; +import com.fc.v2.service.ITSysDictTypeService; import com.fc.v2.util.AutoCode.AutoCodeUtil; import org.apache.commons.io.IOUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -54,10 +58,10 @@ public class AutoCodeController extends BaseController { // private SysUtilService sysUtilService; @Autowired - private SysDictTypeService tSysDictTypeService; + private ITSysDictTypeService tSysDictTypeService; @Autowired - private DictService dictService; + private ITDictService dictService; /** * 代码自动生成全局配置 @@ -75,7 +79,7 @@ public class AutoCodeController extends BaseController { modelMap.put("author", AutoCodeConfig.getConfig().getProperty("author")); modelMap.put("email", AutoCodeConfig.getConfig().getProperty("author")); modelMap.put("parentPath", AutoCodeConfig.getConfig().getProperty("parentPath")); - modelMap.put("dictTypes",tSysDictTypeService.selectByExample(null)); + modelMap.put("dictTypes",tSysDictTypeService.selectTSysDictTypeList(new QueryWrapper())); return prefix + "/global"; } diff --git a/src/main/java/com/fc/v2/controller/admin/DictDataController.java b/src/main/java/com/fc/v2/controller/admin/DictDataController.java index 3e3b331..42a42f2 100644 --- a/src/main/java/com/fc/v2/controller/admin/DictDataController.java +++ b/src/main/java/com/fc/v2/controller/admin/DictDataController.java @@ -1,11 +1,15 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.model.auto.TSysDictData; +import com.fc.v2.model.auto.TSysDictType; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysDictDataService; -import com.fc.v2.service.SysDictTypeService; +import com.fc.v2.service.ITSysDictDataService; +import com.fc.v2.service.ITSysDictTypeService; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -18,23 +22,25 @@ import org.springframework.web.bind.annotation.*; /** * 字典表Controller - * @ClassName: DictDataController + * * @author fuce + * @ClassName: DictDataController * @date 2019-11-20 22:46 */ @Api(value = "字典数据表") @Controller @RequestMapping("/DictDataController") -public class DictDataController extends BaseController{ - +public class DictDataController extends BaseController { + private final String prefix = "admin/dict_data"; @Autowired - private SysDictDataService tSysDictDataService; + private ITSysDictDataService tSysDictDataService; @Autowired - private SysDictTypeService sysDictTypeService; - + private ITSysDictTypeService sysDictTypeService; + /** * 分页list页面 + * * @param model * @param dictId * @return @@ -42,151 +48,167 @@ public class DictDataController extends BaseController{ @ApiOperation(value = "分页跳转", notes = "分页跳转") @GetMapping("/view") @RequiresPermissions("system:dictData:view") - public String view(ModelMap model,String dictId) - { - model.addAttribute("dictId",dictId); - return prefix + "/list"; - } - + public String view(ModelMap model, String dictId) { + model.addAttribute("dictId", dictId); + return prefix + "/list"; + } + /** * 字典数据表集合查询 + * * @param tablepar * @param searchText * @param dictId * @return */ - //@Log(title = "字典数据表集合查询", action = "1") + // @Log(title = "字典数据表集合查询", action = "1") @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/list") @RequiresPermissions("system:dictData:list") @ResponseBody - public Object list(Tablepar tablepar,String searchText,String dictId){ - PageInfo page=tSysDictDataService.list(tablepar,searchText,dictId) ; - return pageTable(page.getList(),page.getTotal()); + public Object list(Tablepar tablepar, String searchText, Long dictId) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("DICT_SORT"); + + if (dictId != null && dictId != 0) { + TSysDictType dictType = sysDictTypeService.selectTSysDictTypeById(dictId); + queryWrapper.eq(dictType != null, "dict_type", dictType.getDictType()); + } + + queryWrapper.like(StringUtils.isNotEmpty(searchText), "dict_value", searchText); + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + PageInfo page = new PageInfo( + tSysDictDataService.selectTSysDictDataList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); } - + /** * 新增跳转 + * * @param modelMap * @param dictId * @return */ @ApiOperation(value = "新增跳转", notes = "新增跳转") - @GetMapping("/add") - public String add(ModelMap modelMap,String dictId) - { - modelMap.addAttribute("dictType",sysDictTypeService.selectByPrimaryKey(dictId).getDictType()); - return prefix + "/add"; - } - - /** - * 新增保存 - * @param tSysDictData - * @param model - * @return - */ - //@Log(title = "字典数据表新增", action = "1") + @GetMapping("/add") + public String add(ModelMap modelMap, Long dictId) { + modelMap.addAttribute("dictType", sysDictTypeService.selectTSysDictTypeById(dictId).getDictType()); + return prefix + "/add"; + } + + /** + * 新增保存 + * + * @param tSysDictData + * @param model + * @return + */ + // @Log(title = "字典数据表新增", action = "1") @ApiOperation(value = "新增", notes = "新增") @PostMapping("/add") @RequiresPermissions("system:dictData:add") @ResponseBody - public AjaxResult add(TSysDictData tSysDictData, Model model){ - int b=tSysDictDataService.insertSelective(tSysDictData); - if(b>0){ + public AjaxResult add(TSysDictData tSysDictData, Model model) { + int b = tSysDictDataService.insertTSysDictData(tSysDictData); + if (b > 0) { return success(); - }else{ + } else { return error(); } } - + /** - * 删除 + * 字典数据删除 + * * @param ids * @return */ - //@Log(title = "字典数据表删除", action = "1") + // @Log(title = "字典数据表删除", action = "1") @ApiOperation(value = "删除", notes = "删除") @DeleteMapping("/remove") @RequiresPermissions("system:dictData:remove") @ResponseBody - public AjaxResult remove(String ids){ - int b=tSysDictDataService.deleteByPrimaryKey(ids); - if(b>0){ + public AjaxResult remove(String ids) { + int b = tSysDictDataService.deleteTSysDictDataByIds(ids); + if (b > 0) { return success(); - }else{ + } else { return error(); } } - + /** * 检查 + * * @param tsysUser * @return */ @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") @PostMapping("/checkNameUnique") @ResponseBody - public int checkNameUnique(TSysDictData tSysDictData){ - int b=tSysDictDataService.checkNameUnique(tSysDictData); - if(b>0){ + public int checkNameUnique(TSysDictData tSysDictData) { + int b = tSysDictDataService.checkNameUnique(tSysDictData); + if (b > 0) { return 1; - }else{ + } else { return 0; } } - - + /** * 修改跳转 + * * @param id * @param mmap * @return */ @ApiOperation(value = "修改跳转", notes = "修改跳转") @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { - TSysDictData sysDictData= tSysDictDataService.selectByPrimaryKey(id); - mmap.put("TSysDictData", sysDictData); - return prefix + "/edit"; - } - + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + TSysDictData sysDictData = tSysDictDataService.selectTSysDictDataById(id); + mmap.put("TSysDictData", sysDictData); + return prefix + "/edit"; + } + /** - * 修改保存 - */ - //@Log(title = "字典数据表修改", action = "1") + * 修改保存 + * + * @param record + * @return + */ + // @Log(title = "字典数据表修改", action = "1") @ApiOperation(value = "修改保存", notes = "修改保存") - @RequiresPermissions("system:dictData:edit") - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(TSysDictData record) - { - return toAjax(tSysDictDataService.updateByPrimaryKeySelective(record)); - } - + @RequiresPermissions("system:dictData:edit") + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TSysDictData record) { + return toAjax(tSysDictDataService.updateTSysDictData(record)); + } - /** + /** * 修改是否默认 + * * @param record * @return */ - @PutMapping("/updateDefault") + @PutMapping("/updateDefault") @ResponseBody - public AjaxResult updateDefault(@RequestBody TSysDictData record){ - int i=tSysDictDataService.updateByPrimaryKeySelective(record); + public AjaxResult updateDefault(@RequestBody TSysDictData record) { + int i = tSysDictDataService.updateTSysDictData(record); return toAjax(i); } - - /** + + /** * 修改是否启用 + * * @param record * @return */ - @PutMapping("/updateEnable") + @PutMapping("/updateEnable") @ResponseBody - public AjaxResult updateEnable(@RequestBody TSysDictData record){ - int i=tSysDictDataService.updateByPrimaryKeySelective(record); + public AjaxResult updateEnable(@RequestBody TSysDictData record) { + int i = tSysDictDataService.updateTSysDictData(record); return toAjax(i); } - } diff --git a/src/main/java/com/fc/v2/controller/admin/DictTypeController.java b/src/main/java/com/fc/v2/controller/admin/DictTypeController.java index c9c9688..67bda45 100644 --- a/src/main/java/com/fc/v2/controller/admin/DictTypeController.java +++ b/src/main/java/com/fc/v2/controller/admin/DictTypeController.java @@ -1,11 +1,14 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.common.domain.ResultTable; import com.fc.v2.model.auto.TSysDictType; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysDictTypeService; +import com.fc.v2.service.ITSysDictTypeService; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -18,156 +21,167 @@ import org.springframework.web.bind.annotation.*; /** * 字典类型Controller - * @ClassName: DictTypeController + * * @author fuce + * @ClassName: DictTypeController * @date 2019-11-20 22:45 */ @Api(value = "字典类型表") @Controller @RequestMapping("/DictTypeController") -public class DictTypeController extends BaseController{ - +public class DictTypeController extends BaseController { + private final String prefix = "admin/dict_type"; @Autowired - private SysDictTypeService tSysDictTypeService; - + private ITSysDictTypeService tSysDictTypeService; + /** * 分页list页面 + * * @param model * @return */ @ApiOperation(value = "分页跳转", notes = "分页跳转") @GetMapping("/view") @RequiresPermissions("system:dictType:view") - public String view(ModelMap model) - { - return prefix + "/list"; - } - + public String view(ModelMap model) { + return prefix + "/list"; + } + /** * 字典类型表集合查询 - * @param tablepar post参数 + * + * @param tablepar post参数 * @param searchText 查询字段 * @return ResultTable 集合 */ - //@Log(title = "字典类型表集合查询", action = "111") + // @Log(title = "字典类型表集合查询", action = "111") @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/list") @RequiresPermissions("system:dictType:list") @ResponseBody - public ResultTable list(Tablepar tablepar, String searchText){ - PageInfo page=tSysDictTypeService.list(tablepar,searchText) ; - return pageTable(page.getList(),page.getTotal()); + public ResultTable list(Tablepar tablepar, String searchText) { + + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.like(StringUtils.isNotEmpty(searchText), "dict_name", searchText); + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + PageInfo page = new PageInfo( + tSysDictTypeService.selectTSysDictTypeList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); } - + /** * 新增跳转 + * * @param modelMap 试图 * @return String 跳转连接 */ @ApiOperation(value = "新增跳转", notes = "新增跳转") - @GetMapping("/add") - public String add(ModelMap modelMap) - { - return prefix + "/add"; - } - - /** - * 新增保存 - * @param tSysDictType 字段类型 - * @param model model - * @return AjaxResult 对象 - */ - //@Log(title = "字典类型表新增", action = "111") + @GetMapping("/add") + public String add(ModelMap modelMap) { + return prefix + "/add"; + } + + /** + * 新增保存 + * + * @param tSysDictType 字段类型 + * @param model model + * @return AjaxResult 对象 + */ + // @Log(title = "字典类型表新增", action = "111") @ApiOperation(value = "新增", notes = "新增") @PostMapping("/add") @RequiresPermissions("system:dictType:add") @ResponseBody - public AjaxResult add(TSysDictType tSysDictType,Model model){ - int b=tSysDictTypeService.insertSelective(tSysDictType); - if(b>0){ + public AjaxResult add(TSysDictType tSysDictType, Model model) { + int b = tSysDictTypeService.insertTSysDictType(tSysDictType); + if (b > 0) { return success(); - }else{ + } else { return error(); } } - + /** * 删除字典类型 + * * @param ids * @return */ - //@Log(title = "字典类型表删除", action = "111") + // @Log(title = "字典类型表删除", action = "111") @ApiOperation(value = "删除", notes = "删除") @DeleteMapping("/remove") @RequiresPermissions("system:dictType:remove") @ResponseBody - public AjaxResult remove(String ids){ - int b=tSysDictTypeService.deleteByPrimaryKey(ids); - if(b>0){ + public AjaxResult remove(String ids) { + int b = tSysDictTypeService.deleteTSysDictTypeByIds(ids); + if (b > 0) { return success(); - }else{ + } else { return error(); } } - + /** * 检查字典类型名字相同 + * * @param tSysDictType * @return */ @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") @PostMapping("/checkNameUnique") @ResponseBody - public int checkNameUnique(TSysDictType tSysDictType){ - int b=tSysDictTypeService.checkNameUnique(tSysDictType); - if(b>0){ + public int checkNameUnique(TSysDictType tSysDictType) { + int b = tSysDictTypeService.checkNameUnique(tSysDictType); + if (b > 0) { return 1; - }else{ + } else { return 0; } } - - + /** * 修改跳转 + * * @param id * @param mmap * @return */ @ApiOperation(value = "修改跳转", notes = "修改跳转") @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { - mmap.put("TSysDictType", tSysDictTypeService.selectByPrimaryKey(id)); - return prefix + "/edit"; - } - + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put("TSysDictType", tSysDictTypeService.selectTSysDictTypeById(id)); + return prefix + "/edit"; + } + /** - * 修改保存 - */ - //@Log(title = "字典类型表修改", action = "111") + * 修改保存 + * + * @param record + * @return + */ + // @Log(title = "字典类型表修改", action = "111") @ApiOperation(value = "修改保存", notes = "修改保存") - @RequiresPermissions("system:dictType:edit") - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(TSysDictType record) - { - return toAjax(tSysDictTypeService.updateByPrimaryKeySelective(record)); - } + @RequiresPermissions("system:dictType:edit") + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TSysDictType record) { + return toAjax(tSysDictTypeService.updateTSysDictType(record)); + } - /** + /** * 修改是否启用 + * * @param record * @return */ - @PutMapping("/updateEnable") + @PutMapping("/updateEnable") @ResponseBody - public AjaxResult updateEnable(@RequestBody TSysDictType record){ - int i=tSysDictTypeService.updateByPrimaryKeySelective(record); + public AjaxResult updateEnable(@RequestBody TSysDictType record) { + int i = tSysDictTypeService.updateTSysDictType(record); return toAjax(i); } - - } diff --git a/src/main/java/com/fc/v2/controller/admin/EmailController.java b/src/main/java/com/fc/v2/controller/admin/EmailController.java index 94ddc46..6600726 100644 --- a/src/main/java/com/fc/v2/controller/admin/EmailController.java +++ b/src/main/java/com/fc/v2/controller/admin/EmailController.java @@ -1,13 +1,16 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.conf.oss.OssTemplate; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.common.domain.ResultTable; import com.fc.v2.model.auto.TSysEmail; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.TSysEmailService; +import com.fc.v2.service.ITSysEmailService; import com.fc.v2.util.SimpleEmailUtil; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,136 +23,146 @@ import org.springframework.web.bind.annotation.*; /** * 邮件发送Controller - * @ClassName: EmailController + * * @author fuce - * @date 2019-06-10 00:39 * @version V1.0 + * @ClassName: EmailController + * @date 2019-06-10 00:39 */ @Api(value = "邮件发送Controller") @Controller @RequestMapping("/EmailController") -public class EmailController extends BaseController{ - - private final String prefix = "admin/email"; - - @Autowired - private TSysEmailService tSysEmailService; - - @Autowired - private OssTemplate template; - - /** - * 分页展示页面 - * @param model - * @return String - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("system:email:view") - public String view(ModelMap model) - { +public class EmailController extends BaseController { + + private final String prefix = "admin/email"; + + @Autowired + private ITSysEmailService tSysEmailService; + + @Autowired + private OssTemplate template; + + /** + * 分页展示页面 + * + * @param model + * @return String + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("system:email:view") + public String view(ModelMap model) { return prefix + "/list"; } - /** - * 分页list页面 - * @param tablepar - * @param searchText - * @return - */ - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/list") - @RequiresPermissions("system:email:list") - @ResponseBody - public ResultTable list(Tablepar tablepar, String searchText){ - PageInfo page=tSysEmailService.list(tablepar,searchText) ; - return pageTable(page.getList(),page.getTotal()); - } - - /** + /** + * 分页list页面 + * + * @param tablepar + * @param searchText + * @return + */ + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/list") + @RequiresPermissions("system:email:list") + @ResponseBody + public ResultTable list(Tablepar tablepar, String searchText) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByDesc("id"); + queryWrapper.like(StringUtils.isNotEmpty(searchText), "content", searchText); + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + + PageInfo page = new PageInfo(tSysEmailService.selectTSysEmailList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); + } + + /** * 新增跳转 */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add(ModelMap modelMap) - { - modelMap.put("BucketName",template.getOssProperties().getBucketName()); + public String add(ModelMap modelMap) { + modelMap.put("BucketName", template.getOssProperties().getBucketName()); return prefix + "/add"; } - - /** - * 新增 - * @param tSysEmail - * @param model - * @return - * @throws Exception - * @author fuce - */ - //@Log(title = "新增邮件", action = "1") - @ApiOperation(value = "新增", notes = "新增") - @PostMapping("/add") - @RequiresPermissions("system:email:add") - @ResponseBody - public AjaxResult add(@RequestBody TSysEmail tSysEmail,Model model) throws Exception{ - int b=tSysEmailService.insertSelective(tSysEmail); - if(b>0){ - //发送邮件 - SimpleEmailUtil.sendEmail(tSysEmail); - return success(); - }else{ - return error(); - } - } - - /** - * 删除邮件 - * @param ids - * @return - */ - //@Log(title = "删除邮件", action = "1") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("system:email:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=tSysEmailService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 检查邮件同名 - * @param tSysEmail - * @return - */ - @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") - @PostMapping("/checkNameUnique") - @ResponseBody - public int checkNameUnique(TSysEmail tSysEmail){ - int b=tSysEmailService.checkNameUnique(tSysEmail); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - - /** - * 修改跳转 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { - mmap.put("BucketName",template.getOssProperties().getBucketName()); - mmap.put("TSysEmail", tSysEmailService.selectByPrimaryKey(id)); + + /** + * 新增 + * + * @param tSysEmail + * @param model + * @return + * @throws Exception + * @author fuce + */ + //@Log(title = "新增邮件", action = "1") + @ApiOperation(value = "新增", notes = "新增") + @PostMapping("/add") + @RequiresPermissions("system:email:add") + @ResponseBody + public AjaxResult add(@RequestBody TSysEmail tSysEmail, Model model) throws Exception { + int b = tSysEmailService.insertTSysEmail(tSysEmail); + if (b > 0) { + //发送邮件 + SimpleEmailUtil.sendEmail(tSysEmail); + return success(); + } else { + return error(); + } + } + + /** + * 删除邮件 + * + * @param ids + * @return + */ + //@Log(title = "删除邮件", action = "1") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("system:email:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = tSysEmailService.deleteTSysEmailByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 检查邮件同名 + * + * @param tSysEmail + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(TSysEmail tSysEmail) { + int b = tSysEmailService.checkNameUnique(tSysEmail); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + + /** + * 修改跳转 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put("BucketName", template.getOssProperties().getBucketName()); + mmap.put("TSysEmail", tSysEmailService.selectTSysEmailById(id)); return prefix + "/view"; } diff --git a/src/main/java/com/fc/v2/controller/admin/FileController.java b/src/main/java/com/fc/v2/controller/admin/FileController.java index 6d458b3..6fdad66 100644 --- a/src/main/java/com/fc/v2/controller/admin/FileController.java +++ b/src/main/java/com/fc/v2/controller/admin/FileController.java @@ -1,8 +1,10 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.conf.oss.OssTemplate; import com.fc.v2.common.domain.AjaxResult; -import com.fc.v2.model.auto.SysFile; +import com.fc.v2.model.auto.TSysFile; +import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -12,125 +14,134 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import com.fc.v2.common.base.BaseController; import com.fc.v2.model.custom.Tablepar; +import com.fc.v2.util.StringUtils; import com.github.pagehelper.PageInfo; /** * 文件上传controller - * @author fuce + * + * @author fuce * @date: 2018年9月16日 下午4:23:50 */ @Api(value = "文件上传") @Controller @RequestMapping("/FileController") -public class FileController extends BaseController{ - - //跳转页面参数 - private final String prefix = "admin/file"; - - @Autowired - private OssTemplate template; - - /** - * 分页展示页面 - * @param model - * @return - * @author fuce - * @Date 2019年11月20日 下午10:18:32 - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("system:file:view") - public String view(ModelMap model) - { - model.put("bucketURL",template.getOssProperties().getEndpoint()+"/"+template.getOssProperties().getBucketName()); +public class FileController extends BaseController { + + //跳转页面参数 + private final String prefix = "admin/file"; + + @Autowired + private OssTemplate template; + + /** + * 分页展示页面 + * + * @param model + * @return + * @author fuce + * @Date 2019年11月20日 下午10:18:32 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("system:file:view") + public String view(ModelMap model) { + model.put("bucketURL", template.getOssProperties().getEndpoint() + "/" + template.getOssProperties().getBucketName()); return prefix + "/list"; } - - /** - * 文件列表 - * @param tablepar - * @param searchText 搜索字符 - * @return - */ - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/list") - @RequiresPermissions("system:file:list") - @ResponseBody - public Object list(Tablepar tablepar,String searchText){ - PageInfo page=sysFileService.list(tablepar,searchText) ; - return pageTable(page.getList(),page.getTotal()); - } - - /** - * 新增文件跳转页面 - * @return - * @author fuce - * @Date 2019年11月20日 下午10:19:03 - */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + + /** + * 文件列表 + * + * @param tablepar + * @param searchText 搜索字符 + * @return + */ + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/list") + @RequiresPermissions("system:file:list") + @ResponseBody + public Object list(Tablepar tablepar, String searchText) { + + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("id"); + queryWrapper.like(StringUtils.isNotEmpty(searchText), "file_name", searchText); + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + + PageInfo page = new PageInfo(sysFileService.selectTSysFileList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); + } + + /** + * 新增文件跳转页面 + * + * @return + * @author fuce + * @Date 2019年11月20日 下午10:19:03 + */ + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add(ModelMap map) - { - map.put("BucketName",template.getOssProperties().getBucketName()); + public String add(ModelMap map) { + map.put("BucketName", template.getOssProperties().getBucketName()); return prefix + "/add"; } - - /** - * 检查文件名字 - * @param tsysFile - * @return - */ - @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") - @PostMapping("/checkNameUnique") - @ResponseBody - public int checkNameUnique(SysFile tsysFile){ - int b=sysFileService.checkNameUnique(tsysFile); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - - /** - * 修改文件 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap map) - { - map.put("BucketName",template.getOssProperties().getBucketName()); - map.put("sysFile", sysFileService.selectByPrimaryKey(id)); + + /** + * 检查文件名字 + * + * @param tsysFile + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(TSysFile tsysFile) { + int b = sysFileService.checkNameUnique(tsysFile); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + + /** + * 修改文件 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap map) { + map.put("BucketName", template.getOssProperties().getBucketName()); + map.put("sysFile", sysFileService.selectTSysFileById(id)); return prefix + "/edit"; } - - - /** - * 删除文件 - * @param ids - * @return - */ - //@Log(title = "删除日志", action = "1") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("system:file:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysFileService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - - - - + + + /** + * 删除文件 + * + * @param ids + * @return + */ + //@Log(title = "删除日志", action = "1") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("system:file:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysFileService.deleteTSysFileByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + } diff --git a/src/main/java/com/fc/v2/controller/admin/LogController.java b/src/main/java/com/fc/v2/controller/admin/LogController.java index 5c745b8..dc3bffa 100644 --- a/src/main/java/com/fc/v2/controller/admin/LogController.java +++ b/src/main/java/com/fc/v2/controller/admin/LogController.java @@ -1,10 +1,13 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.common.domain.ResultTable; -import com.fc.v2.model.auto.TsysOperLog; +import com.fc.v2.model.auto.TSysOperLog; import com.fc.v2.model.custom.Tablepar; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -15,67 +18,70 @@ import org.springframework.web.bind.annotation.*; /** * 日志记录controller - * @author fuce + * + * @author fuce * @date: 2018年9月30日 下午9:28:31 */ @Controller @Api(value = "日志记录") @RequestMapping("/LogController") -public class LogController extends BaseController{ +public class LogController extends BaseController { - //跳转页面参数 - private final String prefix = "admin/log"; - - /** - * 日志记录展示页面 - * @param model - * @return - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("system:log:view") - public String view(ModelMap model) - { + //跳转页面参数 + private final String prefix = "admin/log"; + + /** + * 日志记录展示页面 + * + * @param model + * @return + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("system:log:view") + public String view(ModelMap model) { return prefix + "/list"; } - - /** - * 文件列表 - * @param tablepar - * @param searchText 搜索字符 - * @return - */ - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/list") - @RequiresPermissions("system:log:list") - @ResponseBody - public ResultTable list(Tablepar tablepar, String searchText){ - PageInfo page=sysOperLogService.list(tablepar,searchText) ; - return pageTable(page.getList(),page.getTotal()); - } - - /** - * 删除日志 - * @param ids - * @return - */ - //@Log(title = "删除日志", action = "1") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("system:log:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysOperLogService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - + /** + * 文件列表 + * + * @param tablepar + * @param searchText 搜索字符 + * @return + */ + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/list") + @RequiresPermissions("system:log:list") + @ResponseBody + public ResultTable list(Tablepar tablepar, String searchText) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByDesc("id"); + queryWrapper.like(StringUtils.isNotEmpty(searchText), "title", searchText); + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + PageInfo page = new PageInfo(sysOperLogService.selectTSysOperLogList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); + } - - + + /** + * 删除日志 + * + * @param ids + * @return + */ + //@Log(title = "删除日志", action = "1") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("system:log:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysOperLogService.deleteTSysOperLogByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } } diff --git a/src/main/java/com/fc/v2/controller/admin/QuartzJobController.java b/src/main/java/com/fc/v2/controller/admin/QuartzJobController.java index b4e465f..c2d8b49 100644 --- a/src/main/java/com/fc/v2/controller/admin/QuartzJobController.java +++ b/src/main/java/com/fc/v2/controller/admin/QuartzJobController.java @@ -1,11 +1,14 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.common.domain.ResultTable; -import com.fc.v2.model.auto.SysQuartzJob; +import com.fc.v2.model.auto.TSysQuartzJob; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysQuartzJobService; +import com.fc.v2.service.ITSysQuartzJobService; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,176 +20,193 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; /** - * -* @ClassName: QuartzJobController -* @author Jan 橙寂 -* @date 2019-11-20 22:49 + * @author Jan 橙寂 + * @ClassName: QuartzJobController + * @date 2019-11-20 22:49 */ @Api(value = "定时任务调度表") @Controller @RequestMapping("/SysQuartzJobController") -public class QuartzJobController extends BaseController{ - - private final String prefix = "admin/sysQuartzJob"; - @Autowired - private SysQuartzJobService sysQuartzJobService; - - /** - * 展示页面 - * @param model - * @return - * @author fuce - * @Date 2019年11月11日 下午3:55:01 - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("gen:sysQuartzJob:view") - public String view(ModelMap model) - { +public class QuartzJobController extends BaseController { + + private final String prefix = "admin/sysQuartzJob"; + @Autowired + private ITSysQuartzJobService sysQuartzJobService; + + /** + * 展示页面 + * + * @param model + * @return + * @author fuce + * @Date 2019年11月11日 下午3:55:01 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("gen:sysQuartzJob:view") + public String view(ModelMap model) { return prefix + "/list"; } - /** - * 定时任务调度list - * @param tablepar - * @param searchText - * @return - */ - //@Log(title = "定时任务调度表集合查询", action = "111") - @ApiOperation(value = "定时任务调度list", notes = "定时任务调度list") - @GetMapping("/list") - @RequiresPermissions("gen:sysQuartzJob:list") - @ResponseBody - public ResultTable list(Tablepar tablepar, String searchText){ - PageInfo page=sysQuartzJobService.list(tablepar,searchText) ; - return pageTable(page.getList(),page.getTotal()); - } - - /** - * 新增跳转页面 - * @param modelMap - * @return - */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + + /** + * 定时任务调度list + * + * @param tablepar + * @param searchText + * @return + */ + //@Log(title = "定时任务调度表集合查询", action = "111") + @ApiOperation(value = "定时任务调度list", notes = "定时任务调度list") + @GetMapping("/list") + @RequiresPermissions("gen:sysQuartzJob:list") + @ResponseBody + public ResultTable list(Tablepar tablepar, String searchText) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByDesc("id"); + queryWrapper.like(StringUtils.isNotEmpty(searchText), "job_name", searchText); + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + PageInfo page = new PageInfo(sysQuartzJobService.selectTSysQuartzJobList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); + } + + /** + * 新增跳转页面 + * + * @param modelMap + * @return + */ + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add(ModelMap modelMap) - { + public String add(ModelMap modelMap) { return prefix + "/add"; } - + /** * 新增保存 + * * @param sysQuartzJob * @return * @author fuce * @Date 2019年11月11日 下午4:00:08 */ - //@Log(title = "定时任务调度表新增", action = "111") - @ApiOperation(value = "新增", notes = "新增") - @PostMapping("/add") - @RequiresPermissions("gen:sysQuartzJob:add") - @ResponseBody - public AjaxResult add(SysQuartzJob sysQuartzJob){ - int b=sysQuartzJobService.insertSelective(sysQuartzJob); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 删除 - * @param ids - * @return - */ - //@Log(title = "定时任务调度表删除", action = "111") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("gen:sysQuartzJob:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysQuartzJobService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 检查 - * @param tsysUser - * @return - */ - @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") - @PostMapping("/checkNameUnique") - @ResponseBody - public int checkNameUnique(SysQuartzJob sysQuartzJob){ - int b=sysQuartzJobService.checkNameUnique(sysQuartzJob); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - - /** - * 修改跳转 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { - mmap.put("SysQuartzJob", sysQuartzJobService.selectByPrimaryKey(id)); + //@Log(title = "定时任务调度表新增", action = "111") + @ApiOperation(value = "新增", notes = "新增") + @PostMapping("/add") + @RequiresPermissions("gen:sysQuartzJob:add") + @ResponseBody + public AjaxResult add(TSysQuartzJob sysQuartzJob) { + int b = sysQuartzJobService.insertTSysQuartzJob(sysQuartzJob); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 删除 + * + * @param ids + * @return + */ + //@Log(title = "定时任务调度表删除", action = "111") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("gen:sysQuartzJob:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysQuartzJobService.deleteTSysQuartzJobByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 检查 + * + * @param tsysUser + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(TSysQuartzJob sysQuartzJob) { + int b = sysQuartzJobService.checkNameUnique(sysQuartzJob); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + + /** + * 修改跳转 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put("SysQuartzJob", sysQuartzJobService.selectTSysQuartzJobById(id)); return prefix + "/edit"; } - - /** + + /** * 修改保存 + * + * @param record + * @return */ //@Log(title = "定时任务调度表修改", action = "111") - @ApiOperation(value = "修改保存", notes = "修改保存") + @ApiOperation(value = "修改保存", notes = "修改保存") @RequiresPermissions("gen:sysQuartzJob:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(SysQuartzJob record) - { - return toAjax(sysQuartzJobService.updateByPrimaryKeySelective(record)); + public AjaxResult editSave(TSysQuartzJob record) { + return toAjax(sysQuartzJobService.updateTSysQuartzJob(record)); } /** * 任务调度状态修改 + * + * @param job + * @return + * @throws SchedulerException */ - //@Log(title = "任务调度状态修改", action = "1") - @ApiOperation(value = "任务调度状态修改", notes = "任务调度状态修改") + //@Log(title = "任务调度状态修改", action = "1") + @ApiOperation(value = "任务调度状态修改", notes = "任务调度状态修改") @PutMapping("/changeStatus") @ResponseBody - public AjaxResult changeStatus(@RequestBody SysQuartzJob job) throws SchedulerException - { - SysQuartzJob newJob = sysQuartzJobService.selectByPrimaryKey(job.getId()); + public AjaxResult changeStatus(@RequestBody TSysQuartzJob job) throws SchedulerException { + TSysQuartzJob newJob = sysQuartzJobService.selectTSysQuartzJobById(job.getId()); newJob.setStatus(job.getStatus()); - sysQuartzJobService.updateByPrimaryKeySelective(newJob); + sysQuartzJobService.updateTSysQuartzJob(newJob); return toAjax(sysQuartzJobService.changeStatus(newJob)); } - + /** * 任务调度立即执行一次 + * + * @param id + * @return + * @throws SchedulerException */ - //@Log(title = "任务调度立即执行一次", action = "1") - @ApiOperation(value = "任务调度立即执行一次", notes = "任务调度立即执行一次") + //@Log(title = "任务调度立即执行一次", action = "1") + @ApiOperation(value = "任务调度立即执行一次", notes = "任务调度立即执行一次") @GetMapping("/run/{id}") @ResponseBody - public AjaxResult run(@PathVariable("id") String id) throws SchedulerException - { - SysQuartzJob newJob = sysQuartzJobService.selectByPrimaryKey(id); - sysQuartzJobService.run(newJob); + public AjaxResult run(@PathVariable("id") Long id) throws SchedulerException { + TSysQuartzJob newJob = sysQuartzJobService.selectTSysQuartzJobById(id); + sysQuartzJobService.run(newJob); return success(); } - + } diff --git a/src/main/java/com/fc/v2/controller/admin/QuartzJobLogController.java b/src/main/java/com/fc/v2/controller/admin/QuartzJobLogController.java index f4765f0..c901456 100644 --- a/src/main/java/com/fc/v2/controller/admin/QuartzJobLogController.java +++ b/src/main/java/com/fc/v2/controller/admin/QuartzJobLogController.java @@ -1,11 +1,14 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.common.domain.ResultTable; -import com.fc.v2.model.auto.SysQuartzJobLog; +import com.fc.v2.model.auto.TSysQuartzJobLog; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysQuartzJobLogService; +import com.fc.v2.service.ITSysQuartzJobLogService; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,92 +20,97 @@ import org.springframework.web.bind.annotation.*; /** * 定时任务日志Controller -* @ClassName: QuartzJobLogController -* @author fuce -* @date 2019-11-20 22:51 + * + * @author fuce + * @ClassName: QuartzJobLogController + * @date 2019-11-20 22:51 */ @Api(value = "定时任务调度日志表") @Controller @RequestMapping("/SysQuartzJobLogController") -public class QuartzJobLogController extends BaseController{ - - private final String prefix = "admin/sysQuartzJobLog"; - @Autowired - private SysQuartzJobLogService sysQuartzJobLogService; - - /** - * 展示跳转页面 - * @param model - * @return - * @author fuce - * @Date 2019年11月11日 下午4:01:13 - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("gen:sysQuartzJobLog:view") - public String view(ModelMap model) - { +public class QuartzJobLogController extends BaseController { + + private final String prefix = "admin/sysQuartzJobLog"; + @Autowired + private ITSysQuartzJobLogService sysQuartzJobLogService; + + /** + * 展示跳转页面 + * + * @param model + * @return + * @author fuce + * @Date 2019年11月11日 下午4:01:13 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("gen:sysQuartzJobLog:view") + public String view(ModelMap model) { return prefix + "/list"; } - - /** - * 定时任务调度日志list - * @param tablepar - * @param searchText - * @return - * @author fuce - * @Date 2019年11月11日 下午4:01:26 - */ - //@Log(title = "定时任务调度日志表集合查询", action = "111") - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/list") - @RequiresPermissions("gen:sysQuartzJobLog:list") - @ResponseBody - public ResultTable list(Tablepar tablepar, String searchText){ - PageInfo page=sysQuartzJobLogService.list(tablepar,searchText) ; - return pageTable(page.getList(),page.getTotal()); - } - - /** - * 查看详情 - * @param modelMap - * @return - * @author fuce - * @Date 2019年9月14日 下午11:50:42 - */ - @ApiOperation(value = "查看详情", notes = "查看详情") - @GetMapping("/detail/{id}") - public String detail(@PathVariable("id") String id,ModelMap modelMap) - { - SysQuartzJobLog log= sysQuartzJobLogService.selectByPrimaryKey(id); - modelMap.put("SysQuartzJobLog", log); + + /** + * 定时任务调度日志list + * + * @param tablepar + * @param searchText + * @return + * @author fuce + * @Date 2019年11月11日 下午4:01:26 + */ + //@Log(title = "定时任务调度日志表集合查询", action = "111") + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/list") + @RequiresPermissions("gen:sysQuartzJobLog:list") + @ResponseBody + public ResultTable list(Tablepar tablepar, String searchText) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByDesc("id"); + queryWrapper.like(StringUtils.isNotEmpty(searchText), "job_name", searchText); + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + PageInfo page = new PageInfo(sysQuartzJobLogService.selectTSysQuartzJobLogList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); + } + + /** + * 查看详情 + * + * @param modelMap + * @return + * @author fuce + * @Date 2019年9月14日 下午11:50:42 + */ + @ApiOperation(value = "查看详情", notes = "查看详情") + @GetMapping("/detail/{id}") + public String detail(@PathVariable("id") Long id, ModelMap modelMap) { + TSysQuartzJobLog log = sysQuartzJobLogService.selectTSysQuartzJobLogById(id); + modelMap.put("SysQuartzJobLog", log); return prefix + "/detail"; - } - + } + + + /** + * 定时任务日志删除 + * + * @param ids id集合 + * @return + * @author fuce + * @Date 2019年11月20日 下午10:51:52 + */ + //@Log(title = "定时任务调度日志表删除", action = "111") + @ApiOperation(value = "定时任务日志删除", notes = "定时任务日志删除") + @DeleteMapping("/remove") + @RequiresPermissions("gen:sysQuartzJobLog:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysQuartzJobLogService.deleteTSysQuartzJobLogByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } - - /** - * 定时任务日志删除 - * @param ids id集合 - * @return - * @author fuce - * @Date 2019年11月20日 下午10:51:52 - */ - //@Log(title = "定时任务调度日志表删除", action = "111") - @ApiOperation(value = "定时任务日志删除", notes = "定时任务日志删除") - @DeleteMapping("/remove") - @RequiresPermissions("gen:sysQuartzJobLog:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysQuartzJobLogService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - - } diff --git a/src/main/java/com/fc/v2/controller/admin/ServiceController.java b/src/main/java/com/fc/v2/controller/admin/ServiceController.java index 2eb3a59..2aecc69 100644 --- a/src/main/java/com/fc/v2/controller/admin/ServiceController.java +++ b/src/main/java/com/fc/v2/controller/admin/ServiceController.java @@ -1,8 +1,8 @@ package com.fc.v2.controller.admin; import com.fc.v2.common.base.BaseController; -import com.fc.v2.model.auto.SysNotice; -import com.fc.v2.model.auto.TsysOperLog; +import com.fc.v2.model.auto.TSysNotice; +import com.fc.v2.model.auto.TSysOperLog; import com.fc.v2.model.custom.Service; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,45 +17,46 @@ import java.util.List; /** * 服务器信息Controller - * @ClassName: ServiceController + * * @author fuce - * @date 2019-06-23 00:55 * @version V1.0 + * @ClassName: ServiceController + * @date 2019-06-23 00:55 */ @Api(value = "服务器信息") @Controller @RequestMapping("/ServiceController") -public class ServiceController extends BaseController{ +public class ServiceController extends BaseController { + + //跳转页面参数 + private final String prefix = "admin/service"; - //跳转页面参数 - private final String prefix = "admin/service"; - - /** - * 展示页面 - * @param model - * @return - * @author fuce - * @Date 2019年11月11日 下午4:04:03 - */ - @ApiOperation(value = "展示页面", notes = "展示页面") - @GetMapping("/view") - @RequiresPermissions("system:service:view") - public String view(ModelMap model) - { - List sysNotices= sysNoticeService.getNEW(); - List sysOperLog=sysOperLogService.getNEW(); - if(sysNotices==null||sysNotices.size()<=0){ - SysNotice sysNotice=new SysNotice(); - sysNotice.setId("0"); - sysNotice.setTitle("暂无公告"); - sysNotice.setCreateTime(new Date()); - sysNotices.add(sysNotice); - } + /** + * 展示页面 + * + * @param model + * @return + * @author fuce + * @Date 2019年11月11日 下午4:04:03 + */ + @ApiOperation(value = "展示页面", notes = "展示页面") + @GetMapping("/view") + @RequiresPermissions("system:service:view") + public String view(ModelMap model) { + List sysNotices = sysNoticeService.getNEW(); + List sysOperLog = sysOperLogService.getNEW(); + if (sysNotices == null || sysNotices.size() <= 0) { + TSysNotice sysNotice = new TSysNotice(); + sysNotice.setId(0L); + sysNotice.setTitle("暂无公告"); + sysNotice.setCreateTime(new Date()); + sysNotices.add(sysNotice); + } - model.addAttribute("service", new Service()); - model.addAttribute("sysNotices", sysNotices); - model.addAttribute("sysOperLog", sysOperLog); + model.addAttribute("service", new Service()); + model.addAttribute("sysNotices", sysNotices); + model.addAttribute("sysOperLog", sysOperLog); return prefix + "/list"; } } diff --git a/src/main/java/com/fc/v2/controller/admin/SysNoticeController.java b/src/main/java/com/fc/v2/controller/admin/SysNoticeController.java index 9536279..9611dd3 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysNoticeController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysNoticeController.java @@ -1,12 +1,15 @@ - package com.fc.v2.controller.admin; +package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.common.domain.ResultTable; -import com.fc.v2.model.auto.SysNotice; +import com.fc.v2.model.auto.TSysNotice; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysNoticeService; +import com.fc.v2.service.ITSysNoticeService; import com.fc.v2.shiro.util.ShiroUtils; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -18,198 +21,207 @@ import org.springframework.web.bind.annotation.*; /** * 公告Controller - * @ClassName: SysNoticeController + * * @author fuce + * @ClassName: SysNoticeController * @date 2019-11-20 22:31 */ @Api(value = "公告") @Controller @RequestMapping("/SysNoticeController") -public class SysNoticeController extends BaseController{ - - private final String prefix = "admin/sysNotice"; - @Autowired - private SysNoticeService sysNoticeService; - - - /** - * 展示页面跳转 - * @param model - * @return - * @author fuce - * @Date 2019年11月11日 下午4:09:24 - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("gen:sysNotice:view") - public String view(ModelMap model) - { - return prefix + "/list"; +public class SysNoticeController extends BaseController { + + private final String prefix = "admin/sysNotice"; + @Autowired + private ITSysNoticeService sysNoticeService; + + + /** + * 展示页面跳转 + * + * @param model + * @return + * @author fuce + * @Date 2019年11月11日 下午4:09:24 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("gen:sysNotice:view") + public String view(ModelMap model) { + return prefix + "/list"; + } + + /** + * list页面 + * + * @param tablepar + * @param searchText + * @return + * @author fuce + * @Date 2019年11月11日 下午4:09:35 + */ + //@Log(title = "公告集合查询", action = "111") + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/list") + @RequiresPermissions("gen:sysNotice:list") + @ResponseBody + public ResultTable list(Tablepar tablepar, String searchText) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("id"); + queryWrapper.like(StringUtils.isNotEmpty(searchText), "title", searchText); + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + PageInfo page = new PageInfo(sysNoticeService.selectTSysNoticeList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); } - /** - * list页面 - * @param tablepar - * @param searchText - * @return - * @author fuce - * @Date 2019年11月11日 下午4:09:35 - */ - //@Log(title = "公告集合查询", action = "111") - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/list") - @RequiresPermissions("gen:sysNotice:list") - @ResponseBody - public ResultTable list(Tablepar tablepar, String searchText){ - PageInfo page=sysNoticeService.list(tablepar,searchText) ; - return pageTable(page.getList(),page.getTotal()); - } - - - /** - * 对应的用户的展示页面 - * @param model - * @return - * @author fuce - * @Date 2019年11月11日 下午4:09:42 - */ - @ApiOperation(value = "对应的用户的展示页面", notes = "对应的用户的展示页面") - @GetMapping("/viewUser") - public String viewUser(ModelMap model) - { - return prefix + "/list_view"; + + + /** + * 对应的用户的展示页面 + * + * @param model + * @return + * @author fuce + * @Date 2019年11月11日 下午4:09:42 + */ + @ApiOperation(value = "对应的用户的展示页面", notes = "对应的用户的展示页面") + @GetMapping("/viewUser") + public String viewUser(ModelMap model) { + return prefix + "/list_view"; } - /** - * 根据公告id查询跳转到公告详情页面 - * @param tablepar - * @param searchText - * @return - */ - @ApiOperation(value = "table根据公告id查询跳转到公告详情页面", notes = "table根据公告id查询跳转到公告详情页面") - @PostMapping("/viewUserlist") - @ResponseBody - public ResultTable viewUserlist(Tablepar tablepar,String searchText) - { - PageInfo page=sysNoticeService.list(ShiroUtils.getUser(), tablepar, searchText); - return pageTable(page.getList(),page.getTotal()); + + /** + * 根据公告id查询跳转到公告详情页面 + * + * @param tablepar + * @param searchText + * @return + */ + @ApiOperation(value = "table根据公告id查询跳转到公告详情页面", notes = "table根据公告id查询跳转到公告详情页面") + @PostMapping("/viewUserlist") + @ResponseBody + public ResultTable viewUserlist(Tablepar tablepar, String searchText) { + PageInfo page = sysNoticeService.selectTSysNoticeList(ShiroUtils.getUser(), tablepar, searchText); + return pageTable(page.getList(), page.getTotal()); } - - /** - * 新增跳转 - * @param modelMap - * @return - */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + + /** + * 新增跳转 + * + * @param modelMap + * @return + */ + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add(ModelMap modelMap) - { + public String add(ModelMap modelMap) { return prefix + "/add"; } - /** - * 新增保存 - * @param sysNotice - * @return - * @author fuce - * @Date 2019年11月11日 下午4:07:09 - */ - //@Log(title = "公告新增", action = "111") + + /** + * 新增保存 + * + * @param sysNotice + * @return + * @author fuce + * @Date 2019年11月11日 下午4:07:09 + */ + //@Log(title = "公告新增", action = "111") @ApiOperation(value = "新增", notes = "新增") - @PostMapping("/add") - @RequiresPermissions("gen:sysNotice:add") - @ResponseBody - public AjaxResult add(SysNotice sysNotice){ - int b=sysNoticeService.insertSelective(sysNotice); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 删除 - * @param ids - * @return - **/ - //@Log(title = "公告删除", action = "111") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("gen:sysNotice:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysNoticeService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 检查 - * @param tsysUser - * @return - */ - @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") - @PostMapping("/checkNameUnique") - @ResponseBody - public int checkNameUnique(SysNotice sysNotice){ - int b=sysNoticeService.checkNameUnique(sysNotice); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - /** - * 根据公告id查询跳转到公告详情页面 - * @param id - * @param mmap - * @return - */ - //@Log(title = "字典数据表删除", action = "1") - @ApiOperation(value = "根据公告id查询跳转到公告详情页面", notes = " 根据公告id查询跳转到公告详情页面") - @GetMapping("/viewinfo/{id}") - public String viewinfo(@PathVariable("id") String id,ModelMap mmap) - { - SysNotice notice= sysNoticeService.selectByPrimaryKey(id); - mmap.addAttribute("notice", notice); - //把推送给该用户的公告设置为已读 - sysNoticeService.editUserState(id); + @PostMapping("/add") + @RequiresPermissions("gen:sysNotice:add") + @ResponseBody + public AjaxResult add(TSysNotice sysNotice) { + int b = sysNoticeService.insertTSysNotice(sysNotice); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 删除 + * + * @param ids + * @return + **/ + //@Log(title = "公告删除", action = "111") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("gen:sysNotice:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysNoticeService.deleteTSysNoticeByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 检查 + * + * @param tsysUser + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(TSysNotice sysNotice) { + int b = sysNoticeService.checkNameUnique(sysNotice); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + /** + * 根据公告id查询跳转到公告详情页面 + * + * @param id + * @param mmap + * @return + */ + //@Log(title = "字典数据表删除", action = "1") + @ApiOperation(value = "根据公告id查询跳转到公告详情页面", notes = " 根据公告id查询跳转到公告详情页面") + @GetMapping("/viewinfo/{id}") + public String viewinfo(@PathVariable("id") Long id, ModelMap mmap) { + TSysNotice notice = sysNoticeService.selectTSysNoticeById(id); + mmap.addAttribute("notice", notice); + //把推送给该用户的公告设置为已读 + sysNoticeService.editUserState(id); return prefix + "/view"; } - - - /** - * 修改跳转 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { - mmap.put("SysNotice", sysNoticeService.selectByPrimaryKey(id)); + + + /** + * 修改跳转 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put("SysNotice", sysNoticeService.selectTSysNoticeById(id)); return prefix + "/edit"; } - - /** + + /** * 修改保存 */ //@Log(title = "公告修改", action = "111") - @ApiOperation(value = "修改保存", notes = "修改保存") + @ApiOperation(value = "修改保存", notes = "修改保存") @RequiresPermissions("gen:sysNotice:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(SysNotice record) - { - return toAjax(sysNoticeService.updateByPrimaryKeySelective(record)); + public AjaxResult editSave(TSysNotice record) { + return toAjax(sysNoticeService.updateTSysNotice(record)); } - - - } diff --git a/src/main/java/com/fc/v2/mapper/auto/SysFileMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysFileMapper.java deleted file mode 100644 index 4c2caa3..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/SysFileMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.SysFile; -import com.fc.v2.model.auto.SysFileExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface SysFileMapper extends BaseMapper { - int countByExample(SysFileExample example); - - int deleteByExample(SysFileExample example); - - int deleteByPrimaryKey(String id); - - int insert(SysFile record); - - int insertSelective(SysFile record); - - List selectByExample(SysFileExample example); - - SysFile selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") SysFile record, @Param("example") SysFileExample example); - - int updateByExample(@Param("record") SysFile record, @Param("example") SysFileExample example); - - int updateByPrimaryKeySelective(SysFile record); - - int updateByPrimaryKey(SysFile record); -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/SysNoticeMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysNoticeMapper.java deleted file mode 100644 index 534dc54..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/SysNoticeMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.SysNotice; -import com.fc.v2.model.auto.SysNoticeExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 公告 SysNoticeMapper - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-08 01:38:44 - */ -public interface SysNoticeMapper extends BaseMapper { - - long countByExample(SysNoticeExample example); - - int deleteByExample(SysNoticeExample example); - - int deleteByPrimaryKey(String id); - - int insert(SysNotice record); - - int insertSelective(SysNotice record); - - List selectByExample(SysNoticeExample example); - - SysNotice selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") SysNotice record, @Param("example") SysNoticeExample example); - - int updateByExample(@Param("record") SysNotice record, @Param("example") SysNoticeExample example); - - int updateByPrimaryKeySelective(SysNotice record); - - int updateByPrimaryKey(SysNotice record); - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/SysNoticeUserMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysNoticeUserMapper.java deleted file mode 100644 index ea9c14f..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/SysNoticeUserMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.SysNoticeUser; -import com.fc.v2.model.auto.SysNoticeUserExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 公告_用户外键 SysNoticeUserMapper - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-08 02:12:54 - */ -public interface SysNoticeUserMapper extends BaseMapper { - - long countByExample(SysNoticeUserExample example); - - int deleteByExample(SysNoticeUserExample example); - - int deleteByPrimaryKey(String id); - - int insert(SysNoticeUser record); - - int insertSelective(SysNoticeUser record); - - List selectByExample(SysNoticeUserExample example); - - SysNoticeUser selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") SysNoticeUser record, @Param("example") SysNoticeUserExample example); - - int updateByExample(@Param("record") SysNoticeUser record, @Param("example") SysNoticeUserExample example); - - int updateByPrimaryKeySelective(SysNoticeUser record); - - int updateByPrimaryKey(SysNoticeUser record); - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobLogMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobLogMapper.java deleted file mode 100644 index 4ae9d54..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobLogMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.SysQuartzJobLog; -import com.fc.v2.model.auto.SysQuartzJobLogExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 定时任务调度日志表 SysQuartzJobLogMapper - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-13 00:03:42 - */ -public interface SysQuartzJobLogMapper extends BaseMapper { - - long countByExample(SysQuartzJobLogExample example); - - int deleteByExample(SysQuartzJobLogExample example); - - int deleteByPrimaryKey(String id); - - int insert(SysQuartzJobLog record); - - int insertSelective(SysQuartzJobLog record); - - List selectByExample(SysQuartzJobLogExample example); - - SysQuartzJobLog selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") SysQuartzJobLog record, @Param("example") SysQuartzJobLogExample example); - - int updateByExample(@Param("record") SysQuartzJobLog record, @Param("example") SysQuartzJobLogExample example); - - int updateByPrimaryKeySelective(SysQuartzJobLog record); - - int updateByPrimaryKey(SysQuartzJobLog record); - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobMapper.java deleted file mode 100644 index c3ba82e..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/SysQuartzJobMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.SysQuartzJob; -import com.fc.v2.model.auto.SysQuartzJobExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 定时任务调度表 SysQuartzJobMapper - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-13 00:03:35 - */ -public interface SysQuartzJobMapper extends BaseMapper { - - long countByExample(SysQuartzJobExample example); - - int deleteByExample(SysQuartzJobExample example); - - int deleteByPrimaryKey(String id); - - int insert(SysQuartzJob record); - - int insertSelective(SysQuartzJob record); - - List selectByExample(SysQuartzJobExample example); - - SysQuartzJob selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") SysQuartzJob record, @Param("example") SysQuartzJobExample example); - - int updateByExample(@Param("record") SysQuartzJob record, @Param("example") SysQuartzJobExample example); - - int updateByPrimaryKeySelective(SysQuartzJob record); - - int updateByPrimaryKey(SysQuartzJob record); - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysDictDataMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysDictDataMapper.java index ad72640..98a5b99 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TSysDictDataMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TSysDictDataMapper.java @@ -1,35 +1,16 @@ + package com.fc.v2.mapper.auto; +import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TSysDictData; -import com.fc.v2.model.auto.TSysDictDataExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** - * 字典数据表 + * 字典数据Mapper接口 * - * @author 一休 - * @email 438081243@qq.com - * @date 2019-09-08 00:10:43 + * @author zhaonz + * @date 2021-08-06 */ public interface TSysDictDataMapper extends BaseMapper { - long countByExample(TSysDictDataExample example); - - int deleteByExample(TSysDictDataExample example); - - int insert(TSysDictData record); - - int insertSelective(TSysDictData record); - - List selectByExample(TSysDictDataExample example); - - int updateByExampleSelective(@Param("record") TSysDictData record, @Param("example") TSysDictDataExample example); - - int updateByExample(@Param("record") TSysDictData record, @Param("example") TSysDictDataExample example); - - TSysDictData selectByPrimaryKey(String id); - int updateByPrimaryKeySelective(TSysDictData record); -} \ No newline at end of file +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysDictTypeMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysDictTypeMapper.java index 0501272..7f15676 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TSysDictTypeMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TSysDictTypeMapper.java @@ -1,39 +1,16 @@ + package com.fc.v2.mapper.auto; +import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TSysDictType; -import com.fc.v2.model.auto.TSysDictTypeExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** - * 字典类型表 + * 字典类型Mapper接口 * - * @author 一休 - * @email 438081243@qq.com - * @date 2019-09-05 12:34:25 + * @author zhaonz + * @date 2021-08-06 */ public interface TSysDictTypeMapper extends BaseMapper { - long countByExample(TSysDictTypeExample example); - - int deleteByExample(TSysDictTypeExample example); - - int deleteByPrimaryKey(String id); - - int insert(TSysDictType record); - - int insertSelective(TSysDictType record); - - List selectByExample(TSysDictTypeExample example); - - TSysDictType selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") TSysDictType record, @Param("example") TSysDictTypeExample example); - - int updateByExample(@Param("record") TSysDictType record, @Param("example") TSysDictTypeExample example); - - int updateByPrimaryKeySelective(TSysDictType record); - int updateByPrimaryKey(TSysDictType record); -} \ No newline at end of file +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysEmailMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysEmailMapper.java index 871fb22..e961b29 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TSysEmailMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TSysEmailMapper.java @@ -1,32 +1,16 @@ + package com.fc.v2.mapper.auto; +import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TSysEmail; -import com.fc.v2.model.auto.TSysEmailExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; +/** + * 电子邮件Mapper接口 + * + * @author zhaonz + * @date 2021-08-06 + */ public interface TSysEmailMapper extends BaseMapper { - long countByExample(TSysEmailExample example); - - int deleteByExample(TSysEmailExample example); - - int deleteByPrimaryKey(String id); - - int insert(TSysEmail record); - - int insertSelective(TSysEmail record); - - List selectByExample(TSysEmailExample example); - - TSysEmail selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") TSysEmail record, @Param("example") TSysEmailExample example); - - int updateByExample(@Param("record") TSysEmail record, @Param("example") TSysEmailExample example); - - int updateByPrimaryKeySelective(TSysEmail record); - int updateByPrimaryKey(TSysEmail record); -} \ No newline at end of file +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysFileMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysFileMapper.java new file mode 100644 index 0000000..745d855 --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysFileMapper.java @@ -0,0 +1,16 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysFile; + +/** + * 文件信息Mapper接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface TSysFileMapper extends BaseMapper { + +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysNoticeMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysNoticeMapper.java new file mode 100644 index 0000000..f0d1f4c --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysNoticeMapper.java @@ -0,0 +1,15 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysNotice; + +/** + * 公告Mapper接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface TSysNoticeMapper extends BaseMapper { +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysNoticeUserMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysNoticeUserMapper.java new file mode 100644 index 0000000..0cac3cb --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysNoticeUserMapper.java @@ -0,0 +1,16 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysNoticeUser; + +/** + * 公告_用户外键Mapper接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface TSysNoticeUserMapper extends BaseMapper { + +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysQuartzJobLogMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysQuartzJobLogMapper.java new file mode 100644 index 0000000..bf890e2 --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysQuartzJobLogMapper.java @@ -0,0 +1,16 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysQuartzJobLog; + +/** + * 定时任务调度日志Mapper接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface TSysQuartzJobLogMapper extends BaseMapper { + +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysQuartzJobMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysQuartzJobMapper.java new file mode 100644 index 0000000..7dcdf3e --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysQuartzJobMapper.java @@ -0,0 +1,16 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysQuartzJob; + +/** + * 定时任务调度Mapper接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface TSysQuartzJobMapper extends BaseMapper { + +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TsysOperLogMapper.java b/src/main/java/com/fc/v2/mapper/auto/TsysOperLogMapper.java index 96afa90..f2fd7ff 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TsysOperLogMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TsysOperLogMapper.java @@ -1,32 +1,16 @@ -package com.fc.v2.mapper.auto; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.TsysOperLog; -import com.fc.v2.model.auto.TsysOperLogExample; -import org.apache.ibatis.annotations.Param; +package com.fc.v2.mapper.auto; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysOperLog; -public interface TsysOperLogMapper extends BaseMapper { - int countByExample(TsysOperLogExample example); - - int deleteByExample(TsysOperLogExample example); - - int deleteByPrimaryKey(String id); - - int insert(TsysOperLog record); - - int insertSelective(TsysOperLog record); - - List selectByExample(TsysOperLogExample example); - - TsysOperLog selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") TsysOperLog record, @Param("example") TsysOperLogExample example); - - int updateByExample(@Param("record") TsysOperLog record, @Param("example") TsysOperLogExample example); - - int updateByPrimaryKeySelective(TsysOperLog record); +/** + * 日志记录Mapper接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface TSysOperLogMapper extends BaseMapper { - int updateByPrimaryKey(TsysOperLog record); -} \ No newline at end of file +} diff --git a/src/main/java/com/fc/v2/model/auto/SysFile.java b/src/main/java/com/fc/v2/model/auto/SysFile.java deleted file mode 100644 index 07fb899..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysFile.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.fc.v2.model.auto; - -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 java.util.Date; - -@TableName(value = "t_sys_file") -public class SysFile { - - @TableId(type = IdType.ASSIGN_ID) - private String id; - - private String fileName; - - private String bucketName; - - private Long fileSize; - - private String fileSuffix; - - private String createUserId; - - private String createUserName; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTime; - - private String updateUserId; - - private String updateUserName; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date updateTime; - - public SysFile(String id, String fileName, String bucketName, Long fileSize, String fileSuffix, String createUserId, String createUserName, Date createTime, String updateUserId, String updateUserName, Date updateTime) { - this.id = id; - this.fileName = fileName; - this.bucketName = bucketName; - this.fileSize = fileSize; - this.fileSuffix = fileSuffix; - this.createUserId = createUserId; - this.createUserName = createUserName; - this.createTime = createTime; - this.updateUserId = updateUserId; - this.updateUserName = updateUserName; - this.updateTime = updateTime; - } - - public SysFile() { - super(); - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id == null ? null : id.trim(); - } - - public String getFileName() { - return fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName == null ? null : fileName.trim(); - } - - public String getBucketName() { - return bucketName; - } - - public void setBucketName(String bucketName) { - this.bucketName = bucketName == null ? null : bucketName.trim(); - } - - public Long getFileSize() { - return fileSize; - } - - public void setFileSize(Long fileSize) { - this.fileSize = fileSize; - } - - public String getFileSuffix() { - return fileSuffix; - } - - public void setFileSuffix(String fileSuffix) { - this.fileSuffix = fileSuffix == null ? null : fileSuffix.trim(); - } - - public String getCreateUserId() { - return createUserId; - } - - public void setCreateUserId(String createUserId) { - this.createUserId = createUserId == null ? null : createUserId.trim(); - } - - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName == null ? null : createUserName.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public String getUpdateUserId() { - return updateUserId; - } - - public void setUpdateUserId(String updateUserId) { - this.updateUserId = updateUserId == null ? null : updateUserId.trim(); - } - - public String getUpdateUserName() { - return updateUserName; - } - - public void setUpdateUserName(String updateUserName) { - this.updateUserName = updateUserName == null ? null : updateUserName.trim(); - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysFileExample.java b/src/main/java/com/fc/v2/model/auto/SysFileExample.java deleted file mode 100644 index 69d1d91..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysFileExample.java +++ /dev/null @@ -1,941 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class SysFileExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysFileExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andFileNameIsNull() { - addCriterion("file_name is null"); - return (Criteria) this; - } - - public Criteria andFileNameIsNotNull() { - addCriterion("file_name is not null"); - return (Criteria) this; - } - - public Criteria andFileNameEqualTo(String value) { - addCriterion("file_name =", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameNotEqualTo(String value) { - addCriterion("file_name <>", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameGreaterThan(String value) { - addCriterion("file_name >", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameGreaterThanOrEqualTo(String value) { - addCriterion("file_name >=", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameLessThan(String value) { - addCriterion("file_name <", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameLessThanOrEqualTo(String value) { - addCriterion("file_name <=", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameLike(String value) { - addCriterion("file_name like", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameNotLike(String value) { - addCriterion("file_name not like", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameIn(List values) { - addCriterion("file_name in", values, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameNotIn(List values) { - addCriterion("file_name not in", values, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameBetween(String value1, String value2) { - addCriterion("file_name between", value1, value2, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameNotBetween(String value1, String value2) { - addCriterion("file_name not between", value1, value2, "fileName"); - return (Criteria) this; - } - - public Criteria andBucketNameIsNull() { - addCriterion("bucket_name is null"); - return (Criteria) this; - } - - public Criteria andBucketNameIsNotNull() { - addCriterion("bucket_name is not null"); - return (Criteria) this; - } - - public Criteria andBucketNameEqualTo(String value) { - addCriterion("bucket_name =", value, "bucketName"); - return (Criteria) this; - } - - public Criteria andBucketNameNotEqualTo(String value) { - addCriterion("bucket_name <>", value, "bucketName"); - return (Criteria) this; - } - - public Criteria andBucketNameGreaterThan(String value) { - addCriterion("bucket_name >", value, "bucketName"); - return (Criteria) this; - } - - public Criteria andBucketNameGreaterThanOrEqualTo(String value) { - addCriterion("bucket_name >=", value, "bucketName"); - return (Criteria) this; - } - - public Criteria andBucketNameLessThan(String value) { - addCriterion("bucket_name <", value, "bucketName"); - return (Criteria) this; - } - - public Criteria andBucketNameLessThanOrEqualTo(String value) { - addCriterion("bucket_name <=", value, "bucketName"); - return (Criteria) this; - } - - public Criteria andBucketNameLike(String value) { - addCriterion("bucket_name like", value, "bucketName"); - return (Criteria) this; - } - - public Criteria andBucketNameNotLike(String value) { - addCriterion("bucket_name not like", value, "bucketName"); - return (Criteria) this; - } - - public Criteria andBucketNameIn(List values) { - addCriterion("bucket_name in", values, "bucketName"); - return (Criteria) this; - } - - public Criteria andBucketNameNotIn(List values) { - addCriterion("bucket_name not in", values, "bucketName"); - return (Criteria) this; - } - - public Criteria andBucketNameBetween(String value1, String value2) { - addCriterion("bucket_name between", value1, value2, "bucketName"); - return (Criteria) this; - } - - public Criteria andBucketNameNotBetween(String value1, String value2) { - addCriterion("bucket_name not between", value1, value2, "bucketName"); - return (Criteria) this; - } - - public Criteria andFileSizeIsNull() { - addCriterion("file_size is null"); - return (Criteria) this; - } - - public Criteria andFileSizeIsNotNull() { - addCriterion("file_size is not null"); - return (Criteria) this; - } - - public Criteria andFileSizeEqualTo(Long value) { - addCriterion("file_size =", value, "fileSize"); - return (Criteria) this; - } - - public Criteria andFileSizeNotEqualTo(Long value) { - addCriterion("file_size <>", value, "fileSize"); - return (Criteria) this; - } - - public Criteria andFileSizeGreaterThan(Long value) { - addCriterion("file_size >", value, "fileSize"); - return (Criteria) this; - } - - public Criteria andFileSizeGreaterThanOrEqualTo(Long value) { - addCriterion("file_size >=", value, "fileSize"); - return (Criteria) this; - } - - public Criteria andFileSizeLessThan(Long value) { - addCriterion("file_size <", value, "fileSize"); - return (Criteria) this; - } - - public Criteria andFileSizeLessThanOrEqualTo(Long value) { - addCriterion("file_size <=", value, "fileSize"); - return (Criteria) this; - } - - public Criteria andFileSizeIn(List values) { - addCriterion("file_size in", values, "fileSize"); - return (Criteria) this; - } - - public Criteria andFileSizeNotIn(List values) { - addCriterion("file_size not in", values, "fileSize"); - return (Criteria) this; - } - - public Criteria andFileSizeBetween(Long value1, Long value2) { - addCriterion("file_size between", value1, value2, "fileSize"); - return (Criteria) this; - } - - public Criteria andFileSizeNotBetween(Long value1, Long value2) { - addCriterion("file_size not between", value1, value2, "fileSize"); - return (Criteria) this; - } - - public Criteria andFileSuffixIsNull() { - addCriterion("file_suffix is null"); - return (Criteria) this; - } - - public Criteria andFileSuffixIsNotNull() { - addCriterion("file_suffix is not null"); - return (Criteria) this; - } - - public Criteria andFileSuffixEqualTo(String value) { - addCriterion("file_suffix =", value, "fileSuffix"); - return (Criteria) this; - } - - public Criteria andFileSuffixNotEqualTo(String value) { - addCriterion("file_suffix <>", value, "fileSuffix"); - return (Criteria) this; - } - - public Criteria andFileSuffixGreaterThan(String value) { - addCriterion("file_suffix >", value, "fileSuffix"); - return (Criteria) this; - } - - public Criteria andFileSuffixGreaterThanOrEqualTo(String value) { - addCriterion("file_suffix >=", value, "fileSuffix"); - return (Criteria) this; - } - - public Criteria andFileSuffixLessThan(String value) { - addCriterion("file_suffix <", value, "fileSuffix"); - return (Criteria) this; - } - - public Criteria andFileSuffixLessThanOrEqualTo(String value) { - addCriterion("file_suffix <=", value, "fileSuffix"); - return (Criteria) this; - } - - public Criteria andFileSuffixLike(String value) { - addCriterion("file_suffix like", value, "fileSuffix"); - return (Criteria) this; - } - - public Criteria andFileSuffixNotLike(String value) { - addCriterion("file_suffix not like", value, "fileSuffix"); - return (Criteria) this; - } - - public Criteria andFileSuffixIn(List values) { - addCriterion("file_suffix in", values, "fileSuffix"); - return (Criteria) this; - } - - public Criteria andFileSuffixNotIn(List values) { - addCriterion("file_suffix not in", values, "fileSuffix"); - return (Criteria) this; - } - - public Criteria andFileSuffixBetween(String value1, String value2) { - addCriterion("file_suffix between", value1, value2, "fileSuffix"); - return (Criteria) this; - } - - public Criteria andFileSuffixNotBetween(String value1, String value2) { - addCriterion("file_suffix not between", value1, value2, "fileSuffix"); - return (Criteria) this; - } - - public Criteria andCreateUserIdIsNull() { - addCriterion("create_user_id is null"); - return (Criteria) this; - } - - public Criteria andCreateUserIdIsNotNull() { - addCriterion("create_user_id is not null"); - return (Criteria) this; - } - - public Criteria andCreateUserIdEqualTo(String value) { - addCriterion("create_user_id =", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdNotEqualTo(String value) { - addCriterion("create_user_id <>", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdGreaterThan(String value) { - addCriterion("create_user_id >", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdGreaterThanOrEqualTo(String value) { - addCriterion("create_user_id >=", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdLessThan(String value) { - addCriterion("create_user_id <", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdLessThanOrEqualTo(String value) { - addCriterion("create_user_id <=", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdLike(String value) { - addCriterion("create_user_id like", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdNotLike(String value) { - addCriterion("create_user_id not like", value, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdIn(List values) { - addCriterion("create_user_id in", values, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdNotIn(List values) { - addCriterion("create_user_id not in", values, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdBetween(String value1, String value2) { - addCriterion("create_user_id between", value1, value2, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserIdNotBetween(String value1, String value2) { - addCriterion("create_user_id not between", value1, value2, "createUserId"); - return (Criteria) this; - } - - public Criteria andCreateUserNameIsNull() { - addCriterion("create_user_name is null"); - return (Criteria) this; - } - - public Criteria andCreateUserNameIsNotNull() { - addCriterion("create_user_name is not null"); - return (Criteria) this; - } - - public Criteria andCreateUserNameEqualTo(String value) { - addCriterion("create_user_name =", value, "createUserName"); - return (Criteria) this; - } - - public Criteria andCreateUserNameNotEqualTo(String value) { - addCriterion("create_user_name <>", value, "createUserName"); - return (Criteria) this; - } - - public Criteria andCreateUserNameGreaterThan(String value) { - addCriterion("create_user_name >", value, "createUserName"); - return (Criteria) this; - } - - public Criteria andCreateUserNameGreaterThanOrEqualTo(String value) { - addCriterion("create_user_name >=", value, "createUserName"); - return (Criteria) this; - } - - public Criteria andCreateUserNameLessThan(String value) { - addCriterion("create_user_name <", value, "createUserName"); - return (Criteria) this; - } - - public Criteria andCreateUserNameLessThanOrEqualTo(String value) { - addCriterion("create_user_name <=", value, "createUserName"); - return (Criteria) this; - } - - public Criteria andCreateUserNameLike(String value) { - addCriterion("create_user_name like", value, "createUserName"); - return (Criteria) this; - } - - public Criteria andCreateUserNameNotLike(String value) { - addCriterion("create_user_name not like", value, "createUserName"); - return (Criteria) this; - } - - public Criteria andCreateUserNameIn(List values) { - addCriterion("create_user_name in", values, "createUserName"); - return (Criteria) this; - } - - public Criteria andCreateUserNameNotIn(List values) { - addCriterion("create_user_name not in", values, "createUserName"); - return (Criteria) this; - } - - public Criteria andCreateUserNameBetween(String value1, String value2) { - addCriterion("create_user_name between", value1, value2, "createUserName"); - return (Criteria) this; - } - - public Criteria andCreateUserNameNotBetween(String value1, String value2) { - addCriterion("create_user_name not between", value1, value2, "createUserName"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdIsNull() { - addCriterion("update_user_id is null"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdIsNotNull() { - addCriterion("update_user_id is not null"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdEqualTo(String value) { - addCriterion("update_user_id =", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdNotEqualTo(String value) { - addCriterion("update_user_id <>", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdGreaterThan(String value) { - addCriterion("update_user_id >", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdGreaterThanOrEqualTo(String value) { - addCriterion("update_user_id >=", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdLessThan(String value) { - addCriterion("update_user_id <", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdLessThanOrEqualTo(String value) { - addCriterion("update_user_id <=", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdLike(String value) { - addCriterion("update_user_id like", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdNotLike(String value) { - addCriterion("update_user_id not like", value, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdIn(List values) { - addCriterion("update_user_id in", values, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdNotIn(List values) { - addCriterion("update_user_id not in", values, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdBetween(String value1, String value2) { - addCriterion("update_user_id between", value1, value2, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserIdNotBetween(String value1, String value2) { - addCriterion("update_user_id not between", value1, value2, "updateUserId"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameIsNull() { - addCriterion("update_user_name is null"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameIsNotNull() { - addCriterion("update_user_name is not null"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameEqualTo(String value) { - addCriterion("update_user_name =", value, "updateUserName"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameNotEqualTo(String value) { - addCriterion("update_user_name <>", value, "updateUserName"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameGreaterThan(String value) { - addCriterion("update_user_name >", value, "updateUserName"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameGreaterThanOrEqualTo(String value) { - addCriterion("update_user_name >=", value, "updateUserName"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameLessThan(String value) { - addCriterion("update_user_name <", value, "updateUserName"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameLessThanOrEqualTo(String value) { - addCriterion("update_user_name <=", value, "updateUserName"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameLike(String value) { - addCriterion("update_user_name like", value, "updateUserName"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameNotLike(String value) { - addCriterion("update_user_name not like", value, "updateUserName"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameIn(List values) { - addCriterion("update_user_name in", values, "updateUserName"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameNotIn(List values) { - addCriterion("update_user_name not in", values, "updateUserName"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameBetween(String value1, String value2) { - addCriterion("update_user_name between", value1, value2, "updateUserName"); - return (Criteria) this; - } - - public Criteria andUpdateUserNameNotBetween(String value1, String value2) { - addCriterion("update_user_name not between", value1, value2, "updateUserName"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysNotice.java b/src/main/java/com/fc/v2/model/auto/SysNotice.java deleted file mode 100644 index 3df99a4..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysNotice.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.fc.v2.model.auto; - -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.fc.v2.util.DateUtils; - -import java.io.Serializable; -import java.util.Date; - -/** - * 公告 SysNotice - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-08 01:38:44 - */ -@TableName(value = "t_sys_notice") -public class SysNotice implements Serializable { - - private static final long serialVersionUID = 1L; - - - /** 主键 **/ - @TableId(type = IdType.ASSIGN_ID) - private String id; - - /** 标题 **/ - private String title; - - /** 内容 **/ - private String content; - - /** 类型 **/ - private Integer type; - - /** 创建人id **/ - private String createId; - - /** 创建人name **/ - private String createUsername; - - /** 发信时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTime; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - - public String getCreateId() { - return createId; - } - - public void setCreateId(String createId) { - this.createId = createId; - } - - - public String getCreateUsername() { - return createUsername; - } - - public void setCreateUsername(String createUsername) { - this.createUsername = createUsername; - } - - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - - public SysNotice() { - super(); - } - - - public SysNotice(String id,String title,String content,Integer type,String createId,String createUsername,Date createTime) { - - this.id = id; - this.title = title; - this.content = content; - this.type = type; - this.createId = createId; - this.createUsername = createUsername; - this.createTime = createTime; - } - - /** - * 格式化时间 - * @return YYYY_MM_DD - */ - public String getdate(){ - return DateUtils.dateTime(this.createTime); - } - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysNoticeExample.java b/src/main/java/com/fc/v2/model/auto/SysNoticeExample.java deleted file mode 100644 index f76a0df..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysNoticeExample.java +++ /dev/null @@ -1,705 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 公告 SysNoticeExample - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-08 01:38:44 - */ -public class SysNoticeExample { - - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysNoticeExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - - public Criteria andTitleIsNull() { - addCriterion("title is null"); - return (Criteria) this; - } - - public Criteria andTitleIsNotNull() { - addCriterion("title is not null"); - return (Criteria) this; - } - - public Criteria andTitleEqualTo(String value) { - addCriterion("title =", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotEqualTo(String value) { - addCriterion("title <>", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThan(String value) { - addCriterion("title >", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThanOrEqualTo(String value) { - addCriterion("title >=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThan(String value) { - addCriterion("title <", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThanOrEqualTo(String value) { - addCriterion("title <=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLike(String value) { - addCriterion("title like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotLike(String value) { - addCriterion("title not like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleIn(List values) { - addCriterion("title in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotIn(List values) { - addCriterion("title not in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleBetween(String value1, String value2) { - addCriterion("title between", value1, value2, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotBetween(String value1, String value2) { - addCriterion("title not between", value1, value2, "title"); - return (Criteria) this; - } - - - public Criteria andContentIsNull() { - addCriterion("content is null"); - return (Criteria) this; - } - - public Criteria andContentIsNotNull() { - addCriterion("content is not null"); - return (Criteria) this; - } - - public Criteria andContentEqualTo(String value) { - addCriterion("content =", value, "content"); - return (Criteria) this; - } - - public Criteria andContentNotEqualTo(String value) { - addCriterion("content <>", value, "content"); - return (Criteria) this; - } - - public Criteria andContentGreaterThan(String value) { - addCriterion("content >", value, "content"); - return (Criteria) this; - } - - public Criteria andContentGreaterThanOrEqualTo(String value) { - addCriterion("content >=", value, "content"); - return (Criteria) this; - } - - public Criteria andContentLessThan(String value) { - addCriterion("content <", value, "content"); - return (Criteria) this; - } - - public Criteria andContentLessThanOrEqualTo(String value) { - addCriterion("content <=", value, "content"); - return (Criteria) this; - } - - public Criteria andContentLike(String value) { - addCriterion("content like", value, "content"); - return (Criteria) this; - } - - public Criteria andContentNotLike(String value) { - addCriterion("content not like", value, "content"); - return (Criteria) this; - } - - public Criteria andContentIn(List values) { - addCriterion("content in", values, "content"); - return (Criteria) this; - } - - public Criteria andContentNotIn(List values) { - addCriterion("content not in", values, "content"); - return (Criteria) this; - } - - public Criteria andContentBetween(String value1, String value2) { - addCriterion("content between", value1, value2, "content"); - return (Criteria) this; - } - - public Criteria andContentNotBetween(String value1, String value2) { - addCriterion("content not between", value1, value2, "content"); - return (Criteria) this; - } - - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(Integer value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(Integer value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(Integer value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(Integer value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(Integer value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLike(Integer value) { - addCriterion("type like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotLike(Integer value) { - addCriterion("type not like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(Integer value1, Integer value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(Integer value1, Integer value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - - public Criteria andCreateIdIsNull() { - addCriterion("create_id is null"); - return (Criteria) this; - } - - public Criteria andCreateIdIsNotNull() { - addCriterion("create_id is not null"); - return (Criteria) this; - } - - public Criteria andCreateIdEqualTo(String value) { - addCriterion("create_id =", value, "createId"); - return (Criteria) this; - } - - public Criteria andCreateIdNotEqualTo(String value) { - addCriterion("create_id <>", value, "createId"); - return (Criteria) this; - } - - public Criteria andCreateIdGreaterThan(String value) { - addCriterion("create_id >", value, "createId"); - return (Criteria) this; - } - - public Criteria andCreateIdGreaterThanOrEqualTo(String value) { - addCriterion("create_id >=", value, "createId"); - return (Criteria) this; - } - - public Criteria andCreateIdLessThan(String value) { - addCriterion("create_id <", value, "createId"); - return (Criteria) this; - } - - public Criteria andCreateIdLessThanOrEqualTo(String value) { - addCriterion("create_id <=", value, "createId"); - return (Criteria) this; - } - - public Criteria andCreateIdLike(String value) { - addCriterion("create_id like", value, "createId"); - return (Criteria) this; - } - - public Criteria andCreateIdNotLike(String value) { - addCriterion("create_id not like", value, "createId"); - return (Criteria) this; - } - - public Criteria andCreateIdIn(List values) { - addCriterion("create_id in", values, "createId"); - return (Criteria) this; - } - - public Criteria andCreateIdNotIn(List values) { - addCriterion("create_id not in", values, "createId"); - return (Criteria) this; - } - - public Criteria andCreateIdBetween(String value1, String value2) { - addCriterion("create_id between", value1, value2, "createId"); - return (Criteria) this; - } - - public Criteria andCreateIdNotBetween(String value1, String value2) { - addCriterion("create_id not between", value1, value2, "createId"); - return (Criteria) this; - } - - - public Criteria andCreateUsernameIsNull() { - addCriterion("create_username is null"); - return (Criteria) this; - } - - public Criteria andCreateUsernameIsNotNull() { - addCriterion("create_username is not null"); - return (Criteria) this; - } - - public Criteria andCreateUsernameEqualTo(String value) { - addCriterion("create_username =", value, "createUsername"); - return (Criteria) this; - } - - public Criteria andCreateUsernameNotEqualTo(String value) { - addCriterion("create_username <>", value, "createUsername"); - return (Criteria) this; - } - - public Criteria andCreateUsernameGreaterThan(String value) { - addCriterion("create_username >", value, "createUsername"); - return (Criteria) this; - } - - public Criteria andCreateUsernameGreaterThanOrEqualTo(String value) { - addCriterion("create_username >=", value, "createUsername"); - return (Criteria) this; - } - - public Criteria andCreateUsernameLessThan(String value) { - addCriterion("create_username <", value, "createUsername"); - return (Criteria) this; - } - - public Criteria andCreateUsernameLessThanOrEqualTo(String value) { - addCriterion("create_username <=", value, "createUsername"); - return (Criteria) this; - } - - public Criteria andCreateUsernameLike(String value) { - addCriterion("create_username like", value, "createUsername"); - return (Criteria) this; - } - - public Criteria andCreateUsernameNotLike(String value) { - addCriterion("create_username not like", value, "createUsername"); - return (Criteria) this; - } - - public Criteria andCreateUsernameIn(List values) { - addCriterion("create_username in", values, "createUsername"); - return (Criteria) this; - } - - public Criteria andCreateUsernameNotIn(List values) { - addCriterion("create_username not in", values, "createUsername"); - return (Criteria) this; - } - - public Criteria andCreateUsernameBetween(String value1, String value2) { - addCriterion("create_username between", value1, value2, "createUsername"); - return (Criteria) this; - } - - public Criteria andCreateUsernameNotBetween(String value1, String value2) { - addCriterion("create_username not between", value1, value2, "createUsername"); - return (Criteria) this; - } - - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLike(Date value) { - addCriterion("create_time like", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotLike(Date value) { - addCriterion("create_time not like", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysNoticeUser.java b/src/main/java/com/fc/v2/model/auto/SysNoticeUser.java deleted file mode 100644 index 794dfa2..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysNoticeUser.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.fc.v2.model.auto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.lang.Integer; - -/** - * 公告_用户外键 SysNoticeUser - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-08 02:12:54 - */ -@TableName(value = "t_sys_notice_user") -public class SysNoticeUser implements Serializable { - - private static final long serialVersionUID = 1L; - - - /** 主键 **/ - @TableId(type = IdType.ASSIGN_ID) - private String id; - - /** 公告id **/ - private String noticeId; - - /** 用户id **/ - private String userId; - - /** 0未阅读 1 阅读 **/ - private Integer state; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - - public String getNoticeId() { - return noticeId; - } - - public void setNoticeId(String noticeId) { - this.noticeId = noticeId; - } - - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - - public Integer getState() { - return state; - } - - public void setState(Integer state) { - this.state = state; - } - - - public SysNoticeUser() { - super(); - } - - - public SysNoticeUser(String id,String noticeId,String userId,Integer state) { - - this.id = id; - this.noticeId = noticeId; - this.userId = userId; - this.state = state; - - } - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysNoticeUserExample.java b/src/main/java/com/fc/v2/model/auto/SysNoticeUserExample.java deleted file mode 100644 index 0998966..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysNoticeUserExample.java +++ /dev/null @@ -1,491 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.List; - -/** - * 公告_用户外键 SysNoticeUserExample - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-08 02:12:54 - */ -public class SysNoticeUserExample { - - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysNoticeUserExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - - public Criteria andNoticeIdIsNull() { - addCriterion("notice_id is null"); - return (Criteria) this; - } - - public Criteria andNoticeIdIsNotNull() { - addCriterion("notice_id is not null"); - return (Criteria) this; - } - - public Criteria andNoticeIdEqualTo(String value) { - addCriterion("notice_id =", value, "noticeId"); - return (Criteria) this; - } - - public Criteria andNoticeIdNotEqualTo(String value) { - addCriterion("notice_id <>", value, "noticeId"); - return (Criteria) this; - } - - public Criteria andNoticeIdGreaterThan(String value) { - addCriterion("notice_id >", value, "noticeId"); - return (Criteria) this; - } - - public Criteria andNoticeIdGreaterThanOrEqualTo(String value) { - addCriterion("notice_id >=", value, "noticeId"); - return (Criteria) this; - } - - public Criteria andNoticeIdLessThan(String value) { - addCriterion("notice_id <", value, "noticeId"); - return (Criteria) this; - } - - public Criteria andNoticeIdLessThanOrEqualTo(String value) { - addCriterion("notice_id <=", value, "noticeId"); - return (Criteria) this; - } - - public Criteria andNoticeIdLike(String value) { - addCriterion("notice_id like", value, "noticeId"); - return (Criteria) this; - } - - public Criteria andNoticeIdNotLike(String value) { - addCriterion("notice_id not like", value, "noticeId"); - return (Criteria) this; - } - - public Criteria andNoticeIdIn(List values) { - addCriterion("notice_id in", values, "noticeId"); - return (Criteria) this; - } - - public Criteria andNoticeIdNotIn(List values) { - addCriterion("notice_id not in", values, "noticeId"); - return (Criteria) this; - } - - public Criteria andNoticeIdBetween(String value1, String value2) { - addCriterion("notice_id between", value1, value2, "noticeId"); - return (Criteria) this; - } - - public Criteria andNoticeIdNotBetween(String value1, String value2) { - addCriterion("notice_id not between", value1, value2, "noticeId"); - return (Criteria) this; - } - - - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); - return (Criteria) this; - } - - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); - return (Criteria) this; - } - - public Criteria andUserIdEqualTo(String value) { - addCriterion("user_id =", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotEqualTo(String value) { - addCriterion("user_id <>", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThan(String value) { - addCriterion("user_id >", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThanOrEqualTo(String value) { - addCriterion("user_id >=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThan(String value) { - addCriterion("user_id <", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThanOrEqualTo(String value) { - addCriterion("user_id <=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLike(String value) { - addCriterion("user_id like", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotLike(String value) { - addCriterion("user_id not like", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdBetween(String value1, String value2) { - addCriterion("user_id between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotBetween(String value1, String value2) { - addCriterion("user_id not between", value1, value2, "userId"); - return (Criteria) this; - } - - - public Criteria andStateIsNull() { - addCriterion("state is null"); - return (Criteria) this; - } - - public Criteria andStateIsNotNull() { - addCriterion("state is not null"); - return (Criteria) this; - } - - public Criteria andStateEqualTo(Integer value) { - addCriterion("state =", value, "state"); - return (Criteria) this; - } - - public Criteria andStateNotEqualTo(Integer value) { - addCriterion("state <>", value, "state"); - return (Criteria) this; - } - - public Criteria andStateGreaterThan(Integer value) { - addCriterion("state >", value, "state"); - return (Criteria) this; - } - - public Criteria andStateGreaterThanOrEqualTo(Integer value) { - addCriterion("state >=", value, "state"); - return (Criteria) this; - } - - public Criteria andStateLessThan(Integer value) { - addCriterion("state <", value, "state"); - return (Criteria) this; - } - - public Criteria andStateLessThanOrEqualTo(Integer value) { - addCriterion("state <=", value, "state"); - return (Criteria) this; - } - - public Criteria andStateLike(Integer value) { - addCriterion("state like", value, "state"); - return (Criteria) this; - } - - public Criteria andStateNotLike(Integer value) { - addCriterion("state not like", value, "state"); - return (Criteria) this; - } - - public Criteria andStateIn(List values) { - addCriterion("state in", values, "state"); - return (Criteria) this; - } - - public Criteria andStateNotIn(List values) { - addCriterion("state not in", values, "state"); - return (Criteria) this; - } - - public Criteria andStateBetween(Integer value1, Integer value2) { - addCriterion("state between", value1, value2, "state"); - return (Criteria) this; - } - - public Criteria andStateNotBetween(Integer value1, Integer value2) { - addCriterion("state not between", value1, value2, "state"); - return (Criteria) this; - } - - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysQuartzJob.java b/src/main/java/com/fc/v2/model/auto/SysQuartzJob.java deleted file mode 100644 index 102a2f9..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysQuartzJob.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.fc.v2.model.auto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.lang.Integer; - -/** - * 定时任务调度表 SysQuartzJob - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-13 00:03:35 - */ -@TableName(value = "t_sys_quartz_job") -public class SysQuartzJob implements Serializable { - - private static final long serialVersionUID = 1L; - - - /** id **/ - @TableId(type = IdType.ASSIGN_ID) - private String id; - - /** 任务名称 **/ - private String jobName; - - /** 任务组名 **/ - private String jobGroup; - - /** 调用目标字符串 **/ - private String invokeTarget; - - /** cron执行表达式 **/ - private String cronExpression; - - /** cron计划策略 **/ - private String misfirePolicy; - - /** 是否并发执行（0允许 1禁止） **/ - private String concurrent; - - /** 任务状态（0正常 1暂停） **/ - private Integer status; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - - public String getJobName() { - return jobName; - } - - public void setJobName(String jobName) { - this.jobName = jobName; - } - - - public String getJobGroup() { - return jobGroup; - } - - public void setJobGroup(String jobGroup) { - this.jobGroup = jobGroup; - } - - - public String getInvokeTarget() { - return invokeTarget; - } - - public void setInvokeTarget(String invokeTarget) { - this.invokeTarget = invokeTarget; - } - - - public String getCronExpression() { - return cronExpression; - } - - public void setCronExpression(String cronExpression) { - this.cronExpression = cronExpression; - } - - - public String getMisfirePolicy() { - return misfirePolicy; - } - - public void setMisfirePolicy(String misfirePolicy) { - this.misfirePolicy = misfirePolicy; - } - - - public String getConcurrent() { - return concurrent; - } - - public void setConcurrent(String concurrent) { - this.concurrent = concurrent; - } - - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - - public SysQuartzJob() { - super(); - } - - - public SysQuartzJob(String id,String jobName,String jobGroup,String invokeTarget,String cronExpression,String misfirePolicy,String concurrent,Integer status) { - - this.id = id; - this.jobName = jobName; - this.jobGroup = jobGroup; - this.invokeTarget = invokeTarget; - this.cronExpression = cronExpression; - this.misfirePolicy = misfirePolicy; - this.concurrent = concurrent; - this.status = status; - - } - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysQuartzJobExample.java b/src/main/java/com/fc/v2/model/auto/SysQuartzJobExample.java deleted file mode 100644 index 343c73e..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysQuartzJobExample.java +++ /dev/null @@ -1,778 +0,0 @@ -package com.fc.v2.model.auto; - -import com.baomidou.mybatisplus.annotation.TableName; - -import java.util.ArrayList; -import java.util.List; - -/** - * 定时任务调度表 SysQuartzJobExample - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-13 00:03:35 - */ -@TableName(value = "t_sys_quartz_job") -public class SysQuartzJobExample { - - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysQuartzJobExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - - public Criteria andJobNameIsNull() { - addCriterion("job_name is null"); - return (Criteria) this; - } - - public Criteria andJobNameIsNotNull() { - addCriterion("job_name is not null"); - return (Criteria) this; - } - - public Criteria andJobNameEqualTo(String value) { - addCriterion("job_name =", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameNotEqualTo(String value) { - addCriterion("job_name <>", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameGreaterThan(String value) { - addCriterion("job_name >", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameGreaterThanOrEqualTo(String value) { - addCriterion("job_name >=", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameLessThan(String value) { - addCriterion("job_name <", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameLessThanOrEqualTo(String value) { - addCriterion("job_name <=", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameLike(String value) { - addCriterion("job_name like", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameNotLike(String value) { - addCriterion("job_name not like", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameIn(List values) { - addCriterion("job_name in", values, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameNotIn(List values) { - addCriterion("job_name not in", values, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameBetween(String value1, String value2) { - addCriterion("job_name between", value1, value2, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameNotBetween(String value1, String value2) { - addCriterion("job_name not between", value1, value2, "jobName"); - return (Criteria) this; - } - - - public Criteria andJobGroupIsNull() { - addCriterion("job_group is null"); - return (Criteria) this; - } - - public Criteria andJobGroupIsNotNull() { - addCriterion("job_group is not null"); - return (Criteria) this; - } - - public Criteria andJobGroupEqualTo(String value) { - addCriterion("job_group =", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupNotEqualTo(String value) { - addCriterion("job_group <>", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupGreaterThan(String value) { - addCriterion("job_group >", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupGreaterThanOrEqualTo(String value) { - addCriterion("job_group >=", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupLessThan(String value) { - addCriterion("job_group <", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupLessThanOrEqualTo(String value) { - addCriterion("job_group <=", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupLike(String value) { - addCriterion("job_group like", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupNotLike(String value) { - addCriterion("job_group not like", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupIn(List values) { - addCriterion("job_group in", values, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupNotIn(List values) { - addCriterion("job_group not in", values, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupBetween(String value1, String value2) { - addCriterion("job_group between", value1, value2, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupNotBetween(String value1, String value2) { - addCriterion("job_group not between", value1, value2, "jobGroup"); - return (Criteria) this; - } - - - public Criteria andInvokeTargetIsNull() { - addCriterion("invoke_target is null"); - return (Criteria) this; - } - - public Criteria andInvokeTargetIsNotNull() { - addCriterion("invoke_target is not null"); - return (Criteria) this; - } - - public Criteria andInvokeTargetEqualTo(String value) { - addCriterion("invoke_target =", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetNotEqualTo(String value) { - addCriterion("invoke_target <>", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetGreaterThan(String value) { - addCriterion("invoke_target >", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetGreaterThanOrEqualTo(String value) { - addCriterion("invoke_target >=", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetLessThan(String value) { - addCriterion("invoke_target <", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetLessThanOrEqualTo(String value) { - addCriterion("invoke_target <=", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetLike(String value) { - addCriterion("invoke_target like", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetNotLike(String value) { - addCriterion("invoke_target not like", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetIn(List values) { - addCriterion("invoke_target in", values, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetNotIn(List values) { - addCriterion("invoke_target not in", values, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetBetween(String value1, String value2) { - addCriterion("invoke_target between", value1, value2, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetNotBetween(String value1, String value2) { - addCriterion("invoke_target not between", value1, value2, "invokeTarget"); - return (Criteria) this; - } - - - public Criteria andCronExpressionIsNull() { - addCriterion("cron_expression is null"); - return (Criteria) this; - } - - public Criteria andCronExpressionIsNotNull() { - addCriterion("cron_expression is not null"); - return (Criteria) this; - } - - public Criteria andCronExpressionEqualTo(String value) { - addCriterion("cron_expression =", value, "cronExpression"); - return (Criteria) this; - } - - public Criteria andCronExpressionNotEqualTo(String value) { - addCriterion("cron_expression <>", value, "cronExpression"); - return (Criteria) this; - } - - public Criteria andCronExpressionGreaterThan(String value) { - addCriterion("cron_expression >", value, "cronExpression"); - return (Criteria) this; - } - - public Criteria andCronExpressionGreaterThanOrEqualTo(String value) { - addCriterion("cron_expression >=", value, "cronExpression"); - return (Criteria) this; - } - - public Criteria andCronExpressionLessThan(String value) { - addCriterion("cron_expression <", value, "cronExpression"); - return (Criteria) this; - } - - public Criteria andCronExpressionLessThanOrEqualTo(String value) { - addCriterion("cron_expression <=", value, "cronExpression"); - return (Criteria) this; - } - - public Criteria andCronExpressionLike(String value) { - addCriterion("cron_expression like", value, "cronExpression"); - return (Criteria) this; - } - - public Criteria andCronExpressionNotLike(String value) { - addCriterion("cron_expression not like", value, "cronExpression"); - return (Criteria) this; - } - - public Criteria andCronExpressionIn(List values) { - addCriterion("cron_expression in", values, "cronExpression"); - return (Criteria) this; - } - - public Criteria andCronExpressionNotIn(List values) { - addCriterion("cron_expression not in", values, "cronExpression"); - return (Criteria) this; - } - - public Criteria andCronExpressionBetween(String value1, String value2) { - addCriterion("cron_expression between", value1, value2, "cronExpression"); - return (Criteria) this; - } - - public Criteria andCronExpressionNotBetween(String value1, String value2) { - addCriterion("cron_expression not between", value1, value2, "cronExpression"); - return (Criteria) this; - } - - - public Criteria andMisfirePolicyIsNull() { - addCriterion("misfire_policy is null"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyIsNotNull() { - addCriterion("misfire_policy is not null"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyEqualTo(String value) { - addCriterion("misfire_policy =", value, "misfirePolicy"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyNotEqualTo(String value) { - addCriterion("misfire_policy <>", value, "misfirePolicy"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyGreaterThan(String value) { - addCriterion("misfire_policy >", value, "misfirePolicy"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyGreaterThanOrEqualTo(String value) { - addCriterion("misfire_policy >=", value, "misfirePolicy"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyLessThan(String value) { - addCriterion("misfire_policy <", value, "misfirePolicy"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyLessThanOrEqualTo(String value) { - addCriterion("misfire_policy <=", value, "misfirePolicy"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyLike(String value) { - addCriterion("misfire_policy like", value, "misfirePolicy"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyNotLike(String value) { - addCriterion("misfire_policy not like", value, "misfirePolicy"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyIn(List values) { - addCriterion("misfire_policy in", values, "misfirePolicy"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyNotIn(List values) { - addCriterion("misfire_policy not in", values, "misfirePolicy"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyBetween(String value1, String value2) { - addCriterion("misfire_policy between", value1, value2, "misfirePolicy"); - return (Criteria) this; - } - - public Criteria andMisfirePolicyNotBetween(String value1, String value2) { - addCriterion("misfire_policy not between", value1, value2, "misfirePolicy"); - return (Criteria) this; - } - - - public Criteria andConcurrentIsNull() { - addCriterion("concurrent is null"); - return (Criteria) this; - } - - public Criteria andConcurrentIsNotNull() { - addCriterion("concurrent is not null"); - return (Criteria) this; - } - - public Criteria andConcurrentEqualTo(String value) { - addCriterion("concurrent =", value, "concurrent"); - return (Criteria) this; - } - - public Criteria andConcurrentNotEqualTo(String value) { - addCriterion("concurrent <>", value, "concurrent"); - return (Criteria) this; - } - - public Criteria andConcurrentGreaterThan(String value) { - addCriterion("concurrent >", value, "concurrent"); - return (Criteria) this; - } - - public Criteria andConcurrentGreaterThanOrEqualTo(String value) { - addCriterion("concurrent >=", value, "concurrent"); - return (Criteria) this; - } - - public Criteria andConcurrentLessThan(String value) { - addCriterion("concurrent <", value, "concurrent"); - return (Criteria) this; - } - - public Criteria andConcurrentLessThanOrEqualTo(String value) { - addCriterion("concurrent <=", value, "concurrent"); - return (Criteria) this; - } - - public Criteria andConcurrentLike(String value) { - addCriterion("concurrent like", value, "concurrent"); - return (Criteria) this; - } - - public Criteria andConcurrentNotLike(String value) { - addCriterion("concurrent not like", value, "concurrent"); - return (Criteria) this; - } - - public Criteria andConcurrentIn(List values) { - addCriterion("concurrent in", values, "concurrent"); - return (Criteria) this; - } - - public Criteria andConcurrentNotIn(List values) { - addCriterion("concurrent not in", values, "concurrent"); - return (Criteria) this; - } - - public Criteria andConcurrentBetween(String value1, String value2) { - addCriterion("concurrent between", value1, value2, "concurrent"); - return (Criteria) this; - } - - public Criteria andConcurrentNotBetween(String value1, String value2) { - addCriterion("concurrent not between", value1, value2, "concurrent"); - return (Criteria) this; - } - - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(Integer value) { - addCriterion("status =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(Integer value) { - addCriterion("status <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(Integer value) { - addCriterion("status >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("status >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(Integer value) { - addCriterion("status <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(Integer value) { - addCriterion("status <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLike(Integer value) { - addCriterion("status like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(Integer value) { - addCriterion("status not like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(Integer value1, Integer value2) { - addCriterion("status between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(Integer value1, Integer value2) { - addCriterion("status not between", value1, value2, "status"); - return (Criteria) this; - } - - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysQuartzJobLog.java b/src/main/java/com/fc/v2/model/auto/SysQuartzJobLog.java deleted file mode 100644 index 590efa6..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysQuartzJobLog.java +++ /dev/null @@ -1,163 +0,0 @@ -package com.fc.v2.model.auto; - -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.fc.v2.util.DateUtils; - -import java.io.Serializable; -import java.util.Date; - -/** - * 定时任务调度日志表 SysQuartzJobLog - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-13 00:03:42 - */ -@TableName(value = "t_sys_quartz_job_log") -public class SysQuartzJobLog implements Serializable { - - private static final long serialVersionUID = 1L; - - - /** 主键 **/ - @TableId(type = IdType.ASSIGN_ID) - private String id; - - /** 任务名称 **/ - private String jobName; - - /** 任务组名 **/ - private String jobGroup; - - /** 调用目标字符串 **/ - private String invokeTarget; - - /** 日志信息 **/ - private String jobMessage; - - /** 执行状态（0正常 1失败） **/ - private Integer status; - - /** 异常信息 **/ - private String exceptionInfo; - - /** 开始时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date startTime; - - /** 结束时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date endTime; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - - public String getJobName() { - return jobName; - } - - public void setJobName(String jobName) { - this.jobName = jobName; - } - - - public String getJobGroup() { - return jobGroup; - } - - public void setJobGroup(String jobGroup) { - this.jobGroup = jobGroup; - } - - - public String getInvokeTarget() { - return invokeTarget; - } - - public void setInvokeTarget(String invokeTarget) { - this.invokeTarget = invokeTarget; - } - - - public String getJobMessage() { - return jobMessage; - } - - public void setJobMessage(String jobMessage) { - this.jobMessage = jobMessage; - } - - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - - public String getExceptionInfo() { - return exceptionInfo; - } - - public void setExceptionInfo(String exceptionInfo) { - this.exceptionInfo = exceptionInfo; - } - - - public Date getStartTime() { - return startTime; - } - - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - - public SysQuartzJobLog() { - super(); - } - - - public SysQuartzJobLog(String id,String jobName,String jobGroup,String invokeTarget,String jobMessage,Integer status,String exceptionInfo,Date startTime,Date endTime) { - - this.id = id; - this.jobName = jobName; - this.jobGroup = jobGroup; - this.invokeTarget = invokeTarget; - this.jobMessage = jobMessage; - this.status = status; - this.exceptionInfo = exceptionInfo; - this.startTime = startTime; - this.endTime = endTime; - - } - - /** - * 格式化时间 - * @return yyyy-MM-dd HH:mm:ss - */ - public String getdate(Date date){ - return DateUtils.parseDateToStr(DateUtils.DATE_TIME_PATTERN,date); - } - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysQuartzJobLogExample.java b/src/main/java/com/fc/v2/model/auto/SysQuartzJobLogExample.java deleted file mode 100644 index 931a280..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysQuartzJobLogExample.java +++ /dev/null @@ -1,847 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 定时任务调度日志表 SysQuartzJobLogExample - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-13 00:03:42 - */ -public class SysQuartzJobLogExample { - - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysQuartzJobLogExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - - public Criteria andJobNameIsNull() { - addCriterion("job_name is null"); - return (Criteria) this; - } - - public Criteria andJobNameIsNotNull() { - addCriterion("job_name is not null"); - return (Criteria) this; - } - - public Criteria andJobNameEqualTo(String value) { - addCriterion("job_name =", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameNotEqualTo(String value) { - addCriterion("job_name <>", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameGreaterThan(String value) { - addCriterion("job_name >", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameGreaterThanOrEqualTo(String value) { - addCriterion("job_name >=", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameLessThan(String value) { - addCriterion("job_name <", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameLessThanOrEqualTo(String value) { - addCriterion("job_name <=", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameLike(String value) { - addCriterion("job_name like", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameNotLike(String value) { - addCriterion("job_name not like", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameIn(List values) { - addCriterion("job_name in", values, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameNotIn(List values) { - addCriterion("job_name not in", values, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameBetween(String value1, String value2) { - addCriterion("job_name between", value1, value2, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameNotBetween(String value1, String value2) { - addCriterion("job_name not between", value1, value2, "jobName"); - return (Criteria) this; - } - - - public Criteria andJobGroupIsNull() { - addCriterion("job_group is null"); - return (Criteria) this; - } - - public Criteria andJobGroupIsNotNull() { - addCriterion("job_group is not null"); - return (Criteria) this; - } - - public Criteria andJobGroupEqualTo(String value) { - addCriterion("job_group =", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupNotEqualTo(String value) { - addCriterion("job_group <>", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupGreaterThan(String value) { - addCriterion("job_group >", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupGreaterThanOrEqualTo(String value) { - addCriterion("job_group >=", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupLessThan(String value) { - addCriterion("job_group <", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupLessThanOrEqualTo(String value) { - addCriterion("job_group <=", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupLike(String value) { - addCriterion("job_group like", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupNotLike(String value) { - addCriterion("job_group not like", value, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupIn(List values) { - addCriterion("job_group in", values, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupNotIn(List values) { - addCriterion("job_group not in", values, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupBetween(String value1, String value2) { - addCriterion("job_group between", value1, value2, "jobGroup"); - return (Criteria) this; - } - - public Criteria andJobGroupNotBetween(String value1, String value2) { - addCriterion("job_group not between", value1, value2, "jobGroup"); - return (Criteria) this; - } - - - public Criteria andInvokeTargetIsNull() { - addCriterion("invoke_target is null"); - return (Criteria) this; - } - - public Criteria andInvokeTargetIsNotNull() { - addCriterion("invoke_target is not null"); - return (Criteria) this; - } - - public Criteria andInvokeTargetEqualTo(String value) { - addCriterion("invoke_target =", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetNotEqualTo(String value) { - addCriterion("invoke_target <>", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetGreaterThan(String value) { - addCriterion("invoke_target >", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetGreaterThanOrEqualTo(String value) { - addCriterion("invoke_target >=", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetLessThan(String value) { - addCriterion("invoke_target <", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetLessThanOrEqualTo(String value) { - addCriterion("invoke_target <=", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetLike(String value) { - addCriterion("invoke_target like", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetNotLike(String value) { - addCriterion("invoke_target not like", value, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetIn(List values) { - addCriterion("invoke_target in", values, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetNotIn(List values) { - addCriterion("invoke_target not in", values, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetBetween(String value1, String value2) { - addCriterion("invoke_target between", value1, value2, "invokeTarget"); - return (Criteria) this; - } - - public Criteria andInvokeTargetNotBetween(String value1, String value2) { - addCriterion("invoke_target not between", value1, value2, "invokeTarget"); - return (Criteria) this; - } - - - public Criteria andJobMessageIsNull() { - addCriterion("job_message is null"); - return (Criteria) this; - } - - public Criteria andJobMessageIsNotNull() { - addCriterion("job_message is not null"); - return (Criteria) this; - } - - public Criteria andJobMessageEqualTo(String value) { - addCriterion("job_message =", value, "jobMessage"); - return (Criteria) this; - } - - public Criteria andJobMessageNotEqualTo(String value) { - addCriterion("job_message <>", value, "jobMessage"); - return (Criteria) this; - } - - public Criteria andJobMessageGreaterThan(String value) { - addCriterion("job_message >", value, "jobMessage"); - return (Criteria) this; - } - - public Criteria andJobMessageGreaterThanOrEqualTo(String value) { - addCriterion("job_message >=", value, "jobMessage"); - return (Criteria) this; - } - - public Criteria andJobMessageLessThan(String value) { - addCriterion("job_message <", value, "jobMessage"); - return (Criteria) this; - } - - public Criteria andJobMessageLessThanOrEqualTo(String value) { - addCriterion("job_message <=", value, "jobMessage"); - return (Criteria) this; - } - - public Criteria andJobMessageLike(String value) { - addCriterion("job_message like", value, "jobMessage"); - return (Criteria) this; - } - - public Criteria andJobMessageNotLike(String value) { - addCriterion("job_message not like", value, "jobMessage"); - return (Criteria) this; - } - - public Criteria andJobMessageIn(List values) { - addCriterion("job_message in", values, "jobMessage"); - return (Criteria) this; - } - - public Criteria andJobMessageNotIn(List values) { - addCriterion("job_message not in", values, "jobMessage"); - return (Criteria) this; - } - - public Criteria andJobMessageBetween(String value1, String value2) { - addCriterion("job_message between", value1, value2, "jobMessage"); - return (Criteria) this; - } - - public Criteria andJobMessageNotBetween(String value1, String value2) { - addCriterion("job_message not between", value1, value2, "jobMessage"); - return (Criteria) this; - } - - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(Integer value) { - addCriterion("status =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(Integer value) { - addCriterion("status <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(Integer value) { - addCriterion("status >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("status >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(Integer value) { - addCriterion("status <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(Integer value) { - addCriterion("status <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLike(Integer value) { - addCriterion("status like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(Integer value) { - addCriterion("status not like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(Integer value1, Integer value2) { - addCriterion("status between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(Integer value1, Integer value2) { - addCriterion("status not between", value1, value2, "status"); - return (Criteria) this; - } - - - public Criteria andExceptionInfoIsNull() { - addCriterion("exception_info is null"); - return (Criteria) this; - } - - public Criteria andExceptionInfoIsNotNull() { - addCriterion("exception_info is not null"); - return (Criteria) this; - } - - public Criteria andExceptionInfoEqualTo(String value) { - addCriterion("exception_info =", value, "exceptionInfo"); - return (Criteria) this; - } - - public Criteria andExceptionInfoNotEqualTo(String value) { - addCriterion("exception_info <>", value, "exceptionInfo"); - return (Criteria) this; - } - - public Criteria andExceptionInfoGreaterThan(String value) { - addCriterion("exception_info >", value, "exceptionInfo"); - return (Criteria) this; - } - - public Criteria andExceptionInfoGreaterThanOrEqualTo(String value) { - addCriterion("exception_info >=", value, "exceptionInfo"); - return (Criteria) this; - } - - public Criteria andExceptionInfoLessThan(String value) { - addCriterion("exception_info <", value, "exceptionInfo"); - return (Criteria) this; - } - - public Criteria andExceptionInfoLessThanOrEqualTo(String value) { - addCriterion("exception_info <=", value, "exceptionInfo"); - return (Criteria) this; - } - - public Criteria andExceptionInfoLike(String value) { - addCriterion("exception_info like", value, "exceptionInfo"); - return (Criteria) this; - } - - public Criteria andExceptionInfoNotLike(String value) { - addCriterion("exception_info not like", value, "exceptionInfo"); - return (Criteria) this; - } - - public Criteria andExceptionInfoIn(List values) { - addCriterion("exception_info in", values, "exceptionInfo"); - return (Criteria) this; - } - - public Criteria andExceptionInfoNotIn(List values) { - addCriterion("exception_info not in", values, "exceptionInfo"); - return (Criteria) this; - } - - public Criteria andExceptionInfoBetween(String value1, String value2) { - addCriterion("exception_info between", value1, value2, "exceptionInfo"); - return (Criteria) this; - } - - public Criteria andExceptionInfoNotBetween(String value1, String value2) { - addCriterion("exception_info not between", value1, value2, "exceptionInfo"); - return (Criteria) this; - } - - - public Criteria andStartTimeIsNull() { - addCriterion("start_time is null"); - return (Criteria) this; - } - - public Criteria andStartTimeIsNotNull() { - addCriterion("start_time is not null"); - return (Criteria) this; - } - - public Criteria andStartTimeEqualTo(Date value) { - addCriterion("start_time =", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotEqualTo(Date value) { - addCriterion("start_time <>", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThan(Date value) { - addCriterion("start_time >", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThanOrEqualTo(Date value) { - addCriterion("start_time >=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThan(Date value) { - addCriterion("start_time <", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThanOrEqualTo(Date value) { - addCriterion("start_time <=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLike(Date value) { - addCriterion("start_time like", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotLike(Date value) { - addCriterion("start_time not like", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeIn(List values) { - addCriterion("start_time in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotIn(List values) { - addCriterion("start_time not in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeBetween(Date value1, Date value2) { - addCriterion("start_time between", value1, value2, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotBetween(Date value1, Date value2) { - addCriterion("start_time not between", value1, value2, "startTime"); - return (Criteria) this; - } - - - public Criteria andEndTimeIsNull() { - addCriterion("end_time is null"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNotNull() { - addCriterion("end_time is not null"); - return (Criteria) this; - } - - public Criteria andEndTimeEqualTo(Date value) { - addCriterion("end_time =", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotEqualTo(Date value) { - addCriterion("end_time <>", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThan(Date value) { - addCriterion("end_time >", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThanOrEqualTo(Date value) { - addCriterion("end_time >=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThan(Date value) { - addCriterion("end_time <", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThanOrEqualTo(Date value) { - addCriterion("end_time <=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLike(Date value) { - addCriterion("end_time like", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotLike(Date value) { - addCriterion("end_time not like", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIn(List values) { - addCriterion("end_time in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotIn(List values) { - addCriterion("end_time not in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeBetween(Date value1, Date value2) { - addCriterion("end_time between", value1, value2, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotBetween(Date value1, Date value2) { - addCriterion("end_time not between", value1, value2, "endTime"); - return (Criteria) this; - } - - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/TSysDictData.java b/src/main/java/com/fc/v2/model/auto/TSysDictData.java index 9a86365..a54a9f0 100644 --- a/src/main/java/com/fc/v2/model/auto/TSysDictData.java +++ b/src/main/java/com/fc/v2/model/auto/TSysDictData.java @@ -1,226 +1,153 @@ -package com.fc.v2.model.auto; -import java.io.Serializable; -import java.util.Date; +package com.fc.v2.model.auto; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.common.base.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.baomidou.mybatisplus.annotation.*; /** - * 字典数据表 + * 字典数据对象 t_sys_dict_data * - * @author 一休 - * @email 438081243@qq.com - * @date 2019-09-08 00:10:43 + * @author zhaonz + * @date 2021-08-06 */ -@TableName(value = "t_sys_dict_data") -public class TSysDictData implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 字典数据表id - */ - @TableId(type = IdType.ASSIGN_ID) - private String id; - - /** - * 字典排序 - */ - private Integer dictSort; - - /** - * 字典标签 - */ - private String dictLabel; - - /** - * 字典键值 - */ - private String dictValue; - - /** - * 字典类型 - */ - private String dictType; - - /** - * 样式属性（其他样式扩展） - */ - private String cssClass; - - /** - * 表格回显样式 - */ - private String listClass; - - /** - * 是否默认（Y是 N否） - */ - private String isDefault; - - /** - * 状态（0正常 1停用） - */ - private String status; - - /** - * 创建者 - */ - private String createBy; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - - /** - * 更新者 - */ - private String updateBy; - - /** - * 更新时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date updateTime; - - /** - * 备注 - */ - private String remark; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id == null ? null : id.trim(); - } - - public Integer getDictSort() { - return dictSort; - } - - public void setDictSort(Integer dictSort) { - this.dictSort = dictSort; - } - - public String getDictLabel() { - return dictLabel; - } - - public void setDictLabel(String dictLabel) { - this.dictLabel = dictLabel == null ? null : dictLabel.trim(); - } - - public String getDictValue() { - return dictValue; - } - - public void setDictValue(String dictValue) { - this.dictValue = dictValue == null ? null : dictValue.trim(); - } - - public String getDictType() { - return dictType; - } - - public void setDictType(String dictType) { - this.dictType = dictType == null ? null : dictType.trim(); - } - - public String getCssClass() { - return cssClass; - } - - public void setCssClass(String cssClass) { - this.cssClass = cssClass == null ? null : cssClass.trim(); - } - - public String getListClass() { - return listClass; - } - - public void setListClass(String listClass) { - this.listClass = listClass == null ? null : listClass.trim(); - } - - public String getIsDefault() { - return isDefault; - } - - public void setIsDefault(String isDefault) { - this.isDefault = isDefault == null ? null : isDefault.trim(); - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status == null ? null : status.trim(); - } - - public String getCreateBy() { - return createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy == null ? null : createBy.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public String getUpdateBy() { - return updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy == null ? null : updateBy.trim(); - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark == null ? null : remark.trim(); - } - - public TSysDictData() { - super(); - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()) - .append("dictSort", getDictSort()).append("dictLabel", getDictLabel()) - .append("dictValue", getDictValue()).append("dictType", getDictType()).append("cssClass", getCssClass()) - .append("listClass", getListClass()).append("isDefault", getIsDefault()).append("status", getStatus()) - .append("createBy", getCreateBy()).append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()) - .toString(); - } - -} \ No newline at end of file +@TableName("t_sys_dict_data") +public class TSysDictData extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 字典排序 */ + private Integer dictSort; + + /** 字典标签 */ + private String dictLabel; + + /** 字典键值 */ + private String dictValue; + + /** 字典类型 */ + private String dictType; + + /** 样式属性（其他样式扩展） */ + private String cssClass; + + /** 表格回显样式 */ + private String listClass; + + /** 是否默认（Y是 N否） */ + private String isDefault; + + /** 状态（0正常 1停用） */ + private String status; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setDictSort(Integer dictSort) + { + this.dictSort = dictSort; + } + + public Integer getDictSort() + { + return dictSort; + } + public void setDictLabel(String dictLabel) + { + this.dictLabel = dictLabel; + } + + public String getDictLabel() + { + return dictLabel; + } + public void setDictValue(String dictValue) + { + this.dictValue = dictValue; + } + + public String getDictValue() + { + return dictValue; + } + public void setDictType(String dictType) + { + this.dictType = dictType; + } + + public String getDictType() + { + return dictType; + } + public void setCssClass(String cssClass) + { + this.cssClass = cssClass; + } + + public String getCssClass() + { + return cssClass; + } + public void setListClass(String listClass) + { + this.listClass = listClass; + } + + public String getListClass() + { + return listClass; + } + public void setIsDefault(String isDefault) + { + this.isDefault = isDefault; + } + + public String getIsDefault() + { + return isDefault; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("dictSort", getDictSort()) + .append("dictLabel", getDictLabel()) + .append("dictValue", getDictValue()) + .append("dictType", getDictType()) + .append("cssClass", getCssClass()) + .append("listClass", getListClass()) + .append("isDefault", getIsDefault()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysDictDataExample.java b/src/main/java/com/fc/v2/model/auto/TSysDictDataExample.java deleted file mode 100644 index e543e44..0000000 --- a/src/main/java/com/fc/v2/model/auto/TSysDictDataExample.java +++ /dev/null @@ -1,1275 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 字典数据表 - * - * @author 一休 - * @email 438081243@qq.com - * @date 2019-09-08 00:10:43 - */ -public class TSysDictDataExample { - - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public TSysDictDataExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andDictCodeIsNull() { - addCriterion("dict_code is null"); - return (Criteria) this; - } - - public Criteria andDictCodeIsNotNull() { - addCriterion("dict_code is not null"); - return (Criteria) this; - } - - public Criteria andDictCodeEqualTo(String value) { - addCriterion("dict_code =", value, "dictCode"); - return (Criteria) this; - } - - public Criteria andDictCodeNotEqualTo(String value) { - addCriterion("dict_code <>", value, "dictCode"); - return (Criteria) this; - } - - public Criteria andDictCodeGreaterThan(String value) { - addCriterion("dict_code >", value, "dictCode"); - return (Criteria) this; - } - - public Criteria andDictCodeGreaterThanOrEqualTo(String value) { - addCriterion("dict_code >=", value, "dictCode"); - return (Criteria) this; - } - - public Criteria andDictCodeLessThan(String value) { - addCriterion("dict_code <", value, "dictCode"); - return (Criteria) this; - } - - public Criteria andDictCodeLessThanOrEqualTo(String value) { - addCriterion("dict_code <=", value, "dictCode"); - return (Criteria) this; - } - - public Criteria andDictCodeLike(String value) { - addCriterion("dict_code like", value, "dictCode"); - return (Criteria) this; - } - - public Criteria andDictCodeNotLike(String value) { - addCriterion("dict_code not like", value, "dictCode"); - return (Criteria) this; - } - - public Criteria andDictCodeIn(List values) { - addCriterion("dict_code in", values, "dictCode"); - return (Criteria) this; - } - - public Criteria andDictCodeNotIn(List values) { - addCriterion("dict_code not in", values, "dictCode"); - return (Criteria) this; - } - - public Criteria andDictCodeBetween(String value1, String value2) { - addCriterion("dict_code between", value1, value2, "dictCode"); - return (Criteria) this; - } - - public Criteria andDictCodeNotBetween(String value1, String value2) { - addCriterion("dict_code not between", value1, value2, "dictCode"); - return (Criteria) this; - } - - - public Criteria andDictSortIsNull() { - addCriterion("dict_sort is null"); - return (Criteria) this; - } - - public Criteria andDictSortIsNotNull() { - addCriterion("dict_sort is not null"); - return (Criteria) this; - } - - public Criteria andDictSortEqualTo(Integer value) { - addCriterion("dict_sort =", value, "dictSort"); - return (Criteria) this; - } - - public Criteria andDictSortNotEqualTo(Integer value) { - addCriterion("dict_sort <>", value, "dictSort"); - return (Criteria) this; - } - - public Criteria andDictSortGreaterThan(Integer value) { - addCriterion("dict_sort >", value, "dictSort"); - return (Criteria) this; - } - - public Criteria andDictSortGreaterThanOrEqualTo(Integer value) { - addCriterion("dict_sort >=", value, "dictSort"); - return (Criteria) this; - } - - public Criteria andDictSortLessThan(Integer value) { - addCriterion("dict_sort <", value, "dictSort"); - return (Criteria) this; - } - - public Criteria andDictSortLessThanOrEqualTo(Integer value) { - addCriterion("dict_sort <=", value, "dictSort"); - return (Criteria) this; - } - - public Criteria andDictSortLike(Integer value) { - addCriterion("dict_sort like", value, "dictSort"); - return (Criteria) this; - } - - public Criteria andDictSortNotLike(Integer value) { - addCriterion("dict_sort not like", value, "dictSort"); - return (Criteria) this; - } - - public Criteria andDictSortIn(List values) { - addCriterion("dict_sort in", values, "dictSort"); - return (Criteria) this; - } - - public Criteria andDictSortNotIn(List values) { - addCriterion("dict_sort not in", values, "dictSort"); - return (Criteria) this; - } - - public Criteria andDictSortBetween(Integer value1, Integer value2) { - addCriterion("dict_sort between", value1, value2, "dictSort"); - return (Criteria) this; - } - - public Criteria andDictSortNotBetween(Integer value1, Integer value2) { - addCriterion("dict_sort not between", value1, value2, "dictSort"); - return (Criteria) this; - } - - - public Criteria andDictLabelIsNull() { - addCriterion("dict_label is null"); - return (Criteria) this; - } - - public Criteria andDictLabelIsNotNull() { - addCriterion("dict_label is not null"); - return (Criteria) this; - } - - public Criteria andDictLabelEqualTo(String value) { - addCriterion("dict_label =", value, "dictLabel"); - return (Criteria) this; - } - - public Criteria andDictLabelNotEqualTo(String value) { - addCriterion("dict_label <>", value, "dictLabel"); - return (Criteria) this; - } - - public Criteria andDictLabelGreaterThan(String value) { - addCriterion("dict_label >", value, "dictLabel"); - return (Criteria) this; - } - - public Criteria andDictLabelGreaterThanOrEqualTo(String value) { - addCriterion("dict_label >=", value, "dictLabel"); - return (Criteria) this; - } - - public Criteria andDictLabelLessThan(String value) { - addCriterion("dict_label <", value, "dictLabel"); - return (Criteria) this; - } - - public Criteria andDictLabelLessThanOrEqualTo(String value) { - addCriterion("dict_label <=", value, "dictLabel"); - return (Criteria) this; - } - - public Criteria andDictLabelLike(String value) { - addCriterion("dict_label like", value, "dictLabel"); - return (Criteria) this; - } - - public Criteria andDictLabelNotLike(String value) { - addCriterion("dict_label not like", value, "dictLabel"); - return (Criteria) this; - } - - public Criteria andDictLabelIn(List values) { - addCriterion("dict_label in", values, "dictLabel"); - return (Criteria) this; - } - - public Criteria andDictLabelNotIn(List values) { - addCriterion("dict_label not in", values, "dictLabel"); - return (Criteria) this; - } - - public Criteria andDictLabelBetween(String value1, String value2) { - addCriterion("dict_label between", value1, value2, "dictLabel"); - return (Criteria) this; - } - - public Criteria andDictLabelNotBetween(String value1, String value2) { - addCriterion("dict_label not between", value1, value2, "dictLabel"); - return (Criteria) this; - } - - - public Criteria andDictValueIsNull() { - addCriterion("dict_value is null"); - return (Criteria) this; - } - - public Criteria andDictValueIsNotNull() { - addCriterion("dict_value is not null"); - return (Criteria) this; - } - - public Criteria andDictValueEqualTo(String value) { - addCriterion("dict_value =", value, "dictValue"); - return (Criteria) this; - } - - public Criteria andDictValueNotEqualTo(String value) { - addCriterion("dict_value <>", value, "dictValue"); - return (Criteria) this; - } - - public Criteria andDictValueGreaterThan(String value) { - addCriterion("dict_value >", value, "dictValue"); - return (Criteria) this; - } - - public Criteria andDictValueGreaterThanOrEqualTo(String value) { - addCriterion("dict_value >=", value, "dictValue"); - return (Criteria) this; - } - - public Criteria andDictValueLessThan(String value) { - addCriterion("dict_value <", value, "dictValue"); - return (Criteria) this; - } - - public Criteria andDictValueLessThanOrEqualTo(String value) { - addCriterion("dict_value <=", value, "dictValue"); - return (Criteria) this; - } - - public Criteria andDictValueLike(String value) { - addCriterion("dict_value like", value, "dictValue"); - return (Criteria) this; - } - - public Criteria andDictValueNotLike(String value) { - addCriterion("dict_value not like", value, "dictValue"); - return (Criteria) this; - } - - public Criteria andDictValueIn(List values) { - addCriterion("dict_value in", values, "dictValue"); - return (Criteria) this; - } - - public Criteria andDictValueNotIn(List values) { - addCriterion("dict_value not in", values, "dictValue"); - return (Criteria) this; - } - - public Criteria andDictValueBetween(String value1, String value2) { - addCriterion("dict_value between", value1, value2, "dictValue"); - return (Criteria) this; - } - - public Criteria andDictValueNotBetween(String value1, String value2) { - addCriterion("dict_value not between", value1, value2, "dictValue"); - return (Criteria) this; - } - - - public Criteria andDictTypeIsNull() { - addCriterion("dict_type is null"); - return (Criteria) this; - } - - public Criteria andDictTypeIsNotNull() { - addCriterion("dict_type is not null"); - return (Criteria) this; - } - - public Criteria andDictTypeEqualTo(String value) { - addCriterion("dict_type =", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeNotEqualTo(String value) { - addCriterion("dict_type <>", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeGreaterThan(String value) { - addCriterion("dict_type >", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeGreaterThanOrEqualTo(String value) { - addCriterion("dict_type >=", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeLessThan(String value) { - addCriterion("dict_type <", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeLessThanOrEqualTo(String value) { - addCriterion("dict_type <=", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeLike(String value) { - addCriterion("dict_type like", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeNotLike(String value) { - addCriterion("dict_type not like", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeIn(List values) { - addCriterion("dict_type in", values, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeNotIn(List values) { - addCriterion("dict_type not in", values, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeBetween(String value1, String value2) { - addCriterion("dict_type between", value1, value2, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeNotBetween(String value1, String value2) { - addCriterion("dict_type not between", value1, value2, "dictType"); - return (Criteria) this; - } - - - public Criteria andCssClassIsNull() { - addCriterion("css_class is null"); - return (Criteria) this; - } - - public Criteria andCssClassIsNotNull() { - addCriterion("css_class is not null"); - return (Criteria) this; - } - - public Criteria andCssClassEqualTo(String value) { - addCriterion("css_class =", value, "cssClass"); - return (Criteria) this; - } - - public Criteria andCssClassNotEqualTo(String value) { - addCriterion("css_class <>", value, "cssClass"); - return (Criteria) this; - } - - public Criteria andCssClassGreaterThan(String value) { - addCriterion("css_class >", value, "cssClass"); - return (Criteria) this; - } - - public Criteria andCssClassGreaterThanOrEqualTo(String value) { - addCriterion("css_class >=", value, "cssClass"); - return (Criteria) this; - } - - public Criteria andCssClassLessThan(String value) { - addCriterion("css_class <", value, "cssClass"); - return (Criteria) this; - } - - public Criteria andCssClassLessThanOrEqualTo(String value) { - addCriterion("css_class <=", value, "cssClass"); - return (Criteria) this; - } - - public Criteria andCssClassLike(String value) { - addCriterion("css_class like", value, "cssClass"); - return (Criteria) this; - } - - public Criteria andCssClassNotLike(String value) { - addCriterion("css_class not like", value, "cssClass"); - return (Criteria) this; - } - - public Criteria andCssClassIn(List values) { - addCriterion("css_class in", values, "cssClass"); - return (Criteria) this; - } - - public Criteria andCssClassNotIn(List values) { - addCriterion("css_class not in", values, "cssClass"); - return (Criteria) this; - } - - public Criteria andCssClassBetween(String value1, String value2) { - addCriterion("css_class between", value1, value2, "cssClass"); - return (Criteria) this; - } - - public Criteria andCssClassNotBetween(String value1, String value2) { - addCriterion("css_class not between", value1, value2, "cssClass"); - return (Criteria) this; - } - - - public Criteria andListClassIsNull() { - addCriterion("list_class is null"); - return (Criteria) this; - } - - public Criteria andListClassIsNotNull() { - addCriterion("list_class is not null"); - return (Criteria) this; - } - - public Criteria andListClassEqualTo(String value) { - addCriterion("list_class =", value, "listClass"); - return (Criteria) this; - } - - public Criteria andListClassNotEqualTo(String value) { - addCriterion("list_class <>", value, "listClass"); - return (Criteria) this; - } - - public Criteria andListClassGreaterThan(String value) { - addCriterion("list_class >", value, "listClass"); - return (Criteria) this; - } - - public Criteria andListClassGreaterThanOrEqualTo(String value) { - addCriterion("list_class >=", value, "listClass"); - return (Criteria) this; - } - - public Criteria andListClassLessThan(String value) { - addCriterion("list_class <", value, "listClass"); - return (Criteria) this; - } - - public Criteria andListClassLessThanOrEqualTo(String value) { - addCriterion("list_class <=", value, "listClass"); - return (Criteria) this; - } - - public Criteria andListClassLike(String value) { - addCriterion("list_class like", value, "listClass"); - return (Criteria) this; - } - - public Criteria andListClassNotLike(String value) { - addCriterion("list_class not like", value, "listClass"); - return (Criteria) this; - } - - public Criteria andListClassIn(List values) { - addCriterion("list_class in", values, "listClass"); - return (Criteria) this; - } - - public Criteria andListClassNotIn(List values) { - addCriterion("list_class not in", values, "listClass"); - return (Criteria) this; - } - - public Criteria andListClassBetween(String value1, String value2) { - addCriterion("list_class between", value1, value2, "listClass"); - return (Criteria) this; - } - - public Criteria andListClassNotBetween(String value1, String value2) { - addCriterion("list_class not between", value1, value2, "listClass"); - return (Criteria) this; - } - - - public Criteria andIsDefaultIsNull() { - addCriterion("is_default is null"); - return (Criteria) this; - } - - public Criteria andIsDefaultIsNotNull() { - addCriterion("is_default is not null"); - return (Criteria) this; - } - - public Criteria andIsDefaultEqualTo(String value) { - addCriterion("is_default =", value, "isDefault"); - return (Criteria) this; - } - - public Criteria andIsDefaultNotEqualTo(String value) { - addCriterion("is_default <>", value, "isDefault"); - return (Criteria) this; - } - - public Criteria andIsDefaultGreaterThan(String value) { - addCriterion("is_default >", value, "isDefault"); - return (Criteria) this; - } - - public Criteria andIsDefaultGreaterThanOrEqualTo(String value) { - addCriterion("is_default >=", value, "isDefault"); - return (Criteria) this; - } - - public Criteria andIsDefaultLessThan(String value) { - addCriterion("is_default <", value, "isDefault"); - return (Criteria) this; - } - - public Criteria andIsDefaultLessThanOrEqualTo(String value) { - addCriterion("is_default <=", value, "isDefault"); - return (Criteria) this; - } - - public Criteria andIsDefaultLike(String value) { - addCriterion("is_default like", value, "isDefault"); - return (Criteria) this; - } - - public Criteria andIsDefaultNotLike(String value) { - addCriterion("is_default not like", value, "isDefault"); - return (Criteria) this; - } - - public Criteria andIsDefaultIn(List values) { - addCriterion("is_default in", values, "isDefault"); - return (Criteria) this; - } - - public Criteria andIsDefaultNotIn(List values) { - addCriterion("is_default not in", values, "isDefault"); - return (Criteria) this; - } - - public Criteria andIsDefaultBetween(String value1, String value2) { - addCriterion("is_default between", value1, value2, "isDefault"); - return (Criteria) this; - } - - public Criteria andIsDefaultNotBetween(String value1, String value2) { - addCriterion("is_default not between", value1, value2, "isDefault"); - return (Criteria) this; - } - - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(String value) { - addCriterion("status =", value, "dataStatus"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(String value) { - addCriterion("status <>", value, "dataStatus"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(String value) { - addCriterion("status >", value, "dataStatus"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(String value) { - addCriterion("status >=", value, "dataStatus"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(String value) { - addCriterion("status <", value, "dataStatus"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(String value) { - addCriterion("status <=", value, "dataStatus"); - return (Criteria) this; - } - - public Criteria andStatusLike(String value) { - addCriterion("status like", value, "dataStatus"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(String value) { - addCriterion("status not like", value, "dataStatus"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "dataStatus"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "dataStatus"); - return (Criteria) this; - } - - public Criteria andStatusBetween(String value1, String value2) { - addCriterion("status between", value1, value2, "dataStatus"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(String value1, String value2) { - addCriterion("status not between", value1, value2, "dataStatus"); - return (Criteria) this; - } - - - public Criteria andCreateByIsNull() { - addCriterion("create_by is null"); - return (Criteria) this; - } - - public Criteria andCreateByIsNotNull() { - addCriterion("create_by is not null"); - return (Criteria) this; - } - - public Criteria andCreateByEqualTo(String value) { - addCriterion("create_by =", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotEqualTo(String value) { - addCriterion("create_by <>", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByGreaterThan(String value) { - addCriterion("create_by >", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByGreaterThanOrEqualTo(String value) { - addCriterion("create_by >=", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByLessThan(String value) { - addCriterion("create_by <", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByLessThanOrEqualTo(String value) { - addCriterion("create_by <=", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByLike(String value) { - addCriterion("create_by like", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotLike(String value) { - addCriterion("create_by not like", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByIn(List values) { - addCriterion("create_by in", values, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotIn(List values) { - addCriterion("create_by not in", values, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByBetween(String value1, String value2) { - addCriterion("create_by between", value1, value2, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotBetween(String value1, String value2) { - addCriterion("create_by not between", value1, value2, "createBy"); - return (Criteria) this; - } - - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLike(Date value) { - addCriterion("create_time like", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotLike(Date value) { - addCriterion("create_time not like", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - - public Criteria andUpdateByIsNull() { - addCriterion("update_by is null"); - return (Criteria) this; - } - - public Criteria andUpdateByIsNotNull() { - addCriterion("update_by is not null"); - return (Criteria) this; - } - - public Criteria andUpdateByEqualTo(String value) { - addCriterion("update_by =", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByNotEqualTo(String value) { - addCriterion("update_by <>", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByGreaterThan(String value) { - addCriterion("update_by >", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByGreaterThanOrEqualTo(String value) { - addCriterion("update_by >=", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByLessThan(String value) { - addCriterion("update_by <", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByLessThanOrEqualTo(String value) { - addCriterion("update_by <=", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByLike(String value) { - addCriterion("update_by like", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByNotLike(String value) { - addCriterion("update_by not like", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByIn(List values) { - addCriterion("update_by in", values, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByNotIn(List values) { - addCriterion("update_by not in", values, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByBetween(String value1, String value2) { - addCriterion("update_by between", value1, value2, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByNotBetween(String value1, String value2) { - addCriterion("update_by not between", value1, value2, "updateBy"); - return (Criteria) this; - } - - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLike(Date value) { - addCriterion("update_time like", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotLike(Date value) { - addCriterion("update_time not like", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - - - public Criteria andRemarkIsNull() { - addCriterion("remark is null"); - return (Criteria) this; - } - - public Criteria andRemarkIsNotNull() { - addCriterion("remark is not null"); - return (Criteria) this; - } - - public Criteria andRemarkEqualTo(String value) { - addCriterion("remark =", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotEqualTo(String value) { - addCriterion("remark <>", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkGreaterThan(String value) { - addCriterion("remark >", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkGreaterThanOrEqualTo(String value) { - addCriterion("remark >=", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLessThan(String value) { - addCriterion("remark <", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLessThanOrEqualTo(String value) { - addCriterion("remark <=", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLike(String value) { - addCriterion("remark like", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotLike(String value) { - addCriterion("remark not like", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkIn(List values) { - addCriterion("remark in", values, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotIn(List values) { - addCriterion("remark not in", values, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkBetween(String value1, String value2) { - addCriterion("remark between", value1, value2, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotBetween(String value1, String value2) { - addCriterion("remark not between", value1, value2, "remark"); - return (Criteria) this; - } - - - - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/TSysDictType.java b/src/main/java/com/fc/v2/model/auto/TSysDictType.java index 141e973..2b86ff9 100644 --- a/src/main/java/com/fc/v2/model/auto/TSysDictType.java +++ b/src/main/java/com/fc/v2/model/auto/TSysDictType.java @@ -1,154 +1,89 @@ package com.fc.v2.model.auto; -import java.io.Serializable; -import java.util.Date; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + + +import com.baomidou.mybatisplus.annotation.*; +import com.fc.v2.common.base.BaseEntity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; /** - * 字典类型表 + * 字典类型对象 t_sys_dict_type * - * @author 一休 - * @email 438081243@qq.com - * @date 2019-09-05 12:34:25 + * @author zhaonz + * @date 2021-08-06 */ -@TableName(value = "t_sys_dict_type") -public class TSysDictType implements Serializable { +@TableName("t_sys_dict_type") +public class TSysDictType extends BaseEntity +{ + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 1L; - - /** 主键 **/ + /** 主键 */ @TableId(type = IdType.ASSIGN_ID) - private String id; - - /** 字典名称 **/ - private String dictName; - - /** 字典类型 **/ - private String dictType; - - /** 状态（0正常 1停用） **/ - private Character status; - - /** 创建者 **/ - private String createBy; - - /** 创建时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTime; - - /** 更新者 **/ - private String updateBy; - - /** 更新时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date updateTime; - - /** 备注 **/ - private String remark; - - - public String getId() { - return id; - } + @JsonSerialize(using = ToStringSerializer.class) + private Long id; - public void setId(String id) { - this.id = id; - } - - - public String getDictName() { - return dictName; - } + /** 字典名称 */ + private String dictName; - public void setDictName(String dictName) { - this.dictName = dictName; - } - - - public String getDictType() { - return dictType; - } + /** 字典类型 */ + private String dictType; - public void setDictType(String dictType) { - this.dictType = dictType; - } - - - public Character getStatus() { - return status; - } + /** 状态（0正常 1停用） */ + private String status; - public void setStatus(Character status) { - this.status = status; - } - - - public String getCreateBy() { - return createBy; + public void setId(Long id) + { + this.id = id; } - public void setCreateBy(String createBy) { - this.createBy = createBy; + public Long getId() + { + return id; } - - - public Date getCreateTime() { - return createTime; + public void setDictName(String dictName) + { + this.dictName = dictName; } - public void setCreateTime(Date createTime) { - this.createTime = createTime; + public String getDictName() + { + return dictName; } - - - public String getUpdateBy() { - return updateBy; + public void setDictType(String dictType) + { + this.dictType = dictType; } - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; + public String getDictType() + { + return dictType; } - - - public Date getUpdateTime() { - return updateTime; + public void setStatus(String status) + { + this.status = status; } - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - - public String getRemark() { - return remark; + public String getStatus() + { + return status; } - public void setRemark(String remark) { - this.remark = remark; - } - - - public TSysDictType() { - super(); - } - - - public TSysDictType(String id,String dictName,String dictType,Character status,String createBy,Date createTime,String updateBy,Date updateTime,String remark) { - - this.id = id; - this.dictName = dictName; - this.dictType = dictType; - this.status = status; - this.createBy = createBy; - this.createTime = createTime; - this.updateBy = updateBy; - this.updateTime = updateTime; - this.remark = remark; - - } - -} \ No newline at end of file + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("dictName", getDictName()) + .append("dictType", getDictType()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysDictTypeExample.java b/src/main/java/com/fc/v2/model/auto/TSysDictTypeExample.java deleted file mode 100644 index c7a48e6..0000000 --- a/src/main/java/com/fc/v2/model/auto/TSysDictTypeExample.java +++ /dev/null @@ -1,849 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 字典类型表 - * - * @author 一休 - * @email 438081243@qq.com - * @date 2019-09-05 12:34:25 - */ -public class TSysDictTypeExample { - - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public TSysDictTypeExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andDictNameIsNull() { - addCriterion("dict_name is null"); - return (Criteria) this; - } - - public Criteria andDictNameIsNotNull() { - addCriterion("dict_name is not null"); - return (Criteria) this; - } - - public Criteria andDictNameEqualTo(String value) { - addCriterion("dict_name =", value, "dictName"); - return (Criteria) this; - } - - public Criteria andDictNameNotEqualTo(String value) { - addCriterion("dict_name <>", value, "dictName"); - return (Criteria) this; - } - - public Criteria andDictNameGreaterThan(String value) { - addCriterion("dict_name >", value, "dictName"); - return (Criteria) this; - } - - public Criteria andDictNameGreaterThanOrEqualTo(String value) { - addCriterion("dict_name >=", value, "dictName"); - return (Criteria) this; - } - - public Criteria andDictNameLessThan(String value) { - addCriterion("dict_name <", value, "dictName"); - return (Criteria) this; - } - - public Criteria andDictNameLessThanOrEqualTo(String value) { - addCriterion("dict_name <=", value, "dictName"); - return (Criteria) this; - } - - public Criteria andDictNameLike(String value) { - addCriterion("dict_name like", value, "dictName"); - return (Criteria) this; - } - - public Criteria andDictNameNotLike(String value) { - addCriterion("dict_name not like", value, "dictName"); - return (Criteria) this; - } - - public Criteria andDictNameIn(List values) { - addCriterion("dict_name in", values, "dictName"); - return (Criteria) this; - } - - public Criteria andDictNameNotIn(List values) { - addCriterion("dict_name not in", values, "dictName"); - return (Criteria) this; - } - - public Criteria andDictNameBetween(String value1, String value2) { - addCriterion("dict_name between", value1, value2, "dictName"); - return (Criteria) this; - } - - public Criteria andDictNameNotBetween(String value1, String value2) { - addCriterion("dict_name not between", value1, value2, "dictName"); - return (Criteria) this; - } - - - public Criteria andDictTypeIsNull() { - addCriterion("dict_type is null"); - return (Criteria) this; - } - - public Criteria andDictTypeIsNotNull() { - addCriterion("dict_type is not null"); - return (Criteria) this; - } - - public Criteria andDictTypeEqualTo(String value) { - addCriterion("dict_type =", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeNotEqualTo(String value) { - addCriterion("dict_type <>", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeGreaterThan(String value) { - addCriterion("dict_type >", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeGreaterThanOrEqualTo(String value) { - addCriterion("dict_type >=", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeLessThan(String value) { - addCriterion("dict_type <", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeLessThanOrEqualTo(String value) { - addCriterion("dict_type <=", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeLike(String value) { - addCriterion("dict_type like", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeNotLike(String value) { - addCriterion("dict_type not like", value, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeIn(List values) { - addCriterion("dict_type in", values, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeNotIn(List values) { - addCriterion("dict_type not in", values, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeBetween(String value1, String value2) { - addCriterion("dict_type between", value1, value2, "dictType"); - return (Criteria) this; - } - - public Criteria andDictTypeNotBetween(String value1, String value2) { - addCriterion("dict_type not between", value1, value2, "dictType"); - return (Criteria) this; - } - - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(String value) { - addCriterion("status =", value, "typeStatus"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(String value) { - addCriterion("status <>", value, "typeStatus"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(String value) { - addCriterion("status >", value, "typeStatus"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(String value) { - addCriterion("status >=", value, "typeStatus"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(String value) { - addCriterion("status <", value, "typeStatus"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(String value) { - addCriterion("status <=", value, "typeStatus"); - return (Criteria) this; - } - - public Criteria andStatusLike(String value) { - addCriterion("status like", value, "typeStatus"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(String value) { - addCriterion("status not like", value, "typeStatus"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "typeStatus"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "typeStatus"); - return (Criteria) this; - } - - public Criteria andStatusBetween(String value1, String value2) { - addCriterion("status between", value1, value2, "typeStatus"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(String value1, String value2) { - addCriterion("status not between", value1, value2, "typeStatus"); - return (Criteria) this; - } - - - public Criteria andCreateByIsNull() { - addCriterion("create_by is null"); - return (Criteria) this; - } - - public Criteria andCreateByIsNotNull() { - addCriterion("create_by is not null"); - return (Criteria) this; - } - - public Criteria andCreateByEqualTo(String value) { - addCriterion("create_by =", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotEqualTo(String value) { - addCriterion("create_by <>", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByGreaterThan(String value) { - addCriterion("create_by >", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByGreaterThanOrEqualTo(String value) { - addCriterion("create_by >=", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByLessThan(String value) { - addCriterion("create_by <", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByLessThanOrEqualTo(String value) { - addCriterion("create_by <=", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByLike(String value) { - addCriterion("create_by like", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotLike(String value) { - addCriterion("create_by not like", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByIn(List values) { - addCriterion("create_by in", values, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotIn(List values) { - addCriterion("create_by not in", values, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByBetween(String value1, String value2) { - addCriterion("create_by between", value1, value2, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotBetween(String value1, String value2) { - addCriterion("create_by not between", value1, value2, "createBy"); - return (Criteria) this; - } - - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLike(Date value) { - addCriterion("create_time like", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotLike(Date value) { - addCriterion("create_time not like", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - - public Criteria andUpdateByIsNull() { - addCriterion("update_by is null"); - return (Criteria) this; - } - - public Criteria andUpdateByIsNotNull() { - addCriterion("update_by is not null"); - return (Criteria) this; - } - - public Criteria andUpdateByEqualTo(String value) { - addCriterion("update_by =", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByNotEqualTo(String value) { - addCriterion("update_by <>", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByGreaterThan(String value) { - addCriterion("update_by >", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByGreaterThanOrEqualTo(String value) { - addCriterion("update_by >=", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByLessThan(String value) { - addCriterion("update_by <", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByLessThanOrEqualTo(String value) { - addCriterion("update_by <=", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByLike(String value) { - addCriterion("update_by like", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByNotLike(String value) { - addCriterion("update_by not like", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByIn(List values) { - addCriterion("update_by in", values, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByNotIn(List values) { - addCriterion("update_by not in", values, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByBetween(String value1, String value2) { - addCriterion("update_by between", value1, value2, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByNotBetween(String value1, String value2) { - addCriterion("update_by not between", value1, value2, "updateBy"); - return (Criteria) this; - } - - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLike(Date value) { - addCriterion("update_time like", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotLike(Date value) { - addCriterion("update_time not like", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - - - public Criteria andRemarkIsNull() { - addCriterion("remark is null"); - return (Criteria) this; - } - - public Criteria andRemarkIsNotNull() { - addCriterion("remark is not null"); - return (Criteria) this; - } - - public Criteria andRemarkEqualTo(String value) { - addCriterion("remark =", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotEqualTo(String value) { - addCriterion("remark <>", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkGreaterThan(String value) { - addCriterion("remark >", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkGreaterThanOrEqualTo(String value) { - addCriterion("remark >=", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLessThan(String value) { - addCriterion("remark <", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLessThanOrEqualTo(String value) { - addCriterion("remark <=", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLike(String value) { - addCriterion("remark like", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotLike(String value) { - addCriterion("remark not like", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkIn(List values) { - addCriterion("remark in", values, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotIn(List values) { - addCriterion("remark not in", values, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkBetween(String value1, String value2) { - addCriterion("remark between", value1, value2, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotBetween(String value1, String value2) { - addCriterion("remark not between", value1, value2, "remark"); - return (Criteria) this; - } - - - - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/TSysEmail.java b/src/main/java/com/fc/v2/model/auto/TSysEmail.java index d05cd85..5a25a90 100644 --- a/src/main/java/com/fc/v2/model/auto/TSysEmail.java +++ b/src/main/java/com/fc/v2/model/auto/TSysEmail.java @@ -1,100 +1,89 @@ + package com.fc.v2.model.auto; -import java.io.Serializable; -import java.util.Date; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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.fasterxml.jackson.annotation.JsonFormat; +import com.baomidou.mybatisplus.annotation.*; +import com.fc.v2.common.base.BaseEntity; -@TableName(value = "t_sys_email") -public class TSysEmail implements Serializable { +/** + * 电子邮件对象 t_sys_email + * + * @author zhaonz + * @date 2021-08-06 + */ +@TableName("t_sys_email") +public class TSysEmail extends BaseEntity +{ + private static final long serialVersionUID = 1L; + /** 主键 */ @TableId(type = IdType.ASSIGN_ID) - private String id; + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + /** 接收人电子邮件 */ private String receiversEmail; + /** 邮件标题 */ private String title; + /** 内容 */ private String content; - private String sendUserId; - - private String sendUserName; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTime; - - private static final long serialVersionUID = 1L; - - public TSysEmail(String id, String receiversEmail, String title, String content, String sendUserId, String sendUserName, Date createTime) { + public void setId(Long id) + { this.id = id; - this.receiversEmail = receiversEmail; - this.title = title; - this.content = content; - this.sendUserId = sendUserId; - this.sendUserName = sendUserName; - this.createTime = createTime; - } - - public TSysEmail() { - super(); } - public String getId() { + public Long getId() + { return id; } - - public void setId(String id) { - this.id = id == null ? null : id.trim(); + public void setReceiversEmail(String receiversEmail) + { + this.receiversEmail = receiversEmail; } - public String getReceiversEmail() { + public String getReceiversEmail() + { return receiversEmail; } - - public void setReceiversEmail(String receiversEmail) { - this.receiversEmail = receiversEmail == null ? null : receiversEmail.trim(); + public void setTitle(String title) + { + this.title = title; } - public String getTitle() { + public String getTitle() + { return title; } - - public void setTitle(String title) { - this.title = title == null ? null : title.trim(); + public void setContent(String content) + { + this.content = content; } - public String getContent() { + public String getContent() + { return content; } - public void setContent(String content) { - this.content = content == null ? null : content.trim(); - } - - public String getSendUserId() { - return sendUserId; - } - - public void setSendUserId(String sendUserId) { - this.sendUserId = sendUserId == null ? null : sendUserId.trim(); - } - - public String getSendUserName() { - return sendUserName; - } - - public void setSendUserName(String sendUserName) { - this.sendUserName = sendUserName == null ? null : sendUserName.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("receiversEmail", getReceiversEmail()) + .append("title", getTitle()) + .append("content", getContent()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/TSysEmailExample.java b/src/main/java/com/fc/v2/model/auto/TSysEmailExample.java deleted file mode 100644 index fb5557e..0000000 --- a/src/main/java/com/fc/v2/model/auto/TSysEmailExample.java +++ /dev/null @@ -1,681 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class TSysEmailExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public TSysEmailExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andReceiversEmailIsNull() { - addCriterion("receivers_email is null"); - return (Criteria) this; - } - - public Criteria andReceiversEmailIsNotNull() { - addCriterion("receivers_email is not null"); - return (Criteria) this; - } - - public Criteria andReceiversEmailEqualTo(String value) { - addCriterion("receivers_email =", value, "receiversEmail"); - return (Criteria) this; - } - - public Criteria andReceiversEmailNotEqualTo(String value) { - addCriterion("receivers_email <>", value, "receiversEmail"); - return (Criteria) this; - } - - public Criteria andReceiversEmailGreaterThan(String value) { - addCriterion("receivers_email >", value, "receiversEmail"); - return (Criteria) this; - } - - public Criteria andReceiversEmailGreaterThanOrEqualTo(String value) { - addCriterion("receivers_email >=", value, "receiversEmail"); - return (Criteria) this; - } - - public Criteria andReceiversEmailLessThan(String value) { - addCriterion("receivers_email <", value, "receiversEmail"); - return (Criteria) this; - } - - public Criteria andReceiversEmailLessThanOrEqualTo(String value) { - addCriterion("receivers_email <=", value, "receiversEmail"); - return (Criteria) this; - } - - public Criteria andReceiversEmailLike(String value) { - addCriterion("receivers_email like", value, "receiversEmail"); - return (Criteria) this; - } - - public Criteria andReceiversEmailNotLike(String value) { - addCriterion("receivers_email not like", value, "receiversEmail"); - return (Criteria) this; - } - - public Criteria andReceiversEmailIn(List values) { - addCriterion("receivers_email in", values, "receiversEmail"); - return (Criteria) this; - } - - public Criteria andReceiversEmailNotIn(List values) { - addCriterion("receivers_email not in", values, "receiversEmail"); - return (Criteria) this; - } - - public Criteria andReceiversEmailBetween(String value1, String value2) { - addCriterion("receivers_email between", value1, value2, "receiversEmail"); - return (Criteria) this; - } - - public Criteria andReceiversEmailNotBetween(String value1, String value2) { - addCriterion("receivers_email not between", value1, value2, "receiversEmail"); - return (Criteria) this; - } - - public Criteria andTitleIsNull() { - addCriterion("title is null"); - return (Criteria) this; - } - - public Criteria andTitleIsNotNull() { - addCriterion("title is not null"); - return (Criteria) this; - } - - public Criteria andTitleEqualTo(String value) { - addCriterion("title =", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotEqualTo(String value) { - addCriterion("title <>", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThan(String value) { - addCriterion("title >", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThanOrEqualTo(String value) { - addCriterion("title >=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThan(String value) { - addCriterion("title <", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThanOrEqualTo(String value) { - addCriterion("title <=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLike(String value) { - addCriterion("title like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotLike(String value) { - addCriterion("title not like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleIn(List values) { - addCriterion("title in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotIn(List values) { - addCriterion("title not in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleBetween(String value1, String value2) { - addCriterion("title between", value1, value2, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotBetween(String value1, String value2) { - addCriterion("title not between", value1, value2, "title"); - return (Criteria) this; - } - - public Criteria andContentIsNull() { - addCriterion("content is null"); - return (Criteria) this; - } - - public Criteria andContentIsNotNull() { - addCriterion("content is not null"); - return (Criteria) this; - } - - public Criteria andContentEqualTo(String value) { - addCriterion("content =", value, "content"); - return (Criteria) this; - } - - public Criteria andContentNotEqualTo(String value) { - addCriterion("content <>", value, "content"); - return (Criteria) this; - } - - public Criteria andContentGreaterThan(String value) { - addCriterion("content >", value, "content"); - return (Criteria) this; - } - - public Criteria andContentGreaterThanOrEqualTo(String value) { - addCriterion("content >=", value, "content"); - return (Criteria) this; - } - - public Criteria andContentLessThan(String value) { - addCriterion("content <", value, "content"); - return (Criteria) this; - } - - public Criteria andContentLessThanOrEqualTo(String value) { - addCriterion("content <=", value, "content"); - return (Criteria) this; - } - - public Criteria andContentLike(String value) { - addCriterion("content like", value, "content"); - return (Criteria) this; - } - - public Criteria andContentNotLike(String value) { - addCriterion("content not like", value, "content"); - return (Criteria) this; - } - - public Criteria andContentIn(List values) { - addCriterion("content in", values, "content"); - return (Criteria) this; - } - - public Criteria andContentNotIn(List values) { - addCriterion("content not in", values, "content"); - return (Criteria) this; - } - - public Criteria andContentBetween(String value1, String value2) { - addCriterion("content between", value1, value2, "content"); - return (Criteria) this; - } - - public Criteria andContentNotBetween(String value1, String value2) { - addCriterion("content not between", value1, value2, "content"); - return (Criteria) this; - } - - public Criteria andSendUserIdIsNull() { - addCriterion("send_user_id is null"); - return (Criteria) this; - } - - public Criteria andSendUserIdIsNotNull() { - addCriterion("send_user_id is not null"); - return (Criteria) this; - } - - public Criteria andSendUserIdEqualTo(String value) { - addCriterion("send_user_id =", value, "sendUserId"); - return (Criteria) this; - } - - public Criteria andSendUserIdNotEqualTo(String value) { - addCriterion("send_user_id <>", value, "sendUserId"); - return (Criteria) this; - } - - public Criteria andSendUserIdGreaterThan(String value) { - addCriterion("send_user_id >", value, "sendUserId"); - return (Criteria) this; - } - - public Criteria andSendUserIdGreaterThanOrEqualTo(String value) { - addCriterion("send_user_id >=", value, "sendUserId"); - return (Criteria) this; - } - - public Criteria andSendUserIdLessThan(String value) { - addCriterion("send_user_id <", value, "sendUserId"); - return (Criteria) this; - } - - public Criteria andSendUserIdLessThanOrEqualTo(String value) { - addCriterion("send_user_id <=", value, "sendUserId"); - return (Criteria) this; - } - - public Criteria andSendUserIdLike(String value) { - addCriterion("send_user_id like", value, "sendUserId"); - return (Criteria) this; - } - - public Criteria andSendUserIdNotLike(String value) { - addCriterion("send_user_id not like", value, "sendUserId"); - return (Criteria) this; - } - - public Criteria andSendUserIdIn(List values) { - addCriterion("send_user_id in", values, "sendUserId"); - return (Criteria) this; - } - - public Criteria andSendUserIdNotIn(List values) { - addCriterion("send_user_id not in", values, "sendUserId"); - return (Criteria) this; - } - - public Criteria andSendUserIdBetween(String value1, String value2) { - addCriterion("send_user_id between", value1, value2, "sendUserId"); - return (Criteria) this; - } - - public Criteria andSendUserIdNotBetween(String value1, String value2) { - addCriterion("send_user_id not between", value1, value2, "sendUserId"); - return (Criteria) this; - } - - public Criteria andSendUserNameIsNull() { - addCriterion("send_user_name is null"); - return (Criteria) this; - } - - public Criteria andSendUserNameIsNotNull() { - addCriterion("send_user_name is not null"); - return (Criteria) this; - } - - public Criteria andSendUserNameEqualTo(String value) { - addCriterion("send_user_name =", value, "sendUserName"); - return (Criteria) this; - } - - public Criteria andSendUserNameNotEqualTo(String value) { - addCriterion("send_user_name <>", value, "sendUserName"); - return (Criteria) this; - } - - public Criteria andSendUserNameGreaterThan(String value) { - addCriterion("send_user_name >", value, "sendUserName"); - return (Criteria) this; - } - - public Criteria andSendUserNameGreaterThanOrEqualTo(String value) { - addCriterion("send_user_name >=", value, "sendUserName"); - return (Criteria) this; - } - - public Criteria andSendUserNameLessThan(String value) { - addCriterion("send_user_name <", value, "sendUserName"); - return (Criteria) this; - } - - public Criteria andSendUserNameLessThanOrEqualTo(String value) { - addCriterion("send_user_name <=", value, "sendUserName"); - return (Criteria) this; - } - - public Criteria andSendUserNameLike(String value) { - addCriterion("send_user_name like", value, "sendUserName"); - return (Criteria) this; - } - - public Criteria andSendUserNameNotLike(String value) { - addCriterion("send_user_name not like", value, "sendUserName"); - return (Criteria) this; - } - - public Criteria andSendUserNameIn(List values) { - addCriterion("send_user_name in", values, "sendUserName"); - return (Criteria) this; - } - - public Criteria andSendUserNameNotIn(List values) { - addCriterion("send_user_name not in", values, "sendUserName"); - return (Criteria) this; - } - - public Criteria andSendUserNameBetween(String value1, String value2) { - addCriterion("send_user_name between", value1, value2, "sendUserName"); - return (Criteria) this; - } - - public Criteria andSendUserNameNotBetween(String value1, String value2) { - addCriterion("send_user_name not between", value1, value2, "sendUserName"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/TSysFile.java b/src/main/java/com/fc/v2/model/auto/TSysFile.java new file mode 100644 index 0000000..957efd2 --- /dev/null +++ b/src/main/java/com/fc/v2/model/auto/TSysFile.java @@ -0,0 +1,111 @@ + +package com.fc.v2.model.auto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +import com.fc.v2.common.base.BaseEntity; + +/** + * 文件信息对象 t_sys_file + * + * @author zhaonz + * @date 2021-08-06 + */ +@TableName("t_sys_file") +public class TSysFile extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 文件名字 */ + private String fileName; + + /** 桶名 */ + private String bucketName; + + /** 文件大小 */ + private Long fileSize; + + /** 后缀 */ + private String fileSuffix; + + public TSysFile() { + } + + public TSysFile(String fileName, String bucketName, Long fileSize, String fileSuffix) { + this.fileName = fileName; + this.bucketName = bucketName; + this.fileSize = fileSize; + this.fileSuffix = fileSuffix; + } + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setFileName(String fileName) + { + this.fileName = fileName; + } + + public String getFileName() + { + return fileName; + } + public void setBucketName(String bucketName) + { + this.bucketName = bucketName; + } + + public String getBucketName() + { + return bucketName; + } + public void setFileSize(Long fileSize) + { + this.fileSize = fileSize; + } + + public Long getFileSize() + { + return fileSize; + } + public void setFileSuffix(String fileSuffix) + { + this.fileSuffix = fileSuffix; + } + + public String getFileSuffix() + { + return fileSuffix; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("fileName", getFileName()) + .append("bucketName", getBucketName()) + .append("fileSize", getFileSize()) + .append("fileSuffix", getFileSuffix()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysNotice.java b/src/main/java/com/fc/v2/model/auto/TSysNotice.java new file mode 100644 index 0000000..d652160 --- /dev/null +++ b/src/main/java/com/fc/v2/model/auto/TSysNotice.java @@ -0,0 +1,97 @@ + +package com.fc.v2.model.auto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.util.DateUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +import com.fc.v2.common.base.BaseEntity; + +/** + * 公告对象 t_sys_notice + * + * @author zhaonz + * @date 2021-08-06 + */ +@TableName("t_sys_notice") +public class TSysNotice extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 标题 */ + private String title; + + /** 内容 */ + private String content; + + /** 类型 */ + private Integer type; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setTitle(String title) + { + this.title = title; + } + + public String getTitle() + { + return title; + } + public void setContent(String content) + { + this.content = content; + } + + public String getContent() + { + return content; + } + public void setType(Integer type) + { + this.type = type; + } + + public Integer getType() + { + return type; + } + + /** + * 格式化时间 + * @return YYYY_MM_DD + */ + public String getdate(){ + return DateUtils.dateTime(getCreateTime()); + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("title", getTitle()) + .append("content", getContent()) + .append("type", getType()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysNoticeUser.java b/src/main/java/com/fc/v2/model/auto/TSysNoticeUser.java new file mode 100644 index 0000000..d89e6b2 --- /dev/null +++ b/src/main/java/com/fc/v2/model/auto/TSysNoticeUser.java @@ -0,0 +1,88 @@ + +package com.fc.v2.model.auto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +import com.fc.v2.common.base.BaseEntity; + +/** + * 公告_用户外键对象 t_sys_notice_user + * + * @author zhaonz + * @date 2021-08-06 + */ +@TableName("t_sys_notice_user") +public class TSysNoticeUser extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 公告id */ + private Long noticeId; + + /** 用户id */ + private Long userId; + + /** 0未阅读 1 阅读 */ + private Integer state; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setNoticeId(Long noticeId) + { + this.noticeId = noticeId; + } + + public Long getNoticeId() + { + return noticeId; + } + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + public void setState(Integer state) + { + this.state = state; + } + + public Integer getState() + { + return state; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("noticeId", getNoticeId()) + .append("userId", getUserId()) + .append("state", getState()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysQuartzJob.java b/src/main/java/com/fc/v2/model/auto/TSysQuartzJob.java new file mode 100644 index 0000000..5040671 --- /dev/null +++ b/src/main/java/com/fc/v2/model/auto/TSysQuartzJob.java @@ -0,0 +1,140 @@ + +package com.fc.v2.model.auto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +import com.fc.v2.common.base.BaseEntity; + +/** + * 定时任务调度对象 t_sys_quartz_job + * + * @author zhaonz + * @date 2021-08-06 + */ +@TableName("t_sys_quartz_job") +public class TSysQuartzJob extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 任务名称 */ + private String jobName; + + /** 任务组名 */ + private String jobGroup; + + /** 调用目标字符串 */ + private String invokeTarget; + + /** cron执行表达式 */ + private String cronExpression; + + /** cron计划策略 */ + private String misfirePolicy; + + /** 是否并发执行（0允许 1禁止） */ + private String concurrent; + + /** 任务状态（0正常 1暂停） */ + private Integer status; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setJobName(String jobName) + { + this.jobName = jobName; + } + + public String getJobName() + { + return jobName; + } + public void setJobGroup(String jobGroup) + { + this.jobGroup = jobGroup; + } + + public String getJobGroup() + { + return jobGroup; + } + public void setInvokeTarget(String invokeTarget) + { + this.invokeTarget = invokeTarget; + } + + public String getInvokeTarget() + { + return invokeTarget; + } + public void setCronExpression(String cronExpression) + { + this.cronExpression = cronExpression; + } + + public String getCronExpression() + { + return cronExpression; + } + public void setMisfirePolicy(String misfirePolicy) + { + this.misfirePolicy = misfirePolicy; + } + + public String getMisfirePolicy() + { + return misfirePolicy; + } + public void setConcurrent(String concurrent) + { + this.concurrent = concurrent; + } + + public String getConcurrent() + { + return concurrent; + } + public void setStatus(Integer status) + { + this.status = status; + } + + public Integer getStatus() + { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("invokeTarget", getInvokeTarget()) + .append("cronExpression", getCronExpression()) + .append("misfirePolicy", getMisfirePolicy()) + .append("concurrent", getConcurrent()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysQuartzJobLog.java b/src/main/java/com/fc/v2/model/auto/TSysQuartzJobLog.java new file mode 100644 index 0000000..b7af08f --- /dev/null +++ b/src/main/java/com/fc/v2/model/auto/TSysQuartzJobLog.java @@ -0,0 +1,167 @@ + +package com.fc.v2.model.auto; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.util.DateUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + + +import com.baomidou.mybatisplus.annotation.*; +import com.fc.v2.common.base.BaseEntity; + +/** + * 定时任务调度日志对象 t_sys_quartz_job_log + * + * @author zhaonz + * @date 2021-08-06 + */ +@TableName("t_sys_quartz_job_log") +public class TSysQuartzJobLog extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 任务名称 */ + private String jobName; + + /** 任务组名 */ + private String jobGroup; + + /** 调用目标字符串 */ + private String invokeTarget; + + /** 日志信息 */ + private String jobMessage; + + /** 执行状态（0正常 1失败） */ + private Integer status; + + /** 异常信息 */ + private String exceptionInfo; + + /** 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date startTime; + + /** 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date endTime; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setJobName(String jobName) + { + this.jobName = jobName; + } + + public String getJobName() + { + return jobName; + } + public void setJobGroup(String jobGroup) + { + this.jobGroup = jobGroup; + } + + public String getJobGroup() + { + return jobGroup; + } + public void setInvokeTarget(String invokeTarget) + { + this.invokeTarget = invokeTarget; + } + + public String getInvokeTarget() + { + return invokeTarget; + } + public void setJobMessage(String jobMessage) + { + this.jobMessage = jobMessage; + } + + public String getJobMessage() + { + return jobMessage; + } + public void setStatus(Integer status) + { + this.status = status; + } + + public Integer getStatus() + { + return status; + } + public void setExceptionInfo(String exceptionInfo) + { + this.exceptionInfo = exceptionInfo; + } + + public String getExceptionInfo() + { + return exceptionInfo; + } + public void setStartTime(Date startTime) + { + this.startTime = startTime; + } + + public Date getStartTime() + { + return startTime; + } + public void setEndTime(Date endTime) + { + this.endTime = endTime; + } + + public Date getEndTime() + { + return endTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("invokeTarget", getInvokeTarget()) + .append("jobMessage", getJobMessage()) + .append("status", getStatus()) + .append("exceptionInfo", getExceptionInfo()) + .append("startTime", getStartTime()) + .append("endTime", getEndTime()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } + + /** + * 格式化时间 + * @return yyyy-MM-dd HH:mm:ss + */ + public String getdate(Date date){ + return DateUtils.parseDateToStr(DateUtils.DATE_TIME_PATTERN,date); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TsysOperLog.java b/src/main/java/com/fc/v2/model/auto/TsysOperLog.java index 1e8105f..7a6891b 100644 --- a/src/main/java/com/fc/v2/model/auto/TsysOperLog.java +++ b/src/main/java/com/fc/v2/model/auto/TsysOperLog.java @@ -1,100 +1,154 @@ + package com.fc.v2.model.auto; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fc.v2.util.DateUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; -import java.util.Date; -@TableName(value = "t_sys_oper_log") -public class TsysOperLog { +import com.baomidou.mybatisplus.annotation.*; +import com.fc.v2.common.base.BaseEntity; +/** + * 日志记录对象 t_sys_oper_log + * + * @author zhaonz + * @date 2021-08-06 + */ +@TableName("t_sys_oper_log") +public class TSysOperLog extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ @TableId(type = IdType.ASSIGN_ID) - private String id; + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + /** 标题 */ private String title; + /** 方法 */ private String method; + /** 操作人 */ private String operName; + /** url */ private String operUrl; + /** 参数 */ private String operParam; + /** */ private String errorMsg; - + + /** 操作时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date operTime; - public String getId() { - return id; + public void setId(Long id) + { + this.id = id; } - public void setId(String id) { - this.id = id == null ? null : id.trim(); + public Long getId() + { + return id; + } + public void setTitle(String title) + { + this.title = title; } - public String getTitle() { + public String getTitle() + { return title; } - - public void setTitle(String title) { - this.title = title == null ? null : title.trim(); + public void setMethod(String method) + { + this.method = method; } - public String getMethod() { + public String getMethod() + { return method; } - - public void setMethod(String method) { - this.method = method == null ? null : method.trim(); + public void setOperName(String operName) + { + this.operName = operName; } - public String getOperName() { + public String getOperName() + { return operName; } - - public void setOperName(String operName) { - this.operName = operName == null ? null : operName.trim(); + public void setOperUrl(String operUrl) + { + this.operUrl = operUrl; } - public String getOperUrl() { + public String getOperUrl() + { return operUrl; } - - public void setOperUrl(String operUrl) { - this.operUrl = operUrl == null ? null : operUrl.trim(); + public void setOperParam(String operParam) + { + this.operParam = operParam; } - public String getOperParam() { + public String getOperParam() + { return operParam; } - - public void setOperParam(String operParam) { - this.operParam = operParam == null ? null : operParam.trim(); + public void setErrorMsg(String errorMsg) + { + this.errorMsg = errorMsg; } - public String getErrorMsg() { + public String getErrorMsg() + { return errorMsg; } - - public void setErrorMsg(String errorMsg) { - this.errorMsg = errorMsg == null ? null : errorMsg.trim(); + public void setOperTime(Date operTime) + { + this.operTime = operTime; } - public Date getOperTime() { + public Date getOperTime() + { return operTime; } - public void setOperTime(Date operTime) { - this.operTime = operTime; - } - + /** + * 格式化时间 + * + * @return + */ public String getdate(){ - return DateUtils.dateTime(this.operTime); - } - -} \ No newline at end of file + return DateUtils.dateTime(this.operTime); + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("title", getTitle()) + .append("method", getMethod()) + .append("operName", getOperName()) + .append("operUrl", getOperUrl()) + .append("operParam", getOperParam()) + .append("errorMsg", getErrorMsg()) + .append("operTime", getOperTime()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TsysOperLogExample.java b/src/main/java/com/fc/v2/model/auto/TsysOperLogExample.java deleted file mode 100644 index 3ad9594..0000000 --- a/src/main/java/com/fc/v2/model/auto/TsysOperLogExample.java +++ /dev/null @@ -1,778 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -public class TsysOperLogExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public TsysOperLogExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - protected void addCriterionForJDBCDate(String condition, Date value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - addCriterion(condition, new java.sql.Date(value.getTime()), property); - } - - protected void addCriterionForJDBCDate(String condition, List values, String property) { - if (values == null || values.size() == 0) { - throw new RuntimeException("Value list for " + property + " cannot be null or empty"); - } - List dateList = new ArrayList(); - Iterator iter = values.iterator(); - while (iter.hasNext()) { - dateList.add(new java.sql.Date(iter.next().getTime())); - } - addCriterion(condition, dateList, property); - } - - protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andTitleIsNull() { - addCriterion("title is null"); - return (Criteria) this; - } - - public Criteria andTitleIsNotNull() { - addCriterion("title is not null"); - return (Criteria) this; - } - - public Criteria andTitleEqualTo(String value) { - addCriterion("title =", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotEqualTo(String value) { - addCriterion("title <>", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThan(String value) { - addCriterion("title >", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThanOrEqualTo(String value) { - addCriterion("title >=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThan(String value) { - addCriterion("title <", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThanOrEqualTo(String value) { - addCriterion("title <=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLike(String value) { - addCriterion("title like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotLike(String value) { - addCriterion("title not like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleIn(List values) { - addCriterion("title in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotIn(List values) { - addCriterion("title not in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleBetween(String value1, String value2) { - addCriterion("title between", value1, value2, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotBetween(String value1, String value2) { - addCriterion("title not between", value1, value2, "title"); - return (Criteria) this; - } - - public Criteria andMethodIsNull() { - addCriterion("method is null"); - return (Criteria) this; - } - - public Criteria andMethodIsNotNull() { - addCriterion("method is not null"); - return (Criteria) this; - } - - public Criteria andMethodEqualTo(String value) { - addCriterion("method =", value, "method"); - return (Criteria) this; - } - - public Criteria andMethodNotEqualTo(String value) { - addCriterion("method <>", value, "method"); - return (Criteria) this; - } - - public Criteria andMethodGreaterThan(String value) { - addCriterion("method >", value, "method"); - return (Criteria) this; - } - - public Criteria andMethodGreaterThanOrEqualTo(String value) { - addCriterion("method >=", value, "method"); - return (Criteria) this; - } - - public Criteria andMethodLessThan(String value) { - addCriterion("method <", value, "method"); - return (Criteria) this; - } - - public Criteria andMethodLessThanOrEqualTo(String value) { - addCriterion("method <=", value, "method"); - return (Criteria) this; - } - - public Criteria andMethodLike(String value) { - addCriterion("method like", value, "method"); - return (Criteria) this; - } - - public Criteria andMethodNotLike(String value) { - addCriterion("method not like", value, "method"); - return (Criteria) this; - } - - public Criteria andMethodIn(List values) { - addCriterion("method in", values, "method"); - return (Criteria) this; - } - - public Criteria andMethodNotIn(List values) { - addCriterion("method not in", values, "method"); - return (Criteria) this; - } - - public Criteria andMethodBetween(String value1, String value2) { - addCriterion("method between", value1, value2, "method"); - return (Criteria) this; - } - - public Criteria andMethodNotBetween(String value1, String value2) { - addCriterion("method not between", value1, value2, "method"); - return (Criteria) this; - } - - public Criteria andOperNameIsNull() { - addCriterion("oper_name is null"); - return (Criteria) this; - } - - public Criteria andOperNameIsNotNull() { - addCriterion("oper_name is not null"); - return (Criteria) this; - } - - public Criteria andOperNameEqualTo(String value) { - addCriterion("oper_name =", value, "operName"); - return (Criteria) this; - } - - public Criteria andOperNameNotEqualTo(String value) { - addCriterion("oper_name <>", value, "operName"); - return (Criteria) this; - } - - public Criteria andOperNameGreaterThan(String value) { - addCriterion("oper_name >", value, "operName"); - return (Criteria) this; - } - - public Criteria andOperNameGreaterThanOrEqualTo(String value) { - addCriterion("oper_name >=", value, "operName"); - return (Criteria) this; - } - - public Criteria andOperNameLessThan(String value) { - addCriterion("oper_name <", value, "operName"); - return (Criteria) this; - } - - public Criteria andOperNameLessThanOrEqualTo(String value) { - addCriterion("oper_name <=", value, "operName"); - return (Criteria) this; - } - - public Criteria andOperNameLike(String value) { - addCriterion("oper_name like", value, "operName"); - return (Criteria) this; - } - - public Criteria andOperNameNotLike(String value) { - addCriterion("oper_name not like", value, "operName"); - return (Criteria) this; - } - - public Criteria andOperNameIn(List values) { - addCriterion("oper_name in", values, "operName"); - return (Criteria) this; - } - - public Criteria andOperNameNotIn(List values) { - addCriterion("oper_name not in", values, "operName"); - return (Criteria) this; - } - - public Criteria andOperNameBetween(String value1, String value2) { - addCriterion("oper_name between", value1, value2, "operName"); - return (Criteria) this; - } - - public Criteria andOperNameNotBetween(String value1, String value2) { - addCriterion("oper_name not between", value1, value2, "operName"); - return (Criteria) this; - } - - public Criteria andOperUrlIsNull() { - addCriterion("oper_url is null"); - return (Criteria) this; - } - - public Criteria andOperUrlIsNotNull() { - addCriterion("oper_url is not null"); - return (Criteria) this; - } - - public Criteria andOperUrlEqualTo(String value) { - addCriterion("oper_url =", value, "operUrl"); - return (Criteria) this; - } - - public Criteria andOperUrlNotEqualTo(String value) { - addCriterion("oper_url <>", value, "operUrl"); - return (Criteria) this; - } - - public Criteria andOperUrlGreaterThan(String value) { - addCriterion("oper_url >", value, "operUrl"); - return (Criteria) this; - } - - public Criteria andOperUrlGreaterThanOrEqualTo(String value) { - addCriterion("oper_url >=", value, "operUrl"); - return (Criteria) this; - } - - public Criteria andOperUrlLessThan(String value) { - addCriterion("oper_url <", value, "operUrl"); - return (Criteria) this; - } - - public Criteria andOperUrlLessThanOrEqualTo(String value) { - addCriterion("oper_url <=", value, "operUrl"); - return (Criteria) this; - } - - public Criteria andOperUrlLike(String value) { - addCriterion("oper_url like", value, "operUrl"); - return (Criteria) this; - } - - public Criteria andOperUrlNotLike(String value) { - addCriterion("oper_url not like", value, "operUrl"); - return (Criteria) this; - } - - public Criteria andOperUrlIn(List values) { - addCriterion("oper_url in", values, "operUrl"); - return (Criteria) this; - } - - public Criteria andOperUrlNotIn(List values) { - addCriterion("oper_url not in", values, "operUrl"); - return (Criteria) this; - } - - public Criteria andOperUrlBetween(String value1, String value2) { - addCriterion("oper_url between", value1, value2, "operUrl"); - return (Criteria) this; - } - - public Criteria andOperUrlNotBetween(String value1, String value2) { - addCriterion("oper_url not between", value1, value2, "operUrl"); - return (Criteria) this; - } - - public Criteria andOperParamIsNull() { - addCriterion("oper_param is null"); - return (Criteria) this; - } - - public Criteria andOperParamIsNotNull() { - addCriterion("oper_param is not null"); - return (Criteria) this; - } - - public Criteria andOperParamEqualTo(String value) { - addCriterion("oper_param =", value, "operParam"); - return (Criteria) this; - } - - public Criteria andOperParamNotEqualTo(String value) { - addCriterion("oper_param <>", value, "operParam"); - return (Criteria) this; - } - - public Criteria andOperParamGreaterThan(String value) { - addCriterion("oper_param >", value, "operParam"); - return (Criteria) this; - } - - public Criteria andOperParamGreaterThanOrEqualTo(String value) { - addCriterion("oper_param >=", value, "operParam"); - return (Criteria) this; - } - - public Criteria andOperParamLessThan(String value) { - addCriterion("oper_param <", value, "operParam"); - return (Criteria) this; - } - - public Criteria andOperParamLessThanOrEqualTo(String value) { - addCriterion("oper_param <=", value, "operParam"); - return (Criteria) this; - } - - public Criteria andOperParamLike(String value) { - addCriterion("oper_param like", value, "operParam"); - return (Criteria) this; - } - - public Criteria andOperParamNotLike(String value) { - addCriterion("oper_param not like", value, "operParam"); - return (Criteria) this; - } - - public Criteria andOperParamIn(List values) { - addCriterion("oper_param in", values, "operParam"); - return (Criteria) this; - } - - public Criteria andOperParamNotIn(List values) { - addCriterion("oper_param not in", values, "operParam"); - return (Criteria) this; - } - - public Criteria andOperParamBetween(String value1, String value2) { - addCriterion("oper_param between", value1, value2, "operParam"); - return (Criteria) this; - } - - public Criteria andOperParamNotBetween(String value1, String value2) { - addCriterion("oper_param not between", value1, value2, "operParam"); - return (Criteria) this; - } - - public Criteria andErrorMsgIsNull() { - addCriterion("error_msg is null"); - return (Criteria) this; - } - - public Criteria andErrorMsgIsNotNull() { - addCriterion("error_msg is not null"); - return (Criteria) this; - } - - public Criteria andErrorMsgEqualTo(String value) { - addCriterion("error_msg =", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgNotEqualTo(String value) { - addCriterion("error_msg <>", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgGreaterThan(String value) { - addCriterion("error_msg >", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgGreaterThanOrEqualTo(String value) { - addCriterion("error_msg >=", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgLessThan(String value) { - addCriterion("error_msg <", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgLessThanOrEqualTo(String value) { - addCriterion("error_msg <=", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgLike(String value) { - addCriterion("error_msg like", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgNotLike(String value) { - addCriterion("error_msg not like", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgIn(List values) { - addCriterion("error_msg in", values, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgNotIn(List values) { - addCriterion("error_msg not in", values, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgBetween(String value1, String value2) { - addCriterion("error_msg between", value1, value2, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgNotBetween(String value1, String value2) { - addCriterion("error_msg not between", value1, value2, "errorMsg"); - return (Criteria) this; - } - - public Criteria andOperTimeIsNull() { - addCriterion("oper_time is null"); - return (Criteria) this; - } - - public Criteria andOperTimeIsNotNull() { - addCriterion("oper_time is not null"); - return (Criteria) this; - } - - public Criteria andOperTimeEqualTo(Date value) { - addCriterionForJDBCDate("oper_time =", value, "operTime"); - return (Criteria) this; - } - - public Criteria andOperTimeNotEqualTo(Date value) { - addCriterionForJDBCDate("oper_time <>", value, "operTime"); - return (Criteria) this; - } - - public Criteria andOperTimeGreaterThan(Date value) { - addCriterionForJDBCDate("oper_time >", value, "operTime"); - return (Criteria) this; - } - - public Criteria andOperTimeGreaterThanOrEqualTo(Date value) { - addCriterionForJDBCDate("oper_time >=", value, "operTime"); - return (Criteria) this; - } - - public Criteria andOperTimeLessThan(Date value) { - addCriterionForJDBCDate("oper_time <", value, "operTime"); - return (Criteria) this; - } - - public Criteria andOperTimeLessThanOrEqualTo(Date value) { - addCriterionForJDBCDate("oper_time <=", value, "operTime"); - return (Criteria) this; - } - - public Criteria andOperTimeIn(List values) { - addCriterionForJDBCDate("oper_time in", values, "operTime"); - return (Criteria) this; - } - - public Criteria andOperTimeNotIn(List values) { - addCriterionForJDBCDate("oper_time not in", values, "operTime"); - return (Criteria) this; - } - - public Criteria andOperTimeBetween(Date value1, Date value2) { - addCriterionForJDBCDate("oper_time between", value1, value2, "operTime"); - return (Criteria) this; - } - - public Criteria andOperTimeNotBetween(Date value1, Date value2) { - addCriterionForJDBCDate("oper_time not between", value1, value2, "operTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/service/DictService.java b/src/main/java/com/fc/v2/service/DictService.java deleted file mode 100644 index be8af77..0000000 --- a/src/main/java/com/fc/v2/service/DictService.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.mapper.auto.TSysDictDataMapper; -import com.fc.v2.mapper.auto.TSysDictTypeMapper; -import com.fc.v2.model.auto.TSysDictData; -import com.fc.v2.model.auto.TSysDictDataExample; -import com.fc.v2.model.auto.TSysDictType; -import com.fc.v2.model.auto.TSysDictTypeExample; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -@Service("dict") -public class DictService { - @Autowired - private TSysDictDataMapper tSysDictDataMapper; - - @Autowired - private TSysDictTypeMapper dictTypeMapper; - - /** - * 根据字典类型查询字典数据信息 - * - * @param dictType 字典类型 - * @return 参数键值 - */ - public List getType(String dictType) { - TSysDictDataExample example=new TSysDictDataExample(); - if(dictType!=null) { - example.createCriteria().andDictTypeEqualTo(dictType); - return tSysDictDataMapper.selectByExample(example); - } - return new ArrayList(); - } - - /** - * 根据字典类型和字典键值查询字典数据信息 - * - * @param dictType - * 字典类型 - * @param dictValue - * 字典键值 - * @return 字典标签 - */ - public String getLabel(String dictType, String dictValue) { - - TSysDictDataExample example=new TSysDictDataExample(); - if(dictType!=null&&dictValue!=null) { - example.createCriteria().andDictTypeEqualTo(dictType).andDictValueEqualTo(dictValue); - List dictDatas=tSysDictDataMapper.selectByExample(example); - if(dictDatas.size()>0) { - return dictDatas.get(0).getDictLabel(); - } - } - return ""; - } - - /** - * 根字典类型查询字典 - * @param dictType - * @return - */ - public TSysDictType getSysDictType(String dictType) { - TSysDictTypeExample dictTypeExample=new TSysDictTypeExample(); - dictTypeExample.createCriteria().andDictTypeEqualTo(dictType); - List tSysDictTypes=dictTypeMapper.selectByExample(dictTypeExample); - if(tSysDictTypes!=null&&tSysDictTypes.size()>0) { - return tSysDictTypes.get(0); - } - return null; - - } - - - -} diff --git a/src/main/java/com/fc/v2/service/ITDictService.java b/src/main/java/com/fc/v2/service/ITDictService.java new file mode 100644 index 0000000..bf01c15 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITDictService.java @@ -0,0 +1,40 @@ +package com.fc.v2.service; + +import com.fc.v2.model.auto.TSysDictData; +import com.fc.v2.model.auto.TSysDictType; + +import java.util.List; + +/** + * 字典Service接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface ITDictService { + + /** + * 根据字典类型查询字典数据信息 + * + * @param dictType + * @return + */ + public List getType(String dictType); + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType + * @param dictValue + * @return + */ + public String getLabel(String dictType, String dictValue); + + /** + * 根字典类型查询字典 + * + * @param dictType + * @return + */ + public TSysDictType getSysDictType(String dictType); +} diff --git a/src/main/java/com/fc/v2/service/ITSysDictDataService.java b/src/main/java/com/fc/v2/service/ITSysDictDataService.java new file mode 100644 index 0000000..79f90d2 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysDictDataService.java @@ -0,0 +1,80 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysDictData; + +/** + * 字典数据Service接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface ITSysDictDataService extends IService { + /** + * 查询字典数据 + * + * @param id 字典数据ID + * @return 字典数据 + */ + public TSysDictData selectTSysDictDataById(Long id); + + /** + * 查询字典数据列表 + * + * @param queryWrapper 字典数据 + * @return 字典数据集合 + */ + public List selectTSysDictDataList(Wrapper queryWrapper); + + /** + * 查询字典数据列表 + * + * @param tSysDictData 字典数据 + * @return 字典数据集合 + */ + public List selectTSysDictDataList(TSysDictData tSysDictData); + + /** + * 新增字典数据 + * + * @param tSysDictData 字典数据 + * @return 结果 + */ + public int insertTSysDictData(TSysDictData tSysDictData); + + /** + * 修改字典数据 + * + * @param tSysDictData 字典数据 + * @return 结果 + */ + public int updateTSysDictData(TSysDictData tSysDictData); + + /** + * 批量删除字典数据 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysDictDataByIds(String ids); + + /** + * 删除字典数据信息 + * + * @param id 字典数据ID + * @return 结果 + */ + public int deleteTSysDictDataById(Long id); + + /** + * 检查name + * + * @param tSysDictData + * @return + */ + public int checkNameUnique(TSysDictData tSysDictData); +} diff --git a/src/main/java/com/fc/v2/service/ITSysDictTypeService.java b/src/main/java/com/fc/v2/service/ITSysDictTypeService.java new file mode 100644 index 0000000..926eaf2 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysDictTypeService.java @@ -0,0 +1,80 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysDictType; + +/** + * 字典类型Service接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface ITSysDictTypeService extends IService { + /** + * 查询字典类型 + * + * @param id 字典类型ID + * @return 字典类型 + */ + public TSysDictType selectTSysDictTypeById(Long id); + + /** + * 查询字典类型列表 + * + * @param queryWrapper 字典类型 + * @return 字典类型集合 + */ + public List selectTSysDictTypeList(Wrapper queryWrapper); + + /** + * 查询字典类型列表 + * + * @param tSysDictType 字典类型 + * @return 字典类型集合 + */ + public List selectTSysDictTypeList(TSysDictType tSysDictType); + + /** + * 新增字典类型 + * + * @param tSysDictType 字典类型 + * @return 结果 + */ + public int insertTSysDictType(TSysDictType tSysDictType); + + /** + * 修改字典类型 + * + * @param tSysDictType 字典类型 + * @return 结果 + */ + public int updateTSysDictType(TSysDictType tSysDictType); + + /** + * 批量删除字典类型 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysDictTypeByIds(String ids); + + /** + * 删除字典类型信息 + * + * @param id 字典类型ID + * @return 结果 + */ + public int deleteTSysDictTypeById(Long id); + + /** + * 检查name + * + * @param tSysDictType + * @return + */ + public int checkNameUnique(TSysDictType tSysDictType); +} diff --git a/src/main/java/com/fc/v2/service/ITSysEmailService.java b/src/main/java/com/fc/v2/service/ITSysEmailService.java new file mode 100644 index 0000000..0fa0349 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysEmailService.java @@ -0,0 +1,80 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysEmail; + +/** + * 电子邮件Service接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface ITSysEmailService extends IService { + /** + * 查询电子邮件 + * + * @param id 电子邮件ID + * @return 电子邮件 + */ + public TSysEmail selectTSysEmailById(Long id); + + /** + * 查询电子邮件列表 + * + * @param queryWrapper 电子邮件 + * @return 电子邮件集合 + */ + public List selectTSysEmailList(Wrapper queryWrapper); + + /** + * 查询电子邮件列表 + * + * @param tSysEmail 电子邮件 + * @return 电子邮件集合 + */ + public List selectTSysEmailList(TSysEmail tSysEmail); + + /** + * 新增电子邮件 + * + * @param tSysEmail 电子邮件 + * @return 结果 + */ + public int insertTSysEmail(TSysEmail tSysEmail); + + /** + * 修改电子邮件 + * + * @param tSysEmail 电子邮件 + * @return 结果 + */ + public int updateTSysEmail(TSysEmail tSysEmail); + + /** + * 批量删除电子邮件 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysEmailByIds(String ids); + + /** + * 删除电子邮件信息 + * + * @param id 电子邮件ID + * @return 结果 + */ + public int deleteTSysEmailById(Long id); + + /** + * 检查name + * + * @param tSysEmail + * @return + */ + public int checkNameUnique(TSysEmail tSysEmail); +} diff --git a/src/main/java/com/fc/v2/service/ITSysFileService.java b/src/main/java/com/fc/v2/service/ITSysFileService.java new file mode 100644 index 0000000..cca82b8 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysFileService.java @@ -0,0 +1,80 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysFile; + +/** + * 文件信息Service接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface ITSysFileService extends IService { + /** + * 查询文件信息 + * + * @param id 文件信息ID + * @return 文件信息 + */ + public TSysFile selectTSysFileById(Long id); + + /** + * 查询文件信息列表 + * + * @param queryWrapper 文件信息 + * @return 文件信息集合 + */ + public List selectTSysFileList(Wrapper queryWrapper); + + /** + * 查询文件信息列表 + * + * @param tSysFile 文件信息 + * @return 文件信息集合 + */ + public List selectTSysFileList(TSysFile tSysFile); + + /** + * 新增文件信息 + * + * @param tSysFile 文件信息 + * @return 结果 + */ + public int insertTSysFile(TSysFile tSysFile); + + /** + * 修改文件信息 + * + * @param tSysFile 文件信息 + * @return 结果 + */ + public int updateTSysFile(TSysFile tSysFile); + + /** + * 批量删除文件信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysFileByIds(String ids); + + /** + * 删除文件信息信息 + * + * @param id 文件信息ID + * @return 结果 + */ + public int deleteTSysFileById(Long id); + + /** + * 检查name + * + * @param tsysFile + * @return + */ + int checkNameUnique(TSysFile tsysFile); +} diff --git a/src/main/java/com/fc/v2/service/ITSysNoticeService.java b/src/main/java/com/fc/v2/service/ITSysNoticeService.java new file mode 100644 index 0000000..4b2c69c --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysNoticeService.java @@ -0,0 +1,116 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysNotice; +import com.fc.v2.model.auto.TsysUser; +import com.fc.v2.model.custom.Tablepar; +import com.github.pagehelper.PageInfo; + +/** + * 公告Service接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface ITSysNoticeService extends IService { + /** + * 查询公告 + * + * @param id 公告ID + * @return 公告 + */ + public TSysNotice selectTSysNoticeById(Long id); + + /** + * 查询公告列表 + * + * @param queryWrapper 公告 + * @return 公告集合 + */ + public List selectTSysNoticeList(Wrapper queryWrapper); + + /** + * 查询公告列表 + * + * @param tSysNotice 公告 + * @return 公告集合 + */ + public List selectTSysNoticeList(TSysNotice tSysNotice); + + /** + * 查询公告列表 + * + * @param tsysUser + * @param tablepar + * @param name + * @return + */ + public PageInfo selectTSysNoticeList(TsysUser tsysUser, Tablepar tablepar, String name); + + /** + * 新增公告 + * + * @param tSysNotice 公告 + * @return 结果 + */ + public int insertTSysNotice(TSysNotice tSysNotice); + + /** + * 修改公告 + * + * @param tSysNotice 公告 + * @return 结果 + */ + public int updateTSysNotice(TSysNotice tSysNotice); + + /** + * 批量删除公告 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysNoticeByIds(String ids); + + /** + * 删除公告信息 + * + * @param id 公告ID + * @return 结果 + */ + public int deleteTSysNoticeById(Long id); + + /** + * 检查name + * + * @param sysNotice + * @return + */ + public int checkNameUnique(TSysNotice sysNotice); + + /** + * 根据公告id把当前用户的公告置为以查看 + * + * @param id + */ + public void editUserState(Long id); + + /** + * 获取用户未阅读公告 + * + * @param user + * @param state + * @return + */ + public List getuserNoticeNotRead(TsysUser user, int state); + + /** + * 获取最新8条公告 + * + * @return + */ + public List getNEW(); +} diff --git a/src/main/java/com/fc/v2/service/ITSysNoticeUserService.java b/src/main/java/com/fc/v2/service/ITSysNoticeUserService.java new file mode 100644 index 0000000..0ea7f3b --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysNoticeUserService.java @@ -0,0 +1,72 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysNoticeUser; + +/** + * 公告_用户外键Service接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface ITSysNoticeUserService extends IService { + /** + * 查询公告_用户外键 + * + * @param id 公告_用户外键ID + * @return 公告_用户外键 + */ + public TSysNoticeUser selectTSysNoticeUserById(Long id); + + /** + * 查询公告_用户外键列表 + * + * @param queryWrapper 公告_用户外键 + * @return 公告_用户外键集合 + */ + public List selectTSysNoticeUserList(Wrapper queryWrapper); + + /** + * 查询公告_用户外键列表 + * + * @param tSysNoticeUser 公告_用户外键 + * @return 公告_用户外键集合 + */ + public List selectTSysNoticeUserList(TSysNoticeUser tSysNoticeUser); + + /** + * 新增公告_用户外键 + * + * @param tSysNoticeUser 公告_用户外键 + * @return 结果 + */ + public int insertTSysNoticeUser(TSysNoticeUser tSysNoticeUser); + + /** + * 修改公告_用户外键 + * + * @param tSysNoticeUser 公告_用户外键 + * @return 结果 + */ + public int updateTSysNoticeUser(TSysNoticeUser tSysNoticeUser); + + /** + * 批量删除公告_用户外键 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysNoticeUserByIds(String ids); + + /** + * 删除公告_用户外键信息 + * + * @param id 公告_用户外键ID + * @return 结果 + */ + public int deleteTSysNoticeUserById(Long id); +} diff --git a/src/main/java/com/fc/v2/service/ITSysOperLogService.java b/src/main/java/com/fc/v2/service/ITSysOperLogService.java new file mode 100644 index 0000000..f716268 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysOperLogService.java @@ -0,0 +1,80 @@ + +package com.fc.v2.service; + +import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysOperLog; + +/** + * 日志记录Service接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface ITSysOperLogService extends IService { + /** + * 查询日志记录 + * + * @param id 日志记录ID + * @return 日志记录 + */ + public TSysOperLog selectTSysOperLogById(Long id); + + /** + * 查询日志记录列表 + * + * @param queryWrapper 日志记录 + * @return 日志记录集合 + */ + public List selectTSysOperLogList(Wrapper queryWrapper); + + /** + * 查询日志记录列表 + * + * @param tSysOperLog 日志记录 + * @return 日志记录集合 + */ + public List selectTSysOperLogList(TSysOperLog tSysOperLog); + + /** + * 新增日志记录 + * + * @param tSysOperLog 日志记录 + * @return 结果 + */ + public int insertTSysOperLog(TSysOperLog tSysOperLog); + + /** + * 修改日志记录 + * + * @param tSysOperLog 日志记录 + * @return 结果 + */ + public int updateTSysOperLog(TSysOperLog tSysOperLog); + + /** + * 批量删除日志记录 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysOperLogByIds(String ids); + + /** + * 删除日志记录信息 + * + * @param id 日志记录ID + * @return 结果 + */ + public int deleteTSysOperLogById(Long id); + + /** + * 获取最新10条日志 + * + * @return + */ + public List getNEW(); +} diff --git a/src/main/java/com/fc/v2/service/ITSysQuartzJobLogService.java b/src/main/java/com/fc/v2/service/ITSysQuartzJobLogService.java new file mode 100644 index 0000000..c242b36 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysQuartzJobLogService.java @@ -0,0 +1,72 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysQuartzJobLog; + +/** + * 定时任务调度日志Service接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface ITSysQuartzJobLogService extends IService { + /** + * 查询定时任务调度日志 + * + * @param id 定时任务调度日志ID + * @return 定时任务调度日志 + */ + public TSysQuartzJobLog selectTSysQuartzJobLogById(Long id); + + /** + * 查询定时任务调度日志列表 + * + * @param queryWrapper 定时任务调度日志 + * @return 定时任务调度日志集合 + */ + public List selectTSysQuartzJobLogList(Wrapper queryWrapper); + + /** + * 查询定时任务调度日志列表 + * + * @param tSysQuartzJobLog 定时任务调度日志 + * @return 定时任务调度日志集合 + */ + public List selectTSysQuartzJobLogList(TSysQuartzJobLog tSysQuartzJobLog); + + /** + * 新增定时任务调度日志 + * + * @param tSysQuartzJobLog 定时任务调度日志 + * @return 结果 + */ + public int insertTSysQuartzJobLog(TSysQuartzJobLog tSysQuartzJobLog); + + /** + * 修改定时任务调度日志 + * + * @param tSysQuartzJobLog 定时任务调度日志 + * @return 结果 + */ + public int updateTSysQuartzJobLog(TSysQuartzJobLog tSysQuartzJobLog); + + /** + * 批量删除定时任务调度日志 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysQuartzJobLogByIds(String ids); + + /** + * 删除定时任务调度日志信息 + * + * @param id 定时任务调度日志ID + * @return 结果 + */ + public int deleteTSysQuartzJobLogById(Long id); +} diff --git a/src/main/java/com/fc/v2/service/ITSysQuartzJobService.java b/src/main/java/com/fc/v2/service/ITSysQuartzJobService.java new file mode 100644 index 0000000..8d76b18 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysQuartzJobService.java @@ -0,0 +1,114 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysQuartzJob; +import org.quartz.SchedulerException; + +/** + * 定时任务调度Service接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface ITSysQuartzJobService extends IService { + /** + * 查询定时任务调度 + * + * @param id 定时任务调度ID + * @return 定时任务调度 + */ + public TSysQuartzJob selectTSysQuartzJobById(Long id); + + /** + * 查询定时任务调度列表 + * + * @param queryWrapper 定时任务调度 + * @return 定时任务调度集合 + */ + public List selectTSysQuartzJobList(Wrapper queryWrapper); + + /** + * 查询定时任务调度列表 + * + * @param tSysQuartzJob 定时任务调度 + * @return 定时任务调度集合 + */ + public List selectTSysQuartzJobList(TSysQuartzJob tSysQuartzJob); + + /** + * 新增定时任务调度 + * + * @param tSysQuartzJob 定时任务调度 + * @return 结果 + */ + public int insertTSysQuartzJob(TSysQuartzJob tSysQuartzJob); + + /** + * 修改定时任务调度 + * + * @param tSysQuartzJob 定时任务调度 + * @return 结果 + */ + public int updateTSysQuartzJob(TSysQuartzJob tSysQuartzJob); + + /** + * 批量删除定时任务调度 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysQuartzJobByIds(String ids); + + /** + * 删除定时任务调度信息 + * + * @param id 定时任务调度ID + * @return 结果 + */ + public int deleteTSysQuartzJobById(Long id); + + /** + * 任务调度状态修改 + * + * @param newJob + * @return + */ + public int changeStatus(TSysQuartzJob newJob) throws SchedulerException; + + /** + * 恢复任务 + * + * @param job + * @return + * @throws SchedulerException + */ + public int resumeJob(TSysQuartzJob job) throws SchedulerException; + + /** + * 暂停任务 + * + * @param job + * @return + * @throws SchedulerException + */ + public int pauseJob(TSysQuartzJob job) throws SchedulerException; + /** + * 检查name + * + * @param sysQuartzJob + * @return + */ + public int checkNameUnique(TSysQuartzJob sysQuartzJob); + + /** + * 立即运行任务 + * + * @param newJob + * @throws SchedulerException + */ + public void run(TSysQuartzJob newJob) throws SchedulerException; +} diff --git a/src/main/java/com/fc/v2/service/SysDictDataService.java b/src/main/java/com/fc/v2/service/SysDictDataService.java deleted file mode 100644 index 12426d0..0000000 --- a/src/main/java/com/fc/v2/service/SysDictDataService.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.TSysDictDataMapper; -import com.fc.v2.mapper.auto.TSysDictTypeMapper; -import com.fc.v2.model.auto.TSysDictData; -import com.fc.v2.model.auto.TSysDictDataExample; -import com.fc.v2.model.auto.TSysDictType; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.shiro.util.ShiroUtils; -import com.fc.v2.util.SnowflakeIdWorker; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * 字典数据表Service -* @Title: TSysDictDataService.java -* @Package com.fc.v2.service -* @author 一休 -* @email 438081243@qq.com -* @date 2019-09-08 00:10:43 - */ -@Service -public class SysDictDataService extends ServiceImpl implements BaseService{ - @Autowired - private TSysDictDataMapper tSysDictDataMapper; - @Autowired - private TSysDictTypeMapper tSysDictTypeMapper; - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name,String dictId){ - TSysDictDataExample testExample=new TSysDictDataExample(); - testExample.setOrderByClause("dict_sort ASC"); - if(dictId!=null&&!"".equals(dictId)){ - TSysDictType dictType= tSysDictTypeMapper.selectByPrimaryKey(dictId); - if(dictType!=null) { - testExample.createCriteria().andDictTypeEqualTo(dictType.getDictType()); - } - } - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andDictValueLike("%"+name+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= tSysDictDataMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - - @Override - public int deleteByPrimaryKey(String ids) { - List lista= ConvertUtil.toListStrArray(ids); - TSysDictDataExample example=new TSysDictDataExample(); - example.createCriteria().andIdIn(lista); - return tSysDictDataMapper.deleteByExample(example); - } - - /** - * 添加 - */ - @Override - public int insertSelective(TSysDictData record) { - //添加雪花主键id - record.setId(SnowflakeIdWorker.getUUID()); - record.setCreateTime(new Date()); - record.setUpdateTime(new Date()); - record.setCreateBy(ShiroUtils.getUser().getUsername()); - return tSysDictDataMapper.insertSelective(record); - } - - @Override - public TSysDictData selectByPrimaryKey(String id) { - return tSysDictDataMapper.selectByPrimaryKey(id); - } - - @Override - public int updateByPrimaryKeySelective(TSysDictData record) { - record.setUpdateTime(new Date()); - record.setUpdateBy(ShiroUtils.getUser().getUsername()); - return tSysDictDataMapper.updateByPrimaryKeySelective(record); - } - - - @Override - public int updateByExampleSelective(TSysDictData record, TSysDictDataExample example) { - - return tSysDictDataMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(TSysDictData record, TSysDictDataExample example) { - - return tSysDictDataMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(TSysDictDataExample example) { - - return tSysDictDataMapper.selectByExample(example); - } - - - @Override - public long countByExample(TSysDictDataExample example) { - - return tSysDictDataMapper.countByExample(example); - } - - - @Override - public int deleteByExample(TSysDictDataExample example) { - - return tSysDictDataMapper.deleteByExample(example); - } - - /** - * 检查name - * @param TSysDictData - * @return - */ - public int checkNameUnique(TSysDictData tSysDictData){ - TSysDictDataExample example=new TSysDictDataExample(); - example.createCriteria().andDictValueEqualTo(tSysDictData.getDictValue()); - List list=tSysDictDataMapper.selectByExample(example); - return list.size(); - } - - /** - * 批量删除 - * @param dictIds - * @author fuce - * @Date 2019年9月9日 上午12:40:52 - */ - public void deleteByPrimaryDictIds(List dictIds) { - TSysDictDataExample example=new TSysDictDataExample(); - example.createCriteria().andIdIn(dictIds); - tSysDictDataMapper.deleteByExample(example); - } -} diff --git a/src/main/java/com/fc/v2/service/SysDictTypeService.java b/src/main/java/com/fc/v2/service/SysDictTypeService.java deleted file mode 100644 index 3a19f63..0000000 --- a/src/main/java/com/fc/v2/service/SysDictTypeService.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.TSysDictDataMapper; -import com.fc.v2.mapper.auto.TSysDictTypeMapper; -import com.fc.v2.model.auto.TSysDictDataExample; -import com.fc.v2.model.auto.TSysDictType; -import com.fc.v2.model.auto.TSysDictTypeExample; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.shiro.util.ShiroUtils; -import com.fc.v2.util.SnowflakeIdWorker; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 字典类型表Service -* @Title: TSysDictTypeService.java -* @Package com.fc.v2.service -* @author 一休 -* @email 438081243@qq.com -* @date 2019-09-05 12:34:25 - */ -@Service -public class SysDictTypeService extends ServiceImpl implements BaseService{ - @Autowired - private TSysDictTypeMapper tSysDictTypeMapper; - @Autowired - private TSysDictDataMapper tSysDictDataMapper; - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name){ - TSysDictTypeExample testExample=new TSysDictTypeExample(); - testExample.setOrderByClause("id+0 desc"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andDictNameLike("%"+name+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= tSysDictTypeMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - @Override - @Transactional - public int deleteByPrimaryKey(String ids) { - //查询type数据得data中DictType有哪些 - List lista=ConvertUtil.toListStrArray(ids); - TSysDictTypeExample example=new TSysDictTypeExample(); - example.createCriteria().andIdIn(lista); - List dictTypes=tSysDictTypeMapper.selectByExample(example); - //在删除type下面得data数据 - List datatypes=new ArrayList(); - for (TSysDictType tSysDictType : dictTypes) { - - datatypes.add(tSysDictType.getDictType()); - } - TSysDictDataExample dictDataExample=new TSysDictDataExample(); - dictDataExample.createCriteria().andDictTypeIn(datatypes); - tSysDictDataMapper.deleteByExample(dictDataExample); - //在删除type数据 - tSysDictTypeMapper.deleteByExample(example); - return 1; - } - - - @Override - public TSysDictType selectByPrimaryKey(String id) { - - return tSysDictTypeMapper.selectByPrimaryKey(id); - } - - - @Override - public int updateByPrimaryKeySelective(TSysDictType record) { - record.setUpdateTime(new Date()); - record.setUpdateBy(ShiroUtils.getUser().getUsername()); - return tSysDictTypeMapper.updateByPrimaryKeySelective(record); - } - - /** - * 添加 - */ - @Override - public int insertSelective(TSysDictType record) { - //添加雪花主键id - record.setId(SnowflakeIdWorker.getUUID()); - record.setCreateTime(new Date()); - record.setUpdateTime(new Date()); - record.setCreateBy(ShiroUtils.getUser().getUsername()); - - return tSysDictTypeMapper.insertSelective(record); - } - - - @Override - public int updateByExampleSelective(TSysDictType record, TSysDictTypeExample example) { - - return tSysDictTypeMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(TSysDictType record, TSysDictTypeExample example) { - - return tSysDictTypeMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(TSysDictTypeExample example) { - - return tSysDictTypeMapper.selectByExample(example); - } - - - @Override - public long countByExample(TSysDictTypeExample example) { - - return tSysDictTypeMapper.countByExample(example); - } - - - @Override - public int deleteByExample(TSysDictTypeExample example) { - - return tSysDictTypeMapper.deleteByExample(example); - } - - /** - * 检查name - * @param TSysDictType - * @return - */ - public int checkNameUnique(TSysDictType tSysDictType){ - TSysDictTypeExample example=new TSysDictTypeExample(); - example.createCriteria().andDictNameEqualTo(tSysDictType.getDictName()); - List list=tSysDictTypeMapper.selectByExample(example); - return list.size(); - } -} diff --git a/src/main/java/com/fc/v2/service/SysFileService.java b/src/main/java/com/fc/v2/service/SysFileService.java deleted file mode 100644 index 1fb4dac..0000000 --- a/src/main/java/com/fc/v2/service/SysFileService.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.SysFileMapper; -import com.fc.v2.model.auto.SysFile; -import com.fc.v2.model.auto.SysFileExample; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.shiro.util.ShiroUtils; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -@Service -public class SysFileService extends ServiceImpl implements BaseService { - @Autowired - private SysFileMapper sysFileMapper; - - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar, String name){ - SysFileExample testExample=new SysFileExample(); - testExample.setOrderByClause("id ASC"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andFileNameEqualTo("%"+name+"%"); - } - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysFileMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - - /** - * 检查文件名字 - * @param tsysFile - * @return - */ - public int checkNameUnique(SysFile tsysFile){ - SysFileExample example=new SysFileExample(); - example.createCriteria().andFileNameEqualTo(tsysFile.getFileName()); - List list=sysFileMapper.selectByExample(example); - return list.size(); - } - - - /** - * 修改信息 - * @param record - * @return - */ - @Transactional - public int updateByPrimaryKey(SysFile record) { - //获取旧数据 - SysFile old_data=sysFileMapper.selectByPrimaryKey(record.getId()); - //插入修改人id - record.setUpdateUserId(ShiroUtils.getUserId()); - //插入修改人name - record.setUpdateUserName(ShiroUtils.getLoginName()); - //插入修改时间 - record.setUpdateTime(new Date()); - return sysFileMapper.updateByPrimaryKey(old_data); - } - - - /** - * 删除文件信息全部 - * @param ids 文件集合 1,2,3 - */ - @Transactional - @Override - public int deleteByPrimaryKey(String ids) { - List lista= ConvertUtil.toListStrArray(ids); - SysFileExample example=new SysFileExample(); - example.createCriteria().andIdIn(lista); - return sysFileMapper.deleteByExample(example); - } - - @Override - public int insertSelective(SysFile record) { - return sysFileMapper.insertSelective(record); - } - - @Override - public SysFile selectByPrimaryKey(String id) { - return sysFileMapper.selectByPrimaryKey(id); - } - - - public int updateByPrimaryKeySelective(SysFile record) { - return sysFileMapper.updateByPrimaryKeySelective(record); - } - - @Override - public int updateByExampleSelective(SysFile record, SysFileExample example) { - return sysFileMapper.updateByExampleSelective(record,example); - } - - @Override - public int updateByExample(SysFile record, SysFileExample example) { - return sysFileMapper.updateByExample(record,example); - } - - @Override - public List selectByExample(SysFileExample example) { - return sysFileMapper.selectByExample(example); - } - - @Override - public long countByExample(SysFileExample example) { - return sysFileMapper.countByExample(example); - } - - @Override - public int deleteByExample(SysFileExample example) { - return sysFileMapper.deleteByExample(example); - } -} diff --git a/src/main/java/com/fc/v2/service/SysNoticeService.java b/src/main/java/com/fc/v2/service/SysNoticeService.java deleted file mode 100644 index d11bcd8..0000000 --- a/src/main/java/com/fc/v2/service/SysNoticeService.java +++ /dev/null @@ -1,257 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.SysNoticeMapper; -import com.fc.v2.mapper.auto.SysNoticeUserMapper; -import com.fc.v2.model.auto.*; -import com.fc.v2.model.auto.SysNoticeUserExample.Criteria; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.shiro.util.ShiroUtils; -import com.fc.v2.util.SnowflakeIdWorker; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 公告 SysNoticeService - * @Title: SysNoticeService.java - * @Package com.fc.v2.service - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-08 01:38:44 - **/ -@Service -public class SysNoticeService extends ServiceImpl implements BaseService{ - @Autowired - private SysNoticeMapper sysNoticeMapper; - @Autowired - private SysUserService sysUserService; - @Autowired - private SysNoticeUserService sysNoticeUserService; - @Autowired - private SysNoticeUserMapper sysNoticeUserMapper; - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name){ - SysNoticeExample testExample=new SysNoticeExample(); - testExample.setOrderByClause("id ASC"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andTitleLike("%"+name+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysNoticeMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - - - /** - * 对应用户的所有公告信息 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(TsysUser tsysUser,Tablepar tablepar,String name){ - //查询未阅读的公告用户外键 - SysNoticeUserExample sysNoticeUserExample=new SysNoticeUserExample(); - Criteria criteria= sysNoticeUserExample.createCriteria(); - criteria.andUserIdEqualTo(tsysUser.getId()); - List noticeUsers= sysNoticeUserMapper.selectByExample(sysNoticeUserExample); - if(noticeUsers!=null&¬iceUsers.size()>0) { - //查询对应的公告列表 - List ids=new ArrayList(); - for (SysNoticeUser sysNoticeUser : noticeUsers) { - ids.add(sysNoticeUser.getNoticeId()); - } - - //分页查询对应用户的所有公告信息 - SysNoticeExample testExample=new SysNoticeExample(); - testExample.setOrderByClause("id desc"); - com.fc.v2.model.auto.SysNoticeExample.Criteria criteria1= testExample.createCriteria(); - if(name!=null&&!"".equals(name)){ - criteria1.andTitleLike("%"+name+"%"); - } - - criteria1.andIdIn(ids); - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysNoticeMapper.selectByExample(testExample); - - PageInfo pageInfo = new PageInfo(list); - - return pageInfo; - } - - return new PageInfo(); - - - } - - - @Override - public int deleteByPrimaryKey(String ids) { - List lista=ConvertUtil.toListStrArray(ids); - SysNoticeExample example=new SysNoticeExample(); - example.createCriteria().andIdIn(lista); - return sysNoticeMapper.deleteByExample(example); - } - - - @Override - public SysNotice selectByPrimaryKey(String id) { - - return sysNoticeMapper.selectByPrimaryKey(id); - } - - - @Override - public int updateByPrimaryKeySelective(SysNotice record) { - return sysNoticeMapper.updateByPrimaryKeySelective(record); - } - - /** - * 添加 - */ - @Override - @Transactional - public int insertSelective(SysNotice record) { - //添加雪花主键id - record.setId(SnowflakeIdWorker.getUUID()); - //添加创建人id - record.setCreateId(ShiroUtils.getUserId()); - //添加创建人 - record.setCreateUsername(ShiroUtils.getLoginName()); - //添加创建时间 - record.setCreateTime(new Date()); - sysNoticeMapper.insertSelective(record); - //给所有人添加公告状态 - List list= sysUserService.selectByExample(new TsysUserExample()); - for (TsysUser tsysUser : list) { - SysNoticeUser noticeUser=new SysNoticeUser(null, record.getId(), tsysUser.getId(), 0); - sysNoticeUserService.insertSelective(noticeUser); - } - return 1; - } - - - @Override - public int updateByExampleSelective(SysNotice record, SysNoticeExample example) { - - return sysNoticeMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(SysNotice record, SysNoticeExample example) { - - return sysNoticeMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(SysNoticeExample example) { - - return sysNoticeMapper.selectByExample(example); - } - - - @Override - public long countByExample(SysNoticeExample example) { - - return sysNoticeMapper.countByExample(example); - } - - - @Override - public int deleteByExample(SysNoticeExample example) { - - return sysNoticeMapper.deleteByExample(example); - } - - /** - * 检查name - * @param sysNotice - * @return - */ - public int checkNameUnique(SysNotice sysNotice){ - SysNoticeExample example=new SysNoticeExample(); - example.createCriteria().andTitleEqualTo(sysNotice.getTitle()); - List list=sysNoticeMapper.selectByExample(example); - return list.size(); - } - - /** - * 获取用户未阅读公告 - * @param tsysUser - * @param state 阅读状态 0未阅读 1 阅读 -1全部 - * @return - * @author fuce - * @Date 2019年9月8日 上午3:36:21 - */ - public List getuserNoticeNotRead(TsysUser tsysUser,int state){ - List notices=new ArrayList<>(); - //查询未阅读的公告用户外键 - SysNoticeUserExample sysNoticeUserExample=new SysNoticeUserExample(); - Criteria criteria= sysNoticeUserExample.createCriteria(); - criteria.andUserIdEqualTo(tsysUser.getId()); - if(-1!=state) { - criteria.andStateEqualTo(state); - } - List noticeUsers= sysNoticeUserMapper.selectByExample(sysNoticeUserExample); - if(noticeUsers!=null&¬iceUsers.size()>0) { - //查询对应的公告列表 - List ids=new ArrayList(); - for (SysNoticeUser sysNoticeUser : noticeUsers) { - ids.add(sysNoticeUser.getNoticeId()); - } - SysNoticeExample noticeExample = new SysNoticeExample(); - noticeExample.createCriteria().andIdIn(ids); - notices=sysNoticeMapper.selectByExample(noticeExample); - } - return notices; - } - - - /** - * 根据公告id把当前用户的公告置为以查看 - * @param noticeid - * @author fuce - * @Date 2019年9月8日 下午7:14:19 - */ - public void editUserState(String noticeid) { - //SysNoticeUser - SysNoticeUserExample sysNoticeUserExample=new SysNoticeUserExample(); - sysNoticeUserExample.createCriteria().andNoticeIdEqualTo(noticeid).andUserIdEqualTo(ShiroUtils.getUserId()); - List noticeUsers= sysNoticeUserMapper.selectByExample(sysNoticeUserExample); - for (SysNoticeUser sysNoticeUser : noticeUsers) { - sysNoticeUser.setState(1); - sysNoticeUserMapper.updateByPrimaryKey(sysNoticeUser); - } - } - - /** - * 获取最新8条公告 - * @return - */ - public List getNEW(){ - SysNoticeExample testExample=new SysNoticeExample(); - testExample.setOrderByClause("id DESC"); - PageHelper.startPage(1, 8); - List list= sysNoticeMapper.selectByExample(testExample); - return list; - } - - -} diff --git a/src/main/java/com/fc/v2/service/SysNoticeUserService.java b/src/main/java/com/fc/v2/service/SysNoticeUserService.java deleted file mode 100644 index 05e57dd..0000000 --- a/src/main/java/com/fc/v2/service/SysNoticeUserService.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.SysNoticeUserMapper; -import com.fc.v2.model.auto.SysNoticeUser; -import com.fc.v2.model.auto.SysNoticeUserExample; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.util.SnowflakeIdWorker; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 公告_用户外键 SysNoticeUserService - * @Title: SysNoticeUserService.java - * @Package com.fc.v2.service - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-08 02:12:54 - **/ -@Service -public class SysNoticeUserService extends ServiceImpl implements BaseService{ - @Autowired - private SysNoticeUserMapper sysNoticeUserMapper; - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name){ - SysNoticeUserExample testExample=new SysNoticeUserExample(); - testExample.setOrderByClause("id ASC"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andUserIdLike("%"+name+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysNoticeUserMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - @Override - public int deleteByPrimaryKey(String ids) { - List lista=ConvertUtil.toListStrArray(ids); - SysNoticeUserExample example=new SysNoticeUserExample(); - example.createCriteria().andIdIn(lista); - return sysNoticeUserMapper.deleteByExample(example); - } - - - @Override - public SysNoticeUser selectByPrimaryKey(String id) { - - return sysNoticeUserMapper.selectByPrimaryKey(id); - } - - - @Override - public int updateByPrimaryKeySelective(SysNoticeUser record) { - return sysNoticeUserMapper.updateByPrimaryKeySelective(record); - } - - /** - * 添加 - */ - @Override - public int insertSelective(SysNoticeUser record) { - //添加雪花主键id - record.setId(SnowflakeIdWorker.getUUID()); - return sysNoticeUserMapper.insertSelective(record); - } - - - @Override - public int updateByExampleSelective(SysNoticeUser record, SysNoticeUserExample example) { - - return sysNoticeUserMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(SysNoticeUser record, SysNoticeUserExample example) { - - return sysNoticeUserMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(SysNoticeUserExample example) { - - return sysNoticeUserMapper.selectByExample(example); - } - - - @Override - public long countByExample(SysNoticeUserExample example) { - - return sysNoticeUserMapper.countByExample(example); - } - - - @Override - public int deleteByExample(SysNoticeUserExample example) { - - return sysNoticeUserMapper.deleteByExample(example); - } - - /** - * 检查name - * @param sysNoticeUser - * @return - */ - public int checkNameUnique(SysNoticeUser sysNoticeUser){ - SysNoticeUserExample example=new SysNoticeUserExample(); - example.createCriteria().andUserIdEqualTo(sysNoticeUser.getUserId()); - List list=sysNoticeUserMapper.selectByExample(example); - return list.size(); - } - -} diff --git a/src/main/java/com/fc/v2/service/SysOperLogService.java b/src/main/java/com/fc/v2/service/SysOperLogService.java deleted file mode 100644 index 474631b..0000000 --- a/src/main/java/com/fc/v2/service/SysOperLogService.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.TsysOperLogMapper; -import com.fc.v2.model.auto.TsysOperLog; -import com.fc.v2.model.auto.TsysOperLogExample; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.util.SnowflakeIdWorker; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import java.util.List; - -@Service -public class SysOperLogService extends ServiceImpl implements BaseService{ - - //文件mapper - @Autowired - private TsysOperLogMapper tsysOperLogMapper; - - /** - * 分页查询 - * @return PageInfo - */ - public PageInfo list(Tablepar tablepar,String searchText){ - TsysOperLogExample testExample=new TsysOperLogExample(); - testExample.setOrderByClause("id+0 DESC"); - if(searchText!=null&&!"".equals(searchText)){ - testExample.createCriteria().andTitleLike("%"+searchText+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= tsysOperLogMapper.selectByExample(testExample); - return new PageInfo<>(list); - } - - - - /** - * 获取最新10条日志 - * @return List - */ - public List getNEW(){ - TsysOperLogExample testExample=new TsysOperLogExample(); - testExample.setOrderByClause("id DESC"); - PageHelper.startPage(1, 10); - return tsysOperLogMapper.selectByExample(testExample); - } - - - @Override - public int deleteByPrimaryKey(String ids) { - List lista=ConvertUtil.toListStrArray(ids); - TsysOperLogExample example=new TsysOperLogExample(); - example.createCriteria().andIdIn(lista); - return tsysOperLogMapper.deleteByExample(example); - } - - - - - - - @Override - public TsysOperLog selectByPrimaryKey(String id) { - - return tsysOperLogMapper.selectByPrimaryKey(id); - } - - - @Override - public int updateByPrimaryKeySelective(TsysOperLog record) { - return tsysOperLogMapper.updateByPrimaryKeySelective(record); - } - - - - - @Override - public int updateByExampleSelective(TsysOperLog record, TsysOperLogExample example) { - - return tsysOperLogMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(TsysOperLog record, TsysOperLogExample example) { - - return tsysOperLogMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(TsysOperLogExample example) { - - return tsysOperLogMapper.selectByExample(example); - } - - - @Override - public long countByExample(TsysOperLogExample example) { - - return tsysOperLogMapper.countByExample(example); - } - - - @Override - public int deleteByExample(TsysOperLogExample example) { - - return tsysOperLogMapper.deleteByExample(example); - } - - - - @Override - public int insertSelective(TsysOperLog record) { - record.setId(SnowflakeIdWorker.getUUID()); - return tsysOperLogMapper.insertSelective(record); - } - - - - -} diff --git a/src/main/java/com/fc/v2/service/SysQuartzJobLogService.java b/src/main/java/com/fc/v2/service/SysQuartzJobLogService.java deleted file mode 100644 index babc32d..0000000 --- a/src/main/java/com/fc/v2/service/SysQuartzJobLogService.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.SysQuartzJobLogMapper; -import com.fc.v2.model.auto.SysQuartzJobLog; -import com.fc.v2.model.auto.SysQuartzJobLogExample; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.util.SnowflakeIdWorker; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 定时任务调度日志表 SysQuartzJobLogService - * @Title: SysQuartzJobLogService.java - * @Package com.fc.v2.service - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-13 00:03:42 - **/ -@Service -public class SysQuartzJobLogService extends ServiceImpl implements BaseService{ - @Autowired - private SysQuartzJobLogMapper sysQuartzJobLogMapper; - - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name){ - SysQuartzJobLogExample testExample=new SysQuartzJobLogExample(); - testExample.setOrderByClause("id DESC"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andJobNameLike("%"+name+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysQuartzJobLogMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - @Override - public int deleteByPrimaryKey(String ids) { - List lista=ConvertUtil.toListStrArray(ids); - SysQuartzJobLogExample example=new SysQuartzJobLogExample(); - example.createCriteria().andIdIn(lista); - return sysQuartzJobLogMapper.deleteByExample(example); - } - - - @Override - public SysQuartzJobLog selectByPrimaryKey(String id) { - - return sysQuartzJobLogMapper.selectByPrimaryKey(id); - } - - - @Override - public int updateByPrimaryKeySelective(SysQuartzJobLog record) { - return sysQuartzJobLogMapper.updateByPrimaryKeySelective(record); - } - - /** - * 添加 - */ - @Override - public int insertSelective(SysQuartzJobLog record) { - //添加雪花主键id - record.setId(SnowflakeIdWorker.getUUID()); - return sysQuartzJobLogMapper.insertSelective(record); - } - - - @Override - public int updateByExampleSelective(SysQuartzJobLog record, SysQuartzJobLogExample example) { - - return sysQuartzJobLogMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(SysQuartzJobLog record, SysQuartzJobLogExample example) { - - return sysQuartzJobLogMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(SysQuartzJobLogExample example) { - - return sysQuartzJobLogMapper.selectByExample(example); - } - - - @Override - public long countByExample(SysQuartzJobLogExample example) { - - return sysQuartzJobLogMapper.countByExample(example); - } - - - @Override - public int deleteByExample(SysQuartzJobLogExample example) { - - return sysQuartzJobLogMapper.deleteByExample(example); - } - - /** - * 检查name - * @param sysQuartzJobLog - * @return - */ - public int checkNameUnique(SysQuartzJobLog sysQuartzJobLog){ - SysQuartzJobLogExample example=new SysQuartzJobLogExample(); - example.createCriteria().andJobNameEqualTo(sysQuartzJobLog.getJobName()); - List list=sysQuartzJobLogMapper.selectByExample(example); - return list.size(); - } - - -} diff --git a/src/main/java/com/fc/v2/service/SysQuartzJobService.java b/src/main/java/com/fc/v2/service/SysQuartzJobService.java deleted file mode 100644 index 9f3919c..0000000 --- a/src/main/java/com/fc/v2/service/SysQuartzJobService.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.quartz.QuartzSchedulerUtil; -import com.fc.v2.common.quartz.ScheduleConstants; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.SysQuartzJobMapper; -import com.fc.v2.model.auto.SysQuartzJob; -import com.fc.v2.model.auto.SysQuartzJobExample; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.util.SnowflakeIdWorker; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 定时任务调度表 SysQuartzJobService - * @Title: SysQuartzJobService.java - * @Package com.fc.v2.service - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2019-09-13 00:03:35 - **/ -@Service -public class SysQuartzJobService extends ServiceImpl implements BaseService{ - @Autowired - private SysQuartzJobMapper sysQuartzJobMapper; - @Autowired - private QuartzSchedulerUtil scheduler; - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name){ - SysQuartzJobExample testExample=new SysQuartzJobExample(); - testExample.setOrderByClause("id ASC"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andJobNameLike("%"+name+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysQuartzJobMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - @Override - public int deleteByPrimaryKey(String ids) { - List lista=ConvertUtil.toListStrArray(ids); - SysQuartzJobExample example=new SysQuartzJobExample(); - example.createCriteria().andIdIn(lista); - return sysQuartzJobMapper.deleteByExample(example); - } - - - @Override - public SysQuartzJob selectByPrimaryKey(String id) { - - return sysQuartzJobMapper.selectByPrimaryKey(id); - } - - - @Override - public int updateByPrimaryKeySelective(SysQuartzJob record) { - int i= sysQuartzJobMapper.updateByPrimaryKeySelective(record); - if(i>0) { - //修改定时器 - scheduler.modifyJob(record); - } - return i; - } - - /** - * 添加 - */ - @Override - public int insertSelective(SysQuartzJob record) { - //添加雪花主键id - record.setId(SnowflakeIdWorker.getUUID()); - return sysQuartzJobMapper.insertSelective(record); - } - - - @Override - public int updateByExampleSelective(SysQuartzJob record, SysQuartzJobExample example) { - - return sysQuartzJobMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(SysQuartzJob record, SysQuartzJobExample example) { - - return sysQuartzJobMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(SysQuartzJobExample example) { - - return sysQuartzJobMapper.selectByExample(example); - } - - - @Override - public long countByExample(SysQuartzJobExample example) { - - return sysQuartzJobMapper.countByExample(example); - } - - - @Override - public int deleteByExample(SysQuartzJobExample example) { - - return sysQuartzJobMapper.deleteByExample(example); - } - - /** - * 检查name - * @param sysQuartzJob - * @return - */ - public int checkNameUnique(SysQuartzJob sysQuartzJob){ - SysQuartzJobExample example=new SysQuartzJobExample(); - example.createCriteria().andJobNameEqualTo(sysQuartzJob.getJobName()); - List list=sysQuartzJobMapper.selectByExample(example); - return list.size(); - } - - - /** - * 恢复任务 - * - * @param job 调度信息 - */ - @Transactional - public int resumeJob(SysQuartzJob job) throws SchedulerException - { - job.setStatus(ScheduleConstants.Status.NORMAL.getValue()); - int rows = sysQuartzJobMapper.updateByPrimaryKeySelective(job); - if (rows > 0) - { - scheduler.resumeJob(job); - } - return rows; - } - - - /** - * 暂停任务 - * - * @param job 调度信息 - */ - @Transactional - public int pauseJob(SysQuartzJob job) throws SchedulerException - { - job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); - //job.setUpdateBy(ShiroUtils.getLoginName()); - int rows = sysQuartzJobMapper.updateByPrimaryKeySelective(job); - if (rows > 0) - { - scheduler.pauseJob(job); - } - return rows; - } - - /** - * 任务调度状态修改 - * - * @param job 调度信息 - */ - @Transactional - public int changeStatus(SysQuartzJob job) throws SchedulerException - { - int rows = 0; - Integer status = job.getStatus(); - if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) - { - rows = resumeJob(job); - } - else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) - { - rows = pauseJob(job); - } - return rows; - } - - - /** - * 立即运行任务 - * - * @param job 调度信息 - */ - @Transactional - public void run(SysQuartzJob job) throws SchedulerException - { - - scheduler.run(job); - - } - - -} diff --git a/src/main/java/com/fc/v2/service/TSysEmailService.java b/src/main/java/com/fc/v2/service/TSysEmailService.java deleted file mode 100644 index 42f89cd..0000000 --- a/src/main/java/com/fc/v2/service/TSysEmailService.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.fc.v2.service; - -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.TSysEmailMapper; -import com.fc.v2.model.auto.TSysEmail; -import com.fc.v2.model.auto.TSysEmailExample; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.shiro.util.ShiroUtils; -import com.fc.v2.util.SnowflakeIdWorker; - -/** - * 电子邮件Service -* @Title: TSysEmailService.java -* @Package com.fc.v2.service -* @author fuce -* @email 87766867@qq.com -* @date 2019-06-30 00:49:49 - */ -@Service -public class TSysEmailService extends ServiceImpl implements BaseService{ - @Autowired - private TSysEmailMapper tSysEmailMapper; - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name){ - TSysEmailExample testExample=new TSysEmailExample(); - testExample.setOrderByClause("id desc"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andContentLike("%"+name+"%"); - } - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= tSysEmailMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - @Override - public int deleteByPrimaryKey(String ids) { - List lista=ConvertUtil.toListStrArray(ids); - TSysEmailExample example=new TSysEmailExample(); - example.createCriteria().andIdIn(lista); - return tSysEmailMapper.deleteByExample(example); - } - - - @Override - public TSysEmail selectByPrimaryKey(String id) { - - return tSysEmailMapper.selectByPrimaryKey(id); - } - - - @Override - public int updateByPrimaryKeySelective(TSysEmail record) { - return tSysEmailMapper.updateByPrimaryKeySelective(record); - } - - /** - * 添加 - */ - @Override - public int insertSelective(TSysEmail record) { - //添加雪花主键id - record.setId(SnowflakeIdWorker.getUUID()); - record.setSendUserId(ShiroUtils.getUserId()); - record.setSendUserName(ShiroUtils.getLoginName()); - record.setCreateTime(new Date()); - return tSysEmailMapper.insertSelective(record); - } - - @Override - public int updateByExampleSelective(TSysEmail record, TSysEmailExample example) { - - return tSysEmailMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(TSysEmail record, TSysEmailExample example) { - - return tSysEmailMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(TSysEmailExample example) { - - return tSysEmailMapper.selectByExample(example); - } - - - @Override - public long countByExample(TSysEmailExample example) { - - return tSysEmailMapper.countByExample(example); - } - - - @Override - public int deleteByExample(TSysEmailExample example) { - - return tSysEmailMapper.deleteByExample(example); - } - - /** - * 检查name - * @param TSysEmail - * @return - */ - public int checkNameUnique(TSysEmail tSysEmail){ - TSysEmailExample example=new TSysEmailExample(); - example.createCriteria().andContentEqualTo(tSysEmail.getContent()); - List list=tSysEmailMapper.selectByExample(example); - return list.size(); - } - - -} diff --git a/src/main/java/com/fc/v2/service/impl/DictServiceImpl.java b/src/main/java/com/fc/v2/service/impl/DictServiceImpl.java new file mode 100644 index 0000000..76ce7fb --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/DictServiceImpl.java @@ -0,0 +1,82 @@ +package com.fc.v2.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.fc.v2.model.auto.TSysDictData; +import com.fc.v2.model.auto.TSysDictType; +import com.fc.v2.service.ITDictService; +import com.fc.v2.service.ITSysDictDataService; +import com.fc.v2.service.ITSysDictTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author zhaozhi + */ +@Service("dict") +public class DictServiceImpl implements ITDictService { + + @Autowired + private ITSysDictDataService itSysDictDataService; + + @Autowired + private ITSysDictTypeService itSysDictTypeService; + + /** + * 根据字典类型查询字典数据信息 + * + * @param dictType 字典类型 + * @return 参数键值 + */ + @Override + public List getType(String dictType) { + QueryWrapper queryWrapper = new QueryWrapper(); + if (dictType != null) { + queryWrapper.eq("dict_type", dictType); + return itSysDictDataService.selectTSysDictDataList(queryWrapper); + } + + return new ArrayList(); + } + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + @Override + public String getLabel(String dictType, String dictValue) { + + QueryWrapper queryWrapper = new QueryWrapper(); + if (dictType != null && dictValue != null) { + queryWrapper.eq("dict_type", dictType).eq("dict_value", dictValue); + List dictDatas = itSysDictDataService.selectTSysDictDataList(queryWrapper); + if (dictDatas.size() > 0) { + return dictDatas.get(0).getDictLabel(); + } + } + return ""; + } + + /** + * 根字典类型查询字典 + * + * @param dictType + * @return + */ + @Override + public TSysDictType getSysDictType(String dictType) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("dict_type", dictType); + List tSysDictTypes = itSysDictTypeService.selectTSysDictTypeList(queryWrapper); + if (tSysDictTypes != null && tSysDictTypes.size() > 0) { + return tSysDictTypes.get(0); + } + return null; + + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysDictDataServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysDictDataServiceImpl.java new file mode 100644 index 0000000..8bb152d --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysDictDataServiceImpl.java @@ -0,0 +1,134 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysDictDataMapper; +import com.fc.v2.model.auto.TSysDictData; +import com.fc.v2.service.ITSysDictDataService; + +import cn.hutool.core.bean.BeanUtil; + +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 字典数据Service业务层处理 + * + * @author zhaonz + * @date 2021-08-06 + */ +@Service +public class TSysDictDataServiceImpl extends ServiceImpl implements ITSysDictDataService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysDictDataServiceImpl.class); + + @Autowired + private TSysDictDataMapper tSysDictDataMapper; + + /** + * 查询字典数据 + * + * @param id 字典数据ID + * @return 字典数据 + */ + @Override + public TSysDictData selectTSysDictDataById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询字典数据列表 + * + * @param queryWrapper 字典数据 + * @return 字典数据 + */ + @Override + public List selectTSysDictDataList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 查询字典数据列表 + * + * @param tSysDictData 字典数据 + * @return 字典数据 + */ + @Override + public List selectTSysDictDataList(TSysDictData tSysDictData) { + Map map = BeanUtil.beanToMap(tSysDictData, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增字典数据 + * + * @param tSysDictData 字典数据 + * @return 结果 + */ + @Override + public int insertTSysDictData(TSysDictData tSysDictData) + { + return this.baseMapper.insert(tSysDictData); + } + + /** + * 修改字典数据 + * + * @param tSysDictData 字典数据 + * @return 结果 + */ + @Override + public int updateTSysDictData(TSysDictData tSysDictData) + { + return this.baseMapper.updateById(tSysDictData); + } + + /** + * 删除字典数据对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysDictDataByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除字典数据信息 + * + * @param id 字典数据ID + * @return 结果 + */ + @Override + public int deleteTSysDictDataById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * 检查name + * + * @param tSysDictData + * @return + */ + @Override + public int checkNameUnique(TSysDictData tSysDictData) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("dict_value", tSysDictData.getDictValue()); + return this.baseMapper.selectList(queryWrapper).size(); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysDictTypeServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysDictTypeServiceImpl.java new file mode 100644 index 0000000..7acdca3 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysDictTypeServiceImpl.java @@ -0,0 +1,134 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysDictTypeMapper; +import com.fc.v2.model.auto.TSysDictType; +import com.fc.v2.service.ITSysDictTypeService; + +import cn.hutool.core.bean.BeanUtil; + +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 字典类型Service业务层处理 + * + * @author zhaonz + * @date 2021-08-06 + */ +@Service +public class TSysDictTypeServiceImpl extends ServiceImpl implements ITSysDictTypeService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysDictTypeServiceImpl.class); + + @Autowired + private TSysDictTypeMapper tSysDictTypeMapper; + + /** + * 查询字典类型 + * + * @param id 字典类型ID + * @return 字典类型 + */ + @Override + public TSysDictType selectTSysDictTypeById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询字典类型列表 + * + * @param queryWrapper 字典类型 + * @return 字典类型 + */ + @Override + public List selectTSysDictTypeList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 查询字典类型列表 + * + * @param tSysDictType 字典类型 + * @return 字典类型 + */ + @Override + public List selectTSysDictTypeList(TSysDictType tSysDictType) { + Map map = BeanUtil.beanToMap(tSysDictType, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增字典类型 + * + * @param tSysDictType 字典类型 + * @return 结果 + */ + @Override + public int insertTSysDictType(TSysDictType tSysDictType) + { + return this.baseMapper.insert(tSysDictType); + } + + /** + * 修改字典类型 + * + * @param tSysDictType 字典类型 + * @return 结果 + */ + @Override + public int updateTSysDictType(TSysDictType tSysDictType) + { + return this.baseMapper.updateById(tSysDictType); + } + + /** + * 删除字典类型对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysDictTypeByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除字典类型信息 + * + * @param id 字典类型ID + * @return 结果 + */ + @Override + public int deleteTSysDictTypeById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * 检查name + * + * @param tSysDictType + * @return + */ + @Override + public int checkNameUnique(TSysDictType tSysDictType) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("dict_name", tSysDictType.getDictName()); + return this.baseMapper.selectList(queryWrapper).size(); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysEmailServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysEmailServiceImpl.java new file mode 100644 index 0000000..cc7ec95 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysEmailServiceImpl.java @@ -0,0 +1,134 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysEmailMapper; +import com.fc.v2.model.auto.TSysEmail; +import com.fc.v2.service.ITSysEmailService; + +import cn.hutool.core.bean.BeanUtil; + +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 电子邮件Service业务层处理 + * + * @author zhaonz + * @date 2021-08-06 + */ +@Service +public class TSysEmailServiceImpl extends ServiceImpl implements ITSysEmailService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysEmailServiceImpl.class); + + @Autowired + private TSysEmailMapper tSysEmailMapper; + + /** + * 查询电子邮件 + * + * @param id 电子邮件ID + * @return 电子邮件 + */ + @Override + public TSysEmail selectTSysEmailById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询电子邮件列表 + * + * @param queryWrapper 电子邮件 + * @return 电子邮件 + */ + @Override + public List selectTSysEmailList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 查询电子邮件列表 + * + * @param tSysEmail 电子邮件 + * @return 电子邮件 + */ + @Override + public List selectTSysEmailList(TSysEmail tSysEmail) { + Map map = BeanUtil.beanToMap(tSysEmail, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增电子邮件 + * + * @param tSysEmail 电子邮件 + * @return 结果 + */ + @Override + public int insertTSysEmail(TSysEmail tSysEmail) + { + return this.baseMapper.insert(tSysEmail); + } + + /** + * 修改电子邮件 + * + * @param tSysEmail 电子邮件 + * @return 结果 + */ + @Override + public int updateTSysEmail(TSysEmail tSysEmail) + { + return this.baseMapper.updateById(tSysEmail); + } + + /** + * 删除电子邮件对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysEmailByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除电子邮件信息 + * + * @param id 电子邮件ID + * @return 结果 + */ + @Override + public int deleteTSysEmailById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * 检查name + * + * @param tSysEmail + * @return + */ + @Override + public int checkNameUnique(TSysEmail tSysEmail) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("content", tSysEmail.getContent()); + return this.baseMapper.selectList(queryWrapper).size(); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysFileServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysFileServiceImpl.java new file mode 100644 index 0000000..01a8e1b --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysFileServiceImpl.java @@ -0,0 +1,129 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysFileMapper; +import com.fc.v2.model.auto.TSysFile; +import com.fc.v2.service.ITSysFileService; + +import cn.hutool.core.bean.BeanUtil; + +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 文件信息Service业务层处理 + * + * @author zhaonz + * @date 2021-08-06 + */ +@Service +public class TSysFileServiceImpl extends ServiceImpl implements ITSysFileService { + + private static final Logger logger = LoggerFactory.getLogger(TSysFileServiceImpl.class); + + @Autowired + private TSysFileMapper tSysFileMapper; + + /** + * 查询文件信息 + * + * @param id 文件信息ID + * @return 文件信息 + */ + @Override + public TSysFile selectTSysFileById(Long id) { + return this.baseMapper.selectById(id); + } + + /** + * 查询文件信息列表 + * + * @param queryWrapper 文件信息 + * @return 文件信息 + */ + @Override + public List selectTSysFileList(Wrapper queryWrapper) { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 查询文件信息列表 + * + * @param tSysFile 文件信息 + * @return 文件信息 + */ + @Override + public List selectTSysFileList(TSysFile tSysFile) { + Map map = BeanUtil.beanToMap(tSysFile, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增文件信息 + * + * @param tSysFile 文件信息 + * @return 结果 + */ + @Override + public int insertTSysFile(TSysFile tSysFile) { + return this.baseMapper.insert(tSysFile); + } + + /** + * 修改文件信息 + * + * @param tSysFile 文件信息 + * @return 结果 + */ + @Override + public int updateTSysFile(TSysFile tSysFile) { + return this.baseMapper.updateById(tSysFile); + } + + /** + * 删除文件信息对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysFileByIds(String ids) { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除文件信息信息 + * + * @param id 文件信息ID + * @return 结果 + */ + @Override + public int deleteTSysFileById(Long id) { + return this.baseMapper.deleteById(id); + } + + /** + * 检查name + * + * @param tsysFile + * @return + */ + @Override + public int checkNameUnique(TSysFile tsysFile) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("file_name", tsysFile.getFileName()); + return this.baseMapper.selectList(queryWrapper).size(); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysNoticeServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysNoticeServiceImpl.java new file mode 100644 index 0000000..3457ac3 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysNoticeServiceImpl.java @@ -0,0 +1,229 @@ + +package com.fc.v2.service.impl; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.model.auto.TSysNoticeUser; +import com.fc.v2.model.auto.TsysUser; +import com.fc.v2.model.custom.Tablepar; +import com.fc.v2.service.ITSysNoticeUserService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import cn.hutool.core.bean.BeanUtil; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysNoticeMapper; +import com.fc.v2.model.auto.TSysNotice; +import com.fc.v2.service.ITSysNoticeService; +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 公告Service业务层处理 + * + * @author zhaonz + * @date 2021-08-06 + */ +@Service +public class TSysNoticeServiceImpl extends ServiceImpl implements ITSysNoticeService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysNoticeServiceImpl.class); + + @Autowired + private TSysNoticeMapper tSysNoticeMapper; + + @Autowired + private ITSysNoticeUserService userService; + /** + * 查询公告 + * + * @param id 公告ID + * @return 公告 + */ + @Override + public TSysNotice selectTSysNoticeById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询公告列表 + * + * @param queryWrapper 公告 + * @return 公告 + */ + @Override + public List selectTSysNoticeList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 查询公告列表 + * + * @param tSysNotice 公告 + * @return 公告 + */ + @Override + public List selectTSysNoticeList(TSysNotice tSysNotice) { + Map map = BeanUtil.beanToMap(tSysNotice, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 查询公告列表 + * + * @param tsysUser + * @param tablepar + * @param name + * @return + */ + @Override + public PageInfo selectTSysNoticeList(TsysUser tsysUser, Tablepar tablepar, String name) { + //查询未阅读的公告用户外键 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("user_id", tsysUser.getId()); + List noticeUsers = userService.selectTSysNoticeUserList(queryWrapper); + + if (noticeUsers == null && noticeUsers.size() == 0){ + return new PageInfo(); + } + + //查询对应的公告列表 + List ids = new ArrayList(); + for (TSysNoticeUser sysNoticeUser : noticeUsers) { + ids.add(sysNoticeUser.getNoticeId()); + } + + //分页查询对应用户的所有公告信息 + QueryWrapper sysNoticeQueryWrapper = new QueryWrapper(); + sysNoticeQueryWrapper.orderByDesc("id"); + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + + List tSysNotices = this.selectTSysNoticeList(sysNoticeQueryWrapper); + + return new PageInfo(tSysNotices); + } + + /** + * 新增公告 + * + * @param tSysNotice 公告 + * @return 结果 + */ + @Override + public int insertTSysNotice(TSysNotice tSysNotice) + { + return this.baseMapper.insert(tSysNotice); + } + + /** + * 修改公告 + * + * @param tSysNotice 公告 + * @return 结果 + */ + @Override + public int updateTSysNotice(TSysNotice tSysNotice) + { + return this.baseMapper.updateById(tSysNotice); + } + + /** + * 删除公告对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysNoticeByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除公告信息 + * + * @param id 公告ID + * @return 结果 + */ + @Override + public int deleteTSysNoticeById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * 检查name + * + * @param sysNotice + * @return + */ + @Override + public int checkNameUnique(TSysNotice sysNotice) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("title", sysNotice.getTitle()); + return this.selectTSysNoticeList(queryWrapper).size(); + } + + /** + * 根据公告id把当前用户的公告置为以查看 + * + * @param id + */ + @Override + public void editUserState(Long id) { + userService.selectTSysNoticeUserById(id); + } + + /** + * 获取用户未阅读公告 + * + * @param user + * @param state + * @return + */ + @Override + public List getuserNoticeNotRead(TsysUser user, int state) { + List notices=new ArrayList(); + //查询未阅读的公告用户外键 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("user_id", user.getId()).eq(-1 != state, "state", state); + + List noticeUsers = userService.selectTSysNoticeUserList(queryWrapper); + if (noticeUsers != null && noticeUsers.size() > 0){ + //查询对应的公告列表 + List ids = new ArrayList(); + for (TSysNoticeUser sysNoticeUser : noticeUsers) { + ids.add(sysNoticeUser.getNoticeId()); + } + + notices = this.baseMapper.selectBatchIds(ids); + } + + return notices; + } + + /** + * 获取最新8条公告 + * + * @return + */ + @Override + public List getNEW() { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("id"); + PageHelper.startPage(1, 8); + return selectTSysNoticeList(queryWrapper); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysNoticeUserServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysNoticeUserServiceImpl.java new file mode 100644 index 0000000..255f67d --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysNoticeUserServiceImpl.java @@ -0,0 +1,121 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysNoticeUserMapper; +import com.fc.v2.model.auto.TSysNoticeUser; +import com.fc.v2.service.ITSysNoticeUserService; + +import cn.hutool.core.bean.BeanUtil; + +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 公告_用户外键Service业务层处理 + * + * @author zhaonz + * @date 2021-08-06 + */ +@Service +public class TSysNoticeUserServiceImpl extends ServiceImpl implements ITSysNoticeUserService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysNoticeUserServiceImpl.class); + + @Autowired + private TSysNoticeUserMapper tSysNoticeUserMapper; + + /** + * 查询公告_用户外键 + * + * @param id 公告_用户外键ID + * @return 公告_用户外键 + */ + @Override + public TSysNoticeUser selectTSysNoticeUserById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询公告_用户外键列表 + * + * @param queryWrapper 公告_用户外键 + * @return 公告_用户外键 + */ + @Override + public List selectTSysNoticeUserList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 查询公告_用户外键列表 + * + * @param tSysNoticeUser 公告_用户外键 + * @return 公告_用户外键 + */ + @Override + public List selectTSysNoticeUserList(TSysNoticeUser tSysNoticeUser) { + Map map = BeanUtil.beanToMap(tSysNoticeUser, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增公告_用户外键 + * + * @param tSysNoticeUser 公告_用户外键 + * @return 结果 + */ + @Override + public int insertTSysNoticeUser(TSysNoticeUser tSysNoticeUser) + { + return this.baseMapper.insert(tSysNoticeUser); + } + + /** + * 修改公告_用户外键 + * + * @param tSysNoticeUser 公告_用户外键 + * @return 结果 + */ + @Override + public int updateTSysNoticeUser(TSysNoticeUser tSysNoticeUser) + { + return this.baseMapper.updateById(tSysNoticeUser); + } + + /** + * 删除公告_用户外键对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysNoticeUserByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除公告_用户外键信息 + * + * @param id 公告_用户外键ID + * @return 结果 + */ + @Override + public int deleteTSysNoticeUserById(Long id) + { + return this.baseMapper.deleteById(id); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysOperLogServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysOperLogServiceImpl.java new file mode 100644 index 0000000..4776079 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysOperLogServiceImpl.java @@ -0,0 +1,135 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; + +import cn.hutool.core.bean.BeanUtil; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysOperLogMapper; +import com.fc.v2.model.auto.TSysOperLog; +import com.fc.v2.service.ITSysOperLogService; +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 日志记录Service业务层处理 + * + * @author zhaonz + * @date 2021-08-06 + */ +@Service +public class TSysOperLogServiceImpl extends ServiceImpl implements ITSysOperLogService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysOperLogServiceImpl.class); + + @Autowired + private TSysOperLogMapper tSysOperLogMapper; + + /** + * 查询日志记录 + * + * @param id 日志记录ID + * @return 日志记录 + */ + @Override + public TSysOperLog selectTSysOperLogById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询日志记录列表 + * + * @param queryWrapper 日志记录 + * @return 日志记录 + */ + @Override + public List selectTSysOperLogList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 查询日志记录列表 + * + * @param tSysOperLog 日志记录 + * @return 日志记录 + */ + @Override + public List selectTSysOperLogList(TSysOperLog tSysOperLog) { + Map map = BeanUtil.beanToMap(tSysOperLog, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增日志记录 + * + * @param tSysOperLog 日志记录 + * @return 结果 + */ + @Override + public int insertTSysOperLog(TSysOperLog tSysOperLog) + { + return this.baseMapper.insert(tSysOperLog); + } + + /** + * 修改日志记录 + * + * @param tSysOperLog 日志记录 + * @return 结果 + */ + @Override + public int updateTSysOperLog(TSysOperLog tSysOperLog) + { + return this.baseMapper.updateById(tSysOperLog); + } + + /** + * 删除日志记录对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysOperLogByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除日志记录信息 + * + * @param id 日志记录ID + * @return 结果 + */ + @Override + public int deleteTSysOperLogById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * 获取最新10条日志 + * + * @return + */ + @Override + public List getNEW() { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByDesc("id"); + PageHelper.startPage(1, 10); + return this.selectTSysOperLogList(queryWrapper); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java new file mode 100644 index 0000000..ab6e949 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java @@ -0,0 +1,122 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysQuartzJobLogMapper; +import com.fc.v2.model.auto.TSysProvince; +import com.fc.v2.model.auto.TSysQuartzJobLog; +import com.fc.v2.service.ITSysQuartzJobLogService; + +import cn.hutool.core.bean.BeanUtil; + +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 定时任务调度日志Service业务层处理 + * + * @author zhaonz + * @date 2021-08-06 + */ +@Service +public class TSysQuartzJobLogServiceImpl extends ServiceImpl implements ITSysQuartzJobLogService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysQuartzJobLogServiceImpl.class); + + @Autowired + private TSysQuartzJobLogMapper tSysQuartzJobLogMapper; + + /** + * 查询定时任务调度日志 + * + * @param id 定时任务调度日志ID + * @return 定时任务调度日志 + */ + @Override + public TSysQuartzJobLog selectTSysQuartzJobLogById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询定时任务调度日志列表 + * + * @param queryWrapper 定时任务调度日志 + * @return 定时任务调度日志 + */ + @Override + public List selectTSysQuartzJobLogList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 查询定时任务调度日志列表 + * + * @param tSysQuartzJobLog 定时任务调度日志 + * @return 定时任务调度日志 + */ + @Override + public List selectTSysQuartzJobLogList(TSysQuartzJobLog tSysQuartzJobLog) { + Map map = BeanUtil.beanToMap(tSysQuartzJobLog, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增定时任务调度日志 + * + * @param tSysQuartzJobLog 定时任务调度日志 + * @return 结果 + */ + @Override + public int insertTSysQuartzJobLog(TSysQuartzJobLog tSysQuartzJobLog) + { + return this.baseMapper.insert(tSysQuartzJobLog); + } + + /** + * 修改定时任务调度日志 + * + * @param tSysQuartzJobLog 定时任务调度日志 + * @return 结果 + */ + @Override + public int updateTSysQuartzJobLog(TSysQuartzJobLog tSysQuartzJobLog) + { + return this.baseMapper.updateById(tSysQuartzJobLog); + } + + /** + * 删除定时任务调度日志对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysQuartzJobLogByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除定时任务调度日志信息 + * + * @param id 定时任务调度日志ID + * @return 结果 + */ + @Override + public int deleteTSysQuartzJobLogById(Long id) + { + return this.baseMapper.deleteById(id); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysQuartzJobServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysQuartzJobServiceImpl.java new file mode 100644 index 0000000..67547fd --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysQuartzJobServiceImpl.java @@ -0,0 +1,199 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Arrays; +import java.util.Map; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.common.quartz.QuartzSchedulerUtil; +import com.fc.v2.common.quartz.ScheduleConstants; +import org.quartz.SchedulerException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysQuartzJobMapper; +import com.fc.v2.model.auto.TSysQuartzJob; +import com.fc.v2.service.ITSysQuartzJobService; +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.transaction.annotation.Transactional; + +/** + * 定时任务调度Service业务层处理 + * + * @author zhaonz + * @date 2021-08-06 + */ +@Service +public class TSysQuartzJobServiceImpl extends ServiceImpl implements ITSysQuartzJobService { + private static final Logger logger = LoggerFactory.getLogger(TSysQuartzJobServiceImpl.class); + + @Autowired + private TSysQuartzJobMapper tSysQuartzJobMapper; + + @Autowired + private QuartzSchedulerUtil scheduler; + + /** + * 查询定时任务调度 + * + * @param id 定时任务调度ID + * @return 定时任务调度 + */ + @Override + public TSysQuartzJob selectTSysQuartzJobById(Long id) { + return this.baseMapper.selectById(id); + } + + /** + * 查询定时任务调度列表 + * + * @param queryWrapper 定时任务调度 + * @return 定时任务调度 + */ + @Override + public List selectTSysQuartzJobList(Wrapper queryWrapper) { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增定时任务调度 + * + * @param tSysQuartzJob 定时任务调度 + * @return 结果 + */ + @Override + public int insertTSysQuartzJob(TSysQuartzJob tSysQuartzJob) { + return this.baseMapper.insert(tSysQuartzJob); + } + + /** + * 修改定时任务调度 + * + * @param tSysQuartzJob 定时任务调度 + * @return 结果 + */ + @Override + public int updateTSysQuartzJob(TSysQuartzJob tSysQuartzJob) { + return this.baseMapper.updateById(tSysQuartzJob); + } + + /** + * 删除定时任务调度对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysQuartzJobByIds(String ids) { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除定时任务调度信息 + * + * @param id 定时任务调度ID + * @return 结果 + */ + @Override + public int deleteTSysQuartzJobById(Long id) { + return this.baseMapper.deleteById(id); + } + + /** + * 任务调度状态修改 + * + * @param job + * @return + */ + @Override + public int changeStatus(TSysQuartzJob job) throws SchedulerException { + int rows = 0; + Integer status = job.getStatus(); + if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) { + rows = resumeJob(job); + } else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) { + rows = pauseJob(job); + } + return rows; + } + + /** + * 恢复任务 + * + * @param job + * @return + * @throws SchedulerException + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int resumeJob(TSysQuartzJob job) throws SchedulerException { + job.setStatus(ScheduleConstants.Status.NORMAL.getValue()); + int rows = this.baseMapper.updateById(job); + if (rows > 0) { + scheduler.resumeJob(job); + } + return rows; + } + + /** + * 暂停任务 + * + * @param job + * @return + * @throws SchedulerException + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int pauseJob(TSysQuartzJob job) throws SchedulerException { + job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); + int rows = this.baseMapper.updateById(job); + if (rows > 0) { + scheduler.pauseJob(job); + } + return rows; + } + + /** + * 检查name + * + * @param sysQuartzJob + * @return + */ + @Override + public int checkNameUnique(TSysQuartzJob sysQuartzJob) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("job_name" , sysQuartzJob.getJobName()); + return this.baseMapper.selectList(queryWrapper).size(); + } + + /** + * 立即运行任务 + * + * @param newJob + * @throws SchedulerException + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void run(TSysQuartzJob newJob) throws SchedulerException { + scheduler.run(newJob); + } + + /** + * 查询定时任务调度列表 + * + * @param tSysQuartzJob 定时任务调度 + * @return 定时任务调度集合 + */ + @Override + public List selectTSysQuartzJobList(TSysQuartzJob tSysQuartzJob) { + Map map = BeanUtil.beanToMap(tSysQuartzJob, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map, false); + return this.baseMapper.selectList(queryWrapper); + } +} diff --git a/src/main/resources/mybatis/auto/SysNoticeMapper.xml b/src/main/resources/mybatis/auto/SysNoticeMapper.xml deleted file mode 100644 index b8fc08b..0000000 --- a/src/main/resources/mybatis/auto/SysNoticeMapper.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, - title, - content, - type, - create_id, - create_username, - create_time - - - - - - delete from t_sys_notice - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_notice - - - - - - - insert into t_sys_notice ( - id, - title, - content, - type, - create_id, - create_username, - create_time - ) - values ( - #{id,jdbcType=VARCHAR}, - #{title,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, - #{type,jdbcType=INTEGER}, - #{createId,jdbcType=VARCHAR}, - #{createUsername,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP} - ) - - - - insert into t_sys_notice - - - - id, - - - - - title, - - - - - content, - - - - - type, - - - - - create_id, - - - - - create_username, - - - - - create_time, - - - - - - #{id,jdbcType=VARCHAR}, - - - #{title,jdbcType=VARCHAR}, - - - #{content,jdbcType=VARCHAR}, - - - #{type,jdbcType=INTEGER}, - - - #{createId,jdbcType=VARCHAR}, - - - #{createUsername,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - - - - - update t_sys_notice - - - id = #{record.id,jdbcType=VARCHAR}, - - - title = #{record.title,jdbcType=VARCHAR}, - - - content = #{record.content,jdbcType=VARCHAR}, - - - type = #{record.type,jdbcType=INTEGER}, - - - create_id = #{record.createId,jdbcType=VARCHAR}, - - - create_username = #{record.createUsername,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - - - - - - - - - update t_sys_notice - set - id = #{record.id,jdbcType=VARCHAR}, - title = #{record.title,jdbcType=VARCHAR}, - content = #{record.content,jdbcType=VARCHAR}, - type = #{record.type,jdbcType=INTEGER}, - create_id = #{record.createId,jdbcType=VARCHAR}, - create_username = #{record.createUsername,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP} - - - - - - - - update t_sys_notice - - - title = #{title,jdbcType=VARCHAR}, - - - content = #{content,jdbcType=VARCHAR}, - - - type = #{type,jdbcType=INTEGER}, - - - create_id = #{createId,jdbcType=VARCHAR}, - - - create_username = #{createUsername,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - where - id = #{id,jdbcType=VARCHAR} - - - - - - - update t_sys_notice - set - title = #{title,jdbcType=VARCHAR}, - content = #{content,jdbcType=VARCHAR}, - type = #{type,jdbcType=INTEGER}, - create_id = #{createId,jdbcType=VARCHAR}, - create_username = #{createUsername,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where - id = #{id,jdbcType=VARCHAR} - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/SysNoticeUserMapper.xml b/src/main/resources/mybatis/auto/SysNoticeUserMapper.xml deleted file mode 100644 index fbcad8f..0000000 --- a/src/main/resources/mybatis/auto/SysNoticeUserMapper.xml +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, - notice_id, - user_id, - state - - - - - - delete from t_sys_notice_user - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_notice_user - - - - - - - insert into t_sys_notice_user ( - id, - notice_id, - user_id, - state - ) - values ( - #{id,jdbcType=VARCHAR}, - #{noticeId,jdbcType=VARCHAR}, - #{userId,jdbcType=VARCHAR}, - #{state,jdbcType=INTEGER} - ) - - - - insert into t_sys_notice_user - - - - id, - - - - - notice_id, - - - - - user_id, - - - - - state, - - - - - - #{id,jdbcType=VARCHAR}, - - - #{noticeId,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{state,jdbcType=INTEGER}, - - - - - - - - update t_sys_notice_user - - - id = #{record.id,jdbcType=VARCHAR}, - - - notice_id = #{record.noticeId,jdbcType=VARCHAR}, - - - user_id = #{record.userId,jdbcType=VARCHAR}, - - - state = #{record.state,jdbcType=INTEGER}, - - - - - - - - - - - update t_sys_notice_user - set - id = #{record.id,jdbcType=VARCHAR}, - notice_id = #{record.noticeId,jdbcType=VARCHAR}, - user_id = #{record.userId,jdbcType=VARCHAR}, - state = #{record.state,jdbcType=INTEGER} - - - - - - - - update t_sys_notice_user - - - notice_id = #{noticeId,jdbcType=VARCHAR}, - - - user_id = #{userId,jdbcType=VARCHAR}, - - - state = #{state,jdbcType=INTEGER}, - - - where - id = #{id,jdbcType=VARCHAR} - - - - - - - update t_sys_notice_user - set - notice_id = #{noticeId,jdbcType=VARCHAR}, - user_id = #{userId,jdbcType=VARCHAR}, - state = #{state,jdbcType=INTEGER} - where - id = #{id,jdbcType=VARCHAR} - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/SysQuartzJobLogMapper.xml b/src/main/resources/mybatis/auto/SysQuartzJobLogMapper.xml deleted file mode 100644 index 60a2a6d..0000000 --- a/src/main/resources/mybatis/auto/SysQuartzJobLogMapper.xml +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, - job_name, - job_group, - invoke_target, - job_message, - status, - exception_info, - start_time, - end_time - - - - - - delete from t_sys_quartz_job_log - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_quartz_job_log - - - - - - - insert into t_sys_quartz_job_log ( - id, - job_name, - job_group, - invoke_target, - job_message, - status, - exception_info, - start_time, - end_time - ) - values ( - #{id,jdbcType=VARCHAR}, - #{jobName,jdbcType=VARCHAR}, - #{jobGroup,jdbcType=VARCHAR}, - #{invokeTarget,jdbcType=VARCHAR}, - #{jobMessage,jdbcType=VARCHAR}, - #{status,jdbcType=INTEGER}, - #{exceptionInfo,jdbcType=VARCHAR}, - #{startTime,jdbcType=TIMESTAMP}, - #{endTime,jdbcType=TIMESTAMP} - ) - - - - insert into t_sys_quartz_job_log - - - - id, - - - - - job_name, - - - - - job_group, - - - - - invoke_target, - - - - - job_message, - - - - - status, - - - - - exception_info, - - - - - start_time, - - - - - end_time, - - - - - - #{id,jdbcType=VARCHAR}, - - - #{jobName,jdbcType=VARCHAR}, - - - #{jobGroup,jdbcType=VARCHAR}, - - - #{invokeTarget,jdbcType=VARCHAR}, - - - #{jobMessage,jdbcType=VARCHAR}, - - - #{status,jdbcType=INTEGER}, - - - #{exceptionInfo,jdbcType=VARCHAR}, - - - #{startTime,jdbcType=TIMESTAMP}, - - - #{endTime,jdbcType=TIMESTAMP}, - - - - - - - - update t_sys_quartz_job_log - - - id = #{record.id,jdbcType=VARCHAR}, - - - job_name = #{record.jobName,jdbcType=VARCHAR}, - - - job_group = #{record.jobGroup,jdbcType=VARCHAR}, - - - invoke_target = #{record.invokeTarget,jdbcType=VARCHAR}, - - - job_message = #{record.jobMessage,jdbcType=VARCHAR}, - - - status = #{record.status,jdbcType=INTEGER}, - - - exception_info = #{record.exceptionInfo,jdbcType=VARCHAR}, - - - start_time = #{record.startTime,jdbcType=TIMESTAMP}, - - - end_time = #{record.endTime,jdbcType=TIMESTAMP}, - - - - - - - - - - - update t_sys_quartz_job_log - set - id = #{record.id,jdbcType=VARCHAR}, - job_name = #{record.jobName,jdbcType=VARCHAR}, - job_group = #{record.jobGroup,jdbcType=VARCHAR}, - invoke_target = #{record.invokeTarget,jdbcType=VARCHAR}, - job_message = #{record.jobMessage,jdbcType=VARCHAR}, - status = #{record.status,jdbcType=INTEGER}, - exception_info = #{record.exceptionInfo,jdbcType=VARCHAR}, - start_time = #{record.startTime,jdbcType=TIMESTAMP}, - end_time = #{record.endTime,jdbcType=TIMESTAMP} - - - - - - - - update t_sys_quartz_job_log - - - job_name = #{jobName,jdbcType=VARCHAR}, - - - job_group = #{jobGroup,jdbcType=VARCHAR}, - - - invoke_target = #{invokeTarget,jdbcType=VARCHAR}, - - - job_message = #{jobMessage,jdbcType=VARCHAR}, - - - status = #{status,jdbcType=INTEGER}, - - - exception_info = #{exceptionInfo,jdbcType=VARCHAR}, - - - start_time = #{startTime,jdbcType=TIMESTAMP}, - - - end_time = #{endTime,jdbcType=TIMESTAMP}, - - - where - id = #{id,jdbcType=VARCHAR} - - - - - - - update t_sys_quartz_job_log - set - job_name = #{jobName,jdbcType=VARCHAR}, - job_group = #{jobGroup,jdbcType=VARCHAR}, - invoke_target = #{invokeTarget,jdbcType=VARCHAR}, - job_message = #{jobMessage,jdbcType=VARCHAR}, - status = #{status,jdbcType=INTEGER}, - exception_info = #{exceptionInfo,jdbcType=VARCHAR}, - start_time = #{startTime,jdbcType=TIMESTAMP}, - end_time = #{endTime,jdbcType=TIMESTAMP} - where - id = #{id,jdbcType=VARCHAR} - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/SysQuartzJobMapper.xml b/src/main/resources/mybatis/auto/SysQuartzJobMapper.xml deleted file mode 100644 index 15355cf..0000000 --- a/src/main/resources/mybatis/auto/SysQuartzJobMapper.xml +++ /dev/null @@ -1,314 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, - job_name, - job_group, - invoke_target, - cron_expression, - misfire_policy, - concurrent, - status - - - - - - delete from t_sys_quartz_job - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_quartz_job - - - - - - - insert into t_sys_quartz_job ( - id, - job_name, - job_group, - invoke_target, - cron_expression, - misfire_policy, - concurrent, - status - ) - values ( - #{id,jdbcType=VARCHAR}, - #{jobName,jdbcType=VARCHAR}, - #{jobGroup,jdbcType=VARCHAR}, - #{invokeTarget,jdbcType=VARCHAR}, - #{cronExpression,jdbcType=VARCHAR}, - #{misfirePolicy,jdbcType=VARCHAR}, - #{concurrent,jdbcType=VARCHAR}, - #{status,jdbcType=INTEGER} - ) - - - - insert into t_sys_quartz_job - - - - id, - - - - - job_name, - - - - - job_group, - - - - - invoke_target, - - - - - cron_expression, - - - - - misfire_policy, - - - - - concurrent, - - - - - status, - - - - - - #{id,jdbcType=VARCHAR}, - - - #{jobName,jdbcType=VARCHAR}, - - - #{jobGroup,jdbcType=VARCHAR}, - - - #{invokeTarget,jdbcType=VARCHAR}, - - - #{cronExpression,jdbcType=VARCHAR}, - - - #{misfirePolicy,jdbcType=VARCHAR}, - - - #{concurrent,jdbcType=VARCHAR}, - - - #{status,jdbcType=INTEGER}, - - - - - - - - update t_sys_quartz_job - - - id = #{record.id,jdbcType=VARCHAR}, - - - job_name = #{record.jobName,jdbcType=VARCHAR}, - - - job_group = #{record.jobGroup,jdbcType=VARCHAR}, - - - invoke_target = #{record.invokeTarget,jdbcType=VARCHAR}, - - - cron_expression = #{record.cronExpression,jdbcType=VARCHAR}, - - - misfire_policy = #{record.misfirePolicy,jdbcType=VARCHAR}, - - - concurrent = #{record.concurrent,jdbcType=VARCHAR}, - - - status = #{record.status,jdbcType=INTEGER}, - - - - - - - - - - - update t_sys_quartz_job - set - id = #{record.id,jdbcType=VARCHAR}, - job_name = #{record.jobName,jdbcType=VARCHAR}, - job_group = #{record.jobGroup,jdbcType=VARCHAR}, - invoke_target = #{record.invokeTarget,jdbcType=VARCHAR}, - cron_expression = #{record.cronExpression,jdbcType=VARCHAR}, - misfire_policy = #{record.misfirePolicy,jdbcType=VARCHAR}, - concurrent = #{record.concurrent,jdbcType=VARCHAR}, - status = #{record.status,jdbcType=INTEGER} - - - - - - - - update t_sys_quartz_job - - - job_name = #{jobName,jdbcType=VARCHAR}, - - - job_group = #{jobGroup,jdbcType=VARCHAR}, - - - invoke_target = #{invokeTarget,jdbcType=VARCHAR}, - - - cron_expression = #{cronExpression,jdbcType=VARCHAR}, - - - misfire_policy = #{misfirePolicy,jdbcType=VARCHAR}, - - - concurrent = #{concurrent,jdbcType=VARCHAR}, - - - status = #{status,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=VARCHAR} - - - - - - update t_sys_quartz_job - set - job_name = #{jobName,jdbcType=VARCHAR}, - job_group = #{jobGroup,jdbcType=VARCHAR}, - invoke_target = #{invokeTarget,jdbcType=VARCHAR}, - cron_expression = #{cronExpression,jdbcType=VARCHAR}, - misfire_policy = #{misfirePolicy,jdbcType=VARCHAR}, - concurrent = #{concurrent,jdbcType=VARCHAR}, - status = #{status,jdbcType=INTEGER} - where - id = #{id,jdbcType=VARCHAR} - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysDictDataMapper.xml b/src/main/resources/mybatis/auto/TSysDictDataMapper.xml index a8bf83b..f38ff70 100644 --- a/src/main/resources/mybatis/auto/TSysDictDataMapper.xml +++ b/src/main/resources/mybatis/auto/TSysDictDataMapper.xml @@ -1,437 +1,27 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, - dict_sort, - dict_label, - dict_value, - dict_type, - css_class, - list_class, - is_default, - status, - create_by, - create_time, - update_by, - update_time, - remark - - - + + + + + + + + + + + + + + + + + - - delete from t_sys_dict_data - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_dict_data - - - - - - - insert into t_sys_dict_data ( - id, - dict_sort, - dict_label, - dict_value, - dict_type, - css_class, - list_class, - is_default, - status, - create_by, - create_time, - update_by, - update_time, - remark - ) - values ( - #{id,jdbcType=VARCHAR}, - #{dictSort,jdbcType=INTEGER}, - #{dictLabel,jdbcType=VARCHAR}, - #{dictValue,jdbcType=VARCHAR}, - #{dictType,jdbcType=VARCHAR}, - #{cssClass,jdbcType=VARCHAR}, - #{listClass,jdbcType=VARCHAR}, - #{isDefault,jdbcType=CHAR}, - #{status,jdbcType=CHAR}, - #{createBy,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}, - #{remark,jdbcType=VARCHAR} - ) - - - - insert into t_sys_dict_data - - - - id, - - - - - dict_sort, - - - - - dict_label, - - - - - dict_value, - - - - - dict_type, - - - - - css_class, - - - - - list_class, - - - - - is_default, - - - - - status, - - - - - create_by, - - - - - create_time, - - - - - update_by, - - - - - update_time, - - - - - remark, - - - - - - #{id,jdbcType=VARCHAR}, - - - #{dictSort,jdbcType=INTEGER}, - - - #{dictLabel,jdbcType=VARCHAR}, - - - #{dictValue,jdbcType=VARCHAR}, - - - #{dictType,jdbcType=VARCHAR}, - - - #{cssClass,jdbcType=VARCHAR}, - - - #{listClass,jdbcType=VARCHAR}, - - - #{isDefault,jdbcType=CHAR}, - - - #{status,jdbcType=CHAR}, - - - #{createBy,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateBy,jdbcType=VARCHAR}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{remark,jdbcType=VARCHAR}, - - - - - - - - update t_sys_dict_data - - - id = #{record.id,jdbcType=VARCHAR}, - - - dict_sort = #{record.dictSort,jdbcType=INTEGER}, - - - dict_label = #{record.dictLabel,jdbcType=VARCHAR}, - - - dict_value = #{record.dictValue,jdbcType=VARCHAR}, - - - dict_type = #{record.dictType,jdbcType=VARCHAR}, - - - css_class = #{record.cssClass,jdbcType=VARCHAR}, - - - list_class = #{record.listClass,jdbcType=VARCHAR}, - - - is_default = #{record.isDefault,jdbcType=CHAR}, - - - status = #{record.status,jdbcType=CHAR}, - - - create_by = #{record.createBy,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_by = #{record.updateBy,jdbcType=VARCHAR}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - remark = #{record.remark,jdbcType=VARCHAR}, - - - - - - - - - - - update t_sys_dict_data - set - id = #{record.id,jdbcType=VARCHAR}, - dict_sort = #{record.dictSort,jdbcType=INTEGER}, - dict_label = #{record.dictLabel,jdbcType=VARCHAR}, - dict_value = #{record.dictValue,jdbcType=VARCHAR}, - dict_type = #{record.dictType,jdbcType=VARCHAR}, - css_class = #{record.cssClass,jdbcType=VARCHAR}, - list_class = #{record.listClass,jdbcType=VARCHAR}, - is_default = #{record.isDefault,jdbcType=CHAR}, - status = #{record.status,jdbcType=CHAR}, - create_by = #{record.createBy,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_by = #{record.updateBy,jdbcType=VARCHAR}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - remark = #{record.remark,jdbcType=VARCHAR} - - - - - - - - update t_sys_dict_data - - - - dict_sort = #{dictSort,jdbcType=INTEGER}, - - - dict_label = #{dictLabel,jdbcType=VARCHAR}, - - - dict_value = #{dictValue,jdbcType=VARCHAR}, - - - dict_type = #{dictType,jdbcType=VARCHAR}, - - - css_class = #{cssClass,jdbcType=VARCHAR}, - - - list_class = #{listClass,jdbcType=VARCHAR}, - - - is_default = #{isDefault,jdbcType=CHAR}, - - - status = #{status,jdbcType=CHAR}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - where - id = #{id,jdbcType=VARCHAR} - - - - - - - update t_sys_dict_data - set - dict_sort = #{dictSort,jdbcType=INTEGER}, - dict_label = #{dictLabel,jdbcType=VARCHAR}, - dict_value = #{dictValue,jdbcType=VARCHAR}, - dict_type = #{dictType,jdbcType=VARCHAR}, - css_class = #{cssClass,jdbcType=VARCHAR}, - list_class = #{listClass,jdbcType=VARCHAR}, - is_default = #{isDefault,jdbcType=CHAR}, - status = #{status,jdbcType=CHAR}, - create_by = #{createBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_by = #{updateBy,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - remark = #{remark,jdbcType=VARCHAR} - where - id = #{id,jdbcType=VARCHAR} - - - - + + select id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark from t_sys_dict_data + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysDictTypeMapper.xml b/src/main/resources/mybatis/auto/TSysDictTypeMapper.xml index 13fa028..96e9a86 100644 --- a/src/main/resources/mybatis/auto/TSysDictTypeMapper.xml +++ b/src/main/resources/mybatis/auto/TSysDictTypeMapper.xml @@ -1,336 +1,22 @@ - - + + - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, - dict_name, - dict_type, - status, - create_by, - create_time, - update_by, - update_time, - remark - - - + + + + + + + + + + + + - - delete from t_sys_dict_type - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_dict_type - - - - - - - insert into t_sys_dict_type ( - id, - dict_name, - dict_type, - status, - create_by, - create_time, - update_by, - update_time, - remark - ) - values ( - #{id,jdbcType=VARCHAR}, - #{dictName,jdbcType=VARCHAR}, - #{dictType,jdbcType=VARCHAR}, - #{status,jdbcType=CHAR}, - #{createBy,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}, - #{remark,jdbcType=VARCHAR} - ) - - - - insert into t_sys_dict_type - - - - id, - - - - - dict_name, - - - - - dict_type, - - - - - status, - - - - - create_by, - - - - - create_time, - - - - - update_by, - - - - - update_time, - - - - - remark, - - - - - - #{id,jdbcType=VARCHAR}, - - - #{dictName,jdbcType=VARCHAR}, - - - #{dictType,jdbcType=VARCHAR}, - - - #{status,jdbcType=CHAR}, - - - #{createBy,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateBy,jdbcType=VARCHAR}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{remark,jdbcType=VARCHAR}, - - - - - - - - update t_sys_dict_type - - - id = #{record.id,jdbcType=VARCHAR}, - - - dict_name = #{record.dictName,jdbcType=VARCHAR}, - - - dict_type = #{record.dictType,jdbcType=VARCHAR}, - - - status = #{record.status,jdbcType=CHAR}, - - - create_by = #{record.createBy,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_by = #{record.updateBy,jdbcType=VARCHAR}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - remark = #{record.remark,jdbcType=VARCHAR}, - - - - - - - - - - - update t_sys_dict_type - set - id = #{record.id,jdbcType=VARCHAR}, - dict_name = #{record.dictName,jdbcType=VARCHAR}, - dict_type = #{record.dictType,jdbcType=VARCHAR}, - status = #{record.status,jdbcType=CHAR}, - create_by = #{record.createBy,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_by = #{record.updateBy,jdbcType=VARCHAR}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - remark = #{record.remark,jdbcType=VARCHAR} - - - - - - - - update t_sys_dict_type - - - dict_name = #{dictName,jdbcType=VARCHAR}, - - - dict_type = #{dictType,jdbcType=VARCHAR}, - - - status = #{status,jdbcType=CHAR}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - where - id = #{id,jdbcType=VARCHAR} - - - - - - - update t_sys_dict_type - set - dict_name = #{dictName,jdbcType=VARCHAR}, - dict_type = #{dictType,jdbcType=VARCHAR}, - status = #{status,jdbcType=CHAR}, - create_by = #{createBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_by = #{updateBy,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - remark = #{remark,jdbcType=VARCHAR} - where - id = #{id,jdbcType=VARCHAR} - - - - + + select id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark from t_sys_dict_type + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysEmailMapper.xml b/src/main/resources/mybatis/auto/TSysEmailMapper.xml index 748bb06..7228a25 100644 --- a/src/main/resources/mybatis/auto/TSysEmailMapper.xml +++ b/src/main/resources/mybatis/auto/TSysEmailMapper.xml @@ -1,245 +1,22 @@ - - + + - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, receivers_email, title, content, send_user_id, send_user_name, create_time - - - - - delete from t_sys_email - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_email - - - - - - insert into t_sys_email (id, receivers_email, title, - content, send_user_id, send_user_name, - create_time) - values (#{id,jdbcType=VARCHAR}, #{receiversEmail,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, #{sendUserId,jdbcType=VARCHAR}, #{sendUserName,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}) - - - insert into t_sys_email - - - id, - - - receivers_email, - - - title, - - - content, - - - send_user_id, - - - send_user_name, - - - create_time, - - - - - #{id,jdbcType=VARCHAR}, - - - #{receiversEmail,jdbcType=VARCHAR}, - - - #{title,jdbcType=VARCHAR}, - - - #{content,jdbcType=VARCHAR}, - - - #{sendUserId,jdbcType=VARCHAR}, - - - #{sendUserName,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - - - update t_sys_email - - - id = #{record.id,jdbcType=VARCHAR}, - - - receivers_email = #{record.receiversEmail,jdbcType=VARCHAR}, - - - title = #{record.title,jdbcType=VARCHAR}, - - - content = #{record.content,jdbcType=VARCHAR}, - - - send_user_id = #{record.sendUserId,jdbcType=VARCHAR}, - - - send_user_name = #{record.sendUserName,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - - - - - - update t_sys_email - set id = #{record.id,jdbcType=VARCHAR}, - receivers_email = #{record.receiversEmail,jdbcType=VARCHAR}, - title = #{record.title,jdbcType=VARCHAR}, - content = #{record.content,jdbcType=VARCHAR}, - send_user_id = #{record.sendUserId,jdbcType=VARCHAR}, - send_user_name = #{record.sendUserName,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP} - - - - - - update t_sys_email - - - receivers_email = #{receiversEmail,jdbcType=VARCHAR}, - - - title = #{title,jdbcType=VARCHAR}, - - - content = #{content,jdbcType=VARCHAR}, - - - send_user_id = #{sendUserId,jdbcType=VARCHAR}, - - - send_user_name = #{sendUserName,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=VARCHAR} - - - update t_sys_email - set receivers_email = #{receiversEmail,jdbcType=VARCHAR}, - title = #{title,jdbcType=VARCHAR}, - content = #{content,jdbcType=VARCHAR}, - send_user_id = #{sendUserId,jdbcType=VARCHAR}, - send_user_name = #{sendUserName,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=VARCHAR} - + + + + + + + + + + + + + + + select id, receivers_email, title, content, create_by, create_time, update_by, update_time, remark from t_sys_email + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysFileMapper.xml b/src/main/resources/mybatis/auto/TSysFileMapper.xml new file mode 100644 index 0000000..32c51b1 --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysFileMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + select id, file_name, bucket_name, file_size, file_suffix, create_by, create_time, update_by, update_time, remark from t_sys_file + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysNoticeMapper.xml b/src/main/resources/mybatis/auto/TSysNoticeMapper.xml new file mode 100644 index 0000000..0cafd7f --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysNoticeMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + select id, title, content, type, create_by, create_time, update_by, update_time, remark from t_sys_notice + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysNoticeUserMapper.xml b/src/main/resources/mybatis/auto/TSysNoticeUserMapper.xml new file mode 100644 index 0000000..23f19bf --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysNoticeUserMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + select id, notice_id, user_id, state, create_by, create_time, update_by, update_time, remark from t_sys_notice_user + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysQuartzJobLogMapper.xml b/src/main/resources/mybatis/auto/TSysQuartzJobLogMapper.xml new file mode 100644 index 0000000..3b482ac --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysQuartzJobLogMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, job_name, job_group, invoke_target, job_message, status, exception_info, start_time, end_time, create_by, create_time, update_by, update_time, remark from t_sys_quartz_job_log + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysQuartzJobMapper.xml b/src/main/resources/mybatis/auto/TSysQuartzJobMapper.xml new file mode 100644 index 0000000..ead840f --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysQuartzJobMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + select id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, update_by, update_time, remark from t_sys_quartz_job + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TsysOperLogMapper.xml b/src/main/resources/mybatis/auto/TsysOperLogMapper.xml index 9f12603..44e7e7b 100644 --- a/src/main/resources/mybatis/auto/TsysOperLogMapper.xml +++ b/src/main/resources/mybatis/auto/TsysOperLogMapper.xml @@ -1,258 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, title, method, oper_name, oper_url, oper_param, error_msg, oper_time - - - - - delete from t_sys_oper_log - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_oper_log - - - - - - insert into t_sys_oper_log (id, title, method, - oper_name, oper_url, oper_param, - error_msg, oper_time) - values (#{id,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, - #{operName,jdbcType=VARCHAR}, #{operUrl,jdbcType=VARCHAR}, #{operParam,jdbcType=VARCHAR}, - #{errorMsg,jdbcType=VARCHAR}, #{operTime,jdbcType=DATE}) - - - insert into t_sys_oper_log - - - id, - - - title, - - - method, - - - oper_name, - - - oper_url, - - - oper_param, - - - error_msg, - - - oper_time, - - - - - #{id,jdbcType=VARCHAR}, - - - #{title,jdbcType=VARCHAR}, - - - #{method,jdbcType=VARCHAR}, - - - #{operName,jdbcType=VARCHAR}, - - - #{operUrl,jdbcType=VARCHAR}, - - - #{operParam,jdbcType=VARCHAR}, - - - #{errorMsg,jdbcType=VARCHAR}, - - - #{operTime,jdbcType=DATE}, - - - - - - update t_sys_oper_log - - - id = #{record.id,jdbcType=VARCHAR}, - - - title = #{record.title,jdbcType=VARCHAR}, - - - method = #{record.method,jdbcType=VARCHAR}, - - - oper_name = #{record.operName,jdbcType=VARCHAR}, - - - oper_url = #{record.operUrl,jdbcType=VARCHAR}, - - - oper_param = #{record.operParam,jdbcType=VARCHAR}, - - - error_msg = #{record.errorMsg,jdbcType=VARCHAR}, - - - oper_time = #{record.operTime,jdbcType=DATE}, - - - - - - - - update t_sys_oper_log - set id = #{record.id,jdbcType=VARCHAR}, - title = #{record.title,jdbcType=VARCHAR}, - method = #{record.method,jdbcType=VARCHAR}, - oper_name = #{record.operName,jdbcType=VARCHAR}, - oper_url = #{record.operUrl,jdbcType=VARCHAR}, - oper_param = #{record.operParam,jdbcType=VARCHAR}, - error_msg = #{record.errorMsg,jdbcType=VARCHAR}, - oper_time = #{record.operTime,jdbcType=DATE} - - - - - - update t_sys_oper_log - - - title = #{title,jdbcType=VARCHAR}, - - - method = #{method,jdbcType=VARCHAR}, - - - oper_name = #{operName,jdbcType=VARCHAR}, - - - oper_url = #{operUrl,jdbcType=VARCHAR}, - - - oper_param = #{operParam,jdbcType=VARCHAR}, - - - error_msg = #{errorMsg,jdbcType=VARCHAR}, - - - oper_time = #{operTime,jdbcType=DATE}, - - - where id = #{id,jdbcType=VARCHAR} - - - update t_sys_oper_log - set title = #{title,jdbcType=VARCHAR}, - method = #{method,jdbcType=VARCHAR}, - oper_name = #{operName,jdbcType=VARCHAR}, - oper_url = #{operUrl,jdbcType=VARCHAR}, - oper_param = #{operParam,jdbcType=VARCHAR}, - error_msg = #{errorMsg,jdbcType=VARCHAR}, - oper_time = #{operTime,jdbcType=DATE} - where id = #{id,jdbcType=VARCHAR} - + + + + + + + + + + + + + + + + + + + + + select id, title, method, oper_name, oper_url, oper_param, error_msg, oper_time, create_by, create_time, update_by, update_time, remark from t_sys_oper_log + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/sysFileMapper.xml b/src/main/resources/mybatis/auto/sysFileMapper.xml deleted file mode 100644 index 3f79c62..0000000 --- a/src/main/resources/mybatis/auto/sysFileMapper.xml +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, file_name, bucket_name, file_size, file_suffix, create_user_id, create_user_name, - create_time, update_user_id, update_user_name, update_time - - - - - delete from t_sys_file - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_file - - - - - - insert into t_sys_file (id, file_name, bucket_name, - file_size, file_suffix, create_user_id, - create_user_name, create_time, update_user_id, - update_user_name, update_time) - values (#{id,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{bucketName,jdbcType=VARCHAR}, - #{fileSize,jdbcType=BIGINT}, #{fileSuffix,jdbcType=VARCHAR}, #{createUserId,jdbcType=VARCHAR}, - #{createUserName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateUserId,jdbcType=VARCHAR}, - #{updateUserName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}) - - - insert into t_sys_file - - - id, - - - file_name, - - - bucket_name, - - - file_size, - - - file_suffix, - - - create_user_id, - - - create_user_name, - - - create_time, - - - update_user_id, - - - update_user_name, - - - update_time, - - - - - #{id,jdbcType=VARCHAR}, - - - #{fileName,jdbcType=VARCHAR}, - - - #{bucketName,jdbcType=VARCHAR}, - - - #{fileSize,jdbcType=BIGINT}, - - - #{fileSuffix,jdbcType=VARCHAR}, - - - #{createUserId,jdbcType=VARCHAR}, - - - #{createUserName,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateUserId,jdbcType=VARCHAR}, - - - #{updateUserName,jdbcType=VARCHAR}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - update t_sys_file - - - id = #{record.id,jdbcType=VARCHAR}, - - - file_name = #{record.fileName,jdbcType=VARCHAR}, - - - bucket_name = #{record.bucketName,jdbcType=VARCHAR}, - - - file_size = #{record.fileSize,jdbcType=BIGINT}, - - - file_suffix = #{record.fileSuffix,jdbcType=VARCHAR}, - - - create_user_id = #{record.createUserId,jdbcType=VARCHAR}, - - - create_user_name = #{record.createUserName,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_user_id = #{record.updateUserId,jdbcType=VARCHAR}, - - - update_user_name = #{record.updateUserName,jdbcType=VARCHAR}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - - - - - - update t_sys_file - set id = #{record.id,jdbcType=VARCHAR}, - file_name = #{record.fileName,jdbcType=VARCHAR}, - bucket_name = #{record.bucketName,jdbcType=VARCHAR}, - file_size = #{record.fileSize,jdbcType=BIGINT}, - file_suffix = #{record.fileSuffix,jdbcType=VARCHAR}, - create_user_id = #{record.createUserId,jdbcType=VARCHAR}, - create_user_name = #{record.createUserName,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_user_id = #{record.updateUserId,jdbcType=VARCHAR}, - update_user_name = #{record.updateUserName,jdbcType=VARCHAR}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP} - - - - - - update t_sys_file - - - file_name = #{fileName,jdbcType=VARCHAR}, - - - bucket_name = #{bucketName,jdbcType=VARCHAR}, - - - file_size = #{fileSize,jdbcType=BIGINT}, - - - file_suffix = #{fileSuffix,jdbcType=VARCHAR}, - - - create_user_id = #{createUserId,jdbcType=VARCHAR}, - - - create_user_name = #{createUserName,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_user_id = #{updateUserId,jdbcType=VARCHAR}, - - - update_user_name = #{updateUserName,jdbcType=VARCHAR}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=VARCHAR} - - - update t_sys_file - set file_name = #{fileName,jdbcType=VARCHAR}, - bucket_name = #{bucketName,jdbcType=VARCHAR}, - file_size = #{fileSize,jdbcType=BIGINT}, - file_suffix = #{fileSuffix,jdbcType=VARCHAR}, - create_user_id = #{createUserId,jdbcType=VARCHAR}, - create_user_name = #{createUserName,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_user_id = #{updateUserId,jdbcType=VARCHAR}, - update_user_name = #{updateUserName,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/src/main/resources/templates/admin/email/list.html b/src/main/resources/templates/admin/email/list.html index 21f0cff..b9cd1ef 100644 --- a/src/main/resources/templates/admin/email/list.html +++ b/src/main/resources/templates/admin/email/list.html @@ -69,7 +69,7 @@ {title: 'ID', field: 'id', align: 'center'}, {title: '接收人', field: 'receiversEmail', align: 'left'}, {title: '标题', field: 'title', align: 'left'}, - {title: '发送人', field: 'sendUserName', align: 'left'}, + {title: '发送人', field: 'createBy', align: 'left'}, {title: '创建时间', field: 'createTime', align: 'left'}, {title: '操作', toolbar: '#email-bar', align: 'center'} ] diff --git a/src/main/resources/templates/admin/file/list.html b/src/main/resources/templates/admin/file/list.html index 81d93e1..ea912f9 100644 --- a/src/main/resources/templates/admin/file/list.html +++ b/src/main/resources/templates/admin/file/list.html @@ -72,9 +72,9 @@ {title: '桶名', field: 'bucketName', align: 'left'}, {title: '大小', field: 'fileSize', align: 'left'}, {title: '后缀', field: 'fileSuffix', align: 'left'}, - {title: '创建人', field: 'createUserName', align: 'left'}, + {title: '创建人', field: 'createBy', align: 'left'}, {title: '创建时间', field: 'createTime', align: 'left'}, - {title: '修改人', field: 'updateUserName', align: 'left'}, + {title: '修改人', field: 'updateBy', align: 'left'}, {title: '修改时间', field: 'updateTime', align: 'left'}, {title: '操作', toolbar: '#sysFile-bar', align: 'center'} ] diff --git a/src/main/resources/templates/admin/sysNotice/list.html b/src/main/resources/templates/admin/sysNotice/list.html index 2f9c8c8..f321a7d 100644 --- a/src/main/resources/templates/admin/sysNotice/list.html +++ b/src/main/resources/templates/admin/sysNotice/list.html @@ -81,7 +81,7 @@ {title: '标题', field: 'title', align: 'left'}, {title: '内容', field: 'content', align: 'left'}, {title: '类型', field: 'type', align: 'center',toolbar: '#sysNotice-type'}, - {title: '创建人', field: 'createUsername', align: 'left'}, + {title: '创建人', field: 'createBy', align: 'left'}, {title: '创建时间', field: 'createTime', align: 'left'}, {title: '操作', toolbar: '#sysNotice-bar', align: 'center'} ] diff --git a/src/main/resources/templates/admin/sysNotice/list_view.html b/src/main/resources/templates/admin/sysNotice/list_view.html index b3e5bd9..78b8b37 100644 --- a/src/main/resources/templates/admin/sysNotice/list_view.html +++ b/src/main/resources/templates/admin/sysNotice/list_view.html @@ -63,7 +63,7 @@ {title: '标题', field: 'title', align: 'left'}, {title: '内容', field: 'content', align: 'left'}, {title: '类型', field: 'type', align: 'center',toolbar: '#sysNotice-type'}, - {title: '创建人', field: 'createUsername', align: 'left'}, + {title: '创建人', field: 'createBy', align: 'left'}, {title: '创建时间', field: 'createTime', align: 'left'}, {title: '操作', toolbar: '#sysNotice-bar', align: 'center'} ] -- Gitee From af011f295604323e9736dd9c5efe8af8c38ee84c Mon Sep 17 00:00:00 2001 From: zhaonengzhi Date: Sun, 8 Aug 2021 02:51:51 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=B8=BAmybatis-plus?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=20Signed-off-by:=20zhaonengzhi=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/springbootv2.sql | 658 +++++++------ .../com/fc/v2/common/base/BaseController.java | 6 +- .../com/fc/v2/common/base/BaseService.java | 35 - .../fc/v2/common/conf/oss/OssEndpoint.java | 6 +- .../v2/common/interceptor/MyInterceptor.java | 15 +- .../java/com/fc/v2/common/log/LogAspect.java | 4 +- .../com/fc/v2/common/quartz/task/V2Task.java | 11 +- .../com/fc/v2/controller/AdminController.java | 6 +- .../controller/admin/AutoCodeController.java | 289 +++--- .../admin/PermissionController.java | 388 ++++---- .../v2/controller/admin/RoleController.java | 147 +-- .../admin/SysDepartmentController.java | 327 +++--- .../admin/SysInterUrlController.java | 328 +++--- .../admin/SysPositionController.java | 281 +++--- .../v2/controller/admin/UserController.java | 348 +++---- .../v2/mapper/auto/SysDepartmentMapper.java | 40 - .../fc/v2/mapper/auto/SysInterUrlMapper.java | 40 - .../fc/v2/mapper/auto/SysPositionMapper.java | 40 - .../v2/mapper/auto/TSysDepartmentMapper.java | 16 + .../fc/v2/mapper/auto/TSysInterUrlMapper.java | 16 + .../v2/mapper/auto/TSysPermissionMapper.java | 39 + .../mapper/auto/TSysPermissionRoleMapper.java | 16 + .../fc/v2/mapper/auto/TSysPositionMapper.java | 16 + .../com/fc/v2/mapper/auto/TSysRoleMapper.java | 24 + .../fc/v2/mapper/auto/TSysRoleUserMapper.java | 32 +- .../com/fc/v2/mapper/auto/TSysUserMapper.java | 44 + .../v2/mapper/auto/TsysPermissionMapper.java | 32 - .../mapper/auto/TsysPermissionRoleMapper.java | 32 - .../com/fc/v2/mapper/auto/TsysRoleMapper.java | 32 - .../com/fc/v2/mapper/auto/TsysUserMapper.java | 32 - .../fc/v2/mapper/custom/PermissionDao.java | 32 - .../java/com/fc/v2/mapper/custom/RoleDao.java | 22 - .../com/fc/v2/mapper/custom/TsysUserDao.java | 30 - .../com/fc/v2/model/auto/SysDepartment.java | 151 --- .../v2/model/auto/SysDepartmentExample.java | 775 --------------- .../com/fc/v2/model/auto/SysInterUrl.java | 92 -- .../fc/v2/model/auto/SysInterUrlExample.java | 491 --------- .../com/fc/v2/model/auto/SysPosition.java | 88 -- .../fc/v2/model/auto/SysPositionExample.java | 491 --------- .../com/fc/v2/model/auto/TSysDepartment.java | 161 +++ .../com/fc/v2/model/auto/TSysInterUrl.java | 95 ++ .../com/fc/v2/model/auto/TSysPosition.java | 94 ++ .../com/fc/v2/model/auto/TSysRoleUser.java | 89 +- .../fc/v2/model/auto/TSysRoleUserExample.java | 410 -------- .../com/fc/v2/model/auto/TsysPermission.java | 209 ++-- .../v2/model/auto/TsysPermissionExample.java | 930 ------------------ .../fc/v2/model/auto/TsysPermissionRole.java | 89 +- .../model/auto/TsysPermissionRoleExample.java | 410 -------- .../java/com/fc/v2/model/auto/TsysRole.java | 81 +- .../com/fc/v2/model/auto/TsysRoleExample.java | 340 ------- .../java/com/fc/v2/model/auto/TsysUser.java | 218 ++-- .../com/fc/v2/model/auto/TsysUserExample.java | 610 ------------ .../model/custom/PermissionTreeModelVo.java | 10 +- .../java/com/fc/v2/model/custom/RoleVo.java | 6 +- .../java/com/fc/v2/model/custom/SysMenu.java | 14 +- .../java/com/fc/v2/model/custom/SysPower.java | 14 +- .../com/fc/v2/service/GeneratorService.java | 62 -- .../com/fc/v2/service/ITGeneratorService.java | 42 + .../fc/v2/service/ITSysDepartmentService.java | 89 ++ .../fc/v2/service/ITSysInterUrlService.java | 80 ++ .../com/fc/v2/service/ITSysNoticeService.java | 6 +- .../service/ITSysPermissionRoleService.java | 89 ++ .../fc/v2/service/ITSysPermissionService.java | 143 +++ .../fc/v2/service/ITSysPositionService.java | 88 ++ .../com/fc/v2/service/ITSysRoleService.java | 97 ++ .../fc/v2/service/ITSysRoleUserService.java | 88 ++ .../com/fc/v2/service/ITSysUserService.java | 130 +++ .../com/fc/v2/service/ITSysUtilService.java | 26 + .../fc/v2/service/SysDepartmentService.java | 144 --- .../com/fc/v2/service/SysInterUrlService.java | 137 --- .../fc/v2/service/SysPermissionService.java | 339 ------- .../com/fc/v2/service/SysPositionService.java | 153 --- .../com/fc/v2/service/SysRoleService.java | 204 ---- .../com/fc/v2/service/SysUserService.java | 250 ----- .../v2/service/impl/GeneratorServiceImpl.java | 70 ++ .../impl/TSysDepartmentServiceImpl.java | 137 +++ .../service/impl/TSysInterUrlServiceImpl.java | 134 +++ .../service/impl/TSysNoticeServiceImpl.java | 6 +- .../impl/TSysPermissionRoleServiceImpl.java | 138 +++ .../impl/TSysPermissionServiceImpl.java | 313 ++++++ .../service/impl/TSysPositionServiceImpl.java | 138 +++ .../v2/service/impl/TSysRoleServiceImpl.java | 170 ++++ .../service/impl/TSysRoleUserServiceImpl.java | 138 +++ .../v2/service/impl/TSysUserServiceImpl.java | 225 +++++ .../TSysUtilServiceImpl.java} | 11 +- .../com/fc/v2/shiro/service/MyShiroRealm.java | 156 +-- .../java/com/fc/v2/shiro/util/ShiroUtils.java | 18 +- src/main/resources/application-dev.yml | 2 +- .../mybatis/auto/SysDepartmentMapper.xml | 318 ------ .../mybatis/auto/SysInterUrlMapper.xml | 236 ----- .../mybatis/auto/SysPositionMapper.xml | 236 ----- .../mybatis/auto/TSysDepartmentMapper.xml | 27 + .../mybatis/auto/TSysInterUrlMapper.xml | 23 + .../mybatis/auto/TSysPermissionMapper.xml | 68 ++ .../mybatis/auto/TSysPositionMapper.xml | 23 + .../mybatis/auto/TSysRoleUserMapper.xml | 200 +--- .../mybatis/auto/TsysPermissionRoleMapper.xml | 200 +--- .../mybatis/auto/TsysPremissionMapper.xml | 308 ------ .../resources/mybatis/auto/TsysRoleMapper.xml | 180 +--- .../resources/mybatis/auto/TsysUserMapper.xml | 280 +----- .../mybatis/custom/TsysPremissionMapper.xml | 43 - .../mybatis/custom/TsysRoleMapper.xml | 17 - .../mybatis/custom/TsysUserMapper.xml | 37 - 103 files changed, 5094 insertions(+), 10177 deletions(-) delete mode 100644 src/main/java/com/fc/v2/common/base/BaseService.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/SysDepartmentMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/SysInterUrlMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/SysPositionMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysDepartmentMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysInterUrlMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysPermissionMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysPermissionRoleMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysPositionMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysRoleMapper.java create mode 100644 src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/TsysPermissionMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/TsysPermissionRoleMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/TsysRoleMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/auto/TsysUserMapper.java delete mode 100644 src/main/java/com/fc/v2/mapper/custom/PermissionDao.java delete mode 100644 src/main/java/com/fc/v2/mapper/custom/RoleDao.java delete mode 100644 src/main/java/com/fc/v2/mapper/custom/TsysUserDao.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysDepartment.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysDepartmentExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysInterUrl.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysInterUrlExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysPosition.java delete mode 100644 src/main/java/com/fc/v2/model/auto/SysPositionExample.java create mode 100644 src/main/java/com/fc/v2/model/auto/TSysDepartment.java create mode 100644 src/main/java/com/fc/v2/model/auto/TSysInterUrl.java create mode 100644 src/main/java/com/fc/v2/model/auto/TSysPosition.java delete mode 100644 src/main/java/com/fc/v2/model/auto/TSysRoleUserExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/TsysPermissionExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/TsysPermissionRoleExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/TsysRoleExample.java delete mode 100644 src/main/java/com/fc/v2/model/auto/TsysUserExample.java delete mode 100644 src/main/java/com/fc/v2/service/GeneratorService.java create mode 100644 src/main/java/com/fc/v2/service/ITGeneratorService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysDepartmentService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysInterUrlService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysPermissionRoleService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysPermissionService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysPositionService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysRoleService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysRoleUserService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysUserService.java create mode 100644 src/main/java/com/fc/v2/service/ITSysUtilService.java delete mode 100644 src/main/java/com/fc/v2/service/SysDepartmentService.java delete mode 100644 src/main/java/com/fc/v2/service/SysInterUrlService.java delete mode 100644 src/main/java/com/fc/v2/service/SysPermissionService.java delete mode 100644 src/main/java/com/fc/v2/service/SysPositionService.java delete mode 100644 src/main/java/com/fc/v2/service/SysRoleService.java delete mode 100644 src/main/java/com/fc/v2/service/SysUserService.java create mode 100644 src/main/java/com/fc/v2/service/impl/GeneratorServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysDepartmentServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysInterUrlServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysPermissionRoleServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysPermissionServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysPositionServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysRoleServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysRoleUserServiceImpl.java create mode 100644 src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java rename src/main/java/com/fc/v2/service/{SysUtilService.java => impl/TSysUtilServiceImpl.java} (81%) delete mode 100644 src/main/resources/mybatis/auto/SysDepartmentMapper.xml delete mode 100644 src/main/resources/mybatis/auto/SysInterUrlMapper.xml delete mode 100644 src/main/resources/mybatis/auto/SysPositionMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysDepartmentMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysInterUrlMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysPermissionMapper.xml create mode 100644 src/main/resources/mybatis/auto/TSysPositionMapper.xml delete mode 100644 src/main/resources/mybatis/auto/TsysPremissionMapper.xml delete mode 100644 src/main/resources/mybatis/custom/TsysPremissionMapper.xml delete mode 100644 src/main/resources/mybatis/custom/TsysRoleMapper.xml delete mode 100644 src/main/resources/mybatis/custom/TsysUserMapper.xml diff --git a/doc/springbootv2.sql b/doc/springbootv2.sql index b1dc067..c9d4ba3 100644 --- a/doc/springbootv2.sql +++ b/doc/springbootv2.sql @@ -114,26 +114,31 @@ INSERT INTO `t_sys_city` VALUES (255, '500100', '重庆市', '重庆', '500000', -- ---------------------------- DROP TABLE IF EXISTS `t_sys_department`; CREATE TABLE `t_sys_department` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id', - `parent_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '父id', + `id` bigint(30) NOT NULL COMMENT '主键', + `parent_id` bigint(30) NULL DEFAULT NULL COMMENT '父id', `dept_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '部门名称', `leader` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '部门负责人', `phone` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '电话', `email` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '邮箱', `status` int(255) NULL DEFAULT NULL COMMENT '状态', `order_num` int(11) NULL DEFAULT NULL COMMENT '排序', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '部门表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '部门表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_department -- ---------------------------- -INSERT INTO `t_sys_department` VALUES (1, '0', 'v2', 'v2', '13012345678', 'v2@qq.com', 1, 1); -INSERT INTO `t_sys_department` VALUES (2, '1', '技术部门', 'x某某', '13012345678', 'v2@qq.com', 1, 2); -INSERT INTO `t_sys_department` VALUES (3, '1', '人事部门', 'a某某', '13012345678', 'v2@qq.com', 1, 3); -INSERT INTO `t_sys_department` VALUES (4, '2', '开发一小组', 'b某某', '13012345678', 'v2@qq.com', 1, 4); -INSERT INTO `t_sys_department` VALUES (5, '3', '销售部门', 'd某某', '13012345678', 'v2@qq.com', 1, 5); -INSERT INTO `t_sys_department` VALUES (6, '5', '销售一组', 'e某某', '13012345678', 'v2@qq.com', 1, 6); +INSERT INTO `t_sys_department` VALUES (1, 0, 'v2', 'v2', '13012345678', 'v2@qq.com', 1, 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_department` VALUES (2, 1, '技术部门', 'x某某', '13012345678', 'v2@qq.com', 1, 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_department` VALUES (3, 1, '人事部门', 'a某某', '13012345678', 'v2@qq.com', 1, 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_department` VALUES (4, 2, '开发一小组', 'b某某', '13012345678', 'v2@qq.com', 1, 4, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_department` VALUES (5, 3, '销售部门', 'd某某', '13012345678', 'v2@qq.com', 1, 5, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_department` VALUES (6, 5, '销售一组', 'e某某', '13012345678', 'v2@qq.com', 1, 6, NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_dict_data @@ -226,9 +231,9 @@ CREATE TABLE `t_sys_email` ( -- ---------------------------- -- Records of t_sys_email -- ---------------------------- -INSERT INTO `t_sys_email` VALUES (503928650819833856, '87766867@qq.com', '87766867@qq.com', 'fffffff\"[委屈]\"', 'admin', '2021-08-07 23:59:41', NULL, NULL, NULL); -INSERT INTO `t_sys_email` VALUES (503928914918379520, '87766867@qq.com', '87766867@qq.com', 'ssssssfsdfsdfsdf\"[抓狂]\"\"[蛋糕]\"', 'admin', '2021-08-07 23:59:41', NULL, NULL, NULL); -INSERT INTO `t_sys_email` VALUES (595001021625794560, '87766867@qq.com', 'springbootv2测试邮件', '

测试测测测

', 'admin', '2021-08-07 23:59:41', NULL, NULL, NULL); +INSERT INTO `t_sys_email` VALUES (503928650819833856, '87766867@qq.com', '87766867@qq.com', 'fffffff\"[委屈]\"', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_email` VALUES (503928914918379520, '87766867@qq.com', '87766867@qq.com', 'ssssssfsdfsdfsdf\"[抓狂]\"\"[蛋糕]\"', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_email` VALUES (595001021625794560, '87766867@qq.com', 'springbootv2测试邮件', '

测试测测测

', NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_file @@ -259,74 +264,79 @@ INSERT INTO `t_sys_file` VALUES (503885528857448448, '503895039806672896.png', ' -- ---------------------------- DROP TABLE IF EXISTS `t_sys_inter_url`; CREATE TABLE `t_sys_inter_url` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键', + `id` bigint(30) NOT NULL COMMENT '主键', `inter_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '拦截名称', `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '拦截url', - `type` int(2) NULL DEFAULT NULL COMMENT '类型', + `type` bigint(2) NULL DEFAULT NULL COMMENT '类型', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '拦截url表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_inter_url -- ---------------------------- -INSERT INTO `t_sys_inter_url` VALUES ('411495038321823744', '字典表新增', '/DictDataController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506433268967673856', '字典表修改', '/DictDataController/edit', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506434978159136768', '字典表删除', '/DictDataController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506435565655298048', '字典表状态修改', '/DictDataController/updateDefault', 4); -INSERT INTO `t_sys_inter_url` VALUES ('506435921147727872', '字典表状态修改2', '/DictDataController/updateEnable', 4); -INSERT INTO `t_sys_inter_url` VALUES ('506436031403397120', '字典表类型新增', '/DictTypeController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506436148680331264', '字典表类型修改', '/DictTypeController/edit', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506436165776314368', '字典表类型删除', '/DictTypeController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506436180578013184', '字典表类型状态修改', '/DictTypeController/updateEnable', 4); -INSERT INTO `t_sys_inter_url` VALUES ('506436662134444032', '邮件新增', '/EmailController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506436757722632192', '邮件删除', '/EmailController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506437010966319104', '日志删除', '/LogController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506437420099702784', 'oss新增', '/oss/bucket/', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506437439112482816', 'oss删除', '/oss/bucket/', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506437964436475904', '权限新增', '/PermissionController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506438040823140352', '权限保存', '/PermissionController/edit', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506438121399914496', '权限删除', '/PermissionController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506438208599494656', '权限授权', '/PermissionController/saveRolePower', 4); -INSERT INTO `t_sys_inter_url` VALUES ('506438306276446208', '权限状态修改', '/PermissionController/updateVisible', 4); -INSERT INTO `t_sys_inter_url` VALUES ('506438447226032128', '定时器新增', '/SysQuartzJobController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506438589874311168', ' 任务调度状态修改', '/SysQuartzJobController/changeStatus', 4); -INSERT INTO `t_sys_inter_url` VALUES ('506438725388079104', '定时器保存', '/SysQuartzJobController/edit', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506438870959788032', '定时器修改', '/SysQuartzJobController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506439003516571648', '定时任务日志删除', '/SysQuartzJobLogController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506439171481669632', '角色新增', '/RoleController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506439186778296320', '角色修改', '/RoleController/edit', 4); -INSERT INTO `t_sys_inter_url` VALUES ('506439297122045952', '角色删除', '/RoleController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506439669773373440', '地区新增', '/SysAreaController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506439687859212288', '地区修改', '/SysAreaController/edit', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506439835490324480', '地区删除', '/SysAreaController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506440103976112128', 'City新增', '/SysCityController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506440145147400192', 'City修改', ' /SysCityController/edit', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506440217188765696', 'City删除', '/SysCityController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506440386873528320', '部门新增', '/SysDepartmentController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506440448223612928', '部门修改', '/SysDepartmentController/edit', 4); -INSERT INTO `t_sys_inter_url` VALUES ('506440515110178816', '部门删除', '/SysDepartmentController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506440574635741184', '部门状态', '/SysDepartmentController/updateVisible', 4); -INSERT INTO `t_sys_inter_url` VALUES ('506440668508459008', '拦截器url新增', '/SysInterUrlController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506440708056551424', '拦截器url修改', '/SysInterUrlController/edit', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506440802856210432', '拦截器url删除', '/SysInterUrlController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506441001783660544', '公告新增', '/SysNoticeController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506441051263864832', '公告修改', '/SysNoticeController/edit', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506441105743679488', '公告删除', '/SysNoticeController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506441242591236096', '职位新增', '/SysPositionController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506441287038275584', '职位修改', '/SysPositionController/edit', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506441350200299520', '职位删除', '/SysPositionController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506441420677189632', '职位状态修改', '/SysPositionController/updateVisible', 4); -INSERT INTO `t_sys_inter_url` VALUES ('506441780003213312', '省份新增', '/SysProvinceController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506441807383629824', '省份修改', '/SysProvinceController/edit', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506441871850082304', '省份删除', '/SysProvinceController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506441980012793856', '街道新增', '/SysStreetController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506442015706320896', '街道修改', '/SysStreetController/edit', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506442092445306880', '街道删除', '/SysStreetController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506442186552905728', '用户新增', '/UserController/add', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506442212696002560', '用户修改', '/UserController/edit', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506442271252680704', '用户修改密码', '/UserController/editPwd', 2); -INSERT INTO `t_sys_inter_url` VALUES ('506442344443285504', '用户删除', '/UserController/remove', 3); -INSERT INTO `t_sys_inter_url` VALUES ('506444610625736704', '拦截器url复制', '/SysInterUrlController/copy/', 3); +INSERT INTO `t_sys_inter_url` VALUES (411495038321823744, '字典表新增', '/DictDataController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506433268967673856, '字典表修改', '/DictDataController/edit', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506434978159136768, '字典表删除', '/DictDataController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506435565655298048, '字典表状态修改', '/DictDataController/updateDefault', 4, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506435921147727872, '字典表状态修改2', '/DictDataController/updateEnable', 4, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506436031403397120, '字典表类型新增', '/DictTypeController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506436148680331264, '字典表类型修改', '/DictTypeController/edit', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506436165776314368, '字典表类型删除', '/DictTypeController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506436180578013184, '字典表类型状态修改', '/DictTypeController/updateEnable', 4, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506436662134444032, '邮件新增', '/EmailController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506436757722632192, '邮件删除', '/EmailController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506437010966319104, '日志删除', '/LogController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506437420099702784, 'oss新增', '/oss/bucket/', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506437439112482816, 'oss删除', '/oss/bucket/', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506437964436475904, '权限新增', '/PermissionController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506438040823140352, '权限保存', '/PermissionController/edit', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506438121399914496, '权限删除', '/PermissionController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506438208599494656, '权限授权', '/PermissionController/saveRolePower', 4, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506438306276446208, '权限状态修改', '/PermissionController/updateVisible', 4, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506438447226032128, '定时器新增', '/SysQuartzJobController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506438589874311168, ' 任务调度状态修改', '/SysQuartzJobController/changeStatus', 4, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506438725388079104, '定时器保存', '/SysQuartzJobController/edit', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506438870959788032, '定时器修改', '/SysQuartzJobController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506439003516571648, '定时任务日志删除', '/SysQuartzJobLogController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506439171481669632, '角色新增', '/RoleController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506439186778296320, '角色修改', '/RoleController/edit', 4, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506439297122045952, '角色删除', '/RoleController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506439669773373440, '地区新增', '/SysAreaController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506439687859212288, '地区修改', '/SysAreaController/edit', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506439835490324480, '地区删除', '/SysAreaController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506440103976112128, 'City新增', '/SysCityController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506440145147400192, 'City修改', ' /SysCityController/edit', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506440217188765696, 'City删除', '/SysCityController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506440386873528320, '部门新增', '/SysDepartmentController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506440448223612928, '部门修改', '/SysDepartmentController/edit', 4, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506440515110178816, '部门删除', '/SysDepartmentController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506440574635741184, '部门状态', '/SysDepartmentController/updateVisible', 4, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506440668508459008, '拦截器url新增', '/SysInterUrlController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506440708056551424, '拦截器url修改', '/SysInterUrlController/edit', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506440802856210432, '拦截器url删除', '/SysInterUrlController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506441001783660544, '公告新增', '/SysNoticeController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506441051263864832, '公告修改', '/SysNoticeController/edit', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506441105743679488, '公告删除', '/SysNoticeController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506441242591236096, '职位新增', '/SysPositionController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506441287038275584, '职位修改', '/SysPositionController/edit', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506441350200299520, '职位删除', '/SysPositionController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506441420677189632, '职位状态修改', '/SysPositionController/updateVisible', 4, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506441780003213312, '省份新增', '/SysProvinceController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506441807383629824, '省份修改', '/SysProvinceController/edit', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506441871850082304, '省份删除', '/SysProvinceController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506441980012793856, '街道新增', '/SysStreetController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506442015706320896, '街道修改', '/SysStreetController/edit', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506442092445306880, '街道删除', '/SysStreetController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506442186552905728, '用户新增', '/UserController/add', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506442212696002560, '用户修改', '/UserController/edit', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506442271252680704, '用户修改密码', '/UserController/editPwd', 2, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506442344443285504, '用户删除', '/UserController/remove', 3, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_inter_url` VALUES (506444610625736704, '拦截器url复制', '/SysInterUrlController/copy/', 3, NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_notice @@ -464,266 +474,281 @@ INSERT INTO `t_sys_oper_log` VALUES (501986656363089920, '用户新增', 'com.fc -- ---------------------------- DROP TABLE IF EXISTS `t_sys_permission`; CREATE TABLE `t_sys_permission` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'id', + `id` bigint(30) NOT NULL COMMENT '主键', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '权限名称', `descripion` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '权限描述', `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '授权链接', `is_blank` int(255) NULL DEFAULT 0 COMMENT '是否跳转 0 不跳转 1跳转', - `pid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '父节点id', + `pid` bigint(30) NULL DEFAULT NULL COMMENT '父节点id', `perms` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '权限标识', `type` int(11) NULL DEFAULT NULL COMMENT '类型 0：目录 1：菜单 2：按钮', `icon` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单图标', `order_num` int(11) NULL DEFAULT NULL COMMENT '排序', `visible` int(255) NULL DEFAULT NULL COMMENT '是否可见', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '权限表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_permission -- ---------------------------- -INSERT INTO `t_sys_permission` VALUES ('10', '角色集合', '角色集合', '/RoleController/list', 0, '9', 'system:role:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('11', '角色添加', '角色添加', '/RoleController/add', 0, '9', 'system:role:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('12', '角色删除', '角色删除', '/RoleController/remove', 0, '9', 'system:role:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('13', '角色修改', '角色修改', '/RoleController/edit', 0, '9', 'system:role:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('14', '权限展示', '权限展示', '/PermissionController/view', 0, '411522822607867904', 'system:permission:view', 1, 'fa fa-key', 3, 0); -INSERT INTO `t_sys_permission` VALUES ('15', '权限集合', '权限集合', '/PermissionController/list', 0, '14', 'system:permission:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('16', '权限添加', '权限添加', '/permissionController/add', 0, '14', 'system:permission:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('17', '权限删除', '权限删除', '/PermissionController/remove', 0, '14', 'system:permission:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('18', '权限修改', '权限修改', '/PermissionController/edit', 0, '14', 'system:permission:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('19', '文件管理', '文件管理', '/FileController/view', 0, '592059865673760768', 'system:file:view', 1, 'fa fa-file-image-o', 4, 0); -INSERT INTO `t_sys_permission` VALUES ('20', '文件添加', '文件添加', '/FileController/add', 0, '19', 'system:file:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('21', '文件删除', '文件删除', '/FileController/remove', 0, '19', 'system:file:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('22', '文件修改', '文件修改', '/FileController/edit', 0, '19', 'system:file:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('23', '文件集合', '文件集合', '/FileController/list', 0, '19', 'system:file:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('330365026642825216', '公告管理', '公告展示', '/SysNoticeController/view', 0, '592059865673760768', 'gen:sysNotice:view', 1, 'fa fa-telegram', 10, 0); -INSERT INTO `t_sys_permission` VALUES ('3303650266428252171', '公告集合', '公告集合', '/SysNoticeController/list', 0, '330365026642825216', 'gen:sysNotice:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3303650266428252182', '公告添加', '公告添加', '/SysNoticeController/add', 0, '330365026642825216', 'gen:sysNotice:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3303650266428252193', '公告删除', '公告删除', '/SysNoticeController/remove', 0, '330365026642825216', 'gen:sysNotice:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3303650266428252204', '公告修改', '公告修改', '/SysNoticeController/edit', 0, '330365026642825216', 'gen:sysNotice:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('331778807298134016', '定时器表达式', NULL, 'https://www.bejson.com/othertools/cron/', 1, '617766548966211584', '#', 1, 'layui-icon fa fa-flash', 12, 0); -INSERT INTO `t_sys_permission` VALUES ('332157860920299520', '定时任务', '定时任务调度表展示', '/SysQuartzJobController/view', 0, '592059865673760768', 'gen:sysQuartzJob:view', 1, 'fa fa-hourglass-1', 13, 0); -INSERT INTO `t_sys_permission` VALUES ('3321578609202995211', '定时任务调度表集合', '定时任务调度表集合', '/SysQuartzJobController/list', 0, '332157860920299520', 'gen:sysQuartzJob:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3321578609202995222', '定时任务调度表添加', '定时任务调度表添加', '/SysQuartzJobController/add', 0, '332157860920299520', 'gen:sysQuartzJob:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3321578609202995233', '定时任务调度表删除', '定时任务调度表删除', '/SysQuartzJobController/remove', 0, '332157860920299520', 'gen:sysQuartzJob:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3321578609202995244', '定时任务调度表修改', '定时任务调度表修改', '/SysQuartzJobController/edit', 0, '332157860920299520', 'gen:sysQuartzJob:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('332857281479839744', '定时任务日志', '定时任务日志', '/SysQuartzJobLogController/view', 0, '592059865673760768', 'gen:sysQuartzJobLog:view', 1, 'fa fa-database', 14, 0); -INSERT INTO `t_sys_permission` VALUES ('3328572814798397451', '定时任务调度日志表集合', '定时任务调度日志表集合', '/SysQuartzJobLogController/list', 0, '332857281479839744', 'gen:sysQuartzJobLog:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3328572814798397473', '定时任务调度日志表删除', '定时任务调度日志表删除', '/SysQuartzJobLogController/remove', 0, '332857281479839744', 'gen:sysQuartzJobLog:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('335330315113467904', 'Json工具', NULL, 'https://www.bejson.com/jsonviewernew/', 1, '617766548966211584', '#', 1, 'layui-icon fa fa-retweet', 10, 0); -INSERT INTO `t_sys_permission` VALUES ('340067579836108800', '省份管理', NULL, '', 0, '0', '', 0, 'layui-icon layui-icon layui-icon-website', 4, 0); -INSERT INTO `t_sys_permission` VALUES ('340068151804956672', '省份表管理', '省份表展示', '/SysProvinceController/view', 0, '340067579836108800', 'gen:sysProvince:view', 1, 'fa fa-quora', 2, 0); -INSERT INTO `t_sys_permission` VALUES ('3400681518049566731', '省份表集合', '省份表集合', '/SysProvinceController/list', 0, '340068151804956672', 'gen:sysProvince:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3400681518049566742', '省份表添加', '省份表添加', '/SysProvinceController/add', 0, '340068151804956672', 'gen:sysProvince:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3400681518049566753', '省份表删除', '省份表删除', '/SysProvinceController/remove', 0, '340068151804956672', 'gen:sysProvince:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3400681518049566764', '省份表修改', '省份表修改', '/SysProvinceController/edit', 0, '340068151804956672', 'gen:sysProvince:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('340088022018166784', '城市表管理', '城市设置展示', '/SysCityController/view', 0, '340067579836108800', 'gen:sysCity:view', 1, 'fa fa-quora', 3, 0); -INSERT INTO `t_sys_permission` VALUES ('3400880220181667851', '城市设置集合', '城市设置集合', '/SysCityController/list', 0, '340088022018166784', 'gen:sysCity:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3400880220181667862', '城市设置添加', '城市设置添加', '/SysCityController/add', 0, '340088022018166784', 'gen:sysCity:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3400880220181667873', '城市设置删除', '城市设置删除', '/SysCityController/remove', 0, '340088022018166784', 'gen:sysCity:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3400880220181667884', '城市设置修改', '城市设置修改', '/SysCityController/edit', 0, '340088022018166784', 'gen:sysCity:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('340096183135506432', '地区设置管理', '地区设置展示', '/SysAreaController/view', 0, '340067579836108800', 'gen:sysArea:view', 1, 'fa fa-quora', 4, 0); -INSERT INTO `t_sys_permission` VALUES ('3400961831355064331', '地区设置集合', '地区设置集合', '/SysAreaController/list', 0, '340096183135506432', 'gen:sysArea:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3400961831355064342', '地区设置添加', '地区设置添加', '/SysAreaController/add', 0, '340096183135506432', 'gen:sysArea:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3400961831355064353', '地区设置删除', '地区设置删除', '/SysAreaController/remove', 0, '340096183135506432', 'gen:sysArea:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3400961831355064364', '地区设置修改', '地区设置修改', '/SysAreaController/edit', 0, '340096183135506432', 'gen:sysArea:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('340127412270534656', '街道设置管理', '街道设置展示', '/SysStreetController/view', 0, '340067579836108800', 'gen:sysStreet:view', 1, 'fa fa-quora', 5, 0); -INSERT INTO `t_sys_permission` VALUES ('3401274122705346571', '街道设置集合', '街道设置集合', '/SysStreetController/list', 0, '340127412270534656', 'gen:sysStreet:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3401274122705346582', '街道设置添加', '街道设置添加', '/SysStreetController/add', 0, '340127412270534656', 'gen:sysStreet:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3401274122705346593', '街道设置删除', '街道设置删除', '/SysStreetController/remove', 0, '340127412270534656', 'gen:sysStreet:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3401274122705346604', '街道设置修改', '街道设置修改', '/SysStreetController/edit', 0, '340127412270534656', 'gen:sysStreet:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('340301160042860544', '省份联动', '省份联动', '/ProvinceLinkageController/view', 0, '340067579836108800', '#', 1, 'fa fa-etsy', 1, 0); -INSERT INTO `t_sys_permission` VALUES ('340381240911859712', 'JavaScript格式化', NULL, '/static/tool/htmlformat/javascriptFormat.html', 0, '617766548966211584', '#', 1, 'layui-icon layui-icon fa fa-magic', 11, 0); -INSERT INTO `t_sys_permission` VALUES ('373489907429150720', 'URL拦截管理', '拦截url表展示', '/SysInterUrlController/view', 0, '617766548966211584', 'gen:sysInterUrl:view', 1, 'fa fa-hand-stop-o', 16, 0); -INSERT INTO `t_sys_permission` VALUES ('3734899074291507211', '拦截url表集合', '拦截url表集合', '/SysInterUrlController/list', 0, '373489907429150720', 'gen:sysInterUrl:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3734899074291507222', '拦截url表添加', '拦截url表添加', '/SysInterUrlController/add', 0, '373489907429150720', 'gen:sysInterUrl:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3734899074291507233', '拦截url表删除', '拦截url表删除', '/SysInterUrlController/remove', 0, '373489907429150720', 'gen:sysInterUrl:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('3734899074291507244', '拦截url表修改', '拦截url表修改', '/SysInterUrlController/edit', 0, '373489907429150720', 'gen:sysInterUrl:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('4', '用户管理', '用户展示', '/UserController/view', 0, '411522822607867904', 'system:user:view', 1, 'icon icon-user', 1, 0); -INSERT INTO `t_sys_permission` VALUES ('410791701859405824', '岗位管理', '岗位展示', '/SysPositionController/view', 0, '411522822607867904', 'gen:sysPosition:view', 1, 'fa fa-vcard', 17, 0); -INSERT INTO `t_sys_permission` VALUES ('4107917018594058251', '岗位表集合', '岗位集合', '/SysPositionController/list', 0, '410791701859405824', 'gen:sysPosition:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('4107917018594058262', '岗位表添加', '岗位添加', '/SysPositionController/add', 0, '410791701859405824', 'gen:sysPosition:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('4107917018594058273', '岗位表删除', '岗位删除', '/SysPositionController/remove', 0, '410791701859405824', 'gen:sysPosition:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('4107917018594058284', '岗位表修改', '岗位修改', '/SysPositionController/edit', 0, '410791701859405824', 'gen:sysPosition:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('410989805699207168', '部门管理', '部门展示', '/SysDepartmentController/view', 0, '411522822607867904', 'gen:sysDepartment:view', 1, 'fa fa-odnoklassniki', 18, 0); -INSERT INTO `t_sys_permission` VALUES ('4109898056992071691', '部门集合', '部门集合', '/SysDepartmentController/list', 0, '410989805699207168', 'gen:sysDepartment:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('4109898056992071702', '部门添加', '部门添加', '/SysDepartmentController/add', 0, '410989805699207168', 'gen:sysDepartment:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('4109898056992071713', '部门删除', '部门删除', '/SysDepartmentController/remove', 0, '410989805699207168', 'gen:sysDepartment:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('4109898056992071724', '部门修改', '部门修改', '/SysDepartmentController/edit', 0, '410989805699207168', 'gen:sysDepartment:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('411522822607867904', '用户管理', NULL, '', 0, '0', '', 0, 'layui-icon layui-icon-user', 3, 0); -INSERT INTO `t_sys_permission` VALUES ('486690002869157888', '用户密码修改', '用户密码修改', '/UserController/editPwd', 0, '4', 'system:user:editPwd', 2, 'entypo-tools', 3, 0); -INSERT INTO `t_sys_permission` VALUES ('496126970468237312', '日志展示', '日志管理', '/LogController/view', 0, '592059865673760768', 'system:log:view', 1, 'fa fa-info', 9, 0); -INSERT INTO `t_sys_permission` VALUES ('496127240363311104', '日志删除', '日志删除', '/LogController/remove', 0, '496126970468237312', 'system:log:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('496127794879660032', '日志集合', '日志集合', '/LogController/list', 0, '496126970468237312', 'system:log:list', 2, NULL, NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('5', '用户集合', '用户集合', '/UserController/list', 0, '4', 'system:user:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('581541547099553792', 'druid监控', 'druid监控', '/druid/', 0, '617766548966211584', 'user:list', 1, 'fa fa-line-chart', 6, 0); -INSERT INTO `t_sys_permission` VALUES ('583063272123531264', 'API文档', NULL, '/doc.html', 1, '617766548966211584', '--', 1, 'layui-icon fa fa-font', 8, 0); -INSERT INTO `t_sys_permission` VALUES ('586003694080753664', '表单构建', NULL, '/static/component/code/index.html', 0, '617766548966211584', 'system:tool:view', 1, 'layui-icon layui-icon fa fa-list-alt', 5, 0); -INSERT INTO `t_sys_permission` VALUES ('587453033487532032', '后台模板', NULL, 'https://www.layui.com/doc/', 1, '617766548966211584', '', 1, 'layui-icon layui-icon fa fa-telegram', 9, 0); -INSERT INTO `t_sys_permission` VALUES ('589559748521623552', '一级菜单', NULL, '', 0, '0', '', 0, 'layui-icon layui-icon layui-icon layui-icon-face-smile', 6, 0); -INSERT INTO `t_sys_permission` VALUES ('592059865673760768', '系统管理', NULL, '', 0, '0', '', 0, 'layui-icon layui-icon-home', 1, 0); -INSERT INTO `t_sys_permission` VALUES ('592067570522128384', '测试跳转', '测试跳转', 'http://www.baidu.com', 1, '589559748521623552', '#', 1, 'fa fa-address-book', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('592167738407911424', '系统监控', '系统监控', '/ServiceController/view', 0, '617766548966211584', 'system:service:view', 1, 'fa fa-video-camera', 7, 0); -INSERT INTO `t_sys_permission` VALUES ('594691026430459904', '电子邮件管理', '电子邮件展示', '/EmailController/view', 0, '592059865673760768', 'system:email:view', 1, 'fa fa-envelope', 8, 0); -INSERT INTO `t_sys_permission` VALUES ('5946910264304599041', '电子邮件集合', '电子邮件集合', '/EmailController/list', 0, '594691026430459904', 'system:email:list', 2, '', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('5946910264304599042', '电子邮件添加', '电子邮件添加', '/EmailController/add', 0, '594691026430459904', 'system:email:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('5946910264304599043', '电子邮件删除', '电子邮件删除', '/EmailController/remove', 0, '594691026430459904', 'system:email:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('5946910264304599044', '电子邮件修改', '电子邮件修改', '/EmailController/edit', 0, '594691026430459904', 'system:email:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('6', '用户添加', '用户添加', '/UserController/add', 0, '4', 'system:user:add', 2, 'entypo-plus-squared', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('610635485890478080', '代码生成', NULL, '', 0, '0', '', 0, 'layui-icon layui-icon layui-icon layui-icon-praise', 2, 0); -INSERT INTO `t_sys_permission` VALUES ('610635950447394816', '全局配置', '', '/autoCodeController/global', 0, '610635485890478080', 'system:autocode:global', 1, 'fa fa-university', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('617766548966211584', '系统工具', NULL, '', 0, '0', '', 0, 'layui-icon layui-icon layui-icon layui-icon layui-icon layui-icon layui-icon-util', 5, 0); -INSERT INTO `t_sys_permission` VALUES ('618918631769636864', '字典管理', '字典类型表展示', '/DictTypeController/view', 0, '592059865673760768', 'system:dictType:view', 1, 'fa fa-puzzle-piece', 11, 0); -INSERT INTO `t_sys_permission` VALUES ('6189186317738311681', '字典类型表集合', '字典类型表集合', '/DictTypeController/list', 0, '618918631769636864', 'system:dictType:list', 2, NULL, NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('6189186317948026882', '字典类型表添加', '字典类型表添加', '/DictTypeController/add', 0, '618918631769636864', 'system:dictType:add', 2, NULL, NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('6189186317948026883', '字典类型表删除', '字典类型表删除', '/DictTypeController/remove', 0, '618918631769636864', 'system:dictType:remove', 2, NULL, NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('6189186317989969924', '字典类型表修改', '字典类型表修改', '/DictTypeController/edit', 0, '618918631769636864', 'system:dictType:edit', 2, NULL, NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('6192095214866268161', '字典数据表集合', '字典数据表集合', '/DictDataController/list', 0, '618918631769636864', 'system:dictData:list', 2, NULL, NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('6192095214866268162', '字典数据表添加', '字典数据表添加', '/DictDataController/add', 0, '618918631769636864', 'system:dictData:add', 2, NULL, NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('6192095215075983363', '字典数据表删除', '字典数据表删除', '/DictDataController/remove', 0, '618918631769636864', 'system:dictData:remove', 2, NULL, NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('6192095215075983364', '字典数据表修改', '字典数据表修改', '/DictDataController/edit', 0, '618918631769636864', 'system:dictData:edit', 2, NULL, NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('619836559427895296', '字典数据视图', '字典数据视图', '/DictDataController/view', 0, '618918631769636864', 'system:dictData:view', 2, NULL, NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('7', '用户删除', '用户删除', '/UserController/remove', 0, '4', 'system:user:remove', 2, 'entypo-trash', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('8', '用户修改', '用户修改', '/UserController/edit', 0, '4', 'system:user:edit', 2, 'fa fa-wrench', NULL, 0); -INSERT INTO `t_sys_permission` VALUES ('9', '角色管理', '角色展示', '/RoleController/view', 0, '411522822607867904', 'system:role:view', 1, 'fa fa-group', 2, 0); +INSERT INTO `t_sys_permission` VALUES (4, '用户管理', '用户展示', '/UserController/view', 0, 411522822607867904, 'system:user:view', 1, 'icon icon-user', 1, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (5, '用户集合', '用户集合', '/UserController/list', 0, 4, 'system:user:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (6, '用户添加', '用户添加', '/UserController/add', 0, 4, 'system:user:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (7, '用户删除', '用户删除', '/UserController/remove', 0, 4, 'system:user:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (8, '用户修改', '用户修改', '/UserController/edit', 0, 4, 'system:user:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (9, '角色管理', '角色展示', '/RoleController/view', 0, 411522822607867904, 'system:role:view', 1, 'fa fa-group', 2, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (10, '角色集合', '角色集合', '/RoleController/list', 0, 9, 'system:role:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (11, '角色添加', '角色添加', '/RoleController/add', 0, 9, 'system:role:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (12, '角色删除', '角色删除', '/RoleController/remove', 0, 9, 'system:role:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (13, '角色修改', '角色修改', '/RoleController/edit', 0, 9, 'system:role:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (14, '权限展示', '权限展示', '/PermissionController/view', 0, 411522822607867904, 'system:permission:view', 1, 'fa fa-key', 3, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (15, '权限集合', '权限集合', '/PermissionController/list', 0, 14, 'system:permission:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (16, '权限添加', '权限添加', '/permissionController/add', 0, 14, 'system:permission:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (17, '权限删除', '权限删除', '/PermissionController/remove', 0, 14, 'system:permission:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (18, '权限修改', '权限修改', '/PermissionController/edit', 0, 14, 'system:permission:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (19, '文件管理', '文件管理', '/FileController/view', 0, 592059865673760768, 'system:file:view', 1, 'fa fa-file-image-o', 4, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (20, '文件添加', '文件添加', '/FileController/add', 0, 19, 'system:file:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (21, '文件删除', '文件删除', '/FileController/remove', 0, 19, 'system:file:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (22, '文件修改', '文件修改', '/FileController/edit', 0, 19, 'system:file:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (23, '文件集合', '文件集合', '/FileController/list', 0, 19, 'system:file:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (330365026642825216, '公告管理', '公告展示', '/SysNoticeController/view', 0, 592059865673760768, 'gen:sysNotice:view', 1, 'fa fa-telegram', 10, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (331778807298134016, '定时器表达式', NULL, 'https://www.bejson.com/othertools/cron/', 1, 617766548966211584, '#', 1, 'layui-icon fa fa-flash', 12, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (332157860920299520, '定时任务', '定时任务调度表展示', '/SysQuartzJobController/view', 0, 592059865673760768, 'gen:sysQuartzJob:view', 1, 'fa fa-hourglass-1', 13, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (332857281479839744, '定时任务日志', '定时任务日志', '/SysQuartzJobLogController/view', 0, 592059865673760768, 'gen:sysQuartzJobLog:view', 1, 'fa fa-database', 14, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (335330315113467904, 'Json工具', NULL, 'https://www.bejson.com/jsonviewernew/', 1, 617766548966211584, '#', 1, 'layui-icon fa fa-retweet', 10, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (340067579836108800, '省份管理', NULL, '', 0, 0, '', 0, 'layui-icon layui-icon layui-icon-website', 4, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (340068151804956672, '省份表管理', '省份表展示', '/SysProvinceController/view', 0, 340067579836108800, 'gen:sysProvince:view', 1, 'fa fa-quora', 2, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (340088022018166784, '城市表管理', '城市设置展示', '/SysCityController/view', 0, 340067579836108800, 'gen:sysCity:view', 1, 'fa fa-quora', 3, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (340096183135506432, '地区设置管理', '地区设置展示', '/SysAreaController/view', 0, 340067579836108800, 'gen:sysArea:view', 1, 'fa fa-quora', 4, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (340127412270534656, '街道设置管理', '街道设置展示', '/SysStreetController/view', 0, 340067579836108800, 'gen:sysStreet:view', 1, 'fa fa-quora', 5, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (340301160042860544, '省份联动', '省份联动', '/ProvinceLinkageController/view', 0, 340067579836108800, '#', 1, 'fa fa-etsy', 1, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (340381240911859712, 'JavaScript格式化', NULL, '/static/tool/htmlformat/javascriptFormat.html', 0, 617766548966211584, '#', 1, 'layui-icon layui-icon fa fa-magic', 11, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (373489907429150720, 'URL拦截管理', '拦截url表展示', '/SysInterUrlController/view', 0, 617766548966211584, 'gen:sysInterUrl:view', 1, 'fa fa-hand-stop-o', 16, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (410791701859405824, '岗位管理', '岗位展示', '/SysPositionController/view', 0, 411522822607867904, 'gen:sysPosition:view', 1, 'fa fa-vcard', 17, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (410989805699207168, '部门管理', '部门展示', '/SysDepartmentController/view', 0, 411522822607867904, 'gen:sysDepartment:view', 1, 'fa fa-odnoklassniki', 18, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (411522822607867904, '用户管理', NULL, '', 0, 0, '', 0, 'layui-icon layui-icon-user', 3, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (486690002869157888, '用户密码修改', '用户密码修改', '/UserController/editPwd', 0, 4, 'system:user:editPwd', 2, 'entypo-tools', 3, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (496126970468237312, '日志展示', '日志管理', '/LogController/view', 0, 592059865673760768, 'system:log:view', 1, 'fa fa-info', 9, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (496127240363311104, '日志删除', '日志删除', '/LogController/remove', 0, 496126970468237312, 'system:log:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (496127794879660032, '日志集合', '日志集合', '/LogController/list', 0, 496126970468237312, 'system:log:list', 2, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (581541547099553792, 'druid监控', 'druid监控', '/druid/', 0, 617766548966211584, 'user:list', 1, 'fa fa-line-chart', 6, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (583063272123531264, 'API文档', NULL, '/doc.html', 1, 617766548966211584, '--', 1, 'layui-icon fa fa-font', 8, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (586003694080753664, '表单构建', NULL, '/static/component/code/index.html', 0, 617766548966211584, 'system:tool:view', 1, 'layui-icon layui-icon fa fa-list-alt', 5, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (587453033487532032, '后台模板', NULL, 'https://www.layui.com/doc/', 1, 617766548966211584, '', 1, 'layui-icon layui-icon fa fa-telegram', 9, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (589559748521623552, '一级菜单', NULL, '', 0, 0, '', 0, 'layui-icon layui-icon layui-icon layui-icon-face-smile', 6, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (592059865673760768, '系统管理', NULL, '', 0, 0, '', 0, 'layui-icon layui-icon-home', 1, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (592067570522128384, '测试跳转', '测试跳转', 'http://www.baidu.com', 1, 589559748521623552, '#', 1, 'fa fa-address-book', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (592167738407911424, '系统监控', '系统监控', '/ServiceController/view', 0, 617766548966211584, 'system:service:view', 1, 'fa fa-video-camera', 7, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (594691026430459904, '电子邮件管理', '电子邮件展示', '/EmailController/view', 0, 592059865673760768, 'system:email:view', 1, 'fa fa-envelope', 8, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (610635485890478080, '代码生成', NULL, '', 0, 0, '', 0, 'layui-icon layui-icon layui-icon layui-icon-praise', 2, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (610635950447394816, '全局配置', '', '/autoCodeController/global', 0, 610635485890478080, 'system:autocode:global', 1, 'fa fa-university', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (617766548966211584, '系统工具', NULL, '', 0, 0, '', 0, 'layui-icon layui-icon layui-icon layui-icon layui-icon layui-icon layui-icon-util', 5, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (618918631769636864, '字典管理', '字典类型表展示', '/DictTypeController/view', 0, 592059865673760768, 'system:dictType:view', 1, 'fa fa-puzzle-piece', 11, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (619836559427895296, '字典数据视图', '字典数据视图', '/DictDataController/view', 0, 618918631769636864, 'system:dictData:view', 2, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3303650266428252171, '公告集合', '公告集合', '/SysNoticeController/list', 0, 330365026642825216, 'gen:sysNotice:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3303650266428252182, '公告添加', '公告添加', '/SysNoticeController/add', 0, 330365026642825216, 'gen:sysNotice:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3303650266428252193, '公告删除', '公告删除', '/SysNoticeController/remove', 0, 330365026642825216, 'gen:sysNotice:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3303650266428252204, '公告修改', '公告修改', '/SysNoticeController/edit', 0, 330365026642825216, 'gen:sysNotice:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3321578609202995211, '定时任务调度表集合', '定时任务调度表集合', '/SysQuartzJobController/list', 0, 332157860920299520, 'gen:sysQuartzJob:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3321578609202995222, '定时任务调度表添加', '定时任务调度表添加', '/SysQuartzJobController/add', 0, 332157860920299520, 'gen:sysQuartzJob:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3321578609202995233, '定时任务调度表删除', '定时任务调度表删除', '/SysQuartzJobController/remove', 0, 332157860920299520, 'gen:sysQuartzJob:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3321578609202995244, '定时任务调度表修改', '定时任务调度表修改', '/SysQuartzJobController/edit', 0, 332157860920299520, 'gen:sysQuartzJob:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3328572814798397451, '定时任务调度日志表集合', '定时任务调度日志表集合', '/SysQuartzJobLogController/list', 0, 332857281479839744, 'gen:sysQuartzJobLog:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3328572814798397473, '定时任务调度日志表删除', '定时任务调度日志表删除', '/SysQuartzJobLogController/remove', 0, 332857281479839744, 'gen:sysQuartzJobLog:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3400681518049566731, '省份表集合', '省份表集合', '/SysProvinceController/list', 0, 340068151804956672, 'gen:sysProvince:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3400681518049566742, '省份表添加', '省份表添加', '/SysProvinceController/add', 0, 340068151804956672, 'gen:sysProvince:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3400681518049566753, '省份表删除', '省份表删除', '/SysProvinceController/remove', 0, 340068151804956672, 'gen:sysProvince:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3400681518049566764, '省份表修改', '省份表修改', '/SysProvinceController/edit', 0, 340068151804956672, 'gen:sysProvince:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3400880220181667851, '城市设置集合', '城市设置集合', '/SysCityController/list', 0, 340088022018166784, 'gen:sysCity:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3400880220181667862, '城市设置添加', '城市设置添加', '/SysCityController/add', 0, 340088022018166784, 'gen:sysCity:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3400880220181667873, '城市设置删除', '城市设置删除', '/SysCityController/remove', 0, 340088022018166784, 'gen:sysCity:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3400880220181667884, '城市设置修改', '城市设置修改', '/SysCityController/edit', 0, 340088022018166784, 'gen:sysCity:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3400961831355064331, '地区设置集合', '地区设置集合', '/SysAreaController/list', 0, 340096183135506432, 'gen:sysArea:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3400961831355064342, '地区设置添加', '地区设置添加', '/SysAreaController/add', 0, 340096183135506432, 'gen:sysArea:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3400961831355064353, '地区设置删除', '地区设置删除', '/SysAreaController/remove', 0, 340096183135506432, 'gen:sysArea:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3400961831355064364, '地区设置修改', '地区设置修改', '/SysAreaController/edit', 0, 340096183135506432, 'gen:sysArea:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3401274122705346571, '街道设置集合', '街道设置集合', '/SysStreetController/list', 0, 340127412270534656, 'gen:sysStreet:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3401274122705346582, '街道设置添加', '街道设置添加', '/SysStreetController/add', 0, 340127412270534656, 'gen:sysStreet:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3401274122705346593, '街道设置删除', '街道设置删除', '/SysStreetController/remove', 0, 340127412270534656, 'gen:sysStreet:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3401274122705346604, '街道设置修改', '街道设置修改', '/SysStreetController/edit', 0, 340127412270534656, 'gen:sysStreet:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3734899074291507211, '拦截url表集合', '拦截url表集合', '/SysInterUrlController/list', 0, 373489907429150720, 'gen:sysInterUrl:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3734899074291507222, '拦截url表添加', '拦截url表添加', '/SysInterUrlController/add', 0, 373489907429150720, 'gen:sysInterUrl:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3734899074291507233, '拦截url表删除', '拦截url表删除', '/SysInterUrlController/remove', 0, 373489907429150720, 'gen:sysInterUrl:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (3734899074291507244, '拦截url表修改', '拦截url表修改', '/SysInterUrlController/edit', 0, 373489907429150720, 'gen:sysInterUrl:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (4107917018594058251, '岗位表集合', '岗位集合', '/SysPositionController/list', 0, 410791701859405824, 'gen:sysPosition:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (4107917018594058262, '岗位表添加', '岗位添加', '/SysPositionController/add', 0, 410791701859405824, 'gen:sysPosition:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (4107917018594058273, '岗位表删除', '岗位删除', '/SysPositionController/remove', 0, 410791701859405824, 'gen:sysPosition:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (4107917018594058284, '岗位表修改', '岗位修改', '/SysPositionController/edit', 0, 410791701859405824, 'gen:sysPosition:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (4109898056992071691, '部门集合', '部门集合', '/SysDepartmentController/list', 0, 410989805699207168, 'gen:sysDepartment:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (4109898056992071702, '部门添加', '部门添加', '/SysDepartmentController/add', 0, 410989805699207168, 'gen:sysDepartment:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (4109898056992071713, '部门删除', '部门删除', '/SysDepartmentController/remove', 0, 410989805699207168, 'gen:sysDepartment:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (4109898056992071724, '部门修改', '部门修改', '/SysDepartmentController/edit', 0, 410989805699207168, 'gen:sysDepartment:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (5946910264304599041, '电子邮件集合', '电子邮件集合', '/EmailController/list', 0, 594691026430459904, 'system:email:list', 2, '', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (5946910264304599042, '电子邮件添加', '电子邮件添加', '/EmailController/add', 0, 594691026430459904, 'system:email:add', 2, 'entypo-plus-squared', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (5946910264304599043, '电子邮件删除', '电子邮件删除', '/EmailController/remove', 0, 594691026430459904, 'system:email:remove', 2, 'entypo-trash', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (5946910264304599044, '电子邮件修改', '电子邮件修改', '/EmailController/edit', 0, 594691026430459904, 'system:email:edit', 2, 'fa fa-wrench', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (6189186317738311681, '字典类型表集合', '字典类型表集合', '/DictTypeController/list', 0, 618918631769636864, 'system:dictType:list', 2, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (6189186317948026882, '字典类型表添加', '字典类型表添加', '/DictTypeController/add', 0, 618918631769636864, 'system:dictType:add', 2, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (6189186317948026883, '字典类型表删除', '字典类型表删除', '/DictTypeController/remove', 0, 618918631769636864, 'system:dictType:remove', 2, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (6189186317989969924, '字典类型表修改', '字典类型表修改', '/DictTypeController/edit', 0, 618918631769636864, 'system:dictType:edit', 2, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (6192095214866268161, '字典数据表集合', '字典数据表集合', '/DictDataController/list', 0, 618918631769636864, 'system:dictData:list', 2, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (6192095214866268162, '字典数据表添加', '字典数据表添加', '/DictDataController/add', 0, 618918631769636864, 'system:dictData:add', 2, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (6192095215075983363, '字典数据表删除', '字典数据表删除', '/DictDataController/remove', 0, 618918631769636864, 'system:dictData:remove', 2, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission` VALUES (6192095215075983364, '字典数据表修改', '字典数据表修改', '/DictDataController/edit', 0, 618918631769636864, 'system:dictData:edit', 2, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_permission_role -- ---------------------------- DROP TABLE IF EXISTS `t_sys_permission_role`; CREATE TABLE `t_sys_permission_role` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, - `role_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色id', - `permission_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '权限id', + `id` bigint(30) NOT NULL COMMENT '主键', + `role_id` bigint(30) NULL DEFAULT NULL COMMENT '角色id', + `permission_id` bigint(30) NULL DEFAULT NULL COMMENT '权限id', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色权限中间表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_permission_role -- ---------------------------- -INSERT INTO `t_sys_permission_role` VALUES ('01fe56ea-22cb-4596-83bb-061af5b13c42', '488243256161730560', '496127794879660032'); -INSERT INTO `t_sys_permission_role` VALUES ('0200d819-80e4-45fd-8240-bb8bb3c9c358', '488243256161730560', '619836559427895296'); -INSERT INTO `t_sys_permission_role` VALUES ('042588ac-72b3-4ccd-98b9-99e8097d747e', '488243256161730560', '610635950447394816'); -INSERT INTO `t_sys_permission_role` VALUES ('05d28e26-04dc-4ffb-943a-a48203d841ec', '488243256161730560', '3734899074291507244'); -INSERT INTO `t_sys_permission_role` VALUES ('063ceacd-2fbd-4f29-a8f6-d929037c11d0', '488243256161730560', '3400880220181667862'); -INSERT INTO `t_sys_permission_role` VALUES ('0b77727f-d792-4927-8e26-b57588db058b', '488243256161730560', '3303650266428252204'); -INSERT INTO `t_sys_permission_role` VALUES ('0cad423c-c836-4d30-b02b-ffe426fd1e2d', '488243256161730560', '410791701859405824'); -INSERT INTO `t_sys_permission_role` VALUES ('0e0b9dae-a60f-4cb1-a3bf-c7ea5b9f8b1c', '488243256161730560', '589559748521623552'); -INSERT INTO `t_sys_permission_role` VALUES ('13186be6-96dc-4848-acef-43a87dc4f36d', '488243256161730560', '3401274122705346571'); -INSERT INTO `t_sys_permission_role` VALUES ('1386562e-830a-4d5f-914e-980f3a9f47f4', '488243256161730560', '18'); -INSERT INTO `t_sys_permission_role` VALUES ('1531d751-d2fb-4379-b700-87b47d1e4e1d', '488243256161730560', '3400681518049566742'); -INSERT INTO `t_sys_permission_role` VALUES ('174b0472-9e11-44c8-8f1b-997c55d08b62', '488243256161730560', '15'); -INSERT INTO `t_sys_permission_role` VALUES ('189d727b-5fff-4903-8980-5e796ce04061', '488243256161730560', '10'); -INSERT INTO `t_sys_permission_role` VALUES ('1d9325bc-13a1-4b8b-90dc-16c0c1613585', '488243256161730560', '4107917018594058284'); -INSERT INTO `t_sys_permission_role` VALUES ('217b5bae-a54d-4e77-b0e1-2ae6624b6b7b', '488243256161730560', '592059865673760768'); -INSERT INTO `t_sys_permission_role` VALUES ('2ddcfb2c-5157-41d0-97cd-f747ed6da07c', '488243256161730560', '23'); -INSERT INTO `t_sys_permission_role` VALUES ('30c6ab74-5154-4370-a77f-fb651db86432', '488243256161730560', '3400880220181667873'); -INSERT INTO `t_sys_permission_role` VALUES ('31cf42c7-2ffa-498a-85a0-ff5e1dc2c732', '488243256161730560', '496126970468237312'); -INSERT INTO `t_sys_permission_role` VALUES ('342dc223-f714-42df-adf9-7a5a0a1d2f60', '488243256161730560', '332157860920299520'); -INSERT INTO `t_sys_permission_role` VALUES ('350dc609-fced-404b-b10f-f0291068b36a', '488243256161730560', '4'); -INSERT INTO `t_sys_permission_role` VALUES ('374e76c4-f3ce-4ff1-8ed0-750bbfbbce5c', '488243256161730560', '617766548966211584'); -INSERT INTO `t_sys_permission_role` VALUES ('39bb74e4-b62f-4cb8-bf5c-ffb44a97bb87', '488243256161730560', '3400681518049566731'); -INSERT INTO `t_sys_permission_role` VALUES ('3c26f2be-ae37-4d53-97ac-323efd57b888', '488243256161730560', '4109898056992071724'); -INSERT INTO `t_sys_permission_role` VALUES ('3dcd50c6-9540-4d5d-88ba-53a2a5e43ead', '488243256161730560', '5946910264304599044'); -INSERT INTO `t_sys_permission_role` VALUES ('3f82e33f-ad1b-4c1a-9751-1f6a75a5abbe', '488243256161730560', '340096183135506432'); -INSERT INTO `t_sys_permission_role` VALUES ('41f8a587-66ce-434b-84d4-5b7e08381081', '488243256161730560', '592067570522128384'); -INSERT INTO `t_sys_permission_role` VALUES ('4361248c-f7cf-4475-96d8-4dcc7257bb74', '488243256161730560', '581541547099553792'); -INSERT INTO `t_sys_permission_role` VALUES ('43fdb52f-51d6-4ddb-9dac-67552df5dba1', '488243256161730560', '5946910264304599042'); -INSERT INTO `t_sys_permission_role` VALUES ('48c20e70-6492-4f46-be9b-cad6e440a807', '488243256161730560', '3734899074291507211'); -INSERT INTO `t_sys_permission_role` VALUES ('4a344779-c6a0-4472-b733-b763bffa6c04', '488243256161730560', '587453033487532032'); -INSERT INTO `t_sys_permission_role` VALUES ('4a9d9d69-6747-4e2b-8434-5c104788661a', '488243256161730560', '5'); -INSERT INTO `t_sys_permission_role` VALUES ('4fb570b8-330f-49d3-ab18-1a5e6f069d89', '488243256161730560', '3321578609202995244'); -INSERT INTO `t_sys_permission_role` VALUES ('52148df8-5a6e-4326-94ae-edbea445b410', '488243256161730560', '19'); -INSERT INTO `t_sys_permission_role` VALUES ('55ad86df-e358-4b23-a1ce-bbcecf136dc9', '488243256161730560', '610635485890478080'); -INSERT INTO `t_sys_permission_role` VALUES ('57b3bd8b-e182-4e53-bf04-036cfc6cc437', '488243256161730560', '340381240911859712'); -INSERT INTO `t_sys_permission_role` VALUES ('57ff846a-f7b5-47aa-a7f5-c00d8154824e', '488243256161730560', '496127240363311104'); -INSERT INTO `t_sys_permission_role` VALUES ('5801d9e4-b4e8-4cef-b6bc-e6c7faa301d0', '488243256161730560', '3734899074291507233'); -INSERT INTO `t_sys_permission_role` VALUES ('5b4a6931-dd42-4b1e-b7c8-8a5af1149fce', '488243256161730560', '7'); -INSERT INTO `t_sys_permission_role` VALUES ('5d7283db-48a2-46c8-b821-957276c1a505', '488243256161730560', '12'); -INSERT INTO `t_sys_permission_role` VALUES ('617dc731-1724-4448-8c41-40e4a3d22997', '488243256161730560', '4109898056992071713'); -INSERT INTO `t_sys_permission_role` VALUES ('688bbfef-2ffa-46c7-bfb4-e46650eeb991', '488243256161730560', '594691026430459904'); -INSERT INTO `t_sys_permission_role` VALUES ('69af7da5-b37a-48d2-9040-734e6dc1e431', '488243256161730560', '5946910264304599043'); -INSERT INTO `t_sys_permission_role` VALUES ('6e7b9204-2465-46e0-89a1-cb185476a4e0', '488243256161730560', '332857281479839744'); -INSERT INTO `t_sys_permission_role` VALUES ('711e404e-e4c8-4bbd-8e9f-c15f692ef47e', '488243256161730560', '4109898056992071702'); -INSERT INTO `t_sys_permission_role` VALUES ('71639639-8f63-4b46-bade-e0e493c037b6', '488243256161730560', '6192095215075983364'); -INSERT INTO `t_sys_permission_role` VALUES ('755531bb-cfe2-4bd3-847c-742386b9f63e', '488243256161730560', '13'); -INSERT INTO `t_sys_permission_role` VALUES ('79793511-a80d-4f66-852f-9ff0f1e0aed8', '488243256161730560', '3400681518049566753'); -INSERT INTO `t_sys_permission_role` VALUES ('7ae45ff8-c0b5-4116-9f9f-d4a7e72edecb', '488243256161730560', '6192095214866268162'); -INSERT INTO `t_sys_permission_role` VALUES ('7d63f4f1-eff7-43e2-bcc1-3bf4030ff81e', '488243256161730560', '20'); -INSERT INTO `t_sys_permission_role` VALUES ('7e86ccb1-273e-4e31-bd44-0475fefe3053', '488243256161730560', '411522822607867904'); -INSERT INTO `t_sys_permission_role` VALUES ('80f5ecd2-93c6-4534-b182-5d5c5b5699ca', '488243256161730560', '373489907429150720'); -INSERT INTO `t_sys_permission_role` VALUES ('867562ec-2283-4cf8-b52d-bc3647796e63', '488243256161730560', '14'); -INSERT INTO `t_sys_permission_role` VALUES ('892899c8-e0b2-4fcd-af1f-320a9c4d9c4d', '488243256161730560', '335330315113467904'); -INSERT INTO `t_sys_permission_role` VALUES ('8cc91f61-6ed6-4b42-887f-7e5f1a436e71', '488243256161730560', '6189186317948026883'); -INSERT INTO `t_sys_permission_role` VALUES ('8d8f4202-68ac-481b-bbce-70b7a1377a18', '488243256161730560', '16'); -INSERT INTO `t_sys_permission_role` VALUES ('8e814dae-3d35-4920-a988-b060b755b2ae', '488243256161730560', '8'); -INSERT INTO `t_sys_permission_role` VALUES ('8f3bd5a7-a723-45f4-9764-6b2b33a9ef26', '488243256161730560', '3303650266428252182'); -INSERT INTO `t_sys_permission_role` VALUES ('92f1874b-64ab-4464-b4c2-79e2d6e48996', '488243256161730560', '21'); -INSERT INTO `t_sys_permission_role` VALUES ('9ab8ff7d-ced8-4653-8ae9-9d2d1798e87e', '488243256161730560', '583063272123531264'); -INSERT INTO `t_sys_permission_role` VALUES ('9ce696bf-62f8-4a96-ab71-1d18acc6a0c1', '488243256161730560', '3401274122705346593'); -INSERT INTO `t_sys_permission_role` VALUES ('a170786f-9814-4879-9789-2e99d6692294', '488243256161730560', '3400961831355064331'); -INSERT INTO `t_sys_permission_role` VALUES ('a3bc35ba-74b9-4ab0-84ff-7679382637ab', '488243256161730560', '3303650266428252171'); -INSERT INTO `t_sys_permission_role` VALUES ('a403c0f1-bcc3-4824-a981-1f68409f3216', '488243256161730560', '340301160042860544'); -INSERT INTO `t_sys_permission_role` VALUES ('aa7d7291-2b78-44a2-8f3a-aef0138cd159', '488243256161730560', '17'); -INSERT INTO `t_sys_permission_role` VALUES ('ae34cbe4-a990-420b-8116-aa4c9a2dcd38', '488243256161730560', '3321578609202995233'); -INSERT INTO `t_sys_permission_role` VALUES ('ae9f52b2-4680-4382-93dc-16a357d7e968', '488243256161730560', '3400681518049566764'); -INSERT INTO `t_sys_permission_role` VALUES ('b0637cbe-4d08-4abb-928a-15333945c163', '488243256161730560', '3328572814798397451'); -INSERT INTO `t_sys_permission_role` VALUES ('b1f30928-f4f2-4dc4-8192-e3e2edb043ee', '488243256161730560', '586003694080753664'); -INSERT INTO `t_sys_permission_role` VALUES ('b2eee05b-e6b9-4348-abab-1924aa10c975', '488243256161730560', '9'); -INSERT INTO `t_sys_permission_role` VALUES ('b35d8119-0c0f-41f7-8ffe-335d3e28f803', '488243256161730560', '4107917018594058262'); -INSERT INTO `t_sys_permission_role` VALUES ('b370966f-5152-47ae-a2ee-064fc879a841', '488243256161730560', '3401274122705346604'); -INSERT INTO `t_sys_permission_role` VALUES ('b6beab0f-2f35-4346-98c0-49966f02203e', '488243256161730560', '6192095215075983363'); -INSERT INTO `t_sys_permission_role` VALUES ('ba73bdec-3e61-4dad-a7e7-afe3c8a401d4', '488243256161730560', '3328572814798397473'); -INSERT INTO `t_sys_permission_role` VALUES ('bab2e069-cad0-46eb-9b67-3df7ecac9d07', '488243256161730560', '3400880220181667851'); -INSERT INTO `t_sys_permission_role` VALUES ('bd6e654e-9f2e-42d8-9d9f-4640267611b0', '488243256161730560', '486690002869157888'); -INSERT INTO `t_sys_permission_role` VALUES ('be2b7eaf-b644-42e9-a432-b12b95ca9a0e', '488243256161730560', '3400880220181667884'); -INSERT INTO `t_sys_permission_role` VALUES ('c17b86b2-0c9a-461d-9fad-31b46e558f29', '488243256161730560', '330365026642825216'); -INSERT INTO `t_sys_permission_role` VALUES ('c1e66043-2c55-449f-8fba-ed39cf24f6eb', '488243256161730560', '4107917018594058251'); -INSERT INTO `t_sys_permission_role` VALUES ('c1f093fb-3823-46e5-af7f-1a035242a0a6', '488243256161730560', '5946910264304599041'); -INSERT INTO `t_sys_permission_role` VALUES ('c4b019a2-5c40-4c1d-81d7-83ac1cb072bb', '488243256161730560', '340068151804956672'); -INSERT INTO `t_sys_permission_role` VALUES ('cf0b0276-8fd4-451f-8a50-8a59786b6ca0', '488243256161730560', '6'); -INSERT INTO `t_sys_permission_role` VALUES ('cf8b3988-2ed3-4aa6-a975-972ae22665fd', '488243256161730560', '6189186317738311681'); -INSERT INTO `t_sys_permission_role` VALUES ('d22853ec-e1e7-478d-b7df-866d64ef1f1d', '488243256161730560', '4107917018594058273'); -INSERT INTO `t_sys_permission_role` VALUES ('d9a3291a-8090-4a44-beb7-f2cedde1149a', '488243256161730560', '22'); -INSERT INTO `t_sys_permission_role` VALUES ('da28049d-e25d-4cdf-aff9-6491603ea922', '488243256161730560', '331778807298134016'); -INSERT INTO `t_sys_permission_role` VALUES ('da39f530-0b0f-4469-b061-eda8bde199ba', '488243256161730560', '340067579836108800'); -INSERT INTO `t_sys_permission_role` VALUES ('dbefb52b-3d04-4cd9-aece-3896308173c1', '488243256161730560', '6189186317989969924'); -INSERT INTO `t_sys_permission_role` VALUES ('dc55ecaa-665a-4a24-824d-0b30e11e5556', '488243256161730560', '6192095214866268161'); -INSERT INTO `t_sys_permission_role` VALUES ('dceaaee8-6396-4f54-992a-367000518669', '488243256161730560', '3400961831355064364'); -INSERT INTO `t_sys_permission_role` VALUES ('deb56b6a-0f1a-4134-8b6c-89c033660272', '488243256161730560', '11'); -INSERT INTO `t_sys_permission_role` VALUES ('df16649c-8476-41f3-bba8-f358c0efd99c', '488243256161730560', '3400961831355064353'); -INSERT INTO `t_sys_permission_role` VALUES ('dfc52b1f-0a30-4bb2-a653-96a02275b1cc', '488243256161730560', '4109898056992071691'); -INSERT INTO `t_sys_permission_role` VALUES ('e14b1f89-5bd2-415d-9a0c-ee54f5b27b1b', '488243256161730560', '340088022018166784'); -INSERT INTO `t_sys_permission_role` VALUES ('e58abb00-ffba-4fe5-b35e-041fbc50fde8', '488243256161730560', '6189186317948026882'); -INSERT INTO `t_sys_permission_role` VALUES ('e87edf20-9d3e-4982-8378-04a407f6553e', '488243256161730560', '3303650266428252193'); -INSERT INTO `t_sys_permission_role` VALUES ('ebd5c520-bcce-47e6-aaaa-ba45c76f0dab', '488243256161730560', '3734899074291507222'); -INSERT INTO `t_sys_permission_role` VALUES ('ebf972aa-af98-4ec9-8d0f-43f4665a8717', '488243256161730560', '3401274122705346582'); -INSERT INTO `t_sys_permission_role` VALUES ('ecf59fe8-bbda-41e9-a54d-5c48e68a4638', '488243256161730560', '3321578609202995211'); -INSERT INTO `t_sys_permission_role` VALUES ('f3410fa8-ef46-49c7-946c-0e546f3bc528', '488243256161730560', '592167738407911424'); -INSERT INTO `t_sys_permission_role` VALUES ('f3d3088d-1d08-4b77-b64d-099aed16f4e0', '488243256161730560', '410989805699207168'); -INSERT INTO `t_sys_permission_role` VALUES ('f56c0f89-f16c-4de4-b1e4-9a8197ffd201', '488243256161730560', '3321578609202995222'); -INSERT INTO `t_sys_permission_role` VALUES ('f7bea38d-7a42-4e0f-b7cf-460691630271', '488243256161730560', '340127412270534656'); -INSERT INTO `t_sys_permission_role` VALUES ('fa039826-5c71-4fff-89f0-bb9a1aa0d354', '488243256161730560', '618918631769636864'); -INSERT INTO `t_sys_permission_role` VALUES ('ff6c8942-b14f-4730-af7c-9756bb999031', '488243256161730560', '3400961831355064342'); +INSERT INTO `t_sys_permission_role` VALUES (1, 488243256161730560, 496127794879660032, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (2, 488243256161730560, 619836559427895296, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (3, 488243256161730560, 610635950447394816, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (4, 488243256161730560, 3734899074291507244, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (5, 488243256161730560, 3400880220181667862, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (6, 488243256161730560, 3303650266428252204, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (7, 488243256161730560, 410791701859405824, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (8, 488243256161730560, 589559748521623552, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (9, 488243256161730560, 3401274122705346571, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (10, 488243256161730560, 18, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (11, 488243256161730560, 3400681518049566742, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (12, 488243256161730560, 15, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (13, 488243256161730560, 10, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (14, 488243256161730560, 4107917018594058284, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (15, 488243256161730560, 592059865673760768, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (16, 488243256161730560, 23, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (17, 488243256161730560, 3400880220181667873, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (18, 488243256161730560, 496126970468237312, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (19, 488243256161730560, 332157860920299520, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (20, 488243256161730560, 4, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (21, 488243256161730560, 617766548966211584, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (22, 488243256161730560, 3400681518049566731, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (23, 488243256161730560, 4109898056992071724, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (24, 488243256161730560, 5946910264304599044, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (25, 488243256161730560, 340096183135506432, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (26, 488243256161730560, 592067570522128384, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (27, 488243256161730560, 581541547099553792, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (28, 488243256161730560, 5946910264304599042, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (29, 488243256161730560, 3734899074291507211, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (30, 488243256161730560, 587453033487532032, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (31, 488243256161730560, 5, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (32, 488243256161730560, 3321578609202995244, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (33, 488243256161730560, 19, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (34, 488243256161730560, 610635485890478080, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (35, 488243256161730560, 340381240911859712, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (36, 488243256161730560, 496127240363311104, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (37, 488243256161730560, 3734899074291507233, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (38, 488243256161730560, 7, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (39, 488243256161730560, 12, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (40, 488243256161730560, 4109898056992071713, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (41, 488243256161730560, 594691026430459904, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (42, 488243256161730560, 5946910264304599043, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (43, 488243256161730560, 332857281479839744, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (44, 488243256161730560, 4109898056992071702, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (45, 488243256161730560, 6192095215075983364, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (46, 488243256161730560, 13, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (47, 488243256161730560, 3400681518049566753, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (48, 488243256161730560, 6192095214866268162, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (49, 488243256161730560, 20, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (50, 488243256161730560, 411522822607867904, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (51, 488243256161730560, 373489907429150720, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (52, 488243256161730560, 14, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (53, 488243256161730560, 335330315113467904, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (54, 488243256161730560, 6189186317948026883, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (55, 488243256161730560, 16, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (56, 488243256161730560, 8, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (57, 488243256161730560, 3303650266428252182, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (58, 488243256161730560, 21, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (59, 488243256161730560, 583063272123531264, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (60, 488243256161730560, 3401274122705346593, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (61, 488243256161730560, 3400961831355064331, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (62, 488243256161730560, 3303650266428252171, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (63, 488243256161730560, 340301160042860544, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (64, 488243256161730560, 17, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (65, 488243256161730560, 3321578609202995233, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (66, 488243256161730560, 3400681518049566764, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (67, 488243256161730560, 3328572814798397451, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (68, 488243256161730560, 586003694080753664, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (69, 488243256161730560, 9, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (70, 488243256161730560, 4107917018594058262, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (71, 488243256161730560, 3401274122705346604, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (72, 488243256161730560, 6192095215075983363, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (73, 488243256161730560, 3328572814798397473, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (74, 488243256161730560, 3400880220181667851, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (75, 488243256161730560, 486690002869157888, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (76, 488243256161730560, 3400880220181667884, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (77, 488243256161730560, 330365026642825216, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (78, 488243256161730560, 4107917018594058251, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (79, 488243256161730560, 5946910264304599041, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (80, 488243256161730560, 340068151804956672, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (81, 488243256161730560, 6, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (82, 488243256161730560, 6189186317738311681, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (83, 488243256161730560, 4107917018594058273, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (84, 488243256161730560, 22, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (85, 488243256161730560, 331778807298134016, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (86, 488243256161730560, 340067579836108800, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (87, 488243256161730560, 6189186317989969924, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (88, 488243256161730560, 6192095214866268161, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (89, 488243256161730560, 3400961831355064364, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (90, 488243256161730560, 11, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (91, 488243256161730560, 3400961831355064353, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (92, 488243256161730560, 4109898056992071691, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (93, 488243256161730560, 340088022018166784, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (94, 488243256161730560, 6189186317948026882, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (95, 488243256161730560, 3303650266428252193, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (96, 488243256161730560, 3734899074291507222, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (97, 488243256161730560, 3401274122705346582, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (98, 488243256161730560, 3321578609202995211, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (99, 488243256161730560, 592167738407911424, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (100, 488243256161730560, 410989805699207168, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (101, 488243256161730560, 3321578609202995222, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (102, 488243256161730560, 340127412270534656, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (103, 488243256161730560, 618918631769636864, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_permission_role` VALUES (104, 488243256161730560, 3400961831355064342, NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_position -- ---------------------------- DROP TABLE IF EXISTS `t_sys_position`; CREATE TABLE `t_sys_position` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键', + `id` bigint(30) NOT NULL COMMENT '主键', `post_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '岗位名称', `order_num` int(11) NULL DEFAULT NULL COMMENT '排序', `status` int(11) NULL DEFAULT NULL COMMENT '状态', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '岗位表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_position -- ---------------------------- -INSERT INTO `t_sys_position` VALUES ('410792368778907648', '总经理', 1, 1); -INSERT INTO `t_sys_position` VALUES ('410792443127140352', '技术经理', 2, 1); -INSERT INTO `t_sys_position` VALUES ('410792478929719296', '人事经理', 3, 1); -INSERT INTO `t_sys_position` VALUES ('411477874382606336', '员工', 4, 1); +INSERT INTO `t_sys_position` VALUES (410792368778907648, '总经理', 1, 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_position` VALUES (410792443127140352, '技术经理', 2, 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_position` VALUES (410792478929719296, '人事经理', 3, 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_position` VALUES (411477874382606336, '员工', 4, 1, NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_province @@ -1008,40 +1033,50 @@ INSERT INTO `t_sys_quartz_job_log` VALUES (503236547471085568, 'v2Task2', 'SYSTE -- ---------------------------- DROP TABLE IF EXISTS `t_sys_role`; CREATE TABLE `t_sys_role` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'id', + `id` bigint(30) NOT NULL COMMENT '主键', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色名称', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_role -- ---------------------------- -INSERT INTO `t_sys_role` VALUES ('488243256161730560', '管理员'); -INSERT INTO `t_sys_role` VALUES ('488289006124007424', '用户'); -INSERT INTO `t_sys_role` VALUES ('488305788310257664', '能修改用户密码角色'); +INSERT INTO `t_sys_role` VALUES (488243256161730560, '管理员', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_role` VALUES (488289006124007424, '用户', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_role` VALUES (488305788310257664, '能修改用户密码角色', NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_role_user -- ---------------------------- DROP TABLE IF EXISTS `t_sys_role_user`; CREATE TABLE `t_sys_role_user` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, - `sys_user_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户id', - `sys_role_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色id', + `id` bigint(30) NOT NULL COMMENT '主键', + `sys_user_id` bigint(30) NULL DEFAULT NULL COMMENT '用户id', + `sys_role_id` bigint(30) NULL DEFAULT NULL COMMENT '角色id', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户角色中间表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_role_user -- ---------------------------- -INSERT INTO `t_sys_role_user` VALUES ('353711021275353089', '353711021275353088', '488289006124007424'); -INSERT INTO `t_sys_role_user` VALUES ('353714370687143936', '488294747442511872', '488289006124007424'); -INSERT INTO `t_sys_role_user` VALUES ('354984037766533120', '354984005751410688', '488243256161730560'); -INSERT INTO `t_sys_role_user` VALUES ('354988722443390977', '354988722443390976', '488243256161730560'); -INSERT INTO `t_sys_role_user` VALUES ('354989789679849472', '354989789675655168', '488305788310257664'); -INSERT INTO `t_sys_role_user` VALUES ('495571139645542400', '1', '488243256161730560'); -INSERT INTO `t_sys_role_user` VALUES ('612107905532952576', '612107905532952576', '488289006124007424'); -INSERT INTO `t_sys_role_user` VALUES ('612107905537146880', '612107905532952576', '488305788310257664'); +INSERT INTO `t_sys_role_user` VALUES (353711021275353089, 353711021275353088, 488289006124007424, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_role_user` VALUES (353714370687143936, 488294747442511872, 488289006124007424, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_role_user` VALUES (354984037766533120, 354984005751410688, 488243256161730560, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_role_user` VALUES (354988722443390977, 354988722443390976, 488243256161730560, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_role_user` VALUES (354989789679849472, 354989789675655168, 488305788310257664, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_role_user` VALUES (495571139645542400, 1, 488243256161730560, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_role_user` VALUES (612107905532952576, 612107905532952576, 488289006124007424, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_role_user` VALUES (612107905537146880, 612107905532952576, 488305788310257664, NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_sys_street @@ -1075,20 +1110,25 @@ CREATE TABLE `t_sys_street` ( -- ---------------------------- DROP TABLE IF EXISTS `t_sys_user`; CREATE TABLE `t_sys_user` ( - `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '主键', + `id` bigint(30) NOT NULL COMMENT '主键', `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户账号', `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户密码', `nickname` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '昵称', `dep_id` int(11) NULL DEFAULT NULL COMMENT '部门id', - `pos_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '岗位id', + `pos_id` bigint(30) NULL DEFAULT NULL COMMENT '岗位id', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '用户表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of t_sys_user -- ---------------------------- -INSERT INTO `t_sys_user` VALUES ('1', 'admin', '21232f297a57a5a743894a0e4a801fc3', '管理员', 2, '410792368778907648'); -INSERT INTO `t_sys_user` VALUES ('433236479427350528', 'fuce', '21232f297a57a5a743894a0e4a801fc3', '付册', 2, '410792443127140352'); +INSERT INTO `t_sys_user` VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '管理员', 2, 410792368778907648, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_sys_user` VALUES (433236479427350528, 'fuce', '21232f297a57a5a743894a0e4a801fc3', '付册', 2, 410792443127140352, NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_test diff --git a/src/main/java/com/fc/v2/common/base/BaseController.java b/src/main/java/com/fc/v2/common/base/BaseController.java index a330aca..d6b492e 100644 --- a/src/main/java/com/fc/v2/common/base/BaseController.java +++ b/src/main/java/com/fc/v2/common/base/BaseController.java @@ -26,15 +26,15 @@ public class BaseController { //系统用户 @Autowired - public SysUserService sysUserService; + public ITSysUserService sysUserService; //系统角色 @Autowired - public SysRoleService sysRoleService; + public ITSysRoleService sysRoleService; //权限 @Autowired - public SysPermissionService sysPermissionService; + public ITSysPermissionService sysPermissionService; //日志操作 @Autowired diff --git a/src/main/java/com/fc/v2/common/base/BaseService.java b/src/main/java/com/fc/v2/common/base/BaseService.java deleted file mode 100644 index 7f916d2..0000000 --- a/src/main/java/com/fc/v2/common/base/BaseService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.fc.v2.common.base; - -import java.util.List; - -import com.baomidou.mybatisplus.extension.service.IService; -import org.apache.ibatis.annotations.Param; -/** - * 抽象类BaseService -* @ClassName: BaseService -* @Description: Service实现这个 -* @author fuce -* @date 2018年6月3日 -* - */ -public interface BaseService extends IService { - - int deleteByPrimaryKey(String id); - - int insertSelective(T record); - - T selectByPrimaryKey(String id); - - int updateByPrimaryKeySelective(T record); - - int updateByExampleSelective(@Param("record") T record, @Param("example") T2 example); - - int updateByExample(@Param("record") T record, @Param("example") T2 example); - - List selectByExample(T2 example); - - long countByExample(T2 example); - - int deleteByExample(T2 example); - -} diff --git a/src/main/java/com/fc/v2/common/conf/oss/OssEndpoint.java b/src/main/java/com/fc/v2/common/conf/oss/OssEndpoint.java index 31eb565..ae23dee 100644 --- a/src/main/java/com/fc/v2/common/conf/oss/OssEndpoint.java +++ b/src/main/java/com/fc/v2/common/conf/oss/OssEndpoint.java @@ -7,7 +7,7 @@ import com.amazonaws.services.s3.model.S3Object; import com.amazonaws.services.s3.model.S3ObjectSummary; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.model.auto.TSysFile; -import com.fc.v2.model.auto.TsysUser; +import com.fc.v2.model.auto.TSysUser; import com.fc.v2.service.ITSysFileService; import com.fc.v2.shiro.util.ShiroUtils; import com.fc.v2.util.SnowflakeIdWorker; @@ -105,7 +105,7 @@ public class OssEndpoint { String fileSuffixName = uuid + suffixName; PutObjectResult putObjectResult = template.putObject(bucketName, fileSuffixName, object.getInputStream(), object.getSize(), object.getContentType()); if (putObjectResult != null) { - TsysUser tsysUser = ShiroUtils.getUser(); + TSysUser tsysUser = ShiroUtils.getUser(); TSysFile sysFile = null; if (tsysUser != null) { sysFile = new TSysFile(fileSuffixName, bucketName, object.getSize(), object.getContentType()); @@ -241,7 +241,7 @@ public class OssEndpoint { String fileSuffixName = uuid + suffixName; PutObjectResult putObjectResult = template.putObject(bucketName, fileSuffixName, file.getInputStream(), file.getSize(), file.getContentType()); if (putObjectResult != null) { - TsysUser tsysUser = ShiroUtils.getUser(); + TSysUser tsysUser = ShiroUtils.getUser(); TSysFile sysFile = null; if (tsysUser != null) { sysFile = new TSysFile(fileSuffixName, bucketName, file.getSize(), file.getContentType()); diff --git a/src/main/java/com/fc/v2/common/interceptor/MyInterceptor.java b/src/main/java/com/fc/v2/common/interceptor/MyInterceptor.java index ba2101b..2a65ede 100644 --- a/src/main/java/com/fc/v2/common/interceptor/MyInterceptor.java +++ b/src/main/java/com/fc/v2/common/interceptor/MyInterceptor.java @@ -1,12 +1,12 @@ package com.fc.v2.common.interceptor; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.conf.V2Config; import com.fc.v2.common.exception.demo.DemoModeException; import com.fc.v2.common.spring.SpringUtils; -import com.fc.v2.model.auto.SysInterUrl; -import com.fc.v2.model.auto.SysInterUrlExample; -import com.fc.v2.service.SysInterUrlService; +import com.fc.v2.model.auto.TSysInterUrl; +import com.fc.v2.service.ITSysInterUrlService; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; @@ -21,17 +21,16 @@ import java.util.List; public class MyInterceptor implements HandlerInterceptor { /*************演示模式需要 start*************/ /**需要被拦截的post请求url**/ - public static List posturllist=new ArrayList(); + public static List posturllist=new ArrayList(); /**注入拦截器表的service**/ - public static SysInterUrlService interUrlService= SpringUtils.getBean(SysInterUrlService.class); + public static ITSysInterUrlService interUrlService= SpringUtils.getBean(ITSysInterUrlService.class); /** * 初始化静态块，避免多次创建调用 * 需要拦截的请求集合 */ static { //post - SysInterUrlExample example_post= new SysInterUrlExample(); - posturllist=interUrlService.selectByExample(example_post); + posturllist=interUrlService.selectTSysInterUrlList(new QueryWrapper()); // //用户POST请求 // posturllist.add("/UserController/add"); @@ -147,7 +146,7 @@ public class MyInterceptor implements HandlerInterceptor { public Boolean ifurl(HttpServletRequest request, HttpServletResponse response) { //当前请求 String requesturl=request.getRequestURI(); - for (SysInterUrl sysInterUrl : posturllist) { + for (TSysInterUrl sysInterUrl : posturllist) { if(StrUtil.containsAnyIgnoreCase(requesturl, sysInterUrl.getUrl())) { return true; } diff --git a/src/main/java/com/fc/v2/common/log/LogAspect.java b/src/main/java/com/fc/v2/common/log/LogAspect.java index 3c006ec..4b0c86f 100644 --- a/src/main/java/com/fc/v2/common/log/LogAspect.java +++ b/src/main/java/com/fc/v2/common/log/LogAspect.java @@ -1,7 +1,7 @@ package com.fc.v2.common.log; import com.fc.v2.model.auto.TSysOperLog; -import com.fc.v2.model.auto.TsysUser; +import com.fc.v2.model.auto.TSysUser; import com.fc.v2.service.ITSysOperLogService; import com.fc.v2.shiro.util.ShiroUtils; import com.fc.v2.util.ServletUtils; @@ -82,7 +82,7 @@ public class LogAspect } // 获取当前的用户 - TsysUser currentUser = ShiroUtils.getUser(); + TSysUser currentUser = ShiroUtils.getUser(); // *========数据库日志=========*// TSysOperLog operLog = new TSysOperLog(); diff --git a/src/main/java/com/fc/v2/common/quartz/task/V2Task.java b/src/main/java/com/fc/v2/common/quartz/task/V2Task.java index 081f5b6..caf5002 100644 --- a/src/main/java/com/fc/v2/common/quartz/task/V2Task.java +++ b/src/main/java/com/fc/v2/common/quartz/task/V2Task.java @@ -1,8 +1,8 @@ package com.fc.v2.common.quartz.task; import cn.hutool.core.date.DateUtil; -import com.fc.v2.mapper.auto.TsysUserMapper; -import com.fc.v2.model.auto.TsysUser; -import com.fc.v2.model.auto.TsysUserExample; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.fc.v2.model.auto.TSysUser; +import com.fc.v2.service.ITSysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -17,8 +17,9 @@ import java.util.List; */ @Component("v2Task") public class V2Task { + @Autowired - private TsysUserMapper tsysUserMapper; + private ITSysUserService userService; /** * 无参的任务 */ @@ -35,7 +36,7 @@ public class V2Task { */ public void runTask2(Integer a,Long b,String c,Boolean d,Double e) { - List list= tsysUserMapper.selectByExample(new TsysUserExample()); + List list= userService.selectTSysUserList(new QueryWrapper()); System.err.println("用户查询num："+list.size()); System.out.println("正在执行定时任务，带多个参数的方法"+a+" "+b+" "+c+" "+d+" "+e+"执行时间:"+DateUtil.now()); } diff --git a/src/main/java/com/fc/v2/controller/AdminController.java b/src/main/java/com/fc/v2/controller/AdminController.java index b51269f..758fa0c 100644 --- a/src/main/java/com/fc/v2/controller/AdminController.java +++ b/src/main/java/com/fc/v2/controller/AdminController.java @@ -3,7 +3,7 @@ package com.fc.v2.controller; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.model.auto.TSysNotice; -import com.fc.v2.model.auto.TsysUser; +import com.fc.v2.model.auto.TSysUser; import com.fc.v2.model.custom.SysMenu; import com.fc.v2.shiro.util.ShiroUtils; import com.fc.v2.util.StringUtils; @@ -99,7 +99,7 @@ public class AdminController extends BaseController { @ApiOperation(value = "用户登陆验证" , notes = "用户登陆验证") @PostMapping("/login") @ResponseBody - public AjaxResult login(TsysUser user, String captcha, RedirectAttributes redirectAttributes, boolean rememberMe, + public AjaxResult login(TSysUser user, String captcha, RedirectAttributes redirectAttributes, boolean rememberMe, HttpServletRequest request) { // ModelAndView view =new ModelAndView(); Boolean yz = false; @@ -181,7 +181,7 @@ public class AdminController extends BaseController { @ApiOperation(value = "手机登录" , notes = "手机登录") @PostMapping("/API/login") @ResponseBody - public AjaxResult APIlogin(TsysUser user, boolean rememberMe, HttpServletRequest request) { + public AjaxResult APIlogin(TSysUser user, boolean rememberMe, HttpServletRequest request) { // ModelAndView view =new ModelAndView(); Boolean yz = true; // if (V2Config.getRollVerification()) {// 滚动验证 diff --git a/src/main/java/com/fc/v2/controller/admin/AutoCodeController.java b/src/main/java/com/fc/v2/controller/admin/AutoCodeController.java index 03ce97b..9c99b59 100644 --- a/src/main/java/com/fc/v2/controller/admin/AutoCodeController.java +++ b/src/main/java/com/fc/v2/controller/admin/AutoCodeController.java @@ -8,9 +8,9 @@ import java.util.Map; import java.util.zip.ZipOutputStream; import javax.servlet.http.HttpServletResponse; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.model.auto.TSysDictType; +import com.fc.v2.service.ITSysDictTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.fc.v2.common.base.BaseController; @@ -25,8 +25,7 @@ import com.fc.v2.model.custom.autocode.AutoDictType; import com.fc.v2.model.custom.autocode.BeanColumn; import com.fc.v2.model.custom.autocode.TableInfo; import com.fc.v2.service.ITDictService; -import com.fc.v2.service.GeneratorService; -import com.fc.v2.service.ITSysDictTypeService; +import com.fc.v2.service.ITGeneratorService; import com.fc.v2.util.AutoCode.AutoCodeUtil; import org.apache.commons.io.IOUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -41,9 +40,9 @@ import org.springframework.web.bind.annotation.ResponseBody; /** * 代码自动生成 - * - * @ClassName: AutoCodeController + * * @author fuce + * @ClassName: AutoCodeController * @date 2019-08-13 00:34 */ @Api(value = "代码自动生成") @@ -51,155 +50,153 @@ import org.springframework.web.bind.annotation.ResponseBody; @RequestMapping("/autoCodeController") public class AutoCodeController extends BaseController { - private String prefix = "admin/autoCode"; - @Autowired - private GeneratorService generatorService; - // @Autowired - // private SysUtilService sysUtilService; - - @Autowired - private ITSysDictTypeService tSysDictTypeService; - - @Autowired - private ITDictService dictService; + private String prefix = "admin/autoCode"; + @Autowired + private ITGeneratorService generatorService; + // @Autowired + // private SysUtilService sysUtilService; + + @Autowired + private ITSysDictTypeService tSysDictTypeService; + + @Autowired + private ITDictService dictService; + + /** + * 代码自动生成全局配置 + * + * @param modelMap + * @return + * @author fuce + * @Date 2019年8月13日 上午12:34:30 + */ + @ApiOperation(value = " 代码自动生成全局配置", notes = "代码自动生成全局配置") + @GetMapping("/global") + @RequiresPermissions("system:autocode:global") + public String global(ModelMap modelMap) { + + modelMap.put("author", AutoCodeConfig.getConfig().getProperty("author")); + modelMap.put("email", AutoCodeConfig.getConfig().getProperty("author")); + modelMap.put("parentPath", AutoCodeConfig.getConfig().getProperty("parentPath")); + modelMap.put("dictTypes", tSysDictTypeService.selectTSysDictTypeList(new QueryWrapper())); + return prefix + "/global"; + } + + /** + * 树结构查询所有表 + * + * @return + * @author fuce + * @Date 2021年1月15日 下午2:21:19 + */ + @GetMapping("/selectTables") + @ResponseBody + public ResuTree selectTables() { + List list = generatorService.queryList(null); + List TreeList = new ArrayList(); + for (int i = 0; i < list.size(); i++) { + TsysTablesVo tablesVo = new TsysTablesVo(i + 1, -1, list.get(i).getTableName(), list.get(i).getEngine(), + list.get(i).getTableComment(), list.get(i).getTableModel(), list.get(i).getCreateTime(), + list.get(i).getTableName() + " > " + list.get(i).getTableComment()); + TreeList.add(tablesVo); + } + + TsysTablesVo tables = new TsysTablesVo(); + tables.setTableModel("all"); + tables.setTableAndName("所有表"); + tables.setParentId(0); + tables.setId(-1); + TreeList.add(tables); + return dataTree(TreeList); + } + + /** + * 根据表查询表字段详情 + * + * @param tableName + * @return + * @author fuce + * @Date 2019年8月15日 上午1:10:42 + */ + @ApiOperation(value = "根据表查询表字段详情", notes = "根据表查询表字段详情") + @GetMapping("/queryTableInfo") + @ResponseBody + public ResultTable queryTableInfo(String tableName) { + List list = generatorService.queryColumns2(tableName); + return pageTable(list, list.size()); + } - /** - * 代码自动生成全局配置 - * - * @param model - * @return - * @author fuce - * @Date 2019年8月13日 上午12:34:30 - */ - @ApiOperation(value = " 代码自动生成全局配置", notes = "代码自动生成全局配置") - @GetMapping("/global") - @RequiresPermissions("system:autocode:global") - public String global(ModelMap modelMap) { - - modelMap.put("author", AutoCodeConfig.getConfig().getProperty("author")); - modelMap.put("email", AutoCodeConfig.getConfig().getProperty("author")); - modelMap.put("parentPath", AutoCodeConfig.getConfig().getProperty("parentPath")); - modelMap.put("dictTypes",tSysDictTypeService.selectTSysDictTypeList(new QueryWrapper())); - return prefix + "/global"; - } + /** + * 生成文件 + * + * @author fuce + * @Date 2021年1月15日 下午2:21:55 + */ + @PostMapping("/createAuto") + @ResponseBody + public AjaxResult createAuto(@RequestBody AutoConfigModel autoConfigModel) { + // 根据表名查询表字段集合 + List list = autoConfigModel.getBeanColumns();// generatorService.queryColumns2(autoConfigModel.getTableName()); + //根据表的设置查询出字典表需要的数据 - /** - * 树结构查询所有表 - * - * @return - * @author fuce - * @Date 2021年1月15日 下午2:21:19 - */ - @GetMapping("/selectTables") - @ResponseBody - public ResuTree selectTables() { - List list = generatorService.queryList(null); - List TreeList = new ArrayList(); - for (int i = 0; i < list.size(); i++) { - TsysTablesVo tablesVo = new TsysTablesVo(i + 1, -1, list.get(i).getTableName(), list.get(i).getEngine(), - list.get(i).getTableComment(), list.get(i).getTableModel(), list.get(i).getCreateTime(), - list.get(i).getTableName() + " > " + list.get(i).getTableComment()); - TreeList.add(tablesVo); - } + list.stream().forEach(item -> { + if (item.getHtmlType() == 2) { + AutoDictType autoDictType = new AutoDictType(dictService.getSysDictType(item.getDictTypeName()), dictService.getType(item.getDictTypeName())); + item.setAutoDictType(autoDictType); + } - TsysTablesVo tables = new TsysTablesVo(); - tables.setTableModel("all"); - tables.setTableAndName("所有表"); - tables.setParentId(0); - tables.setId(-1); - TreeList.add(tables); - return dataTree(TreeList); - } + }); - /** - * 根据表查询表字段详情 - * - * @param tableName - * @return - * @author fuce - * @Date 2019年8月15日 上午1:10:42 - */ - @ApiOperation(value = "根据表查询表字段详情", notes = "根据表查询表字段详情") - @GetMapping("/queryTableInfo") - @ResponseBody - public ResultTable queryTableInfo(String tableName) { - List list = generatorService.queryColumns2(tableName); - return pageTable(list, list.size()); - } - /** - * 生成文件 - * - * @author fuce - * @Date 2021年1月15日 下午2:21:55 - */ - @PostMapping("/createAuto") - @ResponseBody - public AjaxResult createAuto(@RequestBody AutoConfigModel autoConfigModel) { - // 根据表名查询表字段集合 - List list =autoConfigModel.getBeanColumns() ;// generatorService.queryColumns2(autoConfigModel.getTableName()); - //根据表的设置查询出字典表需要的数据 - - list.stream().forEach(item ->{ - if(item.getHtmlType()==2) { - AutoDictType autoDictType=new AutoDictType(dictService.getSysDictType(item.getDictTypeName()),dictService.getType(item.getDictTypeName())); - item.setAutoDictType(autoDictType); - } - - }); - - - - - // 初始化表信息 - TableInfo tableInfo = new TableInfo(autoConfigModel.getTableName(), list, autoConfigModel.getTableComment()); + // 初始化表信息 + TableInfo tableInfo = new TableInfo(autoConfigModel.getTableName(), list, autoConfigModel.getTableComment()); - AutoCodeUtil.autoCodeOneModel(tableInfo, autoConfigModel); - return AjaxResult.success(); - } + AutoCodeUtil.autoCodeOneModel(tableInfo, autoConfigModel); + return AjaxResult.success(); + } - /** - * 生成文件Zip - * - * @author fuce - * @throws IOException - * @Date 2021年1月15日 下午2:21:55 - */ - @GetMapping("/createAutoZip") - @ResponseBody - public void createAutoZip(AutoConfigModel autoConfigModel, HttpServletResponse response) throws IOException { - byte[] b; - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - ZipOutputStream zip = new ZipOutputStream(outputStream); - // 根据表名查询表字段集合 - List list = generatorService.queryColumns2(autoConfigModel.getTableName()); - // 初始化表信息 - TableInfo tableInfo = new TableInfo(autoConfigModel.getTableName(), list, autoConfigModel.getTableComment()); - // 自动生成 - AutoCodeUtil.autoCodeOneModel(tableInfo, autoConfigModel, zip); - IOUtils.closeQuietly(zip); - b = outputStream.toByteArray(); - response.reset(); - response.setHeader("Content-Disposition", "attachment; filename=\"v2.zip\""); - response.addHeader("Content-Length", "" + b.length); - response.setContentType("application/octet-stream; charset=UTF-8"); - IOUtils.write(b, response.getOutputStream()); - } + /** + * 生成文件Zip + * + * @throws IOException + * @author fuce + * @Date 2021年1月15日 下午2:21:55 + */ + @GetMapping("/createAutoZip") + @ResponseBody + public void createAutoZip(AutoConfigModel autoConfigModel, HttpServletResponse response) throws IOException { + byte[] b; + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + ZipOutputStream zip = new ZipOutputStream(outputStream); + // 根据表名查询表字段集合 + List list = generatorService.queryColumns2(autoConfigModel.getTableName()); + // 初始化表信息 + TableInfo tableInfo = new TableInfo(autoConfigModel.getTableName(), list, autoConfigModel.getTableComment()); + // 自动生成 + AutoCodeUtil.autoCodeOneModel(tableInfo, autoConfigModel, zip); + IOUtils.closeQuietly(zip); + b = outputStream.toByteArray(); + response.reset(); + response.setHeader("Content-Disposition", "attachment; filename=\"v2.zip\""); + response.addHeader("Content-Length", "" + b.length); + response.setContentType("application/octet-stream; charset=UTF-8"); + IOUtils.write(b, response.getOutputStream()); + } - /** - * 预览生成文件 - * - * @author fuce - * @Date 2021年1月15日 下午2:21:55 - */ - @GetMapping("/viewAuto") - public String viewAuto(AutoConfigModel autoConfigModel, ModelMap model) { - List list = generatorService.queryColumns2(autoConfigModel.getTableName()); - TableInfo tableInfo = new TableInfo(autoConfigModel.getTableName(), list, autoConfigModel.getTableComment()); - Map map = AutoCodeUtil.viewAuto(tableInfo,autoConfigModel); - model.put("viewmap", map); - return prefix + "/view"; - } + /** + * 预览生成文件 + * + * @author fuce + * @Date 2021年1月15日 下午2:21:55 + */ + @GetMapping("/viewAuto") + public String viewAuto(AutoConfigModel autoConfigModel, ModelMap model) { + List list = generatorService.queryColumns2(autoConfigModel.getTableName()); + TableInfo tableInfo = new TableInfo(autoConfigModel.getTableName(), list, autoConfigModel.getTableComment()); + Map map = AutoCodeUtil.viewAuto(tableInfo, autoConfigModel); + model.put("viewmap", map); + return prefix + "/view"; + } // /** // * 保存配置文件 diff --git a/src/main/java/com/fc/v2/controller/admin/PermissionController.java b/src/main/java/com/fc/v2/controller/admin/PermissionController.java index 53bbcab..9465ef2 100644 --- a/src/main/java/com/fc/v2/controller/admin/PermissionController.java +++ b/src/main/java/com/fc/v2/controller/admin/PermissionController.java @@ -1,12 +1,15 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.common.domain.ResuTree; import com.fc.v2.common.domain.ResultTable; -import com.fc.v2.model.auto.TsysPermission; +import com.fc.v2.model.auto.TSysPermission; import com.fc.v2.model.custom.Tablepar; import com.fc.v2.shiro.util.ShiroUtils; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -15,256 +18,267 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; + import java.util.List; + /** * 权限Controller - * @author fuce + * + * @author fuce * @date: 2018年9月2日 下午8:08:21 */ @Api(value = "权限") @Controller @RequestMapping("/PermissionController") -public class PermissionController extends BaseController{ - - //跳转页面参数 - private final String prefix = "admin/permission"; - - /** - * 权限列表展示 - * @param model - * @return - * @author fuce - * @Date 2019年11月11日 下午3:43:51 - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("system:permission:view") - public String view(ModelMap model) - { - return prefix + "/list"; +public class PermissionController extends BaseController { + + //跳转页面参数 + private final String prefix = "admin/permission"; + + /** + * 权限列表展示 + * + * @param model + * @return + * @author fuce + * @Date 2019年11月11日 下午3:43:51 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("system:permission:view") + public String view(ModelMap model) { + return prefix + "/list"; } - - /** - * 权限列表 - * @param tablepar - * @param searchText 搜索字符 - * @return - */ - @ApiOperation(value = "分页查询", notes = "分页查询") - @PostMapping("/list") - @RequiresPermissions("system:permission:list") - @ResponseBody - public ResultTable list(Tablepar tablepar,String searchText){ - PageInfo page= sysPermissionService.list(tablepar, searchText) ; - return treeTable(page.getList()); - } + /** + * 权限列表 + * + * @param tablepar + * @param searchText 搜索字符 + * @return + */ + @ApiOperation(value = "分页查询", notes = "分页查询") + @PostMapping("/list") + @RequiresPermissions("system:permission:list") + @ResponseBody + public ResultTable list(Tablepar tablepar, String searchText) { + + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("order_num"); + queryWrapper.like(StringUtils.isNotEmpty(searchText), "order_num", searchText); - /** + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + PageInfo page = new PageInfo(sysPermissionService.selectTSysPermissionList(queryWrapper)); + return treeTable(page.getList()); + } + + /** * 新增权限 */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add() - { + public String add() { return prefix + "/add"; } - - + + /** * 权限添加 - * @param role + * + * @param tsysPermission + * @return + */ + //@Log(title = "权限添加", action = "1") + @ApiOperation(value = "新增", notes = "新增") + @PostMapping("/add") + @RequiresPermissions("system:permission:add") + @ResponseBody + public AjaxResult add(@RequestBody TSysPermission tsysPermission) { + int b = sysPermissionService.insertTSysPermission(tsysPermission); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 删除权限 + * + * @param ids * @return */ - //@Log(title = "权限添加", action = "1") - @ApiOperation(value = "新增", notes = "新增") - @PostMapping("/add") - @RequiresPermissions("system:permission:add") - @ResponseBody - public AjaxResult add(@RequestBody TsysPermission tsysPermission){ - int b= sysPermissionService.insertSelective(tsysPermission); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 删除权限 - * @param ids - * @return - */ - //@Log(title = "删除权限", action = "1") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("system:permission:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b= sysPermissionService.deleteByPrimaryKey(ids); - if(b==1){ - return success(); - }else if(b==-1){ - return error("该权限有子权限，请先删除子权限"); - }else if(b==-2){ - return error("该权限绑定了角色，请解除角色绑定"); - }else { - return error(); - } - } - - /** - * 检查权限 - * @param TsysPermission - * @return - */ - @ApiOperation(value = "检查权限", notes = "检查权限") - @PostMapping("/checkNameUnique") - @ResponseBody - public int checkNameUnique(TsysPermission TsysPermission){ - int b= sysPermissionService.checkNameUnique(TsysPermission); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - /** - * 检查权限URL - * @param tsysUser - * @return - */ - @ApiOperation(value = "检查权限URL", notes = "检查权限URL") - @PostMapping("/checkURLUnique") - @ResponseBody - public int checkURLUnique(@RequestBody TsysPermission tsysPermission){ - int b= sysPermissionService.checkURLUnique(tsysPermission); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - /** - * 检查权限perms字段 - * @param tsysUser - * @return - */ - @ApiOperation(value = "检查权限perms字段", notes = "检查权限perms字段") - @PostMapping("/checkPermsUnique") - @ResponseBody - public int checkPermsUnique(TsysPermission tsysPermission){ - int b= sysPermissionService.checkPermsUnique(tsysPermission); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - /** - * 修改权限 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{roleId}") - public String edit(@PathVariable("roleId") String id, ModelMap mmap) - { - //获取自己的权限信息 - TsysPermission mytsysPermission = sysPermissionService.selectByPrimaryKey(id); - //获取父权限信息 - TsysPermission pattsysPermission = sysPermissionService.selectByPrimaryKey(mytsysPermission.getPid()); + //@Log(title = "删除权限", action = "1") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("system:permission:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysPermissionService.deleteTSysPermissionByIds(ids); + if (b == 1) { + return success(); + } else if (b == -1) { + return error("该权限有子权限，请先删除子权限"); + } else if (b == -2) { + return error("该权限绑定了角色，请解除角色绑定"); + } else { + return error(); + } + } + + /** + * 检查权限 + * + * @param tSysPermission + * @return + */ + @ApiOperation(value = "检查权限", notes = "检查权限") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(TSysPermission tSysPermission) { + int b = sysPermissionService.checkNameUnique(tSysPermission); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + /** + * 检查权限URL + * + * @param tsysPermission + * @return + */ + @ApiOperation(value = "检查权限URL", notes = "检查权限URL") + @PostMapping("/checkURLUnique") + @ResponseBody + public int checkURLUnique(@RequestBody TSysPermission tsysPermission) { + int b = sysPermissionService.checkURLUnique(tsysPermission); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + /** + * 检查权限perms字段 + * + * @param tsysPermission + * @return + */ + @ApiOperation(value = "检查权限perms字段", notes = "检查权限perms字段") + @PostMapping("/checkPermsUnique") + @ResponseBody + public int checkPermsUnique(TSysPermission tsysPermission) { + int b = sysPermissionService.checkPermsUnique(tsysPermission); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + /** + * 修改权限 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{roleId}") + public String edit(@PathVariable("roleId") Long id, ModelMap mmap) { + //获取自己的权限信息 + TSysPermission mytsysPermission = sysPermissionService.selectTSysPermissionById(id); + //获取父权限信息 + TSysPermission pattsysPermission = sysPermissionService.selectTSysPermissionById(mytsysPermission.getPid()); mmap.put("TsysPermission", mytsysPermission); mmap.put("pattsysPermission", pattsysPermission); return prefix + "/edit"; } - - /** + + /** * 修改保存权限 + * + * @param tSysPermission + * @return */ - //@Log(title = "修改保存权限", action = "1") - @ApiOperation(value = "修改保存", notes = "修改保存") + //@Log(title = "修改保存权限", action = "1") + @ApiOperation(value = "修改保存", notes = "修改保存") @RequiresPermissions("system:permission:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(@RequestBody TsysPermission TsysPermission) - { - return toAjax(sysPermissionService.updateByPrimaryKey(TsysPermission)); + public AjaxResult editSave(@RequestBody TSysPermission tSysPermission) { + return toAjax(sysPermissionService.updateTSysPermission(tSysPermission)); } - - - + /** * 根据角色id获取bootstarp 所有打勾权限 + * * @param roleId 角色id集合 * @return */ - @ApiOperation(value = "根据角色id获取所有打勾权限", notes = "根据角色id获取 所有打勾权限") + @ApiOperation(value = "根据角色id获取所有打勾权限", notes = "根据角色id获取 所有打勾权限") @GetMapping("/getCheckPrem") @ResponseBody - public ResuTree getCheckPrem(String roleId){ + public ResuTree getCheckPrem(Long roleId) { - return dataTree(sysPermissionService.getRolePower(roleId)); + return dataTree(sysPermissionService.getRolePower(roleId)); } - - + + /** * 跳转到菜单树页面 + * * @return */ - @ApiOperation(value = "跳转到菜单树页面", notes = "跳转到菜单树页面") + @ApiOperation(value = "跳转到菜单树页面", notes = "跳转到菜单树页面") @GetMapping("/tree/{roleId}") - public String Tree(@PathVariable("roleId") String roleId, Model model){ - model.addAttribute("roleId",roleId); - return prefix + "/tree"; + public String Tree(@PathVariable("roleId") String roleId, Model model) { + model.addAttribute("roleId", roleId); + return prefix + "/tree"; } - - /** * 修改保存角色 */ - //@Log(title = "修改保存角色", action = "1") - @ApiOperation(value = "授权保存", notes = "授权保存") + //@Log(title = "修改保存角色", action = "1") + @ApiOperation(value = "授权保存", notes = "授权保存") @RequiresPermissions("system:role:edit") @PutMapping("/saveRolePower") @ResponseBody - public AjaxResult saveRolePower(String roleId,String powerIds) - { - int i=sysRoleService.updateRoleAndPrem(roleId,powerIds); - if(i>0) { - //大于0刷新权限 - ShiroUtils.clearCachedAuthorizationInfo(); - } + public AjaxResult saveRolePower(Long roleId, String powerIds) { + int i = sysRoleService.updateRoleAndPrem(roleId, powerIds); + if (i > 0) { + //大于0刷新权限 + ShiroUtils.clearCachedAuthorizationInfo(); + } return toAjax(i); } - @GetMapping("/selectParent") - @ResponseBody - public ResuTree selectParent(){ - List list = sysPermissionService.getall(null); - TsysPermission basePower = new TsysPermission(); + @ResponseBody + public ResuTree selectParent() { + List list = sysPermissionService.getall(null); + TSysPermission basePower = new TSysPermission(); basePower.setName("顶级权限"); - basePower.setId("0"); - basePower.setPid("-1"); + basePower.setId(0L); + basePower.setPid(-1L); list.add(basePower); return dataTree(list); } @PutMapping("/updateVisible") - @ResponseBody - public AjaxResult updateVisible(@RequestBody TsysPermission TsysPermission){ - int i=sysPermissionService.updateVisible(TsysPermission); - return toAjax(i); - } - + @ResponseBody + public AjaxResult updateVisible(@RequestBody TSysPermission tSysPermission) { + int i = sysPermissionService.updateVisible(tSysPermission); + return toAjax(i); + } + } diff --git a/src/main/java/com/fc/v2/controller/admin/RoleController.java b/src/main/java/com/fc/v2/controller/admin/RoleController.java index c82770f..afa4188 100644 --- a/src/main/java/com/fc/v2/controller/admin/RoleController.java +++ b/src/main/java/com/fc/v2/controller/admin/RoleController.java @@ -1,10 +1,13 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.common.domain.ResultTable; -import com.fc.v2.model.auto.TsysRole; +import com.fc.v2.model.auto.TSysRole; import com.fc.v2.model.custom.Tablepar; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -15,20 +18,21 @@ import org.springframework.web.bind.annotation.*; /** * 角色Controller - * @author fuce + * + * @author fuce * @date: 2018年9月2日 下午8:08:21 */ @Api(value = "用户角色") @Controller @RequestMapping("/RoleController") -public class RoleController extends BaseController{ - - - //跳转页面参数 +public class RoleController extends BaseController { + + // 跳转页面参数 private final String prefix = "admin/role"; - + /** * 展示页面 + * * @param model * @return * @author fuce @@ -37,13 +41,13 @@ public class RoleController extends BaseController{ @ApiOperation(value = "分页跳转", notes = "分页跳转") @GetMapping("/view") @RequiresPermissions("system:role:view") - public String view(ModelMap model) - { + public String view(ModelMap model) { return prefix + "/list"; - } - + } + /** * 角色列表 + * * @param tablepar * @param searchText 搜索字符 * @return @@ -52,109 +56,112 @@ public class RoleController extends BaseController{ @GetMapping("/list") @RequiresPermissions("system:role:list") @ResponseBody - public ResultTable list(Tablepar tablepar){ - PageInfo page=sysRoleService.list(tablepar) ; - return pageTable(page.getList(),page.getTotal()); + public ResultTable list(Tablepar tablepar) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByDesc("ID"); + queryWrapper.like(StringUtils.isNotEmpty(tablepar.getSearchText()), "name", tablepar.getSearchText()); + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + PageInfo page = new PageInfo(sysRoleService.selectTSysRoleList(queryWrapper)); + return treeTable(page.getList()); } /** - * 新增角色 - */ + * 新增角色 + * + * @return + */ @ApiOperation(value = "新增跳转", notes = "新增跳转") - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - - /** - * 角色添加 - * @param role - * @return - */ - //@Log(title = "角色添加", action = "1") + @GetMapping("/add") + public String add() { + return prefix + "/add"; + } + + /** + * 角色添加 + * + * @param role + * @return + */ + // @Log(title = "角色添加", action = "1") @ApiOperation(value = "新增", notes = "新增") @PostMapping("/add") @RequiresPermissions("system:role:add") @ResponseBody - public AjaxResult add(@RequestBody TsysRole role){ - int b=sysRoleService.insertSelective(role); - if(b>0){ + public AjaxResult add(@RequestBody TSysRole role) { + int b = sysRoleService.insertTSysRole(role); + if (b > 0) { return success(); - }else{ + } else { return error(); } } - + /** * 删除角色 + * * @param ids * @return */ - //@Log(title = "删除角色", action = "1") + // @Log(title = "删除角色", action = "1") @ApiOperation(value = "删除", notes = "删除") @DeleteMapping("/remove") @RequiresPermissions("system:role:remove") @ResponseBody - public AjaxResult remove(String ids){ - int b=sysRoleService.deleteByPrimaryKey(ids); - if(b>0){ + public AjaxResult remove(String ids) { + int b = sysRoleService.deleteTSysRoleByIds(ids); + if (b > 0) { return success(); - }else{ + } else { return error(); } } - + /** * 检查角色 - * @param TsysRole + * + * @param tsysRole * @return */ @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") @PostMapping("/checkNameUnique") @ResponseBody - public int checkNameUnique(TsysRole tsysRole){ - int b=sysRoleService.checkNameUnique(tsysRole); - if(b>0){ + public int checkNameUnique(TSysRole tsysRole) { + int b = sysRoleService.checkNameUnique(tsysRole); + if (b > 0) { return 1; - }else{ + } else { return 0; } } - - + /** * 修改角色 + * * @param id * @param mmap * @return */ @ApiOperation(value = "修改跳转", notes = "修改跳转") @GetMapping("/edit/{roleId}") - public String edit(@PathVariable("roleId") String id, ModelMap mmap) - { - mmap.put("sysRole", sysRoleService.selectByPrimaryKey(id)); - return prefix + "/edit"; - } - - + public String edit(@PathVariable("roleId") Long id, ModelMap mmap) { + mmap.put("sysRole", sysRoleService.selectTSysRoleById(id)); + return prefix + "/edit"; + } - /** - * 修改保存角色 - */ - //@Log(title = "修改保存角色", action = "1") + /** + * 修改保存角色 + * + * @param tsysRole + * @return + */ + // @Log(title = "修改保存角色", action = "1") @ApiOperation(value = "修改保存", notes = "修改保存") - @RequiresPermissions("system:role:edit") - @PutMapping("/edit") - @ResponseBody - public AjaxResult editSave(@RequestBody TsysRole tsysRole) - { - int i=sysRoleService.updateByPrimaryKeySelective(tsysRole); - return toAjax(i); - } - - - - + @RequiresPermissions("system:role:edit") + @PutMapping("/edit") + @ResponseBody + public AjaxResult editSave(@RequestBody TSysRole tsysRole) { + int i = sysRoleService.updateTSysRole(tsysRole); + return toAjax(i); + } } diff --git a/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java b/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java index 2f66b7d..beb33ba 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java @@ -1,13 +1,16 @@ package com.fc.v2.controller.admin; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.common.domain.ResultTable; -import com.fc.v2.model.auto.SysDepartment; -import com.fc.v2.model.auto.SysDepartmentExample; +import com.fc.v2.model.auto.TSysDepartment; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysDepartmentService; import com.fc.v2.common.domain.ResuTree; +import com.fc.v2.service.ITSysDepartmentService; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -16,195 +19,215 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; + import java.util.List; @Api(value = "部门表") @Controller @RequestMapping("/SysDepartmentController") -public class SysDepartmentController extends BaseController{ - - private final String prefix = "admin/sysDepartment"; - @Autowired - private SysDepartmentService sysDepartmentService; - - /** - * 分页跳转 - * @param model - * @return - * @author fuce - * @Date 2020年4月18日 下午11:48:55 - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("gen:sysDepartment:view") - public String view(ModelMap model) - { - return prefix + "/list"; +public class SysDepartmentController extends BaseController { + + private final String prefix = "admin/sysDepartment"; + @Autowired + private ITSysDepartmentService sysDepartmentService; + + /** + * 分页跳转 + * + * @param model + * @return + * @author fuce + * @Date 2020年4月18日 下午11:48:55 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("gen:sysDepartment:view") + public String view(ModelMap model) { + return prefix + "/list"; } - - /** - * 分页查询 - * @param tablepar - * @param searchText - * @return - * @author fuce - * @Date 2020年4月18日 下午11:48:34 - */ - //@Log(title = "部门表集合查询", action = "111") - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/list") - @RequiresPermissions("gen:sysDepartment:list") - @ResponseBody - public ResultTable list(Tablepar tablepar, String searchText){ - PageInfo page=sysDepartmentService.list(tablepar,searchText); - return treeTable(page.getList()); - } - - /** + + /** + * 分页查询 + * + * @param tablepar + * @param searchText + * @return + * @author fuce + * @Date 2020年4月18日 下午11:48:34 + */ + //@Log(title = "部门表集合查询", action = "111") + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/list") + @RequiresPermissions("gen:sysDepartment:list") + @ResponseBody + public ResultTable list(Tablepar tablepar, String searchText) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("id"); + queryWrapper.like(StringUtils.isNotEmpty(searchText), "dept_name", searchText); + + if (StrUtil.isNotEmpty(tablepar.getOrderByColumn())) { + queryWrapper.orderByAsc(tablepar.getOrderByColumn()); + } + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + PageInfo page = new PageInfo(sysDepartmentService.selectTSysDepartmentList(queryWrapper)); + return treeTable(page.getList()); + } + + /** * 新增 + * + * @param modelMap + * @return */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add(ModelMap modelMap) - { + public String add(ModelMap modelMap) { return prefix + "/add"; } - + /** - * 新增 + * 新增保存 + * * @param sysDepartment * @return * @author fuce * @Date 2020年4月18日 下午11:47:51 */ - //@Log(title = "部门表新增", action = "111") + //@Log(title = "部门表新增", action = "111") @ApiOperation(value = "新增", notes = "新增") - @PostMapping("/add") - @RequiresPermissions("gen:sysDepartment:add") - @ResponseBody - public AjaxResult add(@RequestBody SysDepartment sysDepartment){ - int b=sysDepartmentService.insertSelective(sysDepartment); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 删除 - * @param ids - * @return - */ - //@Log(title = "部门表删除", action = "111") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("gen:sysDepartment:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysDepartmentService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 检查用户 - * @param tsysUser - * @return - */ - @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") - @PostMapping("/checkNameUnique") - @ResponseBody - public int checkNameUnique(SysDepartment sysDepartment){ - int b=sysDepartmentService.checkNameUnique(sysDepartment); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - - /** - * 修改跳转 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { - //获取自己的权限信息 - SysDepartment mytsysPermission = sysDepartmentService.selectByPrimaryKey(id); + @PostMapping("/add") + @RequiresPermissions("gen:sysDepartment:add") + @ResponseBody + public AjaxResult add(@RequestBody TSysDepartment sysDepartment) { + int b = sysDepartmentService.insertTSysDepartment(sysDepartment); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 删除 + * + * @param ids + * @return + */ + //@Log(title = "部门表删除", action = "111") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("gen:sysDepartment:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysDepartmentService.deleteTSysDepartmentByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 检查用户 + * + * @param sysDepartment + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(TSysDepartment sysDepartment) { + int b = sysDepartmentService.checkNameUnique(sysDepartment); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + + /** + * 修改跳转 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + //获取自己的权限信息 + TSysDepartment mytsysPermission = sysDepartmentService.selectTSysDepartmentById(id); mmap.put("SysDepartment", mytsysPermission); return prefix + "/edit"; } - - /** + + /** * 修改保存 + * + * @param record + * @return */ //@Log(title = "部门表修改", action = "111") - @ApiOperation(value = "修改保存", notes = "修改保存") + @ApiOperation(value = "修改保存", notes = "修改保存") @RequiresPermissions("gen:sysDepartment:edit") @PutMapping("/edit") @ResponseBody - public AjaxResult editSave(@RequestBody SysDepartment record) - { - return toAjax(sysDepartmentService.updateByPrimaryKeySelective(record)); + public AjaxResult editSave(@RequestBody TSysDepartment record) { + return toAjax(sysDepartmentService.updateTSysDepartment(record)); } + /** + * + * @return + */ @GetMapping("/selectParent") - @ResponseBody - public ResuTree selectParent(){ - List list = sysDepartmentService.selectByExample(new SysDepartmentExample()); + @ResponseBody + public ResuTree selectParent() { + List list = sysDepartmentService.selectTSysDepartmentList(new QueryWrapper()); return dataTree(list); } - + + /** + * 根据主键查询 + * + * @param id + * @param mmap + * @return + */ + @PostMapping("/get/{id}") + @ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一") + public TSysDepartment edit(@PathVariable("id") Long id) { + return sysDepartmentService.selectTSysDepartmentById(id); + } + /** - * 根据主键查询 - * - * @param id - * @param mmap - * @return - */ - @PostMapping("/get/{id}") - @ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一") - public SysDepartment edit(@PathVariable("id") String id) { - return sysDepartmentService.selectByPrimaryKey(id); - } - - /** - * Describe: 获取部门树状数据结构 - * */ + * 获取部门树状数据结构 + * + * @return + */ @GetMapping("tree") - @ApiOperation(value = "获取部门树状数据结构", notes = "获取部门树状数据结构") - @ResponseBody - public ResuTree tree(){ - List data = sysDepartmentService.selectByExample(new SysDepartmentExample()); + @ApiOperation(value = "获取部门树状数据结构", notes = "获取部门树状数据结构") + @ResponseBody + public ResuTree tree() { + List data = sysDepartmentService.selectTSysDepartmentList(new QueryWrapper()); return dataTree(data); } /** - * 修改状态 - * @param record - * @return - */ + * 修改状态 + * + * @param record + * @return + */ @PutMapping("/updateVisible") - @ResponseBody - public AjaxResult updateVisible(@RequestBody SysDepartment record){ - int i=sysDepartmentService.updateVisible(record); - return toAjax(i); - } - - - - - + @ResponseBody + public AjaxResult updateVisible(@RequestBody TSysDepartment record) { + int i = sysDepartmentService.updateVisible(record); + return toAjax(i); + } } diff --git a/src/main/java/com/fc/v2/controller/admin/SysInterUrlController.java b/src/main/java/com/fc/v2/controller/admin/SysInterUrlController.java index 291bdb8..4000174 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysInterUrlController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysInterUrlController.java @@ -1,6 +1,11 @@ package com.fc.v2.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.domain.ResultTable; +import com.fc.v2.model.auto.TSysInterUrl; +import com.fc.v2.service.ITSysInterUrlService; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -9,188 +14,193 @@ import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; -import com.fc.v2.model.auto.SysInterUrl; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysInterUrlService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @Api(value = "拦截url表") @Controller @RequestMapping("/SysInterUrlController") -public class SysInterUrlController extends BaseController{ - - private final String prefix = "admin/sysInterUrl"; - @Autowired - private SysInterUrlService sysInterUrlService; - - /** - * 分页跳转 - * @param model - * @return - * @author fuce - * @Date 2020年4月18日 下午11:43:33 - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("gen:sysInterUrl:view") - public String view(ModelMap model) - { - return prefix + "/list"; +public class SysInterUrlController extends BaseController { + + private final String prefix = "admin/sysInterUrl"; + @Autowired + private ITSysInterUrlService sysInterUrlService; + + /** + * 分页跳转 + * + * @param model + * @return + * @author fuce + * @Date 2020年4月18日 下午11:43:33 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("gen:sysInterUrl:view") + public String view(ModelMap model) { + return prefix + "/list"; } - - /** - * 分页查询 - * @param tablepar - * @param searchText - * @return - * @author fuce - * @Date 2020年4月18日 下午11:43:42 - */ - //@Log(title = "拦截url表集合查询", action = "111") - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/list") - @RequiresPermissions("gen:sysInterUrl:list") - @ResponseBody - public ResultTable list(Tablepar tablepar, String searchText){ - PageInfo page=sysInterUrlService.list(tablepar,searchText) ; - return pageTable(page.getList(),page.getTotal()); - } - - /** + + /** + * 分页查询 + * + * @param tablepar + * @param searchText + * @return + * @author fuce + * @Date 2020年4月18日 下午11:43:42 + */ + //@Log(title = "拦截url表集合查询", action = "111") + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/list") + @RequiresPermissions("gen:sysInterUrl:list") + @ResponseBody + public ResultTable list(Tablepar tablepar, String searchText) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("id"); + queryWrapper.like(StringUtils.isNotEmpty(searchText), "inter_name", searchText); + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + PageInfo page = new PageInfo(sysInterUrlService.selectTSysInterUrlList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); + } + + /** * 新增跳转 */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add(ModelMap modelMap) - { + public String add(ModelMap modelMap) { return prefix + "/add"; } - - /** - * 新增 - * @param sysInterUrl - * @return - * @author fuce - * @Date 2020年4月18日 下午11:44:30 - */ - //@Log(title = "拦截url表新增", action = "1") - @ApiOperation(value = "新增", notes = "新增") - @PostMapping("/add") - @RequiresPermissions("gen:sysInterUrl:add") - @ResponseBody - public AjaxResult add(SysInterUrl sysInterUrl){ - int b=sysInterUrlService.insertSelective(sysInterUrl); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 复制 - * @param id - * @return - * @author fuce - * @Date 2020年4月18日 下午11:44:42 - */ - //@Log(title = "复制", action = "1") - @ApiOperation(value = "复制", notes = "复制") - @GetMapping("/copy/{id}") - @RequiresPermissions("gen:sysInterUrl:add") - @ResponseBody - public AjaxResult copy(@PathVariable("id") String id){ - SysInterUrl sysInterUrl= sysInterUrlService.selectByPrimaryKey(id); - sysInterUrl.setInterName(sysInterUrl.getInterName()+"复制"); - int b=sysInterUrlService.insertSelective(sysInterUrl); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - - /** - * 删除用户 - * @param ids - * @return - */ - //@Log(title = "拦截url表删除", action = "111") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("gen:sysInterUrl:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysInterUrlService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 检查用户 - * @param tsysUser - * @return - */ - @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") - @PostMapping("/checkNameUnique") - @ResponseBody - public int checkNameUnique(SysInterUrl sysInterUrl){ - int b=sysInterUrlService.checkNameUnique(sysInterUrl); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - - /** - * 修改跳转 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { - mmap.put("SysInterUrl", sysInterUrlService.selectByPrimaryKey(id)); + + /** + * 新增 + * + * @param sysInterUrl + * @return + * @author fuce + * @Date 2020年4月18日 下午11:44:30 + */ + //@Log(title = "拦截url表新增", action = "1") + @ApiOperation(value = "新增", notes = "新增") + @PostMapping("/add") + @RequiresPermissions("gen:sysInterUrl:add") + @ResponseBody + public AjaxResult add(TSysInterUrl sysInterUrl) { + int b = sysInterUrlService.insertTSysInterUrl(sysInterUrl); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 复制 + * + * @param id + * @return + * @author fuce + * @Date 2020年4月18日 下午11:44:42 + */ + //@Log(title = "复制", action = "1") + @ApiOperation(value = "复制", notes = "复制") + @GetMapping("/copy/{id}") + @RequiresPermissions("gen:sysInterUrl:add") + @ResponseBody + public AjaxResult copy(@PathVariable("id") Long id) { + TSysInterUrl sysInterUrl = sysInterUrlService.selectTSysInterUrlById(id); + sysInterUrl.setInterName(sysInterUrl.getInterName() + "复制"); + int b = sysInterUrlService.insertTSysInterUrl(sysInterUrl); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + + /** + * 删除用户 + * + * @param ids + * @return + */ + //@Log(title = "拦截url表删除", action = "111") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("gen:sysInterUrl:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysInterUrlService.deleteTSysInterUrlByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 检查用户 + * + * @param tsysUser + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(TSysInterUrl sysInterUrl) { + int b = sysInterUrlService.checkNameUnique(sysInterUrl); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + + /** + * 修改跳转 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put("SysInterUrl", sysInterUrlService.selectTSysInterUrlById(id)); return prefix + "/edit"; } - - /** + + /** * 修改保存 */ //@Log(title = "拦截url表修改", action = "1") - @ApiOperation(value = "修改保存", notes = "修改保存") + @ApiOperation(value = "修改保存", notes = "修改保存") @RequiresPermissions("gen:sysInterUrl:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(SysInterUrl record) - { - return toAjax(sysInterUrlService.updateByPrimaryKeySelective(record)); + public AjaxResult editSave(TSysInterUrl record) { + return toAjax(sysInterUrlService.updateTSysInterUrl(record)); } - + /** - * 根据主键查询 - * - * @param id - * @param mmap - * @return - */ - @PostMapping("/get/{id}") - @ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一") - public SysInterUrl edit(@PathVariable("id") String id) { - return sysInterUrlService.selectByPrimaryKey(id); - } - - - + * 根据主键查询 + * + * @param id + * @param mmap + * @return + */ + @PostMapping("/get/{id}") + @ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一") + public TSysInterUrl edit(@PathVariable("id") Long id) { + return sysInterUrlService.selectTSysInterUrlById(id); + } + + } diff --git a/src/main/java/com/fc/v2/controller/admin/SysPositionController.java b/src/main/java/com/fc/v2/controller/admin/SysPositionController.java index ecf7154..4ed14d6 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysPositionController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysPositionController.java @@ -1,11 +1,15 @@ package com.fc.v2.controller.admin; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.common.domain.ResultTable; -import com.fc.v2.model.auto.SysPosition; +import com.fc.v2.model.auto.TSysPosition; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysPositionService; +import com.fc.v2.service.ITSysPositionService; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -18,156 +22,173 @@ import org.springframework.web.bind.annotation.*; @Controller @RequestMapping("/SysPositionController") @Api(value = "岗位表") -public class SysPositionController extends BaseController{ - - private final String prefix = "admin/sysPosition"; - @Autowired - private SysPositionService sysPositionService; - - /** - * list展示 - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("gen:sysPosition:view") - public String view(ModelMap model) - { - return prefix + "/list"; +public class SysPositionController extends BaseController { + + private final String prefix = "admin/sysPosition"; + @Autowired + private ITSysPositionService sysPositionService; + + /** + * list展示 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("gen:sysPosition:view") + public String view(ModelMap model) { + return prefix + "/list"; + } + + /** + * 分页集合 + * + * @param tablepar + * @param searchText + * @return + */ + //@Log(title = "岗位表集合查询", action = "111") + @ApiOperation(value = "分页查询", notes = "分页查询") + @PostMapping("/list") + @RequiresPermissions("gen:sysPosition:list") + @ResponseBody + public ResultTable list(Tablepar tablepar, String searchText) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("id"); + queryWrapper.like(StringUtils.isNotEmpty(searchText), "post_name", searchText); + + if(StrUtil.isNotEmpty(tablepar.getOrderByColumn())) { + queryWrapper.orderByAsc(tablepar.getOrderByColumn()); + } + + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + + PageInfo page = new PageInfo(sysPositionService.selectTSysPositionList(queryWrapper)); + return pageTable(page.getList(), page.getTotal()); } - - /** - * 分页集合 - */ - //@Log(title = "岗位表集合查询", action = "111") - @ApiOperation(value = "分页查询", notes = "分页查询") - @PostMapping("/list") - @RequiresPermissions("gen:sysPosition:list") - @ResponseBody - public ResultTable list(Tablepar tablepar, String searchText){ - PageInfo page=sysPositionService.list(tablepar,searchText) ; - return pageTable(page.getList(),page.getTotal()); - } - - /** + + /** * 新增跳转 + * + * @param modelMap + * @return */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add(ModelMap modelMap) - { + public String add(ModelMap modelMap) { return prefix + "/add"; } - + /** * 新增 + * + * @param sysPosition + * @return */ - //@Log(title = "岗位表新增", action = "111") - @ApiOperation(value = "新增", notes = "新增") - @PostMapping("add") - @RequiresPermissions("gen:sysPosition:add") - @ResponseBody - public AjaxResult add(SysPosition sysPosition){ - int b=sysPositionService.insertSelective(sysPosition); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 删除用户 - * @param ids - * @return - */ - //@Log(title = "岗位表删除", action = "111") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("gen:sysPosition:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysPositionService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 检查用户 - * @param tsysUser - * @return - */ - @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") - @PostMapping("/checkNameUnique") - @ResponseBody - public int checkNameUnique(SysPosition sysPosition){ - int b=sysPositionService.checkNameUnique(sysPosition); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - - /** - * 修改跳转 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { - mmap.put("SysPosition", sysPositionService.selectByPrimaryKey(id)); + //@Log(title = "岗位表新增", action = "111") + @ApiOperation(value = "新增", notes = "新增") + @PostMapping("add") + @RequiresPermissions("gen:sysPosition:add") + @ResponseBody + public AjaxResult add(TSysPosition sysPosition) { + int b = sysPositionService.insertTSysPosition(sysPosition); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 删除用户 + * + * @param ids + * @return + */ + //@Log(title = "岗位表删除", action = "111") + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("gen:sysPosition:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysPositionService.deleteTSysPositionByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 检查用户 + * + * @param TSysUser + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(TSysPosition sysPosition) { + int b = sysPositionService.checkNameUnique(sysPosition); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + + /** + * 修改跳转 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put("SysPosition", sysPositionService.selectTSysPositionById(id)); return prefix + "/edit"; } - - /** + + /** * 修改保存 */ //@Log(title = "岗位表修改", action = "111") - @ApiOperation(value = "修改保存", notes = "修改保存") + @ApiOperation(value = "修改保存", notes = "修改保存") @RequiresPermissions("gen:sysPosition:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(SysPosition record) - { - return toAjax(sysPositionService.updateByPrimaryKeySelective(record)); + public AjaxResult editSave(TSysPosition record) { + return toAjax(sysPositionService.updateTSysPosition(record)); } - + /** - * 根据主键查询 - * - * @param id - * @param mmap - * @return - */ - @PostMapping("/get/{id}") - @ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一") - public SysPosition edit(@PathVariable("id") String id) { - return sysPositionService.selectByPrimaryKey(id); - } - - - /** - * 修改状态 - * @param record - * @return - */ - @PutMapping("/updateVisible") - @ResponseBody - public AjaxResult updateVisible(@RequestBody SysPosition record){ - int i=sysPositionService.updateVisible(record); - return toAjax(i); - } + * 根据主键查询 + * + * @param id + * @return + */ + @PostMapping("/get/{id}") + @ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一") + public TSysPosition edit(@PathVariable("id") Long id) { + return sysPositionService.selectTSysPositionById(id); + } + + /** + * 修改状态 + * + * @param record + * @return + */ + @PutMapping("/updateVisible") + @ResponseBody + public AjaxResult updateVisible(@RequestBody TSysPosition record) { + int i = sysPositionService.updateVisible(record); + return toAjax(i); + } - } diff --git a/src/main/java/com/fc/v2/controller/admin/UserController.java b/src/main/java/com/fc/v2/controller/admin/UserController.java index 3a77f2d..f49b498 100644 --- a/src/main/java/com/fc/v2/controller/admin/UserController.java +++ b/src/main/java/com/fc/v2/controller/admin/UserController.java @@ -1,7 +1,15 @@ package com.fc.v2.controller.admin; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fc.v2.common.domain.ResultTable; +import com.fc.v2.model.auto.TSysDepartment; +import com.fc.v2.model.auto.TSysPosition; +import com.fc.v2.model.auto.TSysRole; +import com.fc.v2.model.auto.TSysUser; +import com.fc.v2.service.ITSysDepartmentService; +import com.fc.v2.service.ITSysPositionService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -10,219 +18,221 @@ import org.springframework.web.bind.annotation.*; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; import com.fc.v2.common.log.Log; -import com.fc.v2.model.auto.SysDepartment; -import com.fc.v2.model.auto.SysDepartmentExample; -import com.fc.v2.model.auto.SysPosition; -import com.fc.v2.model.auto.SysPositionExample; -import com.fc.v2.model.auto.TsysRole; -import com.fc.v2.model.auto.TsysUser; import com.fc.v2.model.custom.RoleVo; import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.service.SysDepartmentService; -import com.fc.v2.service.SysPositionService; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** * 用户Controller - * @ClassName: UserController + * * @author fuce + * @ClassName: UserController * @date 2019-11-20 22:35 */ @Api(value = "用户数据") @Controller @RequestMapping("/UserController") -public class UserController extends BaseController{ - - private final String prefix = "admin/user"; - //部门 - @Autowired - private SysDepartmentService departmentService; - //岗位 - @Autowired - private SysPositionService positionService; - - /** - * 展示跳转页面 - * @param model - * @return - * @author fuce - * @Date 2019年11月11日 下午4:14:34 - */ - @ApiOperation(value = "分页跳转", notes = "分页跳转") - @GetMapping("/view") - @RequiresPermissions("system:user:view") - public String view(ModelMap model) - { - return prefix + "/list"; +public class UserController extends BaseController { + + private final String prefix = "admin/user"; + //部门 + @Autowired + private ITSysDepartmentService departmentService; + //岗位 + @Autowired + private ITSysPositionService positionService; + + /** + * 展示跳转页面 + * + * @param model + * @return + * @author fuce + * @Date 2019年11月11日 下午4:14:34 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("system:user:view") + public String view(ModelMap model) { + return prefix + "/list"; + } + + + /** + * list集合 + * + * @param tablepar + * @param searchText + * @return + * @author fuce + * @Date 2019年11月11日 下午4:14:40 + */ + //@Log(title = "分页查询", action = "1") + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/list") + @RequiresPermissions("system:user:list") + @ResponseBody + public ResultTable list(Tablepar tablepar) { + PageInfo page = sysUserService.userList(tablepar); + return pageTable(page.getList(), page.getTotal()); } - - - /** - * list集合 - * @param tablepar - * @param searchText - * @return - * @author fuce - * @Date 2019年11月11日 下午4:14:40 - */ - //@Log(title = "分页查询", action = "1") - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/list") - @RequiresPermissions("system:user:list") - @ResponseBody - public ResultTable list(Tablepar tablepar){ - PageInfo page=sysUserService.list(tablepar) ; - return pageTable(page.getList(),page.getTotal()); - } - /** - * 新增跳转 - * @param modelMap - * @return - * @author fuce - * @Date 2019年11月11日 下午4:14:51 - */ - @ApiOperation(value = "新增跳转", notes = "新增跳转") + + /** + * 新增跳转 + * + * @param modelMap + * @return + * @author fuce + * @Date 2019年11月11日 下午4:14:51 + */ + @ApiOperation(value = "新增跳转", notes = "新增跳转") @GetMapping("/add") - public String add(ModelMap modelMap) - { - //添加角色列表 - List tsysRoleList=sysRoleService.queryList(); - //部门列表 - List departments=departmentService.selectByExample(new SysDepartmentExample()); - //岗位列表 - List sysPositions=positionService.selectByExample(new SysPositionExample()); - //角色 - modelMap.put("tsysRoleList",tsysRoleList); - //部门 - modelMap.put("departmentsList",departments); - //岗位 - modelMap.put("sysPositionsList",sysPositions); + public String add(ModelMap modelMap) { + //添加角色列表 + List tsysRoleList = sysRoleService.selectTSysRoleList(new QueryWrapper()); + //部门列表 + List departments = departmentService.selectTSysDepartmentList(new QueryWrapper()); + //岗位列表 + List sysPositions = positionService.selectTSysPositionList(new QueryWrapper()); + //角色 + modelMap.put("tsysRoleList", tsysRoleList); + //部门 + modelMap.put("departmentsList", departments); + //岗位 + modelMap.put("sysPositionsList", sysPositions); return prefix + "/add"; } - /** - * 新增保存 - * @param user - * @param model - * @param roles - * @return - * @author fuce - * @Date 2019年11月11日 下午4:14:57 - */ + + /** + * 新增保存 + * + * @param user + * @param model + * @param roles + * @return + * @author fuce + * @Date 2019年11月11日 下午4:14:57 + */ @Log(title = "用户新增", action = "111") @ApiOperation(value = "新增", notes = "新增") - @PostMapping("/add") - @RequiresPermissions("system:user:add") - @ResponseBody - public AjaxResult add(TsysUser user,@RequestParam(value="roleIds", required = false)String roleIds){ - int b=sysUserService.insertUserRoles(user,roleIds); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 删除用户 - * @param ids - * @return - */ + @PostMapping("/add") + @RequiresPermissions("system:user:add") + @ResponseBody + public AjaxResult add(TSysUser user, @RequestParam(value = "roleIds", required = false) String roleIds) { + int b = sysUserService.insertUserRoles(user, roleIds); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 删除用户 + * + * @param ids + * @return + */ //@Log(title = "删除用户", action = "1") - @ApiOperation(value = "删除", notes = "删除") - @DeleteMapping("/remove") - @RequiresPermissions("system:user:remove") - @ResponseBody - public AjaxResult remove(String ids){ - int b=sysUserService.deleteByPrimaryKey(ids); - if(b>0){ - return success(); - }else{ - return error(); - } - } - - /** - * 检查用户 - * @param tsysUser - * @return - */ - @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") - @PostMapping("/checkLoginNameUnique") - @ResponseBody - public int checkLoginNameUnique(TsysUser tsysUser){ - int b=sysUserService.checkLoginNameUnique(tsysUser); - if(b>0){ - return 1; - }else{ - return 0; - } - } - - - /** - * 修改用户跳转 - * @param id - * @param mmap - * @return - */ - @ApiOperation(value = "修改跳转", notes = "修改跳转") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { - //查询所有角色 - List roleVos=sysUserService.getUserIsRole(id); - //岗位列表 - List sysPositions=positionService.selectByExample(new SysPositionExample()); - mmap.put("roleVos",roleVos); - mmap.put("TsysUser", sysUserService.selectByPrimaryKey(id)); + @ApiOperation(value = "删除", notes = "删除") + @DeleteMapping("/remove") + @RequiresPermissions("system:user:remove") + @ResponseBody + public AjaxResult remove(String ids) { + int b = sysUserService.deleteTSysUserByIds(ids); + if (b > 0) { + return success(); + } else { + return error(); + } + } + + /** + * 检查用户 + * + * @param tsysUser + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkLoginNameUnique") + @ResponseBody + public int checkLoginNameUnique(TSysUser tsysUser) { + int b = sysUserService.checkLoginNameUnique(tsysUser); + if (b > 0) { + return 1; + } else { + return 0; + } + } + + + /** + * 修改用户跳转 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + //查询所有角色 + List roleVos = sysUserService.getUserIsRole(id); + //岗位列表 + List sysPositions = positionService.selectTSysPositionList(new QueryWrapper()); + mmap.put("roleVos", roleVos); + mmap.put("TsysUser", sysUserService.selectTSysUserById(id)); //岗位 - mmap.put("sysPositionsList",sysPositions); + mmap.put("sysPositionsList", sysPositions); return prefix + "/edit"; } - - /** + + /** * 修改保存用户 + * + * @param tsysUser + * @param roleIds + * @return */ - //@Log(title = "修改保存用户", action = "1") + //@Log(title = "修改保存用户", action = "1") @ApiOperation(value = "修改保存用户", notes = "修改保存用户") @RequiresPermissions("system:user:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(TsysUser tsysUser,@RequestParam(value="roleIds", required = false)String roleIds) - { - return toAjax(sysUserService.updateUserRoles(tsysUser,roleIds)); + public AjaxResult editSave(TSysUser tsysUser, @RequestParam(value = "roleIds", required = false) String roleIds) { + return toAjax(sysUserService.updateUserRoles(tsysUser, roleIds)); } - - + /** - * 修改用户密码跳转 - * @param id - * @param mmap - * @return - */ + * 修改用户密码跳转 + * + * @param id + * @param mmap + * @return + */ //@Log(title = "修改用户密码", action = "1") @ApiOperation(value = "修改用户密码跳转", notes = "修改用户密码跳转") - @GetMapping("/editPwd/{id}") - public String editPwd(@PathVariable("id") String id, ModelMap mmap) - { - mmap.put("TsysUser", sysUserService.selectByPrimaryKey(id)); + @GetMapping("/editPwd/{id}") + public String editPwd(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put("TsysUser", sysUserService.selectTSysUserById(id)); return prefix + "/editPwd"; } - /** + + /** * 修改保存用户 + * + * @param tsysUser + * @return */ //@Log(title = "修改用户密码", action = "1") @ApiOperation(value = "修改用户密码", notes = "修改用户密码") @RequiresPermissions("system:user:editPwd") @PostMapping("/editPwd") @ResponseBody - public AjaxResult editPwdSave(TsysUser tsysUser) - { + public AjaxResult editPwdSave(TSysUser tsysUser) { return toAjax(sysUserService.updateUserPassword(tsysUser)); } - - } diff --git a/src/main/java/com/fc/v2/mapper/auto/SysDepartmentMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysDepartmentMapper.java deleted file mode 100644 index ee440ef..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/SysDepartmentMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.SysDepartment; -import com.fc.v2.model.auto.SysDepartmentExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 部门表 SysDepartmentMapper - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2020-04-17 13:12:58 - */ -public interface SysDepartmentMapper extends BaseMapper { - - long countByExample(SysDepartmentExample example); - - int deleteByExample(SysDepartmentExample example); - - int deleteByPrimaryKey(Integer id); - - int insert(SysDepartment record); - - int insertSelective(SysDepartment record); - - List selectByExample(SysDepartmentExample example); - - SysDepartment selectByPrimaryKey(Integer id); - - int updateByExampleSelective(@Param("record") SysDepartment record, @Param("example") SysDepartmentExample example); - - int updateByExample(@Param("record") SysDepartment record, @Param("example") SysDepartmentExample example); - - int updateByPrimaryKeySelective(SysDepartment record); - - int updateByPrimaryKey(SysDepartment record); - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/SysInterUrlMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysInterUrlMapper.java deleted file mode 100644 index 544df79..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/SysInterUrlMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.SysInterUrl; -import com.fc.v2.model.auto.SysInterUrlExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 拦截url表 SysInterUrlMapper - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2020-01-05 01:48:22 - */ -public interface SysInterUrlMapper extends BaseMapper { - - long countByExample(SysInterUrlExample example); - - int deleteByExample(SysInterUrlExample example); - - int deleteByPrimaryKey(String id); - - int insert(SysInterUrl record); - - int insertSelective(SysInterUrl record); - - List selectByExample(SysInterUrlExample example); - - SysInterUrl selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") SysInterUrl record, @Param("example") SysInterUrlExample example); - - int updateByExample(@Param("record") SysInterUrl record, @Param("example") SysInterUrlExample example); - - int updateByPrimaryKeySelective(SysInterUrl record); - - int updateByPrimaryKey(SysInterUrl record); - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/SysPositionMapper.java b/src/main/java/com/fc/v2/mapper/auto/SysPositionMapper.java deleted file mode 100644 index 09fdf6d..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/SysPositionMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.SysPosition; -import com.fc.v2.model.auto.SysPositionExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 岗位表 SysPositionMapper - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2020-04-16 23:46:24 - */ -public interface SysPositionMapper extends BaseMapper { - - long countByExample(SysPositionExample example); - - int deleteByExample(SysPositionExample example); - - int deleteByPrimaryKey(String id); - - int insert(SysPosition record); - - int insertSelective(SysPosition record); - - List selectByExample(SysPositionExample example); - - SysPosition selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") SysPosition record, @Param("example") SysPositionExample example); - - int updateByExample(@Param("record") SysPosition record, @Param("example") SysPositionExample example); - - int updateByPrimaryKeySelective(SysPosition record); - - int updateByPrimaryKey(SysPosition record); - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysDepartmentMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysDepartmentMapper.java new file mode 100644 index 0000000..3f540bd --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysDepartmentMapper.java @@ -0,0 +1,16 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysDepartment; + +/** + * 部门Mapper接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface TSysDepartmentMapper extends BaseMapper { + +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysInterUrlMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysInterUrlMapper.java new file mode 100644 index 0000000..28512aa --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysInterUrlMapper.java @@ -0,0 +1,16 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysInterUrl; + +/** + * 拦截urlMapper接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface TSysInterUrlMapper extends BaseMapper { + +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysPermissionMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysPermissionMapper.java new file mode 100644 index 0000000..cbfab0e --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysPermissionMapper.java @@ -0,0 +1,39 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysPermission; + +/** + * 权限Mapper接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface TSysPermissionMapper extends BaseMapper { + + /** + * 查询全部权限 + * + * @return + */ + public List findAll(); + + /** + * 根据用户id查询出用户的所有权限 + * + * @param userId + * @return + */ + public List findByAdminUserId(Long userId); + + /** + * 根据角色id查询权限 + * + * @param roleid + * @return + */ + public List queryRoleId(Long roleid); + +} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysPermissionRoleMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysPermissionRoleMapper.java new file mode 100644 index 0000000..55eb3d7 --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysPermissionRoleMapper.java @@ -0,0 +1,16 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysPermissionRole; + +/** + * 角色权限中间Mapper接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface TSysPermissionRoleMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysPositionMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysPositionMapper.java new file mode 100644 index 0000000..91c79b7 --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysPositionMapper.java @@ -0,0 +1,16 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysPosition; + +/** + * 岗位Mapper接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface TSysPositionMapper extends BaseMapper { + +} diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysRoleMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysRoleMapper.java new file mode 100644 index 0000000..f839a58 --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysRoleMapper.java @@ -0,0 +1,24 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysRole; +import org.apache.ibatis.annotations.Select; + +/** + * 角色Mapper接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface TSysRoleMapper extends BaseMapper { + /** + * 根据用户id查询角色 + * + * @param userid + * @return + */ + @Select("select r.id,r.name from t_sys_role r LEFT JOIN t_sys_role_user ru ON r.id = ru.sys_role_id where ru.sys_user_id=#{userid}") + public List queryUserRole(Long userid); +} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysRoleUserMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysRoleUserMapper.java index 72b2919..5637812 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TSysRoleUserMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TSysRoleUserMapper.java @@ -1,32 +1,16 @@ + package com.fc.v2.mapper.auto; +import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TSysRoleUser; -import com.fc.v2.model.auto.TSysRoleUserExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; +/** + * 用户角色中间Mapper接口 + * + * @author zhaonz + * @date 2021-08-05 + */ public interface TSysRoleUserMapper extends BaseMapper { - int countByExample(TSysRoleUserExample example); - - int deleteByExample(TSysRoleUserExample example); - - int deleteByPrimaryKey(String id); - - int insert(TSysRoleUser record); - - int insertSelective(TSysRoleUser record); - - List selectByExample(TSysRoleUserExample example); - - TSysRoleUser selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") TSysRoleUser record, @Param("example") TSysRoleUserExample example); - - int updateByExample(@Param("record") TSysRoleUser record, @Param("example") TSysRoleUserExample example); - - int updateByPrimaryKeySelective(TSysRoleUser record); - int updateByPrimaryKey(TSysRoleUser record); } \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java new file mode 100644 index 0000000..11a6b88 --- /dev/null +++ b/src/main/java/com/fc/v2/mapper/auto/TSysUserMapper.java @@ -0,0 +1,44 @@ + +package com.fc.v2.mapper.auto; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fc.v2.model.auto.TSysUser; +import org.apache.ibatis.annotations.Select; + +/** + * 用户Mapper接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface TSysUserMapper extends BaseMapper { + /** + * 根据用户名字查询用户 + * + * @param username + * @return + */ + @Select("select id, username, password, nickname, dep_id, pos_id, create_by, create_time, update_by, update_time, remark from t_sys_user where username = #{username}") + public TSysUser queryUserName(String username); + + /** + * 查询用户详情 String name 如果没用 注解@Param("") 它到mapper里面为_parameter + * + * @return + * @author fuce + * @Date 2020年12月6日 下午9:02:20 + */ + @Select({""}) + public List queryUserInfo(String username); +} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/TsysPermissionMapper.java b/src/main/java/com/fc/v2/mapper/auto/TsysPermissionMapper.java deleted file mode 100644 index ee5a58a..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/TsysPermissionMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.TsysPermission; -import com.fc.v2.model.auto.TsysPermissionExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TsysPermissionMapper extends BaseMapper { - long countByExample(TsysPermissionExample example); - - int deleteByExample(TsysPermissionExample example); - - int deleteByPrimaryKey(String id); - - int insert(TsysPermission record); - - int insertSelective(TsysPermission record); - - List selectByExample(TsysPermissionExample example); - - TsysPermission selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") TsysPermission record, @Param("example") TsysPermissionExample example); - - int updateByExample(@Param("record") TsysPermission record, @Param("example") TsysPermissionExample example); - - int updateByPrimaryKeySelective(TsysPermission record); - - int updateByPrimaryKey(TsysPermission record); -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/TsysPermissionRoleMapper.java b/src/main/java/com/fc/v2/mapper/auto/TsysPermissionRoleMapper.java deleted file mode 100644 index 718db92..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/TsysPermissionRoleMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.TsysPermissionRole; -import com.fc.v2.model.auto.TsysPermissionRoleExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TsysPermissionRoleMapper extends BaseMapper { - int countByExample(TsysPermissionRoleExample example); - - int deleteByExample(TsysPermissionRoleExample example); - - int deleteByPrimaryKey(String id); - - int insert(TsysPermissionRole record); - - int insertSelective(TsysPermissionRole record); - - List selectByExample(TsysPermissionRoleExample example); - - TsysPermissionRole selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") TsysPermissionRole record, @Param("example") TsysPermissionRoleExample example); - - int updateByExample(@Param("record") TsysPermissionRole record, @Param("example") TsysPermissionRoleExample example); - - int updateByPrimaryKeySelective(TsysPermissionRole record); - - int updateByPrimaryKey(TsysPermissionRole record); -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/TsysRoleMapper.java b/src/main/java/com/fc/v2/mapper/auto/TsysRoleMapper.java deleted file mode 100644 index 69a7a52..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/TsysRoleMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.TsysRole; -import com.fc.v2.model.auto.TsysRoleExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TsysRoleMapper extends BaseMapper { - int countByExample(TsysRoleExample example); - - int deleteByExample(TsysRoleExample example); - - int deleteByPrimaryKey(String id); - - int insert(TsysRole record); - - int insertSelective(TsysRole record); - - List selectByExample(TsysRoleExample example); - - TsysRole selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") TsysRole record, @Param("example") TsysRoleExample example); - - int updateByExample(@Param("record") TsysRole record, @Param("example") TsysRoleExample example); - - int updateByPrimaryKeySelective(TsysRole record); - - int updateByPrimaryKey(TsysRole record); -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/auto/TsysUserMapper.java b/src/main/java/com/fc/v2/mapper/auto/TsysUserMapper.java deleted file mode 100644 index 118bde2..0000000 --- a/src/main/java/com/fc/v2/mapper/auto/TsysUserMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.fc.v2.mapper.auto; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.TsysUser; -import com.fc.v2.model.auto.TsysUserExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TsysUserMapper extends BaseMapper { - long countByExample(TsysUserExample example); - - int deleteByExample(TsysUserExample example); - - int deleteByPrimaryKey(String id); - - int insert(TsysUser record); - - int insertSelective(TsysUser record); - - List selectByExample(TsysUserExample example); - - TsysUser selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") TsysUser record, @Param("example") TsysUserExample example); - - int updateByExample(@Param("record") TsysUser record, @Param("example") TsysUserExample example); - - int updateByPrimaryKeySelective(TsysUser record); - - int updateByPrimaryKey(TsysUser record); -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/mapper/custom/PermissionDao.java b/src/main/java/com/fc/v2/mapper/custom/PermissionDao.java deleted file mode 100644 index e22194b..0000000 --- a/src/main/java/com/fc/v2/mapper/custom/PermissionDao.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.fc.v2.mapper.custom; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.TsysPermission; - -import java.util.List; - -public interface PermissionDao extends BaseMapper { - /** - * 查询全部权限 - * @return - */ - List findAll(); - - /** - * 根据用户id查询出用户的所有权限 - * @param userId - * @return - */ - List findByAdminUserId(String userId); - - /** - * 根据角色id查询权限 - * @param roleid - * @return - */ - List queryRoleId(String roleid); - - - - -} diff --git a/src/main/java/com/fc/v2/mapper/custom/RoleDao.java b/src/main/java/com/fc/v2/mapper/custom/RoleDao.java deleted file mode 100644 index cf6eab4..0000000 --- a/src/main/java/com/fc/v2/mapper/custom/RoleDao.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.fc.v2.mapper.custom; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.TsysRole; - -import java.util.List; - -/** - * 角色Dao - * @ClassName: RoleDao - * @author fuce - * @date 2018年8月25日 - * - */ -public interface RoleDao extends BaseMapper { - /** - * 根据用户id查询角色 - * @param userid - * @return - */ - public List queryUserRole(String userid); -} diff --git a/src/main/java/com/fc/v2/mapper/custom/TsysUserDao.java b/src/main/java/com/fc/v2/mapper/custom/TsysUserDao.java deleted file mode 100644 index db03a12..0000000 --- a/src/main/java/com/fc/v2/mapper/custom/TsysUserDao.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.fc.v2.mapper.custom; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fc.v2.model.auto.TsysUser; - -import java.util.List; - -/** - * @ClassName: TsysUserDao - * @author fuce - * @date 2018年8月25日 - * - */ -public interface TsysUserDao extends BaseMapper { - /** - * 根据用户名字查询用户 - * @param username - * @return - */ - public TsysUser queryUserName(String username); - - /** - * 查询用户详情 - * String name 如果没用 注解@Param("") 它到mapper里面为_parameter - * @return - * @author fuce - * @Date 2020年12月6日 下午9:02:20 - */ - public List queryUserInfo(String username); -} diff --git a/src/main/java/com/fc/v2/model/auto/SysDepartment.java b/src/main/java/com/fc/v2/model/auto/SysDepartment.java deleted file mode 100644 index fb0b570..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysDepartment.java +++ /dev/null @@ -1,151 +0,0 @@ -package com.fc.v2.model.auto; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.lang.Integer; - -/** - * 部门表 SysDepartment - * - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2020-04-17 13:12:58 - */ -@TableName(value = "t_sys_department") -@ApiModel(value = "SysDepartment", description = "部门表") -public class SysDepartment implements Serializable { - - private static final long serialVersionUID = 1L; - - /** id **/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private Integer id; - - /** 父id **/ - @ApiModelProperty(value = "父id") - private String parentId; - - /** 部门名称 **/ - @ApiModelProperty(value = "部门名称") - private String deptName; - - /** 部门负责人 **/ - @ApiModelProperty(value = "部门负责人") - private String leader; - - /** 电话 **/ - @ApiModelProperty(value = "电话") - private String phone; - - /** 邮箱 **/ - @ApiModelProperty(value = "邮箱") - private String email; - - /** 状态 **/ - @ApiModelProperty(value = "状态") - private Integer status; - - /** 排序 **/ - @ApiModelProperty(value = "排序") - private Integer orderNum; - - private Integer childCount; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getLeader() { - return leader; - } - - public void setLeader(String leader) { - this.leader = leader; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public Integer getOrderNum() { - return orderNum; - } - - public void setOrderNum(Integer orderNum) { - this.orderNum = orderNum; - } - - public Integer getChildCount() { - return childCount; - } - - public void setChildCount(Integer childCount) { - this.childCount = childCount; - } - - public SysDepartment() { - super(); - } - - public SysDepartment(Integer id, String parentId, String deptName, String leader, String phone, String email, - Integer status, Integer orderNum, Integer childCount) { - this.id = id; - this.parentId = parentId; - this.deptName = deptName; - this.leader = leader; - this.phone = phone; - this.email = email; - this.status = status; - this.orderNum = orderNum; - this.childCount = childCount; - - } - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysDepartmentExample.java b/src/main/java/com/fc/v2/model/auto/SysDepartmentExample.java deleted file mode 100644 index 8f402d6..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysDepartmentExample.java +++ /dev/null @@ -1,775 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.List; - -/** - * 部门表 SysDepartmentExample - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2020-04-17 13:12:58 - */ -public class SysDepartmentExample { - - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysDepartmentExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Integer value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Integer value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Integer value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Integer value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Integer value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Integer value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(Integer value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(Integer value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Integer value1, Integer value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Integer value1, Integer value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - - public Criteria andParentIdIsNull() { - addCriterion("parent_id is null"); - return (Criteria) this; - } - - public Criteria andParentIdIsNotNull() { - addCriterion("parent_id is not null"); - return (Criteria) this; - } - - public Criteria andParentIdEqualTo(String value) { - addCriterion("parent_id =", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotEqualTo(String value) { - addCriterion("parent_id <>", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdGreaterThan(String value) { - addCriterion("parent_id >", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdGreaterThanOrEqualTo(String value) { - addCriterion("parent_id >=", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdLessThan(String value) { - addCriterion("parent_id <", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdLessThanOrEqualTo(String value) { - addCriterion("parent_id <=", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdLike(String value) { - addCriterion("parent_id like", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotLike(String value) { - addCriterion("parent_id not like", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdIn(List values) { - addCriterion("parent_id in", values, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotIn(List values) { - addCriterion("parent_id not in", values, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdBetween(String value1, String value2) { - addCriterion("parent_id between", value1, value2, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotBetween(String value1, String value2) { - addCriterion("parent_id not between", value1, value2, "parentId"); - return (Criteria) this; - } - - - public Criteria andDeptNameIsNull() { - addCriterion("dept_name is null"); - return (Criteria) this; - } - - public Criteria andDeptNameIsNotNull() { - addCriterion("dept_name is not null"); - return (Criteria) this; - } - - public Criteria andDeptNameEqualTo(String value) { - addCriterion("dept_name =", value, "deptName"); - return (Criteria) this; - } - - public Criteria andDeptNameNotEqualTo(String value) { - addCriterion("dept_name <>", value, "deptName"); - return (Criteria) this; - } - - public Criteria andDeptNameGreaterThan(String value) { - addCriterion("dept_name >", value, "deptName"); - return (Criteria) this; - } - - public Criteria andDeptNameGreaterThanOrEqualTo(String value) { - addCriterion("dept_name >=", value, "deptName"); - return (Criteria) this; - } - - public Criteria andDeptNameLessThan(String value) { - addCriterion("dept_name <", value, "deptName"); - return (Criteria) this; - } - - public Criteria andDeptNameLessThanOrEqualTo(String value) { - addCriterion("dept_name <=", value, "deptName"); - return (Criteria) this; - } - - public Criteria andDeptNameLike(String value) { - addCriterion("dept_name like", value, "deptName"); - return (Criteria) this; - } - - public Criteria andDeptNameNotLike(String value) { - addCriterion("dept_name not like", value, "deptName"); - return (Criteria) this; - } - - public Criteria andDeptNameIn(List values) { - addCriterion("dept_name in", values, "deptName"); - return (Criteria) this; - } - - public Criteria andDeptNameNotIn(List values) { - addCriterion("dept_name not in", values, "deptName"); - return (Criteria) this; - } - - public Criteria andDeptNameBetween(String value1, String value2) { - addCriterion("dept_name between", value1, value2, "deptName"); - return (Criteria) this; - } - - public Criteria andDeptNameNotBetween(String value1, String value2) { - addCriterion("dept_name not between", value1, value2, "deptName"); - return (Criteria) this; - } - - - public Criteria andLeaderIsNull() { - addCriterion("leader is null"); - return (Criteria) this; - } - - public Criteria andLeaderIsNotNull() { - addCriterion("leader is not null"); - return (Criteria) this; - } - - public Criteria andLeaderEqualTo(String value) { - addCriterion("leader =", value, "leader"); - return (Criteria) this; - } - - public Criteria andLeaderNotEqualTo(String value) { - addCriterion("leader <>", value, "leader"); - return (Criteria) this; - } - - public Criteria andLeaderGreaterThan(String value) { - addCriterion("leader >", value, "leader"); - return (Criteria) this; - } - - public Criteria andLeaderGreaterThanOrEqualTo(String value) { - addCriterion("leader >=", value, "leader"); - return (Criteria) this; - } - - public Criteria andLeaderLessThan(String value) { - addCriterion("leader <", value, "leader"); - return (Criteria) this; - } - - public Criteria andLeaderLessThanOrEqualTo(String value) { - addCriterion("leader <=", value, "leader"); - return (Criteria) this; - } - - public Criteria andLeaderLike(String value) { - addCriterion("leader like", value, "leader"); - return (Criteria) this; - } - - public Criteria andLeaderNotLike(String value) { - addCriterion("leader not like", value, "leader"); - return (Criteria) this; - } - - public Criteria andLeaderIn(List values) { - addCriterion("leader in", values, "leader"); - return (Criteria) this; - } - - public Criteria andLeaderNotIn(List values) { - addCriterion("leader not in", values, "leader"); - return (Criteria) this; - } - - public Criteria andLeaderBetween(String value1, String value2) { - addCriterion("leader between", value1, value2, "leader"); - return (Criteria) this; - } - - public Criteria andLeaderNotBetween(String value1, String value2) { - addCriterion("leader not between", value1, value2, "leader"); - return (Criteria) this; - } - - - public Criteria andPhoneIsNull() { - addCriterion("phone is null"); - return (Criteria) this; - } - - public Criteria andPhoneIsNotNull() { - addCriterion("phone is not null"); - return (Criteria) this; - } - - public Criteria andPhoneEqualTo(String value) { - addCriterion("phone =", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotEqualTo(String value) { - addCriterion("phone <>", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneGreaterThan(String value) { - addCriterion("phone >", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneGreaterThanOrEqualTo(String value) { - addCriterion("phone >=", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLessThan(String value) { - addCriterion("phone <", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLessThanOrEqualTo(String value) { - addCriterion("phone <=", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLike(String value) { - addCriterion("phone like", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotLike(String value) { - addCriterion("phone not like", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneIn(List values) { - addCriterion("phone in", values, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotIn(List values) { - addCriterion("phone not in", values, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneBetween(String value1, String value2) { - addCriterion("phone between", value1, value2, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotBetween(String value1, String value2) { - addCriterion("phone not between", value1, value2, "phone"); - return (Criteria) this; - } - - - public Criteria andEmailIsNull() { - addCriterion("email is null"); - return (Criteria) this; - } - - public Criteria andEmailIsNotNull() { - addCriterion("email is not null"); - return (Criteria) this; - } - - public Criteria andEmailEqualTo(String value) { - addCriterion("email =", value, "email"); - return (Criteria) this; - } - - public Criteria andEmailNotEqualTo(String value) { - addCriterion("email <>", value, "email"); - return (Criteria) this; - } - - public Criteria andEmailGreaterThan(String value) { - addCriterion("email >", value, "email"); - return (Criteria) this; - } - - public Criteria andEmailGreaterThanOrEqualTo(String value) { - addCriterion("email >=", value, "email"); - return (Criteria) this; - } - - public Criteria andEmailLessThan(String value) { - addCriterion("email <", value, "email"); - return (Criteria) this; - } - - public Criteria andEmailLessThanOrEqualTo(String value) { - addCriterion("email <=", value, "email"); - return (Criteria) this; - } - - public Criteria andEmailLike(String value) { - addCriterion("email like", value, "email"); - return (Criteria) this; - } - - public Criteria andEmailNotLike(String value) { - addCriterion("email not like", value, "email"); - return (Criteria) this; - } - - public Criteria andEmailIn(List values) { - addCriterion("email in", values, "email"); - return (Criteria) this; - } - - public Criteria andEmailNotIn(List values) { - addCriterion("email not in", values, "email"); - return (Criteria) this; - } - - public Criteria andEmailBetween(String value1, String value2) { - addCriterion("email between", value1, value2, "email"); - return (Criteria) this; - } - - public Criteria andEmailNotBetween(String value1, String value2) { - addCriterion("email not between", value1, value2, "email"); - return (Criteria) this; - } - - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(Integer value) { - addCriterion("status =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(Integer value) { - addCriterion("status <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(Integer value) { - addCriterion("status >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("status >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(Integer value) { - addCriterion("status <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(Integer value) { - addCriterion("status <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLike(Integer value) { - addCriterion("status like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(Integer value) { - addCriterion("status not like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(Integer value1, Integer value2) { - addCriterion("status between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(Integer value1, Integer value2) { - addCriterion("status not between", value1, value2, "status"); - return (Criteria) this; - } - - - public Criteria andOrderNumIsNull() { - addCriterion("order_num is null"); - return (Criteria) this; - } - - public Criteria andOrderNumIsNotNull() { - addCriterion("order_num is not null"); - return (Criteria) this; - } - - public Criteria andOrderNumEqualTo(Integer value) { - addCriterion("order_num =", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotEqualTo(Integer value) { - addCriterion("order_num <>", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumGreaterThan(Integer value) { - addCriterion("order_num >", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumGreaterThanOrEqualTo(Integer value) { - addCriterion("order_num >=", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumLessThan(Integer value) { - addCriterion("order_num <", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumLessThanOrEqualTo(Integer value) { - addCriterion("order_num <=", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumLike(Integer value) { - addCriterion("order_num like", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotLike(Integer value) { - addCriterion("order_num not like", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumIn(List values) { - addCriterion("order_num in", values, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotIn(List values) { - addCriterion("order_num not in", values, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumBetween(Integer value1, Integer value2) { - addCriterion("order_num between", value1, value2, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotBetween(Integer value1, Integer value2) { - addCriterion("order_num not between", value1, value2, "orderNum"); - return (Criteria) this; - } - - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysInterUrl.java b/src/main/java/com/fc/v2/model/auto/SysInterUrl.java deleted file mode 100644 index aa66f2e..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysInterUrl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.fc.v2.model.auto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; - -/** - * 拦截url表 SysInterUrl - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2020-01-05 01:48:22 - */ -@TableName(value = "t_sys_inter_url") - @ApiModel(value="SysInterUrl", description="拦截url表") -public class SysInterUrl implements Serializable { - - private static final long serialVersionUID = 1L; - - - /** 主键 **/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - - /** 拦截名称 **/ - @ApiModelProperty(value = "拦截名称") - private String interName; - - /** 拦截url **/ - @ApiModelProperty(value = "拦截url") - private String url; - - /** 类型 **/ - @ApiModelProperty(value = "类型") - private Integer type; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - - public String getInterName() { - return interName; - } - - public void setInterName(String interName) { - this.interName = interName; - } - - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - - public SysInterUrl() { - super(); - } - - - public SysInterUrl(String id,String interName,String url,Integer type) { - - this.id = id; - this.interName = interName; - this.url = url; - this.type = type; - - } - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysInterUrlExample.java b/src/main/java/com/fc/v2/model/auto/SysInterUrlExample.java deleted file mode 100644 index ce742b3..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysInterUrlExample.java +++ /dev/null @@ -1,491 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.List; - -/** - * 拦截url表 SysInterUrlExample - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2020-01-05 01:48:22 - */ -public class SysInterUrlExample { - - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysInterUrlExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - - public Criteria andInterNameIsNull() { - addCriterion("inter_name is null"); - return (Criteria) this; - } - - public Criteria andInterNameIsNotNull() { - addCriterion("inter_name is not null"); - return (Criteria) this; - } - - public Criteria andInterNameEqualTo(String value) { - addCriterion("inter_name =", value, "interName"); - return (Criteria) this; - } - - public Criteria andInterNameNotEqualTo(String value) { - addCriterion("inter_name <>", value, "interName"); - return (Criteria) this; - } - - public Criteria andInterNameGreaterThan(String value) { - addCriterion("inter_name >", value, "interName"); - return (Criteria) this; - } - - public Criteria andInterNameGreaterThanOrEqualTo(String value) { - addCriterion("inter_name >=", value, "interName"); - return (Criteria) this; - } - - public Criteria andInterNameLessThan(String value) { - addCriterion("inter_name <", value, "interName"); - return (Criteria) this; - } - - public Criteria andInterNameLessThanOrEqualTo(String value) { - addCriterion("inter_name <=", value, "interName"); - return (Criteria) this; - } - - public Criteria andInterNameLike(String value) { - addCriterion("inter_name like", value, "interName"); - return (Criteria) this; - } - - public Criteria andInterNameNotLike(String value) { - addCriterion("inter_name not like", value, "interName"); - return (Criteria) this; - } - - public Criteria andInterNameIn(List values) { - addCriterion("inter_name in", values, "interName"); - return (Criteria) this; - } - - public Criteria andInterNameNotIn(List values) { - addCriterion("inter_name not in", values, "interName"); - return (Criteria) this; - } - - public Criteria andInterNameBetween(String value1, String value2) { - addCriterion("inter_name between", value1, value2, "interName"); - return (Criteria) this; - } - - public Criteria andInterNameNotBetween(String value1, String value2) { - addCriterion("inter_name not between", value1, value2, "interName"); - return (Criteria) this; - } - - - public Criteria andUrlIsNull() { - addCriterion("url is null"); - return (Criteria) this; - } - - public Criteria andUrlIsNotNull() { - addCriterion("url is not null"); - return (Criteria) this; - } - - public Criteria andUrlEqualTo(String value) { - addCriterion("url =", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotEqualTo(String value) { - addCriterion("url <>", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlGreaterThan(String value) { - addCriterion("url >", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlGreaterThanOrEqualTo(String value) { - addCriterion("url >=", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlLessThan(String value) { - addCriterion("url <", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlLessThanOrEqualTo(String value) { - addCriterion("url <=", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlLike(String value) { - addCriterion("url like", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotLike(String value) { - addCriterion("url not like", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlIn(List values) { - addCriterion("url in", values, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotIn(List values) { - addCriterion("url not in", values, "url"); - return (Criteria) this; - } - - public Criteria andUrlBetween(String value1, String value2) { - addCriterion("url between", value1, value2, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotBetween(String value1, String value2) { - addCriterion("url not between", value1, value2, "url"); - return (Criteria) this; - } - - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(Integer value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(Integer value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(Integer value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(Integer value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(Integer value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLike(Integer value) { - addCriterion("type like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotLike(Integer value) { - addCriterion("type not like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(Integer value1, Integer value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(Integer value1, Integer value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysPosition.java b/src/main/java/com/fc/v2/model/auto/SysPosition.java deleted file mode 100644 index 83ae68f..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysPosition.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.fc.v2.model.auto; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.lang.Integer; - -/** - * 岗位表 SysPosition - * - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2020-04-16 23:46:24 - */ -@TableName(value = "t_sys_position") -@ApiModel(value = "SysPosition", description = "岗位表") -public class SysPosition implements Serializable { - - private static final long serialVersionUID = 1L; - - /** 主键 **/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - - /** 岗位名称 **/ - @ApiModelProperty(value = "岗位名称") - private String postName; - - /** 排序 **/ - @ApiModelProperty(value = "排序") - private Integer orderNum; - - /** 状态 **/ - @ApiModelProperty(value = "状态") - private Integer status; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getPostName() { - return postName; - } - - public void setPostName(String postName) { - this.postName = postName; - } - - public Integer getOrderNum() { - return orderNum; - } - - public void setOrderNum(Integer orderNum) { - this.orderNum = orderNum; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public SysPosition() { - super(); - } - - public SysPosition(String id, String postName, Integer orderNum, Integer status) { - - this.id = id; - this.postName = postName; - this.orderNum = orderNum; - this.status = status; - - } - -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/SysPositionExample.java b/src/main/java/com/fc/v2/model/auto/SysPositionExample.java deleted file mode 100644 index 3f7d70a..0000000 --- a/src/main/java/com/fc/v2/model/auto/SysPositionExample.java +++ /dev/null @@ -1,491 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.List; - -/** - * 岗位表 SysPositionExample - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2020-04-16 23:46:24 - */ -public class SysPositionExample { - - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysPositionExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - - public Criteria andPostNameIsNull() { - addCriterion("post_name is null"); - return (Criteria) this; - } - - public Criteria andPostNameIsNotNull() { - addCriterion("post_name is not null"); - return (Criteria) this; - } - - public Criteria andPostNameEqualTo(String value) { - addCriterion("post_name =", value, "postName"); - return (Criteria) this; - } - - public Criteria andPostNameNotEqualTo(String value) { - addCriterion("post_name <>", value, "postName"); - return (Criteria) this; - } - - public Criteria andPostNameGreaterThan(String value) { - addCriterion("post_name >", value, "postName"); - return (Criteria) this; - } - - public Criteria andPostNameGreaterThanOrEqualTo(String value) { - addCriterion("post_name >=", value, "postName"); - return (Criteria) this; - } - - public Criteria andPostNameLessThan(String value) { - addCriterion("post_name <", value, "postName"); - return (Criteria) this; - } - - public Criteria andPostNameLessThanOrEqualTo(String value) { - addCriterion("post_name <=", value, "postName"); - return (Criteria) this; - } - - public Criteria andPostNameLike(String value) { - addCriterion("post_name like", value, "postName"); - return (Criteria) this; - } - - public Criteria andPostNameNotLike(String value) { - addCriterion("post_name not like", value, "postName"); - return (Criteria) this; - } - - public Criteria andPostNameIn(List values) { - addCriterion("post_name in", values, "postName"); - return (Criteria) this; - } - - public Criteria andPostNameNotIn(List values) { - addCriterion("post_name not in", values, "postName"); - return (Criteria) this; - } - - public Criteria andPostNameBetween(String value1, String value2) { - addCriterion("post_name between", value1, value2, "postName"); - return (Criteria) this; - } - - public Criteria andPostNameNotBetween(String value1, String value2) { - addCriterion("post_name not between", value1, value2, "postName"); - return (Criteria) this; - } - - - public Criteria andOrderNumIsNull() { - addCriterion("order_num is null"); - return (Criteria) this; - } - - public Criteria andOrderNumIsNotNull() { - addCriterion("order_num is not null"); - return (Criteria) this; - } - - public Criteria andOrderNumEqualTo(Integer value) { - addCriterion("order_num =", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotEqualTo(Integer value) { - addCriterion("order_num <>", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumGreaterThan(Integer value) { - addCriterion("order_num >", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumGreaterThanOrEqualTo(Integer value) { - addCriterion("order_num >=", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumLessThan(Integer value) { - addCriterion("order_num <", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumLessThanOrEqualTo(Integer value) { - addCriterion("order_num <=", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumLike(Integer value) { - addCriterion("order_num like", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotLike(Integer value) { - addCriterion("order_num not like", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumIn(List values) { - addCriterion("order_num in", values, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotIn(List values) { - addCriterion("order_num not in", values, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumBetween(Integer value1, Integer value2) { - addCriterion("order_num between", value1, value2, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotBetween(Integer value1, Integer value2) { - addCriterion("order_num not between", value1, value2, "orderNum"); - return (Criteria) this; - } - - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(Integer value) { - addCriterion("status =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(Integer value) { - addCriterion("status <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(Integer value) { - addCriterion("status >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("status >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(Integer value) { - addCriterion("status <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(Integer value) { - addCriterion("status <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLike(Integer value) { - addCriterion("status like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(Integer value) { - addCriterion("status not like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(Integer value1, Integer value2) { - addCriterion("status between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(Integer value1, Integer value2) { - addCriterion("status not between", value1, value2, "status"); - return (Criteria) this; - } - - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/TSysDepartment.java b/src/main/java/com/fc/v2/model/auto/TSysDepartment.java new file mode 100644 index 0000000..81bf017 --- /dev/null +++ b/src/main/java/com/fc/v2/model/auto/TSysDepartment.java @@ -0,0 +1,161 @@ + +package com.fc.v2.model.auto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.common.base.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +/** + * 部门对象 t_sys_department + * + * @author zhaonz + * @date 2021-08-05 + */ +@TableName("t_sys_department") +@ApiModel(value = "SysDepartment", description = "部门表") +public class TSysDepartment extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "主键") + private Long id; + + /** 父id */ + @ApiModelProperty(value = "父id") + private Long parentId; + + /** 部门名称 */ + @ApiModelProperty(value = "部门名称") + private String deptName; + + /** 部门负责人 */ + @ApiModelProperty(value = "部门负责人") + private String leader; + + /** 电话 */ + @ApiModelProperty(value = "电话") + private String phone; + + /** 邮箱 */ + @ApiModelProperty(value = "邮箱") + private String email; + + /** 状态 */ + @ApiModelProperty(value = "状态") + private Integer status; + + /** 排序 */ + @ApiModelProperty(value = "排序") + private Integer orderNum; + + @TableField(exist = false) + private Integer childCount; + + public Integer getChildCount() { + return childCount; + } + + public void setChildCount(Integer childCount) { + this.childCount = childCount; + } + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public Long getParentId() + { + return parentId; + } + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + public void setLeader(String leader) + { + this.leader = leader; + } + + public String getLeader() + { + return leader; + } + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getPhone() + { + return phone; + } + public void setEmail(String email) + { + this.email = email; + } + + public String getEmail() + { + return email; + } + public void setStatus(Integer status) + { + this.status = status; + } + + public Integer getStatus() + { + return status; + } + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + public Integer getOrderNum() + { + return orderNum; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("parentId", getParentId()) + .append("deptName", getDeptName()) + .append("leader", getLeader()) + .append("phone", getPhone()) + .append("email", getEmail()) + .append("status", getStatus()) + .append("orderNum", getOrderNum()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysInterUrl.java b/src/main/java/com/fc/v2/model/auto/TSysInterUrl.java new file mode 100644 index 0000000..4400bb4 --- /dev/null +++ b/src/main/java/com/fc/v2/model/auto/TSysInterUrl.java @@ -0,0 +1,95 @@ + +package com.fc.v2.model.auto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +import com.fc.v2.common.base.BaseEntity; + +/** + * 拦截url对象 t_sys_inter_url + * + * @author zhaonz + * @date 2021-08-06 + */ +@TableName("t_sys_inter_url") +@ApiModel(value="TSysInterUrl", description="拦截url表") +public class TSysInterUrl extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "主键") + private Long id; + + /** 拦截名称 */ + @ApiModelProperty(value = "拦截名称") + private String interName; + + /** 拦截url */ + @ApiModelProperty(value = "拦截url") + private String url; + + /** 类型 */ + @ApiModelProperty(value = "类型") + private Integer type; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setInterName(String interName) + { + this.interName = interName; + } + + public String getInterName() + { + return interName; + } + public void setUrl(String url) + { + this.url = url; + } + + public String getUrl() + { + return url; + } + public void setType(Integer type) + { + this.type = type; + } + + public Integer getType() + { + return type; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("interName", getInterName()) + .append("url", getUrl()) + .append("type", getType()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysPosition.java b/src/main/java/com/fc/v2/model/auto/TSysPosition.java new file mode 100644 index 0000000..a247327 --- /dev/null +++ b/src/main/java/com/fc/v2/model/auto/TSysPosition.java @@ -0,0 +1,94 @@ + +package com.fc.v2.model.auto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.common.base.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +/** + * 岗位对象 t_sys_position + * + * @author zhaonz + * @date 2021-08-05 + */ +@TableName("t_sys_position") +@ApiModel(value = "SysPosition", description = "岗位表") +public class TSysPosition extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "主键") + private Long id; + + /** 岗位名称 */ + @ApiModelProperty(value = "岗位名称") + private String postName; + + /** 排序 */ + @ApiModelProperty(value = "排序") + private Integer orderNum; + + /** 状态 */ + @ApiModelProperty(value = "状态") + private Integer status; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setPostName(String postName) + { + this.postName = postName; + } + + public String getPostName() + { + return postName; + } + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + public Integer getOrderNum() + { + return orderNum; + } + public void setStatus(Integer status) + { + this.status = status; + } + + public Integer getStatus() + { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("postName", getPostName()) + .append("orderNum", getOrderNum()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysRoleUser.java b/src/main/java/com/fc/v2/model/auto/TSysRoleUser.java index fcc1f8e..f345511 100644 --- a/src/main/java/com/fc/v2/model/auto/TSysRoleUser.java +++ b/src/main/java/com/fc/v2/model/auto/TSysRoleUser.java @@ -1,57 +1,74 @@ -package com.fc.v2.model.auto; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +package com.fc.v2.model.auto; -import java.io.Serializable; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.common.base.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; -@TableName(value = "t_sys_role_user") -public class TSysRoleUser implements Serializable { +import com.baomidou.mybatisplus.annotation.*; +/** + * 用户角色中间对象 t_sys_role_user + * + * @author zhaonz + * @date 2021-08-05 + */ +@TableName("t_sys_role_user") +public class TSysRoleUser extends BaseEntity +{ + private static final long serialVersionUID = 1L; + /** 主键 */ @TableId(type = IdType.ASSIGN_ID) - private String id; + @JsonSerialize(using = ToStringSerializer.class) + private Long id; - private String sysUserId; + /** 用户id */ + private Long sysUserId; - private String sysRoleId; + /** 角色id */ + private Long sysRoleId; - private static final long serialVersionUID = 1L; + public void setId(Long id) + { + this.id = id; + } - public String getId() { + public Long getId() + { return id; } - - public void setId(String id) { - this.id = id == null ? null : id.trim(); + public void seTSysUserId(Long sysUserId) + { + this.sysUserId = sysUserId; } - public String getSysUserId() { + public Long geTSysUserId() + { return sysUserId; } - - public void setSysUserId(String sysUserId) { - this.sysUserId = sysUserId == null ? null : sysUserId.trim(); + public void setSysRoleId(Long sysRoleId) + { + this.sysRoleId = sysRoleId; } - public String getSysRoleId() { + public Long getSysRoleId() + { return sysRoleId; } - public void setSysRoleId(String sysRoleId) { - this.sysRoleId = sysRoleId == null ? null : sysRoleId.trim(); + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("sysUserId", geTSysUserId()) + .append("sysRoleId", getSysRoleId()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } - - public TSysRoleUser() { - super(); - } - - public TSysRoleUser(String id, String sysUserId, String sysRoleId) { - super(); - this.id = id; - this.sysUserId = sysUserId; - this.sysRoleId = sysRoleId; - } - - -} \ No newline at end of file +} diff --git a/src/main/java/com/fc/v2/model/auto/TSysRoleUserExample.java b/src/main/java/com/fc/v2/model/auto/TSysRoleUserExample.java deleted file mode 100644 index 7261647..0000000 --- a/src/main/java/com/fc/v2/model/auto/TSysRoleUserExample.java +++ /dev/null @@ -1,410 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.List; - -public class TSysRoleUserExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public TSysRoleUserExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andSysUserIdIsNull() { - addCriterion("sys_user_id is null"); - return (Criteria) this; - } - - public Criteria andSysUserIdIsNotNull() { - addCriterion("sys_user_id is not null"); - return (Criteria) this; - } - - public Criteria andSysUserIdEqualTo(String value) { - addCriterion("sys_user_id =", value, "sysUserId"); - return (Criteria) this; - } - - public Criteria andSysUserIdNotEqualTo(String value) { - addCriterion("sys_user_id <>", value, "sysUserId"); - return (Criteria) this; - } - - public Criteria andSysUserIdGreaterThan(String value) { - addCriterion("sys_user_id >", value, "sysUserId"); - return (Criteria) this; - } - - public Criteria andSysUserIdGreaterThanOrEqualTo(String value) { - addCriterion("sys_user_id >=", value, "sysUserId"); - return (Criteria) this; - } - - public Criteria andSysUserIdLessThan(String value) { - addCriterion("sys_user_id <", value, "sysUserId"); - return (Criteria) this; - } - - public Criteria andSysUserIdLessThanOrEqualTo(String value) { - addCriterion("sys_user_id <=", value, "sysUserId"); - return (Criteria) this; - } - - public Criteria andSysUserIdLike(String value) { - addCriterion("sys_user_id like", value, "sysUserId"); - return (Criteria) this; - } - - public Criteria andSysUserIdNotLike(String value) { - addCriterion("sys_user_id not like", value, "sysUserId"); - return (Criteria) this; - } - - public Criteria andSysUserIdIn(List values) { - addCriterion("sys_user_id in", values, "sysUserId"); - return (Criteria) this; - } - - public Criteria andSysUserIdNotIn(List values) { - addCriterion("sys_user_id not in", values, "sysUserId"); - return (Criteria) this; - } - - public Criteria andSysUserIdBetween(String value1, String value2) { - addCriterion("sys_user_id between", value1, value2, "sysUserId"); - return (Criteria) this; - } - - public Criteria andSysUserIdNotBetween(String value1, String value2) { - addCriterion("sys_user_id not between", value1, value2, "sysUserId"); - return (Criteria) this; - } - - public Criteria andSysRoleIdIsNull() { - addCriterion("sys_role_id is null"); - return (Criteria) this; - } - - public Criteria andSysRoleIdIsNotNull() { - addCriterion("sys_role_id is not null"); - return (Criteria) this; - } - - public Criteria andSysRoleIdEqualTo(String value) { - addCriterion("sys_role_id =", value, "sysRoleId"); - return (Criteria) this; - } - - public Criteria andSysRoleIdNotEqualTo(String value) { - addCriterion("sys_role_id <>", value, "sysRoleId"); - return (Criteria) this; - } - - public Criteria andSysRoleIdGreaterThan(String value) { - addCriterion("sys_role_id >", value, "sysRoleId"); - return (Criteria) this; - } - - public Criteria andSysRoleIdGreaterThanOrEqualTo(String value) { - addCriterion("sys_role_id >=", value, "sysRoleId"); - return (Criteria) this; - } - - public Criteria andSysRoleIdLessThan(String value) { - addCriterion("sys_role_id <", value, "sysRoleId"); - return (Criteria) this; - } - - public Criteria andSysRoleIdLessThanOrEqualTo(String value) { - addCriterion("sys_role_id <=", value, "sysRoleId"); - return (Criteria) this; - } - - public Criteria andSysRoleIdLike(String value) { - addCriterion("sys_role_id like", value, "sysRoleId"); - return (Criteria) this; - } - - public Criteria andSysRoleIdNotLike(String value) { - addCriterion("sys_role_id not like", value, "sysRoleId"); - return (Criteria) this; - } - - public Criteria andSysRoleIdIn(List values) { - addCriterion("sys_role_id in", values, "sysRoleId"); - return (Criteria) this; - } - - public Criteria andSysRoleIdNotIn(List values) { - addCriterion("sys_role_id not in", values, "sysRoleId"); - return (Criteria) this; - } - - public Criteria andSysRoleIdBetween(String value1, String value2) { - addCriterion("sys_role_id between", value1, value2, "sysRoleId"); - return (Criteria) this; - } - - public Criteria andSysRoleIdNotBetween(String value1, String value2) { - addCriterion("sys_role_id not between", value1, value2, "sysRoleId"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/TsysPermission.java b/src/main/java/com/fc/v2/model/auto/TsysPermission.java index 63ee472..50ca670 100644 --- a/src/main/java/com/fc/v2/model/auto/TsysPermission.java +++ b/src/main/java/com/fc/v2/model/auto/TsysPermission.java @@ -1,154 +1,189 @@ -package com.fc.v2.model.auto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; +package com.fc.v2.model.auto; -@TableName(value = "t_sys_permission") -public class TsysPermission implements Serializable { +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.common.base.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +/** + * 权限对象 t_sys_permission + * + * @author zhaonz + * @date 2021-08-05 + */ +@TableName("t_sys_permission") +public class TSysPermission extends BaseEntity +{ + private static final long serialVersionUID = 1L; + /** 主键 */ @TableId(type = IdType.ASSIGN_ID) - private String id; + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + /** 权限名称 */ private String name; + /** 权限描述 */ private String descripion; + /** 授权链接 */ private String url; + /** 是否跳转 0 不跳转 1跳转 */ private Integer isBlank; - private String pid; + /** 父节点id */ + private Long pid; + /** 权限标识 */ private String perms; + /** 类型 0：目录 1：菜单 2：按钮 */ private Integer type; + /** 菜单图标 */ private String icon; + /** 排序 */ private Integer orderNum; - + + /** 是否可见 */ private Integer visible; - + + @TableField(exist = false) private Integer childCount; - - private static final long serialVersionUID = 1L; - public TsysPermission(String id, String name, String descripion, String url, Integer isBlank, String pid, String perms, Integer type, String icon, Integer orderNum, Integer visible, Integer childCount) { - this.id = id; - this.name = name; - this.descripion = descripion; - this.url = url; - this.isBlank = isBlank; - this.pid = pid; - this.perms = perms; - this.type = type; - this.icon = icon; - this.orderNum = orderNum; - this.visible=visible; + public Integer getChildCount() { + return childCount; + } + + public void setChildCount(Integer childCount) { this.childCount = childCount; } - public TsysPermission() { - super(); + public void setId(Long id) + { + this.id = id; } - public String getId() { + public Long getId() + { return id; } - - public void setId(String id) { - this.id = id == null ? null : id.trim(); + public void setName(String name) + { + this.name = name; } - public String getName() { + public String getName() + { return name; } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); + public void setDescripion(String descripion) + { + this.descripion = descripion; } - public String getDescripion() { + public String getDescripion() + { return descripion; } - - public void setDescripion(String descripion) { - this.descripion = descripion == null ? null : descripion.trim(); + public void setUrl(String url) + { + this.url = url; } - public String getUrl() { + public String getUrl() + { return url; } - - public void setUrl(String url) { - this.url = url == null ? null : url.trim(); + public void setIsBlank(Integer isBlank) + { + this.isBlank = isBlank; } - public Integer getIsBlank() { + public Integer getIsBlank() + { return isBlank; } - - public void setIsBlank(Integer isBlank) { - this.isBlank = isBlank; + public void setPid(Long pid) + { + this.pid = pid; } - public String getPid() { + public Long getPid() + { return pid; } - - public void setPid(String pid) { - this.pid = pid == null ? null : pid.trim(); + public void setPerms(String perms) + { + this.perms = perms; } - public String getPerms() { + public String getPerms() + { return perms; } - - public void setPerms(String perms) { - this.perms = perms == null ? null : perms.trim(); + public void setType(Integer type) + { + this.type = type; } - public Integer getType() { + public Integer getType() + { return type; } - - public void setType(Integer type) { - this.type = type; + public void setIcon(String icon) + { + this.icon = icon; } - public String getIcon() { + public String getIcon() + { return icon; } - - public void setIcon(String icon) { - this.icon = icon == null ? null : icon.trim(); + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; } - public Integer getOrderNum() { + public Integer getOrderNum() + { return orderNum; } - - public void setOrderNum(Integer orderNum) { - this.orderNum = orderNum; - } - - public Integer getChildCount() { - return childCount; - } - - public void setChildCount(Integer childCount) { - this.childCount = childCount; - } - - public Integer getVisible() { - return visible; - } - - public void setVisible(Integer visible) { - this.visible = visible; - } - -} \ No newline at end of file + public void setVisible(Integer visible) + { + this.visible = visible; + } + + public Integer getVisible() + { + return visible; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("descripion", getDescripion()) + .append("url", getUrl()) + .append("isBlank", getIsBlank()) + .append("pid", getPid()) + .append("perms", getPerms()) + .append("type", getType()) + .append("icon", getIcon()) + .append("orderNum", getOrderNum()) + .append("visible", getVisible()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TsysPermissionExample.java b/src/main/java/com/fc/v2/model/auto/TsysPermissionExample.java deleted file mode 100644 index 777414c..0000000 --- a/src/main/java/com/fc/v2/model/auto/TsysPermissionExample.java +++ /dev/null @@ -1,930 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.List; - -public class TsysPermissionExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public TsysPermissionExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andDescripionIsNull() { - addCriterion("descripion is null"); - return (Criteria) this; - } - - public Criteria andDescripionIsNotNull() { - addCriterion("descripion is not null"); - return (Criteria) this; - } - - public Criteria andDescripionEqualTo(String value) { - addCriterion("descripion =", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionNotEqualTo(String value) { - addCriterion("descripion <>", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionGreaterThan(String value) { - addCriterion("descripion >", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionGreaterThanOrEqualTo(String value) { - addCriterion("descripion >=", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionLessThan(String value) { - addCriterion("descripion <", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionLessThanOrEqualTo(String value) { - addCriterion("descripion <=", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionLike(String value) { - addCriterion("descripion like", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionNotLike(String value) { - addCriterion("descripion not like", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionIn(List values) { - addCriterion("descripion in", values, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionNotIn(List values) { - addCriterion("descripion not in", values, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionBetween(String value1, String value2) { - addCriterion("descripion between", value1, value2, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionNotBetween(String value1, String value2) { - addCriterion("descripion not between", value1, value2, "descripion"); - return (Criteria) this; - } - - public Criteria andUrlIsNull() { - addCriterion("url is null"); - return (Criteria) this; - } - - public Criteria andUrlIsNotNull() { - addCriterion("url is not null"); - return (Criteria) this; - } - - public Criteria andUrlEqualTo(String value) { - addCriterion("url =", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotEqualTo(String value) { - addCriterion("url <>", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlGreaterThan(String value) { - addCriterion("url >", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlGreaterThanOrEqualTo(String value) { - addCriterion("url >=", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlLessThan(String value) { - addCriterion("url <", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlLessThanOrEqualTo(String value) { - addCriterion("url <=", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlLike(String value) { - addCriterion("url like", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotLike(String value) { - addCriterion("url not like", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlIn(List values) { - addCriterion("url in", values, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotIn(List values) { - addCriterion("url not in", values, "url"); - return (Criteria) this; - } - - public Criteria andUrlBetween(String value1, String value2) { - addCriterion("url between", value1, value2, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotBetween(String value1, String value2) { - addCriterion("url not between", value1, value2, "url"); - return (Criteria) this; - } - - public Criteria andIsBlankIsNull() { - addCriterion("is_blank is null"); - return (Criteria) this; - } - - public Criteria andIsBlankIsNotNull() { - addCriterion("is_blank is not null"); - return (Criteria) this; - } - - public Criteria andIsBlankEqualTo(Integer value) { - addCriterion("is_blank =", value, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankNotEqualTo(Integer value) { - addCriterion("is_blank <>", value, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankGreaterThan(Integer value) { - addCriterion("is_blank >", value, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankGreaterThanOrEqualTo(Integer value) { - addCriterion("is_blank >=", value, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankLessThan(Integer value) { - addCriterion("is_blank <", value, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankLessThanOrEqualTo(Integer value) { - addCriterion("is_blank <=", value, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankIn(List values) { - addCriterion("is_blank in", values, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankNotIn(List values) { - addCriterion("is_blank not in", values, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankBetween(Integer value1, Integer value2) { - addCriterion("is_blank between", value1, value2, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankNotBetween(Integer value1, Integer value2) { - addCriterion("is_blank not between", value1, value2, "isBlank"); - return (Criteria) this; - } - - public Criteria andPidIsNull() { - addCriterion("pid is null"); - return (Criteria) this; - } - - public Criteria andPidIsNotNull() { - addCriterion("pid is not null"); - return (Criteria) this; - } - - public Criteria andPidEqualTo(String value) { - addCriterion("pid =", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidNotEqualTo(String value) { - addCriterion("pid <>", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidGreaterThan(String value) { - addCriterion("pid >", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidGreaterThanOrEqualTo(String value) { - addCriterion("pid >=", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidLessThan(String value) { - addCriterion("pid <", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidLessThanOrEqualTo(String value) { - addCriterion("pid <=", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidLike(String value) { - addCriterion("pid like", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidNotLike(String value) { - addCriterion("pid not like", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidIn(List values) { - addCriterion("pid in", values, "pid"); - return (Criteria) this; - } - - public Criteria andPidNotIn(List values) { - addCriterion("pid not in", values, "pid"); - return (Criteria) this; - } - - public Criteria andPidBetween(String value1, String value2) { - addCriterion("pid between", value1, value2, "pid"); - return (Criteria) this; - } - - public Criteria andPidNotBetween(String value1, String value2) { - addCriterion("pid not between", value1, value2, "pid"); - return (Criteria) this; - } - - public Criteria andPermsIsNull() { - addCriterion("perms is null"); - return (Criteria) this; - } - - public Criteria andPermsIsNotNull() { - addCriterion("perms is not null"); - return (Criteria) this; - } - - public Criteria andPermsEqualTo(String value) { - addCriterion("perms =", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsNotEqualTo(String value) { - addCriterion("perms <>", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsGreaterThan(String value) { - addCriterion("perms >", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsGreaterThanOrEqualTo(String value) { - addCriterion("perms >=", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsLessThan(String value) { - addCriterion("perms <", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsLessThanOrEqualTo(String value) { - addCriterion("perms <=", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsLike(String value) { - addCriterion("perms like", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsNotLike(String value) { - addCriterion("perms not like", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsIn(List values) { - addCriterion("perms in", values, "perms"); - return (Criteria) this; - } - - public Criteria andPermsNotIn(List values) { - addCriterion("perms not in", values, "perms"); - return (Criteria) this; - } - - public Criteria andPermsBetween(String value1, String value2) { - addCriterion("perms between", value1, value2, "perms"); - return (Criteria) this; - } - - public Criteria andPermsNotBetween(String value1, String value2) { - addCriterion("perms not between", value1, value2, "perms"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(Integer value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(Integer value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(Integer value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(Integer value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(Integer value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(Integer value1, Integer value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(Integer value1, Integer value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andIconIsNull() { - addCriterion("icon is null"); - return (Criteria) this; - } - - public Criteria andIconIsNotNull() { - addCriterion("icon is not null"); - return (Criteria) this; - } - - public Criteria andIconEqualTo(String value) { - addCriterion("icon =", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconNotEqualTo(String value) { - addCriterion("icon <>", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconGreaterThan(String value) { - addCriterion("icon >", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconGreaterThanOrEqualTo(String value) { - addCriterion("icon >=", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconLessThan(String value) { - addCriterion("icon <", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconLessThanOrEqualTo(String value) { - addCriterion("icon <=", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconLike(String value) { - addCriterion("icon like", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconNotLike(String value) { - addCriterion("icon not like", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconIn(List values) { - addCriterion("icon in", values, "icon"); - return (Criteria) this; - } - - public Criteria andIconNotIn(List values) { - addCriterion("icon not in", values, "icon"); - return (Criteria) this; - } - - public Criteria andIconBetween(String value1, String value2) { - addCriterion("icon between", value1, value2, "icon"); - return (Criteria) this; - } - - public Criteria andIconNotBetween(String value1, String value2) { - addCriterion("icon not between", value1, value2, "icon"); - return (Criteria) this; - } - - public Criteria andOrderNumIsNull() { - addCriterion("order_num is null"); - return (Criteria) this; - } - - public Criteria andOrderNumIsNotNull() { - addCriterion("order_num is not null"); - return (Criteria) this; - } - - public Criteria andOrderNumEqualTo(Integer value) { - addCriterion("order_num =", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotEqualTo(Integer value) { - addCriterion("order_num <>", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumGreaterThan(Integer value) { - addCriterion("order_num >", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumGreaterThanOrEqualTo(Integer value) { - addCriterion("order_num >=", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumLessThan(Integer value) { - addCriterion("order_num <", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumLessThanOrEqualTo(Integer value) { - addCriterion("order_num <=", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumIn(List values) { - addCriterion("order_num in", values, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotIn(List values) { - addCriterion("order_num not in", values, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumBetween(Integer value1, Integer value2) { - addCriterion("order_num between", value1, value2, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotBetween(Integer value1, Integer value2) { - addCriterion("order_num not between", value1, value2, "orderNum"); - return (Criteria) this; - } - - public Criteria andVisibleIsNull() { - addCriterion("visible is null"); - return (Criteria) this; - } - - public Criteria andVisibleIsNotNull() { - addCriterion("visible is not null"); - return (Criteria) this; - } - - public Criteria andVisibleEqualTo(Integer value) { - addCriterion("visible =", value, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleNotEqualTo(Integer value) { - addCriterion("visible <>", value, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleGreaterThan(Integer value) { - addCriterion("visible >", value, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleGreaterThanOrEqualTo(Integer value) { - addCriterion("visible >=", value, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleLessThan(Integer value) { - addCriterion("visible <", value, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleLessThanOrEqualTo(Integer value) { - addCriterion("visible <=", value, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleIn(List values) { - addCriterion("visible in", values, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleNotIn(List values) { - addCriterion("visible not in", values, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleBetween(Integer value1, Integer value2) { - addCriterion("visible between", value1, value2, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleNotBetween(Integer value1, Integer value2) { - addCriterion("visible not between", value1, value2, "visible"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/TsysPermissionRole.java b/src/main/java/com/fc/v2/model/auto/TsysPermissionRole.java index 152dde2..4b963f1 100644 --- a/src/main/java/com/fc/v2/model/auto/TsysPermissionRole.java +++ b/src/main/java/com/fc/v2/model/auto/TsysPermissionRole.java @@ -1,57 +1,74 @@ -package com.fc.v2.model.auto; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +package com.fc.v2.model.auto; -import java.io.Serializable; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.common.base.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; -@TableName(value = "t_sys_permission_role") -public class TsysPermissionRole implements Serializable { +import com.baomidou.mybatisplus.annotation.*; +/** + * 角色权限中间对象 t_sys_permission_role + * + * @author zhaonz + * @date 2021-08-05 + */ +@TableName("t_sys_permission_role") +public class TSysPermissionRole extends BaseEntity +{ + private static final long serialVersionUID = 1L; + /** 主键 */ @TableId(type = IdType.ASSIGN_ID) - private String id; + @JsonSerialize(using = ToStringSerializer.class) + private Long id; - private String roleId; + /** 角色id */ + private Long roleId; - private String permissionId; + /** 权限id */ + private Long permissionId; - private static final long serialVersionUID = 1L; + public void setId(Long id) + { + this.id = id; + } - public String getId() { + public Long getId() + { return id; } - - public void setId(String id) { - this.id = id == null ? null : id.trim(); + public void setRoleId(Long roleId) + { + this.roleId = roleId; } - public String getRoleId() { + public Long getRoleId() + { return roleId; } - - public void setRoleId(String roleId) { - this.roleId = roleId == null ? null : roleId.trim(); + public void setPermissionId(Long permissionId) + { + this.permissionId = permissionId; } - public String getPermissionId() { + public Long getPermissionId() + { return permissionId; } - public void setPermissionId(String permissionId) { - this.permissionId = permissionId == null ? null : permissionId.trim(); + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("roleId", getRoleId()) + .append("permissionId", getPermissionId()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } - - public TsysPermissionRole(String id, String roleId, String permissionId) { - super(); - this.id = id; - this.roleId = roleId; - this.permissionId = permissionId; - } - - public TsysPermissionRole() { - super(); - } - - -} \ No newline at end of file +} diff --git a/src/main/java/com/fc/v2/model/auto/TsysPermissionRoleExample.java b/src/main/java/com/fc/v2/model/auto/TsysPermissionRoleExample.java deleted file mode 100644 index efd57d9..0000000 --- a/src/main/java/com/fc/v2/model/auto/TsysPermissionRoleExample.java +++ /dev/null @@ -1,410 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.List; - -public class TsysPermissionRoleExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public TsysPermissionRoleExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andRoleIdIsNull() { - addCriterion("role_id is null"); - return (Criteria) this; - } - - public Criteria andRoleIdIsNotNull() { - addCriterion("role_id is not null"); - return (Criteria) this; - } - - public Criteria andRoleIdEqualTo(String value) { - addCriterion("role_id =", value, "roleId"); - return (Criteria) this; - } - - public Criteria andRoleIdNotEqualTo(String value) { - addCriterion("role_id <>", value, "roleId"); - return (Criteria) this; - } - - public Criteria andRoleIdGreaterThan(String value) { - addCriterion("role_id >", value, "roleId"); - return (Criteria) this; - } - - public Criteria andRoleIdGreaterThanOrEqualTo(String value) { - addCriterion("role_id >=", value, "roleId"); - return (Criteria) this; - } - - public Criteria andRoleIdLessThan(String value) { - addCriterion("role_id <", value, "roleId"); - return (Criteria) this; - } - - public Criteria andRoleIdLessThanOrEqualTo(String value) { - addCriterion("role_id <=", value, "roleId"); - return (Criteria) this; - } - - public Criteria andRoleIdLike(String value) { - addCriterion("role_id like", value, "roleId"); - return (Criteria) this; - } - - public Criteria andRoleIdNotLike(String value) { - addCriterion("role_id not like", value, "roleId"); - return (Criteria) this; - } - - public Criteria andRoleIdIn(List values) { - addCriterion("role_id in", values, "roleId"); - return (Criteria) this; - } - - public Criteria andRoleIdNotIn(List values) { - addCriterion("role_id not in", values, "roleId"); - return (Criteria) this; - } - - public Criteria andRoleIdBetween(String value1, String value2) { - addCriterion("role_id between", value1, value2, "roleId"); - return (Criteria) this; - } - - public Criteria andRoleIdNotBetween(String value1, String value2) { - addCriterion("role_id not between", value1, value2, "roleId"); - return (Criteria) this; - } - - public Criteria andPermissionIdIsNull() { - addCriterion("permission_id is null"); - return (Criteria) this; - } - - public Criteria andPermissionIdIsNotNull() { - addCriterion("permission_id is not null"); - return (Criteria) this; - } - - public Criteria andPermissionIdEqualTo(String value) { - addCriterion("permission_id =", value, "permissionId"); - return (Criteria) this; - } - - public Criteria andPermissionIdNotEqualTo(String value) { - addCriterion("permission_id <>", value, "permissionId"); - return (Criteria) this; - } - - public Criteria andPermissionIdGreaterThan(String value) { - addCriterion("permission_id >", value, "permissionId"); - return (Criteria) this; - } - - public Criteria andPermissionIdGreaterThanOrEqualTo(String value) { - addCriterion("permission_id >=", value, "permissionId"); - return (Criteria) this; - } - - public Criteria andPermissionIdLessThan(String value) { - addCriterion("permission_id <", value, "permissionId"); - return (Criteria) this; - } - - public Criteria andPermissionIdLessThanOrEqualTo(String value) { - addCriterion("permission_id <=", value, "permissionId"); - return (Criteria) this; - } - - public Criteria andPermissionIdLike(String value) { - addCriterion("permission_id like", value, "permissionId"); - return (Criteria) this; - } - - public Criteria andPermissionIdNotLike(String value) { - addCriterion("permission_id not like", value, "permissionId"); - return (Criteria) this; - } - - public Criteria andPermissionIdIn(List values) { - addCriterion("permission_id in", values, "permissionId"); - return (Criteria) this; - } - - public Criteria andPermissionIdNotIn(List values) { - addCriterion("permission_id not in", values, "permissionId"); - return (Criteria) this; - } - - public Criteria andPermissionIdBetween(String value1, String value2) { - addCriterion("permission_id between", value1, value2, "permissionId"); - return (Criteria) this; - } - - public Criteria andPermissionIdNotBetween(String value1, String value2) { - addCriterion("permission_id not between", value1, value2, "permissionId"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/TsysRole.java b/src/main/java/com/fc/v2/model/auto/TsysRole.java index d8b7d5b..9c709bf 100644 --- a/src/main/java/com/fc/v2/model/auto/TsysRole.java +++ b/src/main/java/com/fc/v2/model/auto/TsysRole.java @@ -1,45 +1,70 @@ -package com.fc.v2.model.auto; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +package com.fc.v2.model.auto; -import java.io.Serializable; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.common.base.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; -@TableName(value = "t_sys_role") -public class TsysRole implements Serializable { +import com.baomidou.mybatisplus.annotation.*; +/** + * 角色对象 t_sys_role + * + * @author zhaonz + * @date 2021-08-05 + */ +@TableName("t_sys_role") +public class TSysRole extends BaseEntity +{ + private static final long serialVersionUID = 1L; + /** 主键 */ @TableId(type = IdType.ASSIGN_ID) - private String id; + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + /** 角色名称 */ private String name; - private static final long serialVersionUID = 1L; + public TSysRole() { - public String getId() { - return id; } - public void setId(String id) { - this.id = id == null ? null : id.trim(); + public TSysRole(Long id, String name) { + this.id = id; + this.name = name; } - public String getName() { - return name; + public void setId(Long id) + { + this.id = id; } - public void setName(String name) { - this.name = name == null ? null : name.trim(); + public Long getId() + { + return id; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; } - public TsysRole(String id, String name) { - super(); - this.id = id; - this.name = name; - } - - public TsysRole() { - super(); - } - -} \ No newline at end of file + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TsysRoleExample.java b/src/main/java/com/fc/v2/model/auto/TsysRoleExample.java deleted file mode 100644 index 3ba21da..0000000 --- a/src/main/java/com/fc/v2/model/auto/TsysRoleExample.java +++ /dev/null @@ -1,340 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.List; - -public class TsysRoleExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public TsysRoleExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/auto/TsysUser.java b/src/main/java/com/fc/v2/model/auto/TsysUser.java index 40cf685..183faf1 100644 --- a/src/main/java/com/fc/v2/model/auto/TsysUser.java +++ b/src/main/java/com/fc/v2/model/auto/TsysUser.java @@ -1,126 +1,146 @@ -package com.fc.v2.model.auto; -import java.io.Serializable; +package com.fc.v2.model.auto; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fc.v2.common.base.BaseEntity; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -@TableName(value = "t_sys_user") -public class TsysUser implements Serializable { - - private static final long serialVersionUID = 1L; - - /** 主键 **/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - - /** 用户账号 **/ - @ApiModelProperty(value = "用户账号") - private String username; - - /** 用户密码 **/ - @ApiModelProperty(value = "用户密码") - private String password; - - /** 昵称 **/ - @ApiModelProperty(value = "昵称") - private String nickname; - - /** 部门id **/ - @ApiModelProperty(value = "部门id") - private Integer depId; - - /** 岗位id **/ - @ApiModelProperty(value = "岗位id") - private String posId; - - /**部门名称**/ - private String depName; - /**岗位名称**/ - private String posName; - - - - public TsysUser(String id, String username, String password, String nickname, Integer depId, String posId) { - super(); - this.id = id; - this.username = username; - this.password = password; - this.nickname = nickname; - this.depId = depId; - this.posId = posId; - } - - public TsysUser() { - super(); - } - - public String getId() { - return id; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.baomidou.mybatisplus.annotation.*; +/** + * 用户对象 t_sys_user + * + * @author zhaonz + * @date 2021-08-05 + */ +@TableName("t_sys_user") +@ApiModel(value = "TSysUser", description = "用户表") +public class TSysUser extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "主键") + private Long id; + + /** 用户账号 */ + @ApiModelProperty(value = "用户账号") + private String username; + + /** 用户密码 */ + @ApiModelProperty(value = "用户密码") + private String password; + + /** 昵称 */ + @ApiModelProperty(value = "昵称") + private String nickname; + + /** 部门id */ + @ApiModelProperty(value = "部门id") + private Long depId; + + /** 岗位id */ + @ApiModelProperty(value = "岗位id") + private Long posId; + + /** 部门名称 */ + @TableField(exist = false) + private String depName; + + /** 岗位名称 */ + @TableField(exist = false) + private String posName; + + public String getDepName() { + return depName; } - public void setId(String id) { - this.id = id == null ? null : id.trim(); + public void setDepName(String depName) { + this.depName = depName; } - public String getUsername() { - return username; + public String getPosName() { + return posName; } - public void setUsername(String username) { - this.username = username == null ? null : username.trim(); + public void setPosName(String posName) { + this.posName = posName; } - public String getPassword() { - return password; + public void setId(Long id) + { + this.id = id; } - public void setPassword(String password) { - this.password = password == null ? null : password.trim(); + public Long getId() + { + return id; + } + public void setUsername(String username) + { + this.username = username; } - public String getNickname() { - return nickname; + public String getUsername() + { + return username; + } + public void setPassword(String password) + { + this.password = password; } - public void setNickname(String nickname) { - this.nickname = nickname == null ? null : nickname.trim(); + public String getPassword() + { + return password; } - public Integer getDepId() { - return depId; + public void setNickname(String nickname) + { + this.nickname = nickname; } - public void setDepId(Integer depId) { - this.depId = depId; + public String getNickname() + { + return nickname; } - - - public String getPosId() { - return posId; + public void setDepId(Long depId) + { + this.depId = depId; } - public void setPosId(String posId) { + public Long getDepId() + { + return depId; + } + public void setPosId(Long posId) + { this.posId = posId; } - public String getDepName() { - return depName; - } - - public void setDepName(String depName) { - this.depName = depName; - } - - public String getPosName() { - return posName; - } + public Long getPosId() + { + return posId; + } - public void setPosName(String posName) { - this.posName = posName; - } - - -} \ No newline at end of file + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("username", getUsername()) + .append("password", getPassword()) + .append("nickname", getNickname()) + .append("depId", getDepId()) + .append("posId", getPosId()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/src/main/java/com/fc/v2/model/auto/TsysUserExample.java b/src/main/java/com/fc/v2/model/auto/TsysUserExample.java deleted file mode 100644 index 5886ba2..0000000 --- a/src/main/java/com/fc/v2/model/auto/TsysUserExample.java +++ /dev/null @@ -1,610 +0,0 @@ -package com.fc.v2.model.auto; - -import java.util.ArrayList; -import java.util.List; - -public class TsysUserExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public TsysUserExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andUsernameIsNull() { - addCriterion("username is null"); - return (Criteria) this; - } - - public Criteria andUsernameIsNotNull() { - addCriterion("username is not null"); - return (Criteria) this; - } - - public Criteria andUsernameEqualTo(String value) { - addCriterion("username =", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameNotEqualTo(String value) { - addCriterion("username <>", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameGreaterThan(String value) { - addCriterion("username >", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameGreaterThanOrEqualTo(String value) { - addCriterion("username >=", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameLessThan(String value) { - addCriterion("username <", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameLessThanOrEqualTo(String value) { - addCriterion("username <=", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameLike(String value) { - addCriterion("username like", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameNotLike(String value) { - addCriterion("username not like", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameIn(List values) { - addCriterion("username in", values, "username"); - return (Criteria) this; - } - - public Criteria andUsernameNotIn(List values) { - addCriterion("username not in", values, "username"); - return (Criteria) this; - } - - public Criteria andUsernameBetween(String value1, String value2) { - addCriterion("username between", value1, value2, "username"); - return (Criteria) this; - } - - public Criteria andUsernameNotBetween(String value1, String value2) { - addCriterion("username not between", value1, value2, "username"); - return (Criteria) this; - } - - public Criteria andPasswordIsNull() { - addCriterion("password is null"); - return (Criteria) this; - } - - public Criteria andPasswordIsNotNull() { - addCriterion("password is not null"); - return (Criteria) this; - } - - public Criteria andPasswordEqualTo(String value) { - addCriterion("password =", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordNotEqualTo(String value) { - addCriterion("password <>", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordGreaterThan(String value) { - addCriterion("password >", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordGreaterThanOrEqualTo(String value) { - addCriterion("password >=", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordLessThan(String value) { - addCriterion("password <", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordLessThanOrEqualTo(String value) { - addCriterion("password <=", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordLike(String value) { - addCriterion("password like", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordNotLike(String value) { - addCriterion("password not like", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordIn(List values) { - addCriterion("password in", values, "password"); - return (Criteria) this; - } - - public Criteria andPasswordNotIn(List values) { - addCriterion("password not in", values, "password"); - return (Criteria) this; - } - - public Criteria andPasswordBetween(String value1, String value2) { - addCriterion("password between", value1, value2, "password"); - return (Criteria) this; - } - - public Criteria andPasswordNotBetween(String value1, String value2) { - addCriterion("password not between", value1, value2, "password"); - return (Criteria) this; - } - - public Criteria andNicknameIsNull() { - addCriterion("nickname is null"); - return (Criteria) this; - } - - public Criteria andNicknameIsNotNull() { - addCriterion("nickname is not null"); - return (Criteria) this; - } - - public Criteria andNicknameEqualTo(String value) { - addCriterion("nickname =", value, "nickname"); - return (Criteria) this; - } - - public Criteria andNicknameNotEqualTo(String value) { - addCriterion("nickname <>", value, "nickname"); - return (Criteria) this; - } - - public Criteria andNicknameGreaterThan(String value) { - addCriterion("nickname >", value, "nickname"); - return (Criteria) this; - } - - public Criteria andNicknameGreaterThanOrEqualTo(String value) { - addCriterion("nickname >=", value, "nickname"); - return (Criteria) this; - } - - public Criteria andNicknameLessThan(String value) { - addCriterion("nickname <", value, "nickname"); - return (Criteria) this; - } - - public Criteria andNicknameLessThanOrEqualTo(String value) { - addCriterion("nickname <=", value, "nickname"); - return (Criteria) this; - } - - public Criteria andNicknameLike(String value) { - addCriterion("nickname like", value, "nickname"); - return (Criteria) this; - } - - public Criteria andNicknameNotLike(String value) { - addCriterion("nickname not like", value, "nickname"); - return (Criteria) this; - } - - public Criteria andNicknameIn(List values) { - addCriterion("nickname in", values, "nickname"); - return (Criteria) this; - } - - public Criteria andNicknameNotIn(List values) { - addCriterion("nickname not in", values, "nickname"); - return (Criteria) this; - } - - public Criteria andNicknameBetween(String value1, String value2) { - addCriterion("nickname between", value1, value2, "nickname"); - return (Criteria) this; - } - - public Criteria andNicknameNotBetween(String value1, String value2) { - addCriterion("nickname not between", value1, value2, "nickname"); - return (Criteria) this; - } - - public Criteria andDepIdIsNull() { - addCriterion("dep_id is null"); - return (Criteria) this; - } - - public Criteria andDepIdIsNotNull() { - addCriterion("dep_id is not null"); - return (Criteria) this; - } - - public Criteria andDepIdEqualTo(Integer value) { - addCriterion("dep_id =", value, "depId"); - return (Criteria) this; - } - - public Criteria andDepIdNotEqualTo(Integer value) { - addCriterion("dep_id <>", value, "depId"); - return (Criteria) this; - } - - public Criteria andDepIdGreaterThan(Integer value) { - addCriterion("dep_id >", value, "depId"); - return (Criteria) this; - } - - public Criteria andDepIdGreaterThanOrEqualTo(Integer value) { - addCriterion("dep_id >=", value, "depId"); - return (Criteria) this; - } - - public Criteria andDepIdLessThan(Integer value) { - addCriterion("dep_id <", value, "depId"); - return (Criteria) this; - } - - public Criteria andDepIdLessThanOrEqualTo(Integer value) { - addCriterion("dep_id <=", value, "depId"); - return (Criteria) this; - } - - public Criteria andDepIdIn(List values) { - addCriterion("dep_id in", values, "depId"); - return (Criteria) this; - } - - public Criteria andDepIdNotIn(List values) { - addCriterion("dep_id not in", values, "depId"); - return (Criteria) this; - } - - public Criteria andDepIdBetween(Integer value1, Integer value2) { - addCriterion("dep_id between", value1, value2, "depId"); - return (Criteria) this; - } - - public Criteria andDepIdNotBetween(Integer value1, Integer value2) { - addCriterion("dep_id not between", value1, value2, "depId"); - return (Criteria) this; - } - - public Criteria andPosIdIsNull() { - addCriterion("pos_id is null"); - return (Criteria) this; - } - - public Criteria andPosIdIsNotNull() { - addCriterion("pos_id is not null"); - return (Criteria) this; - } - - public Criteria andPosIdEqualTo(String value) { - addCriterion("pos_id =", value, "posId"); - return (Criteria) this; - } - - public Criteria andPosIdNotEqualTo(String value) { - addCriterion("pos_id <>", value, "posId"); - return (Criteria) this; - } - - public Criteria andPosIdGreaterThan(String value) { - addCriterion("pos_id >", value, "posId"); - return (Criteria) this; - } - - public Criteria andPosIdGreaterThanOrEqualTo(String value) { - addCriterion("pos_id >=", value, "posId"); - return (Criteria) this; - } - - public Criteria andPosIdLessThan(String value) { - addCriterion("pos_id <", value, "posId"); - return (Criteria) this; - } - - public Criteria andPosIdLessThanOrEqualTo(String value) { - addCriterion("pos_id <=", value, "posId"); - return (Criteria) this; - } - - public Criteria andPosIdLike(String value) { - addCriterion("pos_id like", value, "posId"); - return (Criteria) this; - } - - public Criteria andPosIdNotLike(String value) { - addCriterion("pos_id not like", value, "posId"); - return (Criteria) this; - } - - public Criteria andPosIdIn(List values) { - addCriterion("pos_id in", values, "posId"); - return (Criteria) this; - } - - public Criteria andPosIdNotIn(List values) { - addCriterion("pos_id not in", values, "posId"); - return (Criteria) this; - } - - public Criteria andPosIdBetween(String value1, String value2) { - addCriterion("pos_id between", value1, value2, "posId"); - return (Criteria) this; - } - - public Criteria andPosIdNotBetween(String value1, String value2) { - addCriterion("pos_id not between", value1, value2, "posId"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/custom/PermissionTreeModelVo.java b/src/main/java/com/fc/v2/model/custom/PermissionTreeModelVo.java index f03571c..1e4da94 100644 --- a/src/main/java/com/fc/v2/model/custom/PermissionTreeModelVo.java +++ b/src/main/java/com/fc/v2/model/custom/PermissionTreeModelVo.java @@ -1,6 +1,6 @@ package com.fc.v2.model.custom; -import com.fc.v2.model.auto.TsysPermission; +import com.fc.v2.model.auto.TSysPermission; import java.util.List; @@ -10,15 +10,15 @@ import java.util.List; * @date: 2018年9月8日 下午6:40:29 */ public class PermissionTreeModelVo { - private TsysPermission tsysPermission; + private TSysPermission tsysPermission; List childList;//子类 - public TsysPermission getTsysPermission() { + public TSysPermission getTsysPermission() { return tsysPermission; } - public void setTsysPermission(TsysPermission tsysPermission) { + public void setTsysPermission(TSysPermission tsysPermission) { this.tsysPermission = tsysPermission; } @@ -30,7 +30,7 @@ public class PermissionTreeModelVo { this.childList = childList; } - public PermissionTreeModelVo(TsysPermission tsysPermission, + public PermissionTreeModelVo(TSysPermission tsysPermission, List childList) { super(); this.tsysPermission = tsysPermission; diff --git a/src/main/java/com/fc/v2/model/custom/RoleVo.java b/src/main/java/com/fc/v2/model/custom/RoleVo.java index 1899564..90c11ac 100644 --- a/src/main/java/com/fc/v2/model/custom/RoleVo.java +++ b/src/main/java/com/fc/v2/model/custom/RoleVo.java @@ -1,13 +1,13 @@ package com.fc.v2.model.custom; -import com.fc.v2.model.auto.TsysRole; +import com.fc.v2.model.auto.TSysRole; /** * 角色自定义数据 * @author fuce * @date: 2018年9月8日 上午12:18:59 */ -public class RoleVo extends TsysRole{ +public class RoleVo extends TSysRole{ private static final long serialVersionUID = 1L; private boolean ischeck;//判断是否又这个权限 @@ -21,7 +21,7 @@ public class RoleVo extends TsysRole{ public RoleVo() { super(); } - public RoleVo(String id, String name,Boolean ischeck) { + public RoleVo(Long id, String name,Boolean ischeck) { super(id, name); this.ischeck=ischeck; } diff --git a/src/main/java/com/fc/v2/model/custom/SysMenu.java b/src/main/java/com/fc/v2/model/custom/SysMenu.java index 78a71e8..196a9e7 100644 --- a/src/main/java/com/fc/v2/model/custom/SysMenu.java +++ b/src/main/java/com/fc/v2/model/custom/SysMenu.java @@ -8,12 +8,12 @@ public class SysMenu { /** * 菜单编号 * */ - private String id; + private Long id; /** * 父节点 * */ - private String parentId; + private Long parentId; /** * 标题 @@ -51,19 +51,19 @@ public class SysMenu { * */ private String checkArr = "0"; - public String getId() { + public Long getId() { return id; } - public void setId(String id) { + public void setId(Long id) { this.id = id; } - public String getParentId() { + public Long getParentId() { return parentId; } - public void setParentId(String parentId) { + public void setParentId(Long parentId) { this.parentId = parentId; } @@ -126,7 +126,7 @@ public class SysMenu { this.checkArr = checkArr; } - public SysMenu(String id, String parentId, String title, Integer type, Integer openType, String icon, String href, List children) { + public SysMenu(Long id, Long parentId, String title, Integer type, Integer openType, String icon, String href, List children) { this.id = id; this.parentId = parentId; this.title = title; diff --git a/src/main/java/com/fc/v2/model/custom/SysPower.java b/src/main/java/com/fc/v2/model/custom/SysPower.java index 5479e96..441d7aa 100644 --- a/src/main/java/com/fc/v2/model/custom/SysPower.java +++ b/src/main/java/com/fc/v2/model/custom/SysPower.java @@ -11,7 +11,7 @@ public class SysPower{ /** * 编号 * */ - private String powerId; + private Long powerId; /** * 权限名称 @@ -41,7 +41,7 @@ public class SysPower{ /** * 父级编号 * */ - private String parentId; + private Long parentId; /** * 图标 @@ -63,11 +63,11 @@ public class SysPower{ * */ private String checkArr = "0"; - public String getPowerId() { + public Long getPowerId() { return powerId; } - public void setPowerId(String powerId) { + public void setPowerId(Long powerId) { this.powerId = powerId; } @@ -111,11 +111,11 @@ public class SysPower{ this.openType = openType; } - public String getParentId() { + public Long getParentId() { return parentId; } - public void setParentId(String parentId) { + public void setParentId(Long parentId) { this.parentId = parentId; } @@ -154,7 +154,7 @@ public class SysPower{ public SysPower() { } - public SysPower(String powerId, String powerName, Integer powerType, String powerCode, String powerUrl, Integer openType, String parentId, String icon, Integer sort, Integer enable, String checkArr) { + public SysPower(Long powerId, String powerName, Integer powerType, String powerCode, String powerUrl, Integer openType, Long parentId, String icon, Integer sort, Integer enable, String checkArr) { this.powerId = powerId; this.powerName = powerName; this.powerType = powerType; diff --git a/src/main/java/com/fc/v2/service/GeneratorService.java b/src/main/java/com/fc/v2/service/GeneratorService.java deleted file mode 100644 index bb2745d..0000000 --- a/src/main/java/com/fc/v2/service/GeneratorService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.fc.v2.service; - -import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.mapper.auto.GeneratorMapper; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.model.custom.TsysTables; -import com.fc.v2.model.custom.autocode.BeanColumn; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import java.util.List; - - -/** - * 自动生成代码Service -* @Title: GeneratorService.java -* @Package com.fc.v2.service -* @author fuce -* @date 2019年5月9日 上午12:24:47 -* @version V1.0 - */ -@Service -public class GeneratorService extends ServiceImpl implements IService { - @Autowired - private GeneratorMapper generatorMapper; - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String searchText){ - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= generatorMapper.queryList(searchText); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - - /** - * 查询具体某表信息 - * @param tableName - * @return - */ - public List queryList(String tableName){ - return generatorMapper.queryList(tableName); - } - - /** - * 查询表详情 - * @param tableName - * @return - */ - public List queryColumns2(String tableName){ - System.out.println("queryColumns2>>>"+JSONUtil.toJsonPrettyStr(generatorMapper.queryColumns3(tableName))); - return generatorMapper.queryColumns2(tableName); - } - -} diff --git a/src/main/java/com/fc/v2/service/ITGeneratorService.java b/src/main/java/com/fc/v2/service/ITGeneratorService.java new file mode 100644 index 0000000..b0d16e9 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITGeneratorService.java @@ -0,0 +1,42 @@ +package com.fc.v2.service; + +import com.fc.v2.model.custom.Tablepar; +import com.fc.v2.model.custom.TsysTables; +import com.fc.v2.model.custom.autocode.BeanColumn; +import com.github.pagehelper.PageInfo; + +import java.util.List; + +/** + * 生成代码Service接口 + * + * @author + * @date 2021-08-05 + */ +public interface ITGeneratorService { + + /** + * 分页查询 + * + * @param tablepar + * @param searchText + * @return + */ + public PageInfo list(Tablepar tablepar, String searchText); + + /** + * 查询具体某表信息 + * + * @param tableName + * @return + */ + public List queryList(String tableName); + + /** + * 查询表详情 + * + * @param tableName + * @return + */ + public List queryColumns2(String tableName); +} diff --git a/src/main/java/com/fc/v2/service/ITSysDepartmentService.java b/src/main/java/com/fc/v2/service/ITSysDepartmentService.java new file mode 100644 index 0000000..75d388f --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysDepartmentService.java @@ -0,0 +1,89 @@ + +package com.fc.v2.service; + +import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysDepartment; + +/** + * 部门Service接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface ITSysDepartmentService extends IService { + /** + * 查询部门 + * + * @param id 部门ID + * @return 部门 + */ + public TSysDepartment selectTSysDepartmentById(Long id); + + /** + * 查询部门列表 + * + * @param queryWrapper 部门 + * @return 部门集合 + */ + public List selectTSysDepartmentList(Wrapper queryWrapper); + + /** + * 查询部门列表 + * + * @param tSysDepartment 部门 + * @return 部门集合 + */ + public List selectTSysDepartmentList(TSysDepartment tSysDepartment); + + /** + * 新增部门 + * + * @param tSysDepartment 部门 + * @return 结果 + */ + public int insertTSysDepartment(TSysDepartment tSysDepartment); + + /** + * 修改部门 + * + * @param tSysDepartment 部门 + * @return 结果 + */ + public int updateTSysDepartment(TSysDepartment tSysDepartment); + + /** + * 批量删除部门 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysDepartmentByIds(String ids); + + /** + * 删除部门信息 + * + * @param id 部门ID + * @return 结果 + */ + public int deleteTSysDepartmentById(Long id); + + /** + * 检查name + * + * @param sysDepartment + * @return + */ + int checkNameUnique(TSysDepartment sysDepartment); + + /** + * 修改权限状态展示或者不展示 + * + * @param record + * @return + */ + int updateVisible(TSysDepartment record); +} diff --git a/src/main/java/com/fc/v2/service/ITSysInterUrlService.java b/src/main/java/com/fc/v2/service/ITSysInterUrlService.java new file mode 100644 index 0000000..6c6d44a --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysInterUrlService.java @@ -0,0 +1,80 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysInterUrl; + +/** + * 拦截urlService接口 + * + * @author zhaonz + * @date 2021-08-06 + */ +public interface ITSysInterUrlService extends IService { + /** + * 查询拦截url + * + * @param id 拦截urlID + * @return 拦截url + */ + public TSysInterUrl selectTSysInterUrlById(Long id); + + /** + * 查询拦截url列表 + * + * @param queryWrapper 拦截url + * @return 拦截url集合 + */ + public List selectTSysInterUrlList(Wrapper queryWrapper); + + /** + * 查询拦截url列表 + * + * @param tSysInterUrl 拦截url + * @return 拦截url集合 + */ + public List selectTSysInterUrlList(TSysInterUrl tSysInterUrl); + + /** + * 新增拦截url + * + * @param tSysInterUrl 拦截url + * @return 结果 + */ + public int insertTSysInterUrl(TSysInterUrl tSysInterUrl); + + /** + * 修改拦截url + * + * @param tSysInterUrl 拦截url + * @return 结果 + */ + public int updateTSysInterUrl(TSysInterUrl tSysInterUrl); + + /** + * 批量删除拦截url + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysInterUrlByIds(String ids); + + /** + * 删除拦截url信息 + * + * @param id 拦截urlID + * @return 结果 + */ + public int deleteTSysInterUrlById(Long id); + + /** + * 检查name + * + * @param sysInterUrl + * @return + */ + public int checkNameUnique(TSysInterUrl sysInterUrl); +} diff --git a/src/main/java/com/fc/v2/service/ITSysNoticeService.java b/src/main/java/com/fc/v2/service/ITSysNoticeService.java index 4b2c69c..62fff93 100644 --- a/src/main/java/com/fc/v2/service/ITSysNoticeService.java +++ b/src/main/java/com/fc/v2/service/ITSysNoticeService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.fc.v2.model.auto.TSysNotice; -import com.fc.v2.model.auto.TsysUser; +import com.fc.v2.model.auto.TSysUser; import com.fc.v2.model.custom.Tablepar; import com.github.pagehelper.PageInfo; @@ -49,7 +49,7 @@ public interface ITSysNoticeService extends IService { * @param name * @return */ - public PageInfo selectTSysNoticeList(TsysUser tsysUser, Tablepar tablepar, String name); + public PageInfo selectTSysNoticeList(TSysUser tsysUser, Tablepar tablepar, String name); /** * 新增公告 @@ -105,7 +105,7 @@ public interface ITSysNoticeService extends IService { * @param state * @return */ - public List getuserNoticeNotRead(TsysUser user, int state); + public List getuserNoticeNotRead(TSysUser user, int state); /** * 获取最新8条公告 diff --git a/src/main/java/com/fc/v2/service/ITSysPermissionRoleService.java b/src/main/java/com/fc/v2/service/ITSysPermissionRoleService.java new file mode 100644 index 0000000..baebff0 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysPermissionRoleService.java @@ -0,0 +1,89 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysPermissionRole; + +/** + * 角色权限中间Service接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface ITSysPermissionRoleService extends IService { + /** + * 查询角色权限中间 + * + * @param id 角色权限中间ID + * @return 角色权限中间 + */ + public TSysPermissionRole selectTSysPermissionRoleById(Long id); + + /** + * 查询角色权限中间列表 + * + * @param queryWrapper 角色权限中间 + * @return 角色权限中间集合 + */ + public List selectTSysPermissionRoleList(Wrapper queryWrapper); + + /** + * 查询角色权限中间列表 + * + * @param tSysPermissionRole 角色权限中间 + * @return 角色权限中间集合 + */ + public List selectTSysPermissionRoleList(TSysPermissionRole tSysPermissionRole); + + /** + * 新增角色权限中间 + * + * @param tSysPermissionRole 角色权限中间 + * @return 结果 + */ + public int insertTSysPermissionRole(TSysPermissionRole tSysPermissionRole); + + /** + * 批量新增角色权限中间 + * + * @param tSysPermissionRole + * @return + */ + public boolean saveTSysPermissionRoleBatch(List tSysPermissionRole); + + /** + * 修改角色权限中间 + * + * @param tSysPermissionRole 角色权限中间 + * @return 结果 + */ + public int updateTSysPermissionRole(TSysPermissionRole tSysPermissionRole); + + /** + * 批量删除角色权限中间 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysPermissionRoleByIds(String ids); + + /** + * 删除角色权限中间信息 + * + * @param id 角色权限中间ID + * @return 结果 + */ + public int deleteTSysPermissionRoleById(Long id); + + /** + * 删除角色权限中间信息 + * + * @param queryWrapper + * @return 结果 + */ + public int deleteTSysPermissionRole(QueryWrapper queryWrapper); +} diff --git a/src/main/java/com/fc/v2/service/ITSysPermissionService.java b/src/main/java/com/fc/v2/service/ITSysPermissionService.java new file mode 100644 index 0000000..4a1a328 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysPermissionService.java @@ -0,0 +1,143 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysPermission; +import com.fc.v2.model.custom.SysMenu; +import com.fc.v2.model.custom.SysPower; + +/** + * 权限Service接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface ITSysPermissionService extends IService { + /** + * 查询权限 + * + * @param id 权限ID + * @return 权限 + */ + public TSysPermission selectTSysPermissionById(Long id); + + /** + * 查询权限 + * + * @param ids 权限ID + * @return 权限 + */ + public List selectTSysPermissionByIds(List ids); + + /** + * 查询权限列表 + * + * @param queryWrapper 权限 + * @return 权限集合 + */ + public List selectTSysPermissionList(Wrapper queryWrapper); + + /** + * 查询权限列表 + * + * @param tSysPermission 权限 + * @return 权限集合 + */ + public List selectTSysPermissionList(TSysPermission tSysPermission); + + /** + * 新增权限 + * + * @param tSysPermission 权限 + * @return 结果 + */ + public int insertTSysPermission(TSysPermission tSysPermission); + + /** + * 修改权限 + * + * @param tSysPermission 权限 + * @return 结果 + */ + public int updateTSysPermission(TSysPermission tSysPermission); + + /** + * 批量删除权限 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysPermissionByIds(String ids); + + /** + * 删除权限信息 + * + * @param id 权限ID + * @return 结果 + */ + public int deleteTSysPermissionById(Long id); + + /** + * 检查权限name + * + * @param tsysPermission + * @return + */ + public int checkNameUnique(TSysPermission tsysPermission); + + /** + * 检查权限URL + * + * @param tsysPermission + * @return + */ + public int checkURLUnique(TSysPermission tsysPermission); + + /** + * 检查权限perms字段 + * + * @param tsysPermission + * @return + */ + public int checkPermsUnique(TSysPermission tsysPermission); + + /** + * + * @param roleId + * @return + */ + public List getRolePower(Long roleId); + + /** + * + * @param userid + * @return + */ + public List getall(Long userid); + + /** + * 修改权限状态展示或者不展示 + * + * @param tSysPermission + * @return + */ + public int updateVisible(TSysPermission tSysPermission); + + /** + * 根据用户id查询菜单栏 + * + * @param userId + * @return + */ + public List getSysMenus(Long userId); + + /** + * + * @param rolid + * @return + */ + public List queryRoleId(Long rolid); +} diff --git a/src/main/java/com/fc/v2/service/ITSysPositionService.java b/src/main/java/com/fc/v2/service/ITSysPositionService.java new file mode 100644 index 0000000..ad31268 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysPositionService.java @@ -0,0 +1,88 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysPosition; + +/** + * 岗位Service接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface ITSysPositionService extends IService { + /** + * 查询岗位 + * + * @param id 岗位ID + * @return 岗位 + */ + public TSysPosition selectTSysPositionById(Long id); + + /** + * 查询岗位列表 + * + * @param queryWrapper 岗位 + * @return 岗位集合 + */ + public List selectTSysPositionList(Wrapper queryWrapper); + + /** + * 查询岗位列表 + * + * @param tSysPosition 岗位 + * @return 岗位集合 + */ + public List selectTSysPositionList(TSysPosition tSysPosition); + + /** + * 新增岗位 + * + * @param tSysPosition 岗位 + * @return 结果 + */ + public int insertTSysPosition(TSysPosition tSysPosition); + + /** + * 修改岗位 + * + * @param tSysPosition 岗位 + * @return 结果 + */ + public int updateTSysPosition(TSysPosition tSysPosition); + + /** + * 批量删除岗位 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysPositionByIds(String ids); + + /** + * 删除岗位信息 + * + * @param id 岗位ID + * @return 结果 + */ + public int deleteTSysPositionById(Long id); + + /** + * 检查name + * + * @param sysPosition + * @return + */ + int checkNameUnique(TSysPosition sysPosition); + + /** + * 修改权限状态展示或者不展示 + * + * @param record + * @return + */ + int updateVisible(TSysPosition record); +} diff --git a/src/main/java/com/fc/v2/service/ITSysRoleService.java b/src/main/java/com/fc/v2/service/ITSysRoleService.java new file mode 100644 index 0000000..87bc91e --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysRoleService.java @@ -0,0 +1,97 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysRole; + +/** + * 角色Service接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface ITSysRoleService extends IService { + /** + * 查询角色 + * + * @param id 角色ID + * @return 角色 + */ + public TSysRole selectTSysRoleById(Long id); + + /** + * 查询角色列表 + * + * @param queryWrapper 角色 + * @return 角色集合 + */ + public List selectTSysRoleList(Wrapper queryWrapper); + + /** + * 查询角色列表 + * + * @param tSysRole 角色 + * @return 角色集合 + */ + public List selectTSysRoleList(TSysRole tSysRole); + + /** + * 新增角色 + * + * @param tSysRole 角色 + * @return 结果 + */ + public int insertTSysRole(TSysRole tSysRole); + + /** + * 修改角色 + * + * @param tSysRole 角色 + * @return 结果 + */ + public int updateTSysRole(TSysRole tSysRole); + + /** + * 批量删除角色 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysRoleByIds(String ids); + + /** + * 删除角色信息 + * + * @param id 角色ID + * @return 结果 + */ + public int deleteTSysRoleById(Long id); + + /** + * 根据用户id查询角色 + * + * @param userid + * @return + */ + public List queryUserRole(Long userid); + + /** + * 检查角色name + * + * @param tsysRole + * @return + */ + int checkNameUnique(TSysRole tsysRole); + + /** + * 修改用户角色 以及下面绑定的权限 + * + * @param roleId + * @param powerIds + * @return + */ + int updateRoleAndPrem(Long roleId, String powerIds); +} diff --git a/src/main/java/com/fc/v2/service/ITSysRoleUserService.java b/src/main/java/com/fc/v2/service/ITSysRoleUserService.java new file mode 100644 index 0000000..9be1477 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysRoleUserService.java @@ -0,0 +1,88 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysRoleUser; + +/** + * 用户角色中间Service接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface ITSysRoleUserService extends IService { + /** + * 查询用户角色中间 + * + * @param id 用户角色中间ID + * @return 用户角色中间 + */ + public TSysRoleUser selectTSysRoleUserById(Long id); + + /** + * 查询用户角色中间列表 + * + * @param queryWrapper 用户角色中间 + * @return 用户角色中间集合 + */ + public List selectTSysRoleUserList(Wrapper queryWrapper); + + /** + * 查询用户角色中间列表 + * + * @param tSysRoleUser 用户角色中间 + * @return 用户角色中间集合 + */ + public List selectTSysRoleUserList(TSysRoleUser tSysRoleUser); + + /** + * 新增用户角色中间 + * + * @param tSysRoleUser 用户角色中间 + * @return 结果 + */ + public int insertTSysRoleUser(TSysRoleUser tSysRoleUser); + + /** + * 新增用户角色中间 + * + * @param tSysRoleUsers 批量保存用户角色中间 + * @return 结果 + */ + public boolean saveTSysRoleUserBatch(List tSysRoleUsers); + /** + * 修改用户角色中间 + * + * @param tSysRoleUser 用户角色中间 + * @return 结果 + */ + public int updateTSysRoleUser(TSysRoleUser tSysRoleUser); + + /** + * 批量删除用户角色中间 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysRoleUserByIds(String ids); + + /** + * 删除用户角色中间信息 + * + * @param id 用户角色中间ID + * @return 结果 + */ + public int deleteTSysRoleUserById(Long id); + + /** + * 删除用户角色中间信息 + * + * @param queryWrapper + * @return 结果 + */ + public int deleteTSysRoleUser(QueryWrapper queryWrapper); +} diff --git a/src/main/java/com/fc/v2/service/ITSysUserService.java b/src/main/java/com/fc/v2/service/ITSysUserService.java new file mode 100644 index 0000000..f09af99 --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysUserService.java @@ -0,0 +1,130 @@ + +package com.fc.v2.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.fc.v2.model.auto.TSysUser; +import com.fc.v2.model.custom.RoleVo; +import com.fc.v2.model.custom.Tablepar; +import com.github.pagehelper.PageInfo; + +/** + * 用户Service接口 + * + * @author zhaonz + * @date 2021-08-05 + */ +public interface ITSysUserService extends IService { + /** + * 查询用户 + * + * @param id 用户ID + * @return 用户 + */ + public TSysUser selectTSysUserById(Long id); + + /** + * 查询用户列表 + * + * @param queryWrapper 用户 + * @return 用户集合 + */ + public List selectTSysUserList(Wrapper queryWrapper); + + /** + * 查询用户列表 + * + * @param tSysUser 用户 + * @return 用户集合 + */ + public List selectTSysUserList(TSysUser tSysUser); + + /** + * 新增用户 + * + * @param TSysUser 用户 + * @return 结果 + */ + public int insertTSysUser(TSysUser TSysUser); + + /** + * 修改用户 + * + * @param TSysUser 用户 + * @return 结果 + */ + public int updateTSysUser(TSysUser TSysUser); + + /** + * 批量删除用户 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSysUserByIds(String ids); + + /** + * 删除用户信息 + * + * @param id 用户ID + * @return 结果 + */ + public int deleteTSysUserById(Long id); + + /** + * 检查用户name + * + * @param user + * @param roleIds + * @return + */ + int insertUserRoles(TSysUser user, String roleIds); + + /** + * + * @param tsysUser + * @return + */ + int checkLoginNameUnique(TSysUser tsysUser); + + /** + * 获取所有权限 并且增加是否有权限字段 + * + * @param id + * @return + */ + List getUserIsRole(Long id); + + /** + * 修改用户信息以及角色信息 + * + * @param tsysUser + * @param roleIds + * @return + */ + int updateUserRoles(TSysUser tsysUser, String roleIds); + + /** + * 修改用户密码 + * + * @param tsysUser + * @return + */ + int updateUserPassword(TSysUser tsysUser); + + /** + * + * @param tablepar + * @return + */ + PageInfo userList(Tablepar tablepar); + + /** + * + * @param username + * @return + */ + TSysUser queryUserName(String username); +} diff --git a/src/main/java/com/fc/v2/service/ITSysUtilService.java b/src/main/java/com/fc/v2/service/ITSysUtilService.java new file mode 100644 index 0000000..dff5f5c --- /dev/null +++ b/src/main/java/com/fc/v2/service/ITSysUtilService.java @@ -0,0 +1,26 @@ +package com.fc.v2.service; + +import java.util.List; +import java.util.Map; + +/** + * @author fuce + */ +public interface ITSysUtilService { + + /** + * 执行sql + * + * @param sql + * @return + */ + abstract public int executeSQL(String sql); + + /** + * 查询sql + * + * @param sql + * @return + */ + abstract public List> SelectExecuteSQL(String sql); +} diff --git a/src/main/java/com/fc/v2/service/SysDepartmentService.java b/src/main/java/com/fc/v2/service/SysDepartmentService.java deleted file mode 100644 index d5e8609..0000000 --- a/src/main/java/com/fc/v2/service/SysDepartmentService.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.fc.v2.service; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.SysDepartmentMapper; -import com.fc.v2.model.auto.SysDepartment; -import com.fc.v2.model.auto.SysDepartmentExample; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.util.StringUtils; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - -/** - * 部门表 SysDepartmentService - * - * @Title: SysDepartmentService.java - * @Package com.fc.v2.service - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2020-04-17 13:12:58 - **/ -@Service -public class SysDepartmentService extends ServiceImpl implements BaseService { - @Autowired - private SysDepartmentMapper sysDepartmentMapper; - - /** - * 分页查询 - * - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar, String name) { - SysDepartmentExample testExample = new SysDepartmentExample(); - testExample.setOrderByClause("id ASC"); - if (name != null && !"".equals(name)) { - testExample.createCriteria().andDeptNameLike("%" + name + "%"); - } - if (StrUtil.isNotEmpty(tablepar.getOrderByColumn())) { - testExample.setOrderByClause( - StringUtils.toUnderScoreCase(tablepar.getOrderByColumn()) + " " + tablepar.getIsAsc()); - } - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list = sysDepartmentMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - @Override - public int deleteByPrimaryKey(String ids) { - - Integer[] integers = ConvertUtil.toIntArray(",", ids); - List stringB = Arrays.asList(integers); - SysDepartmentExample example = new SysDepartmentExample(); - example.createCriteria().andIdIn(stringB); - return sysDepartmentMapper.deleteByExample(example); - - } - - @Override - public SysDepartment selectByPrimaryKey(String id) { - - Integer id1 = Integer.valueOf(id); - return sysDepartmentMapper.selectByPrimaryKey(id1); - - } - - @Override - public int updateByPrimaryKeySelective(SysDepartment record) { - return sysDepartmentMapper.updateByPrimaryKeySelective(record); - } - - /** - * 添加 - */ - @Override - public int insertSelective(SysDepartment record) { - - record.setId(null); - - return sysDepartmentMapper.insertSelective(record); - } - - @Override - public int updateByExampleSelective(SysDepartment record, SysDepartmentExample example) { - - return sysDepartmentMapper.updateByExampleSelective(record, example); - } - - @Override - public int updateByExample(SysDepartment record, SysDepartmentExample example) { - - return sysDepartmentMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(SysDepartmentExample example) { - - return sysDepartmentMapper.selectByExample(example); - } - - @Override - public long countByExample(SysDepartmentExample example) { - - return sysDepartmentMapper.countByExample(example); - } - - @Override - public int deleteByExample(SysDepartmentExample example) { - - return sysDepartmentMapper.deleteByExample(example); - } - - /** - * 检查name - * - * @param sysDepartment - * @return - */ - public int checkNameUnique(SysDepartment sysDepartment) { - SysDepartmentExample example = new SysDepartmentExample(); - example.createCriteria().andDeptNameEqualTo(sysDepartment.getDeptName()); - List list = sysDepartmentMapper.selectByExample(example); - return list.size(); - } - - /** - * 修改权限状态展示或者不展示 - * @param record - * @return - */ - public int updateVisible(SysDepartment record) { - return sysDepartmentMapper.updateByPrimaryKeySelective(record); - } - -} diff --git a/src/main/java/com/fc/v2/service/SysInterUrlService.java b/src/main/java/com/fc/v2/service/SysInterUrlService.java deleted file mode 100644 index 8eea82b..0000000 --- a/src/main/java/com/fc/v2/service/SysInterUrlService.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.SysInterUrlMapper; -import com.fc.v2.model.auto.SysInterUrl; -import com.fc.v2.model.auto.SysInterUrlExample; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.util.SnowflakeIdWorker; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 拦截url表 SysInterUrlService - * @Title: SysInterUrlService.java - * @Package com.fc.v2.service - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2020-01-05 01:48:22 - **/ -@Service -public class SysInterUrlService extends ServiceImpl implements BaseService{ - @Autowired - private SysInterUrlMapper sysInterUrlMapper; - - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name){ - SysInterUrlExample testExample=new SysInterUrlExample(); - testExample.setOrderByClause("id ASC"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andInterNameLike("%"+name+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysInterUrlMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - @Override - public int deleteByPrimaryKey(String ids) { - - List lista=ConvertUtil.toListStrArray(ids); - SysInterUrlExample example=new SysInterUrlExample(); - example.createCriteria().andIdIn(lista); - return sysInterUrlMapper.deleteByExample(example); - - - } - - - @Override - public SysInterUrl selectByPrimaryKey(String id) { - - return sysInterUrlMapper.selectByPrimaryKey(id); - - } - - - @Override - public int updateByPrimaryKeySelective(SysInterUrl record) { - return sysInterUrlMapper.updateByPrimaryKeySelective(record); - } - - - /** - * 添加 - */ - @Override - public int insertSelective(SysInterUrl record) { - - //添加雪花主键id - record.setId(SnowflakeIdWorker.getUUID()); - - - return sysInterUrlMapper.insertSelective(record); - } - - - @Override - public int updateByExampleSelective(SysInterUrl record, SysInterUrlExample example) { - - return sysInterUrlMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(SysInterUrl record, SysInterUrlExample example) { - - return sysInterUrlMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(SysInterUrlExample example) { - - return sysInterUrlMapper.selectByExample(example); - } - - - @Override - public long countByExample(SysInterUrlExample example) { - - return sysInterUrlMapper.countByExample(example); - } - - - @Override - public int deleteByExample(SysInterUrlExample example) { - - return sysInterUrlMapper.deleteByExample(example); - } - - /** - * 检查name - * @param sysInterUrl - * @return - */ - public int checkNameUnique(SysInterUrl sysInterUrl){ - SysInterUrlExample example=new SysInterUrlExample(); - example.createCriteria().andInterNameEqualTo(sysInterUrl.getInterName()); - List list=sysInterUrlMapper.selectByExample(example); - return list.size(); - } - - -} diff --git a/src/main/java/com/fc/v2/service/SysPermissionService.java b/src/main/java/com/fc/v2/service/SysPermissionService.java deleted file mode 100644 index 3aed2a2..0000000 --- a/src/main/java/com/fc/v2/service/SysPermissionService.java +++ /dev/null @@ -1,339 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.TsysPermissionMapper; -import com.fc.v2.mapper.auto.TsysPermissionRoleMapper; -import com.fc.v2.mapper.custom.PermissionDao; -import com.fc.v2.model.auto.TsysPermission; -import com.fc.v2.model.auto.TsysPermissionExample; -import com.fc.v2.model.auto.TsysPermissionRole; -import com.fc.v2.model.auto.TsysPermissionRoleExample; -import com.fc.v2.model.custom.SysMenu; -import com.fc.v2.model.custom.SysPower; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.util.SnowflakeIdWorker; -import com.fc.v2.util.StringUtils; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -@Service -public class SysPermissionService extends ServiceImpl implements BaseService{ - - //权限mapper - @Autowired - private TsysPermissionMapper tsysPermissionMapper; - - //权限自定义dao - @Autowired - private PermissionDao permissionDao; - //权限角色关联表 - @Autowired - private TsysPermissionRoleMapper permissionRoleMapper; - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar, String searchText){ - TsysPermissionExample testExample=new TsysPermissionExample(); - testExample.setOrderByClause("order_num is null ASC,order_num ASC"); - if(searchText!=null&&!"".equals(searchText)){ - testExample.createCriteria().andNameLike("%"+searchText+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= tsysPermissionMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - - @Override - public int deleteByPrimaryKey(String ids) { - //转成集合 - List lista=ConvertUtil.toListStrArray(ids); - - - //判断角色是否删除去除 - TsysPermissionRoleExample permissionRoleExample=new TsysPermissionRoleExample(); - permissionRoleExample.createCriteria().andPermissionIdIn(lista); - List tsysPermissionRoles=permissionRoleMapper.selectByExample(permissionRoleExample); - if(tsysPermissionRoles.size()>0) {//有角色外键 - return -2; - } - - //判断是否有子集 - TsysPermissionExample example=new TsysPermissionExample(); - example.createCriteria().andIdIn(lista); - List tsysPermissions = tsysPermissionMapper.selectByExample(example); - boolean lag=false; - for (TsysPermission tsysPermission : tsysPermissions) { - if(tsysPermission.getChildCount()>0) { - lag=true; - } - } - if(lag) {//有子集 无法删除 - return -1; - }else {//删除操作 - int i=tsysPermissionMapper.deleteByExample(example); - if(i>0) {//删除成功 - return 1; - }else {//删除失败 - return 0; - } - - } - } - - - - @Override - public int insertSelective(TsysPermission record) { - //添加雪花主键id - record.setId(SnowflakeIdWorker.getUUID()); - //判断为目录的时候添加父id为0 - /*if(record!=null&&record.getType()==0){ - record.setPid("1"); - }*/ - //默认设置不跳转 - if(record.getIsBlank()==null) { - record.setIsBlank(0); - } - return tsysPermissionMapper.insertSelective(record); - } - - @Override - public TsysPermission selectByPrimaryKey(String id) { - - return tsysPermissionMapper.selectByPrimaryKey(id); - } - - - @Override - public int updateByPrimaryKeySelective(TsysPermission record) { - //默认设置不跳转 - if(record.getIsBlank()==null) { - record.setIsBlank(0); - } - return tsysPermissionMapper.updateByPrimaryKeySelective(record); - } - - public int updateByPrimaryKey(TsysPermission record) { - //默认设置不跳转 - if(record.getIsBlank()==null) { - record.setIsBlank(0); - } - return tsysPermissionMapper.updateByPrimaryKey(record); - } - - /** - * 修改权限状态展示或者不展示 - * @param record - * @return - */ - public int updateVisible(TsysPermission record) { - return tsysPermissionMapper.updateByPrimaryKeySelective(record); - } - - - @Override - public int updateByExampleSelective(TsysPermission record, TsysPermissionExample example) { - //默认设置不跳转 - if(record.getIsBlank()==null) { - record.setIsBlank(0); - } - return tsysPermissionMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(TsysPermission record, TsysPermissionExample example) { - //默认设置不跳转 - if(record.getIsBlank()==null) { - record.setIsBlank(0); - } - return tsysPermissionMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(TsysPermissionExample example) { - - return tsysPermissionMapper.selectByExample(example); - } - - - @Override - public long countByExample(TsysPermissionExample example) { - - return tsysPermissionMapper.countByExample(example); - } - - - @Override - public int deleteByExample(TsysPermissionExample example) { - - return tsysPermissionMapper.deleteByExample(example); - } - - /** - * 检查权限名字 - * @param tsysUser - * @return - */ - public int checkNameUnique(TsysPermission tsysPermission){ - TsysPermissionExample example=new TsysPermissionExample(); - example.createCriteria().andNameEqualTo(tsysPermission.getName()); - List list=tsysPermissionMapper.selectByExample(example); - return list.size(); - } - - /** - * 检查权限URL - * @param tsysUser - * @return - */ - public int checkURLUnique(TsysPermission tsysPermission){ - TsysPermissionExample example=new TsysPermissionExample(); - example.createCriteria().andUrlEqualTo(tsysPermission.getUrl()); - List list=tsysPermissionMapper.selectByExample(example); - return list.size(); - } - - /** - * 检查权限perms字段 - * @param tsysUser - * @return - */ - public int checkPermsUnique(TsysPermission tsysPermission){ - TsysPermissionExample example=new TsysPermissionExample(); - example.createCriteria().andPermsEqualTo(tsysPermission.getPerms()); - List list=tsysPermissionMapper.selectByExample(example); - return list.size(); - } - - - /** - * 根据父id 以及类型查询权限子集 - * @param pid - * @return - */ - public List queryPid(String pid, int type){ - TsysPermissionExample example=new TsysPermissionExample(); - example.createCriteria().andPidEqualTo(pid).andTypeEqualTo(type); - return tsysPermissionMapper.selectByExample(example); - } - - /** - * 根据用户id查询菜单栏 - * @return - */ - public List getSysMenus(String userid){ - List treeList = new ArrayList(); - List menuList = getall(userid); - treeList = getSysMenus(menuList,"0"); - return treeList; - } - - /** - * 递归查询权限 - * @param treeList - * @param parentId - * @return - */ - private List getSysMenus(List treeList,String parentId){ - List SysMenuList = new ArrayList(); - if(StringUtils.isNotNull(parentId)&&treeList!=null&&treeList.size()>0){ - List childList=null; - for (TsysPermission tsysPermission : treeList) { - if(tsysPermission.getPid().equals(parentId)){ - if(tsysPermission.getChildCount()!=null&&tsysPermission.getChildCount()>0){ - childList=getSysMenus(treeList,tsysPermission.getId()); - } - SysMenu sysMenu=new SysMenu(tsysPermission.getId(), tsysPermission.getPid(), tsysPermission.getName(),tsysPermission.getType(),tsysPermission.getIsBlank(),tsysPermission.getIcon(), tsysPermission.getUrl(), childList); - SysMenuList.add(sysMenu); - childList = null; - } - } - } - - - return SysMenuList; - } - - - /** - * 根据角色id查询所有权限，权限有会有标识表示 - * @return - */ - public List getRolePower(String roleId){ - //所有权限 - List allPower = getall(null); - //角色权限 - List rolePower=permissionDao.queryRoleId(roleId); - - List sysPowerList=new ArrayList<>(); - - allPower.forEach(sysPower->{ - SysPower sysPower1=new SysPower(sysPower.getId(),sysPower.getName(), sysPower.getType(),sysPower.getPerms(),sysPower.getUrl(), sysPower.getIsBlank(),sysPower.getPid(),sysPower.getIcon(),sysPower.getOrderNum(), sysPower.getVisible(),"0"); - rolePower.forEach(sysRolePower->{ - if(sysRolePower.getId().equals(sysPower.getId())){ - sysPower1.setCheckArr("1"); - return; - } - }); - sysPowerList.add(sysPower1); - - }); - return sysPowerList; - - } - - - - /** - * 根据用户id获取用户角色如果用户为null 获取所有权限 - * @return - */ - public List getall(String userid){ - if(StringUtils.isEmpty(userid)) { - TsysPermissionExample example = new TsysPermissionExample(); - example.createCriteria().andVisibleEqualTo(0); - example.setOrderByClause("order_num is null ASC,order_num ASC"); - return tsysPermissionMapper.selectByExample(example); - } - return permissionDao.findByAdminUserId(userid); - } - - - - - - - - - - /** - * 根据权限字段查询是否存在 - * @param perms - * @return - * @author fuce - * @Date 2019年9月1日 上午2:06:31 - */ - public Boolean queryLikePerms(String perms){ - TsysPermissionExample example=new TsysPermissionExample(); - example.createCriteria().andPermsLike("%gen:"+perms+"%"); - List list= tsysPermissionMapper.selectByExample(example); - return list.size() > 0; - } - - -} diff --git a/src/main/java/com/fc/v2/service/SysPositionService.java b/src/main/java/com/fc/v2/service/SysPositionService.java deleted file mode 100644 index 01285e8..0000000 --- a/src/main/java/com/fc/v2/service/SysPositionService.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.fc.v2.service; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.SysPositionMapper; -import com.fc.v2.model.auto.SysPosition; -import com.fc.v2.model.auto.SysPositionExample; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.util.SnowflakeIdWorker; -import com.fc.v2.util.StringUtils; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 岗位表 SysPositionService - * @Title: SysPositionService.java - * @Package com.fc.v2.service - * @author fuce_自动生成 - * @email 115889198@qq.com - * @date 2020-04-16 23:46:24 - **/ -@Service -public class SysPositionService extends ServiceImpl implements BaseService{ - @Autowired - private SysPositionMapper sysPositionMapper; - - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar,String name){ - SysPositionExample testExample=new SysPositionExample(); - testExample.setOrderByClause("id ASC"); - if(name!=null&&!"".equals(name)){ - testExample.createCriteria().andPostNameLike("%"+name+"%"); - } - - if(StrUtil.isNotEmpty(tablepar.getOrderByColumn())) { - testExample.setOrderByClause(StringUtils.toUnderScoreCase(tablepar.getOrderByColumn()) +" "+tablepar.getIsAsc()); - } - - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysPositionMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - @Override - public int deleteByPrimaryKey(String ids) { - - List lista=ConvertUtil.toListStrArray(ids); - SysPositionExample example=new SysPositionExample(); - example.createCriteria().andIdIn(lista); - return sysPositionMapper.deleteByExample(example); - - - } - - - @Override - public SysPosition selectByPrimaryKey(String id) { - - return sysPositionMapper.selectByPrimaryKey(id); - - } - - - @Override - public int updateByPrimaryKeySelective(SysPosition record) { - return sysPositionMapper.updateByPrimaryKeySelective(record); - } - - - /** - * 添加 - */ - @Override - public int insertSelective(SysPosition record) { - - //添加雪花主键id - record.setId(SnowflakeIdWorker.getUUID()); - - - return sysPositionMapper.insertSelective(record); - } - - - @Override - public int updateByExampleSelective(SysPosition record, SysPositionExample example) { - - return sysPositionMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(SysPosition record, SysPositionExample example) { - - return sysPositionMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(SysPositionExample example) { - - return sysPositionMapper.selectByExample(example); - } - - - @Override - public long countByExample(SysPositionExample example) { - - return sysPositionMapper.countByExample(example); - } - - - @Override - public int deleteByExample(SysPositionExample example) { - - return sysPositionMapper.deleteByExample(example); - } - - /** - * 检查name - * @param sysPosition - * @return - */ - public int checkNameUnique(SysPosition sysPosition){ - SysPositionExample example=new SysPositionExample(); - example.createCriteria().andPostNameEqualTo(sysPosition.getPostName()); - List list=sysPositionMapper.selectByExample(example); - return list.size(); - } - - - /** - * 修改权限状态展示或者不展示 - * @param record - * @return - */ - public int updateVisible(SysPosition record) { - return sysPositionMapper.updateByPrimaryKeySelective(record); - } - -} diff --git a/src/main/java/com/fc/v2/service/SysRoleService.java b/src/main/java/com/fc/v2/service/SysRoleService.java deleted file mode 100644 index 16284e2..0000000 --- a/src/main/java/com/fc/v2/service/SysRoleService.java +++ /dev/null @@ -1,204 +0,0 @@ -package com.fc.v2.service; - -import cn.hutool.core.util.RandomUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.TsysPermissionRoleMapper; -import com.fc.v2.mapper.auto.TsysRoleMapper; -import com.fc.v2.mapper.custom.RoleDao; -import com.fc.v2.model.auto.TsysPermissionRole; -import com.fc.v2.model.auto.TsysPermissionRoleExample; -import com.fc.v2.model.auto.TsysRole; -import com.fc.v2.model.auto.TsysRoleExample; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.util.SnowflakeIdWorker; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -@Service -public class SysRoleService extends ServiceImpl implements BaseService { - //角色mapper - @Autowired - private TsysRoleMapper tsysRoleMapper; - //自定义角色dao - @Autowired - private RoleDao roleDao; - //自动生成的权限角色映射mapper - @Autowired - private TsysPermissionRoleMapper tsysPermissionRoleMapper; - - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar){ - TsysRoleExample testExample=new TsysRoleExample(); - testExample.setOrderByClause("id+0 DESC"); - if(tablepar.getSearchText()!=null&&!"".equals(tablepar.getSearchText())){ - testExample.createCriteria().andNameLike("%"+tablepar.getSearchText()+"%"); - } - - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= tsysRoleMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - /** - * 查询全部角色集合 - * @return - */ - public List queryList(){ - TsysRoleExample tsysRoleExample=new TsysRoleExample(); - return tsysRoleMapper.selectByExample(tsysRoleExample); - } - - - /** - * - */ - @Override - @Transactional - public int deleteByPrimaryKey(String ids) { - List lista=ConvertUtil.toListStrArray(ids); - //先删除角色下面的所有权限 - TsysPermissionRoleExample permissionRoleExample=new TsysPermissionRoleExample(); - permissionRoleExample.createCriteria().andRoleIdIn(lista); - tsysPermissionRoleMapper.deleteByExample(permissionRoleExample); - //在删除角色 - TsysRoleExample example=new TsysRoleExample(); - example.createCriteria().andIdIn(lista); - return tsysRoleMapper.deleteByExample(example); - } - - - - @Override - public int insertSelective(TsysRole record) { - //添加雪花主键id - record.setId(SnowflakeIdWorker.getUUID()); - return tsysRoleMapper.insertSelective(record); - } - - /** - * 添加角色绑定权限 - * @param record 角色信息 - * @param prem 权限id集合 - * @return - */ - @Transactional - public int insertRoleAndPrem(TsysRole record,String prem) { - //添加雪花主键id - String roleid=SnowflakeIdWorker.getUUID(); - record.setId(roleid); - //添加权限 - List prems=ConvertUtil.toListStrArray(prem); - for (String premid : prems) { - TsysPermissionRole tsysPermissionRole=new TsysPermissionRole(RandomUtil.randomUUID() , roleid, premid); - tsysPermissionRoleMapper.insertSelective(tsysPermissionRole); - } - return tsysRoleMapper.insertSelective(record); - } - - @Override - public TsysRole selectByPrimaryKey(String id) { - - return tsysRoleMapper.selectByPrimaryKey(id); - } - - - @Override - public int updateByPrimaryKeySelective(TsysRole record) { - return tsysRoleMapper.updateByPrimaryKeySelective(record); - } - - /** - * 修改用户角色 以及下面绑定的权限 - * @param record - * @return - */ - @Transactional - public int updateRoleAndPrem(String roleId,String powerIds) { - //先删除角色下面的所有权限 - TsysPermissionRoleExample permissionRoleExample=new TsysPermissionRoleExample(); - permissionRoleExample.createCriteria().andRoleIdEqualTo(roleId); - tsysPermissionRoleMapper.deleteByExample(permissionRoleExample); - //添加权限关联 - List prems=ConvertUtil.toListStrArray(powerIds); - int i=0; - for (String pre : prems) { - TsysPermissionRole permissionRole=new TsysPermissionRole(RandomUtil.randomUUID(), roleId, pre); - tsysPermissionRoleMapper.insertSelective(permissionRole); - i++; - } - - return i; - } - - - - @Override - public int updateByExampleSelective(TsysRole record, TsysRoleExample example) { - - return tsysRoleMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(TsysRole record, TsysRoleExample example) { - - return tsysRoleMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(TsysRoleExample example) { - - return tsysRoleMapper.selectByExample(example); - } - - - @Override - public long countByExample(TsysRoleExample example) { - - return tsysRoleMapper.countByExample(example); - } - - - @Override - public int deleteByExample(TsysRoleExample example) { - - return tsysRoleMapper.deleteByExample(example); - } - - /** - * 检查角色name - * @param tsysUser - * @return - */ - public int checkNameUnique(TsysRole tsysRole){ - TsysRoleExample example=new TsysRoleExample(); - example.createCriteria().andNameEqualTo(tsysRole.getName()); - List list=tsysRoleMapper.selectByExample(example); - return list.size(); - } - - - /** - * 根据用户id查询角色 - * @param userid - * @return - */ - public List queryUserRole(String userid){ - return roleDao.queryUserRole(userid); - } - -} diff --git a/src/main/java/com/fc/v2/service/SysUserService.java b/src/main/java/com/fc/v2/service/SysUserService.java deleted file mode 100644 index fe30640..0000000 --- a/src/main/java/com/fc/v2/service/SysUserService.java +++ /dev/null @@ -1,250 +0,0 @@ -package com.fc.v2.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fc.v2.common.base.BaseService; -import com.fc.v2.common.support.ConvertUtil; -import com.fc.v2.mapper.auto.TSysRoleUserMapper; -import com.fc.v2.mapper.auto.TsysRoleMapper; -import com.fc.v2.mapper.auto.TsysUserMapper; -import com.fc.v2.mapper.custom.RoleDao; -import com.fc.v2.mapper.custom.TsysUserDao; -import com.fc.v2.model.auto.*; -import com.fc.v2.model.custom.RoleVo; -import com.fc.v2.model.custom.Tablepar; -import com.fc.v2.util.MD5Util; -import com.fc.v2.util.SnowflakeIdWorker; -import com.fc.v2.util.StringUtils; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -/** - * 系统用户 - * @ClassName: SysUserService - * @author fuce - * @date 2018年8月26日 - * - */ -@Service -public class SysUserService extends ServiceImpl implements BaseService{ - //生成的用户dao - @Autowired - private TsysUserMapper tsysUserMapper; - - //生成的角色用户dao - @Autowired - private TSysRoleUserMapper tSysRoleUserMapper; - - //自定义角色dao - @Autowired - private RoleDao roleDao; - - //自动生成的角色dao - @Autowired - private TsysRoleMapper tsysRoleMapper; - - //自定义用户dao - @Autowired - private TsysUserDao userDao ; - - /** - * 分页查询 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo list(Tablepar tablepar){ - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= userDao.queryUserInfo(tablepar.getSearchText()); - PageInfo pageInfo = new PageInfo(list); - return pageInfo; - } - - - @Override - @Transactional - public int deleteByPrimaryKey(String ids) { - List lista=ConvertUtil.toListStrArray(ids); - TsysUserExample example=new TsysUserExample(); - example.createCriteria().andIdIn(lista); - int i=tsysUserMapper.deleteByExample(example); - if(i>0){ - TSysRoleUserExample tSysRoleUserExample=new TSysRoleUserExample(); - tSysRoleUserExample.createCriteria().andSysUserIdIn(lista); - tSysRoleUserMapper.deleteByExample(tSysRoleUserExample); - } - return i; - - } - - /** - * 添加用户 - */ - @Override - public int insertSelective(TsysUser record) { - return tsysUserMapper.insertSelective(record); - } - - /** - * 添加用户跟角色信息 - * @param record - * @param roles - * @return - */ - @Transactional - public int insertUserRoles(TsysUser record,String roles) { - String userid=SnowflakeIdWorker.getUUID(); - record.setId(userid); - if(StringUtils.isNotEmpty(roles)){ - List list_roles=ConvertUtil.toListStrArray(roles); - for (String rolesid : list_roles) { - TSysRoleUser roleUser=new TSysRoleUser(SnowflakeIdWorker.getUUID(), userid,rolesid); - tSysRoleUserMapper.insertSelective(roleUser); - } - } - - //密码加密 - record.setPassword(MD5Util.encode(record.getPassword())); - return tsysUserMapper.insertSelective(record); - } - - @Override - public TsysUser selectByPrimaryKey(String id) { - - return tsysUserMapper.selectByPrimaryKey(id); - } - - - @Override - public int updateByPrimaryKeySelective(TsysUser record) { - record.setPassword(MD5Util.encode(record.getPassword())); - return tsysUserMapper.updateByPrimaryKeySelective(record); - } - - - - - - @Override - public int updateByExampleSelective(TsysUser record, TsysUserExample example) { - - return tsysUserMapper.updateByExampleSelective(record, example); - } - - - @Override - public int updateByExample(TsysUser record, TsysUserExample example) { - - return tsysUserMapper.updateByExample(record, example); - } - - @Override - public List selectByExample(TsysUserExample example) { - - return tsysUserMapper.selectByExample(example); - } - - - @Override - public long countByExample(TsysUserExample example) { - - return tsysUserMapper.countByExample(example); - } - - - @Override - public int deleteByExample(TsysUserExample example) { - - return tsysUserMapper.deleteByExample(example); - } - - /** - * 检查用户name - * @param tsysUser - * @return - */ - public int checkLoginNameUnique(TsysUser tsysUser){ - TsysUserExample example=new TsysUserExample(); - example.createCriteria().andUsernameEqualTo(tsysUser.getUsername()); - List list=tsysUserMapper.selectByExample(example); - - return list.size(); - } - - /** - * 获取所有权限 并且增加是否有权限字段 - * @return - */ - public List getUserIsRole(String userid){ - List list=new ArrayList(); - //查询出我的权限 - List myRoles= roleDao.queryUserRole(userid); - TsysRoleExample tsysRoleExample=new TsysRoleExample(); - //查询系统所有的角色 - List tsysRoles=tsysRoleMapper.selectByExample(tsysRoleExample); - if(StringUtils.isNotEmpty(tsysRoles)){ - for (TsysRole tsysRole : tsysRoles) { - Boolean isflag=false; - RoleVo roleVo=new RoleVo(tsysRole.getId(),tsysRole.getName(), isflag); - for (TsysRole myRole : myRoles) { - if(tsysRole.getId().equals(myRole.getId())){ - isflag=true; - break; - } - } - if(isflag){ - roleVo.setIscheck(true); - list.add(roleVo); - }else{ - list.add(roleVo); - } - } - } - return list; - } - - - /** - * 修改用户密码 - * @param record - * @return - */ - public int updateUserPassword(TsysUser record) { - record.setPassword(MD5Util.encode(record.getPassword())); - //修改用户信息 - return tsysUserMapper.updateByPrimaryKeySelective(record); - } - - - /** - * 修改用户信息以及角色信息 - * @param record - * @param roles - * @return - */ - @Transactional - public int updateUserRoles(TsysUser record,String roleIds) { - //先删除这个用户的所有角色 - TSysRoleUserExample tSysRoleUserExample=new TSysRoleUserExample(); - tSysRoleUserExample.createCriteria().andSysUserIdEqualTo(record.getId()); - tSysRoleUserMapper.deleteByExample(tSysRoleUserExample); - if(StringUtils.isNotEmpty(roleIds)) { - List list_roles=ConvertUtil.toListStrArray(roleIds); - //添加新的角色信息 - for (String role : list_roles) { - TSysRoleUser tSysRoleUser= new TSysRoleUser(SnowflakeIdWorker.getUUID(), record.getId(), role); - tSysRoleUserMapper.insertSelective(tSysRoleUser); - } - } - //修改用户信息 - return tsysUserMapper.updateByPrimaryKeySelective(record); - } - - - -} diff --git a/src/main/java/com/fc/v2/service/impl/GeneratorServiceImpl.java b/src/main/java/com/fc/v2/service/impl/GeneratorServiceImpl.java new file mode 100644 index 0000000..3ac43de --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/GeneratorServiceImpl.java @@ -0,0 +1,70 @@ +package com.fc.v2.service.impl; + +import cn.hutool.json.JSONUtil; +import com.fc.v2.mapper.auto.GeneratorMapper; +import com.fc.v2.model.custom.Tablepar; +import com.fc.v2.model.custom.TsysTables; +import com.fc.v2.model.custom.autocode.BeanColumn; +import com.fc.v2.service.ITGeneratorService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 自动生成代码Service + * + * @author fuce + * @version V1.0 + * @Title: GeneratorService.java + * @Package com.fc.v2.service + * @date 2019年5月9日 上午12:24:47 + */ +@Service +public class GeneratorServiceImpl implements ITGeneratorService { + + @Autowired + private GeneratorMapper generatorMapper; + + /** + * 分页查询 + * + * @param tablepar + * @param searchText + * @return + */ + @Override + public PageInfo list(Tablepar tablepar, String searchText) { + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + List list = generatorMapper.queryList(searchText); + PageInfo pageInfo = new PageInfo(list); + return pageInfo; + } + + + /** + * 查询具体某表信息 + * + * @param tableName + * @return + */ + @Override + public List queryList(String tableName) { + return generatorMapper.queryList(tableName); + } + + /** + * 查询表详情 + * + * @param tableName + * @return + */ + @Override + public List queryColumns2(String tableName) { + System.out.println("queryColumns2>>>" + JSONUtil.toJsonPrettyStr(generatorMapper.queryColumns3(tableName))); + return generatorMapper.queryColumns2(tableName); + } + +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysDepartmentServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysDepartmentServiceImpl.java new file mode 100644 index 0000000..df3a2d4 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysDepartmentServiceImpl.java @@ -0,0 +1,137 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.service.ITSysDepartmentService; + +import cn.hutool.core.bean.BeanUtil; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysDepartmentMapper; +import com.fc.v2.model.auto.TSysDepartment; +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 部门Service业务层处理 + * + * @author zhaonz + * @date 2021-08-05 + */ +@Service +public class TSysDepartmentServiceImpl extends ServiceImpl implements ITSysDepartmentService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysDepartmentServiceImpl.class); + + @Autowired + private TSysDepartmentMapper tSysDepartmentMapper; + + /** + * 查询部门 + * + * @param id 部门ID + * @return 部门 + */ + @Override + public TSysDepartment selectTSysDepartmentById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询部门列表 + * + * @param queryWrapper 部门 + * @return 部门 + */ + @Override + public List selectTSysDepartmentList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + @Override + public List selectTSysDepartmentList(TSysDepartment tSysDepartment) { + Map map = BeanUtil.beanToMap(tSysDepartment, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增部门 + * + * @param tSysDepartment 部门 + * @return 结果 + */ + @Override + public int insertTSysDepartment(TSysDepartment tSysDepartment) + { + return this.baseMapper.insert(tSysDepartment); + } + + /** + * 修改部门 + * + * @param tSysDepartment 部门 + * @return 结果 + */ + @Override + public int updateTSysDepartment(TSysDepartment tSysDepartment) + { + return this.baseMapper.updateById(tSysDepartment); + } + + /** + * 删除部门对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysDepartmentByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除部门信息 + * + * @param id 部门ID + * @return 结果 + */ + @Override + public int deleteTSysDepartmentById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * + * @param sysDepartment + * @return + */ + @Override + public int checkNameUnique(TSysDepartment sysDepartment) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("dept_name", sysDepartment.getDeptName()); + return this.baseMapper.selectList(queryWrapper).size(); + } + + /** + * + * @param record + * @return + */ + @Override + public int updateVisible(TSysDepartment record) { + return this.baseMapper.updateById(record); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysInterUrlServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysInterUrlServiceImpl.java new file mode 100644 index 0000000..d7d9f40 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysInterUrlServiceImpl.java @@ -0,0 +1,134 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysInterUrlMapper; +import com.fc.v2.model.auto.TSysInterUrl; +import com.fc.v2.service.ITSysInterUrlService; + +import cn.hutool.core.bean.BeanUtil; + +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 拦截urlService业务层处理 + * + * @author zhaonz + * @date 2021-08-06 + */ +@Service +public class TSysInterUrlServiceImpl extends ServiceImpl implements ITSysInterUrlService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysInterUrlServiceImpl.class); + + @Autowired + private TSysInterUrlMapper tSysInterUrlMapper; + + /** + * 查询拦截url + * + * @param id 拦截urlID + * @return 拦截url + */ + @Override + public TSysInterUrl selectTSysInterUrlById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询拦截url列表 + * + * @param queryWrapper 拦截url + * @return 拦截url + */ + @Override + public List selectTSysInterUrlList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 查询拦截url列表 + * + * @param tSysInterUrl 拦截url + * @return 拦截url + */ + @Override + public List selectTSysInterUrlList(TSysInterUrl tSysInterUrl) { + Map map = BeanUtil.beanToMap(tSysInterUrl, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增拦截url + * + * @param tSysInterUrl 拦截url + * @return 结果 + */ + @Override + public int insertTSysInterUrl(TSysInterUrl tSysInterUrl) + { + return this.baseMapper.insert(tSysInterUrl); + } + + /** + * 修改拦截url + * + * @param tSysInterUrl 拦截url + * @return 结果 + */ + @Override + public int updateTSysInterUrl(TSysInterUrl tSysInterUrl) + { + return this.baseMapper.updateById(tSysInterUrl); + } + + /** + * 删除拦截url对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysInterUrlByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除拦截url信息 + * + * @param id 拦截urlID + * @return 结果 + */ + @Override + public int deleteTSysInterUrlById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * 检查name + * + * @param sysInterUrl + * @return + */ + @Override + public int checkNameUnique(TSysInterUrl sysInterUrl) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("inter_name", sysInterUrl.getInterName()); + return this.baseMapper.selectList(queryWrapper).size(); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysNoticeServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysNoticeServiceImpl.java index 3457ac3..5b6b090 100644 --- a/src/main/java/com/fc/v2/service/impl/TSysNoticeServiceImpl.java +++ b/src/main/java/com/fc/v2/service/impl/TSysNoticeServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.model.auto.TSysNoticeUser; -import com.fc.v2.model.auto.TsysUser; +import com.fc.v2.model.auto.TSysUser; import com.fc.v2.model.custom.Tablepar; import com.fc.v2.service.ITSysNoticeUserService; import com.github.pagehelper.PageHelper; @@ -89,7 +89,7 @@ public class TSysNoticeServiceImpl extends ServiceImpl selectTSysNoticeList(TsysUser tsysUser, Tablepar tablepar, String name) { + public PageInfo selectTSysNoticeList(TSysUser tsysUser, Tablepar tablepar, String name) { //查询未阅读的公告用户外键 QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("user_id", tsysUser.getId()); @@ -194,7 +194,7 @@ public class TSysNoticeServiceImpl extends ServiceImpl getuserNoticeNotRead(TsysUser user, int state) { + public List getuserNoticeNotRead(TSysUser user, int state) { List notices=new ArrayList(); //查询未阅读的公告用户外键 QueryWrapper queryWrapper = new QueryWrapper(); diff --git a/src/main/java/com/fc/v2/service/impl/TSysPermissionRoleServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysPermissionRoleServiceImpl.java new file mode 100644 index 0000000..8b2da9c --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysPermissionRoleServiceImpl.java @@ -0,0 +1,138 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.service.ITSysPermissionRoleService; + +import cn.hutool.core.bean.BeanUtil; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysPermissionRoleMapper; +import com.fc.v2.model.auto.TSysOperLog; +import com.fc.v2.model.auto.TSysPermissionRole; +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 角色权限中间Service业务层处理 + * + * @author zhaonz + * @date 2021-08-05 + */ +@Service +public class TSysPermissionRoleServiceImpl extends ServiceImpl implements ITSysPermissionRoleService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysPermissionRoleServiceImpl.class); + + @Autowired + private TSysPermissionRoleMapper tSysPermissionRoleMapper; + + /** + * 查询角色权限中间 + * + * @param id 角色权限中间ID + * @return 角色权限中间 + */ + @Override + public TSysPermissionRole selectTSysPermissionRoleById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询角色权限中间列表 + * + * @param queryWrapper 角色权限中间 + * @return 角色权限中间 + */ + @Override + public List selectTSysPermissionRoleList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + @Override + public List selectTSysPermissionRoleList(TSysPermissionRole tSysPermissionRole) { + Map map = BeanUtil.beanToMap(tSysPermissionRole, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增角色权限中间 + * + * @param tSysPermissionRole 角色权限中间 + * @return 结果 + */ + @Override + public int insertTSysPermissionRole(TSysPermissionRole tSysPermissionRole) + { + return this.baseMapper.insert(tSysPermissionRole); + } + + /** + * 批量新增角色权限中间 + * + * @param tSysPermissionRole + * @return + */ + @Override + public boolean saveTSysPermissionRoleBatch(List tSysPermissionRole) { + return this.saveBatch(tSysPermissionRole); + } + + /** + * 修改角色权限中间 + * + * @param tSysPermissionRole 角色权限中间 + * @return 结果 + */ + @Override + public int updateTSysPermissionRole(TSysPermissionRole tSysPermissionRole) + { + return this.baseMapper.updateById(tSysPermissionRole); + } + + /** + * 删除角色权限中间对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysPermissionRoleByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除角色权限中间信息 + * + * @param id 角色权限中间ID + * @return 结果 + */ + @Override + public int deleteTSysPermissionRoleById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * 删除角色权限中间信息 + * + * @param queryWrapper + * @return 结果 + */ + @Override + public int deleteTSysPermissionRole(QueryWrapper queryWrapper) { + return this.baseMapper.delete(queryWrapper); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysPermissionServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysPermissionServiceImpl.java new file mode 100644 index 0000000..cc26fb5 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysPermissionServiceImpl.java @@ -0,0 +1,313 @@ + +package com.fc.v2.service.impl; + +import java.util.*; +import java.util.stream.Collectors; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.model.auto.TSysPermissionRole; +import com.fc.v2.model.custom.SysMenu; +import com.fc.v2.model.custom.SysPower; +import com.fc.v2.service.ITSysPermissionRoleService; +import com.fc.v2.service.ITSysPermissionService; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysPermissionMapper; +import com.fc.v2.model.auto.TSysPermission; +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 权限Service业务层处理 + * + * @author zhaonz + * @date 2021-08-05 + */ +@Service +public class TSysPermissionServiceImpl extends ServiceImpl implements ITSysPermissionService { + + private static final Logger logger = LoggerFactory.getLogger(TSysPermissionServiceImpl.class); + + @Autowired + private TSysPermissionMapper tSysPermissionMapper; + + @Autowired + private ITSysPermissionRoleService itSysPermissionRoleService; + + /** + * 查询权限 + * + * @param id 权限ID + * @return 权限 + */ + @Override + public TSysPermission selectTSysPermissionById(Long id) { + return this.baseMapper.selectById(id); + } + + /** + * 查询权限 + * + * @param ids 权限ID + * @return 权限 + */ + @Override + public List selectTSysPermissionByIds(List ids) { + return this.baseMapper.selectBatchIds(ids); + } + + /** + * 查询权限列表 + * + * @param queryWrapper 权限 + * @return 权限 + */ + @Override + public List selectTSysPermissionList(Wrapper queryWrapper) { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 查询权限列表 + * + * @param tSysPermission 权限 + * @return + */ + @Override + public List selectTSysPermissionList(TSysPermission tSysPermission) { + Map map = BeanUtil.beanToMap(tSysPermission, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map, false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增权限 + * + * @param tSysPermission 权限 + * @return 结果 + */ + @Override + public int insertTSysPermission(TSysPermission tSysPermission) { + //默认设置不跳转 + if (tSysPermission.getIsBlank() == null) { + tSysPermission.setIsBlank(0); + } + return this.baseMapper.insert(tSysPermission); + } + + /** + * 修改权限 + * + * @param tSysPermission 权限 + * @return 结果 + */ + @Override + public int updateTSysPermission(TSysPermission tSysPermission) { + //默认设置不跳转 + if (tSysPermission.getIsBlank() == null) { + tSysPermission.setIsBlank(0); + } + return this.baseMapper.updateById(tSysPermission); + } + + /** + * 删除权限对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysPermissionByIds(String ids) { + //转成集合 + List lista = ConvertUtil.toListStrArray(ids); + List cdids = lista.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); + + //判断角色是否删除去除 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.in("permission_id" , cdids); + + List tSysPermissionRoleList = itSysPermissionRoleService.selectTSysPermissionRoleList(queryWrapper); + if (tSysPermissionRoleList.size() > 0) {//有角色外键 + return -2; + } + + //判断是否有子集 + List tsysPermissions = this.baseMapper.selectBatchIds(cdids); + boolean lag = false; + for (TSysPermission tSysPermission : tsysPermissions) { + if (tSysPermission.getChildCount() > 0) { + lag = true; + } + } + + if (lag) {//有子集 无法删除 + return -1; + } + + return this.baseMapper.deleteBatchIds(cdids); + } + + /** + * 删除权限信息 + * + * @param id 权限ID + * @return 结果 + */ + @Override + public int deleteTSysPermissionById(Long id) { + return this.baseMapper.deleteById(id); + } + + @Override + public int checkNameUnique(TSysPermission tsysPermission) { + TSysPermission sysPermission = new TSysPermission(); + sysPermission.setName(tsysPermission.getName()); + return this.selectTSysPermissionList(sysPermission).size(); + } + + @Override + public int checkURLUnique(TSysPermission tsysPermission) { + TSysPermission sysPermission = new TSysPermission(); + sysPermission.setName(tsysPermission.getUrl()); + return this.selectTSysPermissionList(sysPermission).size(); + } + + @Override + public int checkPermsUnique(TSysPermission tsysPermission) { + TSysPermission sysPermission = new TSysPermission(); + sysPermission.setName(tsysPermission.getPerms()); + return this.selectTSysPermissionList(sysPermission).size(); + } + + /** + * 根据父id 以及类型查询权限子集 + * + * @param pid + * @return + */ + public List queryPid(Long pid, int type) { + TSysPermission sysPermission = new TSysPermission(); + sysPermission.setPid(pid); + sysPermission.setType(type); + return this.selectTSysPermissionList(sysPermission); + } + + /** + * @param roleId + * @return + */ + @Override + public List getRolePower(Long roleId) { + //所有权限 + List allPower = getall(null); + //角色权限 + List rolePower = this.tSysPermissionMapper.queryRoleId(roleId); + + List sysPowerList = new ArrayList(); + + allPower.forEach(sysPower -> { + SysPower sysPower1 = new SysPower(sysPower.getId(), sysPower.getName(), sysPower.getType(), sysPower.getPerms(), sysPower.getUrl(), sysPower.getIsBlank(), sysPower.getPid(), sysPower.getIcon(), sysPower.getOrderNum(), sysPower.getVisible(), "0"); + rolePower.forEach(sysRolePower -> { + if (sysRolePower.getId().equals(sysPower.getId())) { + sysPower1.setCheckArr("1"); + return; + } + }); + sysPowerList.add(sysPower1); + + }); + return sysPowerList; + } + + /** + * @param userid + * @return + */ + @Override + public List getall(Long userid) { + if (userid == null) { + TSysPermission sysPermission = new TSysPermission(); + sysPermission.setVisible(0); + PageHelper.orderBy("order_num is null ASC,order_num ASC"); + return this.selectTSysPermissionList(sysPermission); + } + return this.tSysPermissionMapper.findByAdminUserId(userid); + } + + /** + * @param tSysPermission + * @return + */ + @Override + public int updateVisible(TSysPermission tSysPermission) { + return this.baseMapper.updateById(tSysPermission); + } + + /** + * @param userId + * @return + */ + @Override + public List getSysMenus(Long userId) { + List treeList = new ArrayList(); + List menuList = getall(userId); + treeList = getSysMenus(menuList, 0L); + return treeList; + } + + /** + * 递归查询权限 + * + * @param treeList + * @param parentId + * @return + */ + private List getSysMenus(List treeList, Long parentId) { + List SysMenuList = new ArrayList(); + if (StringUtils.isNotNull(parentId) && treeList != null && treeList.size() > 0) { + List childList = null; + for (TSysPermission tsysPermission : treeList) { + if (tsysPermission.getPid().equals(parentId)) { + if (tsysPermission.getChildCount() != null && tsysPermission.getChildCount() > 0) { + childList = getSysMenus(treeList, tsysPermission.getId()); + } + SysMenu sysMenu = new SysMenu(tsysPermission.getId(), tsysPermission.getPid(), tsysPermission.getName(), tsysPermission.getType(), tsysPermission.getIsBlank(), tsysPermission.getIcon(), tsysPermission.getUrl(), childList); + SysMenuList.add(sysMenu); + childList = null; + } + } + } + + return SysMenuList; + } + + /** + * @param rolid + * @return + */ + @Override + public List queryRoleId(Long rolid) { + return this.tSysPermissionMapper.queryRoleId(rolid); + } + + /** + * 根据权限字段查询是否存在 + * + * @param perms + * @return + * @author fuce + * @Date 2019年9月1日 上午2:06:31 + */ + public Boolean queryLikePerms(String perms) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.like("perms" , perms); + return this.selectTSysPermissionList(queryWrapper).size() > 0; + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysPositionServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysPositionServiceImpl.java new file mode 100644 index 0000000..7381077 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysPositionServiceImpl.java @@ -0,0 +1,138 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.service.ITSysPositionService; + +import cn.hutool.core.bean.BeanUtil; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysPositionMapper; +import com.fc.v2.model.auto.TSysPermissionRole; +import com.fc.v2.model.auto.TSysPosition; +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 岗位Service业务层处理 + * + * @author zhaonz + * @date 2021-08-05 + */ +@Service +public class TSysPositionServiceImpl extends ServiceImpl implements ITSysPositionService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysPositionServiceImpl.class); + + @Autowired + private TSysPositionMapper tSysPositionMapper; + + /** + * 查询岗位 + * + * @param id 岗位ID + * @return 岗位 + */ + @Override + public TSysPosition selectTSysPositionById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询岗位列表 + * + * @param queryWrapper 岗位 + * @return 岗位 + */ + @Override + public List selectTSysPositionList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + @Override + public List selectTSysPositionList(TSysPosition tSysPosition) { + Map map = BeanUtil.beanToMap(tSysPosition, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增岗位 + * + * @param tSysPosition 岗位 + * @return 结果 + */ + @Override + public int insertTSysPosition(TSysPosition tSysPosition) + { + return this.baseMapper.insert(tSysPosition); + } + + /** + * 修改岗位 + * + * @param tSysPosition 岗位 + * @return 结果 + */ + @Override + public int updateTSysPosition(TSysPosition tSysPosition) + { + return this.baseMapper.updateById(tSysPosition); + } + + /** + * 删除岗位对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysPositionByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除岗位信息 + * + * @param id 岗位ID + * @return 结果 + */ + @Override + public int deleteTSysPositionById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * + * @param sysPosition + * @return + */ + @Override + public int checkNameUnique(TSysPosition sysPosition) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("post_name", sysPosition.getPostName()); + return this.baseMapper.selectList(queryWrapper).size(); + } + + /** + * + * @param record + * @return + */ + @Override + public int updateVisible(TSysPosition record) { + return this.baseMapper.updateById(record); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysRoleServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysRoleServiceImpl.java new file mode 100644 index 0000000..0dc8099 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysRoleServiceImpl.java @@ -0,0 +1,170 @@ + +package com.fc.v2.service.impl; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.model.auto.TSysPermissionRole; +import com.fc.v2.service.ITSysPermissionRoleService; +import com.fc.v2.service.ITSysRoleService; + +import cn.hutool.core.bean.BeanUtil; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysRoleMapper; +import com.fc.v2.model.auto.TSysRole; +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 角色Service业务层处理 + * + * @author zhaonz + * @date 2021-08-05 + */ +@Service +public class TSysRoleServiceImpl extends ServiceImpl implements ITSysRoleService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysRoleServiceImpl.class); + + @Autowired + private TSysRoleMapper tSysRoleMapper; + + @Autowired + private ITSysPermissionRoleService permissionRoleService; + + /** + * 查询角色 + * + * @param id 角色ID + * @return 角色 + */ + @Override + public TSysRole selectTSysRoleById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询角色列表 + * + * @param queryWrapper 角色 + * @return 角色 + */ + @Override + public List selectTSysRoleList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + @Override + public List selectTSysRoleList(TSysRole tSysRole) { + Map map = BeanUtil.beanToMap(tSysRole, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增角色 + * + * @param tSysRole 角色 + * @return 结果 + */ + @Override + public int insertTSysRole(TSysRole tSysRole) + { + return this.baseMapper.insert(tSysRole); + } + + /** + * 修改角色 + * + * @param tSysRole 角色 + * @return 结果 + */ + @Override + public int updateTSysRole(TSysRole tSysRole) + { + return this.baseMapper.updateById(tSysRole); + } + + /** + * 删除角色对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysRoleByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除角色信息 + * + * @param id 角色ID + * @return 结果 + */ + @Override + public int deleteTSysRoleById(Long id) + { + return this.baseMapper.deleteById(id); + } + + @Override + public List queryUserRole(Long userid) { + return tSysRoleMapper.queryUserRole(userid); + } + + /** + * + * @param tsysRole + * @return + */ + @Override + public int checkNameUnique(TSysRole tsysRole) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("name", tsysRole.getName()); + return this.baseMapper.selectList(queryWrapper).size(); + } + + /** + * 修改用户角色 以及下面绑定的权限 + * + * @param roleId + * @param powerIds + * @return + */ + @Override + public int updateRoleAndPrem(Long roleId, String powerIds) { + //先删除角色下面的所有权限 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("role_id", roleId); + + permissionRoleService.deleteTSysPermissionRole(queryWrapper); + List list = new ArrayList(); + //添加权限关联 + List prems = ConvertUtil.toListStrArray(powerIds); + + for (String pre : prems) { + TSysPermissionRole permissionRole = new TSysPermissionRole(); + permissionRole.setRoleId(roleId); + permissionRole.setPermissionId(Long.parseLong(pre)); + list.add(permissionRole); + } + + if (permissionRoleService.saveTSysPermissionRoleBatch(list)){ + return list.size(); + } + + return 0; + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysRoleUserServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysRoleUserServiceImpl.java new file mode 100644 index 0000000..074d452 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysRoleUserServiceImpl.java @@ -0,0 +1,138 @@ + +package com.fc.v2.service.impl; + +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.service.ITSysRoleUserService; + +import cn.hutool.core.bean.BeanUtil; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysRoleUserMapper; +import com.fc.v2.model.auto.TSysRole; +import com.fc.v2.model.auto.TSysRoleUser; +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * 用户角色中间Service业务层处理 + * + * @author zhaonz + * @date 2021-08-05 + */ +@Service +public class TSysRoleUserServiceImpl extends ServiceImpl implements ITSysRoleUserService +{ + private static final Logger logger = LoggerFactory.getLogger(TSysRoleUserServiceImpl.class); + + @Autowired + private TSysRoleUserMapper tSysRoleUserMapper; + + /** + * 查询用户角色中间 + * + * @param id 用户角色中间ID + * @return 用户角色中间 + */ + @Override + public TSysRoleUser selectTSysRoleUserById(Long id) + { + return this.baseMapper.selectById(id); + } + + /** + * 查询用户角色中间列表 + * + * @param queryWrapper 用户角色中间 + * @return 用户角色中间 + */ + @Override + public List selectTSysRoleUserList(Wrapper queryWrapper) + { + return this.baseMapper.selectList(queryWrapper); + } + + @Override + public List selectTSysRoleUserList(TSysRoleUser tSysRoleUser) { + Map map = BeanUtil.beanToMap(tSysRoleUser, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增用户角色中间 + * + * @param tSysRoleUser 用户角色中间 + * @return 结果 + */ + @Override + public int insertTSysRoleUser(TSysRoleUser tSysRoleUser) + { + return this.baseMapper.insert(tSysRoleUser); + } + + /** + * 新增用户角色中间 + * + * @param tSysRoleUsers 批量保存用户角色中间 + * @return 结果 + */ + @Override + public boolean saveTSysRoleUserBatch(List tSysRoleUsers) { + return this.saveBatch(tSysRoleUsers); + } + + /** + * 修改用户角色中间 + * + * @param tSysRoleUser 用户角色中间 + * @return 结果 + */ + @Override + public int updateTSysRoleUser(TSysRoleUser tSysRoleUser) + { + return this.baseMapper.updateById(tSysRoleUser); + } + + /** + * 删除用户角色中间对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysRoleUserByIds(String ids) + { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除用户角色中间信息 + * + * @param id 用户角色中间ID + * @return 结果 + */ + @Override + public int deleteTSysRoleUserById(Long id) + { + return this.baseMapper.deleteById(id); + } + + /** + * 删除用户角色中间信息 + * + * @param queryWrapper + * @return 结果 + */ + @Override + public int deleteTSysRoleUser(QueryWrapper queryWrapper) { + return this.baseMapper.delete(queryWrapper); + } +} diff --git a/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java new file mode 100644 index 0000000..02a0313 --- /dev/null +++ b/src/main/java/com/fc/v2/service/impl/TSysUserServiceImpl.java @@ -0,0 +1,225 @@ + +package com.fc.v2.service.impl; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fc.v2.model.auto.TSysRole; +import com.fc.v2.model.custom.RoleVo; +import com.fc.v2.model.custom.Tablepar; +import com.fc.v2.service.ITSysRoleService; +import com.fc.v2.service.ITSysRoleUserService; +import com.fc.v2.service.ITSysUserService; +import com.fc.v2.util.MD5Util; +import com.fc.v2.util.StringUtils; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import cn.hutool.core.bean.BeanUtil; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fc.v2.mapper.auto.TSysUserMapper; +import com.fc.v2.model.auto.TSysRoleUser; +import com.fc.v2.model.auto.TSysUser; +import com.fc.v2.common.support.ConvertUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 用户Service业务层处理 + * + * @author zhaonz + * @date 2021-08-05 + */ +@Service +public class TSysUserServiceImpl extends ServiceImpl implements ITSysUserService { + + private static final Logger logger = LoggerFactory.getLogger(TSysUserServiceImpl.class); + + @Autowired + private TSysUserMapper tSysUserMapper; + + @Autowired + private ITSysRoleUserService itSysRoleUserService; + + @Autowired + private ITSysRoleService itSysRoleService; + + /** + * 查询用户 + * + * @param id 用户ID + * @return 用户 + */ + @Override + public TSysUser selectTSysUserById(Long id) { + return this.baseMapper.selectById(id); + } + + /** + * 查询用户列表 + * + * @param queryWrapper 用户 + * @return 用户 + */ + @Override + public List selectTSysUserList(Wrapper queryWrapper) { + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 查询用户列表 + * + * @param tSysUser 用户 + * @return 用户 + */ + @Override + public List selectTSysUserList(TSysUser tSysUser) { + Map map = BeanUtil.beanToMap(tSysUser, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map,false); + return this.baseMapper.selectList(queryWrapper); + } + + /** + * 新增用户 + * + * @param tSysUser 用户 + * @return 结果 + */ + @Override + public int insertTSysUser(TSysUser tSysUser) { + return this.baseMapper.insert(tSysUser); + } + + /** + * 修改用户 + * + * @param tSysUser 用户 + * @return 结果 + */ + @Override + public int updateTSysUser(TSysUser tSysUser) { + return this.baseMapper.updateById(tSysUser); + } + + /** + * 删除用户对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSysUserByIds(String ids) { + return this.baseMapper.deleteBatchIds(Arrays.asList(ConvertUtil.toStrArray(ids))); + } + + /** + * 删除用户信息 + * + * @param id 用户ID + * @return 结果 + */ + @Override + public int deleteTSysUserById(Long id) { + return this.baseMapper.deleteById(id); + } + + @Override + public int insertUserRoles(TSysUser user, String roleIds) { + user.setId(IdWorker.getId()); + if (StringUtils.isNotEmpty(roleIds)) { + List listRoles = ConvertUtil.toListStrArray(roleIds); + for (String rolesid : listRoles) { + TSysRoleUser tSysRoleUser = new TSysRoleUser(); + tSysRoleUser.seTSysUserId(user.getId()); + tSysRoleUser.setSysRoleId(Long.parseLong(rolesid)); + itSysRoleUserService.insertTSysRoleUser(tSysRoleUser); + } + } + + user.setPassword(MD5Util.encode(user.getPassword())); + return this.baseMapper.insert(user); + } + + @Override + public int checkLoginNameUnique(TSysUser tsysUser) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("username", tsysUser.getUsername()); + return this.baseMapper.selectList(queryWrapper).size(); + } + + @Override + public List getUserIsRole(Long id) { + List list = new ArrayList(); + //查询出我的权限 + List myRoles = itSysRoleService.queryUserRole(id); + //查询系统所有的角色 + List tsysRoles = itSysRoleService.selectTSysRoleList(new QueryWrapper()); + if (StringUtils.isNotEmpty(tsysRoles)) { + for (TSysRole tsysRole : tsysRoles) { + Boolean isflag = false; + RoleVo roleVo = new RoleVo(tsysRole.getId(), tsysRole.getName(), isflag); + for (TSysRole myRole : myRoles) { + if (tsysRole.getId().equals(myRole.getId())) { + isflag = true; + break; + } + } + if (isflag) { + roleVo.setIscheck(true); + list.add(roleVo); + } else { + list.add(roleVo); + } + } + } + return list; + } + + @Override + public int updateUserRoles(TSysUser tsysUser, String roleIds) { + //先删除这个用户的所有角色 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("sys_user_id", tsysUser.getId()); + itSysRoleUserService.remove(queryWrapper); + + if(StringUtils.isNotEmpty(roleIds)) { + List list_roles = ConvertUtil.toListStrArray(roleIds); + //添加新的角色信息 + for (String role : list_roles) { + TSysRoleUser tSysRoleUser = new TSysRoleUser(); + tSysRoleUser.seTSysUserId(tsysUser.getId()); + tSysRoleUser.setSysRoleId(Long.parseLong(role)); + itSysRoleUserService.insertTSysRoleUser(tSysRoleUser); + } + } + //修改用户信息 + return this.updateTSysUser(tsysUser); + } + + @Override + public int updateUserPassword(TSysUser tsysUser) { + tsysUser.setPassword(MD5Util.encode(tsysUser.getPassword())); + return this.updateTSysUser(tsysUser); + } + + @Override + public PageInfo userList(Tablepar tablepar) { + PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); + List list = tSysUserMapper.queryUserInfo(tablepar.getSearchText()); + return new PageInfo(list); + } + + @Override + public TSysUser queryUserName(String username) { + return this.tSysUserMapper.queryUserName(username); + } +} diff --git a/src/main/java/com/fc/v2/service/SysUtilService.java b/src/main/java/com/fc/v2/service/impl/TSysUtilServiceImpl.java similarity index 81% rename from src/main/java/com/fc/v2/service/SysUtilService.java rename to src/main/java/com/fc/v2/service/impl/TSysUtilServiceImpl.java index 9ddbba3..6d16319 100644 --- a/src/main/java/com/fc/v2/service/SysUtilService.java +++ b/src/main/java/com/fc/v2/service/impl/TSysUtilServiceImpl.java @@ -1,8 +1,8 @@ -package com.fc.v2.service; +package com.fc.v2.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fc.v2.mapper.custom.SysUtilDao; import com.fc.v2.model.custom.SQLAdapter; +import com.fc.v2.service.ITSysUtilService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,17 +10,20 @@ import java.util.List; import java.util.Map; @Service -public class SysUtilService { +public class TSysUtilServiceImpl implements ITSysUtilService { + @Autowired private SysUtilDao dao; /** * 执行sql + * * @param sql * @return * @author fuce * @Date 2019年8月31日 下午6:15:08 */ + @Override public int executeSQL(String sql){ return dao.executeSQL(new SQLAdapter(sql)); } @@ -28,11 +31,13 @@ public class SysUtilService { /** * 查询sql + * * @param sql * @return list * @author fuce * @Date 2020年4月10日 下午4:55:49 */ + @Override public List> SelectExecuteSQL(String sql){ return dao.SelectExecuteSQL(new SQLAdapter(sql)); } diff --git a/src/main/java/com/fc/v2/shiro/service/MyShiroRealm.java b/src/main/java/com/fc/v2/shiro/service/MyShiroRealm.java index ab265f1..e920932 100644 --- a/src/main/java/com/fc/v2/shiro/service/MyShiroRealm.java +++ b/src/main/java/com/fc/v2/shiro/service/MyShiroRealm.java @@ -1,11 +1,11 @@ package com.fc.v2.shiro.service; -import com.fc.v2.mapper.custom.PermissionDao; -import com.fc.v2.mapper.custom.RoleDao; -import com.fc.v2.mapper.custom.TsysUserDao; -import com.fc.v2.model.auto.TsysPermission; -import com.fc.v2.model.auto.TsysRole; -import com.fc.v2.model.auto.TsysUser; +import com.fc.v2.model.auto.TSysPermission; +import com.fc.v2.model.auto.TSysRole; +import com.fc.v2.model.auto.TSysUser; +import com.fc.v2.service.ITSysPermissionService; +import com.fc.v2.service.ITSysRoleService; +import com.fc.v2.service.ITSysUserService; import com.fc.v2.util.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; @@ -24,92 +24,92 @@ import java.util.List; /** * 身份校验核心类 - * - * @ClassName: MyShiroRealm + * * @author fuce + * @ClassName: MyShiroRealm * @date 2018年8月25日 - * */ @Service public class MyShiroRealm extends AuthorizingRealm { - - @Autowired - private TsysUserDao tsysUserDao; - - @Autowired - private PermissionDao permissionDao;//权限dao - - @Autowired - private RoleDao roleDao ;//角色dao - - - /** - * 认证登陆 - */ - @SuppressWarnings("unused") - @Override - protected AuthenticationInfo doGetAuthenticationInfo( - AuthenticationToken token) throws AuthenticationException { - - //加这一步的目的是在Post请求的时候会先进认证，然后在到请求 + + @Autowired + private ITSysUserService userService; + + //权限dao + @Autowired + private ITSysPermissionService permissionService; + + //角色dao + @Autowired + private ITSysRoleService roleService; + + + /** + * 认证登陆 + */ + @SuppressWarnings("unused") + @Override + protected AuthenticationInfo doGetAuthenticationInfo( + AuthenticationToken token) throws AuthenticationException { + + //加这一步的目的是在Post请求的时候会先进认证，然后在到请求 if (token.getPrincipal() == null) { return null; } - String username = (String) token.getPrincipal(); - String password = new String((char[]) token.getCredentials()); - // 通过username从数据库中查找 User对象，如果找到，没找到. - // 实际项目中，这里可以根据实际情况做缓存，如果不做，Shiro自己也是有时间间隔机制，2分钟内不会重复执行该方法 - TsysUser userInfo = tsysUserDao.queryUserName(username); + String username = (String) token.getPrincipal(); + String password = new String((char[]) token.getCredentials()); + // 通过username从数据库中查找 User对象，如果找到，没找到. + // 实际项目中，这里可以根据实际情况做缓存，如果不做，Shiro自己也是有时间间隔机制，2分钟内不会重复执行该方法 + TSysUser userInfo = userService.queryUserName(username); // System.out.println(userInfo); // System.out.println("----->>userInfo=" + userInfo.getUsername() + "---"+ userInfo.getPassword()); - if (userInfo == null) - return null; - else{ - SimpleAuthenticationInfo authenticationInfo = new SimpleAuthenticationInfo( - userInfo, // 用户对象 - userInfo.getPassword(), // 密码 - getName() // realm name - ); - return authenticationInfo; - } - - } - - /** + if (userInfo == null) + return null; + else { + SimpleAuthenticationInfo authenticationInfo = new SimpleAuthenticationInfo( + userInfo, // 用户对象 + userInfo.getPassword(), // 密码 + getName() // realm name + ); + return authenticationInfo; + } + + } + + /** * 授权查询回调函数, 进行鉴权但缓存中无用户的授权信息时调用. */ - @Override - protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { - //System.out.println("权限配置-->MyShiroRealm.doGetAuthorizationInfo()"); - if(principals == null){ - throw new AuthorizationException("principals should not be null"); - } - SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo(); - TsysUser userinfo = (TsysUser)principals.getPrimaryPrincipal(); - String uid=userinfo.getId(); - List tsysRoles= roleDao.queryUserRole(uid); - for(TsysRole userrole:tsysRoles){ - //System.out.println("角色名字:"+gson.toJson(userrole)); - String rolid=userrole.getId();//角色id - authorizationInfo.addRole(userrole.getName());//添加角色名字 - List permissions=permissionDao.queryRoleId(rolid); - for(TsysPermission p:permissions){ - //System.out.println("角色下面的权限:"+gson.toJson(p)); - if(StringUtils.isNotEmpty(p.getPerms())){ - authorizationInfo.addStringPermission(p.getPerms()); - } - - } - } - - return authorizationInfo; - } - - /** + @Override + protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { + //System.out.println("权限配置-->MyShiroRealm.doGetAuthorizationInfo()"); + if (principals == null) { + throw new AuthorizationException("principals should not be null"); + } + SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo(); + TSysUser userinfo = (TSysUser) principals.getPrimaryPrincipal(); + Long uid = userinfo.getId(); + List tsysRoles = roleService.queryUserRole(uid); + for (TSysRole userrole : tsysRoles) { + //System.out.println("角色名字:"+gson.toJson(userrole)); + Long rolid = userrole.getId();//角色id + authorizationInfo.addRole(userrole.getName());//添加角色名字 + List permissions = permissionService.queryRoleId(rolid); + for (TSysPermission p : permissions) { + //System.out.println("角色下面的权限:"+gson.toJson(p)); + if (StringUtils.isNotEmpty(p.getPerms())) { + authorizationInfo.addStringPermission(p.getPerms()); + } + + } + } + + return authorizationInfo; + } + + /** * 清理缓存权限 */ - public void clearCachedAuthorizationInfo() - { + public void clearCachedAuthorizationInfo() { this.clearCachedAuthorizationInfo(SecurityUtils.getSubject().getPrincipals()); } diff --git a/src/main/java/com/fc/v2/shiro/util/ShiroUtils.java b/src/main/java/com/fc/v2/shiro/util/ShiroUtils.java index 0472368..6ea9a11 100644 --- a/src/main/java/com/fc/v2/shiro/util/ShiroUtils.java +++ b/src/main/java/com/fc/v2/shiro/util/ShiroUtils.java @@ -1,12 +1,12 @@ package com.fc.v2.shiro.util; +import com.fc.v2.model.auto.TSysUser; import org.apache.shiro.SecurityUtils; import org.apache.shiro.mgt.RealmSecurityManager; import org.apache.shiro.session.Session; import org.apache.shiro.subject.PrincipalCollection; import org.apache.shiro.subject.SimplePrincipalCollection; import org.apache.shiro.subject.Subject; -import com.fc.v2.model.auto.TsysUser; import com.fc.v2.shiro.service.MyShiroRealm; import com.fc.v2.util.BeanUtils; import com.fc.v2.util.StringUtils; @@ -59,13 +59,13 @@ public class ShiroUtils { * @author fuce * @Date 2019年11月21日 上午10:00:10 */ - public static TsysUser getUser() + public static TSysUser getUser() { - TsysUser user = null; + TSysUser user = null; Object obj = getSubjct().getPrincipal(); if (StringUtils.isNotNull(obj)) { - user = new TsysUser(); + user = new TSysUser(); BeanUtils.copyBeanProp(user, obj); } return user; @@ -77,7 +77,7 @@ public class ShiroUtils { * @author fuce * @Date 2019年11月21日 上午9:59:52 */ - public static void setUser(TsysUser user) + public static void setUser(TSysUser user) { Subject subject = getSubjct(); PrincipalCollection principalCollection = subject.getPrincipals(); @@ -105,13 +105,13 @@ public class ShiroUtils { * @author fuce * @Date 2019年11月21日 上午9:58:55 */ - public static String getUserId() + public static Long getUserId() { - TsysUser tsysUser = getUser(); + TSysUser tsysUser = getUser(); if (tsysUser == null || tsysUser.getId() == null){ throw new RuntimeException("用户不存在！"); } - return tsysUser.getId().trim(); + return tsysUser.getId(); } /** @@ -122,7 +122,7 @@ public class ShiroUtils { */ public static String getLoginName() { - TsysUser tsysUser = getUser(); + TSysUser tsysUser = getUser(); if (tsysUser == null){ throw new RuntimeException("用户不存在！"); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c2d3997..b84543a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,7 +7,7 @@ spring: druid: #主库数据源 master: - url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=GMT + url: jdbc:mysql://192.168.231.135:3306/springboot-v2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=GMT username: root password: root #备数据源 #关闭 diff --git a/src/main/resources/mybatis/auto/SysDepartmentMapper.xml b/src/main/resources/mybatis/auto/SysDepartmentMapper.xml deleted file mode 100644 index 02ba442..0000000 --- a/src/main/resources/mybatis/auto/SysDepartmentMapper.xml +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, - parent_id, - dept_name, - leader, - phone, - email, - status, - order_num, - (select count(1) from t_sys_department where parent_id=a.id) childcount - - - - - - delete from t_sys_department - where id = #{id,jdbcType=INTEGER} - - - delete from t_sys_department - - - - - - - insert into t_sys_department ( - id, - parent_id, - dept_name, - leader, - phone, - email, - status, - order_num - ) - values ( - #{id,jdbcType=INTEGER}, - #{parentId,jdbcType=VARCHAR}, - #{deptName,jdbcType=VARCHAR}, - #{leader,jdbcType=VARCHAR}, - #{phone,jdbcType=VARCHAR}, - #{email,jdbcType=VARCHAR}, - #{status,jdbcType=INTEGER}, - #{orderNum,jdbcType=INTEGER} - ) - - - - insert into t_sys_department - - - - id, - - - - - parent_id, - - - - - dept_name, - - - - - leader, - - - - - phone, - - - - - email, - - - - - status, - - - - - order_num, - - - - - - #{id,jdbcType=INTEGER}, - - - #{parentId,jdbcType=VARCHAR}, - - - #{deptName,jdbcType=VARCHAR}, - - - #{leader,jdbcType=VARCHAR}, - - - #{phone,jdbcType=VARCHAR}, - - - #{email,jdbcType=VARCHAR}, - - - #{status,jdbcType=INTEGER}, - - - #{orderNum,jdbcType=INTEGER}, - - - - - - - - update t_sys_department - - - id = #{record.id,jdbcType=INTEGER}, - - - parent_id = #{record.parentId,jdbcType=VARCHAR}, - - - dept_name = #{record.deptName,jdbcType=VARCHAR}, - - - leader = #{record.leader,jdbcType=VARCHAR}, - - - phone = #{record.phone,jdbcType=VARCHAR}, - - - email = #{record.email,jdbcType=VARCHAR}, - - - status = #{record.status,jdbcType=INTEGER}, - - - order_num = #{record.orderNum,jdbcType=INTEGER}, - - - - - - - - - - - update t_sys_department - set - id = #{record.id,jdbcType=INTEGER}, - parent_id = #{record.parentId,jdbcType=VARCHAR}, - dept_name = #{record.deptName,jdbcType=VARCHAR}, - leader = #{record.leader,jdbcType=VARCHAR}, - phone = #{record.phone,jdbcType=VARCHAR}, - email = #{record.email,jdbcType=VARCHAR}, - status = #{record.status,jdbcType=INTEGER}, - order_num = #{record.orderNum,jdbcType=INTEGER} - - - - - - - - update t_sys_department - - - parent_id = #{parentId,jdbcType=VARCHAR}, - - - dept_name = #{deptName,jdbcType=VARCHAR}, - - - leader = #{leader,jdbcType=VARCHAR}, - - - phone = #{phone,jdbcType=VARCHAR}, - - - email = #{email,jdbcType=VARCHAR}, - - - status = #{status,jdbcType=INTEGER}, - - - order_num = #{orderNum,jdbcType=INTEGER}, - - - where - id = #{id,jdbcType=INTEGER} - - - - - - - update t_sys_department - set - parent_id = #{parentId,jdbcType=VARCHAR}, - dept_name = #{deptName,jdbcType=VARCHAR}, - leader = #{leader,jdbcType=VARCHAR}, - phone = #{phone,jdbcType=VARCHAR}, - email = #{email,jdbcType=VARCHAR}, - status = #{status,jdbcType=INTEGER}, - order_num = #{orderNum,jdbcType=INTEGER} - where - id = #{id,jdbcType=INTEGER} - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/SysInterUrlMapper.xml b/src/main/resources/mybatis/auto/SysInterUrlMapper.xml deleted file mode 100644 index 43836d8..0000000 --- a/src/main/resources/mybatis/auto/SysInterUrlMapper.xml +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, - inter_name, - url, - type - - - - - - delete from t_sys_inter_url - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_inter_url - - - - - - - insert into t_sys_inter_url ( - id, - inter_name, - url, - type - ) - values ( - #{id,jdbcType=VARCHAR}, - #{interName,jdbcType=VARCHAR}, - #{url,jdbcType=VARCHAR}, - #{type,jdbcType=INTEGER} - ) - - - - insert into t_sys_inter_url - - - - id, - - - - - inter_name, - - - - - url, - - - - - type, - - - - - - #{id,jdbcType=VARCHAR}, - - - #{interName,jdbcType=VARCHAR}, - - - #{url,jdbcType=VARCHAR}, - - - #{type,jdbcType=INTEGER}, - - - - - - - - update t_sys_inter_url - - - id = #{record.id,jdbcType=VARCHAR}, - - - inter_name = #{record.interName,jdbcType=VARCHAR}, - - - url = #{record.url,jdbcType=VARCHAR}, - - - type = #{record.type,jdbcType=INTEGER}, - - - - - - - - - - - update t_sys_inter_url - set - id = #{record.id,jdbcType=VARCHAR}, - inter_name = #{record.interName,jdbcType=VARCHAR}, - url = #{record.url,jdbcType=VARCHAR}, - type = #{record.type,jdbcType=INTEGER} - - - - - - - - update t_sys_inter_url - - - inter_name = #{interName,jdbcType=VARCHAR}, - - - url = #{url,jdbcType=VARCHAR}, - - - type = #{type,jdbcType=INTEGER}, - - - where - id = #{id,jdbcType=VARCHAR} - - - - - - - update t_sys_inter_url - set - inter_name = #{interName,jdbcType=VARCHAR}, - url = #{url,jdbcType=VARCHAR}, - type = #{type,jdbcType=INTEGER} - where - id = #{id,jdbcType=VARCHAR} - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/SysPositionMapper.xml b/src/main/resources/mybatis/auto/SysPositionMapper.xml deleted file mode 100644 index ccf680f..0000000 --- a/src/main/resources/mybatis/auto/SysPositionMapper.xml +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, - post_name, - order_num, - status - - - - - - delete from t_sys_position - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_position - - - - - - - insert into t_sys_position ( - id, - post_name, - order_num, - status - ) - values ( - #{id,jdbcType=VARCHAR}, - #{postName,jdbcType=VARCHAR}, - #{orderNum,jdbcType=INTEGER}, - #{status,jdbcType=INTEGER} - ) - - - - insert into t_sys_position - - - - id, - - - - - post_name, - - - - - order_num, - - - - - status, - - - - - - #{id,jdbcType=VARCHAR}, - - - #{postName,jdbcType=VARCHAR}, - - - #{orderNum,jdbcType=INTEGER}, - - - #{status,jdbcType=INTEGER}, - - - - - - - - update t_sys_position - - - id = #{record.id,jdbcType=VARCHAR}, - - - post_name = #{record.postName,jdbcType=VARCHAR}, - - - order_num = #{record.orderNum,jdbcType=INTEGER}, - - - status = #{record.status,jdbcType=INTEGER}, - - - - - - - - - - - update t_sys_position - set - id = #{record.id,jdbcType=VARCHAR}, - post_name = #{record.postName,jdbcType=VARCHAR}, - order_num = #{record.orderNum,jdbcType=INTEGER}, - status = #{record.status,jdbcType=INTEGER} - - - - - - - - update t_sys_position - - - post_name = #{postName,jdbcType=VARCHAR}, - - - order_num = #{orderNum,jdbcType=INTEGER}, - - - status = #{status,jdbcType=INTEGER}, - - - where - id = #{id,jdbcType=VARCHAR} - - - - - - - update t_sys_position - set - post_name = #{postName,jdbcType=VARCHAR}, - order_num = #{orderNum,jdbcType=INTEGER}, - status = #{status,jdbcType=INTEGER} - where - id = #{id,jdbcType=VARCHAR} - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysDepartmentMapper.xml b/src/main/resources/mybatis/auto/TSysDepartmentMapper.xml new file mode 100644 index 0000000..b2281b7 --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysDepartmentMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + select id, parent_id, dept_name, leader, phone, email, status, order_num, create_by, create_time, update_by, update_time, remark from t_sys_department + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysInterUrlMapper.xml b/src/main/resources/mybatis/auto/TSysInterUrlMapper.xml new file mode 100644 index 0000000..882dd3f --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysInterUrlMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + select id, inter_name, url, type, create_by, create_time, update_by, update_time, remark from t_sys_inter_url + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysPermissionMapper.xml b/src/main/resources/mybatis/auto/TSysPermissionMapper.xml new file mode 100644 index 0000000..8ee0e65 --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysPermissionMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, name, descripion, url, is_blank, pid, perms, type, icon, order_num, visible, create_by, create_time, update_by, update_time, remark from t_sys_permission + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysPositionMapper.xml b/src/main/resources/mybatis/auto/TSysPositionMapper.xml new file mode 100644 index 0000000..c0d5c16 --- /dev/null +++ b/src/main/resources/mybatis/auto/TSysPositionMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + select id, post_name, order_num, status, create_by, create_time, update_by, update_time, remark from t_sys_position + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TSysRoleUserMapper.xml b/src/main/resources/mybatis/auto/TSysRoleUserMapper.xml index 2d69c90..c0912a1 100644 --- a/src/main/resources/mybatis/auto/TSysRoleUserMapper.xml +++ b/src/main/resources/mybatis/auto/TSysRoleUserMapper.xml @@ -1,181 +1,23 @@ - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, sys_user_id, sys_role_id - - - - - delete from t_sys_role_user - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_role_user - - - - - - insert into t_sys_role_user (id, sys_user_id, sys_role_id - ) - values (#{id,jdbcType=VARCHAR}, #{sysUserId,jdbcType=VARCHAR}, #{sysRoleId,jdbcType=VARCHAR} - ) - - - insert into t_sys_role_user - - - id, - - - sys_user_id, - - - sys_role_id, - - - - - #{id,jdbcType=VARCHAR}, - - - #{sysUserId,jdbcType=VARCHAR}, - - - #{sysRoleId,jdbcType=VARCHAR}, - - - - - - update t_sys_role_user - - - id = #{record.id,jdbcType=VARCHAR}, - - - sys_user_id = #{record.sysUserId,jdbcType=VARCHAR}, - - - sys_role_id = #{record.sysRoleId,jdbcType=VARCHAR}, - - - - - - - - update t_sys_role_user - set id = #{record.id,jdbcType=VARCHAR}, - sys_user_id = #{record.sysUserId,jdbcType=VARCHAR}, - sys_role_id = #{record.sysRoleId,jdbcType=VARCHAR} - - - - - - update t_sys_role_user - - - sys_user_id = #{sysUserId,jdbcType=VARCHAR}, - - - sys_role_id = #{sysRoleId,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update t_sys_role_user - set sys_user_id = #{sysUserId,jdbcType=VARCHAR}, - sys_role_id = #{sysRoleId,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - + + + + + + + + + + + + + + + + select id, sys_user_id, sys_role_id, create_by, create_time, update_by, update_time, remark from t_sys_role_user + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TsysPermissionRoleMapper.xml b/src/main/resources/mybatis/auto/TsysPermissionRoleMapper.xml index 9cc384a..7277102 100644 --- a/src/main/resources/mybatis/auto/TsysPermissionRoleMapper.xml +++ b/src/main/resources/mybatis/auto/TsysPermissionRoleMapper.xml @@ -1,181 +1,23 @@ - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, role_id, permission_id - - - - - delete from t_sys_permission_role - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_permission_role - - - - - - insert into t_sys_permission_role (id, role_id, permission_id - ) - values (#{id,jdbcType=VARCHAR}, #{roleId,jdbcType=VARCHAR}, #{permissionId,jdbcType=VARCHAR} - ) - - - insert into t_sys_permission_role - - - id, - - - role_id, - - - permission_id, - - - - - #{id,jdbcType=VARCHAR}, - - - #{roleId,jdbcType=VARCHAR}, - - - #{permissionId,jdbcType=VARCHAR}, - - - - - - update t_sys_permission_role - - - id = #{record.id,jdbcType=VARCHAR}, - - - role_id = #{record.roleId,jdbcType=VARCHAR}, - - - permission_id = #{record.permissionId,jdbcType=VARCHAR}, - - - - - - - - update t_sys_permission_role - set id = #{record.id,jdbcType=VARCHAR}, - role_id = #{record.roleId,jdbcType=VARCHAR}, - permission_id = #{record.permissionId,jdbcType=VARCHAR} - - - - - - update t_sys_permission_role - - - role_id = #{roleId,jdbcType=VARCHAR}, - - - permission_id = #{permissionId,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update t_sys_permission_role - set role_id = #{roleId,jdbcType=VARCHAR}, - permission_id = #{permissionId,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - + + + + + + + + + + + + + + + + select id, role_id, permission_id, create_by, create_time, update_by, update_time, remark from t_sys_permission_role + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TsysPremissionMapper.xml b/src/main/resources/mybatis/auto/TsysPremissionMapper.xml deleted file mode 100644 index 6680e05..0000000 --- a/src/main/resources/mybatis/auto/TsysPremissionMapper.xml +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, name, descripion, url, is_blank, pid, perms, type, icon, order_num, visible, (select count(1) from t_sys_permission where pid=a.id) childcount - - - - - delete from t_sys_permission - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_permission - - - - - - insert into t_sys_permission (id, name, descripion, - url, is_blank, pid, - perms, type, icon, - order_num, visible) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{descripion,jdbcType=VARCHAR}, - #{url,jdbcType=VARCHAR}, #{isBlank,jdbcType=INTEGER}, #{pid,jdbcType=VARCHAR}, - #{perms,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{icon,jdbcType=VARCHAR}, - #{orderNum,jdbcType=INTEGER}, #{visible,jdbcType=INTEGER}) - - - insert into t_sys_permission - - - id, - - - name, - - - descripion, - - - url, - - - is_blank, - - - pid, - - - perms, - - - type, - - - icon, - - - order_num, - - - visible, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{descripion,jdbcType=VARCHAR}, - - - #{url,jdbcType=VARCHAR}, - - - #{isBlank,jdbcType=INTEGER}, - - - #{pid,jdbcType=VARCHAR}, - - - #{perms,jdbcType=VARCHAR}, - - - #{type,jdbcType=INTEGER}, - - - #{icon,jdbcType=VARCHAR}, - - - #{orderNum,jdbcType=INTEGER}, - - - #{visible,jdbcType=INTEGER}, - - - - - - update t_sys_permission - - - id = #{record.id,jdbcType=VARCHAR}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - descripion = #{record.descripion,jdbcType=VARCHAR}, - - - url = #{record.url,jdbcType=VARCHAR}, - - - is_blank = #{record.isBlank,jdbcType=INTEGER}, - - - pid = #{record.pid,jdbcType=VARCHAR}, - - - perms = #{record.perms,jdbcType=VARCHAR}, - - - type = #{record.type,jdbcType=INTEGER}, - - - icon = #{record.icon,jdbcType=VARCHAR}, - - - order_num = #{record.orderNum,jdbcType=INTEGER}, - - - visible = #{record.visible,jdbcType=INTEGER}, - - - - - - - - update t_sys_permission - set id = #{record.id,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR}, - descripion = #{record.descripion,jdbcType=VARCHAR}, - url = #{record.url,jdbcType=VARCHAR}, - is_blank = #{record.isBlank,jdbcType=INTEGER}, - pid = #{record.pid,jdbcType=VARCHAR}, - perms = #{record.perms,jdbcType=VARCHAR}, - type = #{record.type,jdbcType=INTEGER}, - icon = #{record.icon,jdbcType=VARCHAR}, - order_num = #{record.orderNum,jdbcType=INTEGER}, - visible = #{record.visible,jdbcType=INTEGER} - - - - - - update t_sys_permission - - - name = #{name,jdbcType=VARCHAR}, - - - descripion = #{descripion,jdbcType=VARCHAR}, - - - url = #{url,jdbcType=VARCHAR}, - - - is_blank = #{isBlank,jdbcType=INTEGER}, - - - pid = #{pid,jdbcType=VARCHAR}, - - - perms = #{perms,jdbcType=VARCHAR}, - - - type = #{type,jdbcType=INTEGER}, - - - icon = #{icon,jdbcType=VARCHAR}, - - - order_num = #{orderNum,jdbcType=INTEGER}, - - - visible = #{visible,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=VARCHAR} - - - update t_sys_permission - set name = #{name,jdbcType=VARCHAR}, - descripion = #{descripion,jdbcType=VARCHAR}, - url = #{url,jdbcType=VARCHAR}, - is_blank = #{isBlank,jdbcType=INTEGER}, - pid = #{pid,jdbcType=VARCHAR}, - perms = #{perms,jdbcType=VARCHAR}, - type = #{type,jdbcType=INTEGER}, - icon = #{icon,jdbcType=VARCHAR}, - order_num = #{orderNum,jdbcType=INTEGER}, - visible = #{visible,jdbcType=INTEGER} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TsysRoleMapper.xml b/src/main/resources/mybatis/auto/TsysRoleMapper.xml index a40004d..4ae87d9 100644 --- a/src/main/resources/mybatis/auto/TsysRoleMapper.xml +++ b/src/main/resources/mybatis/auto/TsysRoleMapper.xml @@ -1,164 +1,20 @@ - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, name - - - - - delete from t_sys_role - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_role - - - - - - insert into t_sys_role (id, name) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}) - - - insert into t_sys_role - - - id, - - - name, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - - - - update t_sys_role - - - id = #{record.id,jdbcType=VARCHAR}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - - - - - - update t_sys_role - set id = #{record.id,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR} - - - - - - update t_sys_role - - - name = #{name,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update t_sys_role - set name = #{name,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - + + + + + + + + + + + + + + + select id, name, create_by, create_time, update_by, update_time, remark from t_sys_role + \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TsysUserMapper.xml b/src/main/resources/mybatis/auto/TsysUserMapper.xml index e729d4f..22aac6a 100644 --- a/src/main/resources/mybatis/auto/TsysUserMapper.xml +++ b/src/main/resources/mybatis/auto/TsysUserMapper.xml @@ -1,246 +1,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, username, password, nickname, dep_id, pos_id - - - - - delete from t_sys_user - where id = #{id,jdbcType=VARCHAR} - - - delete from t_sys_user - - - - - - insert into t_sys_user (id, username, password, - nickname, dep_id, pos_id - ) - values (#{id,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, - #{nickname,jdbcType=VARCHAR}, #{depId,jdbcType=INTEGER}, #{posId,jdbcType=VARCHAR} - ) - - - insert into t_sys_user - - - id, - - - username, - - - password, - - - nickname, - - - dep_id, - - - pos_id, - - - - - #{id,jdbcType=VARCHAR}, - - - #{username,jdbcType=VARCHAR}, - - - #{password,jdbcType=VARCHAR}, - - - #{nickname,jdbcType=VARCHAR}, - - - #{depId,jdbcType=INTEGER}, - - - #{posId,jdbcType=VARCHAR}, - - - - - - update t_sys_user - - - id = #{record.id,jdbcType=VARCHAR}, - - - username = #{record.username,jdbcType=VARCHAR}, - - - password = #{record.password,jdbcType=VARCHAR}, - - - nickname = #{record.nickname,jdbcType=VARCHAR}, - - - dep_id = #{record.depId,jdbcType=INTEGER}, - - - pos_id = #{record.posId,jdbcType=VARCHAR}, - - - - - - - - update t_sys_user - set id = #{record.id,jdbcType=VARCHAR}, - username = #{record.username,jdbcType=VARCHAR}, - password = #{record.password,jdbcType=VARCHAR}, - nickname = #{record.nickname,jdbcType=VARCHAR}, - dep_id = #{record.depId,jdbcType=INTEGER}, - pos_id = #{record.posId,jdbcType=VARCHAR} - - - - - - update t_sys_user - - - username = #{username,jdbcType=VARCHAR}, - - - password = #{password,jdbcType=VARCHAR}, - - - nickname = #{nickname,jdbcType=VARCHAR}, - - - dep_id = #{depId,jdbcType=INTEGER}, - - - pos_id = #{posId,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update t_sys_user - set username = #{username,jdbcType=VARCHAR}, - password = #{password,jdbcType=VARCHAR}, - nickname = #{nickname,jdbcType=VARCHAR}, - dep_id = #{depId,jdbcType=INTEGER}, - pos_id = #{posId,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - + + + + + + + + + + + + + + + + + + select id, username, password, nickname, dep_id, pos_id, create_by, create_time, update_by, update_time, remark from t_sys_user + \ No newline at end of file diff --git a/src/main/resources/mybatis/custom/TsysPremissionMapper.xml b/src/main/resources/mybatis/custom/TsysPremissionMapper.xml deleted file mode 100644 index 114b4c4..0000000 --- a/src/main/resources/mybatis/custom/TsysPremissionMapper.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, name, descripion, url, pid, perms, type, icon, order_num - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/custom/TsysRoleMapper.xml b/src/main/resources/mybatis/custom/TsysRoleMapper.xml deleted file mode 100644 index 82227ee..0000000 --- a/src/main/resources/mybatis/custom/TsysRoleMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - id, name - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/custom/TsysUserMapper.xml b/src/main/resources/mybatis/custom/TsysUserMapper.xml deleted file mode 100644 index ce077f7..0000000 --- a/src/main/resources/mybatis/custom/TsysUserMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- Gitee From 14f4c7e334cbfdbb0b82061f54e37db6820c864c Mon Sep 17 00:00:00 2001 From: zhaonengzhi Date: Sun, 8 Aug 2021 02:53:51 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=AF=AF=E6=8F=90=E4=BA=A4=20Signed-off-by?= =?UTF-8?q?:=20zhaonengzhi=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b84543a..c2d3997 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,7 +7,7 @@ spring: druid: #主库数据源 master: - url: jdbc:mysql://192.168.231.135:3306/springboot-v2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=GMT + url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=GMT username: root password: root #备数据源 #关闭 -- Gitee