diff --git a/README.md b/README.md index 33028523..e7c21538 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ SmartAdmin由河南·洛阳 [1024创新实验室](https://www.1024lab.net/)团 github: [https://github.com/1024-lab/smart-admin](https://github.com/1024-lab/smart-admin) gitee: [https://gitee.com/lab1024/smart-admin](https://gitee.com/lab1024/smart-admin) 在线预览： [http://preview.smartadmin.1024lab.net](http://preview.smartadmin.1024lab.net) -部署文档：[http://smartadmin.1024lab.net/doc/1/68](http://smartadmin.1024lab.net/doc/1/68) +部署文档：[http://smartadmin.1024lab.net/doc/2/168](http://smartadmin.1024lab.net/doc/2/168) #### 疑惑 有人问：又是个“轮子”？ 轮子靠谱吗？为什么要选择你这个轮子？ @@ -24,38 +24,38 @@ gitee: [https://gitee.com/lab1024/smart-admin](https://gitee.com/lab1024/smart- #### 演示图 - - + + - - + + - - + + - - + + - - + + - - + + - - + +
#### 技术体系 -- 前端：Vue + Vue-Router + Vuex + ViewUI(iview) + vue-enum +- 前端：Vue + Vue-Router + Vuex + ViewUI + vue-enum - 后端：SpringBoot2 + Mybatis-plus + jwt + druid + mysql - 前端代码规范smart-front-standard -guide（大力推荐） - 基于阿里规范之上的后端规范smart-backend-standard-guide（大力推荐） @@ -67,7 +67,7 @@ gitee: [https://gitee.com/lab1024/smart-admin](https://gitee.com/lab1024/smart- - 前端常量维护: vue-enum，拒绝出现魔法数字，代码不可维护的现象 - 全新的基于前端的权限设计（忘掉传统的权限设计吧，已经不适合这个前端时代） - 基于websocket的在线人数 -- 支持一级、二级、三级菜单，单搜索功能 +- 支持一级、二级、三级菜单，四级菜单以及搜索功能 - 其他功能：邮件、富文本、消息、系统配置等等 - 写不完了，太多好的细节需要你的发现...... @@ -103,20 +103,28 @@ gitee: [https://gitee.com/lab1024/smart-admin](https://gitee.com/lab1024/smart- ps：以上规范基础都是以团队出发，让团队开心快乐的写代码，而不是为了代码规范而规范，不喜勿喷！谢谢。 #### 联系我们 + [1024创新实验室](https://www.1024lab.net/) -官方QQ群：914442584 - -SmartAdmin微信群（**加我拉你入群！**）： +SmartAdmin微信群（**加我微信拉你入群！**） - - - + +
+#### 捐赠 +开源不易，感谢捐赠 +>*佛祖保佑捐赠这些人写程序永无bug，工资翻倍，迎娶白富美，走上人生巅峰！* + + + + +
+ + --- 作者简介: [卓大](https://zhuoluodada.cn)， 1024创新实验室主任，混迹于各个技术圈，研究过计算机，熟悉点java，略懂点前端。 diff --git a/smart-admin-service/pom.xml b/smart-admin-service/pom.xml index b23dde3c..3726290a 100644 --- a/smart-admin-service/pom.xml +++ b/smart-admin-service/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.gangquan360 + net.1024lab smart-admin-service-parent 1.0.0 pom @@ -11,74 +11,40 @@ smart-admin-api - + + UTF-8 + UTF-8 1.8 - 3.3.0.ga + 3.1.1 2.10.0 - 2.1.9.RELEASE - Finchley.SR1 - 5.1.10.RELEASE - 2.0.5.RELEASE - 1.5.0 - 1.0.6 - 2.0.1 - 3.0.1.RELEASE - 3.0.2.RELEASE - 2.3.0 - 3.0.9.RELEASE + 2.2.5.RELEASE 1.7 - 2.7.0 - 1.3.0 - 6.3.2.jre8-preview - 1.2.9 - 8.18.0 - 23.1-jre - 1.2.3 - 2.7.0 - [7.2.0, 7.2.99] - 1.3.1 - 0.9.0 - 0.0.1-RC11 - 6.0.2.Final - 2.0.0.Final - 3.0.1-b08 - 1.0.29 - 3.3.2 - 2.1.6 - 1.0.4 - 1.4.2 2.0 - 1.0.0-SNAPSHOT - 2.0.2.RELEASE - 3.15 - 3.3.0 - 3.3.4 + 2.7.0 + 3.3.1 + 1.2.66 + 28.2-jre + 2.7.0 + [7.2.0, 7.2.99] + 0.9.1 + 1.1.21 + 1.4.2 + 4.1.2 + 1.3.1 + 3.3.2 1.9.3 - 3.1.0 - 2.1.11.RELEASE - 2.1.11.RELEASE - 1.6.4 - 1.21 + 2.8.0 2.3.2 - 1.18.8 4.2.2 + 8.0.19 + 1.21 + 1.18.8 - - velocity - org.apache.velocity - ${velocity.version} - - - org.springframework - spring-framework-bom - ${spring-framework-bom.version} - pom - import - + org.springframework.boot spring-boot-dependencies @@ -86,26 +52,65 @@ pom import + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - org.springframework.boot - spring-boot-starter-actuator - ${actuator.version} + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus-boot.version} + + + + + velocity + org.apache.velocity + ${velocity.version} - org.springframework.boot - spring-boot-starter-quartz - 2.0.5.RELEASE - - - org.jolokia - jolokia-core - ${jolokia.version} - - - io.micrometer - micrometer-registry-influx - ${micrometer.version} + org.apache.velocity + velocity-engine-core + ${velocity-engine-core.version} + + + com.alibaba fastjson @@ -119,195 +124,44 @@ ${druid.version} - - - com.github.binarywang - weixin-java-mp - ${weixin-sdk.version} - - - - org.springframework.kafka - spring-kafka - ${kafka.version} - - - org.springframework.kafka - spring-kafka-test - ${kafka.version} - - - - - org.springframework.cloud - spring-cloud-dependencies - ${smartadmin.springcloud.version} - pom - import - - - - - org.hibernate - hibernate-validator - ${hibernate-validator-version} - - - - javax.validation - validation-api - ${javax.validation-version} - - - - org.glassfish - javax.el - ${javax.el-version} - - - - - org.apache.logging.log4j - log4j-web - ${log4j.web.version} - - - - - com.github.mxab.thymeleaf.extras - thymeleaf-extras-data-attribute - ${thymeleaf-extras-data-attribute.version} - - - org.thymeleaf.extras - thymeleaf-extras-java8time - ${thymeleaf-extras-java8time.version} - - - org.thymeleaf.extras - thymeleaf-extras-springsecurity4 - ${thymeleaf-extras-springsecurity4.version} - - - nz.net.ultraq.thymeleaf - thymeleaf-layout-dialect - ${thymeleaf-layout-dialect.version} - - - org.thymeleaf - thymeleaf - ${thymeleaf.version} - - - javassist - org.javassist - - - - - org.thymeleaf - thymeleaf-spring5 - ${thymeleaf.version} - - - - - - org.springframework.boot - spring-boot-starter-data-redis - ${smartadmin.springboot.version} - - - - org.springframework.boot - spring-boot-starter-test - ${smartadmin.springboot.version} - test - - - + io.springfox springfox-swagger2 ${swagger.version} - io.springfox springfox-swagger-ui ${swagger.version} - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis-spring-boot.version} - - - - - com.microsoft.sqlserver - mssql-jdbc - ${sql-server.version} - - - - - com.alibaba - fastjson - ${fastjson.version} - - - - - com.netflix.feign - feign-gson - ${feign-gson-version} - - - com.google.code.gson - gson - 2.8.5 - - - - - org.springframework.boot - spring-boot-starter-cache - ${smartadmin.springboot.version} - + com.google.guava guava - ${guava-version} + ${guava.version} - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper-version} - - - + com.aliyun.oss aliyun-sdk-oss - ${oss.version} + ${aliyun-oss.version} com.qiniu qiniu-java-sdk - ${qiniu.version} + ${qiniu-oss.version} commons-fileupload commons-fileupload - ${fileupload.version} + ${commons-fileupload.version} + + io.jsonwebtoken @@ -315,86 +169,33 @@ ${jjwt.version} - - - com.openhtmltopdf - openhtmltopdf-core - ${openhtml.version} - - - - - com.openhtmltopdf - openhtmltopdf-pdfbox - ${openhtml.version} - - - - - com.openhtmltopdf - openhtmltopdf-java2d - ${openhtml.version} - - - + cn.afterturn - easypoi-base - ${easypoi-version} + easypoi-spring-boot-starter + ${easypoi.version} + - + - cn.afterturn - easypoi-web - ${easypoi-version} + mysql + mysql-connector-java + ${mysql.version} - - cn.afterturn - easypoi-annotation - ${easypoi-version} - - - - org.apache.poi - poi - ${apache-poi-version} - - - - org.apache.poi - poi-ooxml-schemas - ${apache-poi-version} - - - - org.apache.poi - poi-ooxml - ${apache-poi-version} - - - - - cn.jpush.api - jpush-client - ${jpush-api-version} - commons-beanutils commons-beanutils ${commons-beanutils.version} + - org.fusesource - sigar - ${sigar.version} - - - eu.bitwalker - UserAgentUtils - ${userAgent.version} + org.apache.commons + commons-pool2 + ${commons-pool2.version} + com.github.penggle kaptcha @@ -404,20 +205,7 @@ com.googlecode.concurrentlinkedhashmap concurrentlinkedhashmap-lru - ${concurrentlinkedhashmap-version} - - - - org.apache.velocity - velocity-engine-core - ${velocity-engine-core.version} - test - - - - com.baomidou - mybatis-plus - ${mybatisplus.version} + ${concurrentlinkedhashmap.version} @@ -426,17 +214,10 @@ ${okhttp.version} - - com.baomidou - mybatisplus-spring-boot-starter - - - spring-boot-starter-logging - org.springframework.boot - - - ${mybatisplus-spring-boot-starter.version} + eu.bitwalker + UserAgentUtils + ${user-agent-util.version} @@ -523,6 +304,12 @@ true + + telework + + telework + + sit diff --git a/smart-admin-service/smart-admin-api/doc/readme.txt b/smart-admin-service/smart-admin-api/doc/readme.txt index e5cd39c0..3b06068e 100644 --- a/smart-admin-service/smart-admin-api/doc/readme.txt +++ b/smart-admin-service/smart-admin-api/doc/readme.txt @@ -1,5 +1,5 @@ 1 更新密码 -com.gangquan360.smartadmin.module.employee.EmployeeController.updatePwd +EmployeeController.updatePwd 2 更新功能点 PrivilegeController functionSaveOrUpdate和menuBatchSave @@ -14,4 +14,9 @@ sa/123456 5 除dev之外文件 6 刷新页面，获取权限是否走缓存 -com.gangquan360.smartadmin.module.login.LoginService.getSession \ No newline at end of file +LoginService.getSession + +7 test类中去掉代码生成run + +8 RoleController 更新角色 + updateRole diff --git a/smart-admin-service/smart-admin-api/pom.xml b/smart-admin-service/smart-admin-api/pom.xml index 0b35c3f8..293b3116 100644 --- a/smart-admin-service/smart-admin-api/pom.xml +++ b/smart-admin-service/smart-admin-api/pom.xml @@ -1,7 +1,7 @@ - com.gangquan360 + net.1024lab smart-admin-service-parent 1.0.0 ../pom.xml @@ -16,32 +16,55 @@ UTF-8 UTF-8 + 1.8 - - velocity - - - commons-collections - commons-collections - - - org.apache.velocity - - + org.springframework.boot spring-boot-starter-log4j2 - - org.apache.logging.log4j - log4j-web - 2.10.0 + org.springframework.boot + spring-boot-starter-aop + + + spring-boot-starter-logging + org.springframework.boot + + + + + org.springframework.boot + spring-boot-starter-quartz + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-data-redis + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-mail + + + org.springframework.boot + spring-boot-starter-test + test - org.springframework.boot spring-boot-starter-actuator @@ -56,33 +79,34 @@ + - org.springframework.boot - spring-boot-starter-websocket + com.baomidou + mybatis-plus-boot-starter + - org.projectlombok - lombok - provided - - - - - org.springframework.boot - spring-boot-starter-data-redis + velocity + org.apache.velocity - org.springframework.boot - spring-boot-starter + commons-collections + commons-collections - - com.microsoft.sqlserver - mssql-jdbc + org.apache.velocity + velocity-engine-core + + + + + + com.alibaba + fastjson @@ -91,24 +115,71 @@ druid + - com.alibaba - fastjson + io.springfox + springfox-swagger2 + + + io.springfox + springfox-swagger-ui + + + + + + com.google.guava + guava + + + + + com.aliyun.oss + aliyun-sdk-oss + + + commons-logging + commons-logging + + + + + com.qiniu + qiniu-java-sdk + + + commons-fileupload + commons-fileupload + + + + + + io.jsonwebtoken + jjwt + + + + + cn.afterturn + easypoi-spring-boot-starter + + + + + commons-beanutils + commons-beanutils + + + commons-logging + commons-logging + + - org.springframework.boot - spring-boot-starter-jdbc - - - logback-classic - ch.qos.logback - - - spring-boot-starter - org.springframework.boot - - + org.apache.commons + commons-pool2 @@ -117,79 +188,8 @@ - com.baomidou - mybatisplus-spring-boot-starter - - - spring-boot-starter-logging - org.springframework.boot - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-logging - - - - - org.springframework.boot - spring-boot-devtools - true - - - org.springframework.boot - spring-boot-starter-test - test - - - - io.jsonwebtoken - jjwt - - - - org.springframework.boot - spring-boot-starter-mail - - - spring-boot-starter - org.springframework.boot - - - - - org.springframework.boot - spring-boot-starter-quartz - - - org.quartz-scheduler - quartz - - - org.quartz-scheduler - quartz-jobs - - - - org.apache.commons - commons-lang3 - - - - - io.springfox - springfox-swagger2 - - - - io.springfox - springfox-swagger-ui + com.github.penggle + kaptcha @@ -198,103 +198,8 @@ - org.springframework.boot - spring-boot-starter-aop - - - - org.apache.velocity - velocity-engine-core - test - - - - - redis.clients - jedis - - - - cn.afterturn - easypoi-base - - - javassist - org.javassist - - - - - - cn.afterturn - easypoi-web - - - - cn.afterturn - easypoi-annotation - - - - org.apache.poi - poi - - - - org.apache.poi - poi-ooxml-schemas - - - - org.apache.poi - poi-ooxml - - - - commons-beanutils - commons-beanutils - - - - com.thoughtworks.xstream - xstream - 1.4.10 - - - - org.springframework.boot - spring-boot-test - - - - - com.qiniu - qiniu-java-sdk - - - - - com.aliyun.oss - aliyun-sdk-oss - - - commons-lang - commons-lang - - - commons-logging - commons-logging - - - commons-collections - commons-collections - - - - - - com.baomidou - mybatis-plus + com.squareup.okhttp3 + okhttp @@ -303,13 +208,9 @@ - com.github.penggle - kaptcha - - - - com.squareup.okhttp3 - okhttp + org.projectlombok + lombok + provided diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartMybatisPlusConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartMybatisPlusConfig.java deleted file mode 100644 index 5cdb86a1..00000000 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartMybatisPlusConfig.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gangquan360.smartadmin.config; - -import com.baomidou.mybatisplus.plugins.PaginationInterceptor; -import com.baomidou.mybatisplus.plugins.PerformanceInterceptor; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Conditional; -import org.springframework.context.annotation.Configuration; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -/** - * description - * - * @author listen - * @date 2017/12/19 13:54 - */ -@EnableTransactionManagement -@Configuration -@MapperScan(basePackages = {"com.gangquan360.smartadmin.module.*"}) -public class SmartMybatisPlusConfig { - - /** - * 分页插件 - */ - @Bean - public PaginationInterceptor paginationInterceptor() { - return new PaginationInterceptor(); - } - - /** - * mybatis-plus SQL执行效率插件【生产环境可以关闭】 - */ - @Bean - @Conditional(SystemEnvironmentCondition.class) - public PerformanceInterceptor performanceInterceptor() { - return new PerformanceInterceptor(); - } - -} diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorComponent.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorComponent.java deleted file mode 100644 index 724fb4be..00000000 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorComponent.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.gangquan360.smartadmin.module.codegenerator.service; - -import com.google.common.collect.Lists; -import org.springframework.stereotype.Component; - -import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * [ ] - * - * @author yandanyang - * @version 1.0 - * @company 1024lab.net - * @copyright (c) 2018 1024lab.netInc. All rights reserved. - * @date 2019/5/11 0011 上午 8:33 - * @since JDK1.8 - */ -@Component -public class CodeGeneratorComponent { - - private static Map dataMap = new HashMap<>(16); - - static { - dataMap(); - } - - public static void dataMap(){ - dataMap.put("int","Integer"); - dataMap.put("tinyint","Integer"); - dataMap.put("smallint","Integer"); - dataMap.put("integer","Integer"); - dataMap.put("bigint","Long"); - dataMap.put("float","Float"); - dataMap.put("double","Double"); - dataMap.put("decimal","BigDecimal"); - - dataMap.put("char","String"); - dataMap.put("varchar","String"); - dataMap.put("tinytext","String"); - dataMap.put("text","String"); - dataMap.put("longtext","String"); - - dataMap.put("date","Date"); - dataMap.put("datetime","Date"); - dataMap.put("timestamp","Date"); - - } - - - public Map codeTemplates(String moduleClass, String basePackage, String modulePackage){ - String javaPackagePath = "src"+File.separator+"main" + File.separator + "java" + File.separator; - javaPackagePath = javaPackagePath + basePackage.replace(".", File.separator) + File.separator+"module"+File.separator + modulePackage + File.separator; - String xmlPackagePath = "src"+File.separator+"main" + File.separator + "resources" + File.separator +"mapper"+File.separator+ modulePackage + File.separator; - Map templateMap = new HashMap<>(7); - templateMap.put("templates/codegenerator/Controller.java.vm",javaPackagePath+"controller"+File.separator+moduleClass+"Controller.java"); - templateMap.put("templates/codegenerator/Dao.java.vm",javaPackagePath+"dao"+File.separator+moduleClass+"Dao.java"); - templateMap.put("templates/codegenerator/Dao.xml.vm",xmlPackagePath+moduleClass+"Mapper.xml"); - templateMap.put("templates/codegenerator/DTO.java.vm",javaPackagePath+"domain"+File.separator+"dto"+File.separator+moduleClass+"DTO.java"); - templateMap.put("templates/codegenerator/Entity.java.vm",javaPackagePath+"domain"+File.separator+"entity"+File.separator+moduleClass+"Entity.java"); - templateMap.put("templates/codegenerator/QueryDTO.java.vm",javaPackagePath+"domain"+File.separator+"dto"+File.separator+moduleClass+"QueryDTO.java"); - templateMap.put("templates/codegenerator/Service.java.vm",javaPackagePath+"service"+File.separator+moduleClass+"Service.java"); - return templateMap; - } - - public String getJavaType(String mysqlType ){ - String javaType = dataMap.get(mysqlType); - return javaType; - } - - -} diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/SmartAdminApplication.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/SmartAdminApplication.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/SmartAdminApplication.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/SmartAdminApplication.java index 2ef566e1..b22d0670 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/SmartAdminApplication.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/SmartAdminApplication.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin; +package net.lab1024.smartadmin; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -15,8 +15,9 @@ import org.springframework.scheduling.annotation.EnableScheduling; * @copyright (c) 2019 1024lab.netInc. All rights reserved. * @date * @since JDK1.8 + * */ -@SpringBootApplication(scanBasePackages = {"com.gangquan360.smartadmin", "cn.afterturn.easypoi"}) +@SpringBootApplication(scanBasePackages = {"net.lab1024.smartadmin", "cn.afterturn.easypoi"}) @EnableCaching @EnableScheduling @EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true) diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/ApiModelPropertyEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/ApiModelPropertyEnum.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/ApiModelPropertyEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/ApiModelPropertyEnum.java index 39b2f92f..40399a0f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/ApiModelPropertyEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/ApiModelPropertyEnum.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.common.anno; +package net.lab1024.smartadmin.common.anno; -import com.gangquan360.smartadmin.common.domain.BaseEnum; +import net.lab1024.smartadmin.common.domain.BaseEnum; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/DataScope.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/DataScope.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/DataScope.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/DataScope.java index ec58da8c..802b0a9b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/DataScope.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/DataScope.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.common.anno; +package net.lab1024.smartadmin.common.anno; -import com.gangquan360.smartadmin.module.datascope.constant.DataScopeTypeEnum; +import net.lab1024.smartadmin.module.system.datascope.constant.DataScopeTypeEnum; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoNeedLogin.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/NoNeedLogin.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoNeedLogin.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/NoNeedLogin.java index 4bb314a8..3957937a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoNeedLogin.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/NoNeedLogin.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.anno; +package net.lab1024.smartadmin.common.anno; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoValidPrivilege.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/NoValidPrivilege.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoValidPrivilege.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/NoValidPrivilege.java index 4ba657c3..d37e63c2 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoValidPrivilege.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/NoValidPrivilege.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.anno; +package net.lab1024.smartadmin.common.anno; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/OperateLog.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/OperateLog.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/OperateLog.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/OperateLog.java index c6762082..31dd3683 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/OperateLog.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/OperateLog.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.anno; +package net.lab1024.smartadmin.common.anno; import java.lang.annotation.*; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/CommentSortTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/constant/CommentSortTypeEnum.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/CommentSortTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/constant/CommentSortTypeEnum.java index da4d561c..1a4de4e4 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/CommentSortTypeEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/constant/CommentSortTypeEnum.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.common.constant; +package net.lab1024.smartadmin.common.constant; -import com.gangquan360.smartadmin.common.domain.BaseEnum; +import net.lab1024.smartadmin.common.domain.BaseEnum; /** * 全局排序枚举类 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/JudgeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/constant/JudgeEnum.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/JudgeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/constant/JudgeEnum.java index dda791a5..d7c55429 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/JudgeEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/constant/JudgeEnum.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.common.constant; +package net.lab1024.smartadmin.common.constant; -import com.gangquan360.smartadmin.common.domain.BaseEnum; +import net.lab1024.smartadmin.common.domain.BaseEnum; import java.util.Arrays; import java.util.Optional; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/ResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/constant/ResponseCodeConst.java similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/ResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/constant/ResponseCodeConst.java index df0cef93..31f3f4c9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/ResponseCodeConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/constant/ResponseCodeConst.java @@ -1,14 +1,14 @@ -package com.gangquan360.smartadmin.common.constant; +package net.lab1024.smartadmin.common.constant; -import com.gangquan360.smartadmin.module.department.DepartmentResponseCodeConst; -import com.gangquan360.smartadmin.module.employee.constant.EmployeeResponseCodeConst; -import com.gangquan360.smartadmin.module.file.constant.FileResponseCodeConst; -import com.gangquan360.smartadmin.module.log.orderoperatelog.constant.OrderOperateLogOperateTypeConst; -import com.gangquan360.smartadmin.module.login.LoginResponseCodeConst; -import com.gangquan360.smartadmin.module.position.PositionResponseCodeConst; -import com.gangquan360.smartadmin.module.privilege.constant.PrivilegeResponseCodeConst; -import com.gangquan360.smartadmin.module.role.basic.RoleResponseCodeConst; -import com.gangquan360.smartadmin.module.systemconfig.constant.SystemConfigResponseCodeConst; +import net.lab1024.smartadmin.module.system.department.DepartmentResponseCodeConst; +import net.lab1024.smartadmin.module.system.employee.constant.EmployeeResponseCodeConst; +import net.lab1024.smartadmin.module.support.file.constant.FileResponseCodeConst; +import net.lab1024.smartadmin.module.business.log.orderoperatelog.constant.OrderOperateLogOperateTypeConst; +import net.lab1024.smartadmin.module.business.login.LoginResponseCodeConst; +import net.lab1024.smartadmin.module.system.position.PositionResponseCodeConst; +import net.lab1024.smartadmin.module.system.privilege.constant.PrivilegeResponseCodeConst; +import net.lab1024.smartadmin.module.system.role.basic.RoleResponseCodeConst; +import net.lab1024.smartadmin.module.system.systemconfig.constant.SystemConfigResponseCodeConst; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; @@ -37,9 +37,7 @@ public class ResponseCodeConst { } - public static final ResponseCodeConst SUCCESS = new ResponseCodeConst(1, "success", true); - - public static final ResponseCodeConst COMMON_ERROR = new ResponseCodeConst(2, "我错了...."); + public static final ResponseCodeConst SUCCESS = new ResponseCodeConst(1, "操作成功!", true); public static final ResponseCodeConst ERROR_PARAM = new ResponseCodeConst(101, "参数异常！"); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/controller/BaseController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/controller/BaseController.java new file mode 100644 index 00000000..47b321aa --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/controller/BaseController.java @@ -0,0 +1,42 @@ +package net.lab1024.smartadmin.common.controller; + +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Workbook; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + +/** + * @author: zhuoda + * @create: 2020-03-31 08:54 PM from win10 + */ + +@Slf4j +public class BaseController { + + /** + * 下载 Excel 消息头 + * @param fileName + * @param workbook + * @param response + */ + public void downloadExcel(String fileName, Workbook workbook, HttpServletResponse response) { + try { + fileName = URLEncoder.encode(fileName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + log.error("", e); + } + response.setCharacterEncoding("utf-8"); + response.setHeader("Content-Type", "application/vnd.ms-excel"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xls"); + try { + workbook.write(response.getOutputStream()); + workbook.close(); + } catch (IOException e) { + log.error("", e); + } + } + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java similarity index 76% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java index 507fb215..2d890064 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.common.domain; +package net.lab1024.smartadmin.common.domain; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.util.Date; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEnum.java similarity index 98% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEnum.java index 7e194637..61ef2c66 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.domain; +package net.lab1024.smartadmin.common.domain; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONAware; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/ITask.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ITask.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/ITask.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ITask.java index cfdd3067..b6427c8e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/ITask.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ITask.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.quartz.task; +package net.lab1024.smartadmin.common.domain; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/OrderItemDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/OrderItemDTO.java new file mode 100644 index 00000000..759bb93d --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/OrderItemDTO.java @@ -0,0 +1,16 @@ +package net.lab1024.smartadmin.common.domain; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; + +/** + * @author: zhuoda + * @create: 2020-03-20 09:07 PM from win10 + */ + +@Slf4j +@Data +public class OrderItemDTO { + private String column; + private boolean asc = true; +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageParamDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/PageParamDTO.java similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageParamDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/PageParamDTO.java index 7d768fb2..14abc61a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageParamDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/PageParamDTO.java @@ -1,10 +1,11 @@ -package com.gangquan360.smartadmin.common.domain; +package net.lab1024.smartadmin.common.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Max; import javax.validation.constraints.NotNull; +import java.util.List; /** * 分页基础参数 @@ -24,12 +25,9 @@ public class PageParamDTO { @Max(value = 200, message = "每页最大为200") protected Integer pageSize; - @ApiModelProperty("排序规则：true正序 | false 倒序") - protected Boolean sort; - - @ApiModelProperty("排序字段") - protected String orderByField; - @ApiModelProperty("是否查询总条数") protected Boolean searchCount; + + @ApiModelProperty("排序") + protected List orders; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageResultDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/PageResultDTO.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageResultDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/PageResultDTO.java index 94e3d803..23995832 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageResultDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/PageResultDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.domain; +package net.lab1024.smartadmin.common.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,13 +18,13 @@ public class PageResultDTO { * 当前页 */ @ApiModelProperty(value = "当前页") - private Integer pageNum; + private Long pageNum; /** * 每页的数量 */ @ApiModelProperty(value = "每页的数量") - private Integer pageSize; + private Long pageSize; /** * 总记录数 @@ -36,7 +36,7 @@ public class PageResultDTO { * 总页数 */ @ApiModelProperty(value = "总页数") - private Integer pages; + private Long pages; /** * 结果集 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/ResponseDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ResponseDTO.java similarity index 95% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/ResponseDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ResponseDTO.java index df28466c..d1b4845b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/ResponseDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ResponseDTO.java @@ -1,13 +1,13 @@ -package com.gangquan360.smartadmin.common.domain; +package net.lab1024.smartadmin.common.domain; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; /** * 返回类 * * @param - * @author gangquan + * @author zhuoda */ public class ResponseDTO { diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/ValidateList.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ValidateList.java similarity index 98% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/ValidateList.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ValidateList.java index 0df1c4f8..c3907e63 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/ValidateList.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ValidateList.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.domain; +package net.lab1024.smartadmin.common.domain; import javax.validation.Valid; import javax.validation.constraints.NotEmpty; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartBusinessException.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/exception/SmartBusinessException.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartBusinessException.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/exception/SmartBusinessException.java index 2a35552b..904f3a7b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartBusinessException.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/exception/SmartBusinessException.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.exception; +package net.lab1024.smartadmin.common.exception; /** * * [ 业务逻辑异常,全局异常拦截后统一返回ResponseCodeConst.SYSTEM_ERROR ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartResponseCodeException.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/exception/SmartResponseCodeException.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartResponseCodeException.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/exception/SmartResponseCodeException.java index f0edc118..f3c37ed2 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartResponseCodeException.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/exception/SmartResponseCodeException.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.exception; +package net.lab1024.smartadmin.common.exception; /** * [ 全局异常拦截后保留ResponseCode码的异常] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/AbstractHeartBeatCommand.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/AbstractHeartBeatCommand.java similarity index 97% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/AbstractHeartBeatCommand.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/AbstractHeartBeatCommand.java index d2a3412d..c62fbc3d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/AbstractHeartBeatCommand.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/AbstractHeartBeatCommand.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.heartbeat; +package net.lab1024.smartadmin.common.heartbeat; import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.util.Date; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeartBeatConfig.java similarity index 89% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeartBeatConfig.java index 7e6f5f0a..3fa1ed84 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeartBeatConfig.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.heartbeat; +package net.lab1024.smartadmin.common.heartbeat; import lombok.Builder; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatLogger.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeartBeatLogger.java similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatLogger.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeartBeatLogger.java index b624fe1e..0376b0f0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatLogger.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeartBeatLogger.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.heartbeat; +package net.lab1024.smartadmin.common.heartbeat; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordCommendInterface.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeartBeatRecordCommendInterface.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordCommendInterface.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeartBeatRecordCommendInterface.java index 943836a9..e94369e3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordCommendInterface.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeartBeatRecordCommendInterface.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.heartbeat; +package net.lab1024.smartadmin.common.heartbeat; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeartBeatRecordDTO.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeartBeatRecordDTO.java index 83914968..b5f4e499 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeartBeatRecordDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.heartbeat; +package net.lab1024.smartadmin.common.heartbeat; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeatBeatRecordHelper.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeatBeatRecordHelper.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeatBeatRecordHelper.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeatBeatRecordHelper.java index 41e4ed3d..ce3b04f7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeatBeatRecordHelper.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/HeatBeatRecordHelper.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.heartbeat; +package net.lab1024.smartadmin.common.heartbeat; import java.lang.management.ManagementFactory; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/IpUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/IpUtil.java similarity index 98% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/IpUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/IpUtil.java index d3359bdc..e250f074 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/IpUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/IpUtil.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.heartbeat; +package net.lab1024.smartadmin.common.heartbeat; import java.net.InetAddress; import java.net.NetworkInterface; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/StringUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/StringUtil.java similarity index 96% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/StringUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/StringUtil.java index bcbffa59..9e0842ec 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/StringUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/heartbeat/StringUtil.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.heartbeat; +package net.lab1024.smartadmin.common.heartbeat; import java.util.Iterator; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonDeserializer.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/json/LongJsonDeserializer.java similarity index 93% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonDeserializer.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/json/LongJsonDeserializer.java index 50d809a5..0dc8e315 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonDeserializer.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/json/LongJsonDeserializer.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.json; +package net.lab1024.smartadmin.common.json; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonSerializer.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/json/LongJsonSerializer.java similarity index 93% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonSerializer.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/json/LongJsonSerializer.java index 1682357b..75442925 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonSerializer.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/json/LongJsonSerializer.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.json; +package net.lab1024.smartadmin.common.json; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaColor.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/kaptcha/KaptchaColor.java similarity index 95% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaColor.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/kaptcha/KaptchaColor.java index 638ac106..4baeb2a2 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaColor.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/kaptcha/KaptchaColor.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.kaptcha; +package net.lab1024.smartadmin.common.kaptcha; import com.google.common.collect.Lists; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaNoise.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/kaptcha/KaptchaNoise.java similarity index 96% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaNoise.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/kaptcha/KaptchaNoise.java index 3af2a7ad..22238a6c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaNoise.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/kaptcha/KaptchaNoise.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.kaptcha; +package net.lab1024.smartadmin.common.kaptcha; import com.google.code.kaptcha.NoiseProducer; import com.google.code.kaptcha.util.Configurable; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaWordRenderer.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/kaptcha/KaptchaWordRenderer.java similarity index 98% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaWordRenderer.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/kaptcha/KaptchaWordRenderer.java index ef0269b1..38ff1b4c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaWordRenderer.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/kaptcha/KaptchaWordRenderer.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.kaptcha; +package net.lab1024.smartadmin.common.kaptcha; import com.google.code.kaptcha.util.Configurable; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/mybatis/MyBatisSqlQuerySqlDebugPlugin.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/mybatis/MyBatisSqlQuerySqlDebugPlugin.java new file mode 100644 index 00000000..dcd18c02 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/mybatis/MyBatisSqlQuerySqlDebugPlugin.java @@ -0,0 +1,46 @@ +package net.lab1024.smartadmin.common.mybatis; + +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.mapping.BoundSql; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.plugin.*; +import org.apache.ibatis.session.ResultHandler; +import org.apache.ibatis.session.RowBounds; + +import java.util.Properties; + +/** + * [ mybaits sql 拦截 ] + * + * @author zhuoda + * @version 1.0 + * @company 1024lab.net + * @copyright (c) 2019 1024lab.netInc. All rights reserved. + * @date + * @since JDK1.8 + */ +@Intercepts({@Signature(type = org.apache.ibatis.executor.Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class})}) +@Slf4j +public class MyBatisSqlQuerySqlDebugPlugin implements Interceptor { + + @Override + public Object intercept(Invocation invocation) throws Throwable { + MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0]; + Object parameter = invocation.getArgs()[1]; + BoundSql boundSql = mappedStatement.getBoundSql(parameter); + log.info(boundSql.getSql()+"\r\n"+boundSql.getParameterMappings().toString()); + Object obj = invocation.proceed(); + return obj; + } + + @Override + public Object plugin(Object arg0) { + return Plugin.wrap(arg0,this); + } + + @Override + public void setProperties(Properties arg0) { + + } + +} \ No newline at end of file diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/mybatis/MyBatisSqlUpdateSqlDebugPlugin.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/mybatis/MyBatisSqlUpdateSqlDebugPlugin.java new file mode 100644 index 00000000..5f8f5850 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/mybatis/MyBatisSqlUpdateSqlDebugPlugin.java @@ -0,0 +1,44 @@ +package net.lab1024.smartadmin.common.mybatis; + +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.mapping.BoundSql; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.plugin.*; + +import java.util.Properties; + +/** + * [ mybaits sql 拦截 ] + * + * @author zhuoda + * @version 1.0 + * @company 1024lab.net + * @copyright (c) 2019 1024lab.netInc. All rights reserved. + * @date + * @since JDK1.8 + */ +@Intercepts({@Signature(type = org.apache.ibatis.executor.Executor.class, method = "update", args = {MappedStatement.class, Object.class})}) +@Slf4j +public class MyBatisSqlUpdateSqlDebugPlugin implements Interceptor { + + @Override + public Object intercept(Invocation invocation) throws Throwable { + MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0]; + Object parameter = invocation.getArgs()[1]; + BoundSql boundSql = mappedStatement.getBoundSql(parameter); + log.info(boundSql.getSql()+"\r\n"+boundSql.getParameterMappings().toString()); + Object obj = invocation.proceed(); + return obj; + } + + @Override + public Object plugin(Object arg0) { + return Plugin.wrap(arg0,this); + } + + @Override + public void setProperties(Properties arg0) { + + } + +} \ No newline at end of file diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadManager.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/SmartReloadManager.java similarity index 84% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadManager.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/SmartReloadManager.java index f6e7352e..1d4770c4 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadManager.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/SmartReloadManager.java @@ -1,14 +1,14 @@ -package com.gangquan360.smartadmin.common.reload; +package net.lab1024.smartadmin.common.reload; -import com.gangquan360.smartadmin.common.reload.annotation.SmartReload; -import com.gangquan360.smartadmin.common.reload.domain.AbstractSmartReloadObject; -import com.gangquan360.smartadmin.common.reload.domain.AnnotationReloadObject; -import com.gangquan360.smartadmin.common.reload.domain.InterfaceReloadObject; -import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem; -import com.gangquan360.smartadmin.common.reload.domain.entity.SmartReloadResult; -import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadCommandInterface; -import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadThreadLogger; -import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadable; +import net.lab1024.smartadmin.common.reload.annotation.SmartReload; +import net.lab1024.smartadmin.common.reload.domain.AbstractSmartReloadObject; +import net.lab1024.smartadmin.common.reload.domain.AnnotationReloadObject; +import net.lab1024.smartadmin.common.reload.domain.InterfaceReloadObject; +import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem; +import net.lab1024.smartadmin.common.reload.domain.entity.SmartReloadResult; +import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadCommandInterface; +import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadThreadLogger; +import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadable; import java.lang.reflect.Method; import java.util.Map; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadScheduler.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/SmartReloadScheduler.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadScheduler.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/SmartReloadScheduler.java index d0dc0587..121c3056 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadScheduler.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/SmartReloadScheduler.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.common.reload; +package net.lab1024.smartadmin.common.reload; -import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadCommandInterface; -import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadThreadLogger; +import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadCommandInterface; +import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadThreadLogger; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadFactory; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand.java index b5b90aac..8e1dc3ed 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand.java @@ -1,8 +1,8 @@ -package com.gangquan360.smartadmin.common.reload.abstracts; +package net.lab1024.smartadmin.common.reload.abstracts; -import com.gangquan360.smartadmin.common.reload.SmartReloadManager; -import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem; -import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadCommandInterface; +import net.lab1024.smartadmin.common.reload.SmartReloadManager; +import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem; +import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadCommandInterface; import java.util.List; import java.util.concurrent.ConcurrentHashMap; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand4Spring.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand4Spring.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand4Spring.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand4Spring.java index 4b550591..60f34a9c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand4Spring.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand4Spring.java @@ -1,11 +1,10 @@ -package com.gangquan360.smartadmin.common.reload.abstracts; +package net.lab1024.smartadmin.common.reload.abstracts; -import com.gangquan360.smartadmin.common.reload.SmartReloadManager; -import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem; -import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadCommandInterface; +import net.lab1024.smartadmin.common.reload.SmartReloadManager; +import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem; +import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadCommandInterface; import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.PostConstruct; import java.util.List; import java.util.concurrent.ConcurrentHashMap; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/annotation/SmartReload.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/annotation/SmartReload.java similarity index 84% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/annotation/SmartReload.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/annotation/SmartReload.java index 6176ae2d..eac54afd 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/annotation/SmartReload.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/annotation/SmartReload.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.reload.annotation; +package net.lab1024.smartadmin.common.reload.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AbstractSmartReloadObject.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/AbstractSmartReloadObject.java similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AbstractSmartReloadObject.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/AbstractSmartReloadObject.java index 1f37569d..907d37da 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AbstractSmartReloadObject.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/AbstractSmartReloadObject.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.common.reload.domain; +package net.lab1024.smartadmin.common.reload.domain; -import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem; -import com.gangquan360.smartadmin.common.reload.domain.entity.SmartReloadResult; +import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem; +import net.lab1024.smartadmin.common.reload.domain.entity.SmartReloadResult; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AnnotationReloadObject.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/AnnotationReloadObject.java similarity index 79% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AnnotationReloadObject.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/AnnotationReloadObject.java index 21ea4dea..da19bcb9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AnnotationReloadObject.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/AnnotationReloadObject.java @@ -1,8 +1,8 @@ -package com.gangquan360.smartadmin.common.reload.domain; +package net.lab1024.smartadmin.common.reload.domain; -import com.gangquan360.smartadmin.common.reload.annotation.SmartReload; -import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem; -import com.gangquan360.smartadmin.common.reload.domain.entity.SmartReloadResult; +import net.lab1024.smartadmin.common.reload.annotation.SmartReload; +import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem; +import net.lab1024.smartadmin.common.reload.domain.entity.SmartReloadResult; import java.lang.reflect.Method; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/InterfaceReloadObject.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/InterfaceReloadObject.java similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/InterfaceReloadObject.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/InterfaceReloadObject.java index 409aba0f..e0f75ba0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/InterfaceReloadObject.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/InterfaceReloadObject.java @@ -1,8 +1,8 @@ -package com.gangquan360.smartadmin.common.reload.domain; +package net.lab1024.smartadmin.common.reload.domain; -import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem; -import com.gangquan360.smartadmin.common.reload.domain.entity.SmartReloadResult; -import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadable; +import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem; +import net.lab1024.smartadmin.common.reload.domain.entity.SmartReloadResult; +import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadable; /** * Reload 处理程序的实现类 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/ReloadItem.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/entity/ReloadItem.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/ReloadItem.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/entity/ReloadItem.java index a2e9a40d..66a89b60 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/ReloadItem.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/entity/ReloadItem.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.reload.domain.entity; +package net.lab1024.smartadmin.common.reload.domain.entity; /** * ReloadItem 类 * diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/SmartReloadResult.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/entity/SmartReloadResult.java similarity index 96% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/SmartReloadResult.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/entity/SmartReloadResult.java index a22fba47..07c6d2d5 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/SmartReloadResult.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/domain/entity/SmartReloadResult.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.reload.domain.entity; +package net.lab1024.smartadmin.common.reload.domain.entity; /** * t_reload_result 表 实体类 * diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadCommandInterface.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/interfaces/SmartReloadCommandInterface.java similarity index 78% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadCommandInterface.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/interfaces/SmartReloadCommandInterface.java index 6adbed3e..c9e04237 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadCommandInterface.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/interfaces/SmartReloadCommandInterface.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.common.reload.interfaces; +package net.lab1024.smartadmin.common.reload.interfaces; -import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem; -import com.gangquan360.smartadmin.common.reload.domain.entity.SmartReloadResult; +import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem; +import net.lab1024.smartadmin.common.reload.domain.entity.SmartReloadResult; import java.util.List; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadThreadLogger.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/interfaces/SmartReloadThreadLogger.java similarity index 73% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadThreadLogger.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/interfaces/SmartReloadThreadLogger.java index 5db12541..e03c9ad7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadThreadLogger.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/interfaces/SmartReloadThreadLogger.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.reload.interfaces; +package net.lab1024.smartadmin.common.reload.interfaces; /** * SmartReloadThreadLogger 日志类 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadable.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/interfaces/SmartReloadable.java similarity index 65% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadable.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/interfaces/SmartReloadable.java index 66122413..85473d5f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadable.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/reload/interfaces/SmartReloadable.java @@ -1,6 +1,7 @@ -package com.gangquan360.smartadmin.common.reload.interfaces; +package net.lab1024.smartadmin.common.reload.interfaces; + +import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem; -import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem; /** * reload 接口
* 需要reload的业务实现类 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java index cc863c48..15037fb8 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java @@ -17,16 +17,14 @@ * */ -package com.gangquan360.smartadmin.common.swagger; +package net.lab1024.smartadmin.common.swagger; -import com.gangquan360.smartadmin.common.anno.ApiModelPropertyEnum; -import com.gangquan360.smartadmin.common.domain.BaseEnum; +import net.lab1024.smartadmin.common.anno.ApiModelPropertyEnum; +import net.lab1024.smartadmin.common.domain.BaseEnum; import com.google.common.base.Function; import com.google.common.base.Optional; import org.apache.commons.lang3.StringUtils; import org.springframework.core.annotation.AnnotationUtils; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.schema.ModelPropertyBuilderPlugin; import springfox.documentation.spi.schema.contexts.ModelPropertyContext; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/BigDecimalValidator.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/bigdecimal/BigDecimalValidator.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/BigDecimalValidator.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/bigdecimal/BigDecimalValidator.java index ed0a91fb..5ba85bf7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/BigDecimalValidator.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/bigdecimal/BigDecimalValidator.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.common.validator.bigdecimal; +package net.lab1024.smartadmin.common.validator.bigdecimal; -import com.gangquan360.smartadmin.util.SmartBigDecimalUtil; +import net.lab1024.smartadmin.util.SmartBigDecimalUtil; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/CheckBigDecimal.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/bigdecimal/CheckBigDecimal.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/CheckBigDecimal.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/bigdecimal/CheckBigDecimal.java index a005fd8b..73ef5668 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/CheckBigDecimal.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/bigdecimal/CheckBigDecimal.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.validator.bigdecimal; +package net.lab1024.smartadmin.common.validator.bigdecimal; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/ComparisonSymbolEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/bigdecimal/ComparisonSymbolEnum.java similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/ComparisonSymbolEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/bigdecimal/ComparisonSymbolEnum.java index f25948cc..e59d0bf3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/ComparisonSymbolEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/bigdecimal/ComparisonSymbolEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.common.validator.bigdecimal; +package net.lab1024.smartadmin.common.validator.bigdecimal; /** * 比较符枚举类 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/CheckEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/en/CheckEnum.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/CheckEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/en/CheckEnum.java index 662dc7ed..ceef46fc 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/CheckEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/en/CheckEnum.java @@ -1,8 +1,7 @@ -package com.gangquan360.smartadmin.common.validator.en; +package net.lab1024.smartadmin.common.validator.en; -import com.gangquan360.smartadmin.common.domain.BaseEnum; -import com.gangquan360.smartadmin.common.validator.en.EnumValidator; +import net.lab1024.smartadmin.common.domain.BaseEnum; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/EnumValidator.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/en/EnumValidator.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/EnumValidator.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/en/EnumValidator.java index 8cb3004d..953a90d3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/EnumValidator.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/validator/en/EnumValidator.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.common.validator.en; +package net.lab1024.smartadmin.common.validator.en; -import com.gangquan360.smartadmin.common.domain.BaseEnum; +import net.lab1024.smartadmin.common.domain.BaseEnum; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartAdminWebAppConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartAdminWebAppConfig.java similarity index 73% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartAdminWebAppConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartAdminWebAppConfig.java index b4ee830f..04d30c67 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartAdminWebAppConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartAdminWebAppConfig.java @@ -1,17 +1,13 @@ -package com.gangquan360.smartadmin.config; +package net.lab1024.smartadmin.config; -import com.gangquan360.smartadmin.interceptor.SmartAuthenticationInterceptor; +import net.lab1024.smartadmin.interceptor.SmartAuthenticationInterceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.*; -/** - * @Description - * @Author lihaifan - * @Date Created in 2017/10/24 13:48 - */ @Configuration -public class SmartAdminWebAppConfig implements WebMvcConfigurer{ +public class SmartAdminWebAppConfig implements WebMvcConfigurer { + @Autowired private SmartAuthenticationInterceptor smartAuthenticationInterceptor; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartDruidDataSourceConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartDruidDataSourceConfig.java similarity index 96% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartDruidDataSourceConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartDruidDataSourceConfig.java index b05932ab..f0107110 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartDruidDataSourceConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartDruidDataSourceConfig.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.config; +package net.lab1024.smartadmin.config; import com.alibaba.druid.filter.Filter; import com.alibaba.druid.filter.stat.StatFilter; @@ -6,6 +6,7 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.http.StatViewServlet; import com.alibaba.druid.support.http.WebStatFilter; import com.alibaba.druid.support.spring.stat.DruidStatInterceptor; +import com.alibaba.druid.util.JdbcConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.aop.support.JdkRegexpMethodPointcut; @@ -89,6 +90,7 @@ public class SmartDruidDataSourceConfig { @Primary public DataSource druidDataSource() { DruidDataSource druidDataSource = new DruidDataSource(); + druidDataSource.setDbType(JdbcConstants.MYSQL); druidDataSource.setDriverClassName(driver); druidDataSource.setUrl(url); druidDataSource.setUsername(username); @@ -155,7 +157,7 @@ public class SmartDruidDataSourceConfig { @Bean public JdkRegexpMethodPointcut jdkRegexpMethodPointcut() { JdkRegexpMethodPointcut jdkRegexpMethodPointcut = new JdkRegexpMethodPointcut(); - jdkRegexpMethodPointcut.setPatterns("com.gangquan360.smartadmin.module..*Service.*"); + jdkRegexpMethodPointcut.setPatterns("net.lab1024.smartadmin.module..*Service.*"); return jdkRegexpMethodPointcut; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartHeartBeatConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartHeartBeatConfig.java similarity index 93% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartHeartBeatConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartHeartBeatConfig.java index 7e572a84..14517a8f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartHeartBeatConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartHeartBeatConfig.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.config; +package net.lab1024.smartadmin.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartKaptchaConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartKaptchaConfig.java similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartKaptchaConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartKaptchaConfig.java index e29d98bf..44744a8c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartKaptchaConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartKaptchaConfig.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.config; +package net.lab1024.smartadmin.config; -import com.gangquan360.smartadmin.common.kaptcha.KaptchaNoise; -import com.gangquan360.smartadmin.common.kaptcha.KaptchaWordRenderer; +import net.lab1024.smartadmin.common.kaptcha.KaptchaNoise; +import net.lab1024.smartadmin.common.kaptcha.KaptchaWordRenderer; import com.google.code.kaptcha.impl.DefaultKaptcha; import com.google.code.kaptcha.util.Config; import org.springframework.context.annotation.Bean; @@ -38,7 +38,7 @@ public class SmartKaptchaConfig { properties.setProperty("kaptcha.background.clear.from", "white"); properties.setProperty("kaptcha.background.clear.to", "white"); - properties.setProperty("kaptcha.word.impl",KaptchaWordRenderer.class.getName()); + properties.setProperty("kaptcha.word.impl", KaptchaWordRenderer.class.getName()); properties.setProperty("kaptcha.noise.impl", KaptchaNoise.class.getName()); Config config=new Config(properties); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartMybatisPlusConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartMybatisPlusConfig.java new file mode 100644 index 00000000..95d20208 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartMybatisPlusConfig.java @@ -0,0 +1,44 @@ +package net.lab1024.smartadmin.config; + +import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer; +import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize; +import net.lab1024.smartadmin.common.mybatis.MyBatisSqlQuerySqlDebugPlugin; +import net.lab1024.smartadmin.common.mybatis.MyBatisSqlUpdateSqlDebugPlugin; +import net.lab1024.smartadmin.constant.SystemEnvironmentEnum; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * @author zhuoda + */ +@EnableTransactionManagement +@Configuration +@MapperScan(basePackages = {"net.lab1024.smartadmin.module.*"}) +public class SmartMybatisPlusConfig { + + /** + * 分页插件 + */ + @Bean + public PaginationInterceptor paginationInterceptor() { + // 开启 count 的 join 优化,只针对 left join !!! + return new PaginationInterceptor().setCountSqlParser(new JsqlParserCountOptimize(true)); + } + + /** + * 打印sql log + * @return + */ + @Bean + @Profile(SystemEnvironmentEnum.DEV_ENV) + ConfigurationCustomizer mybatisConfigurationCustomizer() { + return configuration -> { + configuration.addInterceptor(new MyBatisSqlUpdateSqlDebugPlugin()); + configuration.addInterceptor(new MyBatisSqlQuerySqlDebugPlugin()); + }; + } +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRedisConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartRedisConfig.java similarity index 98% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRedisConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartRedisConfig.java index 881d54ac..829ca01f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRedisConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartRedisConfig.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.config; +package net.lab1024.smartadmin.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartReloadConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartReloadConfig.java similarity index 84% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartReloadConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartReloadConfig.java index 8b2f2ec8..bf5defdd 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartReloadConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartReloadConfig.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.config; +package net.lab1024.smartadmin.config; -import com.gangquan360.smartadmin.common.reload.SmartReloadManager; -import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadThreadLogger; +import net.lab1024.smartadmin.common.reload.SmartReloadManager; +import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadThreadLogger; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRestTemplateConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartRestTemplateConfig.java similarity index 98% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRestTemplateConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartRestTemplateConfig.java index da3eac8c..70d9624c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRestTemplateConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartRestTemplateConfig.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.config; +package net.lab1024.smartadmin.config; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; import org.apache.http.client.HttpClient; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerApiModelEnumConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartSwaggerApiModelEnumConfig.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerApiModelEnumConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartSwaggerApiModelEnumConfig.java index 93d9427c..93e45791 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerApiModelEnumConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartSwaggerApiModelEnumConfig.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.config; +package net.lab1024.smartadmin.config; -import com.gangquan360.smartadmin.common.swagger.SmartSwaggerApiModelEnumPlugin; +import net.lab1024.smartadmin.common.swagger.SmartSwaggerApiModelEnumPlugin; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerDynamicGroupConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartSwaggerDynamicGroupConfig.java similarity index 98% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerDynamicGroupConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartSwaggerDynamicGroupConfig.java index efe1eda8..b3ca6d9a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerDynamicGroupConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartSwaggerDynamicGroupConfig.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.config; +package net.lab1024.smartadmin.config; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.constant.SwaggerTagConst; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Predicates; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartWebSocketConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartWebSocketConfig.java similarity index 93% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartWebSocketConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartWebSocketConfig.java index 3087d2ec..f431fdac 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartWebSocketConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartWebSocketConfig.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.config; +package net.lab1024.smartadmin.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SystemEnvironmentCondition.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SystemEnvironmentCondition.java similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SystemEnvironmentCondition.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SystemEnvironmentCondition.java index 46755115..63c2a5ed 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SystemEnvironmentCondition.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SystemEnvironmentCondition.java @@ -1,5 +1,5 @@ -package com.gangquan360.smartadmin.config; -import com.gangquan360.smartadmin.constant.SystemEnvironmentEnum; +package net.lab1024.smartadmin.config; +import net.lab1024.smartadmin.constant.SystemEnvironmentEnum; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/CommonConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/constant/CommonConst.java similarity index 96% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/CommonConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/constant/CommonConst.java index 1b482e0c..b2c4a63f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/CommonConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/constant/CommonConst.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.constant; +package net.lab1024.smartadmin.constant; import com.google.common.collect.ImmutableSet; import org.apache.commons.collections4.CollectionUtils; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SmartReloadTagConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/constant/SmartReloadTagConst.java similarity index 84% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SmartReloadTagConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/constant/SmartReloadTagConst.java index f5ed6e68..0799bd66 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SmartReloadTagConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/constant/SmartReloadTagConst.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.constant; +package net.lab1024.smartadmin.constant; /** * smart initDefines 项 常量 * diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SwaggerTagConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/constant/SwaggerTagConst.java similarity index 97% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SwaggerTagConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/constant/SwaggerTagConst.java index 6ce07b85..559f9a30 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SwaggerTagConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/constant/SwaggerTagConst.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.constant; +package net.lab1024.smartadmin.constant; /** * [] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SystemEnvironmentEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/constant/SystemEnvironmentEnum.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SystemEnvironmentEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/constant/SystemEnvironmentEnum.java index 07ba8b54..e8d0fd75 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SystemEnvironmentEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/constant/SystemEnvironmentEnum.java @@ -1,6 +1,7 @@ -package com.gangquan360.smartadmin.constant; +package net.lab1024.smartadmin.constant; + +import net.lab1024.smartadmin.common.domain.BaseEnum; -import com.gangquan360.smartadmin.common.domain.BaseEnum; /** * 系统环境枚举类 * @@ -9,6 +10,7 @@ import com.gangquan360.smartadmin.common.domain.BaseEnum; */ public enum SystemEnvironmentEnum implements BaseEnum { + /** * dev */ @@ -29,6 +31,10 @@ public enum SystemEnvironmentEnum implements BaseEnum { */ PROD("prod", "生产环境"); + + public static final String DEV_ENV = "dev"; + + private String value; private String desc; @@ -37,6 +43,7 @@ public enum SystemEnvironmentEnum implements BaseEnum { this.value = value; this.desc = desc; } + /** * 获取定义枚举value值 * diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartGlobalExceptionHandler.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/handler/SmartGlobalExceptionHandler.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartGlobalExceptionHandler.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/handler/SmartGlobalExceptionHandler.java index 29f779a4..dabd6fd9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartGlobalExceptionHandler.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/handler/SmartGlobalExceptionHandler.java @@ -1,8 +1,8 @@ -package com.gangquan360.smartadmin.handler; +package net.lab1024.smartadmin.handler; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.common.exception.SmartBusinessException; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.common.exception.SmartBusinessException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.TypeMismatchException; import org.springframework.http.converter.HttpMessageNotReadableException; @@ -40,6 +40,8 @@ public class SmartGlobalExceptionHandler { @ResponseBody @ExceptionHandler(Exception.class) public ResponseDTO exceptionHandler(Exception e) { + log.error("error:", e); + // http 请求方式错误 if (e instanceof HttpRequestMethodNotSupportedException) { return ResponseDTO.wrap(ResponseCodeConst.REQUEST_METHOD_ERROR); @@ -66,8 +68,6 @@ public class SmartGlobalExceptionHandler { return ResponseDTO.wrap(ResponseCodeConst.SYSTEM_ERROR); } - log.error("error:", e); - return ResponseDTO.wrap(ResponseCodeConst.SYSTEM_ERROR); } } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartOperateLogAspect.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/handler/SmartOperateLogAspect.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartOperateLogAspect.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/handler/SmartOperateLogAspect.java index dc2dccdc..7bf5e923 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartOperateLogAspect.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/handler/SmartOperateLogAspect.java @@ -1,13 +1,13 @@ -package com.gangquan360.smartadmin.handler; +package net.lab1024.smartadmin.handler; import com.alibaba.fastjson.JSON; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.constant.JudgeEnum; -import com.gangquan360.smartadmin.module.log.LogService; -import com.gangquan360.smartadmin.module.log.useroperatelog.domain.UserOperateLogEntity; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; -import com.gangquan360.smartadmin.util.SmartRequestTokenUtil; -import com.gangquan360.smartadmin.util.SmartStringUtil; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.constant.JudgeEnum; +import net.lab1024.smartadmin.module.business.log.LogService; +import net.lab1024.smartadmin.module.business.log.useroperatelog.domain.UserOperateLogEntity; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.util.SmartRequestTokenUtil; +import net.lab1024.smartadmin.util.SmartStringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -46,7 +46,7 @@ public class SmartOperateLogAspect { @Autowired private LogService logService; - @Pointcut("execution(* com.gangquan360.smartadmin.module..*Controller.*(..)))") + @Pointcut("execution(* net.lab1024.smartadmin.module..*Controller.*(..)))") public void logPointCut() { } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/interceptor/SmartAuthenticationInterceptor.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/interceptor/SmartAuthenticationInterceptor.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/interceptor/SmartAuthenticationInterceptor.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/interceptor/SmartAuthenticationInterceptor.java index 83879e54..4d949393 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/interceptor/SmartAuthenticationInterceptor.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/interceptor/SmartAuthenticationInterceptor.java @@ -1,16 +1,16 @@ -package com.gangquan360.smartadmin.interceptor; +package net.lab1024.smartadmin.interceptor; import com.alibaba.fastjson.JSONObject; -import com.gangquan360.smartadmin.common.anno.NoNeedLogin; -import com.gangquan360.smartadmin.common.anno.NoValidPrivilege; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.CommonConst; -import com.gangquan360.smartadmin.module.login.LoginResponseCodeConst; -import com.gangquan360.smartadmin.module.login.LoginTokenService; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; -import com.gangquan360.smartadmin.module.privilege.service.PrivilegeEmployeeService; -import com.gangquan360.smartadmin.util.SmartRequestTokenUtil; -import com.gangquan360.smartadmin.util.SmartStringUtil; +import net.lab1024.smartadmin.common.anno.NoNeedLogin; +import net.lab1024.smartadmin.common.anno.NoValidPrivilege; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.CommonConst; +import net.lab1024.smartadmin.module.business.login.LoginResponseCodeConst; +import net.lab1024.smartadmin.module.business.login.LoginTokenService; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.module.system.privilege.service.PrivilegeEmployeeService; +import net.lab1024.smartadmin.util.SmartRequestTokenUtil; +import net.lab1024.smartadmin.util.SmartStringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/listener/SmartAdminStartupRunner.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/listener/SmartAdminStartupRunner.java similarity index 76% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/listener/SmartAdminStartupRunner.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/listener/SmartAdminStartupRunner.java index f19aa9b7..9205fa5b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/listener/SmartAdminStartupRunner.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/listener/SmartAdminStartupRunner.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.listener; +package net.lab1024.smartadmin.listener; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/EmailController.java similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/EmailController.java index a04aff8d..b7e350bd 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/EmailController.java @@ -1,16 +1,17 @@ -package com.gangquan360.smartadmin.module.email; +package net.lab1024.smartadmin.module.business.email; -import com.gangquan360.smartadmin.common.anno.NoValidPrivilege; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.email.domain.dto.EmailDTO; -import com.gangquan360.smartadmin.module.email.domain.dto.EmailQueryDTO; -import com.gangquan360.smartadmin.module.email.domain.dto.EmailVO; +import net.lab1024.smartadmin.common.anno.NoValidPrivilege; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.business.email.domain.dto.EmailDTO; +import net.lab1024.smartadmin.module.business.email.domain.dto.EmailQueryDTO; +import net.lab1024.smartadmin.module.business.email.domain.dto.EmailVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,7 +37,7 @@ public class EmailController { @ApiOperation(value = "分页查询",notes = "@author yandanyang") @PostMapping("/email/page/query") @NoValidPrivilege - public ResponseDTO> queryByPage(@RequestBody EmailQueryDTO queryDTO) { + public ResponseDTO> queryByPage(@RequestBody @Validated EmailQueryDTO queryDTO) { return emailService.queryByPage(queryDTO); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/EmailDao.java similarity index 64% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/EmailDao.java index e7fd5e76..76a7dea5 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/EmailDao.java @@ -1,9 +1,9 @@ -package com.gangquan360.smartadmin.module.email; +package net.lab1024.smartadmin.module.business.email; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.baomidou.mybatisplus.plugins.pagination.Pagination; -import com.gangquan360.smartadmin.module.email.domain.dto.EmailQueryDTO; -import com.gangquan360.smartadmin.module.email.domain.entity.EmailEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.module.business.email.domain.dto.EmailQueryDTO; +import net.lab1024.smartadmin.module.business.email.domain.entity.EmailEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @@ -29,7 +29,7 @@ public interface EmailDao extends BaseMapper { * @param queryDTO * @return EmailEntity */ - List queryByPage(Pagination page, @Param("queryDTO") EmailQueryDTO queryDTO); + List queryByPage(Page page, @Param("queryDTO") EmailQueryDTO queryDTO); /** * 根据id删除 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailSendStatusEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/EmailSendStatusEnum.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailSendStatusEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/EmailSendStatusEnum.java index ba8e6e85..a6cf0c44 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailSendStatusEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/EmailSendStatusEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.email; +package net.lab1024.smartadmin.module.business.email; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/EmailService.java similarity index 73% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/EmailService.java index 9296f231..6b7e5b7d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/EmailService.java @@ -1,19 +1,19 @@ -package com.gangquan360.smartadmin.module.email; +package net.lab1024.smartadmin.module.business.email; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.email.domain.dto.EmailConfigDTO; -import com.gangquan360.smartadmin.module.email.domain.dto.EmailDTO; -import com.gangquan360.smartadmin.module.email.domain.dto.EmailQueryDTO; -import com.gangquan360.smartadmin.module.email.domain.dto.EmailVO; -import com.gangquan360.smartadmin.module.email.domain.entity.EmailEntity; -import com.gangquan360.smartadmin.module.systemconfig.SystemConfigService; -import com.gangquan360.smartadmin.module.systemconfig.constant.SystemConfigEnum; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartPaginationUtil; -import com.gangquan360.smartadmin.util.SmartSendMailUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.business.email.domain.dto.EmailConfigDTO; +import net.lab1024.smartadmin.module.business.email.domain.dto.EmailDTO; +import net.lab1024.smartadmin.module.business.email.domain.dto.EmailQueryDTO; +import net.lab1024.smartadmin.module.business.email.domain.dto.EmailVO; +import net.lab1024.smartadmin.module.business.email.domain.entity.EmailEntity; +import net.lab1024.smartadmin.module.system.systemconfig.SystemConfigService; +import net.lab1024.smartadmin.module.system.systemconfig.constant.SystemConfigEnum; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartPageUtil; +import net.lab1024.smartadmin.util.SmartSendMailUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,11 +46,11 @@ public class EmailService { * @date 2019-05-13 17:10:16 */ public ResponseDTO> queryByPage(EmailQueryDTO queryDTO) { - Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page page = SmartPageUtil.convert2QueryPage(queryDTO); List entities = emailDao.queryByPage(page, queryDTO); List dtoList = SmartBeanUtil.copyList(entities, EmailVO.class); page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page); return ResponseDTO.succData(pageResultDTO); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailConfigDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/dto/EmailConfigDTO.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailConfigDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/dto/EmailConfigDTO.java index 84974033..87f0e413 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailConfigDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/dto/EmailConfigDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.email.domain.dto; +package net.lab1024.smartadmin.module.business.email.domain.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/dto/EmailDTO.java similarity index 93% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/dto/EmailDTO.java index 86b23076..8300a3f5 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/dto/EmailDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.email.domain.dto; +package net.lab1024.smartadmin.module.business.email.domain.dto; import lombok.Data; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/dto/EmailQueryDTO.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/dto/EmailQueryDTO.java index 4aea64bc..6768dc4f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/dto/EmailQueryDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.email.domain.dto; +package net.lab1024.smartadmin.module.business.email.domain.dto; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageParamDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/dto/EmailVO.java similarity index 93% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/dto/EmailVO.java index 29545058..4686efad 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/dto/EmailVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.email.domain.dto; +package net.lab1024.smartadmin.module.business.email.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/entity/EmailEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/entity/EmailEntity.java similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/entity/EmailEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/entity/EmailEntity.java index 92951595..d7c0da18 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/entity/EmailEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/email/domain/entity/EmailEntity.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.email.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +package net.lab1024.smartadmin.module.business.email.domain.entity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/LogService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/LogService.java similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/LogService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/LogService.java index 06df389e..9aae836c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/LogService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/LogService.java @@ -1,12 +1,12 @@ -package com.gangquan360.smartadmin.module.log; +package net.lab1024.smartadmin.module.business.log; -import com.gangquan360.smartadmin.module.log.orderoperatelog.OrderOperateLogDao; -import com.gangquan360.smartadmin.module.log.orderoperatelog.domain.entity.OrderOperateLogEntity; -import com.gangquan360.smartadmin.module.log.userloginlog.UserLoginLogDao; -import com.gangquan360.smartadmin.module.log.userloginlog.domain.UserLoginLogEntity; -import com.gangquan360.smartadmin.module.log.useroperatelog.UserOperateLogDao; -import com.gangquan360.smartadmin.module.log.useroperatelog.domain.UserOperateLogEntity; -import com.gangquan360.smartadmin.util.SmartThreadFactory; +import net.lab1024.smartadmin.module.business.log.orderoperatelog.OrderOperateLogDao; +import net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.entity.OrderOperateLogEntity; +import net.lab1024.smartadmin.module.business.log.userloginlog.UserLoginLogDao; +import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogEntity; +import net.lab1024.smartadmin.module.business.log.useroperatelog.UserOperateLogDao; +import net.lab1024.smartadmin.module.business.log.useroperatelog.domain.UserOperateLogEntity; +import net.lab1024.smartadmin.util.SmartThreadFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogController.java similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogController.java index 2d847080..5f84c7ab 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogController.java @@ -1,11 +1,11 @@ -package com.gangquan360.smartadmin.module.log.orderoperatelog; +package net.lab1024.smartadmin.module.business.log.orderoperatelog; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.log.orderoperatelog.constant.OrderOperateLogOrderTypeEnum; -import com.gangquan360.smartadmin.module.log.orderoperatelog.domain.vo.OrderOperateLogVO; -import com.gangquan360.smartadmin.util.SmartStringUtil; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.business.log.orderoperatelog.constant.OrderOperateLogOrderTypeEnum; +import net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.vo.OrderOperateLogVO; +import net.lab1024.smartadmin.util.SmartStringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogDao.java similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogDao.java index 4d075b9e..a720f5c5 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogDao.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.log.orderoperatelog; +package net.lab1024.smartadmin.module.business.log.orderoperatelog; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.gangquan360.smartadmin.module.log.orderoperatelog.domain.entity.OrderOperateLogEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.entity.OrderOperateLogEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java index cea07785..be9ebf5b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java @@ -1,11 +1,11 @@ -package com.gangquan360.smartadmin.module.log.orderoperatelog; +package net.lab1024.smartadmin.module.business.log.orderoperatelog; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.log.orderoperatelog.domain.dto.OrderOperateLogSaveDTO; -import com.gangquan360.smartadmin.module.log.orderoperatelog.domain.entity.OrderOperateLogEntity; -import com.gangquan360.smartadmin.module.log.orderoperatelog.domain.vo.OrderOperateLogVO; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartStringUtil; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.dto.OrderOperateLogSaveDTO; +import net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.entity.OrderOperateLogEntity; +import net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.vo.OrderOperateLogVO; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartStringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogDefaultEmpEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/constant/OrderOperateLogDefaultEmpEnum.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogDefaultEmpEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/constant/OrderOperateLogDefaultEmpEnum.java index f066be65..c088322d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogDefaultEmpEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/constant/OrderOperateLogDefaultEmpEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.log.orderoperatelog.constant; +package net.lab1024.smartadmin.module.business.log.orderoperatelog.constant; /** * diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOperateTypeConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/constant/OrderOperateLogOperateTypeConst.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOperateTypeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/constant/OrderOperateLogOperateTypeConst.java index 66ed165c..d5d14b63 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOperateTypeConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/constant/OrderOperateLogOperateTypeConst.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.log.orderoperatelog.constant; +package net.lab1024.smartadmin.module.business.log.orderoperatelog.constant; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; /** * [ 8001 -8999 ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOrderTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/constant/OrderOperateLogOrderTypeEnum.java similarity index 93% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOrderTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/constant/OrderOperateLogOrderTypeEnum.java index eeb5a3f0..9674836e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOrderTypeEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/constant/OrderOperateLogOrderTypeEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.log.orderoperatelog.constant; +package net.lab1024.smartadmin.module.business.log.orderoperatelog.constant; import java.util.Arrays; import java.util.Optional; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/OrderOperateLogSaveDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/domain/dto/OrderOperateLogSaveDTO.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/OrderOperateLogSaveDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/domain/dto/OrderOperateLogSaveDTO.java index fb82c244..a9861bdc 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/OrderOperateLogSaveDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/domain/dto/OrderOperateLogSaveDTO.java @@ -1,9 +1,10 @@ -package com.gangquan360.smartadmin.module.log.orderoperatelog.domain.dto; +package net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.dto; -import com.gangquan360.smartadmin.module.log.orderoperatelog.constant.OrderOperateLogOperateTypeConst; -import com.gangquan360.smartadmin.module.log.orderoperatelog.constant.OrderOperateLogOrderTypeEnum; +import net.lab1024.smartadmin.module.business.log.orderoperatelog.constant.OrderOperateLogOperateTypeConst; +import net.lab1024.smartadmin.module.business.log.orderoperatelog.constant.OrderOperateLogOrderTypeEnum; import lombok.Data; + /** * * @author yandanyang diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/SupplierOrderOperateVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/domain/dto/SupplierOrderOperateVO.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/SupplierOrderOperateVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/domain/dto/SupplierOrderOperateVO.java index 6329b588..9633527f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/SupplierOrderOperateVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/domain/dto/SupplierOrderOperateVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.log.orderoperatelog.domain.dto; +package net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.dto; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/entity/OrderOperateLogEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/domain/entity/OrderOperateLogEntity.java similarity index 73% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/entity/OrderOperateLogEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/domain/entity/OrderOperateLogEntity.java index 4836c919..8f61f3ec 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/entity/OrderOperateLogEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/domain/entity/OrderOperateLogEntity.java @@ -1,12 +1,10 @@ -package com.gangquan360.smartadmin.module.log.orderoperatelog.domain.entity; +package net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Builder; import lombok.Data; -import java.util.Date; - /** *

* 各种单据操作记录 @@ -20,7 +18,7 @@ import java.util.Date; @Data @Builder @TableName("t_order_operate_log") -public class OrderOperateLogEntity extends BaseEntity{ +public class OrderOperateLogEntity extends BaseEntity { /** * 各种单据的id diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/vo/OrderOperateLogVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/domain/vo/OrderOperateLogVO.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/vo/OrderOperateLogVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/domain/vo/OrderOperateLogVO.java index f4d511da..ab565691 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/vo/OrderOperateLogVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/domain/vo/OrderOperateLogVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.log.orderoperatelog.domain.vo; +package net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/UserLoginLogController.java similarity index 70% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/UserLoginLogController.java index dcfea4fa..eccf2e69 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/UserLoginLogController.java @@ -1,13 +1,13 @@ -package com.gangquan360.smartadmin.module.log.userloginlog; +package net.lab1024.smartadmin.module.business.log.userloginlog; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeQueryDTO; -import com.gangquan360.smartadmin.module.employee.domain.vo.EmployeeVO; -import com.gangquan360.smartadmin.module.log.userloginlog.domain.UserLoginLogDTO; -import com.gangquan360.smartadmin.module.log.userloginlog.domain.UserLoginLogQueryDTO; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeQueryDTO; +import net.lab1024.smartadmin.module.system.employee.domain.vo.EmployeeVO; +import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogDTO; +import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogQueryDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/UserLoginLogDao.java similarity index 62% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/UserLoginLogDao.java index 2392bc96..ab585690 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/UserLoginLogDao.java @@ -1,9 +1,9 @@ -package com.gangquan360.smartadmin.module.log.userloginlog; +package net.lab1024.smartadmin.module.business.log.userloginlog; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.baomidou.mybatisplus.plugins.pagination.Pagination; -import com.gangquan360.smartadmin.module.log.userloginlog.domain.UserLoginLogQueryDTO; -import com.gangquan360.smartadmin.module.log.userloginlog.domain.UserLoginLogEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogQueryDTO; +import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @@ -29,7 +29,7 @@ public interface UserLoginLogDao extends BaseMapper { * @param queryDTO * @return UserLoginLogEntity */ - List queryByPage(Pagination page, @Param("queryDTO") UserLoginLogQueryDTO queryDTO); + List queryByPage(Page page, @Param("queryDTO") UserLoginLogQueryDTO queryDTO); /** * 根据id删除 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/UserLoginLogService.java similarity index 64% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/UserLoginLogService.java index 9f20b35d..0d096fe3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/UserLoginLogService.java @@ -1,17 +1,17 @@ -package com.gangquan360.smartadmin.module.log.userloginlog; +package net.lab1024.smartadmin.module.business.log.userloginlog; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.employee.EmployeeService; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeQueryDTO; -import com.gangquan360.smartadmin.module.employee.domain.vo.EmployeeVO; -import com.gangquan360.smartadmin.module.log.userloginlog.domain.UserLoginLogDTO; -import com.gangquan360.smartadmin.module.log.userloginlog.domain.UserLoginLogEntity; -import com.gangquan360.smartadmin.module.log.userloginlog.domain.UserLoginLogQueryDTO; -import com.gangquan360.smartadmin.module.websocket.WebSocketServer; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartPaginationUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.system.employee.EmployeeService; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeQueryDTO; +import net.lab1024.smartadmin.module.system.employee.domain.vo.EmployeeVO; +import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogDTO; +import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogEntity; +import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogQueryDTO; +import net.lab1024.smartadmin.module.support.websocket.WebSocketServer; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartPageUtil; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -44,11 +44,11 @@ public class UserLoginLogService { * @date 2019-05-15 10:25:21 */ public ResponseDTO> queryByPage(UserLoginLogQueryDTO queryDTO) { - Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page page = SmartPageUtil.convert2QueryPage(queryDTO); List entities = userLoginLogDao.queryByPage(page, queryDTO); List dtoList = SmartBeanUtil.copyList(entities, UserLoginLogDTO.class); page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page); return ResponseDTO.succData(pageResultDTO); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/domain/UserLoginLogDTO.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/domain/UserLoginLogDTO.java index 9b0118d4..efeb14de 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/domain/UserLoginLogDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.log.userloginlog.domain; +package net.lab1024.smartadmin.module.business.log.userloginlog.domain; import lombok.Data; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/domain/UserLoginLogEntity.java similarity index 76% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/domain/UserLoginLogEntity.java index 5e04165d..b0d02ac9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/domain/UserLoginLogEntity.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.log.userloginlog.domain; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +package net.lab1024.smartadmin.module.business.log.userloginlog.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.*; @@ -19,7 +19,7 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @TableName("t_user_login_log") -public class UserLoginLogEntity extends BaseEntity{ +public class UserLoginLogEntity extends BaseEntity { /** * 员工id diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/domain/UserLoginLogQueryDTO.java similarity index 80% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/domain/UserLoginLogQueryDTO.java index 02cb5ad2..726797cc 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/userloginlog/domain/UserLoginLogQueryDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.log.userloginlog.domain; +package net.lab1024.smartadmin.module.business.log.userloginlog.domain; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageParamDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/UserOperateLogController.java similarity index 73% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/UserOperateLogController.java index a2f48f69..e1c2d775 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/UserOperateLogController.java @@ -1,11 +1,11 @@ -package com.gangquan360.smartadmin.module.log.useroperatelog; +package net.lab1024.smartadmin.module.business.log.useroperatelog; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.log.useroperatelog.domain.UserOperateLogDTO; -import com.gangquan360.smartadmin.module.log.useroperatelog.domain.UserOperateLogQueryDTO; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.business.log.useroperatelog.domain.UserOperateLogDTO; +import net.lab1024.smartadmin.module.business.log.useroperatelog.domain.UserOperateLogQueryDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/UserOperateLogDao.java similarity index 61% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/UserOperateLogDao.java index 9441a474..8959bbed 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/UserOperateLogDao.java @@ -1,9 +1,9 @@ -package com.gangquan360.smartadmin.module.log.useroperatelog; +package net.lab1024.smartadmin.module.business.log.useroperatelog; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.baomidou.mybatisplus.plugins.pagination.Pagination; -import com.gangquan360.smartadmin.module.log.useroperatelog.domain.UserOperateLogQueryDTO; -import com.gangquan360.smartadmin.module.log.useroperatelog.domain.UserOperateLogEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.module.business.log.useroperatelog.domain.UserOperateLogQueryDTO; +import net.lab1024.smartadmin.module.business.log.useroperatelog.domain.UserOperateLogEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @@ -29,7 +29,7 @@ public interface UserOperateLogDao extends BaseMapper { * @param queryDTO * @return UserOperateLogEntity */ - List queryByPage(Pagination page, @Param("queryDTO") UserOperateLogQueryDTO queryDTO); + List queryByPage(Page page, @Param("queryDTO") UserOperateLogQueryDTO queryDTO); /** * 根据id删除 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/UserOperateLogService.java similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/UserOperateLogService.java index 2e2b3bf8..772504ce 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/UserOperateLogService.java @@ -1,13 +1,13 @@ -package com.gangquan360.smartadmin.module.log.useroperatelog; +package net.lab1024.smartadmin.module.business.log.useroperatelog; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.log.useroperatelog.domain.UserOperateLogDTO; -import com.gangquan360.smartadmin.module.log.useroperatelog.domain.UserOperateLogEntity; -import com.gangquan360.smartadmin.module.log.useroperatelog.domain.UserOperateLogQueryDTO; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartPaginationUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.business.log.useroperatelog.domain.UserOperateLogDTO; +import net.lab1024.smartadmin.module.business.log.useroperatelog.domain.UserOperateLogEntity; +import net.lab1024.smartadmin.module.business.log.useroperatelog.domain.UserOperateLogQueryDTO; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartPageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,11 +36,11 @@ public class UserOperateLogService { * @date 2019-05-15 11:32:14 */ public ResponseDTO> queryByPage(UserOperateLogQueryDTO queryDTO) { - Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page page = SmartPageUtil.convert2QueryPage(queryDTO); List entities = userOperateLogDao.queryByPage(page, queryDTO); List dtoList = SmartBeanUtil.copyList(entities, UserOperateLogDTO.class); page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page); return ResponseDTO.succData(pageResultDTO); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/domain/UserOperateLogDTO.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/domain/UserOperateLogDTO.java index ac23994f..39fd2f99 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/domain/UserOperateLogDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.log.useroperatelog.domain; +package net.lab1024.smartadmin.module.business.log.useroperatelog.domain; import lombok.Data; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/domain/UserOperateLogEntity.java similarity index 80% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/domain/UserOperateLogEntity.java index e578dcae..467ce769 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/domain/UserOperateLogEntity.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.log.useroperatelog.domain; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +package net.lab1024.smartadmin.module.business.log.useroperatelog.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -21,7 +21,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @TableName("t_user_operate_log") -public class UserOperateLogEntity extends BaseEntity{ +public class UserOperateLogEntity extends BaseEntity { diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/domain/UserOperateLogQueryDTO.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/domain/UserOperateLogQueryDTO.java index 4995dc6a..cee24b7d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/useroperatelog/domain/UserOperateLogQueryDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.log.useroperatelog.domain; +package net.lab1024.smartadmin.module.business.log.useroperatelog.domain; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageParamDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/LoginController.java similarity index 74% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/LoginController.java index 95022466..ddbf0fb8 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/LoginController.java @@ -1,15 +1,15 @@ -package com.gangquan360.smartadmin.module.login; +package net.lab1024.smartadmin.module.business.login; -import com.gangquan360.smartadmin.common.anno.NoNeedLogin; -import com.gangquan360.smartadmin.common.anno.NoValidPrivilege; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeLoginFormDTO; -import com.gangquan360.smartadmin.module.login.domain.KaptchaVO; -import com.gangquan360.smartadmin.module.login.domain.LoginDetailVO; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; -import com.gangquan360.smartadmin.util.SmartRequestTokenUtil; +import net.lab1024.smartadmin.common.anno.NoNeedLogin; +import net.lab1024.smartadmin.common.anno.NoValidPrivilege; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeLoginFormDTO; +import net.lab1024.smartadmin.module.business.login.domain.KaptchaVO; +import net.lab1024.smartadmin.module.business.login.domain.LoginDetailVO; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.util.SmartRequestTokenUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/LoginResponseCodeConst.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/LoginResponseCodeConst.java index f12a3a3a..0bb69e96 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginResponseCodeConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/LoginResponseCodeConst.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.login; +package net.lab1024.smartadmin.module.business.login; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; /** * 员工常量类 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/LoginService.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/LoginService.java index 74b34575..9e346082 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/LoginService.java @@ -1,26 +1,26 @@ -package com.gangquan360.smartadmin.module.login; +package net.lab1024.smartadmin.module.business.login; -import com.gangquan360.smartadmin.common.constant.JudgeEnum; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.CommonConst; -import com.gangquan360.smartadmin.module.department.DepartmentDao; -import com.gangquan360.smartadmin.module.department.domain.entity.DepartmentEntity; -import com.gangquan360.smartadmin.module.employee.EmployeeDao; -import com.gangquan360.smartadmin.module.employee.constant.EmployeeResponseCodeConst; -import com.gangquan360.smartadmin.module.employee.constant.EmployeeStatusEnum; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeDTO; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeLoginFormDTO; -import com.gangquan360.smartadmin.module.log.LogService; -import com.gangquan360.smartadmin.module.log.userloginlog.domain.UserLoginLogEntity; -import com.gangquan360.smartadmin.module.login.domain.KaptchaVO; -import com.gangquan360.smartadmin.module.login.domain.LoginDetailVO; -import com.gangquan360.smartadmin.module.login.domain.LoginPrivilegeDTO; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; -import com.gangquan360.smartadmin.module.privilege.domain.entity.PrivilegeEntity; -import com.gangquan360.smartadmin.module.privilege.service.PrivilegeEmployeeService; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartDigestUtil; -import com.gangquan360.smartadmin.util.SmartIPUtil; +import net.lab1024.smartadmin.common.constant.JudgeEnum; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.CommonConst; +import net.lab1024.smartadmin.module.system.department.DepartmentDao; +import net.lab1024.smartadmin.module.system.department.domain.entity.DepartmentEntity; +import net.lab1024.smartadmin.module.system.employee.EmployeeDao; +import net.lab1024.smartadmin.module.system.employee.constant.EmployeeResponseCodeConst; +import net.lab1024.smartadmin.module.system.employee.constant.EmployeeStatusEnum; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeDTO; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeLoginFormDTO; +import net.lab1024.smartadmin.module.business.log.LogService; +import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogEntity; +import net.lab1024.smartadmin.module.business.login.domain.KaptchaVO; +import net.lab1024.smartadmin.module.business.login.domain.LoginDetailVO; +import net.lab1024.smartadmin.module.business.login.domain.LoginPrivilegeDTO; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.module.system.privilege.domain.entity.PrivilegeEntity; +import net.lab1024.smartadmin.module.system.privilege.service.PrivilegeEmployeeService; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartDigestUtil; +import net.lab1024.smartadmin.util.SmartIPUtil; import com.google.code.kaptcha.impl.DefaultKaptcha; import eu.bitwalker.useragentutils.UserAgent; import lombok.extern.slf4j.Slf4j; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginTokenService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/LoginTokenService.java similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginTokenService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/LoginTokenService.java index 80e3ef4a..961532e8 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginTokenService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/LoginTokenService.java @@ -1,11 +1,11 @@ -package com.gangquan360.smartadmin.module.login; +package net.lab1024.smartadmin.module.business.login; -import com.gangquan360.smartadmin.common.constant.JudgeEnum; -import com.gangquan360.smartadmin.module.employee.EmployeeService; -import com.gangquan360.smartadmin.module.employee.constant.EmployeeStatusEnum; -import com.gangquan360.smartadmin.module.employee.domain.bo.EmployeeBO; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeDTO; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.common.constant.JudgeEnum; +import net.lab1024.smartadmin.module.system.employee.EmployeeService; +import net.lab1024.smartadmin.module.system.employee.constant.EmployeeStatusEnum; +import net.lab1024.smartadmin.module.system.employee.domain.bo.EmployeeBO; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeDTO; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/KaptchaVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/KaptchaVO.java similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/KaptchaVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/KaptchaVO.java index ce730e6a..4c5a4f4e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/KaptchaVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/KaptchaVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.login.domain; +package net.lab1024.smartadmin.module.business.login.domain; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginCacheDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/LoginCacheDTO.java similarity index 74% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginCacheDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/LoginCacheDTO.java index 7dd6e9ed..c8f8835f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginCacheDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/LoginCacheDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.login.domain; +package net.lab1024.smartadmin.module.business.login.domain; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeDTO; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeDTO; import lombok.Data; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginDetailVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/LoginDetailVO.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginDetailVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/LoginDetailVO.java index 671fc951..5cd924b5 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginDetailVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/LoginDetailVO.java @@ -1,13 +1,11 @@ -package com.gangquan360.smartadmin.module.login.domain; +package net.lab1024.smartadmin.module.business.login.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; import java.util.List; -import java.util.Map; /** * 登录返回DTO diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginPrivilegeDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/LoginPrivilegeDTO.java similarity index 72% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginPrivilegeDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/LoginPrivilegeDTO.java index 1329964e..cdfb3988 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginPrivilegeDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/LoginPrivilegeDTO.java @@ -1,12 +1,10 @@ -package com.gangquan360.smartadmin.module.login.domain; +package net.lab1024.smartadmin.module.business.login.domain; -import com.gangquan360.smartadmin.common.anno.ApiModelPropertyEnum; -import com.gangquan360.smartadmin.module.privilege.constant.PrivilegeTypeEnum; +import net.lab1024.smartadmin.common.anno.ApiModelPropertyEnum; +import net.lab1024.smartadmin.module.system.privilege.constant.PrivilegeTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; - /** * [ ] * diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/RequestTokenBO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/RequestTokenBO.java similarity index 78% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/RequestTokenBO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/RequestTokenBO.java index e4019f6d..40bf1b2e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/RequestTokenBO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/login/domain/RequestTokenBO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.login.domain; +package net.lab1024.smartadmin.module.business.login.domain; -import com.gangquan360.smartadmin.module.employee.domain.bo.EmployeeBO; +import net.lab1024.smartadmin.module.system.employee.domain.bo.EmployeeBO; import lombok.Getter; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeController.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeController.java index 28681cc8..5d42d5d9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeController.java @@ -1,12 +1,12 @@ -package com.gangquan360.smartadmin.module.notice; +package net.lab1024.smartadmin.module.business.notice; -import com.gangquan360.smartadmin.common.anno.NoValidPrivilege; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.notice.domain.dto.*; -import com.gangquan360.smartadmin.util.SmartRequestTokenUtil; +import net.lab1024.smartadmin.common.anno.NoValidPrivilege; +import net.lab1024.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.business.notice.domain.dto.*; +import net.lab1024.smartadmin.util.SmartRequestTokenUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeManage.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java similarity index 81% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeManage.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java index fa26796c..4fe6b183 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeManage.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java @@ -1,12 +1,12 @@ -package com.gangquan360.smartadmin.module.notice; +package net.lab1024.smartadmin.module.business.notice; -import com.gangquan360.smartadmin.common.constant.JudgeEnum; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; -import com.gangquan360.smartadmin.module.notice.dao.NoticeDao; -import com.gangquan360.smartadmin.module.notice.dao.NoticeReceiveRecordDao; -import com.gangquan360.smartadmin.module.notice.domain.dto.NoticeUpdateDTO; -import com.gangquan360.smartadmin.module.notice.domain.entity.NoticeEntity; -import com.gangquan360.smartadmin.module.notice.domain.entity.NoticeReceiveRecordEntity; +import net.lab1024.smartadmin.common.constant.JudgeEnum; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.module.business.notice.dao.NoticeDao; +import net.lab1024.smartadmin.module.business.notice.dao.NoticeReceiveRecordDao; +import net.lab1024.smartadmin.module.business.notice.domain.dto.NoticeUpdateDTO; +import net.lab1024.smartadmin.module.business.notice.domain.entity.NoticeEntity; +import net.lab1024.smartadmin.module.business.notice.domain.entity.NoticeReceiveRecordEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java index 5ac6678d..4faf77b7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java @@ -1,20 +1,20 @@ -package com.gangquan360.smartadmin.module.notice; +package net.lab1024.smartadmin.module.business.notice; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.common.constant.JudgeEnum; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; -import com.gangquan360.smartadmin.module.notice.dao.NoticeDao; -import com.gangquan360.smartadmin.module.notice.dao.NoticeReceiveRecordDao; -import com.gangquan360.smartadmin.module.notice.domain.dto.*; -import com.gangquan360.smartadmin.module.notice.domain.entity.NoticeEntity; -import com.gangquan360.smartadmin.module.notice.domain.entity.NoticeReceiveRecordEntity; -import com.gangquan360.smartadmin.module.websocket.WebSocketServer; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartPaginationUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.constant.JudgeEnum; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.module.business.notice.dao.NoticeDao; +import net.lab1024.smartadmin.module.business.notice.dao.NoticeReceiveRecordDao; +import net.lab1024.smartadmin.module.business.notice.domain.dto.*; +import net.lab1024.smartadmin.module.business.notice.domain.entity.NoticeEntity; +import net.lab1024.smartadmin.module.business.notice.domain.entity.NoticeReceiveRecordEntity; +import net.lab1024.smartadmin.module.support.websocket.WebSocketServer; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartPageUtil; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,10 +55,10 @@ public class NoticeService { */ public ResponseDTO> queryByPage(NoticeQueryDTO queryDTO) { queryDTO.setDeleted(JudgeEnum.NO.getValue()); - Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page page = SmartPageUtil.convert2QueryPage(queryDTO); List dtoList = noticeDao.queryByPage(page, queryDTO); page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page); return ResponseDTO.succData(pageResultDTO); } @@ -72,7 +72,7 @@ public class NoticeService { public ResponseDTO> queryReceiveByPage(NoticeReceiveQueryDTO queryDTO, RequestTokenBO requestToken) { queryDTO.setEmployeeId(requestToken.getRequestUserId()); queryDTO.setSendStatus(JudgeEnum.YES.getValue()); - Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page page = SmartPageUtil.convert2QueryPage(queryDTO); List dtoList = noticeDao.queryReceiveByPage(page, queryDTO); dtoList.forEach(e -> { if (e.getReceiveTime() == null) { @@ -82,7 +82,7 @@ public class NoticeService { } }); page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page); return ResponseDTO.succData(pageResultDTO); } @@ -94,10 +94,10 @@ public class NoticeService { * @return */ public ResponseDTO> queryUnreadByPage(PageParamDTO queryDTO, RequestTokenBO requestToken) { - Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page page = SmartPageUtil.convert2QueryPage(queryDTO); List dtoList = noticeDao.queryUnreadByPage(page, requestToken.getRequestUserId(), JudgeEnum.YES.getValue()); page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page); return ResponseDTO.succData(pageResultDTO); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/dao/NoticeDao.java similarity index 72% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/dao/NoticeDao.java index 7c3235e9..bb8cca72 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/dao/NoticeDao.java @@ -1,9 +1,9 @@ -package com.gangquan360.smartadmin.module.notice.dao; +package net.lab1024.smartadmin.module.business.notice.dao; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.baomidou.mybatisplus.plugins.pagination.Pagination; -import com.gangquan360.smartadmin.module.notice.domain.dto.*; -import com.gangquan360.smartadmin.module.notice.domain.entity.NoticeEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.module.business.notice.domain.dto.*; +import net.lab1024.smartadmin.module.business.notice.domain.entity.NoticeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @@ -29,7 +29,7 @@ public interface NoticeDao extends BaseMapper { * @param queryDTO * @return NoticeEntity */ - List queryByPage(Pagination page, @Param("queryDTO") NoticeQueryDTO queryDTO); + List queryByPage(Page page, @Param("queryDTO") NoticeQueryDTO queryDTO); /** @@ -38,7 +38,7 @@ public interface NoticeDao extends BaseMapper { * @param employeeId * @return */ - List queryUnreadByPage(Pagination page, @Param("employeeId") Long employeeId, @Param("sendStatus") Integer sendStatus); + List queryUnreadByPage(Page page, @Param("employeeId") Long employeeId, @Param("sendStatus") Integer sendStatus); /** @@ -47,7 +47,7 @@ public interface NoticeDao extends BaseMapper { * @param queryDTO * @return */ - List queryReceiveByPage(Pagination page, @Param("queryDTO") NoticeReceiveQueryDTO queryDTO); + List queryReceiveByPage(Page page, @Param("queryDTO") NoticeReceiveQueryDTO queryDTO); /** * 详情 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeReceiveRecordDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/dao/NoticeReceiveRecordDao.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeReceiveRecordDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/dao/NoticeReceiveRecordDao.java index f91bc31f..682e0d74 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeReceiveRecordDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/dao/NoticeReceiveRecordDao.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.notice.dao; +package net.lab1024.smartadmin.module.business.notice.dao; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.gangquan360.smartadmin.module.notice.domain.entity.NoticeReceiveRecordEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.lab1024.smartadmin.module.business.notice.domain.entity.NoticeReceiveRecordEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeAddDTO.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeAddDTO.java index 29dc1d1b..572817d1 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeAddDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeAddDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.notice.domain.dto; +package net.lab1024.smartadmin.module.business.notice.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeDetailVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeDetailVO.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeDetailVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeDetailVO.java index 1083cfc4..097317cd 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeDetailVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeDetailVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.notice.domain.dto; +package net.lab1024.smartadmin.module.business.notice.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeQueryDTO.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeQueryDTO.java index d20ccedd..b68feb4f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeQueryDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.notice.domain.dto; +package net.lab1024.smartadmin.module.business.notice.domain.dto; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageParamDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReadCountDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeReadCountDTO.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReadCountDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeReadCountDTO.java index e6245d00..7821cf76 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReadCountDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeReadCountDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.notice.domain.dto; +package net.lab1024.smartadmin.module.business.notice.domain.dto; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeReceiveDTO.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeReceiveDTO.java index 055af2b6..aa4aa7ad 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeReceiveDTO.java @@ -1,8 +1,8 @@ -package com.gangquan360.smartadmin.module.notice.domain.dto; +package net.lab1024.smartadmin.module.business.notice.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.gangquan360.smartadmin.common.anno.ApiModelPropertyEnum; -import com.gangquan360.smartadmin.common.constant.JudgeEnum; +import net.lab1024.smartadmin.common.anno.ApiModelPropertyEnum; +import net.lab1024.smartadmin.common.constant.JudgeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeReceiveQueryDTO.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeReceiveQueryDTO.java index 2f93b651..63bbc87b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeReceiveQueryDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.notice.domain.dto; +package net.lab1024.smartadmin.module.business.notice.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeUpdateDTO.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeUpdateDTO.java index 48ec9056..d62c00ca 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeUpdateDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeUpdateDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.notice.domain.dto; +package net.lab1024.smartadmin.module.business.notice.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeVO.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeVO.java index de5ab85c..04fc5fbb 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/dto/NoticeVO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.notice.domain.dto; -import com.gangquan360.smartadmin.common.anno.ApiModelPropertyEnum; -import com.gangquan360.smartadmin.common.constant.JudgeEnum; +package net.lab1024.smartadmin.module.business.notice.domain.dto; +import net.lab1024.smartadmin.common.anno.ApiModelPropertyEnum; +import net.lab1024.smartadmin.common.constant.JudgeEnum; import lombok.Data; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/entity/NoticeEntity.java similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/entity/NoticeEntity.java index 782e8ae6..4caeca22 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/entity/NoticeEntity.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.notice.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +package net.lab1024.smartadmin.module.business.notice.domain.entity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeReceiveRecordEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/entity/NoticeReceiveRecordEntity.java similarity index 61% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeReceiveRecordEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/entity/NoticeReceiveRecordEntity.java index 6af997ea..74f5f3e7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeReceiveRecordEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/domain/entity/NoticeReceiveRecordEntity.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.notice.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +package net.lab1024.smartadmin.module.business.notice.domain.entity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; /** @@ -15,7 +15,7 @@ import lombok.Data; */ @Data @TableName("t_notice_receive_record") -public class NoticeReceiveRecordEntity extends BaseEntity{ +public class NoticeReceiveRecordEntity extends BaseEntity { /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/controller/PeonyController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/controller/PeonyController.java new file mode 100644 index 00000000..08b12c62 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/controller/PeonyController.java @@ -0,0 +1,88 @@ +package net.lab1024.smartadmin.module.business.peony.controller; + +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.controller.BaseController; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.common.domain.ValidateList; +import net.lab1024.smartadmin.module.business.peony.domain.dto.PeonyAddDTO; +import net.lab1024.smartadmin.module.business.peony.domain.dto.PeonyUpdateDTO; +import net.lab1024.smartadmin.module.business.peony.domain.dto.PeonyQueryDTO; +import net.lab1024.smartadmin.module.business.peony.domain.vo.PeonyVO; +import net.lab1024.smartadmin.module.business.peony.domain.vo.PeonyExcelVO; +import net.lab1024.smartadmin.module.business.peony.service.PeonyService; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import org.apache.poi.ss.usermodel.Workbook; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * [ 牡丹花 ] + * + * @author 卓大 + * @version 1.0 + * @company 1024创新实验室( www.1024lab.net ) + * @copyright (c) 1024创新实验室( www.1024lab.net )Inc. All rights reserved. + * @date 2020-04-06 18:17:56 + * @since JDK1.8 + */ +@RestController +@Api(tags = {"牡丹花"}) +public class PeonyController extends BaseController { + + @Autowired + private PeonyService peonyService; + + @ApiOperation(value = "分页查询牡丹花",notes = "@author 卓大") + @PostMapping("/peony/page/query") + public ResponseDTO> queryByPage(@RequestBody PeonyQueryDTO queryDTO) { + return peonyService.queryByPage(queryDTO); + } + + @ApiOperation(value = "添加牡丹花",notes = "@author 卓大") + @PostMapping("/peony/add") + public ResponseDTO add(@RequestBody @Validated PeonyAddDTO addTO){ + return peonyService.add(addTO); + } + + @ApiOperation(value="修改牡丹花",notes = "@author 卓大") + @PostMapping("/peony/update") + public ResponseDTO update(@RequestBody @Validated PeonyUpdateDTO updateDTO){ + return peonyService.update(updateDTO); + } + + @ApiOperation(value="批量删除牡丹花",notes = "@author 卓大") + @PostMapping("/peony/deleteByIds") + public ResponseDTO delete(@RequestBody @Validated ValidateList idList) { + return peonyService.deleteByIds(idList); + } + + @ApiOperation(value = "批量导出", notes = "@author 卓大") + @PostMapping("/peony/export/batch") + public void batchExport(@RequestBody @Validated ValidateList idList, HttpServletResponse response) { + //查询数据 + List peonyList = peonyService.queryBatchExportData(idList); + //导出操作 + ExportParams ex = new ExportParams("牡丹花", "Sheet1"); + Workbook workbook = ExcelExportUtil.exportExcel(ex, PeonyExcelVO.class, peonyList); + downloadExcel("牡丹花", workbook, response); + } + + @ApiOperation(value = "导出全部", notes = "@author 卓大") + @PostMapping("/peony/export/all") + public void exportAll(@RequestBody @Validated PeonyQueryDTO queryDTO, HttpServletResponse response) { + //查询数据 + List peonyList = peonyService.queryAllExportData(queryDTO); + //导出操作 + ExportParams ex = new ExportParams("牡丹花", "Sheet1"); + Workbook workbook = ExcelExportUtil.exportExcel(ex, PeonyExcelVO.class, peonyList); + downloadExcel("牡丹花", workbook, response); + } + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/dao/PeonyDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/dao/PeonyDao.java new file mode 100644 index 00000000..bc131bb3 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/dao/PeonyDao.java @@ -0,0 +1,64 @@ +package net.lab1024.smartadmin.module.business.peony.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import net.lab1024.smartadmin.module.business.peony.domain.dto.PeonyQueryDTO; +import net.lab1024.smartadmin.module.business.peony.domain.entity.PeonyEntity; +import net.lab1024.smartadmin.module.business.peony.domain.vo.PeonyVO; +import net.lab1024.smartadmin.module.business.peony.domain.vo.PeonyExcelVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * [ 牡丹花 ] + * + * @author 卓大 + * @version 1.0 + * @company 1024创新实验室( www.1024lab.net ) + * @copyright (c) 1024创新实验室( www.1024lab.net )Inc. All rights reserved. + * @date 2020-04-06 18:17:56 + * @since JDK1.8 + */ +@Mapper +@Component +public interface PeonyDao extends BaseMapper { + + /** + * 分页查询 + * @param queryDTO + * @return PeonyVO + */ + IPage queryByPage(Page page, @Param("queryDTO") PeonyQueryDTO queryDTO); + + /** + * 根据id删除 + * @param id + * @return + */ + void deleteById(@Param("id") Long id); + + /** + * 根据id批量删除 + * @param idList + * @return + */ + void deleteByIdList(@Param("idList") List idList); + + /** + * 查询所有导出数据 + * @param queryDTO + * @return + */ + List queryAllExportData(@Param("queryDTO") PeonyQueryDTO queryDTO); + + /** + * 查询批量导出数据 + * @param idList + * @return + */ + List queryBatchExportData(@Param("idList") List idList); +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/dto/PeonyAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/dto/PeonyAddDTO.java new file mode 100644 index 00000000..976a2593 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/dto/PeonyAddDTO.java @@ -0,0 +1,41 @@ +package net.lab1024.smartadmin.module.business.peony.domain.dto; + +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; + +/** + * 新建 [ 牡丹花 ] + * + * @author 卓大 + * @version 1.0 + * @company 1024创新实验室( www.1024lab.net ) + * @copyright (c) 2018 1024创新实验室( www.1024lab.net )Inc. All rights reserved. + * @date 2020-04-06 18:17:56 + * @since JDK1.8 + */ +@Data +public class PeonyAddDTO { + @ApiModelProperty("品种") + private String kind; + + @ApiModelProperty("名字") + private String name; + + @ApiModelProperty("颜色") + private String color; + + @ApiModelProperty("图片链接") + private String imageUrl; + + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty("更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateTime; + + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/dto/PeonyQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/dto/PeonyQueryDTO.java new file mode 100644 index 00000000..9841f01d --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/dto/PeonyQueryDTO.java @@ -0,0 +1,44 @@ +package net.lab1024.smartadmin.module.business.peony.domain.dto; + +import net.lab1024.smartadmin.common.domain.PageParamDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.util.Date; + +/** + * [ 牡丹花 ] + * + * @author 卓大 + * @version 1.0 + * @company 1024创新实验室( www.1024lab.net ) + * @copyright (c) 1024创新实验室( www.1024lab.net )Inc. All rights reserved. + * @date 2020-04-06 18:17:56 + * @since JDK1.8 + */ +@Data +public class PeonyQueryDTO extends PageParamDTO { + + @ApiModelProperty("ID") + private Long id; + + @ApiModelProperty("品种") + private String kind; + + @ApiModelProperty("名字") + private String name; + + @ApiModelProperty("颜色") + private String color; + + @ApiModelProperty("创建时间-开始") + private Date createTimeBegin; + + @ApiModelProperty("创建时间-截止") + private Date createTimeEnd; + + @ApiModelProperty("上次更新时间-开始") + private Date updateTimeBegin; + + @ApiModelProperty("上次更新创建时间-开始") + private Date updateTimeEnd; +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/dto/PeonyUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/dto/PeonyUpdateDTO.java new file mode 100644 index 00000000..7d7ca820 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/dto/PeonyUpdateDTO.java @@ -0,0 +1,20 @@ +package net.lab1024.smartadmin.module.business.peony.domain.dto; + +import lombok.Data; + +/** + * 更新 [ 牡丹花 ] + * + * @author 卓大 + * @version 1.0 + * @company 1024创新实验室( www.1024lab.net ) + * @copyright (c) 2018 1024创新实验室( www.1024lab.net )Inc. All rights reserved. + * @date 2020-04-06 18:17:56 + * @since JDK1.8 + */ +@Data +public class PeonyUpdateDTO extends PeonyAddDTO { + + private Long id; + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/entity/PeonyEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/entity/PeonyEntity.java new file mode 100644 index 00000000..48eb9d56 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/entity/PeonyEntity.java @@ -0,0 +1,44 @@ +package net.lab1024.smartadmin.module.business.peony.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; +import lombok.Data; + +/** + * [ 牡丹花 ] + * + * @author 卓大 + * @version 1.0 + * @company 1024创新实验室( www.1024lab.net ) + * @copyright (c) 1024创新实验室( www.1024lab.net )Inc. All rights reserved. + * @date 2020-04-06 18:17:56 + * @since JDK1.8 + */ +@Data +@TableName("t_peony") +public class PeonyEntity extends BaseEntity{ + + + /** + * 品种 + */ + private String kind; + + /** + * 名字 + */ + private String name; + + /** + * 颜色 + */ + private String color; + + /** + * 图片链接 + */ + private String imageUrl; + + + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/vo/PeonyExcelVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/vo/PeonyExcelVO.java new file mode 100644 index 00000000..8964433f --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/vo/PeonyExcelVO.java @@ -0,0 +1,42 @@ +package net.lab1024.smartadmin.module.business.peony.domain.vo; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; +import java.util.Date; + +/** + * [ 牡丹花 ] + * + * @author 卓大 + * @version 1.0 + * @company 1024创新实验室( www.1024lab.net ) + * @copyright (c) 1024创新实验室( www.1024lab.net )Inc. All rights reserved. + * @date 2020-04-06 18:17:56 + * @since JDK1.8 + */ +@Data +public class PeonyExcelVO { + @Excel(name = "ID") + private Long id; + + @Excel(name = "品种") + private String kind; + + @Excel(name = "名字") + private String name; + + @Excel(name = "颜色") + private String color; + + @Excel(name = "图片链接") + private String imageUrl; + + @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @Excel(name = "更新时间", format = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/vo/PeonyVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/vo/PeonyVO.java new file mode 100644 index 00000000..06590916 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/domain/vo/PeonyVO.java @@ -0,0 +1,45 @@ +package net.lab1024.smartadmin.module.business.peony.domain.vo; + +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; + +/** + * [ 牡丹花 ] + * + * @author 卓大 + * @version 1.0 + * @company 1024创新实验室( www.1024lab.net ) + * @copyright (c) 1024创新实验室( www.1024lab.net )Inc. All rights reserved. + * @date 2020-04-06 18:17:56 + * @since JDK1.8 + */ +@Data +public class PeonyVO { + @ApiModelProperty("ID") + private Long id; + + @ApiModelProperty("品种") + private String kind; + + @ApiModelProperty("名字") + private String name; + + @ApiModelProperty("颜色") + private String color; + + @ApiModelProperty("图片链接") + private String imageUrl; + + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty("更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateTime; + + + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/service/PeonyService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/service/PeonyService.java new file mode 100644 index 00000000..50bfbb44 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/peony/service/PeonyService.java @@ -0,0 +1,108 @@ +package net.lab1024.smartadmin.module.business.peony.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.business.peony.dao.PeonyDao; +import net.lab1024.smartadmin.module.business.peony.domain.dto.PeonyAddDTO; +import net.lab1024.smartadmin.module.business.peony.domain.dto.PeonyUpdateDTO; +import net.lab1024.smartadmin.module.business.peony.domain.dto.PeonyQueryDTO; +import net.lab1024.smartadmin.module.business.peony.domain.entity.PeonyEntity; +import net.lab1024.smartadmin.module.business.peony.domain.vo.PeonyVO; +import net.lab1024.smartadmin.module.business.peony.domain.vo.PeonyExcelVO; +import net.lab1024.smartadmin.util.SmartPageUtil; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * [ 牡丹花 ] + * + * @author 卓大 + * @version 1.0 + * @company 1024创新实验室( www.1024lab.net ) + * @copyright (c) 1024创新实验室( www.1024lab.net )Inc. All rights reserved. + * @date 2020-04-06 18:17:56 + * @since JDK1.8 + */ +@Service +public class PeonyService { + + @Autowired + private PeonyDao peonyDao; + + /** + * 根据id查询 + */ + public PeonyEntity getById(Long id){ + return peonyDao.selectById(id); + } + + /** + * 分页查询 + * @author 卓大 + * @date 2020-04-06 18:17:56 + */ + public ResponseDTO> queryByPage(PeonyQueryDTO queryDTO) { + Page page = SmartPageUtil.convert2QueryPage(queryDTO); + IPage voList = peonyDao.queryByPage(page, queryDTO); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(voList); + return ResponseDTO.succData(pageResultDTO); + } + + /** + * 添加 + * @author 卓大 + * @date 2020-04-06 18:17:56 + */ + public ResponseDTO add(PeonyAddDTO addDTO) { + PeonyEntity entity = SmartBeanUtil.copy(addDTO, PeonyEntity.class); + peonyDao.insert(entity); + return ResponseDTO.succ(); + } + + /** + * 编辑 + * @author 卓大 + * @date 2020-04-06 18:17:56 + */ + @Transactional(rollbackFor = Exception.class) + public ResponseDTO update(PeonyUpdateDTO updateDTO) { + PeonyEntity entity = SmartBeanUtil.copy(updateDTO, PeonyEntity.class); + peonyDao.updateById(entity); + return ResponseDTO.succ(); + } + + /** + * 删除 + * @author 卓大 + * @date 2020-04-06 18:17:56 + */ + @Transactional(rollbackFor = Exception.class) + public ResponseDTO deleteByIds(List idList) { + peonyDao.deleteByIdList(idList); + return ResponseDTO.succ(); + } + + /** + * 查询全部导出对象 + * @author 卓大 + * @date 2020-04-06 18:17:56 + */ + public List queryAllExportData(PeonyQueryDTO queryDTO) { + return peonyDao.queryAllExportData( queryDTO); + } + + /** + * 批量查询导出对象 + * @author 卓大 + * @date 2020-04-06 18:17:56 + */ + public List queryBatchExportData(List idList) { + return peonyDao.queryBatchExportData(idList); + } +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/constant/SqlOperateTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/constant/SqlOperateTypeEnum.java similarity index 74% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/constant/SqlOperateTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/constant/SqlOperateTypeEnum.java index 49186aff..943e1c36 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/constant/SqlOperateTypeEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/constant/SqlOperateTypeEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.codegenerator.constant; +package net.lab1024.smartadmin.module.support.codegenerator.constant; /** @@ -13,9 +13,7 @@ public enum SqlOperateTypeEnum{ LIKE(1, "like"), EQUALS(2, "equals"), - IN(3, "in"), - TIME_EQUALS(5, "time_equals"), - TIME_BETWEEN(6, "time_between"); + IN(3, "in"); private Integer type; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/dao/TableDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/dao/TableDao.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/dao/TableDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/dao/TableDao.java index e772b0f3..f8d005ab 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/dao/TableDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/dao/TableDao.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.codegenerator.dao; +package net.lab1024.smartadmin.module.support.codegenerator.dao; -import com.gangquan360.smartadmin.module.codegenerator.domain.ColumnVO; +import net.lab1024.smartadmin.module.support.codegenerator.domain.ColumnVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/domain/CodeGeneratorDTO.java similarity index 84% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/domain/CodeGeneratorDTO.java index adff6c5f..4995aa57 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/domain/CodeGeneratorDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.codegenerator.domain; +package net.lab1024.smartadmin.module.support.codegenerator.domain; import lombok.Builder; import lombok.Data; @@ -34,6 +34,11 @@ public class CodeGeneratorDTO { */ private String basePackage; + /** + * module下的子包 + */ + private String modulePackage; + /** * 公司 */ diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorQueryColumnDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/domain/CodeGeneratorQueryColumnDTO.java similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorQueryColumnDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/domain/CodeGeneratorQueryColumnDTO.java index d945c652..9e1bd054 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorQueryColumnDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/domain/CodeGeneratorQueryColumnDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.codegenerator.domain; +package net.lab1024.smartadmin.module.support.codegenerator.domain; -import com.gangquan360.smartadmin.module.codegenerator.constant.SqlOperateTypeEnum; +import net.lab1024.smartadmin.module.support.codegenerator.constant.SqlOperateTypeEnum; import lombok.Builder; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/ColumnVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/domain/ColumnVO.java similarity index 84% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/ColumnVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/domain/ColumnVO.java index 84e5d580..9bec4d9f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/ColumnVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/domain/ColumnVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.codegenerator.domain; +package net.lab1024.smartadmin.module.support.codegenerator.domain; import lombok.AllArgsConstructor; import lombok.Builder; @@ -31,4 +31,6 @@ public class ColumnVO { private String fieldName; + private Boolean isNumber; + } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/QueryFieldVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/domain/QueryFieldVO.java similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/QueryFieldVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/domain/QueryFieldVO.java index fc5c1036..c2afcc53 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/QueryFieldVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/domain/QueryFieldVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.codegenerator.domain; +package net.lab1024.smartadmin.module.support.codegenerator.domain; import lombok.Builder; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/service/CodeGeneratorComponent.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/service/CodeGeneratorComponent.java new file mode 100644 index 00000000..37ee4e87 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/service/CodeGeneratorComponent.java @@ -0,0 +1,92 @@ +package net.lab1024.smartadmin.module.support.codegenerator.service; + +import com.google.common.base.CaseFormat; +import org.springframework.stereotype.Component; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +/** + * [ ] + * + * @author yandanyang + * @version 1.0 + * @company 1024lab.net + * @copyright (c) 2018 1024lab.netInc. All rights reserved. + * @date 2019/5/11 0011 上午 8:33 + * @since JDK1.8 + */ +@Component +public class CodeGeneratorComponent { + + private static Map dataMap = new HashMap<>(16); + private static Map numberTypeMap = new HashMap<>(16); + + static { + dataMap(); + } + + public static void dataMap() { + numberTypeMap.put("int", "Integer"); + numberTypeMap.put("tinyint", "Integer"); + numberTypeMap.put("smallint", "Integer"); + numberTypeMap.put("integer", "Integer"); + numberTypeMap.put("bigint", "Long"); + numberTypeMap.put("float", "Float"); + numberTypeMap.put("double", "Double"); + numberTypeMap.put("decimal", "BigDecimal"); + + dataMap.put("char", "String"); + dataMap.put("varchar", "String"); + dataMap.put("tinytext", "String"); + dataMap.put("text", "String"); + dataMap.put("longtext", "String"); + + dataMap.put("date", "Date"); + dataMap.put("datetime", "Date"); + dataMap.put("timestamp", "Date"); + + } + + + public Map codeTemplates(String moduleClass, String basePackage, String modulePackage) { + String modulePath = modulePackage.replaceAll("\\.", "/"); + String javaPackagePath = "java/" + modulePath + File.separator; + String xmlPackagePath = "mapper/" + modulePath + File.separator; + String frontPackagePath = "web" + File.separator; + Map templateMap = new HashMap<>(); + //后端 + templateMap.put("templates/codegenerator/java/Controller.java.vm", javaPackagePath + "controller" + File.separator + moduleClass + "Controller.java"); + templateMap.put("templates/codegenerator/java/Dao.java.vm", javaPackagePath + "dao" + File.separator + moduleClass + "Dao.java"); + templateMap.put("templates/codegenerator/java/Dao.xml.vm", xmlPackagePath + moduleClass + "Mapper.xml"); + templateMap.put("templates/codegenerator/java/AddDTO.java.vm", javaPackagePath + "domain" + File.separator + "dto" + File.separator + moduleClass + "AddDTO.java"); + templateMap.put("templates/codegenerator/java/UpdateDTO.java.vm", javaPackagePath + "domain" + File.separator + "dto" + File.separator + moduleClass + "UpdateDTO.java"); + templateMap.put("templates/codegenerator/java/Entity.java.vm", javaPackagePath + "domain" + File.separator + "entity" + File.separator + moduleClass + "Entity.java"); + templateMap.put("templates/codegenerator/java/VO.java.vm", javaPackagePath + "domain" + File.separator + "vo" + File.separator + moduleClass + "VO.java"); + templateMap.put("templates/codegenerator/java/ExcelVO.java.vm", javaPackagePath + "domain" + File.separator + "vo" + File.separator + moduleClass + "ExcelVO.java"); + templateMap.put("templates/codegenerator/java/QueryDTO.java.vm", javaPackagePath + "domain" + File.separator + "dto" + File.separator + moduleClass + "QueryDTO.java"); + templateMap.put("templates/codegenerator/java/Service.java.vm", javaPackagePath + "service" + File.separator + moduleClass + "Service.java"); + //前端 + String webPackageName = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, moduleClass).replaceAll("_", "-"); + templateMap.put("templates/codegenerator/web/Api.js.vm", frontPackagePath + "api" + File.separator + webPackageName + ".js"); + templateMap.put("templates/codegenerator/web/Router.js.vm", frontPackagePath + "router" + File.separator + webPackageName + ".js"); + templateMap.put("templates/codegenerator/web/List.vue.vm", frontPackagePath + webPackageName + File.separator + webPackageName + "-list.vue"); + templateMap.put("templates/codegenerator/web/ListForm.vue.vm", frontPackagePath + webPackageName + File.separator + "components" + File.separator + webPackageName + "-list-form.vue"); + return templateMap; + } + + public String getJavaType(String mysqlType) { + String javaType = dataMap.get(mysqlType); + if (javaType == null) { + javaType = numberTypeMap.get(mysqlType); + } + return javaType; + } + + public boolean isNumber(String mysqlType) { + return numberTypeMap.containsKey(mysqlType); + } + + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/service/CodeGeneratorService.java similarity index 79% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/service/CodeGeneratorService.java index b1158d19..b2b6585d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/codegenerator/service/CodeGeneratorService.java @@ -1,13 +1,15 @@ -package com.gangquan360.smartadmin.module.codegenerator.service; +package net.lab1024.smartadmin.module.support.codegenerator.service; -import com.gangquan360.smartadmin.module.codegenerator.dao.TableDao; -import com.gangquan360.smartadmin.module.codegenerator.domain.CodeGeneratorDTO; -import com.gangquan360.smartadmin.module.codegenerator.domain.CodeGeneratorQueryColumnDTO; -import com.gangquan360.smartadmin.module.codegenerator.domain.ColumnVO; -import com.gangquan360.smartadmin.module.codegenerator.domain.QueryFieldVO; -import com.gangquan360.smartadmin.util.SmartDateUtil; +import com.google.common.base.CaseFormat; +import net.lab1024.smartadmin.module.support.codegenerator.dao.TableDao; +import net.lab1024.smartadmin.module.support.codegenerator.domain.CodeGeneratorDTO; +import net.lab1024.smartadmin.module.support.codegenerator.domain.CodeGeneratorQueryColumnDTO; +import net.lab1024.smartadmin.module.support.codegenerator.domain.ColumnVO; +import net.lab1024.smartadmin.module.support.codegenerator.domain.QueryFieldVO; +import net.lab1024.smartadmin.util.SmartDateUtil; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; +import net.lab1024.smartadmin.util.SmartStringUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.WordUtils; import org.apache.commons.lang3.StringUtils; @@ -18,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ResourceUtils; +import javax.swing.filechooser.FileSystemView; import java.io.File; import java.io.FileWriter; import java.util.*; @@ -57,11 +60,11 @@ public class CodeGeneratorService { String author = codeGenerator.getAuthor(); String basePackage = codeGenerator.getBasePackage(); if (StringUtils.isEmpty(basePackage)) { - basePackage = "com.gangquan360.smartadmin"; + basePackage = "net.lab1024.smartadmin"; } String moduleClass = this.tableName2Class(codeGenerator.getTableName(), codeGenerator.getTablePrefix()); String moduleVar = this.tableName2Var(codeGenerator.getTableName(), codeGenerator.getTablePrefix()); - String modulePackage = this.tableName2Package(codeGenerator.getTableName(), codeGenerator.getTablePrefix()); + String modulePackage = codeGenerator.getModulePackage(); List columnList = this.columnList(codeGenerator.getTableName()); List queryFieldList = this.buildQueryField(codeGenerator, columnList); @@ -89,6 +92,11 @@ public class CodeGeneratorService { map.put("queryImports", queryImports); map.put("dtoImports", dtoImports); map.put("entityImports", entityImports); + map.put("webModuleName", CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, moduleClass).replaceAll("_", "-")); + map.put("upperCamel", CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, moduleClass)); + //前端的变量 + map.put("ViewUIMessage", "$Message"); + map.put("VueRefs", "$refs"); VelocityContext context = new VelocityContext(map); this.codeGenerator(context, codeTemplates); } @@ -120,7 +128,7 @@ public class CodeGeneratorService { List entityImports = Lists.newArrayList(); if (CollectionUtils.isNotEmpty(columnList)) { columnList.forEach(e -> { - if (! e.getFieldName().equals("createTime") && ! e.getFieldName().equals("updateTime") && ! e.getFieldName().equals("id")) { + if (!e.getFieldName().equals("createTime") && !e.getFieldName().equals("updateTime") && !e.getFieldName().equals("id")) { importPackage(entityImports, e.getFieldType()); } }); @@ -129,14 +137,19 @@ public class CodeGeneratorService { } private void importPackage(List imports, String fieldType) { - if ("Date".equals(fieldType) && ! imports.contains("import java.util.Date;")) { + if ("Date".equals(fieldType) && !imports.contains("import java.util.Date;")) { imports.add("import java.util.Date;"); } - if ("BigDecimal".equals(fieldType) && ! imports.contains("import java.math.BigDecimal;")) { + if ("BigDecimal".equals(fieldType) && !imports.contains("import java.math.BigDecimal;")) { imports.add("import java.math.BigDecimal;"); } } + private String getOutputDir() { + File desktopDir = FileSystemView.getFileSystemView().getHomeDirectory(); + return desktopDir.getAbsolutePath() + File.separator + "smart-admin" + File.separator; + } + /** * 生成代码 * @@ -144,18 +157,18 @@ public class CodeGeneratorService { * @param codeTemplates */ private void codeGenerator(VelocityContext context, Map codeTemplates) throws Exception { - String projectPath = ResourceUtils.getURL("classpath:").getPath(); - String targetDir = "target"; - int targetIndex = StringUtils.indexOf(projectPath, targetDir); - projectPath = projectPath.substring(0, targetIndex + targetDir.length() + 1); - projectPath = projectPath.replace("target/", "").replaceFirst("/", ""); + String projectPath = getOutputDir(); + + Velocity.setProperty("input.encoding", "UTF-8"); + Velocity.setProperty("output.encoding", "UTF-8"); + for (Entry entry : codeTemplates.entrySet()) { String template = entry.getKey(); String filePath = projectPath + entry.getValue(); String fileName = filePath.substring(filePath.lastIndexOf(File.separator) + 1); String fileDir = filePath.replace(fileName, ""); File directory = new File(fileDir); - if (! directory.exists()) { + if (!directory.exists()) { directory.mkdirs(); } FileWriter writer; @@ -169,6 +182,11 @@ public class CodeGeneratorService { log.error("", e); } } + + log.info("------------------------------ 代 码 生 成 完 毕 ！ ------------------------------"); + log.info("代码目录：{}", projectPath); + log.info("------------------------------ 代 码 生 成 完 毕 ！ ------------------------------"); + } public static void main(String[] args) { @@ -201,7 +219,7 @@ public class CodeGeneratorService { */ private List buildQueryField(CodeGeneratorDTO codeGenerator, List columnList) throws Exception { List queryFieldList = Lists.newArrayList(); - Map storageMap = columnList.stream().collect(Collectors.toMap(ColumnVO:: getColumnName, e -> e)); + Map storageMap = columnList.stream().collect(Collectors.toMap(ColumnVO::getColumnName, e -> e)); List queryColumnList = codeGenerator.getQueryColumnList(); if (CollectionUtils.isEmpty(queryColumnList)) { return queryFieldList; @@ -214,7 +232,7 @@ public class CodeGeneratorService { throw new Exception(errorMsg); } QueryFieldVO queryField = - QueryFieldVO.builder().fieldName(columnDTO.getFieldName()).fieldType(columnDTO.getFieldType()).columnName(columnDTO.getColumnName()).columnDesc(columnDTO.getColumnDesc()).sqlOperate(queryColumn.getSqlOperate().getName()).build(); + QueryFieldVO.builder().fieldName(columnDTO.getFieldName()).fieldType(columnDTO.getFieldType()).columnName(columnDTO.getColumnName()).columnDesc(columnDTO.getColumnDesc()).sqlOperate(queryColumn.getSqlOperate().getName()).build(); queryFieldList.add(queryField); } return queryFieldList; @@ -242,6 +260,11 @@ public class CodeGeneratorService { column.setFieldType(javaType); } column.setFieldName(this.columnName2Field(column.getColumnName())); + if (SmartStringUtil.isBlank(column.getColumnDesc())) { + column.setColumnDesc(column.getColumnName()); + } + + column.setIsNumber(codeGeneratorComponent.isNumber(column.getColumnType())); } return list; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/FileController.java similarity index 79% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/FileController.java index bdb908af..408f2aac 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/FileController.java @@ -1,17 +1,17 @@ -package com.gangquan360.smartadmin.module.file; +package net.lab1024.smartadmin.module.support.file; -import com.gangquan360.smartadmin.common.anno.NoNeedLogin; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.file.constant.FileServiceTypeEnum; -import com.gangquan360.smartadmin.module.file.domain.dto.FileAddDTO; -import com.gangquan360.smartadmin.module.file.domain.dto.FileQueryDTO; -import com.gangquan360.smartadmin.module.file.domain.vo.FileVO; -import com.gangquan360.smartadmin.module.file.domain.vo.UploadVO; -import com.gangquan360.smartadmin.module.file.service.FileService; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; -import com.gangquan360.smartadmin.util.SmartRequestTokenUtil; +import net.lab1024.smartadmin.common.anno.NoNeedLogin; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.support.file.constant.FileServiceTypeEnum; +import net.lab1024.smartadmin.module.support.file.domain.dto.FileAddDTO; +import net.lab1024.smartadmin.module.support.file.domain.dto.FileQueryDTO; +import net.lab1024.smartadmin.module.support.file.domain.vo.FileVO; +import net.lab1024.smartadmin.module.support.file.domain.vo.UploadVO; +import net.lab1024.smartadmin.module.support.file.service.FileService; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.util.SmartRequestTokenUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/FileDao.java similarity index 78% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/FileDao.java index 01c3faa6..3155bf25 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/FileDao.java @@ -1,11 +1,11 @@ -package com.gangquan360.smartadmin.module.file; +package net.lab1024.smartadmin.module.support.file; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.module.file.domain.dto.FileDTO; -import com.gangquan360.smartadmin.module.file.domain.dto.FileQueryDTO; -import com.gangquan360.smartadmin.module.file.domain.entity.FileEntity; -import com.gangquan360.smartadmin.module.file.domain.vo.FileVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.module.support.file.domain.dto.FileDTO; +import net.lab1024.smartadmin.module.support.file.domain.dto.FileQueryDTO; +import net.lab1024.smartadmin.module.support.file.domain.entity.FileEntity; +import net.lab1024.smartadmin.module.support.file.domain.vo.FileVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileModuleTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/constant/FileModuleTypeEnum.java similarity index 74% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileModuleTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/constant/FileModuleTypeEnum.java index 78670f2c..8052b767 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileModuleTypeEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/constant/FileModuleTypeEnum.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.file.constant; +package net.lab1024.smartadmin.module.support.file.constant; -import com.gangquan360.smartadmin.common.domain.BaseEnum; +import net.lab1024.smartadmin.common.domain.BaseEnum; /** * [] @@ -15,7 +15,9 @@ public enum FileModuleTypeEnum implements BaseEnum { * path 首字符不能包含\ 或者/ */ - BACK_USER(1, "backUser/config", "backUser"); + BACK_USER(1, "backUser/config", "backUser"), + + CODE_REVIEW(2, "codeReview", "CodeReview"); private Integer value; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/constant/FileResponseCodeConst.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/constant/FileResponseCodeConst.java index 795bed17..fd5abfb9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileResponseCodeConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/constant/FileResponseCodeConst.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.file.constant; +package net.lab1024.smartadmin.module.support.file.constant; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceNameConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/constant/FileServiceNameConst.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceNameConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/constant/FileServiceNameConst.java index 96c649f3..012cffbf 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceNameConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/constant/FileServiceNameConst.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.file.constant; +package net.lab1024.smartadmin.module.support.file.constant; /** * 文件服务名称常量 * diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/constant/FileServiceTypeEnum.java similarity index 89% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/constant/FileServiceTypeEnum.java index 04046b20..793503fc 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceTypeEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/constant/FileServiceTypeEnum.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.file.constant; +package net.lab1024.smartadmin.module.support.file.constant; -import com.gangquan360.smartadmin.common.domain.BaseEnum; +import net.lab1024.smartadmin.common.domain.BaseEnum; /** * 文件服务枚举类 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/dto/FileAddDTO.java similarity index 76% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/dto/FileAddDTO.java index 9121b56f..b097df0a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileAddDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/dto/FileAddDTO.java @@ -1,13 +1,12 @@ -package com.gangquan360.smartadmin.module.file.domain.dto; +package net.lab1024.smartadmin.module.support.file.domain.dto; -import com.gangquan360.smartadmin.common.anno.ApiModelPropertyEnum; -import com.gangquan360.smartadmin.common.validator.en.CheckEnum; -import com.gangquan360.smartadmin.module.file.constant.FileServiceTypeEnum; +import net.lab1024.smartadmin.common.anno.ApiModelPropertyEnum; +import net.lab1024.smartadmin.common.validator.en.CheckEnum; +import net.lab1024.smartadmin.module.support.file.constant.FileServiceTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; /** * @Description: 文件保存DTO diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/dto/FileDTO.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/dto/FileDTO.java index a6998cf0..16491d85 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/dto/FileDTO.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.file.domain.dto; +package net.lab1024.smartadmin.module.support.file.domain.dto; -import com.gangquan360.smartadmin.common.anno.ApiModelPropertyEnum; -import com.gangquan360.smartadmin.module.file.constant.FileServiceTypeEnum; +import net.lab1024.smartadmin.common.anno.ApiModelPropertyEnum; +import net.lab1024.smartadmin.module.support.file.constant.FileServiceTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/dto/FileQueryDTO.java similarity index 65% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/dto/FileQueryDTO.java index d6e547bd..85df6375 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/dto/FileQueryDTO.java @@ -1,10 +1,10 @@ -package com.gangquan360.smartadmin.module.file.domain.dto; +package net.lab1024.smartadmin.module.support.file.domain.dto; -import com.gangquan360.smartadmin.common.anno.ApiModelPropertyEnum; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; -import com.gangquan360.smartadmin.common.validator.en.CheckEnum; -import com.gangquan360.smartadmin.module.file.constant.FileModuleTypeEnum; -import com.gangquan360.smartadmin.module.file.constant.FileServiceTypeEnum; +import net.lab1024.smartadmin.common.anno.ApiModelPropertyEnum; +import net.lab1024.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.validator.en.CheckEnum; +import net.lab1024.smartadmin.module.support.file.constant.FileModuleTypeEnum; +import net.lab1024.smartadmin.module.support.file.constant.FileServiceTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/OSSConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/dto/OSSConfig.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/OSSConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/dto/OSSConfig.java index cd4013a9..112ad4eb 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/OSSConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/dto/OSSConfig.java @@ -1,6 +1,5 @@ -package com.gangquan360.smartadmin.module.file.domain.dto; +package net.lab1024.smartadmin.module.support.file.domain.dto; -import com.alibaba.fastjson.JSON; import lombok.Data; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/entity/FileEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/entity/FileEntity.java similarity index 80% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/entity/FileEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/entity/FileEntity.java index b99e4dcd..38b0db3d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/entity/FileEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/entity/FileEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.file.domain.entity; +package net.lab1024.smartadmin.module.support.file.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; @@ -18,7 +18,7 @@ import lombok.Data; */ @Data @TableName(value = "t_file") -public class FileEntity extends BaseEntity{ +public class FileEntity extends BaseEntity { /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/FileVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/vo/FileVO.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/FileVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/vo/FileVO.java index 336282fd..7f101482 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/FileVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/vo/FileVO.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.file.domain.vo; +package net.lab1024.smartadmin.module.support.file.domain.vo; -import com.gangquan360.smartadmin.common.anno.ApiModelPropertyEnum; -import com.gangquan360.smartadmin.module.file.constant.FileServiceTypeEnum; +import net.lab1024.smartadmin.common.anno.ApiModelPropertyEnum; +import net.lab1024.smartadmin.module.support.file.constant.FileServiceTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/UploadVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/vo/UploadVO.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/UploadVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/vo/UploadVO.java index aff3a02e..f878e7a7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/UploadVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/domain/vo/UploadVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.file.domain.vo; +package net.lab1024.smartadmin.module.support.file.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java similarity index 80% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java index 91152a04..b889c077 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java @@ -1,22 +1,22 @@ -package com.gangquan360.smartadmin.module.file.service; +package net.lab1024.smartadmin.module.support.file.service; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.file.FileDao; -import com.gangquan360.smartadmin.module.file.constant.FileModuleTypeEnum; -import com.gangquan360.smartadmin.module.file.constant.FileResponseCodeConst; -import com.gangquan360.smartadmin.module.file.constant.FileServiceTypeEnum; -import com.gangquan360.smartadmin.module.file.domain.dto.FileAddDTO; -import com.gangquan360.smartadmin.module.file.domain.dto.FileDTO; -import com.gangquan360.smartadmin.module.file.domain.dto.FileQueryDTO; -import com.gangquan360.smartadmin.module.file.domain.entity.FileEntity; -import com.gangquan360.smartadmin.module.file.domain.vo.FileVO; -import com.gangquan360.smartadmin.module.file.domain.vo.UploadVO; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; -import com.gangquan360.smartadmin.util.SmartBaseEnumUtil; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartPaginationUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.support.file.FileDao; +import net.lab1024.smartadmin.module.support.file.constant.FileModuleTypeEnum; +import net.lab1024.smartadmin.module.support.file.constant.FileResponseCodeConst; +import net.lab1024.smartadmin.module.support.file.constant.FileServiceTypeEnum; +import net.lab1024.smartadmin.module.support.file.domain.dto.FileAddDTO; +import net.lab1024.smartadmin.module.support.file.domain.dto.FileDTO; +import net.lab1024.smartadmin.module.support.file.domain.dto.FileQueryDTO; +import net.lab1024.smartadmin.module.support.file.domain.entity.FileEntity; +import net.lab1024.smartadmin.module.support.file.domain.vo.FileVO; +import net.lab1024.smartadmin.module.support.file.domain.vo.UploadVO; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.util.SmartBaseEnumUtil; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartPageUtil; import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -148,7 +148,7 @@ public class FileService { * @return */ public ResponseDTO> queryListByPage(FileQueryDTO queryDTO) { - Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page page = SmartPageUtil.convert2QueryPage(queryDTO); List fileList = fileDao.queryListByPage(page, queryDTO); if (CollectionUtils.isNotEmpty(fileList)) { fileList.forEach(e -> { @@ -158,7 +158,7 @@ public class FileService { e.setFileUrl(fileService.getFileUrl(e.getFilePath()).getData()); }); } - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page, fileList); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page, fileList); return ResponseDTO.succData(pageResultDTO); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceAliYun.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileServiceAliYun.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceAliYun.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileServiceAliYun.java index 1872be3e..15ae3feb 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceAliYun.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileServiceAliYun.java @@ -1,16 +1,16 @@ -package com.gangquan360.smartadmin.module.file.service; +package net.lab1024.smartadmin.module.support.file.service; import com.aliyun.oss.OSSClient; import com.aliyun.oss.model.OSSObject; import com.aliyun.oss.model.ObjectMetadata; import com.aliyun.oss.model.PutObjectRequest; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.file.constant.FileResponseCodeConst; -import com.gangquan360.smartadmin.module.file.constant.FileServiceNameConst; -import com.gangquan360.smartadmin.module.file.domain.dto.OSSConfig; -import com.gangquan360.smartadmin.module.file.domain.vo.UploadVO; -import com.gangquan360.smartadmin.module.systemconfig.SystemConfigService; -import com.gangquan360.smartadmin.module.systemconfig.constant.SystemConfigEnum; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.support.file.constant.FileResponseCodeConst; +import net.lab1024.smartadmin.module.support.file.constant.FileServiceNameConst; +import net.lab1024.smartadmin.module.support.file.domain.dto.OSSConfig; +import net.lab1024.smartadmin.module.support.file.domain.vo.UploadVO; +import net.lab1024.smartadmin.module.system.systemconfig.SystemConfigService; +import net.lab1024.smartadmin.module.system.systemconfig.constant.SystemConfigEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceLocal.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileServiceLocal.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceLocal.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileServiceLocal.java index a11a20ce..08aac36d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceLocal.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileServiceLocal.java @@ -1,12 +1,12 @@ -package com.gangquan360.smartadmin.module.file.service; +package net.lab1024.smartadmin.module.support.file.service; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.file.constant.FileResponseCodeConst; -import com.gangquan360.smartadmin.module.file.constant.FileServiceNameConst; -import com.gangquan360.smartadmin.module.file.domain.vo.UploadVO; -import com.gangquan360.smartadmin.module.systemconfig.SystemConfigDao; -import com.gangquan360.smartadmin.module.systemconfig.constant.SystemConfigEnum; -import com.gangquan360.smartadmin.module.systemconfig.domain.entity.SystemConfigEntity; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.support.file.constant.FileResponseCodeConst; +import net.lab1024.smartadmin.module.support.file.constant.FileServiceNameConst; +import net.lab1024.smartadmin.module.support.file.domain.vo.UploadVO; +import net.lab1024.smartadmin.module.system.systemconfig.SystemConfigDao; +import net.lab1024.smartadmin.module.system.systemconfig.constant.SystemConfigEnum; +import net.lab1024.smartadmin.module.system.systemconfig.domain.entity.SystemConfigEntity; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceQiNiuYun.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileServiceQiNiuYun.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceQiNiuYun.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileServiceQiNiuYun.java index f09aeb6a..394b7af8 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceQiNiuYun.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileServiceQiNiuYun.java @@ -1,12 +1,12 @@ -package com.gangquan360.smartadmin.module.file.service; +package net.lab1024.smartadmin.module.support.file.service; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.file.constant.FileResponseCodeConst; -import com.gangquan360.smartadmin.module.file.constant.FileServiceNameConst; -import com.gangquan360.smartadmin.module.file.domain.dto.OSSConfig; -import com.gangquan360.smartadmin.module.file.domain.vo.UploadVO; -import com.gangquan360.smartadmin.module.systemconfig.SystemConfigService; -import com.gangquan360.smartadmin.module.systemconfig.constant.SystemConfigEnum; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.support.file.constant.FileResponseCodeConst; +import net.lab1024.smartadmin.module.support.file.constant.FileServiceNameConst; +import net.lab1024.smartadmin.module.support.file.domain.dto.OSSConfig; +import net.lab1024.smartadmin.module.support.file.domain.vo.UploadVO; +import net.lab1024.smartadmin.module.system.systemconfig.SystemConfigService; +import net.lab1024.smartadmin.module.system.systemconfig.constant.SystemConfigEnum; import com.qiniu.http.Response; import com.qiniu.storage.Configuration; import com.qiniu.storage.UploadManager; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/IFileService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/IFileService.java similarity index 96% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/IFileService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/IFileService.java index 0cc35f36..a818ae42 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/IFileService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/IFileService.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.file.service; +package net.lab1024.smartadmin.module.support.file.service; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.file.domain.vo.UploadVO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.support.file.domain.vo.UploadVO; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatController.java similarity index 69% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatController.java index b40c8454..a9671255 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatController.java @@ -1,10 +1,10 @@ -package com.gangquan360.smartadmin.module.heartbeat; +package net.lab1024.smartadmin.module.support.heartbeat; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatRecordDao.java similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatRecordDao.java index ca9fc96f..e10c8e8c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatRecordDao.java @@ -1,8 +1,7 @@ -package com.gangquan360.smartadmin.module.heartbeat; +package net.lab1024.smartadmin.module.support.heartbeat; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.baomidou.mybatisplus.plugins.pagination.Pagination; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @@ -49,5 +48,5 @@ public interface HeartBeatRecordDao extends BaseMapper { * 分页查询心跳记录 * @return */ - List pageQuery(Pagination page); + List pageQuery(Page page); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatRecordEntity.java similarity index 79% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatRecordEntity.java index 3df2490d..694eb936 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatRecordEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.heartbeat; +package net.lab1024.smartadmin.module.support.heartbeat; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; import java.io.Serializable; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatRecordVO.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatRecordVO.java index bea39703..34e98932 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatRecordVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.heartbeat; +package net.lab1024.smartadmin.module.support.heartbeat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatService.java similarity index 71% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatService.java index 8bdefc4a..b474c174 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/heartbeat/HeartBeatService.java @@ -1,16 +1,16 @@ -package com.gangquan360.smartadmin.module.heartbeat; +package net.lab1024.smartadmin.module.support.heartbeat; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.common.heartbeat.AbstractHeartBeatCommand; -import com.gangquan360.smartadmin.common.heartbeat.HeartBeatConfig; -import com.gangquan360.smartadmin.common.heartbeat.HeartBeatLogger; -import com.gangquan360.smartadmin.common.heartbeat.HeartBeatRecordDTO; -import com.gangquan360.smartadmin.config.SmartHeartBeatConfig; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartPaginationUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.common.heartbeat.AbstractHeartBeatCommand; +import net.lab1024.smartadmin.common.heartbeat.HeartBeatConfig; +import net.lab1024.smartadmin.common.heartbeat.HeartBeatLogger; +import net.lab1024.smartadmin.common.heartbeat.HeartBeatRecordDTO; +import net.lab1024.smartadmin.config.SmartHeartBeatConfig; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartPageUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -81,9 +81,9 @@ public class HeartBeatService extends AbstractHeartBeatCommand { } public ResponseDTO> pageQuery(PageParamDTO pageParamDTO) { - Page pageQueryInfo = SmartPaginationUtil.convert2PageQueryInfo(pageParamDTO); + Page pageQueryInfo = SmartPageUtil.convert2QueryPage(pageParamDTO); List recordVOList = heartBeatRecordDao.pageQuery(pageQueryInfo); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(pageQueryInfo, recordVOList); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(pageQueryInfo, recordVOList); return ResponseDTO.succData(pageResultDTO); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/IdGeneratorDao.java similarity index 74% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/IdGeneratorDao.java index c2e31e45..e6e1341e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/IdGeneratorDao.java @@ -1,12 +1,11 @@ -package com.gangquan360.smartadmin.module.idgenerator; +package net.lab1024.smartadmin.module.support.idgenerator; -import com.gangquan360.smartadmin.module.idgenerator.domain.IdGeneratorEntity; -import com.gangquan360.smartadmin.module.idgenerator.domain.IdGeneratorLastNumberDTO; -import com.gangquan360.smartadmin.module.idgenerator.domain.IdGeneratorRecordDTO; +import net.lab1024.smartadmin.module.support.idgenerator.domain.IdGeneratorEntity; +import net.lab1024.smartadmin.module.support.idgenerator.domain.IdGeneratorLastNumberDTO; +import net.lab1024.smartadmin.module.support.idgenerator.domain.IdGeneratorRecordDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; import java.util.List; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorManager.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/IdGeneratorManager.java similarity index 89% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorManager.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/IdGeneratorManager.java index de976b3b..1b2a926d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorManager.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/IdGeneratorManager.java @@ -1,8 +1,8 @@ -package com.gangquan360.smartadmin.module.idgenerator; +package net.lab1024.smartadmin.module.support.idgenerator; -import com.gangquan360.smartadmin.common.exception.SmartBusinessException; -import com.gangquan360.smartadmin.module.idgenerator.domain.IdGeneratorLastNumberDTO; -import com.gangquan360.smartadmin.module.idgenerator.domain.IdGeneratorPOJO; +import net.lab1024.smartadmin.common.exception.SmartBusinessException; +import net.lab1024.smartadmin.module.support.idgenerator.domain.IdGeneratorLastNumberDTO; +import net.lab1024.smartadmin.module.support.idgenerator.domain.IdGeneratorPOJO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/IdGeneratorService.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/IdGeneratorService.java index 079c6a41..ca5d581b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/IdGeneratorService.java @@ -1,10 +1,10 @@ -package com.gangquan360.smartadmin.module.idgenerator; +package net.lab1024.smartadmin.module.support.idgenerator; -import com.gangquan360.smartadmin.common.exception.SmartBusinessException; -import com.gangquan360.smartadmin.module.idgenerator.constant.IdGeneratorEnum; -import com.gangquan360.smartadmin.module.idgenerator.constant.IdGeneratorRuleTypeEnum; -import com.gangquan360.smartadmin.module.idgenerator.domain.IdGeneratorEntity; -import com.gangquan360.smartadmin.module.idgenerator.domain.IdGeneratorPOJO; +import net.lab1024.smartadmin.common.exception.SmartBusinessException; +import net.lab1024.smartadmin.module.support.idgenerator.constant.IdGeneratorEnum; +import net.lab1024.smartadmin.module.support.idgenerator.constant.IdGeneratorRuleTypeEnum; +import net.lab1024.smartadmin.module.support.idgenerator.domain.IdGeneratorEntity; +import net.lab1024.smartadmin.module.support.idgenerator.domain.IdGeneratorPOJO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/constant/IdGeneratorEnum.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/constant/IdGeneratorEnum.java index 9d72dda2..77453e2a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/constant/IdGeneratorEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.idgenerator.constant; +package net.lab1024.smartadmin.module.support.idgenerator.constant; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorRuleTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/constant/IdGeneratorRuleTypeEnum.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorRuleTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/constant/IdGeneratorRuleTypeEnum.java index d087354b..c2dad2da 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorRuleTypeEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/constant/IdGeneratorRuleTypeEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.idgenerator.constant; +package net.lab1024.smartadmin.module.support.idgenerator.constant; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorEntity.java similarity index 81% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorEntity.java index a245ff53..051cca36 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.idgenerator.domain; +package net.lab1024.smartadmin.module.support.idgenerator.domain; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; import java.io.Serializable; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorLastNumberDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorLastNumberDTO.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorLastNumberDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorLastNumberDTO.java index 771c7b96..69af325e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorLastNumberDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorLastNumberDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.idgenerator.domain; +package net.lab1024.smartadmin.module.support.idgenerator.domain; import java.util.Date; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorPOJO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorPOJO.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorPOJO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorPOJO.java index 210bfc26..6cd93931 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorPOJO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorPOJO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.idgenerator.domain; +package net.lab1024.smartadmin.module.support.idgenerator.domain; -import com.gangquan360.smartadmin.module.idgenerator.constant.IdGeneratorRuleTypeEnum; +import net.lab1024.smartadmin.module.support.idgenerator.constant.IdGeneratorRuleTypeEnum; /** * @Auther: yandanyang diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorRecordDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorRecordDTO.java similarity index 81% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorRecordDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorRecordDTO.java index 3e13344c..50f79b1e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorRecordDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorRecordDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.idgenerator.domain; +package net.lab1024.smartadmin.module.support.idgenerator.domain; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/QuartzConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/constant/QuartzConst.java similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/QuartzConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/constant/QuartzConst.java index de28155d..949da2bc 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/QuartzConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/constant/QuartzConst.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.quartz.constant; +package net.lab1024.smartadmin.module.support.quartz.constant; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskResultEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/constant/TaskResultEnum.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskResultEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/constant/TaskResultEnum.java index 72e95146..df5fbc5d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskResultEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/constant/TaskResultEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.quartz.constant; +package net.lab1024.smartadmin.module.support.quartz.constant; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskStatusEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/constant/TaskStatusEnum.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskStatusEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/constant/TaskStatusEnum.java index 19e24a87..9a7f9bd7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskStatusEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/constant/TaskStatusEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.quartz.constant; +package net.lab1024.smartadmin.module.support.quartz.constant; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/controller/QuartzController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/controller/QuartzController.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/controller/QuartzController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/controller/QuartzController.java index 2b76fd16..59a71ad3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/controller/QuartzController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/controller/QuartzController.java @@ -1,14 +1,14 @@ -package com.gangquan360.smartadmin.module.quartz.controller; +package net.lab1024.smartadmin.module.support.quartz.controller; -import com.gangquan360.smartadmin.common.anno.NoValidPrivilege; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.quartz.domain.dto.*; -import com.gangquan360.smartadmin.module.quartz.service.QuartzTaskService; +import net.lab1024.smartadmin.common.anno.NoValidPrivilege; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.support.quartz.service.QuartzTaskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import net.lab1024.smartadmin.module.support.quartz.domain.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/dao/QuartzTaskDao.java similarity index 65% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/dao/QuartzTaskDao.java index 9813aa71..f9153e9e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/dao/QuartzTaskDao.java @@ -1,10 +1,10 @@ -package com.gangquan360.smartadmin.module.quartz.dao; +package net.lab1024.smartadmin.module.support.quartz.dao; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.module.quartz.domain.dto.QuartzQueryDTO; -import com.gangquan360.smartadmin.module.quartz.domain.dto.QuartzTaskVO; -import com.gangquan360.smartadmin.module.quartz.domain.entity.QuartzTaskEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.module.support.quartz.domain.dto.QuartzQueryDTO; +import net.lab1024.smartadmin.module.support.quartz.domain.dto.QuartzTaskVO; +import net.lab1024.smartadmin.module.support.quartz.domain.entity.QuartzTaskEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskLogDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/dao/QuartzTaskLogDao.java similarity index 59% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskLogDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/dao/QuartzTaskLogDao.java index 0202e663..b2e9cb04 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskLogDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/dao/QuartzTaskLogDao.java @@ -1,10 +1,10 @@ -package com.gangquan360.smartadmin.module.quartz.dao; +package net.lab1024.smartadmin.module.support.quartz.dao; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.module.quartz.domain.dto.QuartzLogQueryDTO; -import com.gangquan360.smartadmin.module.quartz.domain.dto.QuartzTaskLogVO; -import com.gangquan360.smartadmin.module.quartz.domain.entity.QuartzTaskLogEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.module.support.quartz.domain.dto.QuartzLogQueryDTO; +import net.lab1024.smartadmin.module.support.quartz.domain.dto.QuartzTaskLogVO; +import net.lab1024.smartadmin.module.support.quartz.domain.entity.QuartzTaskLogEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzLogQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzLogQueryDTO.java similarity index 80% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzLogQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzLogQueryDTO.java index 40450853..84b8564e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzLogQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzLogQueryDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.quartz.domain.dto; +package net.lab1024.smartadmin.module.support.quartz.domain.dto; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageParamDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzQueryDTO.java similarity index 67% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzQueryDTO.java index 1257291b..51e6b584 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzQueryDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.quartz.domain.dto; +package net.lab1024.smartadmin.module.support.quartz.domain.dto; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageParamDTO; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzTaskDTO.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzTaskDTO.java index 001a7a27..5fb303fc 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzTaskDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.quartz.domain.dto; +package net.lab1024.smartadmin.module.support.quartz.domain.dto; -import com.gangquan360.smartadmin.module.quartz.constant.TaskStatusEnum; +import net.lab1024.smartadmin.module.support.quartz.constant.TaskStatusEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskLogVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzTaskLogVO.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskLogVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzTaskLogVO.java index c5015d62..23cd35fc 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskLogVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzTaskLogVO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.quartz.domain.dto; +package net.lab1024.smartadmin.module.support.quartz.domain.dto; -import com.gangquan360.smartadmin.module.quartz.constant.TaskResultEnum; +import net.lab1024.smartadmin.module.support.quartz.constant.TaskResultEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzTaskVO.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzTaskVO.java index 20c2c38f..b588c532 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/dto/QuartzTaskVO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.quartz.domain.dto; +package net.lab1024.smartadmin.module.support.quartz.domain.dto; -import com.gangquan360.smartadmin.module.quartz.constant.TaskStatusEnum; +import net.lab1024.smartadmin.module.support.quartz.constant.TaskStatusEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/entity/QuartzTaskEntity.java similarity index 73% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/entity/QuartzTaskEntity.java index a25b58dd..f010c604 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/entity/QuartzTaskEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.quartz.domain.entity; +package net.lab1024.smartadmin.module.support.quartz.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; /** @@ -16,7 +16,7 @@ import lombok.Data; */ @Data @TableName("t_quartz_task") -public class QuartzTaskEntity extends BaseEntity{ +public class QuartzTaskEntity extends BaseEntity { /** * 任务名称参数 */ diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskLogEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/entity/QuartzTaskLogEntity.java similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskLogEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/entity/QuartzTaskLogEntity.java index cd3c6dc0..9d728416 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskLogEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/domain/entity/QuartzTaskLogEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.quartz.domain.entity; +package net.lab1024.smartadmin.module.support.quartz.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; /** @@ -16,7 +16,7 @@ import lombok.Data; */ @Data @TableName("t_quartz_task_log") -public class QuartzTaskLogEntity extends BaseEntity{ +public class QuartzTaskLogEntity extends BaseEntity { /** * 任务名称参数 */ diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTask.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java similarity index 79% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTask.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java index 010ab318..c09e7ba2 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTask.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java @@ -1,13 +1,14 @@ -package com.gangquan360.smartadmin.module.quartz.service; +package net.lab1024.smartadmin.module.support.quartz.service; -import com.gangquan360.smartadmin.module.quartz.constant.QuartzConst; -import com.gangquan360.smartadmin.module.quartz.constant.TaskResultEnum; -import com.gangquan360.smartadmin.module.quartz.domain.entity.QuartzTaskEntity; -import com.gangquan360.smartadmin.module.quartz.domain.entity.QuartzTaskLogEntity; -import com.gangquan360.smartadmin.module.quartz.task.ITask; -import com.gangquan360.smartadmin.third.SmartApplicationContext; -import com.gangquan360.smartadmin.util.SmartIPUtil; -import com.gangquan360.smartadmin.util.SmartQuartzUtil; +import net.lab1024.smartadmin.module.support.quartz.constant.QuartzConst; +import net.lab1024.smartadmin.module.support.quartz.constant.TaskResultEnum; +import net.lab1024.smartadmin.module.support.quartz.domain.entity.QuartzTaskEntity; +import net.lab1024.smartadmin.module.support.quartz.domain.entity.QuartzTaskLogEntity; +import net.lab1024.smartadmin.common.domain.ITask; +import net.lab1024.smartadmin.third.SmartApplicationContext; +import net.lab1024.smartadmin.util.SmartIPUtil; +import net.lab1024.smartadmin.util.SmartQuartzUtil; +import lombok.extern.slf4j.Slf4j; import org.quartz.JobDetail; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -28,6 +29,7 @@ import java.util.Date; * @date * @since JDK1.8 */ +@Slf4j public class QuartzTask extends QuartzJobBean { @Override @@ -60,6 +62,7 @@ public class QuartzTask extends QuartzJobBean { taskClass.execute(paramsStr); taskLogEntity.setProcessStatus(TaskResultEnum.SUCCESS.getStatus()); } catch (Exception e) { + log.error("", e); StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw, true); e.printStackTrace(pw); diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskLogService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskLogService.java similarity index 70% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskLogService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskLogService.java index 8a396991..e54c483c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskLogService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskLogService.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.quartz.service; +package net.lab1024.smartadmin.module.support.quartz.service; -import com.gangquan360.smartadmin.module.quartz.dao.QuartzTaskLogDao; -import com.gangquan360.smartadmin.module.quartz.domain.entity.QuartzTaskLogEntity; +import net.lab1024.smartadmin.module.support.quartz.dao.QuartzTaskLogDao; +import net.lab1024.smartadmin.module.support.quartz.domain.entity.QuartzTaskLogEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java index 05fb2484..bce68330 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java @@ -1,20 +1,20 @@ -package com.gangquan360.smartadmin.module.quartz.service; +package net.lab1024.smartadmin.module.support.quartz.service; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.quartz.constant.QuartzConst; -import com.gangquan360.smartadmin.module.quartz.constant.TaskStatusEnum; -import com.gangquan360.smartadmin.module.quartz.dao.QuartzTaskDao; -import com.gangquan360.smartadmin.module.quartz.dao.QuartzTaskLogDao; -import com.gangquan360.smartadmin.module.quartz.domain.dto.*; -import com.gangquan360.smartadmin.module.quartz.domain.entity.QuartzTaskEntity; -import com.gangquan360.smartadmin.third.SmartApplicationContext; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartPaginationUtil; -import com.gangquan360.smartadmin.util.SmartQuartzUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.support.quartz.constant.QuartzConst; +import net.lab1024.smartadmin.module.support.quartz.constant.TaskStatusEnum; +import net.lab1024.smartadmin.module.support.quartz.dao.QuartzTaskDao; +import net.lab1024.smartadmin.module.support.quartz.dao.QuartzTaskLogDao; +import net.lab1024.smartadmin.module.support.quartz.domain.entity.QuartzTaskEntity; +import net.lab1024.smartadmin.third.SmartApplicationContext; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartPageUtil; +import net.lab1024.smartadmin.util.SmartQuartzUtil; import lombok.extern.slf4j.Slf4j; +import net.lab1024.smartadmin.module.support.quartz.domain.dto.*; import org.quartz.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,10 +53,10 @@ public class QuartzTaskService { * @return */ public ResponseDTO> query(QuartzQueryDTO queryDTO) { - Page pageParam = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page pageParam = SmartPageUtil.convert2QueryPage(queryDTO); List taskList = quartzTaskDao.queryList(pageParam, queryDTO); pageParam.setRecords(taskList); - return ResponseDTO.succData(SmartPaginationUtil.convert2PageResultDTO(pageParam)); + return ResponseDTO.succData(SmartPageUtil.convert2PageResult(pageParam)); } /** @@ -66,10 +66,10 @@ public class QuartzTaskService { * @return */ public ResponseDTO> queryLog(QuartzLogQueryDTO queryDTO) { - Page pageParam = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page pageParam = SmartPageUtil.convert2QueryPage(queryDTO); List taskList = quartzTaskLogDao.queryList(pageParam, queryDTO); pageParam.setRecords(taskList); - return ResponseDTO.succData(SmartPaginationUtil.convert2PageResultDTO(pageParam)); + return ResponseDTO.succData(SmartPageUtil.convert2PageResult(pageParam)); } /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/test/Example.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/task/test/Example.java similarity index 76% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/test/Example.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/task/test/Example.java index a4c4b43f..8502555a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/test/Example.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/task/test/Example.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.quartz.task.test; +package net.lab1024.smartadmin.module.support.quartz.task.test; -import com.gangquan360.smartadmin.module.quartz.task.ITask; -import com.gangquan360.smartadmin.util.SmartDateUtil; +import net.lab1024.smartadmin.common.domain.ITask; +import net.lab1024.smartadmin.util.SmartDateUtil; import org.springframework.stereotype.Component; import java.util.Date; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadCommand.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/SmartReloadCommand.java similarity index 61% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadCommand.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/SmartReloadCommand.java index 5922a7c0..2535efdd 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadCommand.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/SmartReloadCommand.java @@ -1,13 +1,13 @@ -package com.gangquan360.smartadmin.module.smartreload; +package net.lab1024.smartadmin.module.support.smartreload; -import com.gangquan360.smartadmin.common.reload.abstracts.AbstractSmartReloadCommand4Spring; -import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem; -import com.gangquan360.smartadmin.common.reload.domain.entity.SmartReloadResult; -import com.gangquan360.smartadmin.module.smartreload.dao.ReloadItemDao; -import com.gangquan360.smartadmin.module.smartreload.dao.ReloadResultDao; -import com.gangquan360.smartadmin.module.smartreload.domain.entity.ReloadItemEntity; -import com.gangquan360.smartadmin.module.smartreload.domain.entity.ReloadResultEntity; -import com.gangquan360.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.common.reload.abstracts.AbstractSmartReloadCommand4Spring; +import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem; +import net.lab1024.smartadmin.common.reload.domain.entity.SmartReloadResult; +import net.lab1024.smartadmin.module.support.smartreload.dao.ReloadItemDao; +import net.lab1024.smartadmin.module.support.smartreload.dao.ReloadResultDao; +import net.lab1024.smartadmin.module.support.smartreload.domain.entity.ReloadItemEntity; +import net.lab1024.smartadmin.module.support.smartreload.domain.entity.ReloadResultEntity; +import net.lab1024.smartadmin.util.SmartBeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/SmartReloadController.java similarity index 71% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/SmartReloadController.java index 97e71b23..2d6e9560 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/SmartReloadController.java @@ -1,12 +1,12 @@ -package com.gangquan360.smartadmin.module.smartreload; +package net.lab1024.smartadmin.module.support.smartreload; -import com.gangquan360.smartadmin.common.anno.NoValidPrivilege; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.smartreload.domain.dto.ReloadItemUpdateDTO; -import com.gangquan360.smartadmin.module.smartreload.domain.dto.ReloadItemVO; -import com.gangquan360.smartadmin.module.smartreload.domain.dto.ReloadResultVO; +import net.lab1024.smartadmin.common.anno.NoValidPrivilege; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.support.smartreload.domain.dto.ReloadItemUpdateDTO; +import net.lab1024.smartadmin.module.support.smartreload.domain.dto.ReloadItemVO; +import net.lab1024.smartadmin.module.support.smartreload.domain.dto.ReloadResultVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/SmartReloadService.java similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/SmartReloadService.java index 49ad7180..78778659 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/SmartReloadService.java @@ -1,16 +1,16 @@ -package com.gangquan360.smartadmin.module.smartreload; +package net.lab1024.smartadmin.module.support.smartreload; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.common.reload.SmartReloadManager; -import com.gangquan360.smartadmin.module.smartreload.dao.ReloadItemDao; -import com.gangquan360.smartadmin.module.smartreload.dao.ReloadResultDao; -import com.gangquan360.smartadmin.module.smartreload.domain.dto.ReloadItemUpdateDTO; -import com.gangquan360.smartadmin.module.smartreload.domain.dto.ReloadItemVO; -import com.gangquan360.smartadmin.module.smartreload.domain.dto.ReloadResultVO; -import com.gangquan360.smartadmin.module.smartreload.domain.entity.ReloadItemEntity; -import com.gangquan360.smartadmin.module.smartreload.domain.entity.ReloadResultEntity; -import com.gangquan360.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.common.reload.SmartReloadManager; +import net.lab1024.smartadmin.module.support.smartreload.dao.ReloadItemDao; +import net.lab1024.smartadmin.module.support.smartreload.dao.ReloadResultDao; +import net.lab1024.smartadmin.module.support.smartreload.domain.dto.ReloadItemUpdateDTO; +import net.lab1024.smartadmin.module.support.smartreload.domain.dto.ReloadItemVO; +import net.lab1024.smartadmin.module.support.smartreload.domain.dto.ReloadResultVO; +import net.lab1024.smartadmin.module.support.smartreload.domain.entity.ReloadItemEntity; +import net.lab1024.smartadmin.module.support.smartreload.domain.entity.ReloadResultEntity; +import net.lab1024.smartadmin.util.SmartBeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadItemDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/dao/ReloadItemDao.java similarity index 56% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadItemDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/dao/ReloadItemDao.java index e5b56605..c497ebbc 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadItemDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/dao/ReloadItemDao.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.smartreload.dao; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.gangquan360.smartadmin.module.smartreload.domain.entity.ReloadItemEntity; +package net.lab1024.smartadmin.module.support.smartreload.dao; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.lab1024.smartadmin.module.support.smartreload.domain.entity.ReloadItemEntity; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadResultDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/dao/ReloadResultDao.java similarity index 66% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadResultDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/dao/ReloadResultDao.java index b78244c2..dc4d2d69 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadResultDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/dao/ReloadResultDao.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.smartreload.dao; +package net.lab1024.smartadmin.module.support.smartreload.dao; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.gangquan360.smartadmin.module.smartreload.domain.entity.ReloadResultEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.lab1024.smartadmin.module.support.smartreload.domain.entity.ReloadResultEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/dto/ReloadItemUpdateDTO.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/dto/ReloadItemUpdateDTO.java index 15e8e860..20ad98f5 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemUpdateDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/dto/ReloadItemUpdateDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.smartreload.domain.dto; +package net.lab1024.smartadmin.module.support.smartreload.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/dto/ReloadItemVO.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/dto/ReloadItemVO.java index 571dd599..8f462297 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/dto/ReloadItemVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.smartreload.domain.dto; +package net.lab1024.smartadmin.module.support.smartreload.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadResultVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/dto/ReloadResultVO.java similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadResultVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/dto/ReloadResultVO.java index 0db01ee7..56b388a3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadResultVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/dto/ReloadResultVO.java @@ -1,8 +1,6 @@ -package com.gangquan360.smartadmin.module.smartreload.domain.dto; -import io.swagger.annotations.ApiModelProperty; +package net.lab1024.smartadmin.module.support.smartreload.domain.dto; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.util.Date; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadItemEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/entity/ReloadItemEntity.java similarity index 71% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadItemEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/entity/ReloadItemEntity.java index c5be854a..cbd264c1 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadItemEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/entity/ReloadItemEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.smartreload.domain.entity; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +package net.lab1024.smartadmin.module.support.smartreload.domain.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadResultEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/entity/ReloadResultEntity.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadResultEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/entity/ReloadResultEntity.java index e04f197d..bb79c21e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadResultEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/smartreload/domain/entity/ReloadResultEntity.java @@ -1,5 +1,5 @@ -package com.gangquan360.smartadmin.module.smartreload.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; +package net.lab1024.smartadmin.module.support.smartreload.domain.entity; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/MessageTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/MessageTypeEnum.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/MessageTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/MessageTypeEnum.java index d2512306..eda10334 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/MessageTypeEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/MessageTypeEnum.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.websocket; +package net.lab1024.smartadmin.module.support.websocket; -import com.gangquan360.smartadmin.common.domain.BaseEnum; +import net.lab1024.smartadmin.common.domain.BaseEnum; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/WebSocketServer.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/WebSocketServer.java similarity index 95% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/WebSocketServer.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/WebSocketServer.java index 5474e03c..a26489c8 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/WebSocketServer.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/WebSocketServer.java @@ -1,10 +1,10 @@ -package com.gangquan360.smartadmin.module.websocket; +package net.lab1024.smartadmin.module.support.websocket; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; -import com.gangquan360.smartadmin.module.websocket.domain.MessageCommonDTO; -import com.gangquan360.smartadmin.module.websocket.domain.MessageDTO; -import com.gangquan360.smartadmin.module.websocket.domain.WebSocketHeartBeatDTO; +import net.lab1024.smartadmin.module.support.websocket.domain.MessageCommonDTO; +import net.lab1024.smartadmin.module.support.websocket.domain.MessageDTO; +import net.lab1024.smartadmin.module.support.websocket.domain.WebSocketHeartBeatDTO; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageCommonDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/domain/MessageCommonDTO.java similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageCommonDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/domain/MessageCommonDTO.java index fb9611c0..43828b38 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageCommonDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/domain/MessageCommonDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.websocket.domain; +package net.lab1024.smartadmin.module.support.websocket.domain; -import com.gangquan360.smartadmin.module.websocket.MessageTypeEnum; +import net.lab1024.smartadmin.module.support.websocket.MessageTypeEnum; import lombok.Data; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/domain/MessageDTO.java similarity index 81% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/domain/MessageDTO.java index ca1ec32d..23fc615f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/domain/MessageDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.websocket.domain; +package net.lab1024.smartadmin.module.support.websocket.domain; -import com.gangquan360.smartadmin.module.websocket.MessageTypeEnum; +import net.lab1024.smartadmin.module.support.websocket.MessageTypeEnum; import lombok.Builder; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/WebSocketHeartBeatDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/domain/WebSocketHeartBeatDTO.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/WebSocketHeartBeatDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/domain/WebSocketHeartBeatDTO.java index bef2fd9f..90f8c78f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/WebSocketHeartBeatDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/websocket/domain/WebSocketHeartBeatDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.websocket.domain; +package net.lab1024.smartadmin.module.support.websocket.domain; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/DataScopeController.java similarity index 70% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/DataScopeController.java index 91a31754..75a5eec4 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/DataScopeController.java @@ -1,11 +1,13 @@ -package com.gangquan360.smartadmin.module.datascope; +package net.lab1024.smartadmin.module.system.datascope; -import com.gangquan360.smartadmin.common.anno.NoValidPrivilege; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.datascope.domain.dto.*; -import com.gangquan360.smartadmin.module.datascope.service.DataScopeService; +import net.lab1024.smartadmin.common.anno.NoValidPrivilege; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.system.datascope.domain.dto.DataScopeAndViewTypeVO; +import net.lab1024.smartadmin.module.system.datascope.domain.dto.DataScopeBatchSetRoleDTO; +import net.lab1024.smartadmin.module.system.datascope.domain.dto.DataScopeSelectVO; +import net.lab1024.smartadmin.module.system.datascope.service.DataScopeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeRoleDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/DataScopeRoleDao.java similarity index 84% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeRoleDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/DataScopeRoleDao.java index 750571dd..1b926a7b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeRoleDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/DataScopeRoleDao.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.datascope; +package net.lab1024.smartadmin.module.system.datascope; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.gangquan360.smartadmin.module.datascope.domain.entity.DataScopeRoleEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.lab1024.smartadmin.module.system.datascope.domain.entity.DataScopeRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/MyBatisPlugin.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/MyBatisPlugin.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/MyBatisPlugin.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/MyBatisPlugin.java index 64625ce3..f9270b62 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/MyBatisPlugin.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/MyBatisPlugin.java @@ -1,9 +1,9 @@ -package com.gangquan360.smartadmin.module.datascope; +package net.lab1024.smartadmin.module.system.datascope; -import com.gangquan360.smartadmin.module.datascope.domain.dto.DataScopeSqlConfigDTO; -import com.gangquan360.smartadmin.module.datascope.service.DataScopeSqlConfigService; -import com.gangquan360.smartadmin.third.SmartApplicationContext; -import com.gangquan360.smartadmin.util.SmartStringUtil; +import net.lab1024.smartadmin.module.system.datascope.domain.dto.DataScopeSqlConfigDTO; +import net.lab1024.smartadmin.module.system.datascope.service.DataScopeSqlConfigService; +import net.lab1024.smartadmin.third.SmartApplicationContext; +import net.lab1024.smartadmin.util.SmartStringUtil; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.mapping.*; import org.apache.ibatis.plugin.*; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/constant/DataScopeTypeEnum.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/constant/DataScopeTypeEnum.java index 8fba7ff8..4cbc11ce 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeTypeEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/constant/DataScopeTypeEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.datascope.constant; +package net.lab1024.smartadmin.module.system.datascope.constant; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeViewTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/constant/DataScopeViewTypeEnum.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeViewTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/constant/DataScopeViewTypeEnum.java index 0ff89c04..da93f96c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeViewTypeEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/constant/DataScopeViewTypeEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.datascope.constant; +package net.lab1024.smartadmin.module.system.datascope.constant; import java.util.Arrays; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeWhereInTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/constant/DataScopeWhereInTypeEnum.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeWhereInTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/constant/DataScopeWhereInTypeEnum.java index 8008c428..5dbbdc37 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeWhereInTypeEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/constant/DataScopeWhereInTypeEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.datascope.constant; +package net.lab1024.smartadmin.module.system.datascope.constant; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeAndViewTypeVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeAndViewTypeVO.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeAndViewTypeVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeAndViewTypeVO.java index 1dd55a68..1412be57 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeAndViewTypeVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeAndViewTypeVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.datascope.domain.dto; +package net.lab1024.smartadmin.module.system.datascope.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeBatchSetDTO.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeBatchSetDTO.java index 3d361d91..6ff9fc92 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeBatchSetDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.datascope.domain.dto; +package net.lab1024.smartadmin.module.system.datascope.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetRoleDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeBatchSetRoleDTO.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetRoleDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeBatchSetRoleDTO.java index 7b64750d..215ab664 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetRoleDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeBatchSetRoleDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.datascope.domain.dto; +package net.lab1024.smartadmin.module.system.datascope.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeDTO.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeDTO.java index 11718988..629679bf 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeDTO.java @@ -1,12 +1,9 @@ -package com.gangquan360.smartadmin.module.datascope.domain.dto; +package net.lab1024.smartadmin.module.system.datascope.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; import lombok.Data; -import javax.validation.constraints.NotNull; -import java.util.List; - /** * [ ] * diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSelectVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeSelectVO.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSelectVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeSelectVO.java index 3f0ddf8c..5d0a3aa8 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSelectVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeSelectVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.datascope.domain.dto; +package net.lab1024.smartadmin.module.system.datascope.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSqlConfigDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeSqlConfigDTO.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSqlConfigDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeSqlConfigDTO.java index 64f83755..3e79309a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSqlConfigDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeSqlConfigDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.datascope.domain.dto; +package net.lab1024.smartadmin.module.system.datascope.domain.dto; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeViewTypeVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeViewTypeVO.java similarity index 89% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeViewTypeVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeViewTypeVO.java index fd4acffa..853a514f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeViewTypeVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/dto/DataScopeViewTypeVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.datascope.domain.dto; +package net.lab1024.smartadmin.module.system.datascope.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/entity/DataScopeRoleEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/entity/DataScopeRoleEntity.java similarity index 67% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/entity/DataScopeRoleEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/entity/DataScopeRoleEntity.java index cb0de325..016f05bf 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/entity/DataScopeRoleEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/domain/entity/DataScopeRoleEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.datascope.domain.entity; +package net.lab1024.smartadmin.module.system.datascope.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; /** @@ -16,7 +16,7 @@ import lombok.Data; */ @Data @TableName("t_role_data_scope") -public class DataScopeRoleEntity extends BaseEntity{ +public class DataScopeRoleEntity extends BaseEntity { /** * 数据范围id diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/service/DataScopeService.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/service/DataScopeService.java index b2169b4d..8a231dd7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/service/DataScopeService.java @@ -1,14 +1,14 @@ -package com.gangquan360.smartadmin.module.datascope.service; +package net.lab1024.smartadmin.module.system.datascope.service; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.datascope.DataScopeRoleDao; -import com.gangquan360.smartadmin.module.datascope.constant.DataScopeTypeEnum; -import com.gangquan360.smartadmin.module.datascope.constant.DataScopeViewTypeEnum; -import com.gangquan360.smartadmin.module.datascope.domain.dto.*; -import com.gangquan360.smartadmin.module.datascope.domain.entity.DataScopeRoleEntity; -import com.gangquan360.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.system.datascope.DataScopeRoleDao; +import net.lab1024.smartadmin.module.system.datascope.constant.DataScopeTypeEnum; +import net.lab1024.smartadmin.module.system.datascope.constant.DataScopeViewTypeEnum; +import net.lab1024.smartadmin.module.system.datascope.domain.entity.DataScopeRoleEntity; +import net.lab1024.smartadmin.util.SmartBeanUtil; import com.google.common.collect.Lists; +import net.lab1024.smartadmin.module.system.datascope.domain.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeSqlConfigService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/service/DataScopeSqlConfigService.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeSqlConfigService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/service/DataScopeSqlConfigService.java index 82d744dd..70a9b358 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeSqlConfigService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/service/DataScopeSqlConfigService.java @@ -1,10 +1,10 @@ -package com.gangquan360.smartadmin.module.datascope.service; +package net.lab1024.smartadmin.module.system.datascope.service; -import com.gangquan360.smartadmin.common.anno.DataScope; -import com.gangquan360.smartadmin.module.datascope.constant.DataScopeWhereInTypeEnum; -import com.gangquan360.smartadmin.module.datascope.domain.dto.DataScopeSqlConfigDTO; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; -import com.gangquan360.smartadmin.util.SmartRequestTokenUtil; +import net.lab1024.smartadmin.common.anno.DataScope; +import net.lab1024.smartadmin.module.system.datascope.constant.DataScopeWhereInTypeEnum; +import net.lab1024.smartadmin.module.system.datascope.domain.dto.DataScopeSqlConfigDTO; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.util.SmartRequestTokenUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.reflections.Reflections; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeViewService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/service/DataScopeViewService.java similarity index 84% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeViewService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/service/DataScopeViewService.java index e2481284..28a4cd65 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeViewService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/datascope/service/DataScopeViewService.java @@ -1,18 +1,15 @@ -package com.gangquan360.smartadmin.module.datascope.service; +package net.lab1024.smartadmin.module.system.datascope.service; -import com.gangquan360.smartadmin.module.datascope.DataScopeRoleDao; -import com.gangquan360.smartadmin.module.datascope.constant.DataScopeViewTypeEnum; -import com.gangquan360.smartadmin.module.datascope.domain.entity.DataScopeRoleEntity; -import com.gangquan360.smartadmin.module.department.DepartmentTreeService; -import com.gangquan360.smartadmin.module.employee.EmployeeDao; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeDTO; -import com.gangquan360.smartadmin.module.employee.domain.entity.EmployeeEntity; -import com.gangquan360.smartadmin.module.employee.domain.vo.EmployeeVO; -import com.gangquan360.smartadmin.module.privilege.service.PrivilegeEmployeeService; -import com.gangquan360.smartadmin.module.role.roleemployee.RoleEmployeeDao; -import com.gangquan360.smartadmin.module.systemconfig.SystemConfigService; -import com.gangquan360.smartadmin.module.systemconfig.constant.SystemConfigEnum; -import com.gangquan360.smartadmin.module.systemconfig.domain.dto.SystemConfigDTO; +import net.lab1024.smartadmin.module.system.datascope.DataScopeRoleDao; +import net.lab1024.smartadmin.module.system.datascope.constant.DataScopeViewTypeEnum; +import net.lab1024.smartadmin.module.system.datascope.domain.entity.DataScopeRoleEntity; +import net.lab1024.smartadmin.module.system.department.DepartmentTreeService; +import net.lab1024.smartadmin.module.system.employee.EmployeeDao; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeDTO; +import net.lab1024.smartadmin.module.system.employee.domain.entity.EmployeeEntity; +import net.lab1024.smartadmin.module.system.employee.domain.vo.EmployeeVO; +import net.lab1024.smartadmin.module.system.privilege.service.PrivilegeEmployeeService; +import net.lab1024.smartadmin.module.system.role.roleemployee.RoleEmployeeDao; import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentController.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentController.java index ffa65490..98d477b9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentController.java @@ -1,11 +1,11 @@ -package com.gangquan360.smartadmin.module.department; +package net.lab1024.smartadmin.module.system.department; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.department.domain.dto.DepartmentCreateDTO; -import com.gangquan360.smartadmin.module.department.domain.dto.DepartmentUpdateDTO; -import com.gangquan360.smartadmin.module.department.domain.dto.DepartmentVO; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.system.department.domain.dto.DepartmentCreateDTO; +import net.lab1024.smartadmin.module.system.department.domain.dto.DepartmentUpdateDTO; +import net.lab1024.smartadmin.module.system.department.domain.dto.DepartmentVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentDao.java similarity index 76% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentDao.java index 5c3e3b65..2abe5ffd 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentDao.java @@ -1,8 +1,8 @@ -package com.gangquan360.smartadmin.module.department; +package net.lab1024.smartadmin.module.system.department; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.gangquan360.smartadmin.module.department.domain.dto.DepartmentVO; -import com.gangquan360.smartadmin.module.department.domain.entity.DepartmentEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.lab1024.smartadmin.module.system.department.domain.dto.DepartmentVO; +import net.lab1024.smartadmin.module.system.department.domain.entity.DepartmentEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentResponseCodeConst.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentResponseCodeConst.java index b84c2f5e..9ffacba9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentResponseCodeConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentResponseCodeConst.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.department; +package net.lab1024.smartadmin.module.system.department; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; /** * 部门返回信息常量类 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentService.java similarity index 93% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentService.java index aea9b092..73c9f7f4 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentService.java @@ -1,13 +1,13 @@ -package com.gangquan360.smartadmin.module.department; +package net.lab1024.smartadmin.module.system.department; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.department.domain.dto.DepartmentCreateDTO; -import com.gangquan360.smartadmin.module.department.domain.dto.DepartmentUpdateDTO; -import com.gangquan360.smartadmin.module.department.domain.dto.DepartmentVO; -import com.gangquan360.smartadmin.module.department.domain.entity.DepartmentEntity; -import com.gangquan360.smartadmin.module.employee.EmployeeDao; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeDTO; -import com.gangquan360.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.system.department.domain.dto.DepartmentCreateDTO; +import net.lab1024.smartadmin.module.system.department.domain.dto.DepartmentUpdateDTO; +import net.lab1024.smartadmin.module.system.department.domain.dto.DepartmentVO; +import net.lab1024.smartadmin.module.system.department.domain.entity.DepartmentEntity; +import net.lab1024.smartadmin.module.system.employee.EmployeeDao; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeDTO; +import net.lab1024.smartadmin.util.SmartBeanUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentTreeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentTreeService.java similarity index 96% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentTreeService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentTreeService.java index 034fcde9..b34a2678 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentTreeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/DepartmentTreeService.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.department; +package net.lab1024.smartadmin.module.system.department; -import com.gangquan360.smartadmin.module.department.domain.dto.DepartmentVO; +import net.lab1024.smartadmin.module.system.department.domain.dto.DepartmentVO; import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentCreateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/domain/dto/DepartmentCreateDTO.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentCreateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/domain/dto/DepartmentCreateDTO.java index 58174a5b..3e80003c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentCreateDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/domain/dto/DepartmentCreateDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.department.domain.dto; +package net.lab1024.smartadmin.module.system.department.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/domain/dto/DepartmentUpdateDTO.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/domain/dto/DepartmentUpdateDTO.java index 2f3278a4..f1b108a8 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentUpdateDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/domain/dto/DepartmentUpdateDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.department.domain.dto; +package net.lab1024.smartadmin.module.system.department.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/domain/dto/DepartmentVO.java similarity index 89% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/domain/dto/DepartmentVO.java index a76b3b73..067e174d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/domain/dto/DepartmentVO.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.department.domain.dto; +package net.lab1024.smartadmin.module.system.department.domain.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeDTO; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/entity/DepartmentEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/domain/entity/DepartmentEntity.java similarity index 78% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/entity/DepartmentEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/domain/entity/DepartmentEntity.java index f24cd594..26023788 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/entity/DepartmentEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/department/domain/entity/DepartmentEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.department.domain.entity; +package net.lab1024.smartadmin.module.system.department.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; import java.io.Serializable; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeController.java similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeController.java index 4aa57358..9b4273a4 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeController.java @@ -1,13 +1,14 @@ -package com.gangquan360.smartadmin.module.employee; +package net.lab1024.smartadmin.module.system.employee; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.employee.domain.dto.*; -import com.gangquan360.smartadmin.module.employee.domain.vo.EmployeeVO; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; -import com.gangquan360.smartadmin.util.SmartRequestTokenUtil; +import net.lab1024.smartadmin.common.anno.NoValidPrivilege; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.system.employee.domain.dto.*; +import net.lab1024.smartadmin.module.system.employee.domain.vo.EmployeeVO; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.util.SmartRequestTokenUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +37,13 @@ public class EmployeeController { return employeeService.selectEmployeeList(query); } + @GetMapping("/employee/get/all") + @ApiOperation(value = "查询所有员工基本信息，用于选择框", notes = "查询所有员工基本信息，用于选择框") + @NoValidPrivilege + public ResponseDTO> getAll() { + return ResponseDTO.succData(employeeService.getAllEmployee()); + } + @ApiOperation(value = "添加员工", notes = "@author yandanyang") @PostMapping("/employee/add") public ResponseDTO addEmployee(@Valid @RequestBody EmployeeAddDTO emp) { @@ -77,8 +85,8 @@ public class EmployeeController { @PostMapping("/employee/updatePwd") public ResponseDTO updatePwd(@Valid @RequestBody EmployeeUpdatePwdDTO updatePwdDTO) { RequestTokenBO requestToken = SmartRequestTokenUtil.getRequestUser(); - return employeeService.updatePwd(updatePwdDTO, requestToken); -// return ResponseDTO.succ(); +// return employeeService.updatePwd(updatePwdDTO, requestToken); + return ResponseDTO.succ(); } @ApiOperation(value = "通过部门id获取当前部门的人员&没有部门的人", notes = "@author yandanyang") diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeDao.java similarity index 80% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeDao.java index 7191f1b1..11ce08a9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeDao.java @@ -1,12 +1,12 @@ -package com.gangquan360.smartadmin.module.employee; +package net.lab1024.smartadmin.module.system.employee; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeDTO; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeQueryDTO; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeQueryExportDTO; -import com.gangquan360.smartadmin.module.employee.domain.entity.EmployeeEntity; -import com.gangquan360.smartadmin.module.employee.domain.vo.EmployeeVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeDTO; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeQueryDTO; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeQueryExportDTO; +import net.lab1024.smartadmin.module.system.employee.domain.entity.EmployeeEntity; +import net.lab1024.smartadmin.module.system.employee.domain.vo.EmployeeVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @@ -126,4 +126,9 @@ public interface EmployeeDao extends BaseMapper { Integer updatePassword(@Param("employeeId") Integer employeeId, @Param("password") String password); + /** + * 查询所有员工 + * @return + */ + List selectAll(); } \ No newline at end of file diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java index 9e1403be..700ca99a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java @@ -1,30 +1,30 @@ -package com.gangquan360.smartadmin.module.employee; +package net.lab1024.smartadmin.module.system.employee; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.common.constant.JudgeEnum; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.CommonConst; -import com.gangquan360.smartadmin.module.department.DepartmentDao; -import com.gangquan360.smartadmin.module.department.domain.entity.DepartmentEntity; -import com.gangquan360.smartadmin.module.employee.constant.EmployeeResponseCodeConst; -import com.gangquan360.smartadmin.module.employee.constant.EmployeeStatusEnum; -import com.gangquan360.smartadmin.module.employee.domain.bo.EmployeeBO; -import com.gangquan360.smartadmin.module.employee.domain.dto.*; -import com.gangquan360.smartadmin.module.employee.domain.entity.EmployeeEntity; -import com.gangquan360.smartadmin.module.employee.domain.vo.EmployeeVO; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; -import com.gangquan360.smartadmin.module.position.PositionDao; -import com.gangquan360.smartadmin.module.position.PositionService; -import com.gangquan360.smartadmin.module.position.domain.dto.PositionRelationAddDTO; -import com.gangquan360.smartadmin.module.position.domain.dto.PositionRelationResultDTO; -import com.gangquan360.smartadmin.module.privilege.service.PrivilegeEmployeeService; -import com.gangquan360.smartadmin.module.role.roleemployee.RoleEmployeeDao; -import com.gangquan360.smartadmin.module.role.roleemployee.domain.RoleEmployeeEntity; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartDigestUtil; -import com.gangquan360.smartadmin.util.SmartPaginationUtil; -import com.gangquan360.smartadmin.util.SmartVerificationUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.constant.JudgeEnum; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.CommonConst; +import net.lab1024.smartadmin.module.system.department.DepartmentDao; +import net.lab1024.smartadmin.module.system.department.domain.entity.DepartmentEntity; +import net.lab1024.smartadmin.module.system.employee.constant.EmployeeResponseCodeConst; +import net.lab1024.smartadmin.module.system.employee.constant.EmployeeStatusEnum; +import net.lab1024.smartadmin.module.system.employee.domain.bo.EmployeeBO; +import net.lab1024.smartadmin.module.system.employee.domain.dto.*; +import net.lab1024.smartadmin.module.system.employee.domain.entity.EmployeeEntity; +import net.lab1024.smartadmin.module.system.employee.domain.vo.EmployeeVO; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.module.system.position.PositionDao; +import net.lab1024.smartadmin.module.system.position.PositionService; +import net.lab1024.smartadmin.module.system.position.domain.dto.PositionRelationAddDTO; +import net.lab1024.smartadmin.module.system.position.domain.dto.PositionRelationResultDTO; +import net.lab1024.smartadmin.module.system.privilege.service.PrivilegeEmployeeService; +import net.lab1024.smartadmin.module.system.role.roleemployee.RoleEmployeeDao; +import net.lab1024.smartadmin.module.system.role.roleemployee.domain.RoleEmployeeEntity; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartDigestUtil; +import net.lab1024.smartadmin.util.SmartPageUtil; +import net.lab1024.smartadmin.util.SmartVerificationUtil; import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; @@ -74,6 +74,9 @@ public class EmployeeService { */ private static final ConcurrentHashMap employeeCache = new ConcurrentHashMap<>(); + public List getAllEmployee(){ + return employeeDao.selectAll(); + } public EmployeeBO getById(Long id) { EmployeeBO employeeBO = employeeCache.get(id); @@ -95,7 +98,7 @@ public class EmployeeService { * @return */ public ResponseDTO> selectEmployeeList(EmployeeQueryDTO queryDTO) { - Page pageParam = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page pageParam = SmartPageUtil.convert2QueryPage(queryDTO); queryDTO.setIsDelete(JudgeEnum.NO.getValue()); List employeeList = employeeDao.selectEmployeeList(pageParam, queryDTO); List employeeIdList = employeeList.stream().map(EmployeeDTO::getId).collect(Collectors.toList()); @@ -122,7 +125,7 @@ public class EmployeeService { } } } - return ResponseDTO.succData(SmartPaginationUtil.convert2PageResultDTO(pageParam, employeeList, EmployeeVO.class)); + return ResponseDTO.succData(SmartPageUtil.convert2PageResult(pageParam, employeeList, EmployeeVO.class)); } /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/constant/EmployeeResponseCodeConst.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/constant/EmployeeResponseCodeConst.java index 5e3d45f7..379b8be7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeResponseCodeConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/constant/EmployeeResponseCodeConst.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.employee.constant; +package net.lab1024.smartadmin.module.system.employee.constant; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; /** * 员工常量类 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeStatusEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/constant/EmployeeStatusEnum.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeStatusEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/constant/EmployeeStatusEnum.java index 45eafe0e..3c07ce72 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeStatusEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/constant/EmployeeStatusEnum.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.employee.constant; +package net.lab1024.smartadmin.module.system.employee.constant; -import com.gangquan360.smartadmin.common.domain.BaseEnum; +import net.lab1024.smartadmin.common.domain.BaseEnum; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/bo/EmployeeBO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/bo/EmployeeBO.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/bo/EmployeeBO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/bo/EmployeeBO.java index ed22d060..57050a5c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/bo/EmployeeBO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/bo/EmployeeBO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.employee.domain.bo; +package net.lab1024.smartadmin.module.system.employee.domain.bo; -import com.gangquan360.smartadmin.module.employee.domain.entity.EmployeeEntity; +import net.lab1024.smartadmin.module.system.employee.domain.entity.EmployeeEntity; import lombok.Getter; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeAddDTO.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeAddDTO.java index 4a9c95c7..bb1ac368 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeAddDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeAddDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.employee.domain.dto; +package net.lab1024.smartadmin.module.system.employee.domain.dto; -import com.gangquan360.smartadmin.util.SmartVerificationUtil; +import net.lab1024.smartadmin.util.SmartVerificationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBaseDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeBaseDTO.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBaseDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeBaseDTO.java index 35099d88..0931bdb4 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBaseDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeBaseDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.employee.domain.dto; +package net.lab1024.smartadmin.module.system.employee.domain.dto; -import com.gangquan360.smartadmin.util.SmartVerificationUtil; +import net.lab1024.smartadmin.util.SmartVerificationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBatchUpdateStatusDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeBatchUpdateStatusDTO.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBatchUpdateStatusDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeBatchUpdateStatusDTO.java index 1f2a2c29..7d9db716 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBatchUpdateStatusDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeBatchUpdateStatusDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.employee.domain.dto; +package net.lab1024.smartadmin.module.system.employee.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeDTO.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeDTO.java index f5033ec4..61b49e1a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeDTO.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.employee.domain.dto; +package net.lab1024.smartadmin.module.system.employee.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.gangquan360.smartadmin.module.position.domain.dto.PositionRelationResultDTO; +import net.lab1024.smartadmin.module.system.position.domain.dto.PositionRelationResultDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeLoginFormDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeLoginFormDTO.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeLoginFormDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeLoginFormDTO.java index c4220a64..e72d1611 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeLoginFormDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeLoginFormDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.employee.domain.dto; +package net.lab1024.smartadmin.module.system.employee.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeQueryDTO.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeQueryDTO.java index c023261e..e384a4da 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeQueryDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.employee.domain.dto; +package net.lab1024.smartadmin.module.system.employee.domain.dto; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageParamDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryExportDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeQueryExportDTO.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryExportDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeQueryExportDTO.java index c94da314..645bd213 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryExportDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeQueryExportDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.employee.domain.dto; +package net.lab1024.smartadmin.module.system.employee.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeUpdateDTO.java similarity index 89% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeUpdateDTO.java index d266fd5d..d835c522 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeUpdateDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.employee.domain.dto; +package net.lab1024.smartadmin.module.system.employee.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdatePwdDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeUpdatePwdDTO.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdatePwdDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeUpdatePwdDTO.java index 2056c178..f5841c31 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdatePwdDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeUpdatePwdDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.employee.domain.dto; +package net.lab1024.smartadmin.module.system.employee.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateRolesDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeUpdateRolesDTO.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateRolesDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeUpdateRolesDTO.java index b81b826f..2829ba1a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateRolesDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/dto/EmployeeUpdateRolesDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.employee.domain.dto; +package net.lab1024.smartadmin.module.system.employee.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/entity/EmployeeEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/entity/EmployeeEntity.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/entity/EmployeeEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/entity/EmployeeEntity.java index b4b1da84..1744ee1b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/entity/EmployeeEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/entity/EmployeeEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.employee.domain.entity; +package net.lab1024.smartadmin.module.system.employee.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; import java.io.Serializable; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/vo/EmployeeVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/vo/EmployeeVO.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/vo/EmployeeVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/vo/EmployeeVO.java index 8f9e9d36..a180d59b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/vo/EmployeeVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/domain/vo/EmployeeVO.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.employee.domain.vo; +package net.lab1024.smartadmin.module.system.employee.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.gangquan360.smartadmin.module.position.domain.dto.PositionRelationResultDTO; +import net.lab1024.smartadmin.module.system.position.domain.dto.PositionRelationResultDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/PositionController.java similarity index 74% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/PositionController.java index 548068ca..0f1a311e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/PositionController.java @@ -1,13 +1,13 @@ -package com.gangquan360.smartadmin.module.position; +package net.lab1024.smartadmin.module.system.position; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.position.domain.dto.PositionAddDTO; -import com.gangquan360.smartadmin.module.position.domain.dto.PositionQueryDTO; -import com.gangquan360.smartadmin.module.position.domain.dto.PositionResultVO; -import com.gangquan360.smartadmin.module.position.domain.dto.PositionUpdateDTO; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.system.position.domain.dto.PositionAddDTO; +import net.lab1024.smartadmin.module.system.position.domain.dto.PositionQueryDTO; +import net.lab1024.smartadmin.module.system.position.domain.dto.PositionResultVO; +import net.lab1024.smartadmin.module.system.position.domain.dto.PositionUpdateDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/PositionDao.java similarity index 63% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/PositionDao.java index e7c95fcc..68423c59 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/PositionDao.java @@ -1,12 +1,12 @@ -package com.gangquan360.smartadmin.module.position; +package net.lab1024.smartadmin.module.system.position; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.baomidou.mybatisplus.plugins.pagination.Pagination; -import com.gangquan360.smartadmin.module.position.domain.dto.PositionQueryDTO; -import com.gangquan360.smartadmin.module.position.domain.dto.PositionRelationAddDTO; -import com.gangquan360.smartadmin.module.position.domain.dto.PositionRelationQueryDTO; -import com.gangquan360.smartadmin.module.position.domain.dto.PositionRelationResultDTO; -import com.gangquan360.smartadmin.module.position.domain.entity.PositionEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.module.system.position.domain.dto.PositionQueryDTO; +import net.lab1024.smartadmin.module.system.position.domain.dto.PositionRelationAddDTO; +import net.lab1024.smartadmin.module.system.position.domain.dto.PositionRelationQueryDTO; +import net.lab1024.smartadmin.module.system.position.domain.dto.PositionRelationResultDTO; +import net.lab1024.smartadmin.module.system.position.domain.entity.PositionEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @@ -27,7 +27,7 @@ public interface PositionDao extends BaseMapper { * @param queryDTO * @return */ - List selectByPage(Pagination page, PositionQueryDTO queryDTO); + List selectByPage(Page page, @Param("queryDTO") PositionQueryDTO queryDTO); /** * 查询岗位与人员关系 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/PositionResponseCodeConst.java similarity index 73% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/PositionResponseCodeConst.java index 5e8d66da..43528034 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionResponseCodeConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/PositionResponseCodeConst.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.position; +package net.lab1024.smartadmin.module.system.position; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; /** * @author zzr diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/PositionService.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/PositionService.java index 3f6efe61..58468969 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/PositionService.java @@ -1,12 +1,12 @@ -package com.gangquan360.smartadmin.module.position; +package net.lab1024.smartadmin.module.system.position; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.position.domain.dto.*; -import com.gangquan360.smartadmin.module.position.domain.entity.PositionEntity; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartPaginationUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.system.position.domain.dto.*; +import net.lab1024.smartadmin.module.system.position.domain.entity.PositionEntity; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartPageUtil; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,10 +30,10 @@ public class PositionService { * @return */ public ResponseDTO> queryPositionByPage(PositionQueryDTO queryDTO) { - Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page page = SmartPageUtil.convert2QueryPage(queryDTO); List entityList = positionDao.selectByPage(page, queryDTO); page.setRecords(entityList.stream().map(e -> SmartBeanUtil.copy(e, PositionResultVO.class)).collect(Collectors.toList())); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page); return ResponseDTO.succData(pageResultDTO); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionAddDTO.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionAddDTO.java index b061af61..d7b4d8b6 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionAddDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionAddDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.position.domain.dto; +package net.lab1024.smartadmin.module.system.position.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionQueryDTO.java similarity index 65% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionQueryDTO.java index b4bd5d8e..6ab8d066 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionQueryDTO.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.position.domain.dto; +package net.lab1024.smartadmin.module.system.position.domain.dto; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageParamDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionRelationAddDTO.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionRelationAddDTO.java index fbbbaaf1..509c1a22 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationAddDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionRelationAddDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.position.domain.dto; +package net.lab1024.smartadmin.module.system.position.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionRelationQueryDTO.java similarity index 81% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionRelationQueryDTO.java index ed6803f5..3732cd50 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionRelationQueryDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.position.domain.dto; +package net.lab1024.smartadmin.module.system.position.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationResultDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionRelationResultDTO.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationResultDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionRelationResultDTO.java index 865e3431..1881904f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationResultDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionRelationResultDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.position.domain.dto; +package net.lab1024.smartadmin.module.system.position.domain.dto; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionResultVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionResultVO.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionResultVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionResultVO.java index ff317fb0..3bc89efd 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionResultVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionResultVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.position.domain.dto; +package net.lab1024.smartadmin.module.system.position.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionUpdateDTO.java similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionUpdateDTO.java index 52c2e1cd..659da733 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionUpdateDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/dto/PositionUpdateDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.position.domain.dto; +package net.lab1024.smartadmin.module.system.position.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/entity/PositionEntity.java similarity index 60% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/entity/PositionEntity.java index 23d1c9d6..a42af4ac 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/entity/PositionEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.position.domain.entity; +package net.lab1024.smartadmin.module.system.position.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionRelationEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/entity/PositionRelationEntity.java similarity index 61% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionRelationEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/entity/PositionRelationEntity.java index 1478134b..b7ff8676 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionRelationEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/position/domain/entity/PositionRelationEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.position.domain.entity; +package net.lab1024.smartadmin.module.system.position.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/constant/PrivilegeResponseCodeConst.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/constant/PrivilegeResponseCodeConst.java index dd5f09fc..1943ed92 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeResponseCodeConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/constant/PrivilegeResponseCodeConst.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.privilege.constant; +package net.lab1024.smartadmin.module.system.privilege.constant; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/constant/PrivilegeTypeEnum.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/constant/PrivilegeTypeEnum.java index 137d5f20..96b175e6 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeTypeEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/constant/PrivilegeTypeEnum.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.privilege.constant; +package net.lab1024.smartadmin.module.system.privilege.constant; -import com.gangquan360.smartadmin.common.domain.BaseEnum; +import net.lab1024.smartadmin.common.domain.BaseEnum; import java.util.Arrays; import java.util.Optional; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/controller/PrivilegeController.java similarity index 73% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/controller/PrivilegeController.java index 1cc61d83..917386e4 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/controller/PrivilegeController.java @@ -1,13 +1,13 @@ -package com.gangquan360.smartadmin.module.privilege.controller; +package net.lab1024.smartadmin.module.system.privilege.controller; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.common.domain.ValidateList; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.privilege.domain.dto.*; -import com.gangquan360.smartadmin.module.privilege.service.PrivilegeService; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.common.domain.ValidateList; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.system.privilege.service.PrivilegeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import net.lab1024.smartadmin.module.system.privilege.domain.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -41,8 +41,8 @@ public class PrivilegeController { @ApiOperation(value = "菜单批量保存") @PostMapping("/privilege/menu/batchSaveMenu") public ResponseDTO menuBatchSave(@Valid @RequestBody ValidateList menuList) { - return privilegeService.menuBatchSave(menuList); -// return ResponseDTO.succ(); +// return privilegeService.menuBatchSave(menuList); + return ResponseDTO.succ(); } @@ -56,8 +56,8 @@ public class PrivilegeController { @ApiOperation(value = "保存更新功能点") @PostMapping("/privilege/function/saveOrUpdate") public ResponseDTO functionSaveOrUpdate(@Valid @RequestBody PrivilegeFunctionDTO privilegeFunctionDTO) { - return privilegeService.functionSaveOrUpdate(privilegeFunctionDTO); -// return ResponseDTO.succ(); +// return privilegeService.functionSaveOrUpdate(privilegeFunctionDTO); + return ResponseDTO.succ(); } @ApiOperation(value = "查询菜单功能点", notes = "更新") diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/dao/PrivilegeDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/dao/PrivilegeDao.java similarity index 89% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/dao/PrivilegeDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/dao/PrivilegeDao.java index aaa8d5cd..c16692ef 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/dao/PrivilegeDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/dao/PrivilegeDao.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.privilege.dao; +package net.lab1024.smartadmin.module.system.privilege.dao; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.gangquan360.smartadmin.module.privilege.domain.entity.PrivilegeEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.lab1024.smartadmin.module.system.privilege.domain.entity.PrivilegeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeFunctionDTO.java similarity index 89% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeFunctionDTO.java index 8feca1be..0e15a42c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeFunctionDTO.java @@ -1,10 +1,9 @@ -package com.gangquan360.smartadmin.module.privilege.domain.dto; +package net.lab1024.smartadmin.module.system.privilege.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeFunctionVO.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeFunctionVO.java index 337317a3..fd89f959 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeFunctionVO.java @@ -1,11 +1,10 @@ -package com.gangquan360.smartadmin.module.privilege.domain.dto; +package net.lab1024.smartadmin.module.system.privilege.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; -import java.util.List; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeMenuDTO.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeMenuDTO.java index fc13811d..137f827d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeMenuDTO.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.privilege.domain.dto; +package net.lab1024.smartadmin.module.system.privilege.domain.dto; -import com.gangquan360.smartadmin.common.anno.ApiModelPropertyEnum; -import com.gangquan360.smartadmin.module.privilege.constant.PrivilegeTypeEnum; +import net.lab1024.smartadmin.common.anno.ApiModelPropertyEnum; +import net.lab1024.smartadmin.module.system.privilege.constant.PrivilegeTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeMenuVO.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeMenuVO.java index a573f39a..72febd9c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeMenuVO.java @@ -1,11 +1,8 @@ -package com.gangquan360.smartadmin.module.privilege.domain.dto; +package net.lab1024.smartadmin.module.system.privilege.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; -import java.util.List; - /** * [ ] * diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeRequestUrlVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeRequestUrlVO.java similarity index 88% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeRequestUrlVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeRequestUrlVO.java index 87757aaa..d227c04d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeRequestUrlVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/dto/PrivilegeRequestUrlVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.privilege.domain.dto; +package net.lab1024.smartadmin.module.system.privilege.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/entity/PrivilegeEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/entity/PrivilegeEntity.java similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/entity/PrivilegeEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/entity/PrivilegeEntity.java index 0eab5264..df49b874 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/entity/PrivilegeEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/domain/entity/PrivilegeEntity.java @@ -1,7 +1,8 @@ -package com.gangquan360.smartadmin.module.privilege.domain.entity; +package net.lab1024.smartadmin.module.system.privilege.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; import java.io.Serializable; @@ -35,6 +36,7 @@ public class PrivilegeEntity extends BaseEntity implements Serializable { /** * 路由name 英文关键字 */ + @TableField(value = "`key`") private String key; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeEmployeeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/service/PrivilegeEmployeeService.java similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeEmployeeService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/service/PrivilegeEmployeeService.java index e843ff1f..366e567f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeEmployeeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/service/PrivilegeEmployeeService.java @@ -1,18 +1,18 @@ -package com.gangquan360.smartadmin.module.privilege.service; +package net.lab1024.smartadmin.module.system.privilege.service; -import com.gangquan360.smartadmin.common.constant.JudgeEnum; -import com.gangquan360.smartadmin.common.exception.SmartBusinessException; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeDTO; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; -import com.gangquan360.smartadmin.module.privilege.constant.PrivilegeTypeEnum; -import com.gangquan360.smartadmin.module.privilege.dao.PrivilegeDao; -import com.gangquan360.smartadmin.module.privilege.domain.entity.PrivilegeEntity; -import com.gangquan360.smartadmin.module.role.roleemployee.RoleEmployeeDao; -import com.gangquan360.smartadmin.module.role.roleprivilege.RolePrivilegeDao; -import com.gangquan360.smartadmin.module.systemconfig.SystemConfigService; -import com.gangquan360.smartadmin.module.systemconfig.constant.SystemConfigEnum; -import com.gangquan360.smartadmin.module.systemconfig.domain.dto.SystemConfigDTO; -import com.gangquan360.smartadmin.util.SmartStringUtil; +import net.lab1024.smartadmin.common.constant.JudgeEnum; +import net.lab1024.smartadmin.common.exception.SmartBusinessException; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeDTO; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.module.system.privilege.constant.PrivilegeTypeEnum; +import net.lab1024.smartadmin.module.system.privilege.dao.PrivilegeDao; +import net.lab1024.smartadmin.module.system.privilege.domain.entity.PrivilegeEntity; +import net.lab1024.smartadmin.module.system.role.roleemployee.RoleEmployeeDao; +import net.lab1024.smartadmin.module.system.role.roleprivilege.RolePrivilegeDao; +import net.lab1024.smartadmin.module.system.systemconfig.SystemConfigService; +import net.lab1024.smartadmin.module.system.systemconfig.constant.SystemConfigEnum; +import net.lab1024.smartadmin.module.system.systemconfig.domain.dto.SystemConfigDTO; +import net.lab1024.smartadmin.util.SmartStringUtil; import com.google.common.collect.Lists; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import org.apache.commons.collections.CollectionUtils; @@ -88,7 +88,7 @@ public class PrivilegeEmployeeService { return urlList.contains(methodName); } - public List getEmployeeAllPrivilege(Long employeeId){ + public List getEmployeeAllPrivilege(Long employeeId) { return employeePrivilegeListMap.get(employeeId); } @@ -115,16 +115,19 @@ public class PrivilegeEmployeeService { * @return */ public List getPrivilegesByEmployeeId(Long employeeId) { + List privilegeEntities = null; // 如果是超管的话 Boolean isSuperman = this.isSuperman(employeeId); if (isSuperman) { - List privilegeEntities = privilegeDao.selectAll(); - if (privilegeEntities == null) { - return Lists.newArrayList(); - } - return privilegeEntities; + privilegeEntities = privilegeDao.selectAll(); + } else { + privilegeEntities = loadPrivilegeFromDb(employeeId); } - List privilegeEntities = loadPrivilegeFromDb(employeeId); + + if (privilegeEntities == null) { + privilegeEntities = Lists.newArrayList(); + } + this.updateCachePrivilege(employeeId, privilegeEntities); return privilegeEntities; } @@ -157,13 +160,13 @@ public class PrivilegeEmployeeService { } public Map> updateCachePrivilege(Long employeeId, List privilegeEntities) { - employeePrivilegeListMap.put(employeeId,privilegeEntities); + employeePrivilegeListMap.put(employeeId, privilegeEntities); List privilegeList = new ArrayList<>(); Map> privilegeMap = new HashMap<>(16); if (CollectionUtils.isNotEmpty(privilegeEntities)) { List> setList = - privilegeEntities.stream().filter(e -> e.getType().equals(PrivilegeTypeEnum.POINTS.getValue())).map(PrivilegeEntity :: getUrl).collect(Collectors.toList()).stream().map(e -> SmartStringUtil.splitConvertToList(e, ",")).collect(Collectors.toList()); - setList.forEach(privilegeList :: addAll); + privilegeEntities.stream().filter(e -> e.getType().equals(PrivilegeTypeEnum.POINTS.getValue())).map(PrivilegeEntity::getUrl).collect(Collectors.toList()).stream().map(e -> SmartStringUtil.splitConvertToList(e, ",")).collect(Collectors.toList()); + setList.forEach(privilegeList::addAll); } privilegeList.forEach(item -> { List path = SmartStringUtil.splitConvertToList(item, "\\."); @@ -173,7 +176,7 @@ public class PrivilegeEmployeeService { if (null == methodNameList) { methodNameList = new ArrayList(); } - if (! methodNameList.contains(methodName)) { + if (!methodNameList.contains(methodName)) { methodNameList.add(methodName); } privilegeMap.put(controllerName, methodNameList); diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeRequestUrlService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/service/PrivilegeRequestUrlService.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeRequestUrlService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/service/PrivilegeRequestUrlService.java index 3be2af57..f9aa07aa 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeRequestUrlService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/service/PrivilegeRequestUrlService.java @@ -1,8 +1,8 @@ -package com.gangquan360.smartadmin.module.privilege.service; +package net.lab1024.smartadmin.module.system.privilege.service; -import com.gangquan360.smartadmin.constant.CommonConst; -import com.gangquan360.smartadmin.module.privilege.domain.dto.PrivilegeRequestUrlVO; -import com.gangquan360.smartadmin.util.SmartStringUtil; +import net.lab1024.smartadmin.constant.CommonConst; +import net.lab1024.smartadmin.module.system.privilege.domain.dto.PrivilegeRequestUrlVO; +import net.lab1024.smartadmin.util.SmartStringUtil; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import io.swagger.annotations.ApiModelProperty; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/service/PrivilegeService.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/service/PrivilegeService.java index dafa33ab..eb16a8e0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/service/PrivilegeService.java @@ -1,12 +1,12 @@ -package com.gangquan360.smartadmin.module.privilege.service; +package net.lab1024.smartadmin.module.system.privilege.service; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.privilege.constant.PrivilegeTypeEnum; -import com.gangquan360.smartadmin.module.privilege.dao.PrivilegeDao; -import com.gangquan360.smartadmin.module.privilege.domain.dto.*; -import com.gangquan360.smartadmin.module.privilege.domain.entity.PrivilegeEntity; -import com.gangquan360.smartadmin.module.role.roleprivilege.RolePrivilegeDao; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.system.privilege.constant.PrivilegeTypeEnum; +import net.lab1024.smartadmin.module.system.privilege.dao.PrivilegeDao; +import net.lab1024.smartadmin.module.system.privilege.domain.entity.PrivilegeEntity; +import net.lab1024.smartadmin.module.system.role.roleprivilege.RolePrivilegeDao; import com.google.common.collect.Lists; +import net.lab1024.smartadmin.module.system.privilege.domain.dto.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -61,6 +61,11 @@ public class PrivilegeService { if (CollectionUtils.isEmpty(menuList)) { return ResponseDTO.succ(); } + //使用前端发送权限的排序 + for (int i = 0; i < menuList.size(); i++) { + menuList.get(i).setSort(i); + } + List privilegeList = privilegeDao.selectByExcludeType(PrivilegeTypeEnum.POINTS.getValue()); //若数据库无数据 直接全部保存 if (CollectionUtils.isEmpty(privilegeList)) { diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleController.java similarity index 74% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleController.java index 88ff9ab5..9974a75c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleController.java @@ -1,10 +1,10 @@ -package com.gangquan360.smartadmin.module.role.basic; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleAddDTO; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleUpdateDTO; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleVO; +package net.lab1024.smartadmin.module.system.role.basic; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleAddDTO; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleUpdateDTO; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -42,7 +42,8 @@ public class RoleController { @ApiOperation(value = "更新角色", notes = "更新角色") @PostMapping("/role/update") public ResponseDTO updateRole(@Valid @RequestBody RoleUpdateDTO roleUpdateDTO) { - return roleService.updateRole(roleUpdateDTO); +// return roleService.updateRole(roleUpdateDTO); + return ResponseDTO.succ(); } @ApiOperation(value = "获取角色数据", notes = "根据id获取角色数据") diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleDao.java similarity index 71% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleDao.java index 22c6c1e2..91b83b4f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleDao.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.role.basic; +package net.lab1024.smartadmin.module.system.role.basic; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.gangquan360.smartadmin.module.role.basic.domain.entity.RoleEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.lab1024.smartadmin.module.system.role.basic.domain.entity.RoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleResponseCodeConst.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleResponseCodeConst.java index 62bb0573..c1818465 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleResponseCodeConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleResponseCodeConst.java @@ -1,5 +1,5 @@ -package com.gangquan360.smartadmin.module.role.basic; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; +package net.lab1024.smartadmin.module.system.role.basic; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; /** * diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleService.java similarity index 80% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleService.java index 9f90c3ae..cd0d6444 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleService.java @@ -1,14 +1,13 @@ -package com.gangquan360.smartadmin.module.role.basic; +package net.lab1024.smartadmin.module.system.role.basic; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleAddDTO; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleUpdateDTO; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleVO; -import com.gangquan360.smartadmin.module.role.basic.domain.entity.RoleEntity; -import com.gangquan360.smartadmin.module.role.roleemployee.RoleEmployeeDao; -import com.gangquan360.smartadmin.module.role.roleprivilege.RolePrivilegeDao; -import com.gangquan360.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleAddDTO; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleUpdateDTO; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleVO; +import net.lab1024.smartadmin.module.system.role.basic.domain.entity.RoleEntity; +import net.lab1024.smartadmin.module.system.role.roleemployee.RoleEmployeeDao; +import net.lab1024.smartadmin.module.system.role.roleprivilege.RolePrivilegeDao; +import net.lab1024.smartadmin.util.SmartBeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -108,7 +107,7 @@ public class RoleService { * @return ResponseDTO */ public ResponseDTO> getAllRole() { - List roleEntityList = roleDao.selectList(new EntityWrapper()); + List roleEntityList = roleDao.selectList(null); List roleList = SmartBeanUtil.copyList(roleEntityList, RoleVO.class); return ResponseDTO.succData(roleList); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleAddDTO.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleAddDTO.java index f0f5af9a..ba66b68e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleAddDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleAddDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.role.basic.domain.dto; +package net.lab1024.smartadmin.module.system.role.basic.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleBatchDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleBatchDTO.java similarity index 89% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleBatchDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleBatchDTO.java index 487675ca..af01cf8c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleBatchDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleBatchDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.role.basic.domain.dto; +package net.lab1024.smartadmin.module.system.role.basic.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleQueryDTO.java similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleQueryDTO.java index b46eda46..08f2a94b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleQueryDTO.java @@ -1,5 +1,5 @@ -package com.gangquan360.smartadmin.module.role.basic.domain.dto; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; +package net.lab1024.smartadmin.module.system.role.basic.domain.dto; +import net.lab1024.smartadmin.common.domain.PageParamDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleSelectedVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleSelectedVO.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleSelectedVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleSelectedVO.java index b16854f6..9a88d6d2 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleSelectedVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleSelectedVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.role.basic.domain.dto; +package net.lab1024.smartadmin.module.system.role.basic.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleUpdateDTO.java similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleUpdateDTO.java index 27f6a773..adde4749 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleUpdateDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleUpdateDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.role.basic.domain.dto; +package net.lab1024.smartadmin.module.system.role.basic.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleVO.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleVO.java index f8bdbbdd..9f3eed90 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/dto/RoleVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.role.basic.domain.dto; +package net.lab1024.smartadmin.module.system.role.basic.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/entity/RoleEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/entity/RoleEntity.java similarity index 66% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/entity/RoleEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/entity/RoleEntity.java index ab28dca9..ff9d650f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/entity/RoleEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/domain/entity/RoleEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.role.basic.domain.entity; +package net.lab1024.smartadmin.module.system.role.basic.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/RoleEmployeeController.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/RoleEmployeeController.java index 12045d46..72c4e507 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/RoleEmployeeController.java @@ -1,13 +1,13 @@ -package com.gangquan360.smartadmin.module.role.roleemployee; +package net.lab1024.smartadmin.module.system.role.roleemployee; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.employee.domain.vo.EmployeeVO; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleBatchDTO; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleQueryDTO; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleSelectedVO; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.system.employee.domain.vo.EmployeeVO; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleBatchDTO; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleQueryDTO; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleSelectedVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/RoleEmployeeDao.java similarity index 76% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/RoleEmployeeDao.java index 5f09bd37..08a484e7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/RoleEmployeeDao.java @@ -1,10 +1,10 @@ -package com.gangquan360.smartadmin.module.role.roleemployee; +package net.lab1024.smartadmin.module.system.role.roleemployee; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeDTO; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleQueryDTO; -import com.gangquan360.smartadmin.module.role.roleemployee.domain.RoleEmployeeEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeDTO; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleQueryDTO; +import net.lab1024.smartadmin.module.system.role.roleemployee.domain.RoleEmployeeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @@ -38,7 +38,7 @@ public interface RoleEmployeeDao extends BaseMapper { * @param queryDTO * @return */ - List selectEmployeeByNamePage(Page page,@Param("queryDTO") RoleQueryDTO queryDTO); + List selectEmployeeByNamePage(Page page, @Param("queryDTO") RoleQueryDTO queryDTO); /** * diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/RoleEmployeeService.java similarity index 72% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/RoleEmployeeService.java index 33653f74..cf57ed4f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/RoleEmployeeService.java @@ -1,22 +1,21 @@ -package com.gangquan360.smartadmin.module.role.roleemployee; +package net.lab1024.smartadmin.module.system.role.roleemployee; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.department.DepartmentDao; -import com.gangquan360.smartadmin.module.department.domain.entity.DepartmentEntity; -import com.gangquan360.smartadmin.module.employee.domain.dto.EmployeeDTO; -import com.gangquan360.smartadmin.module.employee.domain.vo.EmployeeVO; -import com.gangquan360.smartadmin.module.role.basic.RoleDao; -import com.gangquan360.smartadmin.module.role.basic.RoleResponseCodeConst; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleBatchDTO; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleQueryDTO; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleSelectedVO; -import com.gangquan360.smartadmin.module.role.basic.domain.dto.RoleVO; -import com.gangquan360.smartadmin.module.role.roleemployee.domain.RoleEmployeeEntity; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartPaginationUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.system.department.DepartmentDao; +import net.lab1024.smartadmin.module.system.department.domain.entity.DepartmentEntity; +import net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeDTO; +import net.lab1024.smartadmin.module.system.employee.domain.vo.EmployeeVO; +import net.lab1024.smartadmin.module.system.role.basic.RoleDao; +import net.lab1024.smartadmin.module.system.role.basic.RoleResponseCodeConst; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleBatchDTO; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleQueryDTO; +import net.lab1024.smartadmin.module.system.role.basic.domain.dto.RoleSelectedVO; +import net.lab1024.smartadmin.module.system.role.basic.domain.entity.RoleEntity; +import net.lab1024.smartadmin.module.system.role.roleemployee.domain.RoleEmployeeEntity; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartPageUtil; import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,13 +48,13 @@ public class RoleEmployeeService { * @return */ public ResponseDTO> listEmployeeByName(RoleQueryDTO queryDTO) { - Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page page = SmartPageUtil.convert2QueryPage(queryDTO); List employeeDTOS = roleEmployeeDao.selectEmployeeByNamePage(page, queryDTO); employeeDTOS.stream().filter(e -> e.getDepartmentId() != null).forEach(employeeDTO -> { DepartmentEntity departmentEntity = departmentDao.selectById(employeeDTO.getDepartmentId()); employeeDTO.setDepartmentName(departmentEntity.getName()); }); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page, employeeDTOS, EmployeeVO.class); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page, employeeDTOS, EmployeeVO.class); return ResponseDTO.succData(pageResultDTO); } @@ -125,7 +124,7 @@ public class RoleEmployeeService { */ public ResponseDTO> getRolesByEmployeeId(Long employeeId) { List roleIds = roleEmployeeDao.selectRoleIdByEmployeeId(employeeId); - List roleList = roleDao.selectList(new EntityWrapper()); + List roleList = roleDao.selectList(null); List result = SmartBeanUtil.copyList(roleList, RoleSelectedVO.class); result.stream().forEach(item -> item.setSelected(roleIds.contains(item.getId()))); return ResponseDTO.succData(result); diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/domain/RoleEmployeeDTO.java similarity index 81% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/domain/RoleEmployeeDTO.java index 1578bdbc..5dc70111 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/domain/RoleEmployeeDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.role.roleemployee.domain; +package net.lab1024.smartadmin.module.system.role.roleemployee.domain; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/domain/RoleEmployeeEntity.java similarity index 58% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/domain/RoleEmployeeEntity.java index 75337357..58d16994 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleemployee/domain/RoleEmployeeEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.role.roleemployee.domain; +package net.lab1024.smartadmin.module.system.role.roleemployee.domain; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; /** @@ -16,7 +16,7 @@ import lombok.Data; */ @Data @TableName("t_role_employee") -public class RoleEmployeeEntity extends BaseEntity{ +public class RoleEmployeeEntity extends BaseEntity { private Long roleId; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/RolePrivilegeController.java similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/RolePrivilegeController.java index 63fa38fa..3cb021ef 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/RolePrivilegeController.java @@ -1,10 +1,10 @@ -package com.gangquan360.smartadmin.module.role.roleprivilege; +package net.lab1024.smartadmin.module.system.role.roleprivilege; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.role.roleprivilege.domain.dto.RolePrivilegeDTO; -import com.gangquan360.smartadmin.module.role.roleprivilege.domain.dto.RolePrivilegeTreeVO; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.system.role.roleprivilege.domain.dto.RolePrivilegeDTO; +import net.lab1024.smartadmin.module.system.role.roleprivilege.domain.dto.RolePrivilegeTreeVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/RolePrivilegeDao.java similarity index 80% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/RolePrivilegeDao.java index 2c2bff6b..ebf4284b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/RolePrivilegeDao.java @@ -1,8 +1,8 @@ -package com.gangquan360.smartadmin.module.role.roleprivilege; +package net.lab1024.smartadmin.module.system.role.roleprivilege; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.gangquan360.smartadmin.module.privilege.domain.entity.PrivilegeEntity; -import com.gangquan360.smartadmin.module.role.roleprivilege.domain.entity.RolePrivilegeEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.lab1024.smartadmin.module.system.privilege.domain.entity.PrivilegeEntity; +import net.lab1024.smartadmin.module.system.role.roleprivilege.domain.entity.RolePrivilegeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/RolePrivilegeService.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/RolePrivilegeService.java index 28017fcf..dd39f36f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/RolePrivilegeService.java @@ -1,17 +1,17 @@ -package com.gangquan360.smartadmin.module.role.roleprivilege; +package net.lab1024.smartadmin.module.system.role.roleprivilege; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.module.privilege.dao.PrivilegeDao; -import com.gangquan360.smartadmin.module.privilege.domain.entity.PrivilegeEntity; -import com.gangquan360.smartadmin.module.privilege.service.PrivilegeEmployeeService; -import com.gangquan360.smartadmin.module.role.basic.RoleDao; -import com.gangquan360.smartadmin.module.role.basic.RoleResponseCodeConst; -import com.gangquan360.smartadmin.module.role.basic.domain.entity.RoleEntity; -import com.gangquan360.smartadmin.module.role.roleprivilege.domain.dto.RolePrivilegeDTO; -import com.gangquan360.smartadmin.module.role.roleprivilege.domain.dto.RolePrivilegeSimpleDTO; -import com.gangquan360.smartadmin.module.role.roleprivilege.domain.dto.RolePrivilegeTreeVO; -import com.gangquan360.smartadmin.module.role.roleprivilege.domain.entity.RolePrivilegeEntity; -import com.gangquan360.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.module.system.privilege.dao.PrivilegeDao; +import net.lab1024.smartadmin.module.system.privilege.domain.entity.PrivilegeEntity; +import net.lab1024.smartadmin.module.system.privilege.service.PrivilegeEmployeeService; +import net.lab1024.smartadmin.module.system.role.basic.RoleDao; +import net.lab1024.smartadmin.module.system.role.basic.RoleResponseCodeConst; +import net.lab1024.smartadmin.module.system.role.basic.domain.entity.RoleEntity; +import net.lab1024.smartadmin.module.system.role.roleprivilege.domain.dto.RolePrivilegeDTO; +import net.lab1024.smartadmin.module.system.role.roleprivilege.domain.dto.RolePrivilegeSimpleDTO; +import net.lab1024.smartadmin.module.system.role.roleprivilege.domain.dto.RolePrivilegeTreeVO; +import net.lab1024.smartadmin.module.system.role.roleprivilege.domain.entity.RolePrivilegeEntity; +import net.lab1024.smartadmin.util.SmartBeanUtil; import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/domain/dto/RolePrivilegeDTO.java similarity index 89% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/domain/dto/RolePrivilegeDTO.java index 5b09bf58..261fbfd0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/domain/dto/RolePrivilegeDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.role.roleprivilege.domain.dto; +package net.lab1024.smartadmin.module.system.role.roleprivilege.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeSimpleDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/domain/dto/RolePrivilegeSimpleDTO.java similarity index 76% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeSimpleDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/domain/dto/RolePrivilegeSimpleDTO.java index c44dc937..754b60f1 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeSimpleDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/domain/dto/RolePrivilegeSimpleDTO.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.role.roleprivilege.domain.dto; +package net.lab1024.smartadmin.module.system.role.roleprivilege.domain.dto; -import com.gangquan360.smartadmin.common.anno.ApiModelPropertyEnum; -import com.gangquan360.smartadmin.module.privilege.constant.PrivilegeTypeEnum; +import net.lab1024.smartadmin.common.anno.ApiModelPropertyEnum; +import net.lab1024.smartadmin.module.system.privilege.constant.PrivilegeTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeTreeVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/domain/dto/RolePrivilegeTreeVO.java similarity index 82% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeTreeVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/domain/dto/RolePrivilegeTreeVO.java index 7b7893c2..2d441f85 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeTreeVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/domain/dto/RolePrivilegeTreeVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.role.roleprivilege.domain.dto; +package net.lab1024.smartadmin.module.system.role.roleprivilege.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/entity/RolePrivilegeEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/domain/entity/RolePrivilegeEntity.java similarity index 69% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/entity/RolePrivilegeEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/domain/entity/RolePrivilegeEntity.java index f30b7a3e..b17c80cc 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/entity/RolePrivilegeEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/roleprivilege/domain/entity/RolePrivilegeEntity.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.role.roleprivilege.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +package net.lab1024.smartadmin.module.system.role.roleprivilege.domain.entity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/SystemConfigController.java similarity index 78% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigController.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/SystemConfigController.java index da12c4ff..efe62f4c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/SystemConfigController.java @@ -1,13 +1,13 @@ -package com.gangquan360.smartadmin.module.systemconfig; +package net.lab1024.smartadmin.module.system.systemconfig; -import com.gangquan360.smartadmin.common.anno.OperateLog; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.constant.SwaggerTagConst; -import com.gangquan360.smartadmin.module.systemconfig.domain.dto.SystemConfigAddDTO; -import com.gangquan360.smartadmin.module.systemconfig.domain.dto.SystemConfigQueryDTO; -import com.gangquan360.smartadmin.module.systemconfig.domain.dto.SystemConfigUpdateDTO; -import com.gangquan360.smartadmin.module.systemconfig.domain.dto.SystemConfigVO; +import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.system.systemconfig.domain.dto.SystemConfigAddDTO; +import net.lab1024.smartadmin.module.system.systemconfig.domain.dto.SystemConfigQueryDTO; +import net.lab1024.smartadmin.module.system.systemconfig.domain.dto.SystemConfigUpdateDTO; +import net.lab1024.smartadmin.module.system.systemconfig.domain.dto.SystemConfigVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/SystemConfigDao.java similarity index 69% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigDao.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/SystemConfigDao.java index 53654d97..e8114f11 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/SystemConfigDao.java @@ -1,9 +1,9 @@ -package com.gangquan360.smartadmin.module.systemconfig; +package net.lab1024.smartadmin.module.system.systemconfig; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.baomidou.mybatisplus.plugins.pagination.Pagination; -import com.gangquan360.smartadmin.module.systemconfig.domain.dto.SystemConfigQueryDTO; -import com.gangquan360.smartadmin.module.systemconfig.domain.entity.SystemConfigEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.module.system.systemconfig.domain.dto.SystemConfigQueryDTO; +import net.lab1024.smartadmin.module.system.systemconfig.domain.entity.SystemConfigEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @@ -26,7 +26,7 @@ public interface SystemConfigDao extends BaseMapper { * @param page * @return */ - List selectSystemSettingList(Pagination page, SystemConfigQueryDTO queryDTO); + List selectSystemSettingList(Page page, @Param("queryDTO") SystemConfigQueryDTO queryDTO); /** * 根据key查询获取数据 @@ -48,7 +48,7 @@ public interface SystemConfigDao extends BaseMapper { * * @return */ - List selectSystemSettingList(); + List selectAll(); /** * 根据分组查询所有系统配置 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/SystemConfigService.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/SystemConfigService.java index 068998ac..787500e0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/SystemConfigService.java @@ -1,23 +1,22 @@ -package com.gangquan360.smartadmin.module.systemconfig; +package net.lab1024.smartadmin.module.system.systemconfig; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.common.constant.JudgeEnum; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import com.gangquan360.smartadmin.common.domain.ResponseDTO; -import com.gangquan360.smartadmin.common.exception.SmartBusinessException; -import com.gangquan360.smartadmin.common.reload.annotation.SmartReload; -import com.gangquan360.smartadmin.constant.SmartReloadTagConst; -import com.gangquan360.smartadmin.module.smartreload.SmartReloadService; -import com.gangquan360.smartadmin.module.systemconfig.constant.SystemConfigDataType; -import com.gangquan360.smartadmin.module.systemconfig.constant.SystemConfigEnum; -import com.gangquan360.smartadmin.module.systemconfig.constant.SystemConfigResponseCodeConst; -import com.gangquan360.smartadmin.module.systemconfig.domain.dto.*; -import com.gangquan360.smartadmin.module.systemconfig.domain.entity.SystemConfigEntity; -import com.gangquan360.smartadmin.util.SmartBeanUtil; -import com.gangquan360.smartadmin.util.SmartPaginationUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.constant.JudgeEnum; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; +import net.lab1024.smartadmin.common.domain.PageResultDTO; +import net.lab1024.smartadmin.common.domain.ResponseDTO; +import net.lab1024.smartadmin.common.reload.annotation.SmartReload; +import net.lab1024.smartadmin.constant.SmartReloadTagConst; +import net.lab1024.smartadmin.module.support.smartreload.SmartReloadService; +import net.lab1024.smartadmin.module.system.systemconfig.constant.SystemConfigDataType; +import net.lab1024.smartadmin.module.system.systemconfig.constant.SystemConfigEnum; +import net.lab1024.smartadmin.module.system.systemconfig.constant.SystemConfigResponseCodeConst; +import net.lab1024.smartadmin.module.system.systemconfig.domain.dto.*; +import net.lab1024.smartadmin.module.system.systemconfig.domain.entity.SystemConfigEntity; +import net.lab1024.smartadmin.util.SmartBeanUtil; +import net.lab1024.smartadmin.util.SmartPageUtil; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -56,7 +55,7 @@ public class SystemConfigService { */ @PostConstruct private void initSystemConfigCache() { - List entityList = systemConfigDao.selectSystemSettingList(); + List entityList = systemConfigDao.selectAll(); if (CollectionUtils.isEmpty(entityList)) { return; } @@ -82,9 +81,9 @@ public class SystemConfigService { * @return */ public ResponseDTO> getSystemConfigPage(SystemConfigQueryDTO queryDTO) { - Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); + Page page = SmartPageUtil.convert2QueryPage(queryDTO); List entityList = systemConfigDao.selectSystemSettingList(page, queryDTO); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page, entityList, SystemConfigVO.class); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page, entityList, SystemConfigVO.class); return ResponseDTO.succData(pageResultDTO); } @@ -95,6 +94,7 @@ public class SystemConfigService { * @return */ public ResponseDTO selectByKey(String configKey) { + configKey = configKey.toLowerCase(); SystemConfigEntity entity = systemConfigDao.getByKey(configKey); if (entity == null) { return ResponseDTO.wrap(SystemConfigResponseCodeConst.NOT_EXIST); @@ -112,6 +112,7 @@ public class SystemConfigService { * @return */ public T selectByKey2Obj(String configKey, Class clazz) { + configKey = configKey.toLowerCase(); SystemConfigEntity entity = systemConfigDao.getByKey(configKey); if (entity == null) { return null; @@ -128,7 +129,7 @@ public class SystemConfigService { public SystemConfigDTO getCacheByKey(SystemConfigEnum.Key key) { SystemConfigEntity entity = this.systemConfigMap.get(key.name().toLowerCase()); if (entity == null) { - throw new SmartBusinessException("缺少系统配置[" + key.name() + "]"); + return null; } return SmartBeanUtil.copy(entity, SystemConfigDTO.class); } @@ -140,6 +141,7 @@ public class SystemConfigService { * @return */ public ResponseDTO addSystemConfig(SystemConfigAddDTO configAddDTO) { + configAddDTO.setConfigKey(configAddDTO.getConfigKey().toLowerCase()); SystemConfigEntity entity = systemConfigDao.getByKey(configAddDTO.getConfigKey()); if (entity != null) { return ResponseDTO.wrap(SystemConfigResponseCodeConst.ALREADY_EXIST); @@ -163,6 +165,7 @@ public class SystemConfigService { * @return */ public ResponseDTO updateSystemConfig(SystemConfigUpdateDTO updateDTO) { + updateDTO.setConfigKey(updateDTO.getConfigKey().toLowerCase()); SystemConfigEntity entity = systemConfigDao.selectById(updateDTO.getId()); //系统配置不存在 if (entity == null) { diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigDataType.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/constant/SystemConfigDataType.java similarity index 89% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigDataType.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/constant/SystemConfigDataType.java index e02da00e..900256d8 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigDataType.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/constant/SystemConfigDataType.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.module.systemconfig.constant; +package net.lab1024.smartadmin.module.system.systemconfig.constant; -import com.gangquan360.smartadmin.util.SmartVerificationUtil; +import net.lab1024.smartadmin.util.SmartVerificationUtil; /** * [ ] diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/constant/SystemConfigEnum.java similarity index 81% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/constant/SystemConfigEnum.java index 0007f44b..9791d772 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/constant/SystemConfigEnum.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.systemconfig.constant; +package net.lab1024.smartadmin.module.system.systemconfig.constant; import java.util.Arrays; @@ -17,11 +17,11 @@ import java.util.Optional; public class SystemConfigEnum { public enum Group { - BACK + BACK, + GIT_LOG } public enum Key { - /** * 超管id */ @@ -41,12 +41,15 @@ public class SystemConfigEnum { /** * 邮件配置 */ - EMAIL_CONFIG(SystemConfigDataType.JSON); - + EMAIL_CONFIG(SystemConfigDataType.JSON), + /** + * git-log 插件 + */ + GIT_LOG_PLUGIN(SystemConfigDataType.JSON); private SystemConfigDataType dataType; - Key(SystemConfigDataType dataType){ + Key(SystemConfigDataType dataType) { this.dataType = dataType; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/constant/SystemConfigResponseCodeConst.java similarity index 84% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/constant/SystemConfigResponseCodeConst.java index b95700e4..fd9fa9e4 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigResponseCodeConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/constant/SystemConfigResponseCodeConst.java @@ -1,5 +1,5 @@ -package com.gangquan360.smartadmin.module.systemconfig.constant; -import com.gangquan360.smartadmin.common.constant.ResponseCodeConst; +package net.lab1024.smartadmin.module.system.systemconfig.constant; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; /** * diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigAddDTO.java similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigAddDTO.java index fbae679f..18b8a7c9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigAddDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigAddDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.systemconfig.domain.dto; +package net.lab1024.smartadmin.module.system.systemconfig.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigDTO.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigDTO.java index d17f91e1..16aadef5 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.systemconfig.domain.dto; +package net.lab1024.smartadmin.module.system.systemconfig.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigQueryDTO.java similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigQueryDTO.java index 08030ba8..458ef395 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigQueryDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigQueryDTO.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.systemconfig.domain.dto; +package net.lab1024.smartadmin.module.system.systemconfig.domain.dto; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageParamDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigUpdateDTO.java similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigUpdateDTO.java index 1c59b8e3..2fa29788 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigUpdateDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigUpdateDTO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.systemconfig.domain.dto; +package net.lab1024.smartadmin.module.system.systemconfig.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigVO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigVO.java similarity index 92% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigVO.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigVO.java index 246e4950..3b5de292 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/dto/SystemConfigVO.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.module.systemconfig.domain.dto; +package net.lab1024.smartadmin.module.system.systemconfig.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/entity/SystemConfigEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/entity/SystemConfigEntity.java similarity index 79% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/entity/SystemConfigEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/entity/SystemConfigEntity.java index 56345b64..18ca1f9f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/entity/SystemConfigEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/systemconfig/domain/entity/SystemConfigEntity.java @@ -1,7 +1,7 @@ -package com.gangquan360.smartadmin.module.systemconfig.domain.entity; +package net.lab1024.smartadmin.module.system.systemconfig.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import net.lab1024.smartadmin.common.domain.BaseEntity; import lombok.Data; import java.io.Serializable; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartApplicationContext.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/third/SmartApplicationContext.java similarity index 97% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartApplicationContext.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/third/SmartApplicationContext.java index a14759d8..fc366789 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartApplicationContext.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/third/SmartApplicationContext.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.third; +package net.lab1024.smartadmin.third; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartRedisService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/third/SmartRedisService.java similarity index 99% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartRedisService.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/third/SmartRedisService.java index 78aa5c32..da36246a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartRedisService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/third/SmartRedisService.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.third; +package net.lab1024.smartadmin.third; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBaseEnumUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartBaseEnumUtil.java similarity index 95% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBaseEnumUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartBaseEnumUtil.java index cfed468f..e433367b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBaseEnumUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartBaseEnumUtil.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; -import com.gangquan360.smartadmin.common.domain.BaseEnum; +import net.lab1024.smartadmin.common.domain.BaseEnum; /** * 枚举工具类 diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBeanUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartBeanUtil.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBeanUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartBeanUtil.java index 2c2d3701..6d36c05b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBeanUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartBeanUtil.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; import org.springframework.beans.BeanUtils; @@ -27,6 +27,9 @@ public class SmartBeanUtil { * @return */ public static T copy(Object source, Class target) { + if(source == null || target == null){ + return null; + } try { T newInstance = target.newInstance(); BeanUtils.copyProperties(source, newInstance); diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBigDecimalUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartBigDecimalUtil.java similarity index 99% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBigDecimalUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartBigDecimalUtil.java index 0672dc9d..3dc45f68 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBigDecimalUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartBigDecimalUtil.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.NumberFormat; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDateUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartDateUtil.java similarity index 99% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDateUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartDateUtil.java index 28a602b4..1e078263 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDateUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartDateUtil.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDigestUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartDigestUtil.java similarity index 89% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDigestUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartDigestUtil.java index c36f2a2f..902d5db3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDigestUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartDigestUtil.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; import org.apache.commons.codec.digest.DigestUtils; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartEasyPoiExcelUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartEasyPoiExcelUtil.java new file mode 100644 index 00000000..fb3860a6 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartEasyPoiExcelUtil.java @@ -0,0 +1,99 @@ +package net.lab1024.smartadmin.util; + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.ExcelImportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.ImportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.net.URLEncoder; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; + +/** + * @author: zhuoda + * @create: 2020-03-30 14:27 PM from win10 + */ + +public class SmartEasyPoiExcelUtil { + public static void exportExcel(List list, String title, String sheetName, Class pojoClass, + String fileName, boolean isCreateHeader, HttpServletResponse response) throws IOException { + ExportParams exportParams = new ExportParams(title, sheetName); + exportParams.setCreateHeadRows(isCreateHeader); + defaultExport(list, pojoClass, fileName, response, exportParams); + } + + public static void exportExcel(List list, String title, String sheetName, Class pojoClass, String fileName, + HttpServletResponse response) throws IOException { + defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName)); + } + + public static void exportExcel(List> list, String fileName, HttpServletResponse response) throws IOException { + defaultExport(list, fileName, response); + } + + private static void defaultExport(List list, Class pojoClass, String fileName, + HttpServletResponse response, ExportParams exportParams) throws IOException { + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list); + if (workbook != null) ; + downLoadExcel(fileName, response, workbook); + } + + private static void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) throws IOException { + response.setHeader("content-Type", "application/vnd.ms-excel"); + response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8")); + response.setCharacterEncoding("UTF-8"); + workbook.write(response.getOutputStream()); + } + + private static void defaultExport(List> list, String fileName, HttpServletResponse response) throws IOException { + Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.HSSF); + if (workbook != null) ; + downLoadExcel(fileName, response, workbook); + } + + public static List importExcel(String filePath, Integer titleRows, Integer headerRows, Class pojoClass) { + if (StringUtils.isBlank(filePath)) { + return null; + } + ImportParams params = new ImportParams(); + params.setTitleRows(titleRows); + params.setHeadRows(headerRows); + List list = null; + try { + list = ExcelImportUtil.importExcel(new File(filePath), pojoClass, params); + } catch (NoSuchElementException e) { + //throw new NormalException("模板不能为空"); + } catch (Exception e) { + e.printStackTrace(); + //throw new NormalException(e.getMessage()); + } + return list; + } + + public static List importExcel(MultipartFile file, Integer titleRows, Integer headerRows, Class pojoClass) { + if (file == null) { + return null; + } + ImportParams params = new ImportParams(); + params.setTitleRows(titleRows); + params.setHeadRows(headerRows); + List list = null; + try { + list = ExcelImportUtil.importExcel(file.getInputStream(), pojoClass, params); + } catch (NoSuchElementException e) { + // throw new NormalException("excel文件不能为空"); + } catch (Exception e) { + //throw new NormalException(e.getMessage()); + System.out.println(e.getMessage()); + } + return list; + } +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartHttpUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartHttpUtil.java similarity index 99% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartHttpUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartHttpUtil.java index 27d62cd0..62e8ff2d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartHttpUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartHttpUtil.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartIPUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartIPUtil.java similarity index 99% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartIPUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartIPUtil.java index f85116b2..fb93cd57 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartIPUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartIPUtil.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartPaginationUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartPageUtil.java similarity index 55% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartPaginationUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartPageUtil.java index fc2bb6c8..47340927 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartPaginationUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartPageUtil.java @@ -1,11 +1,13 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; -import com.baomidou.mybatisplus.plugins.Page; -import com.gangquan360.smartadmin.common.domain.PageParamDTO; -import com.gangquan360.smartadmin.common.domain.PageResultDTO; -import org.apache.poi.ss.formula.functions.T; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.smartadmin.common.domain.OrderItemDTO; +import net.lab1024.smartadmin.common.domain.PageParamDTO; +import net.lab1024.smartadmin.common.domain.PageResultDTO; import java.util.List; +import java.util.stream.Collectors; /** * 分页工具类 @@ -14,9 +16,9 @@ import java.util.List; * @date 2017-12-23 16:40 */ -public class SmartPaginationUtil { +public class SmartPageUtil { - public static PageResultDTO convert2PageResultDTO(Page page) { + public static PageResultDTO convert2PageResult(IPage page) { PageResultDTO result = new PageResultDTO<>(); result.setPageNum(page.getCurrent()); result.setPageSize(page.getSize()); @@ -26,12 +28,13 @@ public class SmartPaginationUtil { return result; } - public static Page convert2PageQueryInfo(PageParamDTO baseDTO) { + public static Page convert2QueryPage(PageParamDTO baseDTO) { Page page = new Page<>(); - Boolean sort = baseDTO.getSort(); - if (null != sort && SmartStringUtil.isNoneBlank(baseDTO.getOrderByField())) { - page.setAsc(sort); - page.setOrderByField(baseDTO.getOrderByField()); + + List orders = baseDTO.getOrders(); + if (orders != null && !orders.isEmpty()) { + List orderItemList = orders.stream().map(e -> convertOrderItem(e)).collect(Collectors.toList()); + page.setOrders(orderItemList); } page.setCurrent(baseDTO.getPageNum()); page.setSize(baseDTO.getPageSize()); @@ -41,6 +44,14 @@ public class SmartPaginationUtil { return page; } + private static com.baomidou.mybatisplus.core.metadata.OrderItem convertOrderItem(OrderItemDTO orderItemDTO) { + if (orderItemDTO.isAsc()) { + return com.baomidou.mybatisplus.core.metadata.OrderItem.asc(orderItemDTO.getColumn()); + } else { + return com.baomidou.mybatisplus.core.metadata.OrderItem.desc(orderItemDTO.getColumn()); + } + } + /** * 转换为 PageResultDTO 对象 * @@ -51,7 +62,7 @@ public class SmartPaginationUtil { * @author yandanyang * @date 2018年5月16日 下午6:05:28 */ - public static PageResultDTO convert2PageResultDTO(Page page, List sourceList, Class targetClazz) { + public static PageResultDTO convert2PageResult(IPage page, List sourceList, Class targetClazz) { PageResultDTO pageResultDTO = setPage(page); List records = SmartBeanUtil.copyList(sourceList, targetClazz); page.setRecords(records); @@ -68,14 +79,14 @@ public class SmartPaginationUtil { * @author yandanyang * @date 2018年5月16日 下午6:05:28 */ - public static PageResultDTO convert2PageResultDTO(Page page, List sourceList) { + public static PageResultDTO convert2PageResult(IPage page, List sourceList) { PageResultDTO pageResultDTO = setPage(page); page.setRecords(sourceList); pageResultDTO.setList(sourceList); return pageResultDTO; } - private static PageResultDTO setPage(Page page) { + private static PageResultDTO setPage(IPage page) { PageResultDTO pageResultDTO = new PageResultDTO(); pageResultDTO.setPageNum(page.getCurrent()); pageResultDTO.setPageSize(page.getSize()); diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartQuartzUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartQuartzUtil.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartQuartzUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartQuartzUtil.java index 7b1506bd..14003e6d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartQuartzUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartQuartzUtil.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; -import com.gangquan360.smartadmin.module.quartz.constant.QuartzConst; +import net.lab1024.smartadmin.module.support.quartz.constant.QuartzConst; import org.apache.commons.lang3.StringUtils; import org.quartz.JobKey; import org.quartz.TriggerKey; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartRequestTokenUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartRequestTokenUtil.java similarity index 93% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartRequestTokenUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartRequestTokenUtil.java index b8f3f39a..c8342f35 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartRequestTokenUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartRequestTokenUtil.java @@ -1,6 +1,6 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; -import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; +import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartSendMailUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartSendMailUtil.java similarity index 99% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartSendMailUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartSendMailUtil.java index 8ff2ed6b..b5bee5f6 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartSendMailUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartSendMailUtil.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; import lombok.extern.slf4j.Slf4j; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartStringUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartStringUtil.java similarity index 99% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartStringUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartStringUtil.java index b3d82d0b..da2e1764 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartStringUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartStringUtil.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; import org.apache.commons.lang3.StringUtils; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartThreadFactory.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartThreadFactory.java similarity index 96% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartThreadFactory.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartThreadFactory.java index a6b34c25..367f2b17 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartThreadFactory.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartThreadFactory.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartVerificationUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartVerificationUtil.java similarity index 98% rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartVerificationUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartVerificationUtil.java index 76b6f879..ceb349f1 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartVerificationUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartVerificationUtil.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin.util; +package net.lab1024.smartadmin.util; import java.util.regex.Pattern; /** diff --git a/smart-admin-service/smart-admin-api/src/main/resources/banner.txt b/smart-admin-service/smart-admin-api/src/main/resources/banner.txt index cd18d69c..ee858a4d 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/banner.txt +++ b/smart-admin-service/smart-admin-api/src/main/resources/banner.txt @@ -4,5 +4,5 @@ ____) | | | | | | (_| | | | |_ / ____ \ (_| | | | | | | | | | | |_____/|_| |_| |_|\__,_|_| \__/_/ \_\__,_|_| |_| |_|_|_| |_| -SmartAdmin v1.0.0 +SmartAdmin v1.1.0 diff --git a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties index 29eef45a..061552d8 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties @@ -1,10 +1,10 @@ ######################### server ################### server.servlet.context-path=/smart-admin-api server.port=10086 -spring.profiles.active=dev +spring.profiles.active=@profiles.active@ ######################### tomcat ################### -server.tomcat.basedir=/home/logs/smartadmin/tomcat-logs +server.tomcat.basedir=/home/logs/smart-admin/tomcat-logs server.tomcat.accesslog.enabled=true server.tomcat.accesslog.pattern=%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms) @@ -32,7 +32,7 @@ spring.datasource.max-active=10 spring.datasource.max-wait=60000 spring.datasource.time-between-eviction-runs-millis=60000 spring.datasource.min-evictable-edle-time-millis=300000 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.filters=stat spring.datasource.druid.username=druid spring.datasource.druid.password=123456 @@ -41,13 +41,13 @@ spring.datasource.druid.login.enabled=false ######################### redis ####################################### spring.redis.database=0 spring.redis.host=127.0.0.1 -spring.redis.jedis.pool.max-active=100 -spring.redis.jedis.pool.min-idle=5 -spring.redis.jedis.pool.max-idle=10 -spring.redis.jedis.pool.max-wait=30000ms spring.redis.port=6379 spring.redis.timeout=10000ms spring.redis.password= +spring.redis.lettuce..pool.max-active=100 +spring.redis.lettuce.pool.min-idle=5 +spring.redis.lettuce.pool.max-idle=10 +spring.redis.lettuce.pool.max-wait=30000ms ########################## rest http pool ######################### #\u6700\u5927\u8FDE\u63A5\u6570 @@ -65,8 +65,8 @@ http.pool.connection-request-timeout=8000 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl # mybatis-plus \u5B57\u6BB5\u9A7C\u5CF0\u81EA\u52A8\u8F6C\u6362 mybatis-plus.configuration.map-underscore-to-camel-case=true -mybatis-plus.mapper-locations=classpath:/mapper/*Mapper.xml,/mapper/*/*Mapper.xml -mybatis-plus.typeAliasesPackage=com.gangquan360.smartadmin.*.*.domain.entity +mybatis-plus.mapper-locations=classpath:/mapper/**/*.xml +mybatis-plus.typeAliasesPackage=net.lab1024.smartadmin.*.*.domain.entity mybatis-plus.global-config.refresh-mapper=true mybatis-plus.global-config.db-column-underline=true @@ -76,7 +76,7 @@ swagger.title=smartAdmin swagger.description=smartAdmin swagger.version=1.0 swagger.serviceUrl=http://localhost:10086/smart-admin-api -swagger.packAge=com.gangquan360.smartadmin.module +swagger.packAge=net.lab1024.smartadmin.module ######################### jwt ######################### jwt.key=smart-admin-jwt-key diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/email/EmailMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/business/email/EmailMapper.xml similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/email/EmailMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/business/email/EmailMapper.xml index fcfb0813..6050de51 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/email/EmailMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/business/email/EmailMapper.xml @@ -1,8 +1,8 @@ - + - + diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/log/UserLoginLogMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/business/log/UserLoginLogMapper.xml similarity index 85% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/log/UserLoginLogMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/business/log/UserLoginLogMapper.xml index f97f4853..87b0df3b 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/log/UserLoginLogMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/business/log/UserLoginLogMapper.xml @@ -1,8 +1,8 @@ - + - + diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/notice/NoticeMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/business/notice/NoticeMapper.xml similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/notice/NoticeMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/business/notice/NoticeMapper.xml index dd9e50e8..d94c0ab7 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/notice/NoticeMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/business/notice/NoticeMapper.xml @@ -1,17 +1,17 @@ - + - + - + - + - + - + + select + id, + kind, + name, + color, + image_url, + create_time, + update_time + from t_peony + + + AND id = #{queryDTO.id} + + + AND INSTR(kind,#{queryDTO.kind}) + + + AND INSTR(name,#{queryDTO.name}) + + + AND INSTR(color,#{queryDTO.color}) + + + + AND create_time >= #{queryDTO.createTimeBegin} + + + AND create_time <= #{queryDTO.createTimeEnd} + + + + AND update_time >= #{queryDTO.updateTimeBegin} + + + AND update_time <= #{queryDTO.updateTimeEnd} + + + + + + + + + + delete from t_peony where id = #{id} + + + + delete from t_peony where id in + + #{item} + + + + \ No newline at end of file diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/codegenerator/TableMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/codegenerator/TableMapper.xml similarity index 79% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/codegenerator/TableMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/support/codegenerator/TableMapper.xml index 13be97b7..4af675b6 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/codegenerator/TableMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/codegenerator/TableMapper.xml @@ -1,8 +1,8 @@ - + + type="net.lab1024.smartadmin.module.support.codegenerator.domain.ColumnVO"> diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/file/FileMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/file/FileMapper.xml similarity index 90% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/file/FileMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/support/file/FileMapper.xml index 9b4a32ef..04abb76d 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/file/FileMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/file/FileMapper.xml @@ -1,12 +1,12 @@ - + + type="net.lab1024.smartadmin.module.support.file.domain.entity.FileEntity"> + type="net.lab1024.smartadmin.module.support.file.domain.dto.FileDTO"> - + INSERT INTO t_file ( diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/heartbeat/HeartBeatRecordMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/heartbeat/HeartBeatRecordMapper.xml similarity index 78% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/heartbeat/HeartBeatRecordMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/support/heartbeat/HeartBeatRecordMapper.xml index 97b8521d..27ce75e6 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/heartbeat/HeartBeatRecordMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/heartbeat/HeartBeatRecordMapper.xml @@ -1,6 +1,6 @@ - + @@ -27,11 +27,11 @@ - select * from t_heart_beat_record where project_path = #{projectPath} and server_ip = #{serverIp} and process_no =#{processNo} - SELECT * FROM diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/idgenerator/IdGeneratorMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/idgenerator/IdGeneratorMapper.xml similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/idgenerator/IdGeneratorMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/support/idgenerator/IdGeneratorMapper.xml index 55ad8557..df3b86c5 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/idgenerator/IdGeneratorMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/idgenerator/IdGeneratorMapper.xml @@ -1,14 +1,14 @@ - + + type="net.lab1024.smartadmin.module.support.idgenerator.domain.IdGeneratorLastNumberDTO"> - + + type="net.lab1024.smartadmin.module.support.idgenerator.domain.IdGeneratorRecordDTO"> diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskLogMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/quartz/QuartzTaskLogMapper.xml similarity index 80% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskLogMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/support/quartz/QuartzTaskLogMapper.xml index 570a8053..43f25e05 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskLogMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/quartz/QuartzTaskLogMapper.xml @@ -1,9 +1,9 @@ - + + type="net.lab1024.smartadmin.module.support.quartz.domain.dto.QuartzTaskLogVO"> diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/quartz/QuartzTaskMapper.xml similarity index 78% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/support/quartz/QuartzTaskMapper.xml index 8701f6d5..0bb88311 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/quartz/QuartzTaskMapper.xml @@ -1,9 +1,9 @@ - + + type="net.lab1024.smartadmin.module.support.quartz.domain.entity.QuartzTaskEntity"> t.id, diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/smartreload/ReloadItemMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/smartreload/ReloadItemMapper.xml similarity index 63% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/smartreload/ReloadItemMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/support/smartreload/ReloadItemMapper.xml index f9106a5b..03c1f67f 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/smartreload/ReloadItemMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/smartreload/ReloadItemMapper.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/smartreload/ReloadResultMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/smartreload/ReloadResultMapper.xml similarity index 66% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/smartreload/ReloadResultMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/support/smartreload/ReloadResultMapper.xml index 864d93ad..6c0caba1 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/smartreload/ReloadResultMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/support/smartreload/ReloadResultMapper.xml @@ -1,9 +1,9 @@ - + + type="net.lab1024.smartadmin.module.support.smartreload.domain.entity.ReloadResultEntity"> select id,data_scope_type,view_type,role_id,update_time,create_time from t_role_data_scope where role_id = #{roleId} diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/department/DepartmentMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/department/DepartmentMapper.xml similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/department/DepartmentMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/system/department/DepartmentMapper.xml index 19904e31..f6c33da3 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/department/DepartmentMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/department/DepartmentMapper.xml @@ -1,10 +1,10 @@ - + + type="net.lab1024.smartadmin.module.system.department.domain.dto.DepartmentVO"> diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/employee/EmployeeMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/employee/EmployeeMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml index 79f48c02..fe1397a4 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/employee/EmployeeMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml @@ -1,12 +1,12 @@ - + + type="net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeDTO"> - + e.id, diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/position/PositionMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/position/PositionMapper.xml similarity index 75% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/position/PositionMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/system/position/PositionMapper.xml index 87e74600..a7ef4cce 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/position/PositionMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/position/PositionMapper.xml @@ -1,6 +1,6 @@ - + @@ -11,20 +11,20 @@ create_time - SELECT FROM t_position - - AND INSTR(position_name,#{positionName}) + + AND INSTR(position_name,#{queryDTO.positionName}) order by create_time desc - SELECT job.position_name, rel.position_id, @@ -44,7 +44,7 @@ - SELECT job.position_name, rel.position_id, diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/privilege/PrivilegeMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/privilege/PrivilegeMapper.xml similarity index 93% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/privilege/PrivilegeMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/system/privilege/PrivilegeMapper.xml index 896e1282..3b3d3695 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/privilege/PrivilegeMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/privilege/PrivilegeMapper.xml @@ -1,9 +1,9 @@ - + + type="net.lab1024.smartadmin.module.system.privilege.domain.entity.PrivilegeEntity"> p.id, diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RoleEmployeeMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/role/RoleEmployeeMapper.xml similarity index 94% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RoleEmployeeMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/system/role/RoleEmployeeMapper.xml index 7d60225a..5984cb7d 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RoleEmployeeMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/role/RoleEmployeeMapper.xml @@ -1,10 +1,10 @@ - + + type="net.lab1024.smartadmin.module.system.employee.domain.dto.EmployeeDTO"> diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RoleMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/role/RoleMapper.xml similarity index 74% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RoleMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/system/role/RoleMapper.xml index 7c791e2f..5b7177dd 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RoleMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/role/RoleMapper.xml @@ -1,9 +1,9 @@ - + + type="net.lab1024.smartadmin.module.system.role.basic.domain.entity.RoleEntity"> diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RolePrivilegeMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/role/RolePrivilegeMapper.xml similarity index 84% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RolePrivilegeMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/system/role/RolePrivilegeMapper.xml index 464e97c7..cb44911b 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RolePrivilegeMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/role/RolePrivilegeMapper.xml @@ -1,12 +1,12 @@ - + + type="net.lab1024.smartadmin.module.system.role.roleprivilege.domain.entity.RolePrivilegeEntity"> + type="net.lab1024.smartadmin.module.system.privilege.domain.entity.PrivilegeEntity"> rp.id, diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/systemconfig/SystemConfigMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/systemconfig/SystemConfigMapper.xml similarity index 77% rename from smart-admin-service/smart-admin-api/src/main/resources/mapper/systemconfig/SystemConfigMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/system/systemconfig/SystemConfigMapper.xml index 6604274c..1cebf85b 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/systemconfig/SystemConfigMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/systemconfig/SystemConfigMapper.xml @@ -1,8 +1,12 @@ - + - + + + - select -#foreach($column in $columnList) -#if($velocityCount != $columnList.size()) - $column.columnName, -#else - $column.columnName -#end -#end - from ${tableName} - -#foreach($queryField in $queryFieldList) -#if ($queryField.sqlOperate == 'like') - - AND INSTR($queryField.columnName,#{queryDTO.$queryField.fieldName}) - -#end -#if ($queryField.sqlOperate == 'equals') -#if ($queryField.fieldType == 'String') - - AND $queryField.columnName = #{queryDTO.$queryField.fieldName} - -#else - - AND $queryField.columnName = #{queryDTO.$queryField.fieldName} - -#end -#end -#if ($queryField.sqlOperate == 'time_equals') - - AND DATE_FORMAT($queryField.columnName, '%Y-%m-%d') = #{queryDTO.$queryField.fieldName} - -#end -#if ($queryField.sqlOperate == 'time_between') - - AND DATE_FORMAT($queryField.columnName, '%Y-%m-%d') >= #{queryDTO.startDate} - - - AND DATE_FORMAT($queryField.columnName, '%Y-%m-%d') <= #{queryDTO.endDate} - -#end -#if ($queryField.sqlOperate == 'in') - - and $queryField.columnName in - - #{item} - - -#end -#if ($queryField.sqlOperate == 'gt') - - and DATE_FORMAT($queryField.columnName, '%Y-%m-%d') >= DATE_FORMAT(#{queryDTO.startDate}, '%Y-%m-%d') - -#end -#end - - - - - delete from ${tableName} where id = #{id} - - - - delete from ${tableName} where id in - - #{item} - - - - \ No newline at end of file diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/DTO.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/AddDTO.java.vm similarity index 86% rename from smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/DTO.java.vm rename to smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/AddDTO.java.vm index fa4e8d18..03da7773 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/DTO.java.vm +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/AddDTO.java.vm @@ -1,4 +1,5 @@ package ${basePackage}.module.${modulePackage}.domain.dto; + import lombok.Data; #foreach ($dtoImport in $dtoImports) $dtoImport @@ -7,19 +8,19 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; /** - * [ ${tableDesc} ] + * 新建 [ ${tableDesc} ] * * @author ${author} * @version 1.0 * @company ${company} * @copyright (c) 2018 ${company}Inc. All rights reserved. - * @date 2019/3/27 0027 下午 12:27 + * @date ${date} * @since JDK1.8 */ @Data -public class ${moduleClass}DTO { - +public class ${moduleClass}AddDTO { #foreach ($column in $columnList) +#if($column.fieldName != 'id') #if($column.fieldType == 'Date') @ApiModelProperty("${column.columnDesc}") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -29,6 +30,7 @@ public class ${moduleClass}DTO { private $column.fieldType $column.fieldName; #end +#end #end } diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Controller.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Controller.java.vm new file mode 100644 index 00000000..1dfbe2ed --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Controller.java.vm @@ -0,0 +1,88 @@ +package ${basePackage}.module.${modulePackage}.controller; + +import ${basePackage}.common.domain.PageResultDTO; +import ${basePackage}.common.controller.BaseController; +import ${basePackage}.common.domain.ResponseDTO; +import ${basePackage}.common.domain.ValidateList; +import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}AddDTO; +import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}UpdateDTO; +import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}QueryDTO; +import ${basePackage}.module.${modulePackage}.domain.vo.${moduleClass}VO; +import ${basePackage}.module.${modulePackage}.domain.vo.${moduleClass}ExcelVO; +import ${basePackage}.module.${modulePackage}.service.${moduleClass}Service; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import org.apache.poi.ss.usermodel.Workbook; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * [ ${tableDesc} ] + * + * @author ${author} + * @version 1.0 + * @company ${company} + * @copyright (c) ${company}Inc. All rights reserved. + * @date ${date} + * @since JDK1.8 + */ +@RestController +@Api(tags = {"${tableDesc}"}) +public class ${moduleClass}Controller extends BaseController { + + @Autowired + private ${moduleClass}Service ${moduleVar}Service; + + @ApiOperation(value = "分页查询${tableDesc}",notes = "@author ${author}") + @PostMapping("/${moduleVar}/page/query") + public ResponseDTO> queryByPage(@RequestBody ${moduleClass}QueryDTO queryDTO) { + return ${moduleVar}Service.queryByPage(queryDTO); + } + + @ApiOperation(value = "添加${tableDesc}",notes = "@author ${author}") + @PostMapping("/${moduleVar}/add") + public ResponseDTO add(@RequestBody @Validated ${moduleClass}AddDTO addTO){ + return ${moduleVar}Service.add(addTO); + } + + @ApiOperation(value="修改${tableDesc}",notes = "@author ${author}") + @PostMapping("/${moduleVar}/update") + public ResponseDTO update(@RequestBody @Validated ${moduleClass}UpdateDTO updateDTO){ + return ${moduleVar}Service.update(updateDTO); + } + + @ApiOperation(value="批量删除${tableDesc}",notes = "@author ${author}") + @PostMapping("/${moduleVar}/deleteByIds") + public ResponseDTO delete(@RequestBody @Validated ValidateList idList) { + return ${moduleVar}Service.deleteByIds(idList); + } + + @ApiOperation(value = "批量导出", notes = "@author ${author}") + @PostMapping("/${moduleVar}/export/batch") + public void batchExport(@RequestBody @Validated ValidateList idList, HttpServletResponse response) { + //查询数据 + List<${moduleClass}ExcelVO> ${moduleVar}List = ${moduleVar}Service.queryBatchExportData(idList); + //导出操作 + ExportParams ex = new ExportParams("${tableDesc}", "Sheet1"); + Workbook workbook = ExcelExportUtil.exportExcel(ex, ${moduleClass}ExcelVO.class, ${moduleVar}List); + downloadExcel("${tableDesc}", workbook, response); + } + + @ApiOperation(value = "导出全部", notes = "@author ${author}") + @PostMapping("/${moduleVar}/export/all") + public void exportAll(@RequestBody @Validated ${moduleClass}QueryDTO queryDTO, HttpServletResponse response) { + //查询数据 + List<${moduleClass}ExcelVO> ${moduleVar}List = ${moduleVar}Service.queryAllExportData(queryDTO); + //导出操作 + ExportParams ex = new ExportParams("${tableDesc}", "Sheet1"); + Workbook workbook = ExcelExportUtil.exportExcel(ex, ${moduleClass}ExcelVO.class, ${moduleVar}List); + downloadExcel("${tableDesc}", workbook, response); + } + +} diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Dao.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Dao.java.vm new file mode 100644 index 00000000..b19db804 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Dao.java.vm @@ -0,0 +1,64 @@ +package ${basePackage}.module.${modulePackage}.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}QueryDTO; +import ${basePackage}.module.${modulePackage}.domain.entity.${moduleClass}Entity; +import ${basePackage}.module.${modulePackage}.domain.vo.${moduleClass}VO; +import ${basePackage}.module.${modulePackage}.domain.vo.${moduleClass}ExcelVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * [ ${tableDesc} ] + * + * @author ${author} + * @version 1.0 + * @company ${company} + * @copyright (c) ${company}Inc. All rights reserved. + * @date ${date} + * @since JDK1.8 + */ +@Mapper +@Component +public interface ${moduleClass}Dao extends BaseMapper<${moduleClass}Entity> { + + /** + * 分页查询 + * @param queryDTO + * @return ${moduleClass}VO + */ + IPage<${moduleClass}VO> queryByPage(Page page, @Param("queryDTO") ${moduleClass}QueryDTO queryDTO); + + /** + * 根据id删除 + * @param id + * @return + */ + void deleteById(@Param("id")Long id); + + /** + * 根据id批量删除 + * @param idList + * @return + */ + void deleteByIdList(@Param("idList") List idList); + + /** + * 查询所有导出数据 + * @param queryDTO + * @return + */ + List<${moduleClass}ExcelVO> queryAllExportData(@Param("queryDTO")${moduleClass}QueryDTO queryDTO); + + /** + * 查询批量导出数据 + * @param idList + * @return + */ + List<${moduleClass}ExcelVO> queryBatchExportData(@Param("idList")List idList); +} diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Dao.xml.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Dao.xml.vm new file mode 100644 index 00000000..5e64e4bc --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Dao.xml.vm @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + delete from ${tableName} where id = #{id} + + + + delete from ${tableName} where id in + + #{item} + + + + \ No newline at end of file diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Entity.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Entity.java.vm similarity index 74% rename from smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Entity.java.vm rename to smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Entity.java.vm index fc07de61..ca7e7e6d 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Entity.java.vm +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Entity.java.vm @@ -1,27 +1,25 @@ package ${basePackage}.module.${modulePackage}.domain.entity; -import com.baomidou.mybatisplus.annotations.TableName; -import com.gangquan360.smartadmin.common.domain.BaseEntity; + +import com.baomidou.mybatisplus.annotation.TableName; +import ${basePackage}.common.domain.BaseEntity; #foreach ($entityImport in $entityImports) $entityImport #end import lombok.Data; -import java.io.Serializable; - /** * [ ${tableDesc} ] * * @author ${author} * @version 1.0 * @company ${company} - * @copyright (c) 2018 ${company}Inc. All rights reserved. + * @copyright (c) ${company}Inc. All rights reserved. * @date ${date} * @since JDK1.8 */ @Data @TableName("${tableName}") public class ${moduleClass}Entity extends BaseEntity{ - #foreach ($column in $columnList) #if($column.columnName != 'id' && $column.fieldName != 'updateTime' && $column.fieldName != 'createTime') diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/ExcelVO.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/ExcelVO.java.vm new file mode 100644 index 00000000..fa4e7e0a --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/ExcelVO.java.vm @@ -0,0 +1,33 @@ +package ${basePackage}.module.${modulePackage}.domain.vo; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; +#foreach ($dtoImport in $dtoImports) +$dtoImport +#end + +/** + * [ ${tableDesc} ] + * + * @author ${author} + * @version 1.0 + * @company ${company} + * @copyright (c) ${company}Inc. All rights reserved. + * @date ${date} + * @since JDK1.8 + */ +@Data +public class ${moduleClass}ExcelVO { +#foreach ($column in $columnList) +#if($column.fieldType == 'Date') + @Excel(name = "${column.columnDesc}", format = "yyyy-MM-dd HH:mm:ss") + private $column.fieldType $column.fieldName; +#else + @Excel(name = "${column.columnDesc}") + private $column.fieldType $column.fieldName; +#end + +#end + + +} diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/QueryDTO.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/QueryDTO.java.vm similarity index 65% rename from smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/QueryDTO.java.vm rename to smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/QueryDTO.java.vm index 15c30416..44815d4d 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/QueryDTO.java.vm +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/QueryDTO.java.vm @@ -3,6 +3,7 @@ package ${basePackage}.module.${modulePackage}.domain.dto; import ${basePackage}.common.domain.PageParamDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; #foreach ($queryImport in $queryImports) $queryImport #end @@ -13,31 +14,32 @@ $queryImport * @author ${author} * @version 1.0 * @company ${company} - * @copyright (c) 2019 ${company}Inc. All rights reserved. + * @copyright (c) ${company}Inc. All rights reserved. * @date ${date} * @since JDK1.8 */ @Data public class ${moduleClass}QueryDTO extends PageParamDTO { - #foreach ($queryField in $queryFieldList) #if($queryField.sqlOperate == 'in') @ApiModelProperty("${queryField.columnDesc}") private List<${queryField.fieldType}> ${queryField.fieldName}List; -#elseif($queryField.sqlOperate == 'time_equals') - @ApiModelProperty("${queryField.columnDesc}") - private String ${queryField.fieldName}; -#elseif($queryField.sqlOperate == 'time_between') - @ApiModelProperty("开始日期") - private String startDate; - - @ApiModelProperty("结束日期") - private String endDate; #else @ApiModelProperty("${queryField.columnDesc}") private ${queryField.fieldType} ${queryField.fieldName}; #end - #end + + @ApiModelProperty("创建时间-开始") + private Date createTimeBegin; + + @ApiModelProperty("创建时间-截止") + private Date createTimeEnd; + + @ApiModelProperty("上次更新时间-开始") + private Date updateTimeBegin; + + @ApiModelProperty("上次更新创建时间-开始") + private Date updateTimeEnd; } diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Service.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Service.java.vm similarity index 51% rename from smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Service.java.vm rename to smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Service.java.vm index 72201ef2..ca3b939d 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Service.java.vm +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/Service.java.vm @@ -1,13 +1,17 @@ package ${basePackage}.module.${modulePackage}.service; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ${basePackage}.common.domain.PageResultDTO; import ${basePackage}.common.domain.ResponseDTO; import ${basePackage}.module.${modulePackage}.dao.${moduleClass}Dao; -import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}DTO; +import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}AddDTO; +import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}UpdateDTO; import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}QueryDTO; import ${basePackage}.module.${modulePackage}.domain.entity.${moduleClass}Entity; -import ${basePackage}.util.SmartPaginationUtil; +import ${basePackage}.module.${modulePackage}.domain.vo.${moduleClass}VO; +import ${basePackage}.module.${modulePackage}.domain.vo.${moduleClass}ExcelVO; +import ${basePackage}.util.SmartPageUtil; import ${basePackage}.util.SmartBeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,7 +25,7 @@ import java.util.List; * @author ${author} * @version 1.0 * @company ${company} - * @copyright (c) 2019 ${company}Inc. All rights reserved. + * @copyright (c) ${company}Inc. All rights reserved. * @date ${date} * @since JDK1.8 */ @@ -31,65 +35,74 @@ public class ${moduleClass}Service { @Autowired private ${moduleClass}Dao ${moduleVar}Dao; + /** + * 根据id查询 + */ + public ${moduleClass}Entity getById(Long id){ + return ${moduleVar}Dao.selectById(id); + } /** + * 分页查询 * @author ${author} - * @description 分页查询 * @date ${date} */ - public ResponseDTO> queryByPage(${moduleClass}QueryDTO queryDTO) { - Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); - List<${moduleClass}Entity> entities = ${moduleVar}Dao.queryByPage(page, queryDTO); - List<${moduleClass}DTO> dtoList = SmartBeanUtil.copyList(entities, ${moduleClass}DTO.class); - page.setRecords(dtoList); - PageResultDTO<${moduleClass}DTO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); + public ResponseDTO> queryByPage(${moduleClass}QueryDTO queryDTO) { + Page page = SmartPageUtil.convert2QueryPage(queryDTO); + IPage<${moduleClass}VO> voList = ${moduleVar}Dao.queryByPage(page, queryDTO); + PageResultDTO<${moduleClass}VO> pageResultDTO = SmartPageUtil.convert2PageResult(voList); return ResponseDTO.succData(pageResultDTO); } /** + * 添加 * @author ${author} - * @description 添加 * @date ${date} */ - public ResponseDTO add(${moduleClass}DTO addDTO) { + public ResponseDTO add(${moduleClass}AddDTO addDTO) { ${moduleClass}Entity entity = SmartBeanUtil.copy(addDTO, ${moduleClass}Entity.class); ${moduleVar}Dao.insert(entity); return ResponseDTO.succ(); } - /** + * 编辑 * @author ${author} - * @description 编辑 * @date ${date} */ @Transactional(rollbackFor = Exception.class) - public ResponseDTO update(${moduleClass}DTO updateDTO) { + public ResponseDTO update(${moduleClass}UpdateDTO updateDTO) { ${moduleClass}Entity entity = SmartBeanUtil.copy(updateDTO, ${moduleClass}Entity.class); ${moduleVar}Dao.updateById(entity); return ResponseDTO.succ(); } - /** + * 删除 * @author ${author} - * @description 删除 * @date ${date} */ @Transactional(rollbackFor = Exception.class) - public ResponseDTO delete(Long id) { - ${moduleVar}Dao.deleteById(id); + public ResponseDTO deleteByIds(List idList) { + ${moduleVar}Dao.deleteByIdList(idList); return ResponseDTO.succ(); } /** + * 查询全部导出对象 * @author ${author} - * @description 根据ID查询 * @date ${date} - */ - public ResponseDTO<${moduleClass}DTO> detail(Long id){ - ${moduleClass}Entity entity = ${moduleVar}Dao.selectById(id); - ${moduleClass}DTO dto = SmartBeanUtil.copy(entity,${moduleClass}DTO.class); - return ResponseDTO.succData(dto); + */ + public List<${moduleClass}ExcelVO> queryAllExportData(${moduleClass}QueryDTO queryDTO) { + return ${moduleVar}Dao.queryAllExportData( queryDTO); + } + + /** + * 批量查询导出对象 + * @author ${author} + * @date ${date} + */ + public List<${moduleClass}ExcelVO> queryBatchExportData(List idList) { + return ${moduleVar}Dao.queryBatchExportData(idList); } } diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/UpdateDTO.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/UpdateDTO.java.vm new file mode 100644 index 00000000..e96cc501 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/UpdateDTO.java.vm @@ -0,0 +1,20 @@ +package ${basePackage}.module.${modulePackage}.domain.dto; + +import lombok.Data; + +/** + * 更新 [ ${tableDesc} ] + * + * @author ${author} + * @version 1.0 + * @company ${company} + * @copyright (c) 2018 ${company}Inc. All rights reserved. + * @date ${date} + * @since JDK1.8 + */ +@Data +public class ${moduleClass}UpdateDTO extends ${moduleClass}AddDTO { + + private Long id; + +} diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/VO.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/VO.java.vm new file mode 100644 index 00000000..b7a5ea53 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/java/VO.java.vm @@ -0,0 +1,35 @@ +package ${basePackage}.module.${modulePackage}.domain.vo; + +import lombok.Data; +#foreach ($dtoImport in $dtoImports) +$dtoImport +#end +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; + +/** + * [ ${tableDesc} ] + * + * @author ${author} + * @version 1.0 + * @company ${company} + * @copyright (c) ${company}Inc. All rights reserved. + * @date ${date} + * @since JDK1.8 + */ +@Data +public class ${moduleClass}VO { +#foreach ($column in $columnList) +#if($column.fieldType == 'Date') + @ApiModelProperty("${column.columnDesc}") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private $column.fieldType $column.fieldName; +#else + @ApiModelProperty("${column.columnDesc}") + private $column.fieldType $column.fieldName; +#end + +#end + + +} diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/web/Api.js.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/web/Api.js.vm new file mode 100644 index 00000000..858f2366 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/web/Api.js.vm @@ -0,0 +1,28 @@ +import { postAxios, getAxios, postDownloadAxios } from '@/lib/http'; + +export const ${moduleVar}Api = { + // 添加${tableDesc} @author ${author} + add${moduleClass}: (data) => { + return postAxios('/${moduleVar}/add', data); + }, + // 分页查询${tableDesc} @author ${author} + query${moduleClass}: (data) => { + return postAxios('/${moduleVar}/page/query', data); + }, + // 批量删除${tableDesc} @author ${author} + batchDelete${moduleClass}: (idList) => { + return postAxios('/${moduleVar}/deleteByIds', idList); + }, + // 修改${tableDesc} @author ${author} + update${moduleClass}: (data) => { + return postAxios('/${moduleVar}/update',data); + }, + // 导出全部 @author ${author} + exportAll:(data)=>{ + return postDownloadAxios('/${moduleVar}/export/all',data); + }, + // 批量导出 @author ${author} + batchExport: (idList) => { + return postDownloadAxios('/${moduleVar}/export/batch', idList); + }, +}; diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/web/List.vue.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/web/List.vue.vm new file mode 100644 index 00000000..3bc635f4 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/web/List.vue.vm @@ -0,0 +1,439 @@ + + + diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/web/ListForm.vue.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/web/ListForm.vue.vm new file mode 100644 index 00000000..d9a18d45 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/web/ListForm.vue.vm @@ -0,0 +1,132 @@ + + \ No newline at end of file diff --git a/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/web/Router.js.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/web/Router.js.vm new file mode 100644 index 00000000..00d5ed6c --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/web/Router.js.vm @@ -0,0 +1,32 @@ +import Main from '@/components/main'; +// ${tableName}路由 +export const ${moduleVar} = [ + { + path: '/${webModuleName}', + name: '${moduleClass}', + component: Main, + meta: { + title: '${tableDesc}管理', + icon: 'icon iconfont iconyoujianguanli' + }, + children: [ + // ${tableDesc}列表 + { + path: '/${webModuleName}/${webModuleName}-list', + name: '${moduleClass}List', + meta: { + title: '${tableDesc}列表', + privilege: [ + { title: '查询', name: '${webModuleName}-list-query' }, + { title: '新增', name: '${webModuleName}-list-add' }, + { title: '编辑', name: '${webModuleName}-list-update' }, + { title: '批量删除', name: '${webModuleName}-list-batch-delete' }, + { title: '批量导出', name: '${webModuleName}-list-batch-export' }, + { title: '导出全部', name: '${webModuleName}-list-export-all' } + ] + }, + component: () => import('@/views/business/${webModuleName}/${webModuleName}-list.vue') + } + ] + } +]; diff --git a/smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/module/codegenerator/CodeGeneratorServiceTest.java b/smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/module/codegenerator/CodeGeneratorServiceTest.java deleted file mode 100644 index 2a0880c4..00000000 --- a/smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/module/codegenerator/CodeGeneratorServiceTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.gangquan360.smartadmin.module.codegenerator; - -import com.gangquan360.smartadmin.BaseTest; -import com.gangquan360.smartadmin.module.codegenerator.constant.SqlOperateTypeEnum; -import com.gangquan360.smartadmin.module.codegenerator.domain.CodeGeneratorDTO; -import com.gangquan360.smartadmin.module.codegenerator.domain.CodeGeneratorQueryColumnDTO; -import com.gangquan360.smartadmin.module.codegenerator.service.CodeGeneratorService; -import com.google.common.collect.Lists; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; - -/** - * IdGeneratorService Tester. - * - * @author lizongliang - * @version 1.0 - */ -public class CodeGeneratorServiceTest extends BaseTest { - - @Autowired - private CodeGeneratorService codeGeneratorService; - - @Test - public void testGenerate() throws Exception { - CodeGeneratorQueryColumnDTO createTimeBetween = CodeGeneratorQueryColumnDTO.builder() - .columnName("create_time") - .sqlOperate(SqlOperateTypeEnum.TIME_BETWEEN).build(); - CodeGeneratorQueryColumnDTO like = CodeGeneratorQueryColumnDTO.builder() - .columnName("title") - .sqlOperate(SqlOperateTypeEnum.LIKE).build(); - - List queryColumnList = Lists.newArrayList(createTimeBetween,like); - CodeGeneratorDTO codeGenerator = CodeGeneratorDTO.builder() - .author("zhuoda") - .company("1024创新( www.1024lab.net )") - .tableName("t_notice") - .tablePrefix("t_") - .basePackage("com.gangquan360.smartadmin") - .queryColumnList(queryColumnList).build(); - codeGeneratorService.codeGenerator(codeGenerator); - } - -} diff --git a/smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/BaseTest.java b/smart-admin-service/smart-admin-api/src/test/java/net/lab1024/smartadmin/BaseTest.java similarity index 91% rename from smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/BaseTest.java rename to smart-admin-service/smart-admin-api/src/test/java/net/lab1024/smartadmin/BaseTest.java index 65606abe..6d681a15 100644 --- a/smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/BaseTest.java +++ b/smart-admin-service/smart-admin-api/src/test/java/net/lab1024/smartadmin/BaseTest.java @@ -1,8 +1,7 @@ -package com.gangquan360.smartadmin; +package net.lab1024.smartadmin; import org.junit.After; import org.junit.Before; -import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; diff --git a/smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/SmartAdminApplicationTests.java b/smart-admin-service/smart-admin-api/src/test/java/net/lab1024/smartadmin/SmartAdminApplicationTests.java similarity index 90% rename from smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/SmartAdminApplicationTests.java rename to smart-admin-service/smart-admin-api/src/test/java/net/lab1024/smartadmin/SmartAdminApplicationTests.java index 3113a8bb..d140b88b 100644 --- a/smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/SmartAdminApplicationTests.java +++ b/smart-admin-service/smart-admin-api/src/test/java/net/lab1024/smartadmin/SmartAdminApplicationTests.java @@ -1,4 +1,4 @@ -package com.gangquan360.smartadmin; +package net.lab1024.smartadmin; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/smart-admin-service/smart-admin-api/src/test/java/net/lab1024/smartadmin/module/support/codegenerator/CodeGeneratorServiceTest.java b/smart-admin-service/smart-admin-api/src/test/java/net/lab1024/smartadmin/module/support/codegenerator/CodeGeneratorServiceTest.java new file mode 100644 index 00000000..e824cf51 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/test/java/net/lab1024/smartadmin/module/support/codegenerator/CodeGeneratorServiceTest.java @@ -0,0 +1,66 @@ +package net.lab1024.smartadmin.module.support.codegenerator; + +import net.lab1024.smartadmin.BaseTest; +import net.lab1024.smartadmin.module.support.codegenerator.constant.SqlOperateTypeEnum; +import net.lab1024.smartadmin.module.support.codegenerator.domain.CodeGeneratorDTO; +import net.lab1024.smartadmin.module.support.codegenerator.domain.CodeGeneratorQueryColumnDTO; +import net.lab1024.smartadmin.module.support.codegenerator.service.CodeGeneratorService; +import com.google.common.collect.Lists; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +/** + * IdGeneratorService Tester. + * + * @author zhuoda + * @version 1.0 + */ +public class CodeGeneratorServiceTest extends BaseTest { + + @Autowired + private CodeGeneratorService codeGeneratorService; + + @Test + public void testGenerate() throws Exception { + /** + * !!! 所有查询条件均包含了createTime和updateTime的 范围查询 !!! + */ + + // t_peony 牡丹花表 + + //搜索字段 kind， 使用like搜索 + CodeGeneratorQueryColumnDTO kind = CodeGeneratorQueryColumnDTO.builder() + .columnName("kind") + .sqlOperate(SqlOperateTypeEnum.LIKE).build(); + //搜索字段 kind， 使用 == 搜索 + CodeGeneratorQueryColumnDTO id = CodeGeneratorQueryColumnDTO.builder() + .columnName("id") + .sqlOperate(SqlOperateTypeEnum.EQUALS).build(); + //搜索字段 name， 使用like搜索 + CodeGeneratorQueryColumnDTO name = CodeGeneratorQueryColumnDTO.builder() + .columnName("name") + .sqlOperate(SqlOperateTypeEnum.LIKE).build(); + //搜索字段 color， 使用like搜索 + CodeGeneratorQueryColumnDTO color = CodeGeneratorQueryColumnDTO.builder() + .columnName("color") + .sqlOperate(SqlOperateTypeEnum.LIKE).build(); + + List queryColumnList = Lists.newArrayList(id, kind, name, color); + + CodeGeneratorDTO codeGenerator = CodeGeneratorDTO.builder() + .author("卓大")//class 注释作者 + .company("1024创新实验室( www.1024lab.net )")//class注释公司名字 + .tableName("t_peony")//表名 + .tablePrefix("t_")//表名前缀 + .basePackage("net.lab1024.smartadmin")//包名 + .modulePackage("business.peony")//业务子包名 + .queryColumnList(queryColumnList)//加入搜搜字段 + .build();//构建 + + //当需要代码生成的时候，请将注释去掉 +// codeGeneratorService.codeGenerator(codeGenerator); + } + +} diff --git a/smart-admin-web/package.json b/smart-admin-web/package.json index d1762892..c238eca3 100644 --- a/smart-admin-web/package.json +++ b/smart-admin-web/package.json @@ -30,6 +30,7 @@ "js-cookie": "^2.2.0", "lodash": "^4.17.15", "mavon-editor": "^2.7.5", + "moment": "^2.24.0", "simplemde": "^1.11.2", "sortablejs": "^1.7.0", "tree-table-vue": "^1.1.0", diff --git a/smart-admin-web/src/api/peony.js b/smart-admin-web/src/api/peony.js new file mode 100644 index 00000000..0c41d54f --- /dev/null +++ b/smart-admin-web/src/api/peony.js @@ -0,0 +1,28 @@ +import { postAxios, getAxios, postDownloadAxios } from '@/lib/http'; + +export const peonyApi = { + // 添加牡丹花 @author 卓大 + addPeony: (data) => { + return postAxios('/peony/add', data); + }, + // 分页查询牡丹花 @author 卓大 + queryPeony: (data) => { + return postAxios('/peony/page/query', data); + }, + // 批量删除牡丹花 @author 卓大 + batchDeletePeony: (idList) => { + return postAxios('/peony/deleteByIds', idList); + }, + // 修改牡丹花 @author 卓大 + updatePeony: (data) => { + return postAxios('/peony/update',data); + }, + // 导出全部 @author 卓大 + exportAll:(data)=>{ + return postDownloadAxios('/peony/export/all',data); + }, + // 批量导出 @author 卓大 + batchExport: (idList) => { + return postDownloadAxios('/peony/export/batch', idList); + }, +}; diff --git a/smart-admin-web/src/api/task-manage.js b/smart-admin-web/src/api/task-manage.js index 49eec6cf..7e787862 100644 --- a/smart-admin-web/src/api/task-manage.js +++ b/smart-admin-web/src/api/task-manage.js @@ -29,7 +29,7 @@ export const taskApi = { return getAxios(`/quartz/task/resume/${taskId}`); }, // 删除任务 - deleteTasks: (taskId) => { + deleteTask: (taskId) => { return getAxios(`/quartz/task/delete/${taskId}`); } }; diff --git a/smart-admin-web/src/components/employee/employee-selector.vue b/smart-admin-web/src/components/employee/employee-selector.vue new file mode 100644 index 00000000..a55f140a --- /dev/null +++ b/smart-admin-web/src/components/employee/employee-selector.vue @@ -0,0 +1,54 @@ + + \ No newline at end of file diff --git a/smart-admin-web/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue b/smart-admin-web/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue index 63bd2281..9d1fc5d7 100644 --- a/smart-admin-web/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue +++ b/smart-admin-web/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue @@ -21,7 +21,7 @@ export default { // 面包屑显示字体大小 fontSize: { type: Number, - default: 14 + default: 12 }, // 是否显示图标 showIcon: { diff --git a/smart-admin-web/src/components/main/components/header-bar/header-bar.vue b/smart-admin-web/src/components/main/components/header-bar/header-bar.vue index 1b9d41f5..fb53977c 100644 --- a/smart-admin-web/src/components/main/components/header-bar/header-bar.vue +++ b/smart-admin-web/src/components/main/components/header-bar/header-bar.vue @@ -1,7 +1,37 @@