Skip to content
GitLab
Commit 5ab7fb5b authored by dqjdda's avatar dqjdda
Browse files

目录调整，新增 Not Equal 查询方式

parent 3daa8263
Hide whitespace changes
Inline Side-by-side
eladmin-common/src/main/java/me/zhengjie/annotation/Query.java
View file @ 5ab7fb5b
......@@ -50,6 +50,8 @@ public @interface Query {
, LESS_THAN_NQ
// jie 2019/6/4 包含
, IN
// 不等于
,NOT_EQUAL
}
/**
......
eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
View file @ 5ab7fb5b
......@@ -106,6 +106,9 @@ public class QueryHelp {
list.add(getExpression(attributeName,join,root).in((Collection<Long>) val));
}
break;
case NOT_EQUAL:
list.add(cb.notEqual(getExpression(attributeName,join,root), val));
break;
default: break;
}
}
......
eladmin-generator/pom.xml 0 → 100644
View file @ 5ab7fb5b
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>eladmin</artifactId>
<groupId>me.zhengjie</groupId>
<version>2.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eladmin-generator</artifactId>
<name>代码生成模块</name>
<properties>
<configuration.version>1.9</configuration.version>
</properties>
<dependencies>
<dependency>
<groupId>me.zhengjie</groupId>
<artifactId>eladmin-common</artifactId>
<version>2.3</version>
</dependency>
<!--模板引擎-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${configuration.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/GenConfig.java → eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java
View file @ 5ab7fb5b
package me.zhengjie.modules.generator.domain;
package me.zhengjie.domain;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.*;
/**
* 代码生成配置
......
eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/ColumnInfo.java → eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java
View file @ 5ab7fb5b
package me.zhengjie.modules.generator.domain.vo;
package me.zhengjie.domain.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
......
eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/TableInfo.java → eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java
View file @ 5ab7fb5b
package me.zhengjie.modules.generator.domain.vo;
package me.zhengjie.domain.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
......
eladmin-tools/src/main/java/me/zhengjie/modules/generator/repository/GenConfigRepository.java → eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java
View file @ 5ab7fb5b
package me.zhengjie.modules.generator.repository;
package me.zhengjie.repository;
import me.zhengjie.modules.generator.domain.GenConfig;
import me.zhengjie.domain.GenConfig;
import org.springframework.data.jpa.repository.JpaRepository;
/**
......
eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GenConfigController.java → eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java
View file @ 5ab7fb5b
package me.zhengjie.modules.generator.rest;
package me.zhengjie.rest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import me.zhengjie.modules.generator.domain.GenConfig;
import me.zhengjie.modules.generator.service.GenConfigService;
import me.zhengjie.domain.GenConfig;
import me.zhengjie.service.GenConfigService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
......
eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GeneratorController.java → eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
View file @ 5ab7fb5b
package me.zhengjie.modules.generator.rest;
package me.zhengjie.rest;
import cn.hutool.core.util.PageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import me.zhengjie.domain.vo.ColumnInfo;
import me.zhengjie.exception.BadRequestException;
import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
import me.zhengjie.modules.generator.service.GenConfigService;
import me.zhengjie.modules.generator.service.GeneratorService;
import me.zhengjie.service.GenConfigService;
import me.zhengjie.service.GeneratorService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
......
eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GenConfigService.java → eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java
View file @ 5ab7fb5b
package me.zhengjie.modules.generator.service;
package me.zhengjie.service;
import me.zhengjie.modules.generator.domain.GenConfig;
import me.zhengjie.domain.GenConfig;
/**
* @author Zheng Jie
......
eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GeneratorService.java → eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java
View file @ 5ab7fb5b
package me.zhengjie.modules.generator.service;
package me.zhengjie.service;
import me.zhengjie.modules.generator.domain.GenConfig;
import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
import me.zhengjie.domain.GenConfig;
import me.zhengjie.domain.vo.ColumnInfo;
import java.util.List;
/**
......
eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GenConfigServiceImpl.java → eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java
View file @ 5ab7fb5b
package me.zhengjie.modules.generator.service.impl;
package me.zhengjie.service.impl;
import me.zhengjie.modules.generator.domain.GenConfig;
import me.zhengjie.modules.generator.repository.GenConfigRepository;
import me.zhengjie.modules.generator.service.GenConfigService;
import me.zhengjie.domain.GenConfig;
import me.zhengjie.repository.GenConfigRepository;
import me.zhengjie.service.GenConfigService;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
......
eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GeneratorServiceImpl.java → eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
View file @ 5ab7fb5b
package me.zhengjie.modules.generator.service.impl;
package me.zhengjie.service.impl;
import cn.hutool.core.util.ObjectUtil;
import me.zhengjie.domain.GenConfig;
import me.zhengjie.domain.vo.ColumnInfo;
import me.zhengjie.domain.vo.TableInfo;
import me.zhengjie.exception.BadRequestException;
import me.zhengjie.modules.generator.domain.GenConfig;
import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
import me.zhengjie.modules.generator.domain.vo.TableInfo;
import me.zhengjie.modules.generator.service.GeneratorService;
import me.zhengjie.modules.generator.utils.GenUtil;
import me.zhengjie.service.GeneratorService;
import me.zhengjie.utils.GenUtil;
import me.zhengjie.utils.PageUtil;
import me.zhengjie.utils.StringUtils;
import org.springframework.stereotype.Service;
......
eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/ColUtil.java → eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java
View file @ 5ab7fb5b
package me.zhengjie.modules.generator.utils;
package me.zhengjie.utils;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.*;
/**
* sql字段转java
......
eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/GenUtil.java → eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
View file @ 5ab7fb5b
package me.zhengjie.modules.generator.utils;
package me.zhengjie.utils;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.template.*;
import lombok.extern.slf4j.Slf4j;
import me.zhengjie.modules.generator.domain.GenConfig;
import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
import me.zhengjie.utils.FileUtil;
import me.zhengjie.utils.StringUtils;
import me.zhengjie.domain.GenConfig;
import me.zhengjie.domain.vo.ColumnInfo;
import org.springframework.util.ObjectUtils;
import java.io.File;
import java.io.FileWriter;
......
eladmin-system/pom.xml
View file @ 5ab7fb5b
......@@ -17,6 +17,18 @@
</properties>
<dependencies>
<!-- 代码生成模块 -->
<dependency>
<groupId>me.zhengjie</groupId>
<artifactId>eladmin-generator</artifactId>
<version>2.3</version>
<exclusions>
<exclusion>
<groupId>me.zhengjie</groupId>
<artifactId>eladmin-common</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- tools 模块包含了 common 和 logging 模块 -->
<dependency>
......
eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
View file @ 5ab7fb5b
......@@ -4,7 +4,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import me.zhengjie.aop.log.Log;
import me.zhengjie.config.DataScope;
import me.zhengjie.modules.tools.domain.VerificationCode;
import me.zhengjie.domain.VerificationCode;
import me.zhengjie.modules.system.domain.User;
import me.zhengjie.exception.BadRequestException;
import me.zhengjie.modules.system.domain.vo.UserPassVo;
......@@ -12,7 +12,7 @@ import me.zhengjie.modules.system.service.DeptService;
import me.zhengjie.modules.system.service.RoleService;
import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
import me.zhengjie.modules.system.service.dto.UserQueryCriteria;
import me.zhengjie.modules.tools.service.VerificationCodeService;
import me.zhengjie.service.VerificationCodeService;
import me.zhengjie.utils.*;
import me.zhengjie.modules.system.service.UserService;
import org.springframework.data.domain.Pageable;
......
eladmin-tools/pom.xml
View file @ 5ab7fb5b
......@@ -16,7 +16,6 @@
<mail.version>1.4.7</mail.version>
<qiniu.version>[7.2.0, 7.2.99]</qiniu.version>
<alipay.version>3.1.0</alipay.version>
<configuration.version>1.9</configuration.version>
</properties>
<dependencies>
......@@ -34,19 +33,6 @@
<version>${mail.version}</version>
</dependency>
<!--模板引擎-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${configuration.version}</version>
</dependency>
<!--七牛云存储-->
<dependency>
<groupId>com.qiniu</groupId>
......
eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/AlipayConfig.java → eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java
View file @ 5ab7fb5b
package me.zhengjie.modules.tools.domain;
package me.zhengjie.domain;
import lombok.Data;
import javax.persistence.*;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment