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

maxwillianzhu · Nov 17, 2019 · 5ab7fb5 · 5ab7fb5
1 parent 3daa826
commit 5ab7fb5
Show file tree

Hide file tree

Showing 61 changed files with 210 additions and 175 deletions.
diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java b/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java
@@ -50,6 +50,8 @@ enum Type {
         , LESS_THAN_NQ
         // jie 2019/6/4 包含
         , IN
+        // 不等于
+        ,NOT_EQUAL
     }
 
     /**

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
@@ -106,6 +106,9 @@ public static <R, Q> Predicate getPredicate(Root<R> root, Q query, CriteriaBuild
                                 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;
                     }
                 }

diff --git a/eladmin-generator/pom.xml b/eladmin-generator/pom.xml
@@ -0,0 +1,39 @@
+<?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>
diff --git a/...e/modules/generator/domain/GenConfig.java → ...in/java/me/zhengjie/domain/GenConfig.java b/...e/modules/generator/domain/GenConfig.java → ...in/java/me/zhengjie/domain/GenConfig.java
@@ -1,10 +1,7 @@
-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.*;
 
 /**
  * 代码生成配置

diff --git a/...dules/generator/domain/vo/ColumnInfo.java → ...ava/me/zhengjie/domain/vo/ColumnInfo.java b/...dules/generator/domain/vo/ColumnInfo.java → ...ava/me/zhengjie/domain/vo/ColumnInfo.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.generator.domain.vo;
+package me.zhengjie.domain.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...odules/generator/domain/vo/TableInfo.java → ...java/me/zhengjie/domain/vo/TableInfo.java b/...odules/generator/domain/vo/TableInfo.java → ...java/me/zhengjie/domain/vo/TableInfo.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.generator.domain.vo;
+package me.zhengjie.domain.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...rator/repository/GenConfigRepository.java → ...ngjie/repository/GenConfigRepository.java b/...rator/repository/GenConfigRepository.java → ...ngjie/repository/GenConfigRepository.java
@@ -1,6 +1,6 @@
-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;
 
 /**

diff --git a/...s/generator/rest/GenConfigController.java → ...me/zhengjie/rest/GenConfigController.java b/...s/generator/rest/GenConfigController.java → ...me/zhengjie/rest/GenConfigController.java
@@ -1,9 +1,9 @@
-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;

diff --git a/...s/generator/rest/GeneratorController.java → ...me/zhengjie/rest/GeneratorController.java b/...s/generator/rest/GeneratorController.java → ...me/zhengjie/rest/GeneratorController.java
@@ -1,17 +1,16 @@
-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;
 
 /**

diff --git a/...s/generator/service/GenConfigService.java → ...me/zhengjie/service/GenConfigService.java b/...s/generator/service/GenConfigService.java → ...me/zhengjie/service/GenConfigService.java
@@ -1,6 +1,6 @@
-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

diff --git a/...s/generator/service/GeneratorService.java → ...me/zhengjie/service/GeneratorService.java b/...s/generator/service/GeneratorService.java → ...me/zhengjie/service/GeneratorService.java
@@ -1,7 +1,7 @@
-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;
 
 /**

diff --git a/...or/service/impl/GenConfigServiceImpl.java → ...ie/service/impl/GenConfigServiceImpl.java b/...or/service/impl/GenConfigServiceImpl.java → ...ie/service/impl/GenConfigServiceImpl.java
@@ -1,8 +1,8 @@
-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;

diff --git a/...or/service/impl/GeneratorServiceImpl.java → ...ie/service/impl/GeneratorServiceImpl.java b/...or/service/impl/GeneratorServiceImpl.java → ...ie/service/impl/GeneratorServiceImpl.java
@@ -1,12 +1,12 @@
-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;

diff --git a/...gjie/modules/generator/utils/ColUtil.java → .../main/java/me/zhengjie/utils/ColUtil.java b/...gjie/modules/generator/utils/ColUtil.java → .../main/java/me/zhengjie/utils/ColUtil.java
@@ -1,8 +1,6 @@
-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

diff --git a/...gjie/modules/generator/utils/GenUtil.java → .../main/java/me/zhengjie/utils/GenUtil.java b/...gjie/modules/generator/utils/GenUtil.java → .../main/java/me/zhengjie/utils/GenUtil.java
@@ -1,12 +1,10 @@
-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;

diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml
@@ -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>

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
@@ -4,15 +4,15 @@
 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;
 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;

diff --git a/eladmin-tools/pom.xml b/eladmin-tools/pom.xml
@@ -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>

diff --git a/...ie/modules/tools/domain/AlipayConfig.java → ...java/me/zhengjie/domain/AlipayConfig.java b/...ie/modules/tools/domain/AlipayConfig.java → ...java/me/zhengjie/domain/AlipayConfig.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.tools.domain;
+package me.zhengjie.domain;
 
 import lombok.Data;
 import javax.persistence.*;

diff --git a/...jie/modules/tools/domain/EmailConfig.java → .../java/me/zhengjie/domain/EmailConfig.java b/...jie/modules/tools/domain/EmailConfig.java → .../java/me/zhengjie/domain/EmailConfig.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.tools.domain;
+package me.zhengjie.domain;
 
 import lombok.Data;
 

diff --git a/...ie/modules/tools/domain/LocalStorage.java → ...java/me/zhengjie/domain/LocalStorage.java b/...ie/modules/tools/domain/LocalStorage.java → ...java/me/zhengjie/domain/LocalStorage.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.tools.domain;
+package me.zhengjie.domain;
 
 import lombok.*;
 import cn.hutool.core.bean.BeanUtil;

diff --git a/...hengjie/modules/tools/domain/Picture.java → ...main/java/me/zhengjie/domain/Picture.java b/...hengjie/modules/tools/domain/Picture.java → ...main/java/me/zhengjie/domain/Picture.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.tools.domain;
+package me.zhengjie.domain;
 
 import lombok.Data;
 import org.hibernate.annotations.CreationTimestamp;

diff --git a/...jie/modules/tools/domain/QiniuConfig.java → .../java/me/zhengjie/domain/QiniuConfig.java b/...jie/modules/tools/domain/QiniuConfig.java → .../java/me/zhengjie/domain/QiniuConfig.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.tools.domain;
+package me.zhengjie.domain;
 
 import lombok.Data;
 import javax.persistence.*;

diff --git a/...ie/modules/tools/domain/QiniuContent.java → ...java/me/zhengjie/domain/QiniuContent.java b/...ie/modules/tools/domain/QiniuContent.java → ...java/me/zhengjie/domain/QiniuContent.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.tools.domain;
+package me.zhengjie.domain;
 
 import lombok.Data;
 import org.hibernate.annotations.UpdateTimestamp;

diff --git a/...odules/tools/domain/VerificationCode.java → .../me/zhengjie/domain/VerificationCode.java b/...odules/tools/domain/VerificationCode.java → .../me/zhengjie/domain/VerificationCode.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.tools.domain;
+package me.zhengjie.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...gjie/modules/tools/domain/vo/EmailVo.java → ...n/java/me/zhengjie/domain/vo/EmailVo.java b/...gjie/modules/tools/domain/vo/EmailVo.java → ...n/java/me/zhengjie/domain/vo/EmailVo.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.tools.domain.vo;
+package me.zhengjie.domain.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...gjie/modules/tools/domain/vo/TradeVo.java → ...n/java/me/zhengjie/domain/vo/TradeVo.java b/...gjie/modules/tools/domain/vo/TradeVo.java → ...n/java/me/zhengjie/domain/vo/TradeVo.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.tools.domain.vo;
+package me.zhengjie.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

diff --git a/...es/tools/repository/AlipayRepository.java → ...zhengjie/repository/AlipayRepository.java b/...es/tools/repository/AlipayRepository.java → ...zhengjie/repository/AlipayRepository.java
@@ -1,6 +1,6 @@
-package me.zhengjie.modules.tools.repository;
+package me.zhengjie.repository;
 
-import me.zhengjie.modules.tools.domain.AlipayConfig;
+import me.zhengjie.domain.AlipayConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

diff --git a/...les/tools/repository/EmailRepository.java → .../zhengjie/repository/EmailRepository.java b/...les/tools/repository/EmailRepository.java → .../zhengjie/repository/EmailRepository.java
@@ -1,6 +1,6 @@
-package me.zhengjie.modules.tools.repository;
+package me.zhengjie.repository;
 
-import me.zhengjie.modules.tools.domain.EmailConfig;
+import me.zhengjie.domain.EmailConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

diff --git a/...ls/repository/LocalStorageRepository.java → ...ie/repository/LocalStorageRepository.java b/...ls/repository/LocalStorageRepository.java → ...ie/repository/LocalStorageRepository.java
@@ -1,6 +1,6 @@
-package me.zhengjie.modules.tools.repository;
+package me.zhengjie.repository;
 
-import me.zhengjie.modules.tools.domain.LocalStorage;
+import me.zhengjie.domain.LocalStorage;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

diff --git a/...s/tools/repository/PictureRepository.java → ...hengjie/repository/PictureRepository.java b/...s/tools/repository/PictureRepository.java → ...hengjie/repository/PictureRepository.java
@@ -1,6 +1,6 @@
-package me.zhengjie.modules.tools.repository;
+package me.zhengjie.repository;
 
-import me.zhengjie.modules.tools.domain.Picture;
+import me.zhengjie.domain.Picture;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

diff --git a/...ols/repository/QiNiuConfigRepository.java → ...jie/repository/QiNiuConfigRepository.java b/...ols/repository/QiNiuConfigRepository.java → ...jie/repository/QiNiuConfigRepository.java
@@ -1,6 +1,6 @@
-package me.zhengjie.modules.tools.repository;
+package me.zhengjie.repository;
 
-import me.zhengjie.modules.tools.domain.QiniuConfig;
+import me.zhengjie.domain.QiniuConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

diff --git a/...ls/repository/QiniuContentRepository.java → ...ie/repository/QiniuContentRepository.java b/...ls/repository/QiniuContentRepository.java → ...ie/repository/QiniuContentRepository.java
@@ -1,6 +1,6 @@
-package me.zhengjie.modules.tools.repository;
+package me.zhengjie.repository;
 
-import me.zhengjie.modules.tools.domain.QiniuContent;
+import me.zhengjie.domain.QiniuContent;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

diff --git a/...epository/VerificationCodeRepository.java → ...epository/VerificationCodeRepository.java b/...epository/VerificationCodeRepository.java → ...epository/VerificationCodeRepository.java
@@ -1,6 +1,6 @@
-package me.zhengjie.modules.tools.repository;
+package me.zhengjie.repository;
 
-import me.zhengjie.modules.tools.domain.VerificationCode;
+import me.zhengjie.domain.VerificationCode;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**