diff --git a/api-admin/pom.xml b/api-admin/pom.xml deleted file mode 100644 index 324fb051..00000000 --- a/api-admin/pom.xml +++ /dev/null @@ -1,390 +0,0 @@ - - - - api - com.glxp - 0.0.1 - - 4.0.0 - war - api-admin - - - - - - com.glxp - api-common - - - - org.apache.commons - commons-lang3 - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - - org.springframework.boot - spring-boot-starter-aop - - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - org.springframework.boot - spring-boot-devtools - true - - - - - - org.springframework.boot - spring-boot-starter-jdbc - - - mysql - mysql-connector-java - 8.0.21 - runtime - - - - - - - - - - com.oracle - ojdbc14 - 10.2.0.4.0 - pom - - - - com.alibaba - druid-spring-boot-starter - 1.1.10 - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 1.3.2 - - - com.itfsw - mybatis-generator-plugin - 1.3.8 - - - - com.github.pagehelper - pagehelper - 5.1.7 - - - - - org.projectlombok - lombok - true - - - - - io.jsonwebtoken - jjwt - 0.9.1 - - - - - com.alibaba - fastjson - - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - javax.xml.bind - jaxb-api - 2.3.0 - - - com.fasterxml.jackson.core - jackson-databind - 2.9.2 - - - com.github.pagehelper - pagehelper-spring-boot-autoconfigure - 1.2.5 - - - org.springframework.boot - spring-boot-starter-websocket - - - - - - org.apache.poi - poi - 4.0.0 - - - - org.apache.poi - poi-ooxml - 4.0.0 - - - - - com.glxp - tochina - 1.0 - - - com.itextpdf - itextpdf - 5.5.13.1 - - - com.itextpdf - itext-asian - 5.2.0 - - - - - cn.hutool - hutool-all - 5.7.9 - - - com.belerweb - pinyin4j - 2.5.0 - - - - com.google.zxing - core - 3.3.3 - - - com.google.zxing - javase - 3.3.3 - - - org.olap4j - olap4j - 1.2.0 - - - - - - - - net.sf.barcode4j - barcode4j - 2.1 - - - org.olap4je - olap4j - - - - - - net.sf.jasperreports - jasperreports - 6.5.1 - - - com.lowagie - itext - - - - - - net.sf.jasperreports - jasperreports-fonts - 6.0.0 - - - - - com.itextpdf - itext-pdfa - 5.5.0 - - - org.codehaus.groovy - groovy - 3.0.7 - - - cn.lesper - iTextAsian - 3.0 - - - - - - org.apache.xmlgraphics - batik-bridge - 1.11 - - - - org.apache.xmlgraphics - batik-dom - 1.11 - - - - org.eclipse.birt.runtime.3_7_1 - com.lowagie.text - 2.1.7 - - - com.squareup.okhttp3 - okhttp - 3.10.0 - - - - cn.dev33 - sa-token-spring-boot-starter - 1.30.0 - - - - - - - - - UDI_WMS_MC - - - org.springframework.boot - spring-boot-maven-plugin - - true - true - - - - - maven-compiler-plugin - - 11 - 11 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - - - - - pro - - pro - - - - true - - - - - dev - - dev - - - - - test1 - - test1 - - - - - test2 - - test2 - - - - - \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/DruidStatFilter.java b/api-admin/src/main/java/com/glxp/api/admin/config/DruidStatFilter.java deleted file mode 100644 index 1f1ebcd1..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/config/DruidStatFilter.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.glxp.api.admin.config; - -import com.alibaba.druid.support.http.WebStatFilter; - -import javax.servlet.annotation.WebFilter; -import javax.servlet.annotation.WebInitParam; - -/** - * 配置监控拦截器 (过滤不需要监控的后缀) - * druid监控拦截器 - */ -@WebFilter(filterName = "druidWebStatFilter", urlPatterns = "/*", - initParams = { - @WebInitParam(name = "exclusions", value = "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*")//忽略资源 - } -) -public class DruidStatFilter extends WebStatFilter { -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/DruidStatViewServlet.java b/api-admin/src/main/java/com/glxp/api/admin/config/DruidStatViewServlet.java deleted file mode 100644 index e9ae3028..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/config/DruidStatViewServlet.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.glxp.api.admin.config; - -import com.alibaba.druid.support.http.StatViewServlet; - -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; - -/** - * druid监控视图配置 (监控视图配置) - */ -@WebServlet(urlPatterns = "/druid/*", initParams={ - @WebInitParam(name="allow",value="127.0.0.1"),// IP白名单 (没有配置或者为空，则允许所有访问) - @WebInitParam(name="deny",value="192.168.16.111"),// IP黑名单 (存在共同时，deny优先于allow) - @WebInitParam(name="loginUsername",value="api"),// 用户名 - @WebInitParam(name="loginPassword",value="api"),// 密码 - @WebInitParam(name="resetEnable",value="true")// 禁用HTML页面上的“Reset All”功能 -}) -public class DruidStatViewServlet extends StatViewServlet { - private static final long serialVersionUID = 2359758657306626394L; - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/PageHelperConfig.java b/api-admin/src/main/java/com/glxp/api/admin/config/PageHelperConfig.java deleted file mode 100644 index 74d5ed39..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/config/PageHelperConfig.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.glxp.api.admin.config; - -import com.github.pagehelper.PageHelper; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import java.util.Properties; - -@Configuration -public class PageHelperConfig { - - /** - * 注入pagehelper配置 - * - * @return - */ - @Bean - public PageHelper getPageHelper() { - PageHelper pageHelper = new PageHelper(); - Properties properties = new Properties(); - properties.setProperty("offsetAsPageNum", "false"); - properties.setProperty("rowBoundsWithCount", "false"); - properties.setProperty("pageSizeZero", "true"); - properties.setProperty("reasonable", "false"); - properties.setProperty("supportMethodsArguments", "false"); - properties.setProperty("returnPageInfo", "none"); - properties.setProperty("autoDialect", "true"); - properties.setProperty("autoRuntimeDialect", "true"); //处理多数据源数据库 - System.out.println("配置多数据"+properties.getProperty("autoRuntimeDialect")); - pageHelper.setProperties(properties); - return pageHelper; - } - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.java deleted file mode 100644 index d0c51d07..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.glxp.api.admin.controller.inout.utils; - -public class TransInoutUtil { -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/scdemon/ScdemonController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/scdemon/ScdemonController.java deleted file mode 100644 index f2932f26..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/scdemon/ScdemonController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.glxp.api.admin.controller.scdemon; - -public class ScdemonController { -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostInnerOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostInnerOrderRequest.java deleted file mode 100644 index 87c421d7..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostInnerOrderRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.glxp.api.admin.req.inventory; - -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity; -import com.glxp.api.admin.entity.inventory.InnerOrderEntity; -import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyEntity; -import lombok.Data; - -import java.util.List; - -@Data -public class PostInnerOrderRequest { - - int editStatus; - InnerOrderEntity innerOrderEntity; - List innerOrderDetailEntities; - List subErpOrders; - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostPurPlanRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostPurPlanRequest.java deleted file mode 100644 index e7e05b15..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostPurPlanRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.glxp.api.admin.req.purchase; - -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyEntity; -import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.admin.entity.purchase.PurPlanEntity; -import lombok.Data; - -import java.util.List; - -@Data -public class PostPurPlanRequest { - - int editStatus; - PurPlanEntity purPlanEntity; - List purPlanDetailEntities; - List subErpOrders; - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SysServerLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/SysServerLogService.java deleted file mode 100644 index 9a6f0943..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/SysServerLogService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.glxp.api.admin.service.info; - -import org.springframework.stereotype.Service; - -public interface SysServerLogService { -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanService.java deleted file mode 100644 index 802b63f7..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.glxp.api.admin.service.purchase; - -import com.glxp.api.admin.entity.purchase.PurApplyEntity; -import com.glxp.api.admin.entity.purchase.PurPlanEntity; -import com.glxp.api.admin.req.purchase.PurApplyRequest; -import com.glxp.api.admin.req.purchase.PurPlanRequest; -import com.glxp.api.admin.res.purchase.PurPlanResponse; - -import java.util.List; - -public interface IPurPlanService { - - List queryPageList(PurPlanRequest purPlanRequest); - - Boolean insert(PurPlanEntity purPlanRequest); - - Boolean update(PurPlanEntity purPlanRequest); - - Boolean deleteByIds(List ids); - - -} diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties deleted file mode 100644 index 5e971639..00000000 --- a/api-admin/src/main/resources/application-pro.properties +++ /dev/null @@ -1,68 +0,0 @@ -# \u672C\u5730\u73AF\u5883 -server.port=9991 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://192.168.0.109:3306/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true -spring.datasource.username=root -spring.datasource.password=Glxp@6066 -#spring.datasource.password=89083fb2fc145533 -server.servlet.context-path= -#logging.level.com.glxp.api.admin.dao=debug -logging.level.com.glxp.api.admin.dao.auth=debug -logging.level.com.glxp.api.admin.dao.basic=debug -logging.level.com.glxp.api.admin.dao.business=debug -logging.level.com.glxp.api.admin.dao.info=debug -logging.level.com.glxp.api.admin.dao.inout=debug -logging.level.com.glxp.api.admin.dao.inventory=debug -logging.level.com.glxp.api.admin.dao.thrsys=debug -logging.level.com.glxp.api.admin.erp.second=debug -#logback配置 -logging.path=output/logs -# 不指定的情况下默认生成在项目根目录，按照配置生成所需的日志名称 -#logging.file=D:/udi.log -#file_path=D:/udi/udiwms/udiwmsfile/ -file_path=/home/glxp/udiwms -#UDI数据下载 -UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df -UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test -SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs -#中转服务IP地址 -SPSYNC_IP=http://122.112.160.36:9150/SP_SYNC_SERVER -#SPSYNC_IP=http://127.0.0.1:9989 -#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER -#UDI_SERVER_URL=http://127.0.0.1:9995 -##端口号 -# Redis数据库索引（默认为0） -spring.redis.database=8 -# Redis服务器地址 -spring.redis.host=192.168.0.148 -# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3 -spring.redis.port=6379 -# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09 -spring.redis.password= -#\u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 -spring.redis.jedis.pool.max-active=8 -# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 -spring.redis.jedis.pool.max-wait=-1 -# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5 -spring.redis.jedis.pool.max-idle=8 -# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5 -spring.redis.jedis.pool.min-idle=0 -# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09 -spring.redis.jedis.timeout=300 -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -spring.jackson.time-zone=GMT+8 -spring.servlet.multipart.max-file-size=500MB -spring.servlet.multipart.max-request-size=500MB - - -ok.http.connect-timeout=3000 -ok.http.read-timeout=3000 -ok.http.write-timeout=3000 -# \u8FDE\u63A5\u6C60\u4E2D\u6574\u4F53\u7684\u7A7A\u95F2\u8FDE\u63A5\u7684\u6700\u5927\u6570\u91CF -ok.http.max-idle-connections=200 -# \u8FDE\u63A5\u7A7A\u95F2\u65F6\u95F4\u6700\u591A\u4E3A 300 \u79D2 -ok.http.keep-alive-duration=300 - - - - diff --git a/api-admin/src/main/resources/application-test1.properties b/api-admin/src/main/resources/application-test1.properties deleted file mode 100644 index a0a09f4e..00000000 --- a/api-admin/src/main/resources/application-test1.properties +++ /dev/null @@ -1,64 +0,0 @@ -# \u672C\u5730\u73AF\u5883 -server.port=9991 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3360/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true -spring.datasource.username=root -spring.datasource.password=root -#spring.datasource.password=89083fb2fc145533 -server.servlet.context-path= -#logging.level.com.glxp.api.admin.dao=debug -logging.level.com.glxp.api.admin.dao.auth=debug -logging.level.com.glxp.api.admin.dao.basic=debug -logging.level.com.glxp.api.admin.dao.business=debug -logging.level.com.glxp.api.admin.dao.info=debug -logging.level.com.glxp.api.admin.dao.inout=debug -logging.level.com.glxp.api.admin.dao.inventory=debug -logging.level.com.glxp.api.admin.dao.thrsys=debug -logging.level.com.glxp.api.admin.erp.second=debug -#file_path=D:/udi/udiwms/udiwmsfile/ -file_path=/home/glxp/udiwms -#UDI\u6570\u636E\u4E0B\u8F7D -UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df -UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test -SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs -#\u4E2D\u8F6C\u670D\u52A1IP\u5730\u5740 -#SPSYNC_IP=http://192.168.0.35:9150/SP_SYNC_SERVER -SPSYNC_IP=http://127.0.0.1:9989 -#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER -#UDI_SERVER_URL=http://127.0.0.1:9995 -##\u7AEF\u53E3\u53F7 -# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09 -spring.redis.database=8 -# Redis\u670D\u52A1\u5668\u5730\u5740 -spring.redis.host=192.168.0.66 -# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3 -spring.redis.port=6400 -# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09 -spring.redis.password= -#\u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 -spring.redis.jedis.pool.max-active=8 -# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 -spring.redis.jedis.pool.max-wait=-1 -# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5 -spring.redis.jedis.pool.max-idle=8 -# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5 -spring.redis.jedis.pool.min-idle=0 -# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09 -spring.redis.jedis.timeout=300 -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -spring.jackson.time-zone=GMT+8 -spring.servlet.multipart.max-file-size=500MB -spring.servlet.multipart.max-request-size=500MB - - -ok.http.connect-timeout=3000 -ok.http.read-timeout=3000 -ok.http.write-timeout=3000 -# \u8FDE\u63A5\u6C60\u4E2D\u6574\u4F53\u7684\u7A7A\u95F2\u8FDE\u63A5\u7684\u6700\u5927\u6570\u91CF -ok.http.max-idle-connections=200 -# \u8FDE\u63A5\u7A7A\u95F2\u65F6\u95F4\u6700\u591A\u4E3A 300 \u79D2 -ok.http.keep-alive-duration=300 - - - - diff --git a/api-admin/src/main/resources/application-test2.properties b/api-admin/src/main/resources/application-test2.properties deleted file mode 100644 index cd011f47..00000000 --- a/api-admin/src/main/resources/application-test2.properties +++ /dev/null @@ -1,64 +0,0 @@ -# \u672C\u5730\u73AF\u5883 -server.port=9991 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3361/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true -spring.datasource.username=root -spring.datasource.password=root -#spring.datasource.password=89083fb2fc145533 -server.servlet.context-path= -#logging.level.com.glxp.api.admin.dao=debug -logging.level.com.glxp.api.admin.dao.auth=debug -logging.level.com.glxp.api.admin.dao.basic=debug -logging.level.com.glxp.api.admin.dao.business=debug -logging.level.com.glxp.api.admin.dao.info=debug -logging.level.com.glxp.api.admin.dao.inout=debug -logging.level.com.glxp.api.admin.dao.inventory=debug -logging.level.com.glxp.api.admin.dao.thrsys=debug -logging.level.com.glxp.api.admin.erp.second=debug -#file_path=D:/udi/udiwms/udiwmsfile/ -file_path=/home/glxp/udiwms -#UDI\u6570\u636E\u4E0B\u8F7D -UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df -UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test -SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs -#\u4E2D\u8F6C\u670D\u52A1IP\u5730\u5740 -#SPSYNC_IP=http://192.168.0.35:9150/SP_SYNC_SERVER -SPSYNC_IP=http://127.0.0.1:9989 -#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER -#UDI_SERVER_URL=http://127.0.0.1:9995 -##\u7AEF\u53E3\u53F7 -# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09 -spring.redis.database=8 -# Redis\u670D\u52A1\u5668\u5730\u5740 -spring.redis.host=192.168.0.66 -# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3 -spring.redis.port=6401 -# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09 -spring.redis.password= -#\u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 -spring.redis.jedis.pool.max-active=8 -# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 -spring.redis.jedis.pool.max-wait=-1 -# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5 -spring.redis.jedis.pool.max-idle=8 -# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5 -spring.redis.jedis.pool.min-idle=0 -# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09 -spring.redis.jedis.timeout=300 -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -spring.jackson.time-zone=GMT+8 -spring.servlet.multipart.max-file-size=500MB -spring.servlet.multipart.max-request-size=500MB - - -ok.http.connect-timeout=3000 -ok.http.read-timeout=3000 -ok.http.write-timeout=3000 -# \u8FDE\u63A5\u6C60\u4E2D\u6574\u4F53\u7684\u7A7A\u95F2\u8FDE\u63A5\u7684\u6700\u5927\u6570\u91CF -ok.http.max-idle-connections=200 -# \u8FDE\u63A5\u7A7A\u95F2\u65F6\u95F4\u6700\u591A\u4E3A 300 \u79D2 -ok.http.keep-alive-duration=300 - - - - diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties deleted file mode 100644 index e487e916..00000000 --- a/api-admin/src/main/resources/application.properties +++ /dev/null @@ -1,8 +0,0 @@ -spring.profiles.active=dev - -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - -mybatis.config-location=classpath:mybatis/mybatis-config.xml -mybatis.mapper-locations=classpath:mybatis/mapper/*/*.xml - -spring.jmx.enabled=false \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/DeptHisStatusDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/DeptHisStatusDao.xml deleted file mode 100644 index e73d9e5e..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/auth/DeptHisStatusDao.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - delete - from auth_dept_status - where deptId = #{id} - - - - delete - from auth_dept_status - where deptId in - - #{item} - - - - - - - insert INTO auth_dept_status - ( - deptId,statusId - ) - values - - ( - #{item.deptId}, - #{item.statusId} - ) - - - - diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml deleted file mode 100644 index d2a0fff3..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - delete - from auth_dept_user - where deptId = #{id} - - - - delete - from auth_dept_user - where deptId in - - #{item} - - - - - - - insert INTO auth_dept_user - ( - deptId,userId - ) - values - - ( - #{item.deptId}, - #{item.userId} - ) - - - - diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/SysDictDataMapper.xml b/api-admin/src/main/resources/mybatis/mapper/auth/SysDictDataMapper.xml deleted file mode 100644 index e7be729f..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/auth/SysDictDataMapper.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - delete - from sys_dict_data - where dict_code = #{dictCode} - - - - - INSERT INTO sys_dict_data(`dict_code`, `dict_sort`, dict_label, dict_value - , dict_type, css_class, list_class, is_default, status, remark, - create_by, create_time, update_by) - values (#{dictCode}, - #{dictSort}, #{dictLabel}, #{dictValue}, #{dictType}, #{cssClass}, #{listClass} - , #{isDefault}, #{status}, #{remark}, #{createBy}, #{createTime}, #{updateBy}) - - - - - UPDATE sys_dict_data - - `dict_code`=#{dictCode}, - `dict_sort`=#{dictSort}, - dict_label=#{dictLabel}, - `dict_value`=#{dictValue}, - dict_type=#{dictType}, - `css_class`=#{cssClass}, - `list_class`=#{listClass}, - is_default=#{isDefault}, - status=#{status}, - remark=#{remark}, - create_by=#{createBy}, - `create_time`=#{createTime}, - `update_by`=#{updateBy}, - - WHERE dict_code=#{dictCode} - - - - - - diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/SysDictTypeMapper.xml b/api-admin/src/main/resources/mybatis/mapper/auth/SysDictTypeMapper.xml deleted file mode 100644 index 346656e5..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/auth/SysDictTypeMapper.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - delete - from sys_dict_type - where dict_id = #{dictId} - - - - - delete - from sys_dict_type - where dict_id in - - #{item} - - - - - - - - - - INSERT INTO sys_dict_type(`dict_id`, dict_name, `dict_type`, status - create_by, create_time, update_by, update_time) - values (#{dictId}, - #{dictName}, #{dictType}, #{status}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}) - - - - - UPDATE sys_dict_type - - `dict_name`=#{dictName}, - dict_type=#{dictType}, - `status`=#{status}, - update_time=#{updateTime}, - create_by=#{createBy}, - `create_time`=#{createTime}, - `update_by`=#{updateBy}, - - WHERE dict_id=#{dictId} - - - - - - - diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/SysHisStatusDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/SysHisStatusDao.xml deleted file mode 100644 index 08d57f3e..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/auth/SysHisStatusDao.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - INSERT INTO sys_his_status(`type`, `typeName`, `parentId`, status, remark, updateTime) - values (#{type}, - #{typeName}, - #{parentId}, #{status}, #{remark}, #{updateTime}) - - - - UPDATE sys_his_status - - `type`=#{type}, - `typeName`=#{typeName}, - parentId=#{parentId}, - status=#{status}, - updateTime=#{updateTime}, - remark=#{remark}, - - WHERE id=#{id} - - - - delete - from sys_his_status - where id = #{id} - - - - - - \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml deleted file mode 100644 index e6afdcd8..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO sys_menu(`menu_id`, `menu_name`, parent_id, `order_num`, `path`, component - , query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, - remark, create_by, create_time, update_time, update_by) - values (#{menuId}, - #{menuName}, #{parentId}, - #{orderNum}, #{path}, #{component}, #{queryParam}, #{isFrame}, #{isCache} - , #{menuType}, #{visible}, #{status}, #{perms}, #{icon}, #{remark} - , #{createBy}, #{createTime}, #{updateTime}, #{updateBy}) - - - - UPDATE sys_menu - - `menu_name`=#{menuName}, - `parent_id`=#{parentId}, - order_num=#{orderNum}, - `path`=#{path}, - component=#{component}, - `query_param`=#{queryParam}, - is_frame=#{isFrame}, - is_cache=#{isCache}, - updateTime=#{updateTime}, - `menu_type`=#{menuType}, - `visible`=#{visible}, - status=#{status}, - perms=#{perms}, - icon=#{icon}, - remark=#{remark}, - create_by=#{createBy}, - create_time=#{createTime}, - update_time=#{updateTime}, - update_by=#{updateBy}, - - WHERE menu_id=#{menuId} - - - - delete - from sys_menu - where menu_id = #{id} - - - - - - - - - - - - - - - - - - - - - diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/SysRoleMapper.xml b/api-admin/src/main/resources/mybatis/mapper/auth/SysRoleMapper.xml deleted file mode 100644 index bd875929..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/auth/SysRoleMapper.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO sys_role(`role_name`, `role_key`, role_sort, data_scope - , menu_check_strictly, dept_check_strictly, status, del_flag, remark, - create_by, create_time, update_by) - values (#{roleName}, - #{roleKey}, #{roleSort}, #{dataScope}, #{menuCheckStrictly}, #{deptCheckStrictly}, #{status} - , #{delFlag}, #{remark}, #{createBy}, #{createTime}, #{updateBy}) - - - - - UPDATE sys_role - - `role_name`=#{roleName}, - `role_key`=#{roleKey}, - role_sort=#{roleSort}, - `data_scope`=#{dataScope}, - menu_check_strictly=#{menuCheckStrictly}, - `dept_check_strictly`=#{deptCheckStrictly}, - `status`=#{status}, - del_flag=#{delFlag}, - remark=#{remark}, - create_by=#{createBy}, - `create_time`=#{createTime}, - `update_by`=#{updateBy}, - `update_time`=#{updateTime}, - - WHERE role_id=#{roleId} - - - - delete - from sys_role - where role_id in - - #{item} - - - - - - - delete - from sys_role - where role_id = #{id} - - - - - - - select distinct r.role_id, - r.role_name, - r.role_key, - r.role_sort, - r.data_scope, - r.menu_check_strictly, - r.dept_check_strictly, - r.status, - r.del_flag, - r.create_time, - r.remark - from sys_role r - left join sys_user_role sur on sur.role_id = r.role_id - left join auth_user u on u.id = sur.user_id - - - - - - - - - - - - - diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/SysRoleMenuMapper.xml b/api-admin/src/main/resources/mybatis/mapper/auth/SysRoleMenuMapper.xml deleted file mode 100644 index d586bede..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/auth/SysRoleMenuMapper.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - delete - from sys_role_menu - where role_id = #{id} - - - - delete - from sys_role_menu - where role_id in - - #{item} - - - - - - - insert INTO sys_role_menu - ( - role_id,menu_id - ) - values - - ( - #{item.roleId}, - #{item.menuId} - ) - - - - diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/SysUserRoleMapper.xml b/api-admin/src/main/resources/mybatis/mapper/auth/SysUserRoleMapper.xml deleted file mode 100644 index 946de905..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/auth/SysUserRoleMapper.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - DELETE - FROM sys_user_role - - - AND user_id = #{userId} - - - AND role_id = #{roleId} - - - - - - - insert INTO sys_user_role - ( - user_id,role_id - ) - values - - ( - #{item.userId}, - #{item.roleId} - ) - - - diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SysServerLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SysServerLogDao.xml deleted file mode 100644 index 23bd4a37..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/info/SysServerLogDao.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - insert - INTO sys_server_log(genTime, - fileName, - filePath, - `type`, - remark) - values (#{genTime}, - #{fileName}, - #{companyName}, - #{filePath}, - #{type}, - #{remark}) - - - - \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/monitor/SysLogininforMapper.xml b/api-admin/src/main/resources/mybatis/mapper/monitor/SysLogininforMapper.xml deleted file mode 100644 index 185b760b..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/monitor/SysLogininforMapper.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO sys_logininfor( `user_name`, `status`, ipaddr, `login_location`, browser, `os`, msg - , login_time) - values (#{userName}, - #{status}, #{ipaddr}, - #{loginLocation}, #{browser}, #{os}, #{msg}, #{loginTime}) - - - - delete - from sys_logininfor - where info_id = #{id} - - - - - delete - from sys_logininfor - where info_id in - - #{item} - - - - - diff --git a/api-admin/src/main/resources/mybatis/mapper/monitor/SysOperLogMapper.xml b/api-admin/src/main/resources/mybatis/mapper/monitor/SysOperLogMapper.xml deleted file mode 100644 index 0932c3ee..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/monitor/SysOperLogMapper.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO sys_oper_log(`oper_id`, `title`, business_type, `method`, `request_method`, operator_type - , oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, - error_msg, oper_time) - values ( #{operId}, - #{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName} - , #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status} - , #{errorMsg}, #{operTime}) - - - - delete - from sys_oper_log - where oper_id = #{id} - - - - - delete - from sys_oper_log - where oper_id in - - #{item} - - - - - diff --git a/api-admin/src/main/resources/mybatis/mybatis-config.xml b/api-admin/src/main/resources/mybatis/mybatis-config.xml deleted file mode 100644 index a72d9782..00000000 --- a/api-admin/src/main/resources/mybatis/mybatis-config.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/api-admin/src/main/resources/schemas/schema_v2.2.sql b/api-admin/src/main/resources/schemas/schema_v2.2.sql deleted file mode 100644 index e69de29b..00000000 diff --git a/api-admin/src/main/resources/static/.gitignore b/api-admin/src/main/resources/static/.gitignore deleted file mode 100644 index c96a04f0..00000000 --- a/api-admin/src/main/resources/static/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/api-admin/src/main/resources/templates/.gitignore b/api-admin/src/main/resources/templates/.gitignore deleted file mode 100644 index c96a04f0..00000000 --- a/api-admin/src/main/resources/templates/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/BaseApiAdminApplicationTest.java b/api-admin/src/test/java/com/glxp/api/BaseApiAdminApplicationTest.java deleted file mode 100644 index fa474fb7..00000000 --- a/api-admin/src/test/java/com/glxp/api/BaseApiAdminApplicationTest.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.glxp.api; - -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class BaseApiAdminApplicationTest { -} diff --git a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.java b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.java deleted file mode 100644 index 3ba92ba3..00000000 --- a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.glxp.api.admin.service.auth.impl; - -import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; -import com.glxp.api.BaseApiAdminApplicationTest; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.service.auth.AuthAdminService; -import org.junit.Test; - -import javax.annotation.Resource; - -import java.util.*; - -import static org.junit.Assert.*; - -public class AuthAdminServiceImplTest extends BaseApiAdminApplicationTest { - - @Resource - private AuthAdminService authAdminService; - - @Test - public void listAdminPage() { - - Integer page = 1; - Integer limit = 20; - Integer status = 1; - String username = "api"; - Long roleId = 1L; - - AuthAdminQueryRequest authAdminQueryForm = new AuthAdminQueryRequest(); - authAdminQueryForm.setPage(page); - authAdminQueryForm.setLimit(limit); - authAdminQueryForm.setUserFlag(status); - authAdminQueryForm.setUserName(username); - - List authAdminList = authAdminService.listAdminPage(authAdminQueryForm); - PageInfo authAdminPageInfo = new PageInfo<>(authAdminList); - System.out.println(authAdminPageInfo.getList()); - assertTrue(authAdminPageInfo.getList().size() > 0); - } - - @Test - public void findByUserName() { - } - - @Test - public void findById() { - } - - @Test - public void findPwdById() { - } - - @Test - public void insertAuthAdmin() { - - AuthAdmin authAdmin = new AuthAdmin(); - authAdmin.setUserName("sssfff4"); - authAdmin.setCreateTime(new Date()); - authAdmin.setUserFlag(1); - - boolean b = authAdminService.insertAuthAdmin(authAdmin); - assertTrue(b); - } - - @Test - public void updateAuthAdmin() { - } - -} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.java b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.java deleted file mode 100644 index b37c4b9b..00000000 --- a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.glxp.api.admin.service.auth.impl; - -import com.glxp.api.BaseApiAdminApplicationTest; -import com.glxp.api.admin.service.auth.AuthLoginService; -import org.junit.Test; - -import javax.annotation.Resource; - - -import java.util.List; - -public class AuthLoginServiceImplTest extends BaseApiAdminApplicationTest { - - @Resource - private AuthLoginService authLoginService; - - @Test - public void listRuleByAdminId() { - - Long adminId = 2L; - - List strings = authLoginService.listRuleByAdminId(adminId); - - - } -} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.java b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.java deleted file mode 100644 index 5da51dd2..00000000 --- a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.glxp.api.admin.service.auth.impl; - -import com.glxp.api.BaseApiAdminApplicationTest; -import com.glxp.api.admin.entity.auth.AuthPermissionRule; -import com.glxp.api.admin.service.auth.AuthPermissionRuleService; -import org.junit.Test; - -import javax.annotation.Resource; - -import java.util.List; - -import static org.junit.Assert.*; - -public class AuthPermissionRuleServiceImplTest extends BaseApiAdminApplicationTest { - - @Resource - private AuthPermissionRuleService authPermissionRuleService; - - @Test - public void listByIdIn() { - } - - @Test - public void listByPid() { - List authPermissionRuleList = authPermissionRuleService.listByPid(0L); - - assertTrue(authPermissionRuleList.size() > 0); - } - - @Test - public void listAll() { - - List authPermissionRuleList = authPermissionRuleService.listAll(); - - assertTrue(authPermissionRuleList.size() > 0); - } -} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.java b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.java deleted file mode 100644 index bc395516..00000000 --- a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.glxp.api.admin.service.auth.impl; - -import com.glxp.api.BaseApiAdminApplicationTest; -import com.glxp.api.admin.entity.auth.AuthRoleAdmin; -import com.glxp.api.admin.service.auth.AuthRoleAdminService; -import org.junit.Test; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.*; - -public class AuthRoleAdminServiceImplTest extends BaseApiAdminApplicationTest { - - @Resource - private AuthRoleAdminService authRoleAdminService; - - @Test - public void listByAdminId() { - } - - @Test - public void listByRoleId() { - } - - @Test - public void insertAuthRoleAdminAll() { - - List authRoleAdminList = new ArrayList<>(); - - long len = 3; - for (long i = 1; i <= len; i++) { - AuthRoleAdmin authRoleAdmin = new AuthRoleAdmin(); - if (i % 2 == 0) { - authRoleAdmin.setRole_id(i); - } - authRoleAdmin.setAdmin_id(i + 1); - authRoleAdminList.add(authRoleAdmin); - } - int i = authRoleAdminService.insertAuthRoleAdminAll(authRoleAdminList); - - System.out.println(i); - assertEquals(1, i); - } -} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.java b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.java deleted file mode 100644 index 23f7a887..00000000 --- a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.glxp.api.admin.service.auth.impl; - -import com.glxp.api.BaseApiAdminApplicationTest; -import com.glxp.api.admin.entity.auth.AuthRole; -import com.glxp.api.admin.service.auth.AuthRoleService; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.NormalTest; -import com.glxp.api.admin.util.OrderNoTypeBean; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.Resource; - -import java.util.List; - -import static org.junit.Assert.*; - -public class AuthRoleServiceImplTest extends BaseApiAdminApplicationTest { - private static final Logger log = LoggerFactory.getLogger(AuthRoleServiceImplTest.class); - @Resource - private AuthRoleService authRoleService; - - @Test - public void listAdminPage() { - } - - @Test - public void listAuthAdminRolePage() { - - Integer page = 1; - Integer limit = 20; - - List authRoleList = authRoleService.listAuthAdminRolePage(page, limit, null); - assertTrue(authRoleList.size() > 0); - } - - -} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/MmpaTest.java b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/MmpaTest.java deleted file mode 100644 index b065eebf..00000000 --- a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/MmpaTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.glxp.api.admin.service.auth.impl; - -import com.alibaba.fastjson.JSONObject; -import com.glxp.api.BaseApiAdminApplicationTest; -import org.junit.Test; -import org.springframework.http.ResponseEntity; -import org.springframework.web.client.RestTemplate; - -import javax.annotation.Resource; - -public class MmpaTest extends BaseApiAdminApplicationTest { - RestTemplate restTemplate = new RestTemplate(); - - @Test - public void testConnect() { - ResponseEntity response = restTemplate.postForEntity("https://udid.nmpa.gov.cn/api/beta/v1/connection/erp", "", String.class); - System.out.println(response.getBody()); - } - - - - - -} diff --git a/api-admin/src/test/java/com/glxp/api/admin/util/DlDeviceTest.java b/api-admin/src/test/java/com/glxp/api/admin/util/DlDeviceTest.java deleted file mode 100644 index f68e91da..00000000 --- a/api-admin/src/test/java/com/glxp/api/admin/util/DlDeviceTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.glxp.api.admin.util; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.glxp.api.admin.httpclient.UdiDlHttpClient; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class DlDeviceTest { - - @Resource - UdiDlHttpClient udiDlHttpClient; - - private static final Logger log = LoggerFactory.getLogger(JwtUtilsTest.class); - - - @Test - public void testDonwload() { -// downDevice(); - } - - - @Test - public void getDi(){ - List udiInfoEntityList = udiDlHttpClient.getUdiByDi("08714729834663"); - log.info("rrr"); - } - -} diff --git a/api-admin/src/test/java/com/glxp/api/admin/util/JwtUtilsTest.java b/api-admin/src/test/java/com/glxp/api/admin/util/JwtUtilsTest.java deleted file mode 100644 index 95b23109..00000000 --- a/api-admin/src/test/java/com/glxp/api/admin/util/JwtUtilsTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.glxp.api.admin.util; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.glxp.api.BaseApiAdminApplicationTest; -import io.jsonwebtoken.Claims; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.Map; - -import static org.junit.Assert.assertNotNull; - -public class JwtUtilsTest extends BaseApiAdminApplicationTest { - - private static final Logger log = LoggerFactory.getLogger(JwtUtilsTest.class); - - @Test - public void createToken() { - Map claims = new HashMap<>(); - claims.put("admin_id", 12222222); - String token = JwtUtils.createToken(claims, 86400L); - System.out.println(token); - System.out.println(token.length()); - assertNotNull(token); - } - - @Test - public void createToken1() { - Map claims = new HashMap<>(); - String token = JwtUtils.createToken(claims); - System.out.println(token); - assertNotNull(token); - } - - @Test - public void parse() { - Map claims = new HashMap<>(); - claims.put("admin_id", 1); - String token = JwtUtils.createToken(claims, 1000L); - System.out.println(token); - System.out.println(token.length()); - Claims claim = JwtUtils.parse(token); - System.out.println(claim); - assertNotNull(claim); - System.out.println(claim.get("admin_id")); - } - - - - - - - - @Test - public void tetsArray(){ - String data = "121212"; - String[] datas = data.split(","); - System.out.println(datas[0]); - } - - -} diff --git a/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java b/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java deleted file mode 100644 index 3807ec05..00000000 --- a/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.glxp.api.admin.util; - -import cn.hutool.extra.pinyin.PinyinUtil; -import com.glxp.api.BaseApiAdminApplicationTest; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; -import org.springframework.boot.test.context.SpringBootTest; - -import javax.annotation.Resource; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -public class NormalTest extends BaseApiAdminApplicationTest { - private static final Logger log = LoggerFactory.getLogger(NormalTest.class); - - @Test - public void testMA() { - String data = "MA.156.M0.100334.0FPN95-06E6"; - log.info(FilterUdiUtils.getDiStr(data)); - - - String data2 = "#32543535#5454#45#5453#"; - log.info(FilterUdiUtils.getUdi(data2).toString()); - } - - @Test - public void testPinyin() { - log.info(PinyinUtil.getFirstLetter("厦门高理性派", "")); - } - - - public static long getStartTime(String startTime) { - final SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss"); - final Date datetime;//将你的日期转换为时间戳 - try { - datetime = sdf.parse(startTime); - final long time = datetime.getTime(); - long curTime = System.currentTimeMillis(); - if (curTime - time > 0) { - return 24 * 60 * 60 * 1000 - (curTime - time); - } else - return time - curTime; - } catch (ParseException e) { - e.printStackTrace(); - } - return 0; - } - - @Test - @AutoConfigureWebTestClient - public void testTime() { -// log.info(getStartTime("17:30:01")+""); - - - String data = "2022-07-15"; - String setTime = "2022-09-26"; - - if (data.length() > 10) { - String resultDate = data.substring(0, 10); - log.info("1=" + resultDate); - if (setTime.compareTo(resultDate) > 0) { - log.info(">1" + resultDate); - } - } else if (data.length() == 10) { - if (setTime.compareTo(data) > 0) { - log.info(">2" + data); - } - } - - } - - -} diff --git a/api-admin/src/test/java/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.java b/api-admin/src/test/java/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.java deleted file mode 100644 index 7b8809de..00000000 --- a/api-admin/src/test/java/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.glxp.api.admin.util; - -import com.glxp.api.BaseApiAdminApplicationTest; -import com.glxp.api.admin.entity.auth.AuthPermissionRule; -import com.glxp.api.admin.service.auth.AuthPermissionRuleService; -import com.glxp.api.admin.res.auth.AuthPermissionRuleMergeResponse; -import org.junit.Test; - -import javax.annotation.Resource; - -import java.util.List; - -public class PermissionRuleTreeUtilsTest extends BaseApiAdminApplicationTest { - - @Resource - private AuthPermissionRuleService authPermissionRuleService; - - @Test - public void merge() { - - List authPermissionRules = authPermissionRuleService.listAll(); - List merge = PermissionRuleTreeUtils.merge(authPermissionRules,0L); - System.out.println(merge); - - } -} \ No newline at end of file diff --git a/api-common/pom.xml b/api-common/pom.xml deleted file mode 100644 index 601c0907..00000000 --- a/api-common/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - api - com.glxp - 0.0.1 - - 4.0.0 - - api-common - - - - - org.projectlombok - lombok - true - - - - org.apache.commons - commons-lang3 - - - - - \ No newline at end of file diff --git a/api-common/src/main/resources/application.properties b/api-common/src/main/resources/application.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/api-common/src/test/java/com/glxp/api/common/util/ResultVOUtilsTest.java b/api-common/src/test/java/com/glxp/api/common/util/ResultVOUtilsTest.java deleted file mode 100644 index 6c647709..00000000 --- a/api-common/src/test/java/com/glxp/api/common/util/ResultVOUtilsTest.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.glxp.api.common.util; - - -public class ResultVOUtilsTest { - - public void success() { - } -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 70d40017..a31bac9f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,10 @@ com.glxp api 0.0.1 - - api-admin - api-common - - pom + war api - vue后台管理系统 + UDI管理系统后台 org.springframework.boot @@ -26,14 +22,7 @@ 1.8 - - - - com.glxp - api-common - ${version} - @@ -49,7 +38,340 @@ 3.9 + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.springframework.boot + spring-boot-devtools + true + + + + + + org.springframework.boot + spring-boot-starter-jdbc + + + mysql + mysql-connector-java + 8.0.21 + runtime + + + + com.oracle + ojdbc14 + 10.2.0.4.0 + pom + + + + + com.baomidou + mybatis-plus-boot-starter + 3.5.2 + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.3.0 + + + + org.mybatis + mybatis + + + org.mybatis + mybatis-spring + + + + + + + org.projectlombok + lombok + true + + + + + io.jsonwebtoken + jjwt + 0.9.1 + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.9.2 + + + com.github.pagehelper + pagehelper-spring-boot-autoconfigure + 1.4.5 + + + org.springframework.boot + spring-boot-starter-websocket + + + + + + org.apache.poi + poi + 4.0.0 + + + + org.apache.poi + poi-ooxml + 4.0.0 + + + + + com.glxp + tochina + 1.0 + + + com.itextpdf + itextpdf + 5.5.13.1 + + + com.itextpdf + itext-asian + 5.2.0 + + + + + cn.hutool + hutool-all + 5.7.9 + + + com.belerweb + pinyin4j + 2.5.0 + + + + com.google.zxing + core + 3.3.3 + + + com.google.zxing + javase + 3.3.3 + + + org.olap4j + olap4j + 1.2.0 + + + + + + + + net.sf.barcode4j + barcode4j + 2.1 + + + org.olap4je + olap4j + + + + + + net.sf.jasperreports + jasperreports + 6.5.1 + + + com.lowagie + itext + + + + + + net.sf.jasperreports + jasperreports-fonts + 6.0.0 + + + + + com.itextpdf + itext-pdfa + 5.5.0 + + + org.codehaus.groovy + groovy + 3.0.7 + + + cn.lesper + iTextAsian + 3.0 + + + + + + org.apache.xmlgraphics + batik-bridge + 1.11 + + + + org.apache.xmlgraphics + batik-dom + 1.11 + + + + org.eclipse.birt.runtime.3_7_1 + com.lowagie.text + 2.1.7 + + + com.squareup.okhttp3 + okhttp + 3.10.0 + + + + + + + cn.dev33 + sa-token-spring-boot-starter + 1.30.0 + - + + + UDI_WMS_MC + + + org.springframework.boot + spring-boot-maven-plugin + + true + true + + + + + maven-compiler-plugin + + 11 + 11 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + + src/main/java + + **/*.xml + + + + src/main/resources + + + diff --git a/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java b/src/main/java/com/glxp/api/ApiAdminApplication.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java rename to src/main/java/com/glxp/api/ApiAdminApplication.java index f9a1ac90..0b10ac59 100644 --- a/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java +++ b/src/main/java/com/glxp/api/ApiAdminApplication.java @@ -1,6 +1,5 @@ package com.glxp.api; -import com.glxp.api.admin.util.DateUtil; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; diff --git a/api-admin/src/main/java/com/glxp/api/ToolApplicationContextInitializer.java b/src/main/java/com/glxp/api/ToolApplicationContextInitializer.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/ToolApplicationContextInitializer.java rename to src/main/java/com/glxp/api/ToolApplicationContextInitializer.java index 02852957..3dcc9a89 100644 --- a/api-admin/src/main/java/com/glxp/api/ToolApplicationContextInitializer.java +++ b/src/main/java/com/glxp/api/ToolApplicationContextInitializer.java @@ -1,6 +1,6 @@ package com.glxp.api; -import com.glxp.api.admin.util.RsaUtils; +import com.glxp.api.util.RsaUtils; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; diff --git a/api-admin/src/main/java/com/glxp/api/admin/annotation/AuthRuleAnnotation.java b/src/main/java/com/glxp/api/annotation/AuthRuleAnnotation.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/annotation/AuthRuleAnnotation.java rename to src/main/java/com/glxp/api/annotation/AuthRuleAnnotation.java index b12bb811..e805ac3d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/annotation/AuthRuleAnnotation.java +++ b/src/main/java/com/glxp/api/annotation/AuthRuleAnnotation.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.annotation; +package com.glxp.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api-admin/src/main/java/com/glxp/api/admin/annotation/Log.java b/src/main/java/com/glxp/api/annotation/Log.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/annotation/Log.java rename to src/main/java/com/glxp/api/annotation/Log.java index f7dfafdb..5b5f8ecf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/annotation/Log.java +++ b/src/main/java/com/glxp/api/annotation/Log.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.annotation; +package com.glxp.api.annotation; -import com.glxp.api.admin.constant.BusinessType; -import com.glxp.api.admin.constant.OperatorType; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.constant.OperatorType; import java.lang.annotation.*; diff --git a/api-admin/src/main/java/com/glxp/api/admin/annotation/RepeatSubmit.java b/src/main/java/com/glxp/api/annotation/RepeatSubmit.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/annotation/RepeatSubmit.java rename to src/main/java/com/glxp/api/annotation/RepeatSubmit.java index 984300ef..2b5ce5c8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/annotation/RepeatSubmit.java +++ b/src/main/java/com/glxp/api/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.annotation; +package com.glxp.api.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/api-admin/src/main/java/com/glxp/api/admin/aspect/AuthorizeAspect.java b/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/aspect/AuthorizeAspect.java rename to src/main/java/com/glxp/api/aspect/AuthorizeAspect.java index e0e33d64..e4348c4f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/aspect/AuthorizeAspect.java +++ b/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.aspect; +package com.glxp.api.aspect; import cn.hutool.core.util.StrUtil; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.dao.auth.AuthLicenseDao; -import com.glxp.api.admin.entity.auth.AuthLicense; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.service.auth.AuthLoginService; -import com.glxp.api.admin.util.JwtUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.dao.auth.AuthLicenseDao; +import com.glxp.api.entity.auth.AuthLicense; +import com.glxp.api.exception.JsonException; +import com.glxp.api.service.auth.AuthLoginService; +import com.glxp.api.util.JwtUtils; import com.glxp.api.common.enums.ResultEnum; import io.jsonwebtoken.Claims; import lombok.extern.slf4j.Slf4j; @@ -37,7 +37,7 @@ public class AuthorizeAspect { @Resource private AuthLicenseDao authLicenseDao; - @Pointcut("@annotation(com.glxp.api.admin.annotation.AuthRuleAnnotation)") + @Pointcut("@annotation(com.glxp.api.annotation.AuthRuleAnnotation)") public void adminLoginVerify() { } diff --git a/api-admin/src/main/java/com/glxp/api/admin/aspect/LogAspect.java b/src/main/java/com/glxp/api/aspect/LogAspect.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/aspect/LogAspect.java rename to src/main/java/com/glxp/api/aspect/LogAspect.java index 15ae4099..ba83ace7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/aspect/LogAspect.java +++ b/src/main/java/com/glxp/api/aspect/LogAspect.java @@ -1,16 +1,16 @@ -package com.glxp.api.admin.aspect; +package com.glxp.api.aspect; import cn.hutool.core.lang.Dict; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; -import com.glxp.api.admin.annotation.Log; -import com.glxp.api.admin.constant.BusinessStatus; -import com.glxp.api.admin.entity.monitor.OperLogDTO; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.service.monitor.OperLogService; -import com.glxp.api.admin.util.JsonUtils; -import com.glxp.api.admin.util.ServletUtils; -import com.glxp.api.admin.util.SpringUtils; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessStatus; +import com.glxp.api.entity.monitor.OperLogDTO; +import com.glxp.api.exception.JsonException; +import com.glxp.api.service.monitor.OperLogService; +import com.glxp.api.util.JsonUtils; +import com.glxp.api.util.ServletUtils; +import com.glxp.api.util.SpringUtils; import com.glxp.api.common.enums.ResultEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/api-common/src/main/java/com/glxp/api/common/constant/CacheConstant.java b/src/main/java/com/glxp/api/common/constant/CacheConstant.java similarity index 100% rename from api-common/src/main/java/com/glxp/api/common/constant/CacheConstant.java rename to src/main/java/com/glxp/api/common/constant/CacheConstant.java diff --git a/api-common/src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java b/src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java similarity index 100% rename from api-common/src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java rename to src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java diff --git a/api-common/src/main/java/com/glxp/api/common/converter/String2LongListConverter.java b/src/main/java/com/glxp/api/common/converter/String2LongListConverter.java similarity index 100% rename from api-common/src/main/java/com/glxp/api/common/converter/String2LongListConverter.java rename to src/main/java/com/glxp/api/common/converter/String2LongListConverter.java diff --git a/api-common/src/main/java/com/glxp/api/common/converter/String2StringListConverter.java b/src/main/java/com/glxp/api/common/converter/String2StringListConverter.java similarity index 100% rename from api-common/src/main/java/com/glxp/api/common/converter/String2StringListConverter.java rename to src/main/java/com/glxp/api/common/converter/String2StringListConverter.java diff --git a/api-common/src/main/java/com/glxp/api/common/enums/ResultEnum.java b/src/main/java/com/glxp/api/common/enums/ResultEnum.java similarity index 100% rename from api-common/src/main/java/com/glxp/api/common/enums/ResultEnum.java rename to src/main/java/com/glxp/api/common/enums/ResultEnum.java diff --git a/api-common/src/main/java/com/glxp/api/common/req/BaseLimitRequest.java b/src/main/java/com/glxp/api/common/req/BaseLimitRequest.java similarity index 100% rename from api-common/src/main/java/com/glxp/api/common/req/BaseLimitRequest.java rename to src/main/java/com/glxp/api/common/req/BaseLimitRequest.java diff --git a/api-common/src/main/java/com/glxp/api/common/req/BaseRequest.java b/src/main/java/com/glxp/api/common/req/BaseRequest.java similarity index 100% rename from api-common/src/main/java/com/glxp/api/common/req/BaseRequest.java rename to src/main/java/com/glxp/api/common/req/BaseRequest.java diff --git a/api-common/src/main/java/com/glxp/api/common/res/BaseResponse.java b/src/main/java/com/glxp/api/common/res/BaseResponse.java similarity index 100% rename from api-common/src/main/java/com/glxp/api/common/res/BaseResponse.java rename to src/main/java/com/glxp/api/common/res/BaseResponse.java diff --git a/api-common/src/main/java/com/glxp/api/common/util/ResultVOUtils.java b/src/main/java/com/glxp/api/common/util/ResultVOUtils.java similarity index 74% rename from api-common/src/main/java/com/glxp/api/common/util/ResultVOUtils.java rename to src/main/java/com/glxp/api/common/util/ResultVOUtils.java index 2d1bded2..87eb51b9 100644 --- a/api-common/src/main/java/com/glxp/api/common/util/ResultVOUtils.java +++ b/src/main/java/com/glxp/api/common/util/ResultVOUtils.java @@ -1,7 +1,9 @@ package com.glxp.api.common.util; +import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.res.PageSimpleResponse; import java.util.HashMap; import java.util.Map; @@ -13,6 +15,7 @@ public class ResultVOUtils { /** * 成功时返回 + * * @param data 返回的data对象 * @return {@link BaseResponse} */ @@ -26,6 +29,7 @@ public class ResultVOUtils { /** * 成功时返回 + * * @return {@link BaseResponse} */ public static BaseResponse success() { @@ -35,7 +39,8 @@ public class ResultVOUtils { /** * 错误时返回 - * @param code 错误码 + * + * @param code 错误码 * @param message 错误信息 * @return {@link BaseResponse} */ @@ -50,6 +55,7 @@ public class ResultVOUtils { /** * 错误时返回 + * * @param resultEnum 错误枚举类 * @return {@link BaseResponse} */ @@ -59,12 +65,26 @@ public class ResultVOUtils { /** * 错误时返回 + * * @param resultEnum 错误枚举类 - * @param message 错误的信息 + * @param message 错误的信息 * @return {@link BaseResponse} */ public static BaseResponse error(ResultEnum resultEnum, String message) { return error(resultEnum.getCode(), message); } + /** + * 根据PageHelper分页对象，直接返回分页结果 + * + * @param pageInfo + * @return + */ + public static BaseResponse page(PageInfo pageInfo) { + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse(); + pageSimpleResponse.setList(pageInfo.getList()); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + return success(pageSimpleResponse); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/CorsConfig.java b/src/main/java/com/glxp/api/config/CorsConfig.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/config/CorsConfig.java rename to src/main/java/com/glxp/api/config/CorsConfig.java index 8d57673d..1d4dee17 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/config/CorsConfig.java +++ b/src/main/java/com/glxp/api/config/CorsConfig.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.config; +package com.glxp.api.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/CorsFilter.java b/src/main/java/com/glxp/api/config/CorsFilter.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/config/CorsFilter.java rename to src/main/java/com/glxp/api/config/CorsFilter.java index 5c4ef95e..6b9a9e33 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/config/CorsFilter.java +++ b/src/main/java/com/glxp/api/config/CorsFilter.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.config; +package com.glxp.api.config; import org.springframework.beans.factory.annotation.Autowired; diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/HdSchemaExecutor.java b/src/main/java/com/glxp/api/config/HdSchemaExecutor.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/config/HdSchemaExecutor.java rename to src/main/java/com/glxp/api/config/HdSchemaExecutor.java index bbb0fbf6..ee8f6480 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/config/HdSchemaExecutor.java +++ b/src/main/java/com/glxp/api/config/HdSchemaExecutor.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.config; +package com.glxp.api.config; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.UUID; -import com.glxp.api.admin.dao.info.DbVersionDao; -import com.glxp.api.admin.entity.info.DbVersionEntity; -import com.glxp.api.admin.entity.info.SchemaData; +import com.glxp.api.dao.info.DbVersionDao; +import com.glxp.api.entity.info.DbVersionEntity; +import com.glxp.api.entity.info.SchemaData; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/MasterDataSourceConfig.java b/src/main/java/com/glxp/api/config/MasterDataSourceConfig.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/config/MasterDataSourceConfig.java rename to src/main/java/com/glxp/api/config/MasterDataSourceConfig.java index 129fce3d..a28ae42e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/config/MasterDataSourceConfig.java +++ b/src/main/java/com/glxp/api/config/MasterDataSourceConfig.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.config; +package com.glxp.api.config; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionFactoryBean; @@ -20,7 +20,7 @@ import javax.sql.DataSource; public class MasterDataSourceConfig { // 精确到 master 目录，以便跟其他数据源隔离 - static final String PACKAGE = "com.glxp.api.admin.dao"; + static final String PACKAGE = "com.glxp.api.dao"; static final String MAPPER_LOCATION = "classpath:mybatis/mapper/*/*.xml"; @Bean(name = "masterDataSource") diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/OkHttpConfiguration.java b/src/main/java/com/glxp/api/config/OkHttpConfiguration.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/config/OkHttpConfiguration.java rename to src/main/java/com/glxp/api/config/OkHttpConfiguration.java index 7c2baa34..fa4be271 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/config/OkHttpConfiguration.java +++ b/src/main/java/com/glxp/api/config/OkHttpConfiguration.java @@ -1,5 +1,6 @@ -package com.glxp.api.admin.config; +package com.glxp.api.config; +import okhttp3.ConnectionPool; import okhttp3.OkHttpClient; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -12,15 +13,6 @@ import javax.net.ssl.X509TrustManager; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import java.util.concurrent.TimeUnit; -import okhttp3.ConnectionPool; -import okhttp3.OkHttpClient; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import javax.net.ssl.*; -import java.security.*; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.concurrent.TimeUnit; diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/PublicFileUrlConfig.java b/src/main/java/com/glxp/api/config/PublicFileUrlConfig.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/config/PublicFileUrlConfig.java rename to src/main/java/com/glxp/api/config/PublicFileUrlConfig.java index a2faf06a..b84398d9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/config/PublicFileUrlConfig.java +++ b/src/main/java/com/glxp/api/config/PublicFileUrlConfig.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.config; +package com.glxp.api.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/RedisConfig.java b/src/main/java/com/glxp/api/config/RedisConfig.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/config/RedisConfig.java rename to src/main/java/com/glxp/api/config/RedisConfig.java index ec987ae0..37801727 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/config/RedisConfig.java +++ b/src/main/java/com/glxp/api/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.config; +package com.glxp.api.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/RuoYiConfig.java b/src/main/java/com/glxp/api/config/RuoYiConfig.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/config/RuoYiConfig.java rename to src/main/java/com/glxp/api/config/RuoYiConfig.java index a9acf770..d382349f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/config/RuoYiConfig.java +++ b/src/main/java/com/glxp/api/config/RuoYiConfig.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.config; +package com.glxp.api.config; import lombok.Data; import lombok.Getter; diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/WebMvcConfig.java b/src/main/java/com/glxp/api/config/WebMvcConfig.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/config/WebMvcConfig.java rename to src/main/java/com/glxp/api/config/WebMvcConfig.java index 84edbe56..e27d4dea 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/config/WebMvcConfig.java +++ b/src/main/java/com/glxp/api/config/WebMvcConfig.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.config; +package com.glxp.api.config; import org.springframework.context.annotation.Configuration; diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/WebSocketConfig.java b/src/main/java/com/glxp/api/config/WebSocketConfig.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/config/WebSocketConfig.java rename to src/main/java/com/glxp/api/config/WebSocketConfig.java index f9a12734..2d7cd3e0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/config/WebSocketConfig.java +++ b/src/main/java/com/glxp/api/config/WebSocketConfig.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.config; +package com.glxp.api.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.server.standard.ServerEndpointExporter; diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/WebSocketServer.java b/src/main/java/com/glxp/api/config/WebSocketServer.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/config/WebSocketServer.java rename to src/main/java/com/glxp/api/config/WebSocketServer.java index 326f3c7a..70a8c6c1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/config/WebSocketServer.java +++ b/src/main/java/com/glxp/api/config/WebSocketServer.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.config; +package com.glxp.api.config; import com.alibaba.fastjson.JSON; -import com.glxp.api.admin.entity.info.WebSocketEntity; +import com.glxp.api.entity.info.WebSocketEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/BasicProcessStatus.java b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/constant/BasicProcessStatus.java rename to src/main/java/com/glxp/api/constant/BasicProcessStatus.java index 843d570d..35e92dc0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/BasicProcessStatus.java +++ b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.constant; +package com.glxp.api.constant; /** * 基础信息导入导出处理状态 diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/BusinessStatus.java b/src/main/java/com/glxp/api/constant/BusinessStatus.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/constant/BusinessStatus.java rename to src/main/java/com/glxp/api/constant/BusinessStatus.java index 32ff41c9..606b66a4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/BusinessStatus.java +++ b/src/main/java/com/glxp/api/constant/BusinessStatus.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.constant; +package com.glxp.api.constant; /** * 操作状态 diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/BusinessType.java b/src/main/java/com/glxp/api/constant/BusinessType.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/constant/BusinessType.java rename to src/main/java/com/glxp/api/constant/BusinessType.java index 4448f18b..3a23e620 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/BusinessType.java +++ b/src/main/java/com/glxp/api/constant/BusinessType.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.constant; +package com.glxp.api.constant; /** * 业务操作类型 diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/BussinessTypeUtils.java b/src/main/java/com/glxp/api/constant/BussinessTypeUtils.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/constant/BussinessTypeUtils.java rename to src/main/java/com/glxp/api/constant/BussinessTypeUtils.java index 37f129ad..feb8d8e9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/BussinessTypeUtils.java +++ b/src/main/java/com/glxp/api/constant/BussinessTypeUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.constant; +package com.glxp.api.constant; import java.util.ArrayList; import java.util.HashMap; diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java rename to src/main/java/com/glxp/api/constant/Constant.java index 6db5f611..adc93bef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.constant; +package com.glxp.api.constant; public class Constant { diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java rename to src/main/java/com/glxp/api/constant/ConstantStatus.java index 9c355a5d..0388c260 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.constant; +package com.glxp.api.constant; /** * 出入库单据校验状态 diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantType.java b/src/main/java/com/glxp/api/constant/ConstantType.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/constant/ConstantType.java rename to src/main/java/com/glxp/api/constant/ConstantType.java index 7e012ea8..164febf7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantType.java +++ b/src/main/java/com/glxp/api/constant/ConstantType.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.constant; +package com.glxp.api.constant; public interface ConstantType { diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/IncodeStatus.java b/src/main/java/com/glxp/api/constant/IncodeStatus.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/constant/IncodeStatus.java rename to src/main/java/com/glxp/api/constant/IncodeStatus.java index a84124dc..de2230f9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/IncodeStatus.java +++ b/src/main/java/com/glxp/api/constant/IncodeStatus.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.constant; +package com.glxp.api.constant; /** * 内部码处理状态 diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/OperatorType.java b/src/main/java/com/glxp/api/constant/OperatorType.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/constant/OperatorType.java rename to src/main/java/com/glxp/api/constant/OperatorType.java index f36dabfc..ae859dbf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/OperatorType.java +++ b/src/main/java/com/glxp/api/constant/OperatorType.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.constant; +package com.glxp.api.constant; /** * 操作人类别 diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/RedisContant.java b/src/main/java/com/glxp/api/constant/RedisContant.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/constant/RedisContant.java rename to src/main/java/com/glxp/api/constant/RedisContant.java index 2ada679d..6b1c1083 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/RedisContant.java +++ b/src/main/java/com/glxp/api/constant/RedisContant.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.constant; +package com.glxp.api.constant; public class RedisContant { public static String DL_ORDER_STATUS = "udiwms_dl_order_status"; diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/SetupType.java b/src/main/java/com/glxp/api/constant/SetupType.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/constant/SetupType.java rename to src/main/java/com/glxp/api/constant/SetupType.java index a199d15c..c6cce32e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/SetupType.java +++ b/src/main/java/com/glxp/api/constant/SetupType.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.constant; +package com.glxp.api.constant; public class SetupType { diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ThirdSysConstant.java b/src/main/java/com/glxp/api/constant/ThirdSysConstant.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/constant/ThirdSysConstant.java rename to src/main/java/com/glxp/api/constant/ThirdSysConstant.java index 09cd2afa..1d5fdb60 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/ThirdSysConstant.java +++ b/src/main/java/com/glxp/api/constant/ThirdSysConstant.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.constant; +package com.glxp.api.constant; /** * 第三方系统配置参数实体 diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/BaseController.java b/src/main/java/com/glxp/api/controller/BaseController.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/controller/BaseController.java rename to src/main/java/com/glxp/api/controller/BaseController.java index b80f408a..fb86e089 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/BaseController.java +++ b/src/main/java/com/glxp/api/controller/BaseController.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.controller; +package com.glxp.api.controller; import cn.hutool.core.util.StrUtil; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.service.auth.CustomerService; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.service.auth.CustomerService; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java b/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java rename to src/main/java/com/glxp/api/controller/auth/AuthAdminController.java index d5268780..39c0a76a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java @@ -1,31 +1,31 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.annotation.Log; -import com.glxp.api.admin.constant.BusinessType; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.auth.AuthRole; -import com.glxp.api.admin.entity.auth.AuthRoleAdmin; -import com.glxp.api.admin.entity.auth.DeptEntity; -import com.glxp.api.admin.entity.inout.WarehouseUserEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; -import com.glxp.api.admin.req.auth.AuthAdminSaveRequest; -import com.glxp.api.admin.req.auth.FilterNoSelectUserRequest; -import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.auth.AuthAdminResponse; -import com.glxp.api.admin.res.auth.AuthAdminRoleResponse; -import com.glxp.api.admin.service.auth.*; -import com.glxp.api.admin.service.inout.WarehouseUserService; -import com.glxp.api.admin.service.inventory.InvSubWarehouseService; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.PasswordUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.AuthRole; +import com.glxp.api.entity.auth.AuthRoleAdmin; +import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.entity.inout.WarehouseUserEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.req.auth.AuthAdminQueryRequest; +import com.glxp.api.req.auth.AuthAdminSaveRequest; +import com.glxp.api.req.auth.FilterNoSelectUserRequest; +import com.glxp.api.req.inventory.FilterInvLinkDataRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.auth.AuthAdminResponse; +import com.glxp.api.res.auth.AuthAdminRoleResponse; +import com.glxp.api.service.inout.WarehouseUserService; +import com.glxp.api.service.inventory.InvSubWarehouseService; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.PasswordUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.service.auth.*; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthCheckController.java b/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthCheckController.java rename to src/main/java/com/glxp/api/controller/auth/AuthCheckController.java index 4544dc54..c853e7e3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthCheckController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java @@ -1,16 +1,11 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.auth.AuthCheckEntity; -import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; -import com.glxp.api.admin.req.auth.AuthAdminSaveRequest; -import com.glxp.api.admin.req.auth.AuthCheckRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.auth.AuthAdminResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.auth.AuthCheckService; -import com.glxp.api.admin.util.RsaUtils; +import com.glxp.api.entity.auth.AuthCheckEntity; +import com.glxp.api.req.auth.AuthCheckRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.AuthCheckService; +import com.glxp.api.util.RsaUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.java b/src/main/java/com/glxp/api/controller/auth/AuthPermissionRuleController.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.java rename to src/main/java/com/glxp/api/controller/auth/AuthPermissionRuleController.java index eeb40139..24951c6d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthPermissionRuleController.java @@ -1,17 +1,20 @@ -package com.glxp.api.admin.controller.auth; - -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.req.auth.AuthPermissionRuleSaveRequest; +package com.glxp.api.controller.auth; + +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.auth.AuthPermissionRule; +import com.glxp.api.req.auth.AuthPermissionRuleSaveRequest; +import com.glxp.api.res.auth.AuthPermissionRuleMergeResponse; +import com.glxp.api.service.auth.AuthPermissionRuleService; +import com.glxp.api.util.PermissionRuleTreeUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.admin.entity.auth.AuthPermissionRule; -import com.glxp.api.admin.service.auth.AuthPermissionRuleService; -import com.glxp.api.admin.util.PermissionRuleTreeUtils; -import com.glxp.api.admin.res.auth.AuthPermissionRuleMergeResponse; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthRoleController.java b/src/main/java/com/glxp/api/controller/auth/AuthRoleController.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthRoleController.java rename to src/main/java/com/glxp/api/controller/auth/AuthRoleController.java index 4e256547..8682a22c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthRoleController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthRoleController.java @@ -1,26 +1,26 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.auth.AuthRoleAdmin; -import com.glxp.api.admin.req.auth.AuthRoleAuthRequest; -import com.glxp.api.admin.req.auth.AuthRoleQueryRequest; -import com.glxp.api.admin.req.auth.AuthRoleSaveRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.auth.AuthRoleAdminService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.auth.AuthPermission; +import com.glxp.api.entity.auth.AuthPermissionRule; +import com.glxp.api.entity.auth.AuthRole; +import com.glxp.api.entity.auth.AuthRoleAdmin; +import com.glxp.api.req.auth.AuthRoleAuthRequest; +import com.glxp.api.req.auth.AuthRoleQueryRequest; +import com.glxp.api.req.auth.AuthRoleSaveRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.auth.AuthPermissionRuleMergeResponse; +import com.glxp.api.res.auth.AuthRoleResponse; +import com.glxp.api.service.auth.AuthPermissionRuleService; +import com.glxp.api.service.auth.AuthPermissionService; +import com.glxp.api.service.auth.AuthRoleAdminService; +import com.glxp.api.service.auth.AuthRoleService; +import com.glxp.api.util.PermissionRuleTreeUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.auth.AuthPermission; -import com.glxp.api.admin.entity.auth.AuthPermissionRule; -import com.glxp.api.admin.entity.auth.AuthRole; -import com.glxp.api.admin.service.auth.AuthPermissionRuleService; -import com.glxp.api.admin.service.auth.AuthPermissionService; -import com.glxp.api.admin.service.auth.AuthRoleService; -import com.glxp.api.admin.util.PermissionRuleTreeUtils; -import com.glxp.api.admin.res.auth.AuthPermissionRuleMergeResponse; -import com.glxp.api.admin.res.auth.AuthRoleResponse; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/ConnectTestController.java b/src/main/java/com/glxp/api/controller/auth/ConnectTestController.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/ConnectTestController.java rename to src/main/java/com/glxp/api/controller/auth/ConnectTestController.java index 9b1c54e1..aca5cf78 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/ConnectTestController.java +++ b/src/main/java/com/glxp/api/controller/auth/ConnectTestController.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; -import com.glxp.api.admin.entity.auth.AuthConnectEntity; -import com.glxp.api.admin.entity.info.CompanyEntity; -import com.glxp.api.admin.req.auth.ConnectRequest; -import com.glxp.api.admin.service.info.CompanyService; +import com.glxp.api.entity.auth.AuthConnectEntity; +import com.glxp.api.entity.info.CompanyEntity; +import com.glxp.api.req.auth.ConnectRequest; +import com.glxp.api.service.info.CompanyService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java rename to src/main/java/com/glxp/api/controller/auth/DeptController.java index ab33dcac..f9ad82eb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -1,16 +1,16 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.annotation.Log; -import com.glxp.api.admin.constant.BusinessType; -import com.glxp.api.admin.controller.BaseController; -import com.glxp.api.admin.entity.auth.DeptEntity; -import com.glxp.api.admin.req.auth.FilterDeptRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.auth.DeptService; -import com.glxp.api.admin.util.GennerOrderUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.req.auth.FilterDeptRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.DeptService; +import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptUserController.java b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptUserController.java rename to src/main/java/com/glxp/api/controller/auth/DeptUserController.java index 4433d35c..952da1bb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.req.auth.DeptUserReqeust; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.auth.DeptUserResponse; -import com.glxp.api.admin.service.auth.DeptUserService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.req.auth.DeptUserReqeust; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.auth.DeptUserResponse; +import com.glxp.api.service.auth.DeptUserService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java rename to src/main/java/com/glxp/api/controller/auth/LoginController.java index 75303c99..b2f4db45 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -1,33 +1,33 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; import cn.hutool.core.util.StrUtil; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.controller.BaseController; -import com.glxp.api.admin.dao.auth.AuthLicenseDao; -import com.glxp.api.admin.entity.auth.AuthCheckEntity; -import com.glxp.api.admin.entity.auth.SysMenu; -import com.glxp.api.admin.entity.auth.SysRole; -import com.glxp.api.admin.entity.info.CompanyEntity; -import com.glxp.api.admin.entity.info.DeviceKeyEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.req.auth.LoginRequest; -import com.glxp.api.admin.req.auth.PCLoginRequest; -import com.glxp.api.admin.req.auth.UpdatePasswordRequest; -import com.glxp.api.admin.res.auth.LoginResponse; -import com.glxp.api.admin.service.auth.*; -import com.glxp.api.admin.service.info.CompanyService; -import com.glxp.api.admin.service.inventory.InvSubWarehouseService; -import com.glxp.api.admin.service.inventory.InvWarehouseService; -import com.glxp.api.admin.service.monitor.LogininforService; -import com.glxp.api.admin.util.*; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.Constant; +import com.glxp.api.controller.BaseController; +import com.glxp.api.dao.auth.AuthLicenseDao; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.AuthCheckEntity; +import com.glxp.api.entity.auth.SysMenu; +import com.glxp.api.entity.auth.SysRole; +import com.glxp.api.entity.info.CompanyEntity; +import com.glxp.api.entity.info.DeviceKeyEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.auth.LoginRequest; +import com.glxp.api.req.auth.PCLoginRequest; +import com.glxp.api.req.auth.UpdatePasswordRequest; +import com.glxp.api.res.auth.LoginResponse; +import com.glxp.api.res.auth.LoginUserInfoResponse; +import com.glxp.api.service.info.CompanyService; +import com.glxp.api.service.inventory.InvSubWarehouseService; +import com.glxp.api.service.inventory.InvWarehouseService; +import com.glxp.api.service.monitor.LogininforService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.res.auth.LoginUserInfoResponse; +import com.glxp.api.service.auth.*; +import com.glxp.api.util.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysDictDataController.java b/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysDictDataController.java rename to src/main/java/com/glxp/api/controller/auth/SysDictDataController.java index 1c75f417..f3181d6f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysDictDataController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; -import com.glxp.api.admin.controller.BaseController; -import com.glxp.api.admin.entity.auth.SysDictData; -import com.glxp.api.admin.req.auth.SysDictDataRequest; -import com.glxp.api.admin.service.auth.ISysDictDataService; -import com.glxp.api.admin.service.auth.ISysDictTypeService; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.SysDictData; +import com.glxp.api.req.auth.SysDictDataRequest; +import com.glxp.api.service.auth.ISysDictDataService; +import com.glxp.api.service.auth.ISysDictTypeService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysDictTypeController.java b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysDictTypeController.java rename to src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java index 590cda25..dc4d54bf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysDictTypeController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.controller.BaseController; -import com.glxp.api.admin.entity.auth.SysDictType; -import com.glxp.api.admin.req.auth.SysDictTypeRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.auth.ISysDictTypeService; +import com.glxp.api.constant.Constant; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.SysDictType; +import com.glxp.api.req.auth.SysDictTypeRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.ISysDictTypeService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.validation.annotation.Validated; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysHisStatusController.java b/src/main/java/com/glxp/api/controller/auth/SysHisStatusController.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysHisStatusController.java rename to src/main/java/com/glxp/api/controller/auth/SysHisStatusController.java index 9f403102..7fd29198 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysHisStatusController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysHisStatusController.java @@ -1,15 +1,15 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.annotation.Log; -import com.glxp.api.admin.constant.BusinessType; -import com.glxp.api.admin.controller.BaseController; -import com.glxp.api.admin.entity.auth.SysHisStatusEntity; -import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.auth.ISysHisStatusService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.SysHisStatusEntity; +import com.glxp.api.req.auth.FilterSysHisStatusRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.ISysHisStatusService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysMenuController.java b/src/main/java/com/glxp/api/controller/auth/SysMenuController.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysMenuController.java rename to src/main/java/com/glxp/api/controller/auth/SysMenuController.java index 9b248d1b..84f3d489 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysMenuController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysMenuController.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; import cn.hutool.http.HttpUtil; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.controller.BaseController; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.auth.SysMenu; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.auth.ISysMenuService; +import com.glxp.api.constant.Constant; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.SysMenu; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.auth.ISysMenuService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.validation.annotation.Validated; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysRoleController.java b/src/main/java/com/glxp/api/controller/auth/SysRoleController.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysRoleController.java rename to src/main/java/com/glxp/api/controller/auth/SysRoleController.java index eaa8b9e0..bbfae2a4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysRoleController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysRoleController.java @@ -1,17 +1,17 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.controller.BaseController; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.auth.SysRole; -import com.glxp.api.admin.entity.auth.SysUserRole; -import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; -import com.glxp.api.admin.req.auth.SysRoleRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.auth.ISysRoleService; +import com.glxp.api.constant.Constant; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.SysRole; +import com.glxp.api.entity.auth.SysUserRole; +import com.glxp.api.req.auth.AuthAdminQueryRequest; +import com.glxp.api.req.auth.SysRoleRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.auth.ISysRoleService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysUserController.java rename to src/main/java/com/glxp/api/controller/auth/SysUserController.java index dc7d4d5c..3b6d3697 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -1,27 +1,25 @@ -package com.glxp.api.admin.controller.auth; +package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.Log; -import com.glxp.api.admin.constant.BusinessType; -import com.glxp.api.admin.controller.BaseController; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.auth.AuthRoleAdmin; -import com.glxp.api.admin.entity.auth.SysMenu; -import com.glxp.api.admin.entity.auth.SysRole; -import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; -import com.glxp.api.admin.req.auth.AuthAdminSaveRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.auth.AuthAdminResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.auth.AuthRoleAdminService; -import com.glxp.api.admin.service.auth.ISysMenuService; -import com.glxp.api.admin.service.auth.ISysRoleService; -import com.glxp.api.admin.util.PasswordUtils; -import com.glxp.api.admin.util.StreamUtils; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.AuthRoleAdmin; +import com.glxp.api.entity.auth.SysRole; +import com.glxp.api.req.auth.AuthAdminQueryRequest; +import com.glxp.api.req.auth.AuthAdminSaveRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.auth.AuthAdminResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.auth.AuthRoleAdminService; +import com.glxp.api.service.auth.ISysRoleService; +import com.glxp.api.util.PasswordUtils; +import com.glxp.api.util.StreamUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicBusTypeChangeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicBusTypeChangeController.java rename to src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java index 4bd8b0d5..e2121d8d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicBusTypeChangeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.admin.req.basic.BasicBusTypeChangeRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.BasicBusTypeChangeResponse; -import com.glxp.api.admin.service.basic.BasicBusTypeChangeService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.api.req.basic.BasicBusTypeChangeRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BasicBusTypeChangeResponse; +import com.glxp.api.service.basic.BasicBusTypeChangeService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java b/src/main/java/com/glxp/api/controller/basic/BasicThirdSysController.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java rename to src/main/java/com/glxp/api/controller/basic/BasicThirdSysController.java index 6460dec2..63949f5d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicThirdSysController.java @@ -1,19 +1,19 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.BasicThirdSysResponse; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; -import com.glxp.api.admin.service.basic.*; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BasicThirdSysResponse; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.service.basic.*; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java b/src/main/java/com/glxp/api/controller/basic/BasicUnitMaintainController.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java rename to src/main/java/com/glxp/api/controller/basic/BasicUnitMaintainController.java index 80f12d44..ed97a44a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicUnitMaintainController.java @@ -1,36 +1,36 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.req.basic.CombineSingleUnitRequest; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; -import com.glxp.api.admin.req.basic.RemoveRelRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.req.receipt.CombineUnitRequest; -import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.BasicProductThirdSysResponse; -import com.glxp.api.admin.res.basic.BasicUnitMaintainResponse; -import com.glxp.api.admin.res.basic.ErpUnitsResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.info.CompanyService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.thrsys.ThrCorpService; -import com.glxp.api.admin.thread.BasicUnitImportService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.req.basic.CombineSingleUnitRequest; +import com.glxp.api.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.req.basic.RemoveRelRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inout.OrderFilterRequest; +import com.glxp.api.req.receipt.CombineUnitRequest; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BasicProductThirdSysResponse; +import com.glxp.api.res.basic.BasicUnitMaintainResponse; +import com.glxp.api.res.basic.ErpUnitsResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.info.CompanyService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.thrsys.ThrCorpService; +import com.glxp.api.thread.BasicUnitImportService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessChangeTypeController.java b/src/main/java/com/glxp/api/controller/basic/BussinessChangeTypeController.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessChangeTypeController.java rename to src/main/java/com/glxp/api/controller/basic/BussinessChangeTypeController.java index 43a02222..f48d1dfa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessChangeTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BussinessChangeTypeController.java @@ -1,22 +1,22 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.req.basic.BusTypeChangeFilterRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.basic.BussinessChangeTypeService; -import com.glxp.api.admin.service.basic.BussinessLocalTypeService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.inventory.InvSubWarehouseService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.entity.basic.BussinessChangeTypeEntity; +import com.glxp.api.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.req.basic.BusTypeChangeFilterRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.basic.BussinessChangeTypeService; +import com.glxp.api.service.basic.BussinessLocalTypeService; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.inventory.InvSubWarehouseService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java b/src/main/java/com/glxp/api/controller/basic/BussinessLocalTypeController.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java rename to src/main/java/com/glxp/api/controller/basic/BussinessLocalTypeController.java index bc88a4f0..7ad233da 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BussinessLocalTypeController.java @@ -1,26 +1,26 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.req.basic.BusNoUserRequest; -import com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest; -import com.glxp.api.admin.req.business.StockOrderFilterRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.BussinessLocalTypeResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.basic.BussinessChangeTypeService; -import com.glxp.api.admin.service.basic.BussinessLocalTypeService; -import com.glxp.api.admin.service.basic.BussinessOriginTypeService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.req.basic.BusNoUserRequest; +import com.glxp.api.req.basic.BussinessLocalTypeFilterRequest; +import com.glxp.api.req.business.StockOrderFilterRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BussinessLocalTypeResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.BussinessChangeTypeService; +import com.glxp.api.service.basic.BussinessLocalTypeService; +import com.glxp.api.service.basic.BussinessOriginTypeService; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java b/src/main/java/com/glxp/api/controller/basic/BussinessOriginTypeController.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java rename to src/main/java/com/glxp/api/controller/basic/BussinessOriginTypeController.java index 09708421..1fd25389 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BussinessOriginTypeController.java @@ -1,20 +1,20 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.BussinessOriginTypeService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.basic.BussinessOriginTypeEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.api.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.service.basic.BussinessOriginTypeService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BussinessTypeController.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java rename to src/main/java/com/glxp/api/controller/basic/BussinessTypeController.java index fc49dfb6..bed96572 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BussinessTypeController.java @@ -1,40 +1,31 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.BussinessTypeUtils; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.entity.basic.BusDataEntity; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.basic.CndidateRequest; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.req.basic.FilterInvBusTypeRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.req.inout.PostOrderRequest; -import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.BasicThirdSysResponse; -import com.glxp.api.admin.res.basic.BussinessTypExportResponse; -import com.glxp.api.admin.res.basic.BussinessTypResponse; -import com.glxp.api.admin.res.basic.SrBtResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.basic.BussinessLocalTypeService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.FileUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.basic.CndidateRequest; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.api.req.basic.FilterInvBusTypeRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inout.OrderFilterRequest; +import com.glxp.api.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BussinessTypExportResponse; +import com.glxp.api.res.basic.BussinessTypResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.BussinessLocalTypeService; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.inout.WarehouseBussinessTypeService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.FileUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -48,8 +39,10 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; /** * 业务类型维护 diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java b/src/main/java/com/glxp/api/controller/basic/CorpExportLogController.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java rename to src/main/java/com/glxp/api/controller/basic/CorpExportLogController.java index 07fd488b..bbe3c2b2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/CorpExportLogController.java @@ -1,19 +1,18 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.basic.CorpExportLogEntity; -import com.glxp.api.admin.req.basic.*; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.BasicUnitMaintainExportResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.basic.CorpExportLogService; -import com.glxp.api.admin.thread.BasicGenExcelService; -import com.glxp.api.admin.thread.BasicGenJsonService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.basic.CorpExportLogEntity; +import com.glxp.api.req.basic.*; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BasicUnitMaintainExportResponse; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.CorpExportLogService; +import com.glxp.api.thread.BasicGenExcelService; +import com.glxp.api.thread.BasicGenJsonService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -28,7 +27,8 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.FileInputStream; import java.io.OutputStream; -import java.util.*; +import java.util.Date; +import java.util.List; @RestController public class CorpExportLogController { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpImportLogController.java b/src/main/java/com/glxp/api/controller/basic/CorpImportLogController.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpImportLogController.java rename to src/main/java/com/glxp/api/controller/basic/CorpImportLogController.java index 8b20ca54..666c53e0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpImportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/CorpImportLogController.java @@ -1,26 +1,24 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import cn.hutool.core.io.IoUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.req.basic.PostCorpsRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.BasicUnitMaintainExportResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.CorpImportDetailService; -import com.glxp.api.admin.service.basic.CorpImportLogService; -import com.glxp.api.admin.thread.BasicCorpImportService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.entity.basic.*; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.req.basic.PostCorpsRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BasicUnitMaintainExportResponse; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.service.basic.CorpImportDetailService; +import com.glxp.api.service.basic.CorpImportLogService; +import com.glxp.api.thread.BasicCorpImportService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.Row; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -170,7 +168,7 @@ public class CorpImportLogController { for (CorpImportDetailEntity corpImportDetailEntity : corpImportDetailEntities) { corpImportDetailEntity.setGenKeyFk(genKey); corpImportDetailEntity.setImportStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_UNPROCESS); - corpImportDetailEntity.setUpdateTime(new java.util.Date()); + corpImportDetailEntity.setUpdateTime(new Date()); corpImportDetailService.insertCorpImport(corpImportDetailEntity); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/EntrustReceController.java b/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/EntrustReceController.java rename to src/main/java/com/glxp/api/controller/basic/EntrustReceController.java index 1e69ea85..33c2dc62 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/EntrustReceController.java +++ b/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java @@ -1,18 +1,18 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; //委托验收 import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.basic.DlEntrustReceEntity; -import com.glxp.api.admin.entity.basic.EntrustReceEntity; -import com.glxp.api.admin.req.basic.BasicEntrustRecRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.EntrustReceResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.basic.EntrustReceService; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.basic.DlEntrustReceEntity; +import com.glxp.api.entity.basic.EntrustReceEntity; +import com.glxp.api.req.basic.BasicEntrustRecRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.EntrustReceResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/NewUploadDiController.java b/src/main/java/com/glxp/api/controller/basic/NewUploadDiController.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/NewUploadDiController.java rename to src/main/java/com/glxp/api/controller/basic/NewUploadDiController.java index 7f3e89df..1e6fe99c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/NewUploadDiController.java +++ b/src/main/java/com/glxp/api/controller/basic/NewUploadDiController.java @@ -1,23 +1,21 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.dao.basic.BasicThirdSysDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.CorpImportLogEntity; -import com.glxp.api.admin.entity.basic.NewUploadDiEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.req.basic.FilterNewUploadDiRequest; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.NewUploadDiResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.NewUploadDiService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.util.HttpOkClient; +import com.glxp.api.dao.basic.BasicThirdSysDao; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.basic.NewUploadDiEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.req.basic.FilterNewUploadDiRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.NewUploadDiResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.NewUploadDiService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.util.HttpOkClient; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/basic/SpsSyncDownloadController.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncDownloadController.java rename to src/main/java/com/glxp/api/controller/basic/SpsSyncDownloadController.java index 1126a9d6..eb58ec26 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/basic/SpsSyncDownloadController.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.basic.BasicDownloadStatusEntity; -import com.glxp.api.admin.httpclient.SpGetHttpClient; -import com.glxp.api.admin.req.basic.BasicDownloadRequest; -import com.glxp.api.admin.req.info.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.basic.BasicDownloadService; -import com.glxp.api.admin.thread.DlBasicService; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.entity.basic.BasicDownloadStatusEntity; +import com.glxp.api.httpclient.SpGetHttpClient; +import com.glxp.api.req.basic.BasicDownloadRequest; +import com.glxp.api.req.info.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.basic.BasicDownloadService; +import com.glxp.api.thread.DlBasicService; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/basic/SpsSyncExportStatusController.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java rename to src/main/java/com/glxp/api/controller/basic/SpsSyncExportStatusController.java index 61baa93d..1bed5da8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java +++ b/src/main/java/com/glxp/api/controller/basic/SpsSyncExportStatusController.java @@ -1,26 +1,26 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.BasicExportStatusEntity; -import com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity; -import com.glxp.api.admin.req.basic.BasicExportStatusRequest; -import com.glxp.api.admin.req.basic.BasicExportTimeRequest; -import com.glxp.api.admin.req.basic.SpsSyncDataRequest; -import com.glxp.api.admin.req.info.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.SpsSyncBusResponse; -import com.glxp.api.admin.res.basic.SpsSyncDataResponse; -import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; -import com.glxp.api.admin.service.basic.BasicExportService; -import com.glxp.api.admin.service.basic.BasicExportTimeService; -import com.glxp.api.admin.thread.HeartService; -import com.glxp.api.admin.thread.UpBasicService; -import com.glxp.api.admin.util.RedisUtil; -import com.glxp.api.admin.httpclient.SpGetHttpClient; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.BasicExportStatusEntity; +import com.glxp.api.entity.basic.BasicExportStatusTimeEntity; +import com.glxp.api.httpclient.SpGetHttpClient; +import com.glxp.api.req.basic.BasicExportStatusRequest; +import com.glxp.api.req.basic.BasicExportTimeRequest; +import com.glxp.api.req.basic.SpsSyncDataRequest; +import com.glxp.api.req.info.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.SpsSyncBusResponse; +import com.glxp.api.res.basic.SpsSyncDataResponse; +import com.glxp.api.res.basic.SpsSyncOrderResponse; +import com.glxp.api.service.basic.BasicExportService; +import com.glxp.api.service.basic.BasicExportTimeService; +import com.glxp.api.thread.HeartService; +import com.glxp.api.thread.UpBasicService; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java rename to src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 9cace8a5..dfda8b51 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -1,27 +1,27 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.ProductInfoEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.httpclient.UdiDlHttpClient; -import com.glxp.api.admin.req.basic.CombineRequest; -import com.glxp.api.admin.req.basic.RemoveRelRequest; -import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.basic.*; -import com.glxp.api.admin.service.thrsys.ThrProductsService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.UdiInfoUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.basic.ProductInfoEntity; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.httpclient.UdiDlHttpClient; +import com.glxp.api.req.basic.CombineRequest; +import com.glxp.api.req.basic.RemoveRelRequest; +import com.glxp.api.req.receipt.ProductInfoFilterRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.basic.*; +import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.UdiInfoUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java b/src/main/java/com/glxp/api/controller/basic/UdiInfoController.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java rename to src/main/java/com/glxp/api/controller/basic/UdiInfoController.java index d3b3b5e8..5772cb72 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiInfoController.java @@ -1,22 +1,22 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.basic.UdiCompanyRequest; -import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpProductsResponse; -import com.glxp.api.admin.service.basic.*; -import com.glxp.api.admin.service.thrsys.ThrProductsService; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.FilterErpGoodsRequest; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.basic.UdiCompanyRequest; +import com.glxp.api.req.receipt.ProductInfoFilterRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.ErpProductsResponse; +import com.glxp.api.service.basic.*; +import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.util.FilterUdiUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -29,7 +29,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; //基础信息维护 @Slf4j diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java b/src/main/java/com/glxp/api/controller/basic/UdiInfoExportLogController.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java rename to src/main/java/com/glxp/api/controller/basic/UdiInfoExportLogController.java index 7ecc98c7..d8503c89 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiInfoExportLogController.java @@ -1,21 +1,21 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.basic.UdiInfoExportRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.basic.UdiRlDlResponse; -import com.glxp.api.admin.service.basic.UdiInfoExportLogService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.thread.BasicGenExcelService; -import com.glxp.api.admin.thread.BasicGenJsonService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.entity.basic.UdiInfoExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.basic.UdiInfoExportRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.basic.UdiRlDlResponse; +import com.glxp.api.service.basic.UdiInfoExportLogService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.thread.BasicGenExcelService; +import com.glxp.api.thread.BasicGenJsonService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java b/src/main/java/com/glxp/api/controller/basic/UdiInfoImportLogController.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java rename to src/main/java/com/glxp/api/controller/basic/UdiInfoImportLogController.java index 6118bb57..13fd0d66 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiInfoImportLogController.java @@ -1,20 +1,20 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import cn.hutool.core.io.IoUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; -import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.req.basic.PostUdiInfoRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse; -import com.glxp.api.admin.service.basic.UdiInfoImportDetailService; -import com.glxp.api.admin.service.basic.UdiInfoImportLogService; -import com.glxp.api.admin.thread.BasicUdiInfoImportService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.entity.basic.UdiInfoImportDetailEntity; +import com.glxp.api.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.req.basic.PostUdiInfoRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; +import com.glxp.api.service.basic.UdiInfoImportDetailService; +import com.glxp.api.service.basic.UdiInfoImportLogService; +import com.glxp.api.thread.BasicUdiInfoImportService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java rename to src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 7aaf93b9..f45599e8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -1,42 +1,42 @@ -package com.glxp.api.admin.controller.basic; +package com.glxp.api.controller.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.config.WebSocketServer; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.req.basic.*; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inout.WarehouseQueryRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.BasicProductThirdSysResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.info.CompanyProductRelevanceService; -import com.glxp.api.admin.service.info.CompanyService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.CodesService; -import com.glxp.api.admin.service.inventory.InvPreProductService; -import com.glxp.api.admin.service.inventory.InvProductService; -import com.glxp.api.admin.service.thrsys.ThrDataService; -import com.glxp.api.admin.thread.BasicBackUpdateProductService; -import com.glxp.api.admin.thread.BasicUpdateProductService; -import com.glxp.api.admin.util.*; +import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.config.WebSocketServer; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.req.basic.*; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inout.WarehouseQueryRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BasicProductThirdSysResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.service.basic.UdiInfoService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.info.CompanyProductRelevanceService; +import com.glxp.api.service.info.CompanyService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.CodesService; +import com.glxp.api.service.inventory.InvPreProductService; +import com.glxp.api.service.inventory.InvProductService; +import com.glxp.api.service.thrsys.ThrDataService; +import com.glxp.api.thread.BasicBackUpdateProductService; +import com.glxp.api.thread.BasicUpdateProductService; +import com.glxp.api.util.*; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -45,7 +45,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java b/src/main/java/com/glxp/api/controller/business/StockOrderController.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java rename to src/main/java/com/glxp/api/controller/business/StockOrderController.java index 084f5a9a..a226b254 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java +++ b/src/main/java/com/glxp/api/controller/business/StockOrderController.java @@ -1,68 +1,68 @@ -package com.glxp.api.admin.controller.business; +package com.glxp.api.controller.business; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.dao.inout.OrderDao; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.business.StockQRCodeTextEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.AcceptOrderEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inout.WarehouseUserEntity; -import com.glxp.api.admin.entity.inventory.InnerOrderEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.entity.inventory.StockPrintEntity; -import com.glxp.api.admin.entity.inventory.StockPrinttREntity; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; -import com.glxp.api.admin.req.business.StockOrderFilterRequest; -import com.glxp.api.admin.req.business.StockOrderIdsRequest; -import com.glxp.api.admin.req.business.StockOrderPostRequest; -import com.glxp.api.admin.req.inout.AddStockOrderChangeRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.FilterInvUserRequest; -import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest; -import com.glxp.api.admin.req.inventory.PostStockPrintRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.business.StockOrderExportResponse; -import com.glxp.api.admin.res.inout.ErpOrderResponse; -import com.glxp.api.admin.res.inout.StockOrderResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.basic.BussinessLocalTypeService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.business.StockOrderDetailService; -import com.glxp.api.admin.service.business.StockOrderDetailTempService; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.business.StockQRCodeTextService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.CodesService; -import com.glxp.api.admin.service.inout.CodesTempService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.inout.WarehouseUserService; -import com.glxp.api.admin.service.inventory.InnerOrderDetailService; -import com.glxp.api.admin.service.inventory.InnerOrderService; -import com.glxp.api.admin.service.inventory.InvStockPrintService; -import com.glxp.api.admin.service.inventory.InvWarehouseService; -import com.glxp.api.admin.util.*; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.inout.OrderDao; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.business.StockQRCodeTextEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.AcceptOrderEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inout.WarehouseUserEntity; +import com.glxp.api.entity.inventory.InnerOrderEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.entity.inventory.StockPrintEntity; +import com.glxp.api.entity.inventory.StockPrinttREntity; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.req.business.StockOrderFilterRequest; +import com.glxp.api.req.business.StockOrderIdsRequest; +import com.glxp.api.req.business.StockOrderPostRequest; +import com.glxp.api.req.inout.AddStockOrderChangeRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.FilterInvUserRequest; +import com.glxp.api.req.inventory.InnerOrderDetailRequest; +import com.glxp.api.req.inventory.PostStockPrintRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.business.StockOrderExportResponse; +import com.glxp.api.res.inout.ErpOrderResponse; +import com.glxp.api.res.inout.StockOrderResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.BussinessLocalTypeService; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.business.StockOrderDetailService; +import com.glxp.api.service.business.StockOrderDetailTempService; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.business.StockQRCodeTextService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.CodesService; +import com.glxp.api.service.inout.CodesTempService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.inout.WarehouseUserService; +import com.glxp.api.service.inventory.InnerOrderDetailService; +import com.glxp.api.service.inventory.InnerOrderService; +import com.glxp.api.service.inventory.InvStockPrintService; +import com.glxp.api.service.inventory.InvWarehouseService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.util.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/src/main/java/com/glxp/api/controller/business/StockOrderDetailController.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java rename to src/main/java/com/glxp/api/controller/business/StockOrderDetailController.java index 4cb55b8a..b2e423ce 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/business/StockOrderDetailController.java @@ -1,47 +1,47 @@ -package com.glxp.api.admin.controller.business; +package com.glxp.api.controller.business; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; -import com.glxp.api.admin.req.business.StockOrderIdsRequest; -import com.glxp.api.admin.req.business.StockSelectDataEntity; -import com.glxp.api.admin.req.info.SystemParamConfigRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.business.StockOrderDetailQueryProductResponse; -import com.glxp.api.admin.res.business.StockOrderDetailResponse; -import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; -import com.glxp.api.admin.res.purchase.SupProductResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.basic.BussinessLocalTypeService; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.business.StockOrderDetailService; -import com.glxp.api.admin.service.business.StockOrderDetailTempService; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.info.CompanyProductRelevanceService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.CodesService; -import com.glxp.api.admin.service.inventory.InvProductService; -import com.glxp.api.admin.service.purchase.SupProductService; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.req.business.StockOrderIdsRequest; +import com.glxp.api.req.business.StockSelectDataEntity; +import com.glxp.api.req.info.SystemParamConfigRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.business.StockOrderDetailQueryProductResponse; +import com.glxp.api.res.business.StockOrderDetailResponse; +import com.glxp.api.res.info.CompanyProductRelevanceResponse; +import com.glxp.api.res.purchase.SupProductResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.basic.BussinessLocalTypeService; +import com.glxp.api.service.basic.UdiInfoService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.business.StockOrderDetailService; +import com.glxp.api.service.business.StockOrderDetailTempService; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.info.CompanyProductRelevanceService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.CodesService; +import com.glxp.api.service.inventory.InvProductService; +import com.glxp.api.service.purchase.SupProductService; +import com.glxp.api.util.FilterUdiUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderUploadController.java b/src/main/java/com/glxp/api/controller/business/StockOrderUploadController.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderUploadController.java rename to src/main/java/com/glxp/api/controller/business/StockOrderUploadController.java index 05aa5268..938d8bd2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderUploadController.java +++ b/src/main/java/com/glxp/api/controller/business/StockOrderUploadController.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.controller.business; +package com.glxp.api.controller.business; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.req.business.StockOrderUploadRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inout.StockOrderResponse; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.req.business.StockOrderUploadRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.StockOrderResponse; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.inout.OrderService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderUploadLogController.java b/src/main/java/com/glxp/api/controller/business/StockOrderUploadLogController.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderUploadLogController.java rename to src/main/java/com/glxp/api/controller/business/StockOrderUploadLogController.java index a49ea560..547e6b86 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderUploadLogController.java +++ b/src/main/java/com/glxp/api/controller/business/StockOrderUploadLogController.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.controller.business; +package com.glxp.api.controller.business; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.business.StockOrderUploadLogEntity; -import com.glxp.api.admin.req.business.StockOrderUploadLogRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.business.StockOrderUploadLogService; +import com.glxp.api.entity.business.StockOrderUploadLogEntity; +import com.glxp.api.req.business.StockOrderUploadLogRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.business.StockOrderUploadLogService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java b/src/main/java/com/glxp/api/controller/business/StockQRCodeTextController.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java rename to src/main/java/com/glxp/api/controller/business/StockQRCodeTextController.java index 61cdb9f5..ca92837d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java +++ b/src/main/java/com/glxp/api/controller/business/StockQRCodeTextController.java @@ -1,53 +1,48 @@ -package com.glxp.api.admin.controller.business; +package com.glxp.api.controller.business; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.business.StockOrderPrintEntity; -import com.glxp.api.admin.entity.business.StockQRCodeTextEntity; -import com.glxp.api.admin.entity.info.CompanyEntity; -import com.glxp.api.admin.entity.info.SystemPDFModuleEntity; -import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inventory.StockPrintEntity; -import com.glxp.api.admin.entity.inventory.StockPrintTempEntity; -import com.glxp.api.admin.req.basic.FilterStockprintRequest; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; -import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.DeleteStPrintTempRequest; -import com.glxp.api.admin.req.inventory.FilterStPrintTempRequest; -import com.glxp.api.admin.req.itextpdf.InspectionPDFTemplateRequest; -import com.glxp.api.admin.req.itextpdf.PdfPrintCountEntity; -import com.glxp.api.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest; -import com.glxp.api.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.SystemPDFTemplateRelevanceResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.BussinessLocalTypeService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.business.StockOrderDetailService; -import com.glxp.api.admin.service.business.StockOrderDetailTempService; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.business.StockQRCodeTextService; -import com.glxp.api.admin.service.info.*; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.inventory.InvStockPrintService; -import com.glxp.api.admin.service.inventory.StockPrintTempService; -import com.glxp.api.admin.thread.IoTransInoutService; -import com.glxp.api.admin.thread.JaspaperService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.FileUtils; -import com.glxp.api.admin.util.JasperUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.business.StockOrderPrintEntity; +import com.glxp.api.entity.business.StockQRCodeTextEntity; +import com.glxp.api.entity.info.CompanyEntity; +import com.glxp.api.entity.info.SystemPDFModuleEntity; +import com.glxp.api.entity.info.SystemPDFTemplateEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inventory.StockPrintEntity; +import com.glxp.api.entity.inventory.StockPrintTempEntity; +import com.glxp.api.req.basic.FilterStockprintRequest; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.req.business.StockQRCodeTextFilterRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.DeleteStPrintTempRequest; +import com.glxp.api.req.inventory.FilterStPrintTempRequest; +import com.glxp.api.req.itextpdf.InspectionPDFTemplateRequest; +import com.glxp.api.req.itextpdf.PdfPrintCountEntity; +import com.glxp.api.req.itextpdf.StockQRCodeTextPDFTemplateRequest; +import com.glxp.api.req.itextpdf.SystemPDFTemplateRelevanceRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.SystemPDFTemplateRelevanceResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.BussinessLocalTypeService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.business.StockOrderDetailService; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.business.StockQRCodeTextService; +import com.glxp.api.service.info.*; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.inventory.InvStockPrintService; +import com.glxp.api.service.inventory.StockPrintTempService; +import com.glxp.api.thread.JaspaperService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.FileUtils; +import com.glxp.api.util.JasperUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -63,7 +58,10 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @RestController public class StockQRCodeTextController { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/ClassifyCodeController.java b/src/main/java/com/glxp/api/controller/info/ClassifyCodeController.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/controller/info/ClassifyCodeController.java rename to src/main/java/com/glxp/api/controller/info/ClassifyCodeController.java index 826c2160..75c039ff 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/ClassifyCodeController.java +++ b/src/main/java/com/glxp/api/controller/info/ClassifyCodeController.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.controller.info; +package com.glxp.api.controller.info; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.info.ClassifyCodeEntity; -import com.glxp.api.admin.req.info.FilterClassifyCodeRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.info.ClassifyCodeService; +import com.glxp.api.entity.info.ClassifyCodeEntity; +import com.glxp.api.req.info.FilterClassifyCodeRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.info.ClassifyCodeService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyController.java b/src/main/java/com/glxp/api/controller/info/CompanyController.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyController.java rename to src/main/java/com/glxp/api/controller/info/CompanyController.java index bbd36a79..234f8fe4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyController.java +++ b/src/main/java/com/glxp/api/controller/info/CompanyController.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.controller.info; +package com.glxp.api.controller.info; -import com.glxp.api.admin.entity.info.CompanyEntity; -import com.glxp.api.admin.service.info.CompanyService; +import com.glxp.api.entity.info.CompanyEntity; +import com.glxp.api.service.info.CompanyService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java b/src/main/java/com/glxp/api/controller/info/CompanyProductRelevanceController.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java rename to src/main/java/com/glxp/api/controller/info/CompanyProductRelevanceController.java index 427a8a09..123f8afd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/info/CompanyProductRelevanceController.java @@ -1,27 +1,27 @@ -package com.glxp.api.admin.controller.info; +package com.glxp.api.controller.info; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; -import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.basic.UdiInfoExportRequest; -import com.glxp.api.admin.req.info.CompanyRequest; -import com.glxp.api.admin.req.info.DeleteCompanyFileRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.info.CompanyProductRelevanceService; -import com.glxp.api.admin.service.info.CompanyService; -import com.glxp.api.admin.thread.CompanyProductsRelService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.basic.UdiInfoExportRequest; +import com.glxp.api.req.info.CompanyRequest; +import com.glxp.api.req.info.DeleteCompanyFileRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.info.CompanyProductRelevanceResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.info.CompanyProductRelevanceService; +import com.glxp.api.service.info.CompanyService; +import com.glxp.api.thread.CompanyProductsRelService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/DeviceKeyController.java b/src/main/java/com/glxp/api/controller/info/DeviceKeyController.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/controller/info/DeviceKeyController.java rename to src/main/java/com/glxp/api/controller/info/DeviceKeyController.java index 6426ecdd..06d80dfa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/DeviceKeyController.java +++ b/src/main/java/com/glxp/api/controller/info/DeviceKeyController.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.controller.info; +package com.glxp.api.controller.info; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.info.DeviceKeyEntity; -import com.glxp.api.admin.req.info.FilterDeviceKeyRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.auth.DeviceKeyService; -import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.entity.info.DeviceKeyEntity; +import com.glxp.api.req.info.FilterDeviceKeyRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.DeviceKeyService; +import com.glxp.api.util.DateUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/info/SyncDataSetController.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/controller/info/SyncDataSetController.java rename to src/main/java/com/glxp/api/controller/info/SyncDataSetController.java index 3e57cc46..f84fc260 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/info/SyncDataSetController.java @@ -1,15 +1,14 @@ -package com.glxp.api.admin.controller.info; +package com.glxp.api.controller.info; import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson.JSON; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; -import com.glxp.api.admin.res.info.SyncDataSetResponse; -import com.glxp.api.admin.service.info.SyncDataBustypeService; -import com.glxp.api.admin.service.info.SyncDataSetService; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.info.SyncDataBustypeEntity; +import com.glxp.api.entity.info.SyncDataSetEntity; +import com.glxp.api.res.info.SyncDataSetResponse; +import com.glxp.api.service.info.SyncDataBustypeService; +import com.glxp.api.service.info.SyncDataSetService; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFModuleController.java b/src/main/java/com/glxp/api/controller/info/SystemPDFModuleController.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFModuleController.java rename to src/main/java/com/glxp/api/controller/info/SystemPDFModuleController.java index cc45cdf1..d28c8ae8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFModuleController.java +++ b/src/main/java/com/glxp/api/controller/info/SystemPDFModuleController.java @@ -1,23 +1,23 @@ -package com.glxp.api.admin.controller.info; +package com.glxp.api.controller.info; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.entity.info.SystemPDFModuleEntity; -import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity; -import com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity; -import com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest; -import com.glxp.api.admin.req.info.SystemPDFModuleRequest; -import com.glxp.api.admin.req.info.SystemPDFModuleSaveRequest; -import com.glxp.api.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.SystemPDFTemplateRelevanceResponse; -import com.glxp.api.admin.res.info.SystemPDFModuleResponse; -import com.glxp.api.admin.res.info.SystemPDFModuleSelectResponse; -import com.glxp.api.admin.service.basic.BussinessLocalTypeService; -import com.glxp.api.admin.service.info.SystemPDFModuleService; -import com.glxp.api.admin.service.info.SystemPDFTemplateRelevanceService; -import com.glxp.api.admin.service.info.SystemPDFTemplateService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.entity.info.SystemPDFModuleEntity; +import com.glxp.api.entity.info.SystemPDFTemplateEntity; +import com.glxp.api.entity.info.SystemPDFTemplateRelevanceEntity; +import com.glxp.api.req.basic.BussinessLocalTypeFilterRequest; +import com.glxp.api.req.info.SystemPDFModuleRequest; +import com.glxp.api.req.info.SystemPDFModuleSaveRequest; +import com.glxp.api.req.itextpdf.SystemPDFTemplateRelevanceRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.SystemPDFTemplateRelevanceResponse; +import com.glxp.api.res.info.SystemPDFModuleResponse; +import com.glxp.api.res.info.SystemPDFModuleSelectResponse; +import com.glxp.api.service.basic.BussinessLocalTypeService; +import com.glxp.api.service.info.SystemPDFModuleService; +import com.glxp.api.service.info.SystemPDFTemplateRelevanceService; +import com.glxp.api.service.info.SystemPDFTemplateService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFTemplateController.java b/src/main/java/com/glxp/api/controller/info/SystemPDFTemplateController.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFTemplateController.java rename to src/main/java/com/glxp/api/controller/info/SystemPDFTemplateController.java index 50a174b8..764da3d1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFTemplateController.java +++ b/src/main/java/com/glxp/api/controller/info/SystemPDFTemplateController.java @@ -1,15 +1,15 @@ -package com.glxp.api.admin.controller.info; +package com.glxp.api.controller.info; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity; -import com.glxp.api.admin.req.info.SystemPDFTemplateRequest; -import com.glxp.api.admin.req.info.SystemPDFTemplateSaveRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.info.SystemPDFTemplateResponse; -import com.glxp.api.admin.res.info.SystemPDFTemplateSelectResponse; -import com.glxp.api.admin.service.info.SystemPDFTemplateService; -import com.glxp.api.admin.util.JasperUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.info.SystemPDFTemplateEntity; +import com.glxp.api.req.info.SystemPDFTemplateRequest; +import com.glxp.api.req.info.SystemPDFTemplateSaveRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.info.SystemPDFTemplateResponse; +import com.glxp.api.res.info.SystemPDFTemplateSelectResponse; +import com.glxp.api.service.info.SystemPDFTemplateService; +import com.glxp.api.util.JasperUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java b/src/main/java/com/glxp/api/controller/info/SystemParamConfigController.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java rename to src/main/java/com/glxp/api/controller/info/SystemParamConfigController.java index 95898886..b74dd5fb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java +++ b/src/main/java/com/glxp/api/controller/info/SystemParamConfigController.java @@ -1,19 +1,19 @@ -package com.glxp.api.admin.controller.info; +package com.glxp.api.controller.info; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.dao.schedule.ScheduledDao; -import com.glxp.api.admin.entity.info.ProductRemarkSetEntity; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.req.info.SystemParamConfigRequest; -import com.glxp.api.admin.req.info.SystemParamConfigSaveRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.info.SystemParamConfigResponse; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.util.CronUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.info.ProductRemarkSetEntity; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.req.info.SystemParamConfigRequest; +import com.glxp.api.req.info.SystemParamConfigSaveRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.info.SystemParamConfigResponse; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.util.CronUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdSysApiController.java b/src/main/java/com/glxp/api/controller/info/ThirdSysApiController.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdSysApiController.java rename to src/main/java/com/glxp/api/controller/info/ThirdSysApiController.java index 431b28cb..e053b3e2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdSysApiController.java +++ b/src/main/java/com/glxp/api/controller/info/ThirdSysApiController.java @@ -1,16 +1,10 @@ -package com.glxp.api.admin.controller.info; +package com.glxp.api.controller.info; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.info.CompanyEntity; -import com.glxp.api.admin.entity.info.ThirdSysApiEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.req.info.FilterSysApiRequest; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.info.CompanyService; -import com.glxp.api.admin.service.info.ThirdSysApiService; -import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.entity.info.ThirdSysApiEntity; +import com.glxp.api.req.info.FilterSysApiRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.info.ThirdSysApiService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdUploadSetController.java b/src/main/java/com/glxp/api/controller/info/ThirdUploadSetController.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdUploadSetController.java rename to src/main/java/com/glxp/api/controller/info/ThirdUploadSetController.java index 5bf0b257..bb204c63 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdUploadSetController.java +++ b/src/main/java/com/glxp/api/controller/info/ThirdUploadSetController.java @@ -1,19 +1,14 @@ -package com.glxp.api.admin.controller.info; +package com.glxp.api.controller.info; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; -import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity; -import com.glxp.api.admin.res.info.SyncDataSetResponse; -import com.glxp.api.admin.service.info.SyncUploadDataBustypeService; -import com.glxp.api.admin.service.info.SyncUploadDataSetService; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.info.SyncDataBustypeEntity; +import com.glxp.api.entity.info.SyncUploadDataSetEntity; +import com.glxp.api.service.info.SyncUploadDataBustypeService; +import com.glxp.api.service.info.SyncUploadDataSetService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/IOOrderStatusController.java b/src/main/java/com/glxp/api/controller/inout/IOOrderStatusController.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inout/IOOrderStatusController.java rename to src/main/java/com/glxp/api/controller/inout/IOOrderStatusController.java index b5f4364b..d390e2b5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/IOOrderStatusController.java +++ b/src/main/java/com/glxp/api/controller/inout/IOOrderStatusController.java @@ -1,17 +1,17 @@ -package com.glxp.api.admin.controller.inout; +package com.glxp.api.controller.inout; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.IOOrderStatusEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.req.inout.OrderStatusFilterRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inout.DlOrderResponse; -import com.glxp.api.admin.service.inout.CodesService; -import com.glxp.api.admin.service.inout.IOOrderStatusService; -import com.glxp.api.admin.service.inout.OrderDetailService; -import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.IOOrderStatusEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.req.inout.OrderStatusFilterRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.DlOrderResponse; +import com.glxp.api.service.inout.CodesService; +import com.glxp.api.service.inout.IOOrderStatusService; +import com.glxp.api.service.inout.OrderDetailService; +import com.glxp.api.service.inout.OrderService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/src/main/java/com/glxp/api/controller/inout/OrderController.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java rename to src/main/java/com/glxp/api/controller/inout/OrderController.java index 16a21100..8d998139 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/OrderController.java @@ -1,55 +1,55 @@ -package com.glxp.api.admin.controller.inout; +package com.glxp.api.controller.inout; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.controller.inout.utils.DataTransUtil; -import com.glxp.api.admin.dao.inout.CodesTempDao; -import com.glxp.api.admin.dao.inout.OrderDao; -import com.glxp.api.admin.dao.inventory.InvWarehouseDao; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.basic.EntrustReceEntity; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvBusUserEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.httpclient.SpsDirectClient; -import com.glxp.api.admin.req.basic.BasicEntrustRecRequest; -import com.glxp.api.admin.req.business.StockOrderFilterRequest; -import com.glxp.api.admin.req.inout.*; -import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; -import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.BussinessTypResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.basic.EntrustReceService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.business.StockOrderDetailService; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.*; -import com.glxp.api.admin.service.inventory.InvBusUserService; -import com.glxp.api.admin.service.inventory.InvWarehouseService; -import com.glxp.api.admin.thread.InvProductsTrService; -import com.glxp.api.admin.thread.IoTransInoutService; -import com.glxp.api.admin.util.*; +import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.controller.inout.utils.DataTransUtil; +import com.glxp.api.dao.inout.CodesTempDao; +import com.glxp.api.dao.inout.OrderDao; +import com.glxp.api.dao.inventory.InvWarehouseDao; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.basic.EntrustReceEntity; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inventory.InvBusUserEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.httpclient.SpsDirectClient; +import com.glxp.api.req.basic.BasicEntrustRecRequest; +import com.glxp.api.req.business.StockOrderFilterRequest; +import com.glxp.api.req.inout.*; +import com.glxp.api.req.inventory.FilterInvBusUserRequest; +import com.glxp.api.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BussinessTypResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.basic.EntrustReceService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.business.StockOrderDetailService; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.*; +import com.glxp.api.service.inventory.InvBusUserService; +import com.glxp.api.service.inventory.InvWarehouseService; +import com.glxp.api.thread.InvProductsTrService; +import com.glxp.api.thread.IoTransInoutService; +import com.glxp.api.util.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/src/main/java/com/glxp/api/controller/inout/OrderDetailController.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java rename to src/main/java/com/glxp/api/controller/inout/OrderDetailController.java index 5af9fd2d..05aaa724 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inout/OrderDetailController.java @@ -1,66 +1,60 @@ -package com.glxp.api.admin.controller.inout; +package com.glxp.api.controller.inout; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.db.sql.Order; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.controller.inout.utils.CheckOrderUtils; -import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; -import com.glxp.api.admin.controller.inout.utils.DataTransUtil; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; -import com.glxp.api.admin.httpclient.ErpOrderClient; -import com.glxp.api.admin.httpclient.SpsDirectClient; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; -import com.glxp.api.admin.req.business.StockOrderFilterRequest; -import com.glxp.api.admin.req.info.SystemParamConfigRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inout.FilterOrderRequest; -import com.glxp.api.admin.req.inout.ImportErpOrderRequest; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; -import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.inout.ErpOrderResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.basic.*; -import com.glxp.api.admin.service.business.StockOrderDetailService; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.info.CompanyService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.CodesService; -import com.glxp.api.admin.service.inout.OrderDetailService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.inventory.InvWarehouseService; -import com.glxp.api.admin.service.thrsys.ThrDataService; -import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; -import com.glxp.api.admin.service.thrsys.ThrOrderService; -import com.glxp.api.admin.thread.InvProductsTrService; -import com.glxp.api.admin.thread.IoTransInoutService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.OrderNoTypeBean; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.controller.inout.utils.CheckOrderUtils; +import com.glxp.api.controller.inout.utils.DataTransUtil; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.entity.thrsys.ThrOrderEntity; +import com.glxp.api.httpclient.ErpOrderClient; +import com.glxp.api.httpclient.SpsDirectClient; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.req.business.StockOrderFilterRequest; +import com.glxp.api.req.info.SystemParamConfigRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.inout.ImportErpOrderRequest; +import com.glxp.api.req.inout.OrderFilterRequest; +import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.inout.ErpOrderResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.*; +import com.glxp.api.service.business.StockOrderDetailService; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.CodesService; +import com.glxp.api.service.inout.OrderDetailService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.inventory.InvWarehouseService; +import com.glxp.api.service.thrsys.ThrDataService; +import com.glxp.api.service.thrsys.ThrOrderDetailService; +import com.glxp.api.service.thrsys.ThrOrderService; +import com.glxp.api.thread.IoTransInoutService; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inout/UdiTraceController.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inout/UdiTraceController.java rename to src/main/java/com/glxp/api/controller/inout/UdiTraceController.java index bd8dba34..fc34f866 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/inout/UdiTraceController.java @@ -1,25 +1,25 @@ -package com.glxp.api.admin.controller.inout; +package com.glxp.api.controller.inout; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.inout.WarehouseQueryRequest; -import com.glxp.api.admin.req.inventory.FilterCodeTraceRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.basic.UdiTraceResponse; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.inout.CodesService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.inventory.InvProductDetailService; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.inout.WarehouseQueryRequest; +import com.glxp.api.req.inventory.FilterCodeTraceRequest; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.basic.UdiTraceResponse; +import com.glxp.api.service.basic.UdiInfoService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.inout.CodesService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.inventory.InvProductDetailService; +import com.glxp.api.util.FilterUdiUtils; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/src/main/java/com/glxp/api/controller/inout/WareHouseController.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java rename to src/main/java/com/glxp/api/controller/inout/WareHouseController.java index 6d04c6f6..668841e6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/src/main/java/com/glxp/api/controller/inout/WareHouseController.java @@ -1,58 +1,58 @@ -package com.glxp.api.admin.controller.inout; +package com.glxp.api.controller.inout; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.dao.auth.AuthLicenseDao; -import com.glxp.api.admin.dao.inventory.InvWarehouseDao; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.auth.AuthLicense; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inout.WarehouseUserEntity; -import com.glxp.api.admin.entity.inventory.InvBusUserEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.httpclient.SpsDirectClient; -import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; -import com.glxp.api.admin.req.inout.*; -import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; -import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.BussinessTypResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; -import com.glxp.api.admin.res.inout.WarehouseResponse; -import com.glxp.api.admin.res.inout.WarehouseUserResponse; -import com.glxp.api.admin.res.inventory.InvBusUserResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.info.CompanyProductRelevanceService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.*; -import com.glxp.api.admin.service.inventory.*; -import com.glxp.api.admin.thread.IoTransInoutService; -import com.glxp.api.admin.util.*; +import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.auth.AuthLicenseDao; +import com.glxp.api.dao.inventory.InvWarehouseDao; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.AuthLicense; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inout.WarehouseUserEntity; +import com.glxp.api.entity.inventory.InvBusUserEntity; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.exception.JsonException; +import com.glxp.api.httpclient.SpsDirectClient; +import com.glxp.api.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.req.inout.*; +import com.glxp.api.req.inventory.FilterInvBusUserRequest; +import com.glxp.api.req.inventory.FilterInvLinkDataRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BussinessTypResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.info.CompanyProductRelevanceResponse; +import com.glxp.api.res.inout.WarehouseResponse; +import com.glxp.api.res.inout.WarehouseUserResponse; +import com.glxp.api.res.inventory.InvBusUserResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.basic.UdiInfoService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.info.CompanyProductRelevanceService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.*; +import com.glxp.api.service.inventory.*; +import com.glxp.api.thread.IoTransInoutService; +import com.glxp.api.util.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java b/src/main/java/com/glxp/api/controller/inout/utils/CheckOrderUtils.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java rename to src/main/java/com/glxp/api/controller/inout/utils/CheckOrderUtils.java index 0d2bf9d3..1d283f98 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java +++ b/src/main/java/com/glxp/api/controller/inout/utils/CheckOrderUtils.java @@ -1,24 +1,24 @@ -package com.glxp.api.admin.controller.inout.utils; +package com.glxp.api.controller.inout.utils; import cn.hutool.core.util.StrUtil; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.business.StockOrderFilterRequest; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.BussinessOriginTypeService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.inout.OrderDetailService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.thrsys.ThrDataService; -import com.glxp.api.admin.thread.InvProductsTrService; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.business.StockOrderFilterRequest; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.BussinessOriginTypeService; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.inout.OrderDetailService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.thrsys.ThrDataService; +import com.glxp.api.thread.InvProductsTrService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java b/src/main/java/com/glxp/api/controller/inout/utils/ContrastErpUtil.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java rename to src/main/java/com/glxp/api/controller/inout/utils/ContrastErpUtil.java index 77626aa6..86d5412a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java +++ b/src/main/java/com/glxp/api/controller/inout/utils/ContrastErpUtil.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.controller.inout.utils; +package com.glxp.api.controller.inout.utils; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.api.admin.service.inout.OrderDetailService; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; +import com.glxp.api.service.inout.OrderDetailService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/DataTransUtil.java b/src/main/java/com/glxp/api/controller/inout/utils/DataTransUtil.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/DataTransUtil.java rename to src/main/java/com/glxp/api/controller/inout/utils/DataTransUtil.java index 8ff98596..95bd00cb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/DataTransUtil.java +++ b/src/main/java/com/glxp/api/controller/inout/utils/DataTransUtil.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.controller.inout.utils; +package com.glxp.api.controller.inout.utils; import java.util.ArrayList; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java b/src/main/java/com/glxp/api/controller/inout/utils/InoutUtils.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java rename to src/main/java/com/glxp/api/controller/inout/utils/InoutUtils.java index 59d7f87f..37e14094 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java +++ b/src/main/java/com/glxp/api/controller/inout/utils/InoutUtils.java @@ -1,20 +1,20 @@ -package com.glxp.api.admin.controller.inout.utils; - -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.httpclient.UdiDlHttpClient; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.inout.OrderDetailService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.FilterUdiUtils; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.UdiInfoUtil; +package com.glxp.api.controller.inout.utils; + +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.httpclient.UdiDlHttpClient; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.UdiInfoService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.inout.OrderDetailService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.FilterUdiUtils; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.UdiInfoUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/controller/inout/utils/TransInoutUtil.java b/src/main/java/com/glxp/api/controller/inout/utils/TransInoutUtil.java new file mode 100644 index 00000000..cbd19836 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inout/utils/TransInoutUtil.java @@ -0,0 +1,4 @@ +package com.glxp.api.controller.inout.utils; + +public class TransInoutUtil { +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectDetailController.java b/src/main/java/com/glxp/api/controller/inventory/DeviceCollectDetailController.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectDetailController.java rename to src/main/java/com/glxp/api/controller/inventory/DeviceCollectDetailController.java index 74155c6e..2a9c4187 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectDetailController.java +++ b/src/main/java/com/glxp/api/controller/inventory/DeviceCollectDetailController.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; -import com.glxp.api.admin.req.inventory.AddDeviceCollectOrderDetailRequest; -import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderDetailRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.DeviceCollectOrderDetailResponse; -import com.glxp.api.admin.service.inventory.DeviceCollectOrderDetailService; +import com.glxp.api.entity.inventory.DeviceCollectOrderDetailEntity; +import com.glxp.api.req.inventory.AddDeviceCollectOrderDetailRequest; +import com.glxp.api.req.inventory.FilterDeviceCollectOrderDetailRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.DeviceCollectOrderDetailResponse; +import com.glxp.api.service.inventory.DeviceCollectOrderDetailService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectOrderController.java b/src/main/java/com/glxp/api/controller/inventory/DeviceCollectOrderController.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectOrderController.java rename to src/main/java/com/glxp/api/controller/inventory/DeviceCollectOrderController.java index 8fc1364e..d14f7511 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/inventory/DeviceCollectOrderController.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity; -import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.DeviceCollectOrderResponse; -import com.glxp.api.admin.service.inventory.DeviceCollectOrderService; +import com.glxp.api.entity.inventory.DeviceCollectOrderEntity; +import com.glxp.api.req.inventory.FilterDeviceCollectOrderRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.DeviceCollectOrderResponse; +import com.glxp.api.service.inventory.DeviceCollectOrderService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java b/src/main/java/com/glxp/api/controller/inventory/DeviceMAOrderController.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java rename to src/main/java/com/glxp/api/controller/inventory/DeviceMAOrderController.java index f20931b4..454ae2d6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java +++ b/src/main/java/com/glxp/api/controller/inventory/DeviceMAOrderController.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; -import com.glxp.api.admin.req.inventory.AddDeviceMAOrderRequest; -import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.inventory.DeviceMAOrderService; +import com.glxp.api.entity.inventory.DeviceMAOrderEntity; +import com.glxp.api.req.inventory.AddDeviceMAOrderRequest; +import com.glxp.api.req.inventory.FilterDeviceMAOrderRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.inventory.DeviceMAOrderService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java b/src/main/java/com/glxp/api/controller/inventory/DeviceMAOrderDetailCotroller.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java rename to src/main/java/com/glxp/api/controller/inventory/DeviceMAOrderDetailCotroller.java index a7d62a83..5d1105db 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java +++ b/src/main/java/com/glxp/api/controller/inventory/DeviceMAOrderDetailCotroller.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; -import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse; -import com.glxp.api.admin.service.inventory.DeviceMAOrderDetailService; +import com.glxp.api.entity.inventory.DeviceMAOrderDetailEntity; +import com.glxp.api.req.inventory.FilterDeviceMAOrderDetailRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.DeviceMAOrderDetailResponse; +import com.glxp.api.service.inventory.DeviceMAOrderDetailService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InCodeLogController.java b/src/main/java/com/glxp/api/controller/inventory/InCodeLogController.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InCodeLogController.java rename to src/main/java/com/glxp/api/controller/inventory/InCodeLogController.java index 32ed121a..f93f79fd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InCodeLogController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InCodeLogController.java @@ -1,15 +1,14 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inventory.InCodeLogEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.FilterInCodeLogRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.IncodeSysParmsResponse; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inventory.InCodeLogService; -import com.glxp.api.admin.service.inventory.InvStockPrintService; +import com.glxp.api.entity.inventory.InCodeLogEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.FilterInCodeLogRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.IncodeSysParmsResponse; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inventory.InCodeLogService; +import com.glxp.api.service.inventory.InvStockPrintService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InnerOrderController.java b/src/main/java/com/glxp/api/controller/inventory/InnerOrderController.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InnerOrderController.java rename to src/main/java/com/glxp/api/controller/inventory/InnerOrderController.java index 33d87f4c..658abfc7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InnerOrderController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InnerOrderController.java @@ -1,22 +1,22 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.annotation.RepeatSubmit; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity; -import com.glxp.api.admin.entity.inventory.InnerOrderEntity; -import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest; -import com.glxp.api.admin.req.inventory.InnerOrderRequest; -import com.glxp.api.admin.req.inventory.PostInnerOrderRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.inventory.InnerOrderDetailService; -import com.glxp.api.admin.service.inventory.InnerOrderService; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.OrderNoTypeBean; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.RepeatSubmit; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.inventory.InnerOrderDetailEntity; +import com.glxp.api.entity.inventory.InnerOrderEntity; +import com.glxp.api.req.inventory.InnerOrderDetailRequest; +import com.glxp.api.req.inventory.InnerOrderRequest; +import com.glxp.api.req.inventory.PostInnerOrderRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.inventory.InnerOrderDetailService; +import com.glxp.api.service.inventory.InnerOrderService; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java b/src/main/java/com/glxp/api/controller/inventory/InvBusUserController.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java rename to src/main/java/com/glxp/api/controller/inventory/InvBusUserController.java index b28a4feb..38e5efbc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvBusUserController.java @@ -1,20 +1,20 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; -import com.glxp.api.admin.entity.inventory.InvBusUserEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; -import com.glxp.api.admin.req.inventory.UpdateRelBusRequset; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService; -import com.glxp.api.admin.service.inventory.InvBusUserService; -import com.glxp.api.admin.service.inventory.InvSubWarehouseService; -import com.glxp.api.admin.service.inventory.InvWarehouseService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.api.entity.inventory.InvBusUserEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.FilterInvBusUserRequest; +import com.glxp.api.req.inventory.UpdateRelBusRequset; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.inout.WarehouseBussinessTypeService; +import com.glxp.api.service.inventory.InvBusUserService; +import com.glxp.api.service.inventory.InvSubWarehouseService; +import com.glxp.api.service.inventory.InvWarehouseService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCheckController.java b/src/main/java/com/glxp/api/controller/inventory/InvCheckController.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCheckController.java rename to src/main/java/com/glxp/api/controller/inventory/InvCheckController.java index c1ddacb7..6a00ed13 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCheckController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvCheckController.java @@ -1,20 +1,20 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.StockCheckEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inout.FilterStockCheckRequest; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.inout.OrderDetailService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.inventory.InvOrderCheckService; -import com.glxp.api.admin.thread.InvImportStockService; -import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.StockCheckEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inout.FilterStockCheckRequest; +import com.glxp.api.req.inout.OrderFilterRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.inout.OrderDetailService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.inventory.InvOrderCheckService; +import com.glxp.api.thread.InvImportStockService; +import com.glxp.api.util.DateUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountCodesController.java b/src/main/java/com/glxp/api/controller/inventory/InvCountCodesController.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountCodesController.java rename to src/main/java/com/glxp/api/controller/inventory/InvCountCodesController.java index 3183f287..fa1abbba 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountCodesController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvCountCodesController.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.inventory.InvCountCodes; -import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.inventory.InvCountCodesService; +import com.glxp.api.entity.inventory.InvCountCodes; +import com.glxp.api.req.inventory.FilterInvCountCodesRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.inventory.InvCountCodesService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderController.java b/src/main/java/com/glxp/api/controller/inventory/InvCountOrderController.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderController.java rename to src/main/java/com/glxp/api/controller/inventory/InvCountOrderController.java index 2a85a0e9..3e2b3832 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvCountOrderController.java @@ -1,23 +1,23 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.info.SystemPDFModuleEntity; -import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity; -import com.glxp.api.admin.entity.inventory.InvCountOrder; -import com.glxp.api.admin.req.info.SystemPDFModuleRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest; -import com.glxp.api.admin.req.inventory.FilterInvCountOrderSaveRequest; -import com.glxp.api.admin.req.inventory.InvCountOrderPrintRequest; -import com.glxp.api.admin.req.itextpdf.InspectionPDFTemplateRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.InvCountOrderResponse; -import com.glxp.api.admin.service.info.SystemPDFModuleService; -import com.glxp.api.admin.service.info.SystemPDFTemplateService; -import com.glxp.api.admin.service.inventory.InvCountOrderService; -import com.glxp.api.admin.util.JasperUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.info.SystemPDFModuleEntity; +import com.glxp.api.entity.info.SystemPDFTemplateEntity; +import com.glxp.api.entity.inventory.InvCountOrder; +import com.glxp.api.req.info.SystemPDFModuleRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.FilterInvCountOrderRequest; +import com.glxp.api.req.inventory.FilterInvCountOrderSaveRequest; +import com.glxp.api.req.inventory.InvCountOrderPrintRequest; +import com.glxp.api.req.itextpdf.InspectionPDFTemplateRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.InvCountOrderResponse; +import com.glxp.api.service.info.SystemPDFModuleService; +import com.glxp.api.service.info.SystemPDFTemplateService; +import com.glxp.api.service.inventory.InvCountOrderService; +import com.glxp.api.util.JasperUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderDetailController.java b/src/main/java/com/glxp/api/controller/inventory/InvCountOrderDetailController.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderDetailController.java rename to src/main/java/com/glxp/api/controller/inventory/InvCountOrderDetailController.java index e091bc51..73f940df 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvCountOrderDetailController.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.inventory.InvCountOrderDetail; -import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse; -import com.glxp.api.admin.service.inventory.InvCountOrderDetailService; +import com.glxp.api.entity.inventory.InvCountOrderDetail; +import com.glxp.api.req.inventory.FilterInvCountOrderDetailRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.InvCountOrderDetailResponse; +import com.glxp.api.service.inventory.InvCountOrderDetailService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountSettingController.java b/src/main/java/com/glxp/api/controller/inventory/InvCountSettingController.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountSettingController.java rename to src/main/java/com/glxp/api/controller/inventory/InvCountSettingController.java index 8b0bef2d..09557eaf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountSettingController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvCountSettingController.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.inventory.InvCountSettingEntity; -import com.glxp.api.admin.req.inventory.FilterInvCountSettingRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.InvCountSettingResponse; -import com.glxp.api.admin.service.inventory.InvCountSettingService; +import com.glxp.api.entity.inventory.InvCountSettingEntity; +import com.glxp.api.req.inventory.FilterInvCountSettingRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.InvCountSettingResponse; +import com.glxp.api.service.inventory.InvCountSettingService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java b/src/main/java/com/glxp/api/controller/inventory/InvErpOnhandController.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java rename to src/main/java/com/glxp/api/controller/inventory/InvErpOnhandController.java index e41d67c4..e3b22756 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvErpOnhandController.java @@ -1,26 +1,25 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; -import com.glxp.api.admin.httpclient.ErpInvClient; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.inventory.ErpOnhandRequest; -import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpProductsResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.inventory.ErpInvProductResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.thrsys.ThrInvProductsService; -import com.glxp.api.admin.util.FilterUdiUtils; -import com.glxp.api.admin.util.HttpOkClient; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.httpclient.ErpInvClient; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.inventory.ErpOnhandRequest; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.inventory.ErpInvProductResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.thrsys.ThrInvProductsService; +import com.glxp.api.util.FilterUdiUtils; +import com.glxp.api.util.HttpOkClient; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderController.java b/src/main/java/com/glxp/api/controller/inventory/InvMAOrderController.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderController.java rename to src/main/java/com/glxp/api/controller/inventory/InvMAOrderController.java index 2c9c282c..e94ab2f4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvMAOrderController.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderEntity; -import com.glxp.api.admin.req.inventory.FilterInvMAOrderRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.InvMAOrderResponse; -import com.glxp.api.admin.service.inventory.InvMAOrderService; +import com.glxp.api.entity.inventory.InvMaintenanceOrderEntity; +import com.glxp.api.req.inventory.FilterInvMAOrderRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.InvMAOrderResponse; +import com.glxp.api.service.inventory.InvMAOrderService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderDetailController.java b/src/main/java/com/glxp/api/controller/inventory/InvMAOrderDetailController.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderDetailController.java rename to src/main/java/com/glxp/api/controller/inventory/InvMAOrderDetailController.java index 6be0d63d..bae4311b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvMAOrderDetailController.java @@ -1,15 +1,15 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderDetailEntity; -import com.glxp.api.admin.req.inventory.AddMAOrderDetailRequest; -import com.glxp.api.admin.req.inventory.FilterInvMAOrderDetailRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.InvMAOrderDetailResponse; -import com.glxp.api.admin.service.inventory.InvMAOrderDetailService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.inventory.InvMaintenanceOrderDetailEntity; +import com.glxp.api.req.inventory.AddMAOrderDetailRequest; +import com.glxp.api.req.inventory.FilterInvMAOrderDetailRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.InvMAOrderDetailResponse; +import com.glxp.api.service.inventory.InvMAOrderDetailService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java b/src/main/java/com/glxp/api/controller/inventory/InvPreInProductsController.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java rename to src/main/java/com/glxp/api/controller/inventory/InvPreInProductsController.java index 64d787f0..000148a7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvPreInProductsController.java @@ -1,24 +1,24 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.InvProductDetailResponse; -import com.glxp.api.admin.res.inventory.InvProductPageRespnonse; -import com.glxp.api.admin.res.inventory.InvProductResponse; -import com.glxp.api.admin.res.inventory.InvProductStatResponse; -import com.glxp.api.admin.service.inventory.InvPreInProductDetailService; -import com.glxp.api.admin.service.inventory.InvPreInProductService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.InvProductDetailResponse; +import com.glxp.api.res.inventory.InvProductPageRespnonse; +import com.glxp.api.res.inventory.InvProductResponse; +import com.glxp.api.res.inventory.InvProductStatResponse; +import com.glxp.api.service.inventory.InvPreInProductDetailService; +import com.glxp.api.service.inventory.InvPreInProductService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreProductsController.java b/src/main/java/com/glxp/api/controller/inventory/InvPreProductsController.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreProductsController.java rename to src/main/java/com/glxp/api/controller/inventory/InvPreProductsController.java index ce0323b7..132a2bf6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreProductsController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvPreProductsController.java @@ -1,24 +1,23 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.entity.info.CompanyEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.InvProductDetailResponse; -import com.glxp.api.admin.res.inventory.InvProductPageRespnonse; -import com.glxp.api.admin.res.inventory.InvProductResponse; -import com.glxp.api.admin.res.inventory.InvProductStatResponse; -import com.glxp.api.admin.service.info.CompanyService; -import com.glxp.api.admin.service.inventory.InvPreProductDetailService; -import com.glxp.api.admin.service.inventory.InvPreProductService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.InvProductDetailResponse; +import com.glxp.api.res.inventory.InvProductPageRespnonse; +import com.glxp.api.res.inventory.InvProductResponse; +import com.glxp.api.res.inventory.InvProductStatResponse; +import com.glxp.api.service.info.CompanyService; +import com.glxp.api.service.inventory.InvPreProductDetailService; +import com.glxp.api.service.inventory.InvPreProductService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java b/src/main/java/com/glxp/api/controller/inventory/InvPrintController.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java rename to src/main/java/com/glxp/api/controller/inventory/InvPrintController.java index 7f3f1fb2..4ed01e95 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvPrintController.java @@ -1,33 +1,33 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.IncodeStatus; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inventory.InCodeLogEntity; -import com.glxp.api.admin.httpclient.ErpInvClient; -import com.glxp.api.admin.req.inventory.ErpOnhandRequest; -import com.glxp.api.admin.entity.inventory.StockPrintEntity; -import com.glxp.api.admin.req.basic.FilterStockprintRequest; -import com.glxp.api.admin.req.basic.UpdatePrintStatusRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.PostStockPrintRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.ErpInvProductResponse; -import com.glxp.api.admin.res.inventory.ErpOnHandResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.inventory.InCodeLogService; -import com.glxp.api.admin.service.inventory.InvStockPrintService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.thread.InvImportStockService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.constant.IncodeStatus; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inventory.InCodeLogEntity; +import com.glxp.api.entity.inventory.StockPrintEntity; +import com.glxp.api.httpclient.ErpInvClient; +import com.glxp.api.req.basic.FilterStockprintRequest; +import com.glxp.api.req.basic.UpdatePrintStatusRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.ErpOnhandRequest; +import com.glxp.api.req.inventory.PostStockPrintRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.ErpInvProductResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inventory.InCodeLogService; +import com.glxp.api.service.inventory.InvStockPrintService; +import com.glxp.api.thread.InvImportStockService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.sql.Date; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java b/src/main/java/com/glxp/api/controller/inventory/InvProductsController.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java rename to src/main/java/com/glxp/api/controller/inventory/InvProductsController.java index 1cced17a..6eaa0abe 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvProductsController.java @@ -1,30 +1,30 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseUserEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.*; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.inventory.*; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.inout.WarehouseUserService; -import com.glxp.api.admin.service.inventory.InvProductDetailService; -import com.glxp.api.admin.service.inventory.InvProductService; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseUserEntity; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.*; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.inventory.*; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.UdiInfoService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.inout.WarehouseUserService; +import com.glxp.api.service.inventory.InvProductDetailService; +import com.glxp.api.service.inventory.InvProductService; +import com.glxp.api.util.FilterUdiUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSickTraceController.java b/src/main/java/com/glxp/api/controller/inventory/InvSickTraceController.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSickTraceController.java rename to src/main/java/com/glxp/api/controller/inventory/InvSickTraceController.java index c99b6bba..3c97e680 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSickTraceController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvSickTraceController.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.req.inventory.FilterSickTraceRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.req.inout.OrderFilterRequest; +import com.glxp.api.req.inventory.FilterSickTraceRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.inout.OrderService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java b/src/main/java/com/glxp/api/controller/inventory/InvSpaceController.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java rename to src/main/java/com/glxp/api/controller/inventory/InvSpaceController.java index 74010160..38347c68 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvSpaceController.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.business.InvSpace; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.FilterInvSpaceRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.InvSpaceResponse; -import com.glxp.api.admin.service.inventory.InvSpaceService; +import com.glxp.api.entity.business.InvSpace; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.FilterInvSpaceRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.InvSpaceResponse; +import com.glxp.api.service.inventory.InvSpaceService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/src/main/java/com/glxp/api/controller/inventory/InvSubWarehouseController.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java rename to src/main/java/com/glxp/api/controller/inventory/InvSubWarehouseController.java index ffa4add1..d85b0c5b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvSubWarehouseController.java @@ -1,31 +1,31 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.business.InvSpace; -import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.FilterInvSubWarehouseRequest; -import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.InvSubWarehouseResponse; -import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService; -import com.glxp.api.admin.service.inout.WarehouseUserService; -import com.glxp.api.admin.service.inventory.InvProductService; -import com.glxp.api.admin.service.inventory.InvSpaceService; -import com.glxp.api.admin.service.inventory.InvSubWarehouseService; -import com.glxp.api.admin.service.inventory.InvWarehouseService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.business.InvSpace; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.FilterInvSubWarehouseRequest; +import com.glxp.api.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.InvSubWarehouseResponse; +import com.glxp.api.res.inventory.InvWarehouseThirdSysResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.WarehouseBussinessTypeService; +import com.glxp.api.service.inout.WarehouseUserService; +import com.glxp.api.service.inventory.InvProductService; +import com.glxp.api.service.inventory.InvSpaceService; +import com.glxp.api.service.inventory.InvSubWarehouseService; +import com.glxp.api.service.inventory.InvWarehouseService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/inventory/InvWarehouseController.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java rename to src/main/java/com/glxp/api/controller/inventory/InvWarehouseController.java index 2cc2ce80..fc7e8d5e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvWarehouseController.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.controller.inventory; +package com.glxp.api.controller.inventory; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; @@ -7,36 +7,36 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.basic.BasicExportStatusEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity; -import com.glxp.api.admin.req.basic.BasicExportStatusRequest; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.api.admin.req.thrsys.FilterThrSubInvWarehouseRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.InvWarehouseExportResponse; -import com.glxp.api.admin.res.inventory.InvWarehouseResponse; -import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.basic.BasicExportService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inventory.InvProductDetailService; -import com.glxp.api.admin.service.inventory.InvSubWarehouseService; -import com.glxp.api.admin.service.inventory.InvWarehouseService; -import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService; -import com.glxp.api.admin.service.thrsys.ThrSubInvWarehouseService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.FileUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.basic.BasicExportStatusEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.api.entity.thrsys.ThrSubInvWarehouseEntity; +import com.glxp.api.req.basic.BasicExportStatusRequest; +import com.glxp.api.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.InvWarehouseExportResponse; +import com.glxp.api.res.inventory.InvWarehouseResponse; +import com.glxp.api.res.inventory.InvWarehouseThirdSysResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.BasicExportService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inventory.InvProductDetailService; +import com.glxp.api.service.inventory.InvSubWarehouseService; +import com.glxp.api.service.inventory.InvWarehouseService; +import com.glxp.api.service.thrsys.ThrInvWarehouseService; +import com.glxp.api.service.thrsys.ThrSubInvWarehouseService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.FileUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/itextpdf/PDFDawnloadController.java b/src/main/java/com/glxp/api/controller/itextpdf/PDFDawnloadController.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/controller/itextpdf/PDFDawnloadController.java rename to src/main/java/com/glxp/api/controller/itextpdf/PDFDawnloadController.java index 0d208b26..bfd8645c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/itextpdf/PDFDawnloadController.java +++ b/src/main/java/com/glxp/api/controller/itextpdf/PDFDawnloadController.java @@ -1,25 +1,25 @@ -package com.glxp.api.admin.controller.itextpdf; +package com.glxp.api.controller.itextpdf; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.info.SystemPDFModuleEntity; -import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity; -import com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.req.info.SystemPDFTemplateRequest; -import com.glxp.api.admin.req.itextpdf.InoutOrderDetailPDFCodeRequest; -import com.glxp.api.admin.req.itextpdf.InoutOrderDetailPDFFileRequest; -import com.glxp.api.admin.req.itextpdf.InspectionPDFTemplateRequest; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.info.SystemPDFModuleService; -import com.glxp.api.admin.service.info.SystemPDFTemplateRelevanceService; -import com.glxp.api.admin.service.info.SystemPDFTemplateService; -import com.glxp.api.admin.service.inout.OrderDetailService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.util.ITextPDFUtils; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.info.SystemPDFModuleEntity; +import com.glxp.api.entity.info.SystemPDFTemplateEntity; +import com.glxp.api.entity.info.SystemPDFTemplateRelevanceEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.req.info.SystemPDFTemplateRequest; +import com.glxp.api.req.itextpdf.InoutOrderDetailPDFCodeRequest; +import com.glxp.api.req.itextpdf.InoutOrderDetailPDFFileRequest; +import com.glxp.api.req.itextpdf.InspectionPDFTemplateRequest; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.info.SystemPDFModuleService; +import com.glxp.api.service.info.SystemPDFTemplateRelevanceService; +import com.glxp.api.service.info.SystemPDFTemplateService; +import com.glxp.api.service.inout.OrderDetailService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.util.ITextPDFUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/monitor/SysLogininforController.java b/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/controller/monitor/SysLogininforController.java rename to src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java index 7cdc7838..07a298ff 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/monitor/SysLogininforController.java +++ b/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.controller.monitor; +package com.glxp.api.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.Log; -import com.glxp.api.admin.constant.BusinessType; -import com.glxp.api.admin.controller.BaseController; -import com.glxp.api.admin.entity.monitor.SysLogininfor; -import com.glxp.api.admin.req.monitor.SysLogininforRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.monitor.ISysLogininforService; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.monitor.SysLogininfor; +import com.glxp.api.req.monitor.SysLogininforRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.monitor.ISysLogininforService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/monitor/SysOperlogController.java b/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/controller/monitor/SysOperlogController.java rename to src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java index fa107d3d..67fac6b9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/monitor/SysOperlogController.java +++ b/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java @@ -1,15 +1,14 @@ -package com.glxp.api.admin.controller.monitor; +package com.glxp.api.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.Log; -import com.glxp.api.admin.constant.BusinessType; -import com.glxp.api.admin.controller.BaseController; -import com.glxp.api.admin.entity.info.DeviceKeyEntity; -import com.glxp.api.admin.entity.monitor.SysOperLog; -import com.glxp.api.admin.req.monitor.SysOperLogRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.monitor.ISysOperLogService; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.monitor.SysOperLog; +import com.glxp.api.req.monitor.SysOperLogRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.monitor.ISysOperLogService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java rename to src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 371867f1..6c306261 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -1,34 +1,31 @@ -package com.glxp.api.admin.controller.purchase; +package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.annotation.RepeatSubmit; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyEntity; -import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.admin.entity.purchase.PurPlanEntity; -import com.glxp.api.admin.req.purchase.PostPurApplyRequest; -import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; -import com.glxp.api.admin.req.purchase.PurApplyRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.purchase.PurApplyResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.purchase.IPurApplyDetailService; -import com.glxp.api.admin.service.purchase.IPurApplyService; -import com.glxp.api.admin.service.purchase.IPurPlanDetailService; -import com.glxp.api.admin.service.purchase.IPurPlanService; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.MyStrUtil; -import com.glxp.api.admin.util.OrderNoTypeBean; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.RepeatSubmit; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.entity.purchase.PurApplyEntity; +import com.glxp.api.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.entity.purchase.PurPlanEntity; +import com.glxp.api.req.purchase.PostPurApplyRequest; +import com.glxp.api.req.purchase.PurApplyDetailRequest; +import com.glxp.api.req.purchase.PurApplyRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.purchase.PurApplyResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.purchase.IPurApplyDetailService; +import com.glxp.api.service.purchase.IPurApplyService; +import com.glxp.api.service.purchase.IPurPlanDetailService; +import com.glxp.api.service.purchase.IPurPlanService; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java rename to src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index abe8d12e..f23415a0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -1,36 +1,34 @@ -package com.glxp.api.admin.controller.purchase; +package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.annotation.RepeatSubmit; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.admin.entity.purchase.PurPlanEntity; -import com.glxp.api.admin.req.purchase.PostPurPlanRequest; -import com.glxp.api.admin.req.purchase.PurPlanDetailRequest; -import com.glxp.api.admin.req.purchase.PurPlanRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.purchase.PurPlanResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.basic.BasicBusTypeChangeService; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.basic.BussinessLocalTypeService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.business.StockOrderDetailService; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.purchase.IPurPlanDetailService; -import com.glxp.api.admin.service.purchase.IPurPlanService; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.OrderNoTypeBean; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.RepeatSubmit; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.entity.purchase.PurPlanEntity; +import com.glxp.api.req.purchase.PostPurPlanRequest; +import com.glxp.api.req.purchase.PurPlanDetailRequest; +import com.glxp.api.req.purchase.PurPlanRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.purchase.PurPlanResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.BasicBusTypeChangeService; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.business.StockOrderDetailService; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.purchase.IPurPlanDetailService; +import com.glxp.api.service.purchase.IPurPlanService; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertController.java rename to src/main/java/com/glxp/api/controller/purchase/SupCertController.java index abb2316e..381e5bef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -1,25 +1,24 @@ -package com.glxp.api.admin.controller.purchase; +package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.purchase.*; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.req.info.CompanyRequest; -import com.glxp.api.admin.req.info.DeleteCompanyFileRequest; -import com.glxp.api.admin.req.purchase.FilterSupCertRequest; -import com.glxp.api.admin.req.purchase.PostSelCertRequest; -import com.glxp.api.admin.req.purchase.PostSupCertRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.purchase.SupProductResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.purchase.SupCertService; -import com.glxp.api.admin.service.purchase.SupCompanyService; -import com.glxp.api.admin.service.purchase.SupManufacturerService; -import com.glxp.api.admin.service.purchase.SupProductService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.purchase.*; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.info.DeleteCompanyFileRequest; +import com.glxp.api.req.purchase.FilterSupCertRequest; +import com.glxp.api.req.purchase.PostSelCertRequest; +import com.glxp.api.req.purchase.PostSupCertRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.purchase.SupProductResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.purchase.SupCertService; +import com.glxp.api.service.purchase.SupCompanyService; +import com.glxp.api.service.purchase.SupManufacturerService; +import com.glxp.api.service.purchase.SupProductService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertSetController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertSetController.java rename to src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java index f7225922..afac7ccd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertSetController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.controller.purchase; +package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.purchase.SupCertSetEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.purchase.SupCertSetService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.purchase.SupCertSetEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.purchase.FilterCertSetsRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.purchase.SupCertSetService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java rename to src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index e536bac5..4b491c8a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -1,31 +1,31 @@ -package com.glxp.api.admin.controller.purchase; +package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.pinyin.PinyinUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.purchase.CustomerContactEntity; -import com.glxp.api.admin.entity.purchase.SupCertEntity; -import com.glxp.api.admin.entity.purchase.SupCertSetEntity; -import com.glxp.api.admin.entity.purchase.SupCompanyEntity; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; -import com.glxp.api.admin.req.purchase.FilterSupCertRequest; -import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest; -import com.glxp.api.admin.req.purchase.SelectCorpBindRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.purchase.SupCertService; -import com.glxp.api.admin.service.purchase.CustomerContactService; -import com.glxp.api.admin.service.purchase.SupCertSetService; -import com.glxp.api.admin.service.purchase.SupCompanyService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.purchase.CustomerContactEntity; +import com.glxp.api.entity.purchase.SupCertEntity; +import com.glxp.api.entity.purchase.SupCertSetEntity; +import com.glxp.api.entity.purchase.SupCompanyEntity; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.purchase.FilterCertSetsRequest; +import com.glxp.api.req.purchase.FilterSupCertRequest; +import com.glxp.api.req.purchase.FilterSupCompanyRequest; +import com.glxp.api.req.purchase.SelectCorpBindRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.purchase.CustomerContactService; +import com.glxp.api.service.purchase.SupCertService; +import com.glxp.api.service.purchase.SupCertSetService; +import com.glxp.api.service.purchase.SupCompanyService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupContactController.java b/src/main/java/com/glxp/api/controller/purchase/SupContactController.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupContactController.java rename to src/main/java/com/glxp/api/controller/purchase/SupContactController.java index e1754c63..5eb20622 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupContactController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupContactController.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.controller.purchase; +package com.glxp.api.controller.purchase; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.purchase.CustomerContactEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.purchase.CustomerContactFilterRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.purchase.CustomerContactService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.purchase.CustomerContactEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.purchase.CustomerContactFilterRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.purchase.CustomerContactService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupManufacturerController.java rename to src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index 47e17a1e..bf8fade4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -1,27 +1,27 @@ -package com.glxp.api.admin.controller.purchase; +package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.purchase.SupCertEntity; -import com.glxp.api.admin.entity.purchase.SupCertSetEntity; -import com.glxp.api.admin.entity.purchase.SupCompanyEntity; -import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; -import com.glxp.api.admin.req.purchase.FilterSupCertRequest; -import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.info.CompanyService; -import com.glxp.api.admin.service.purchase.SupCertService; -import com.glxp.api.admin.service.purchase.SupCertSetService; -import com.glxp.api.admin.service.purchase.SupCompanyService; -import com.glxp.api.admin.service.purchase.SupManufacturerService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.purchase.SupCertEntity; +import com.glxp.api.entity.purchase.SupCertSetEntity; +import com.glxp.api.entity.purchase.SupCompanyEntity; +import com.glxp.api.entity.purchase.SupManufacturerEntity; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.purchase.FilterCertSetsRequest; +import com.glxp.api.req.purchase.FilterSupCertRequest; +import com.glxp.api.req.purchase.FilterSupManufacturerRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.info.CompanyService; +import com.glxp.api.service.purchase.SupCertService; +import com.glxp.api.service.purchase.SupCertSetService; +import com.glxp.api.service.purchase.SupCompanyService; +import com.glxp.api.service.purchase.SupManufacturerService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupProductController.java rename to src/main/java/com/glxp/api/controller/purchase/SupProductController.java index 9e554444..aed7708a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -1,43 +1,35 @@ -package com.glxp.api.admin.controller.purchase; +package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.entity.purchase.SupCertEntity; -import com.glxp.api.admin.entity.purchase.SupCertSetEntity; -import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; -import com.glxp.api.admin.entity.purchase.SupProductEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.req.info.DeleteCompanyFileRequest; -import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; -import com.glxp.api.admin.req.purchase.FilterPoductRequest; -import com.glxp.api.admin.req.purchase.FilterSupCertRequest; -import com.glxp.api.admin.req.purchase.SelectProductBindRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.purchase.SupProductResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.info.CompanyProductRelevanceService; -import com.glxp.api.admin.service.purchase.SupCertService; -import com.glxp.api.admin.service.purchase.SupCertSetService; -import com.glxp.api.admin.service.purchase.SupManufacturerService; -import com.glxp.api.admin.service.purchase.SupProductService; -import com.glxp.api.admin.service.thrsys.ThrProductsService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.UdiInfoUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.purchase.SupCertEntity; +import com.glxp.api.entity.purchase.SupCertSetEntity; +import com.glxp.api.entity.purchase.SupManufacturerEntity; +import com.glxp.api.entity.purchase.SupProductEntity; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.info.DeleteCompanyFileRequest; +import com.glxp.api.req.purchase.FilterCertSetsRequest; +import com.glxp.api.req.purchase.FilterPoductRequest; +import com.glxp.api.req.purchase.FilterSupCertRequest; +import com.glxp.api.req.purchase.SelectProductBindRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.purchase.SupProductResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.service.basic.UdiInfoService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.info.CompanyProductRelevanceService; +import com.glxp.api.service.purchase.SupCertService; +import com.glxp.api.service.purchase.SupCertSetService; +import com.glxp.api.service.purchase.SupManufacturerService; +import com.glxp.api.service.purchase.SupProductService; +import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupSalesmanController.java b/src/main/java/com/glxp/api/controller/purchase/SupSalesmanController.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupSalesmanController.java rename to src/main/java/com/glxp/api/controller/purchase/SupSalesmanController.java index 41a79b37..e9c5f549 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupSalesmanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupSalesmanController.java @@ -1,16 +1,16 @@ -package com.glxp.api.admin.controller.purchase; +package com.glxp.api.controller.purchase; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.purchase.CompanySalesmanEntity; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.req.info.CompanyRequest; -import com.glxp.api.admin.req.info.DeleteCompanyFileRequest; -import com.glxp.api.admin.req.purchase.FilterCompanySalesmanRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.purchase.CompanySalesmanService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.purchase.CompanySalesmanEntity; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.info.CompanyRequest; +import com.glxp.api.req.info.DeleteCompanyFileRequest; +import com.glxp.api.req.purchase.FilterCompanySalesmanRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.purchase.CompanySalesmanService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/src/main/java/com/glxp/api/controller/scdemon/ScdemonController.java b/src/main/java/com/glxp/api/controller/scdemon/ScdemonController.java new file mode 100644 index 00000000..c6046d1b --- /dev/null +++ b/src/main/java/com/glxp/api/controller/scdemon/ScdemonController.java @@ -0,0 +1,4 @@ +package com.glxp.api.controller.scdemon; + +public class ScdemonController { +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpExportLogController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java index 4273a269..e3580e41 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java @@ -1,23 +1,22 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.thrsys.*; -import com.glxp.api.admin.entity.thrsys.ThrCorpExportLogEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.thrsys.*; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpUnitsResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.thrsys.ThrCorpExportLogService; -import com.glxp.api.admin.service.thrsys.ThrCorpService; -import com.glxp.api.admin.thread.ThrCorpsDlService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.thrsys.*; +import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.thrsys.*; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.ErpUnitsResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.thrsys.ThrCorpExportLogService; +import com.glxp.api.service.thrsys.ThrCorpService; +import com.glxp.api.thread.ThrCorpsDlService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpImportLogController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java index 516c0e72..145d9911 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java @@ -1,14 +1,13 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.thrsys.ThrCorpImportDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.thrsys.ThrCorpImportDetailService; -import com.glxp.api.admin.service.thrsys.ThrCorpImportLogService; +import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; +import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.thrsys.ThrCorpImportDetailService; +import com.glxp.api.service.thrsys.ThrCorpImportLogService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java index b4d2c7bf..08a3cca6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java @@ -1,21 +1,21 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.thrsys.*; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; -import com.glxp.api.admin.req.thrsys.PostThrCorpRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpUnitsResponse; -import com.glxp.api.admin.service.thrsys.ThrCorpImportLogService; -import com.glxp.api.admin.service.thrsys.ThrCorpService; -import com.glxp.api.admin.thread.ThrCorpsDlService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.thrsys.*; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.req.thrsys.PostThrCorpRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.ErpUnitsResponse; +import com.glxp.api.service.thrsys.ThrCorpImportLogService; +import com.glxp.api.service.thrsys.ThrCorpService; +import com.glxp.api.thread.ThrCorpsDlService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java index 257a307c..a3168f20 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java @@ -1,21 +1,21 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportLogEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.ErpOnhandRequest; -import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; -import com.glxp.api.admin.req.thrsys.PostThrInvProductsRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.ErpInvProductResponse; -import com.glxp.api.admin.service.thrsys.ThrInvProductsImportLogService; -import com.glxp.api.admin.service.thrsys.ThrInvProductsService; -import com.glxp.api.admin.thread.ThrInvProductsDlService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.ErpOnhandRequest; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.req.thrsys.PostThrInvProductsRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.ErpInvProductResponse; +import com.glxp.api.service.thrsys.ThrInvProductsImportLogService; +import com.glxp.api.service.thrsys.ThrInvProductsService; +import com.glxp.api.thread.ThrInvProductsDlService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsExportLogController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java index d8a63930..7d052476 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java @@ -1,23 +1,23 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsExportLogEntity; -import com.glxp.api.admin.httpclient.ErpInvClient; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.ErpOnhandRequest; -import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; -import com.glxp.api.admin.req.thrsys.ThrInvProductsExportRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.ErpInvProductResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.thrsys.ThrInvProductsExportLogService; -import com.glxp.api.admin.service.thrsys.ThrInvProductsService; -import com.glxp.api.admin.thread.ThrInvProductsDlService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity; +import com.glxp.api.httpclient.ErpInvClient; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inventory.ErpOnhandRequest; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.req.thrsys.ThrInvProductsExportRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.ErpInvProductResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.thrsys.ThrInvProductsExportLogService; +import com.glxp.api.service.thrsys.ThrInvProductsService; +import com.glxp.api.thread.ThrInvProductsDlService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsImportLogController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java index 02f83631..bb4b10ce 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java @@ -1,14 +1,13 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.thrsys.ThrCorpImportDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.thrsys.ThrInvProductsDetailService; -import com.glxp.api.admin.service.thrsys.ThrInvProductsImportLogService; +import com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity; +import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.thrsys.ThrInvProductsDetailService; +import com.glxp.api.service.thrsys.ThrInvProductsImportLogService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvWarehouseController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java index f6fb73d1..8f73bd5d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.dao.basic.BasicThirdSysDao; -import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService; +import com.glxp.api.dao.basic.BasicThirdSysDao; +import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.thrsys.FilterThrInvWarehouseRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.thrsys.ThrInvWarehouseService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java index 08b3b6af..d885d1cc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java @@ -1,31 +1,30 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.api.admin.entity.thrsys.*; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.thrsys.*; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inout.ErpOrderResponse; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.OrderDetailService; -import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; -import com.glxp.api.admin.service.thrsys.ThrOrderImportDetailService; -import com.glxp.api.admin.service.thrsys.ThrOrderImportLogService; -import com.glxp.api.admin.service.thrsys.ThrOrderService; -import com.glxp.api.admin.thread.ThrOrderImportService; -import com.glxp.api.admin.thread.ThrOrdersDlService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.HttpClient; -import com.glxp.api.admin.util.HttpOkClient; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; +import com.glxp.api.entity.thrsys.*; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.thrsys.*; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.ErpOrderResponse; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.OrderDetailService; +import com.glxp.api.service.thrsys.ThrOrderDetailService; +import com.glxp.api.service.thrsys.ThrOrderImportDetailService; +import com.glxp.api.service.thrsys.ThrOrderImportLogService; +import com.glxp.api.service.thrsys.ThrOrderService; +import com.glxp.api.thread.ThrOrderImportService; +import com.glxp.api.thread.ThrOrdersDlService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.HttpOkClient; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java index 3f2a1727..7a36ad8e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java @@ -1,26 +1,26 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderExportLogEntity; -import com.glxp.api.admin.httpclient.ErpOrderClient; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inout.FilterOrderRequest; -import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; -import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.admin.req.thrsys.ThrOrderExportRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inout.ErpOrderResponse; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; -import com.glxp.api.admin.service.thrsys.ThrOrderExportLogService; -import com.glxp.api.admin.service.thrsys.ThrOrderService; -import com.glxp.api.admin.thread.ThrOrdersDlService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.entity.thrsys.ThrOrderEntity; +import com.glxp.api.entity.thrsys.ThrOrderExportLogEntity; +import com.glxp.api.httpclient.ErpOrderClient; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.req.thrsys.ThrOrderExportRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.ErpOrderResponse; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.thrsys.ThrOrderDetailService; +import com.glxp.api.service.thrsys.ThrOrderExportLogService; +import com.glxp.api.service.thrsys.ThrOrderService; +import com.glxp.api.thread.ThrOrdersDlService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderImportLogController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java index c80dfd74..656e9340 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java @@ -1,19 +1,19 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.basic.*; -import com.glxp.api.admin.service.thrsys.ThrOrderImportDetailService; -import com.glxp.api.admin.service.thrsys.ThrOrderImportLogService; -import com.glxp.api.admin.thread.ThrOrderImportService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.thrsys.ThrOrderImportDetailEntity; +import com.glxp.api.entity.thrsys.ThrOrderImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.basic.*; +import com.glxp.api.service.thrsys.ThrOrderImportDetailService; +import com.glxp.api.service.thrsys.ThrOrderImportLogService; +import com.glxp.api.thread.ThrOrderImportService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderReceiveController.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrOrderReceiveController.java index e98caa44..5bbe7d51 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderReceiveController.java @@ -1,25 +1,25 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; //领用单 import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; -import com.glxp.api.admin.req.business.StockOrderPostRequest; -import com.glxp.api.admin.req.inout.FilterOrderRequest; -import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; -import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inout.ErpOrderResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; -import com.glxp.api.admin.service.thrsys.ThrOrderService; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.OrderNoTypeBean; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.entity.thrsys.ThrOrderEntity; +import com.glxp.api.req.business.StockOrderPostRequest; +import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.ErpOrderResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.thrsys.ThrOrderDetailService; +import com.glxp.api.service.thrsys.ThrOrderService; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index 04e55902..14789784 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -1,26 +1,26 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.req.thrsys.PostThrProductsRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpProductsResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService; -import com.glxp.api.admin.service.thrsys.ThrProductsService; -import com.glxp.api.admin.thread.ThrProductsDlService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.req.thrsys.PostThrProductsRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.ErpProductsResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.thrsys.ThrProductsImportLogService; +import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.thread.ThrProductsDlService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java index 5c45064c..269412ef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java @@ -1,23 +1,23 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.req.thrsys.ThrProductsExportRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpProductsResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.thrsys.ThrProductsExportLogService; -import com.glxp.api.admin.service.thrsys.ThrProductsService; -import com.glxp.api.admin.thread.ThrProductsDlService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.FilterErpGoodsRequest; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.req.thrsys.ThrProductsExportRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.ErpProductsResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.thrsys.ThrProductsExportLogService; +import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.thread.ThrProductsDlService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsImportLogController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java index 2b1722e8..ccc61244 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java @@ -1,15 +1,13 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.thrsys.ThrInvProductsImportLogService; -import com.glxp.api.admin.service.thrsys.ThrProductsImportDetailService; -import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService; +import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; +import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.thrsys.ThrProductsImportDetailService; +import com.glxp.api.service.thrsys.ThrProductsImportLogService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrScOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrScOrderController.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrScOrderController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrScOrderController.java index 0cffe36f..c3cb0e53 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrScOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrScOrderController.java @@ -1,22 +1,20 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.dao.basic.UdiRelevanceDao; -import com.glxp.api.admin.dao.basic.UnitMaintainDao; -import com.glxp.api.admin.dao.inventory.InvWarehouseDao; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.entity.thrsys.ThrPostOrderRequest; -import com.glxp.api.admin.req.inout.AddOrderRequest; -import com.glxp.api.admin.req.inout.PostOrderRequest; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; -import com.glxp.api.admin.service.basic.BussinessOriginTypeService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.basic.UnitMaintainService; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.dao.basic.UnitMaintainDao; +import com.glxp.api.dao.inventory.InvWarehouseDao; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.entity.thrsys.ThrPostOrderRequest; +import com.glxp.api.req.inout.PostOrderRequest; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.service.basic.BussinessOriginTypeService; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.util.FilterUdiUtils; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.PostMapping; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrSubInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrSubInvWarehouseController.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrSubInvWarehouseController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThrSubInvWarehouseController.java index d4def8f7..0537caf4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrSubInvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrSubInvWarehouseController.java @@ -1,16 +1,16 @@ -package com.glxp.api.admin.controller.thrsys; +package com.glxp.api.controller.thrsys; import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.thrsys.FilterThrSubInvWarehouseRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.thrsys.ThrSubInvWarehouseResponse; -import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService; -import com.glxp.api.admin.service.thrsys.ThrSubInvWarehouseService; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.api.entity.thrsys.ThrSubInvWarehouseEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.thrsys.ThrSubInvWarehouseResponse; +import com.glxp.api.service.thrsys.ThrInvWarehouseService; +import com.glxp.api.service.thrsys.ThrSubInvWarehouseService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthAdminDao.java rename to src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java index 23d3aaab..084fa54b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; -import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.req.auth.AuthAdminQueryRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthCheckDao.java b/src/main/java/com/glxp/api/dao/auth/AuthCheckDao.java similarity index 65% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthCheckDao.java rename to src/main/java/com/glxp/api/dao/auth/AuthCheckDao.java index 23b9a262..d4cbaf28 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthCheckDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthCheckDao.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.auth.AuthCheckEntity; -import com.glxp.api.admin.req.auth.AuthCheckRequest; +import com.glxp.api.entity.auth.AuthCheckEntity; +import com.glxp.api.req.auth.AuthCheckRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthLicenseDao.java b/src/main/java/com/glxp/api/dao/auth/AuthLicenseDao.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthLicenseDao.java rename to src/main/java/com/glxp/api/dao/auth/AuthLicenseDao.java index ee3386c0..c93de622 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthLicenseDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthLicenseDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.AuthLicense; +import com.glxp.api.entity.auth.AuthLicense; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthPermissionDao.java b/src/main/java/com/glxp/api/dao/auth/AuthPermissionDao.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthPermissionDao.java rename to src/main/java/com/glxp/api/dao/auth/AuthPermissionDao.java index c80f57eb..32c3349a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthPermissionDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthPermissionDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.AuthPermission; +import com.glxp.api.entity.auth.AuthPermission; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthPermissionRuleDao.java b/src/main/java/com/glxp/api/dao/auth/AuthPermissionRuleDao.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthPermissionRuleDao.java rename to src/main/java/com/glxp/api/dao/auth/AuthPermissionRuleDao.java index fc68a70c..202e6f6c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthPermissionRuleDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthPermissionRuleDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.AuthPermissionRule; +import com.glxp.api.entity.auth.AuthPermissionRule; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthRoleAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthRoleAdminDao.java rename to src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java index 1ccaacfc..37b9706e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthRoleAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.AuthRoleAdmin; +import com.glxp.api.entity.auth.AuthRoleAdmin; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthRoleDao.java b/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthRoleDao.java rename to src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java index c97683e3..3431488a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthRoleDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.req.auth.AuthRoleQueryRequest; -import com.glxp.api.admin.entity.auth.AuthRole; +import com.glxp.api.entity.auth.AuthRole; +import com.glxp.api.req.auth.AuthRoleQueryRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java b/src/main/java/com/glxp/api/dao/auth/DeptDao.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java rename to src/main/java/com/glxp/api/dao/auth/DeptDao.java index 578de075..30a088f8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.DeptEntity; -import com.glxp.api.admin.req.auth.FilterDeptRequest; +import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.req.auth.FilterDeptRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptHisStatusDao.java b/src/main/java/com/glxp/api/dao/auth/DeptHisStatusDao.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptHisStatusDao.java rename to src/main/java/com/glxp/api/dao/auth/DeptHisStatusDao.java index b852a3f3..53808a9d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptHisStatusDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptHisStatusDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.DeptHisStatusEntity; -import com.glxp.api.admin.req.auth.SysRoleMenuRequest; +import com.glxp.api.entity.auth.DeptHisStatusEntity; +import com.glxp.api.req.auth.SysRoleMenuRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptUserDao.java b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java similarity index 69% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptUserDao.java rename to src/main/java/com/glxp/api/dao/auth/DeptUserDao.java index 49538aed..5bac06db 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.DeptUserEntity; -import com.glxp.api.admin.req.auth.DeptUserReqeust; -import com.glxp.api.admin.res.auth.DeptUserResponse; +import com.glxp.api.entity.auth.DeptUserEntity; +import com.glxp.api.req.auth.DeptUserReqeust; +import com.glxp.api.res.auth.DeptUserResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeviceKeyDao.java b/src/main/java/com/glxp/api/dao/auth/DeviceKeyDao.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeviceKeyDao.java rename to src/main/java/com/glxp/api/dao/auth/DeviceKeyDao.java index b33ceed0..18d9cd6d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeviceKeyDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeviceKeyDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.info.DeviceKeyEntity; -import com.glxp.api.admin.req.info.FilterDeviceKeyRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.entity.info.DeviceKeyEntity; +import com.glxp.api.req.info.FilterDeviceKeyRequest; +import com.glxp.api.req.inout.DeleteRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysDictDataMapper.java b/src/main/java/com/glxp/api/dao/auth/SysDictDataMapper.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysDictDataMapper.java rename to src/main/java/com/glxp/api/dao/auth/SysDictDataMapper.java index b1439d6e..9b38d523 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysDictDataMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/SysDictDataMapper.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.SysDictData; -import com.glxp.api.admin.req.auth.SysDictDataRequest; +import com.glxp.api.entity.auth.SysDictData; +import com.glxp.api.req.auth.SysDictDataRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysDictTypeMapper.java b/src/main/java/com/glxp/api/dao/auth/SysDictTypeMapper.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysDictTypeMapper.java rename to src/main/java/com/glxp/api/dao/auth/SysDictTypeMapper.java index 6837ea4a..8c60ba49 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysDictTypeMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/SysDictTypeMapper.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.SysDictType; -import com.glxp.api.admin.req.auth.SysDictTypeRequest; +import com.glxp.api.entity.auth.SysDictType; +import com.glxp.api.req.auth.SysDictTypeRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysHisStatusDao.java b/src/main/java/com/glxp/api/dao/auth/SysHisStatusDao.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysHisStatusDao.java rename to src/main/java/com/glxp/api/dao/auth/SysHisStatusDao.java index bca3cec4..cb3996ca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysHisStatusDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysHisStatusDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.SysHisStatusEntity; -import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest; +import com.glxp.api.entity.auth.SysHisStatusEntity; +import com.glxp.api.req.auth.FilterSysHisStatusRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysMenuDao.java b/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysMenuDao.java rename to src/main/java/com/glxp/api/dao/auth/SysMenuDao.java index 36b93c35..9b93f1b7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysMenuDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.SysMenu; -import com.glxp.api.admin.req.auth.SysMenuRequest; +import com.glxp.api.entity.auth.SysMenu; +import com.glxp.api.req.auth.SysMenuRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysRoleMapper.java b/src/main/java/com/glxp/api/dao/auth/SysRoleMapper.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysRoleMapper.java rename to src/main/java/com/glxp/api/dao/auth/SysRoleMapper.java index ae67874b..d5a5c8c9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysRoleMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.SysRole; -import com.glxp.api.admin.req.auth.SysRoleRequest; +import com.glxp.api.entity.auth.SysRole; +import com.glxp.api.req.auth.SysRoleRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysRoleMenuMapper.java b/src/main/java/com/glxp/api/dao/auth/SysRoleMenuMapper.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysRoleMenuMapper.java rename to src/main/java/com/glxp/api/dao/auth/SysRoleMenuMapper.java index 6b85ba8b..239e2aed 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysRoleMenuMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.SysRoleMenu; -import com.glxp.api.admin.req.auth.SysRoleMenuRequest; +import com.glxp.api.entity.auth.SysRoleMenu; +import com.glxp.api.req.auth.SysRoleMenuRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysUserRoleMapper.java b/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysUserRoleMapper.java rename to src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java index 35bba139..76e583d7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysUserRoleMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.auth; +package com.glxp.api.dao.auth; -import com.glxp.api.admin.entity.auth.SysUserRole; -import com.glxp.api.admin.req.auth.SysUserRoleRequest; +import com.glxp.api.entity.auth.SysUserRole; +import com.glxp.api.req.auth.SysUserRoleRequest; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicBusTypeChangeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicBusTypeChangeDao.java rename to src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java index 1939f5cf..fca98b64 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicBusTypeChangeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.admin.req.basic.BasicBusTypeChangeRequest; -import com.glxp.api.admin.res.basic.BasicBusTypeChangeResponse; +import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.api.req.basic.BasicBusTypeChangeRequest; +import com.glxp.api.res.basic.BasicBusTypeChangeResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java b/src/main/java/com/glxp/api/dao/basic/BasicDownloadDao.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java rename to src/main/java/com/glxp/api/dao/basic/BasicDownloadDao.java index 9429c800..77f53f84 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicDownloadDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.BasicDownloadStatusEntity; -import com.glxp.api.admin.req.basic.BasicDownloadRequest; +import com.glxp.api.entity.basic.BasicDownloadStatusEntity; +import com.glxp.api.req.basic.BasicDownloadRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java b/src/main/java/com/glxp/api/dao/basic/BasicExportDao.java similarity index 63% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java rename to src/main/java/com/glxp/api/dao/basic/BasicExportDao.java index 57df6162..7a3d2e61 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicExportDao.java @@ -1,9 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.BasicExportStatusEntity; -import com.glxp.api.admin.entity.inout.IOOrderStatusEntity; -import com.glxp.api.admin.req.basic.BasicExportStatusRequest; -import com.glxp.api.admin.req.inout.OrderStatusFilterRequest; +import com.glxp.api.entity.basic.BasicExportStatusEntity; +import com.glxp.api.req.basic.BasicExportStatusRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportTimeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicExportTimeDao.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportTimeDao.java rename to src/main/java/com/glxp/api/dao/basic/BasicExportTimeDao.java index 5cde6557..a269d2bd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportTimeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicExportTimeDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity; -import com.glxp.api.admin.req.basic.BasicExportTimeRequest; +import com.glxp.api.entity.basic.BasicExportStatusTimeEntity; +import com.glxp.api.req.basic.BasicExportTimeRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysBusApiDao.java b/src/main/java/com/glxp/api/dao/basic/BasicThirdSysBusApiDao.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysBusApiDao.java rename to src/main/java/com/glxp/api/dao/basic/BasicThirdSysBusApiDao.java index e827821a..1bbc0ac2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysBusApiDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicThirdSysBusApiDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.req.basic.FilterBasicThirdSysDetailRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDao.java b/src/main/java/com/glxp/api/dao/basic/BasicThirdSysDao.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDao.java rename to src/main/java/com/glxp/api/dao/basic/BasicThirdSysDao.java index e102c5b4..58fe8315 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicThirdSysDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.req.basic.FilterBasicThirdSysRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDetailDao.java b/src/main/java/com/glxp/api/dao/basic/BasicThirdSysDetailDao.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDetailDao.java rename to src/main/java/com/glxp/api/dao/basic/BasicThirdSysDetailDao.java index 038c6a0c..a278a42a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDetailDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicThirdSysDetailDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.req.basic.FilterBasicThirdSysDetailRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java b/src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java rename to src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java index de3d6c8e..57801990 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessChangeTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BussinessChangeTypeDao.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessChangeTypeDao.java rename to src/main/java/com/glxp/api/dao/basic/BussinessChangeTypeDao.java index d54b90d9..22ab4624 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessChangeTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BussinessChangeTypeDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity; -import com.glxp.api.admin.req.basic.BusTypeChangeFilterRequest; +import com.glxp.api.entity.basic.BussinessChangeTypeEntity; +import com.glxp.api.req.basic.BusTypeChangeFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BussinessLocalTypeDao.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java rename to src/main/java/com/glxp/api/dao/basic/BussinessLocalTypeDao.java index d351f7e2..6c107453 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BussinessLocalTypeDao.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.req.basic.BusOriginJoinFilterRequest; -import com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.req.basic.BusOriginJoinFilterRequest; +import com.glxp.api.req.basic.BussinessLocalTypeFilterRequest; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessOriginTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BussinessOriginTypeDao.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessOriginTypeDao.java rename to src/main/java/com/glxp/api/dao/basic/BussinessOriginTypeDao.java index 51eb09bd..efbaee9b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessOriginTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BussinessOriginTypeDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; -import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.entity.basic.BussinessOriginTypeEntity; +import com.glxp.api.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BussinessTypeDao.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java rename to src/main/java/com/glxp/api/dao/basic/BussinessTypeDao.java index c740f8e7..013a13c5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BussinessTypeDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; -import com.glxp.api.admin.res.basic.BussinessTypResponse; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.res.basic.BussinessTypResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java rename to src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java index 3c32fb59..5d1094a8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; -import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; -import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; +import com.glxp.api.res.info.CompanyProductRelevanceResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpExportLogDao.java b/src/main/java/com/glxp/api/dao/basic/CorpExportLogDao.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpExportLogDao.java rename to src/main/java/com/glxp/api/dao/basic/CorpExportLogDao.java index aca152d0..a0a6845b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpExportLogDao.java +++ b/src/main/java/com/glxp/api/dao/basic/CorpExportLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.CorpExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.entity.basic.CorpExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpImportDetailDao.java b/src/main/java/com/glxp/api/dao/basic/CorpImportDetailDao.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpImportDetailDao.java rename to src/main/java/com/glxp/api/dao/basic/CorpImportDetailDao.java index b5f2e384..34031d7b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpImportDetailDao.java +++ b/src/main/java/com/glxp/api/dao/basic/CorpImportDetailDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.CorpImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.basic.CorpImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpImportLogDao.java b/src/main/java/com/glxp/api/dao/basic/CorpImportLogDao.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpImportLogDao.java rename to src/main/java/com/glxp/api/dao/basic/CorpImportLogDao.java index 880a1476..21778a18 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpImportLogDao.java +++ b/src/main/java/com/glxp/api/dao/basic/CorpImportLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.CorpImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.basic.CorpImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/EntrustReceDao.java b/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/EntrustReceDao.java rename to src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java index 94123d4f..1e16195c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/EntrustReceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.DlEntrustReceEntity; -import com.glxp.api.admin.entity.basic.EntrustReceEntity; -import com.glxp.api.admin.req.basic.BasicEntrustRecRequest; -import com.glxp.api.admin.res.basic.EntrustReceResponse; +import com.glxp.api.entity.basic.DlEntrustReceEntity; +import com.glxp.api.entity.basic.EntrustReceEntity; +import com.glxp.api.req.basic.BasicEntrustRecRequest; +import com.glxp.api.res.basic.EntrustReceResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/NewUploadDiDao.java b/src/main/java/com/glxp/api/dao/basic/NewUploadDiDao.java similarity index 69% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/NewUploadDiDao.java rename to src/main/java/com/glxp/api/dao/basic/NewUploadDiDao.java index be74ab00..057eaf38 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/NewUploadDiDao.java +++ b/src/main/java/com/glxp/api/dao/basic/NewUploadDiDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.NewUploadDiEntity; -import com.glxp.api.admin.req.basic.FilterNewUploadDiRequest; -import com.glxp.api.admin.res.basic.NewUploadDiResponse; +import com.glxp.api.entity.basic.NewUploadDiEntity; +import com.glxp.api.req.basic.FilterNewUploadDiRequest; +import com.glxp.api.res.basic.NewUploadDiResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/ProductInfoDao.java b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/ProductInfoDao.java rename to src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java index 3d25d50e..7425ecd8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/ProductInfoDao.java +++ b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.ProductInfoEntity; -import com.glxp.api.admin.req.ListPageRequest; -import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest; +import com.glxp.api.entity.basic.ProductInfoEntity; +import com.glxp.api.req.ListPageRequest; +import com.glxp.api.req.receipt.ProductInfoFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiCompanyDao.java b/src/main/java/com/glxp/api/dao/basic/UdiCompanyDao.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiCompanyDao.java rename to src/main/java/com/glxp/api/dao/basic/UdiCompanyDao.java index 273e7c5a..92a41ae0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiCompanyDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiCompanyDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.UdiCompanyEntity; -import com.glxp.api.admin.req.basic.UdiCompanyRequest; +import com.glxp.api.entity.basic.UdiCompanyEntity; +import com.glxp.api.req.basic.UdiCompanyRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java b/src/main/java/com/glxp/api/dao/basic/UdiInfoDao.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java rename to src/main/java/com/glxp/api/dao/basic/UdiInfoDao.java index a8349cbf..90c5fb7a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiInfoDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoExportLogDao.java b/src/main/java/com/glxp/api/dao/basic/UdiInfoExportLogDao.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoExportLogDao.java rename to src/main/java/com/glxp/api/dao/basic/UdiInfoExportLogDao.java index 93abd8f7..50bf538a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoExportLogDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiInfoExportLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.entity.basic.UdiInfoExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoImportDetailDao.java b/src/main/java/com/glxp/api/dao/basic/UdiInfoImportDetailDao.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoImportDetailDao.java rename to src/main/java/com/glxp/api/dao/basic/UdiInfoImportDetailDao.java index d2e27319..710f3ace 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoImportDetailDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiInfoImportDetailDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.basic.UdiInfoImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoImportLogDao.java b/src/main/java/com/glxp/api/dao/basic/UdiInfoImportLogDao.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoImportLogDao.java rename to src/main/java/com/glxp/api/dao/basic/UdiInfoImportLogDao.java index b6865c7c..9cd87ad1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoImportLogDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiInfoImportLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java rename to src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index c65ffe06..23a6015d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java b/src/main/java/com/glxp/api/dao/basic/UnitMaintainDao.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java rename to src/main/java/com/glxp/api/dao/basic/UnitMaintainDao.java index 3ae1a093..f1fc6f70 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UnitMaintainDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.basic; +package com.glxp.api.dao.basic; -import com.glxp.api.admin.entity.basic.UnitMaintainEntity; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.entity.basic.UnitMaintainEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java b/src/main/java/com/glxp/api/dao/business/InvSpaceDao.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java rename to src/main/java/com/glxp/api/dao/business/InvSpaceDao.java index f84b81d4..f5781eea 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java +++ b/src/main/java/com/glxp/api/dao/business/InvSpaceDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.business; +package com.glxp.api.dao.business; -import com.glxp.api.admin.entity.business.InvSpace; -import com.glxp.api.admin.req.inventory.FilterInvSpaceRequest; -import com.glxp.api.admin.res.inventory.InvSpaceResponse; +import com.glxp.api.entity.business.InvSpace; +import com.glxp.api.req.inventory.FilterInvSpaceRequest; +import com.glxp.api.res.inventory.InvSpaceResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java b/src/main/java/com/glxp/api/dao/business/StockOrderDao.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java rename to src/main/java/com/glxp/api/dao/business/StockOrderDao.java index 8ed247ac..b01dbcb4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java +++ b/src/main/java/com/glxp/api/dao/business/StockOrderDao.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.dao.business; +package com.glxp.api.dao.business; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.business.StockOrderPrintEntity; -import com.glxp.api.admin.req.business.StockOrderFilterRequest; -import com.glxp.api.admin.req.business.StockOrderQueryRequest; -import com.glxp.api.admin.req.business.StockOrderUploadRequest; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.business.StockOrderPrintEntity; +import com.glxp.api.req.business.StockOrderFilterRequest; +import com.glxp.api.req.business.StockOrderQueryRequest; +import com.glxp.api.req.business.StockOrderUploadRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDetailDao.java b/src/main/java/com/glxp/api/dao/business/StockOrderDetailDao.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDetailDao.java rename to src/main/java/com/glxp/api/dao/business/StockOrderDetailDao.java index 6976d604..d694ff04 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/business/StockOrderDetailDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.business; +package com.glxp.api.dao.business; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; -import com.glxp.api.admin.res.business.StockOrderDetailResponse; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.res.business.StockOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDetailTempDao.java b/src/main/java/com/glxp/api/dao/business/StockOrderDetailTempDao.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDetailTempDao.java rename to src/main/java/com/glxp/api/dao/business/StockOrderDetailTempDao.java index d0fce20c..3b9553b9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDetailTempDao.java +++ b/src/main/java/com/glxp/api/dao/business/StockOrderDetailTempDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.business; +package com.glxp.api.dao.business; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java b/src/main/java/com/glxp/api/dao/business/StockOrderRemakDao.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java rename to src/main/java/com/glxp/api/dao/business/StockOrderRemakDao.java index 5b8ad38f..aa79bd39 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java +++ b/src/main/java/com/glxp/api/dao/business/StockOrderRemakDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.dao.business; +package com.glxp.api.dao.business; -import com.glxp.api.admin.entity.business.StockOrderRemakEntity; +import com.glxp.api.entity.business.StockOrderRemakEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderUploadLogDao.java b/src/main/java/com/glxp/api/dao/business/StockOrderUploadLogDao.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderUploadLogDao.java rename to src/main/java/com/glxp/api/dao/business/StockOrderUploadLogDao.java index bbffd862..06ea2748 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderUploadLogDao.java +++ b/src/main/java/com/glxp/api/dao/business/StockOrderUploadLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.business; +package com.glxp.api.dao.business; -import com.glxp.api.admin.entity.business.StockOrderUploadLogEntity; -import com.glxp.api.admin.req.business.StockOrderUploadLogRequest; +import com.glxp.api.entity.business.StockOrderUploadLogEntity; +import com.glxp.api.req.business.StockOrderUploadLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockQRCodeTextDao.java b/src/main/java/com/glxp/api/dao/business/StockQRCodeTextDao.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/dao/business/StockQRCodeTextDao.java rename to src/main/java/com/glxp/api/dao/business/StockQRCodeTextDao.java index 6c4bbd0f..25501980 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockQRCodeTextDao.java +++ b/src/main/java/com/glxp/api/dao/business/StockQRCodeTextDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.business; +package com.glxp.api.dao.business; -import com.glxp.api.admin.entity.business.StockQRCodeTextEntity; -import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest; +import com.glxp.api.entity.business.StockQRCodeTextEntity; +import com.glxp.api.req.business.StockQRCodeTextFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/ClassifyCodeDao.java b/src/main/java/com/glxp/api/dao/info/ClassifyCodeDao.java similarity index 58% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/ClassifyCodeDao.java rename to src/main/java/com/glxp/api/dao/info/ClassifyCodeDao.java index 48c1932d..0f7390c4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/ClassifyCodeDao.java +++ b/src/main/java/com/glxp/api/dao/info/ClassifyCodeDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.ClassifyCodeEntity; -import com.glxp.api.admin.req.info.FilterClassifyCodeRequest; +import com.glxp.api.entity.info.ClassifyCodeEntity; +import com.glxp.api.req.info.FilterClassifyCodeRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/CompanyDao.java b/src/main/java/com/glxp/api/dao/info/CompanyDao.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/CompanyDao.java rename to src/main/java/com/glxp/api/dao/info/CompanyDao.java index ab508d44..bcb8a65b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/CompanyDao.java +++ b/src/main/java/com/glxp/api/dao/info/CompanyDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.CompanyEntity; +import com.glxp.api.entity.info.CompanyEntity; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/DbVersionDao.java b/src/main/java/com/glxp/api/dao/info/DbVersionDao.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/DbVersionDao.java rename to src/main/java/com/glxp/api/dao/info/DbVersionDao.java index 8e9aee30..24f4c5c0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/DbVersionDao.java +++ b/src/main/java/com/glxp/api/dao/info/DbVersionDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.DbVersionEntity; +import com.glxp.api.entity.info.DbVersionEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SetupDao.java b/src/main/java/com/glxp/api/dao/info/SetupDao.java similarity index 60% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/SetupDao.java rename to src/main/java/com/glxp/api/dao/info/SetupDao.java index 35c7b15a..9fce604f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SetupDao.java +++ b/src/main/java/com/glxp/api/dao/info/SetupDao.java @@ -1,11 +1,9 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.SetupEntity; -import com.glxp.api.admin.req.info.FilterSetupRequest; +import com.glxp.api.entity.info.SetupEntity; +import com.glxp.api.req.info.FilterSetupRequest; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - @Mapper public interface SetupDao { diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncDataBustypeDao.java b/src/main/java/com/glxp/api/dao/info/SyncDataBustypeDao.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncDataBustypeDao.java rename to src/main/java/com/glxp/api/dao/info/SyncDataBustypeDao.java index 8e37c990..fc5e33dd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncDataBustypeDao.java +++ b/src/main/java/com/glxp/api/dao/info/SyncDataBustypeDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; +import com.glxp.api.entity.info.SyncDataBustypeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncDataSetDao.java b/src/main/java/com/glxp/api/dao/info/SyncDataSetDao.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncDataSetDao.java rename to src/main/java/com/glxp/api/dao/info/SyncDataSetDao.java index 464bf910..15bfa0ef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncDataSetDao.java +++ b/src/main/java/com/glxp/api/dao/info/SyncDataSetDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; +import com.glxp.api.entity.info.SyncDataSetEntity; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataBustypeDao.java b/src/main/java/com/glxp/api/dao/info/SyncUploadDataBustypeDao.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataBustypeDao.java rename to src/main/java/com/glxp/api/dao/info/SyncUploadDataBustypeDao.java index 302732b6..a51f403b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataBustypeDao.java +++ b/src/main/java/com/glxp/api/dao/info/SyncUploadDataBustypeDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; +import com.glxp.api.entity.info.SyncDataBustypeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataSetDao.java b/src/main/java/com/glxp/api/dao/info/SyncUploadDataSetDao.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataSetDao.java rename to src/main/java/com/glxp/api/dao/info/SyncUploadDataSetDao.java index a77966a1..c13c11ab 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataSetDao.java +++ b/src/main/java/com/glxp/api/dao/info/SyncUploadDataSetDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity; +import com.glxp.api.entity.info.SyncUploadDataSetEntity; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SysServerLogDao.java b/src/main/java/com/glxp/api/dao/info/SysServerLogDao.java similarity index 56% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/SysServerLogDao.java rename to src/main/java/com/glxp/api/dao/info/SysServerLogDao.java index 448dddcb..363dd45d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SysServerLogDao.java +++ b/src/main/java/com/glxp/api/dao/info/SysServerLogDao.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.SetupEntity; -import com.glxp.api.admin.entity.info.SysServerLogEntity; -import com.glxp.api.admin.req.info.FilterSetupRequest; +import com.glxp.api.entity.info.SysServerLogEntity; +import com.glxp.api.req.info.FilterSetupRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SystemPDFModuleDao.java b/src/main/java/com/glxp/api/dao/info/SystemPDFModuleDao.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/SystemPDFModuleDao.java rename to src/main/java/com/glxp/api/dao/info/SystemPDFModuleDao.java index caa31f9b..7eb068c5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SystemPDFModuleDao.java +++ b/src/main/java/com/glxp/api/dao/info/SystemPDFModuleDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.SystemPDFModuleEntity; -import com.glxp.api.admin.req.info.SystemPDFModuleRequest; -import com.glxp.api.admin.req.info.SystemPDFModuleSaveRequest; +import com.glxp.api.entity.info.SystemPDFModuleEntity; +import com.glxp.api.req.info.SystemPDFModuleRequest; +import com.glxp.api.req.info.SystemPDFModuleSaveRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SystemPDFTemplateDao.java b/src/main/java/com/glxp/api/dao/info/SystemPDFTemplateDao.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/SystemPDFTemplateDao.java rename to src/main/java/com/glxp/api/dao/info/SystemPDFTemplateDao.java index d0c1f1f8..f9c12415 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SystemPDFTemplateDao.java +++ b/src/main/java/com/glxp/api/dao/info/SystemPDFTemplateDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity; -import com.glxp.api.admin.req.info.SystemPDFTemplateRequest; -import com.glxp.api.admin.req.info.SystemPDFTemplateSaveRequest; +import com.glxp.api.entity.info.SystemPDFTemplateEntity; +import com.glxp.api.req.info.SystemPDFTemplateRequest; +import com.glxp.api.req.info.SystemPDFTemplateSaveRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SystemPDFTemplateRelevanceDao.java b/src/main/java/com/glxp/api/dao/info/SystemPDFTemplateRelevanceDao.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/SystemPDFTemplateRelevanceDao.java rename to src/main/java/com/glxp/api/dao/info/SystemPDFTemplateRelevanceDao.java index eabf195f..42fd86f6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SystemPDFTemplateRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/info/SystemPDFTemplateRelevanceDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity; -import com.glxp.api.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; -import com.glxp.api.admin.res.basic.SystemPDFTemplateRelevanceResponse; +import com.glxp.api.entity.info.SystemPDFTemplateRelevanceEntity; +import com.glxp.api.req.itextpdf.SystemPDFTemplateRelevanceRequest; +import com.glxp.api.res.basic.SystemPDFTemplateRelevanceResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/ThirdSysApiDao.java b/src/main/java/com/glxp/api/dao/info/ThirdSysApiDao.java similarity index 63% rename from api-admin/src/main/java/com/glxp/api/admin/dao/info/ThirdSysApiDao.java rename to src/main/java/com/glxp/api/dao/info/ThirdSysApiDao.java index 56c7b438..dc3cebc1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/ThirdSysApiDao.java +++ b/src/main/java/com/glxp/api/dao/info/ThirdSysApiDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.info; +package com.glxp.api.dao.info; -import com.glxp.api.admin.entity.info.ThirdSysApiEntity; -import com.glxp.api.admin.req.info.FilterSysApiRequest; +import com.glxp.api.entity.info.ThirdSysApiEntity; +import com.glxp.api.req.info.FilterSysApiRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java b/src/main/java/com/glxp/api/dao/inout/CodesDao.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java rename to src/main/java/com/glxp/api/dao/inout/CodesDao.java index 765301af..593f84e6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java +++ b/src/main/java/com/glxp/api/dao/inout/CodesDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.inout; +package com.glxp.api.dao.inout; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.req.inout.WarehouseQueryRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesTempDao.java b/src/main/java/com/glxp/api/dao/inout/CodesTempDao.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesTempDao.java rename to src/main/java/com/glxp/api/dao/inout/CodesTempDao.java index be4c4b81..668e52a7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesTempDao.java +++ b/src/main/java/com/glxp/api/dao/inout/CodesTempDao.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.dao.inout; +package com.glxp.api.dao.inout; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inout.Warehousetemp; -import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.req.inout.WarehouseQueryRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/IOOrderStatusDao.java b/src/main/java/com/glxp/api/dao/inout/IOOrderStatusDao.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inout/IOOrderStatusDao.java rename to src/main/java/com/glxp/api/dao/inout/IOOrderStatusDao.java index 644abc65..ff140fa4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/IOOrderStatusDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IOOrderStatusDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.inout; +package com.glxp.api.dao.inout; -import com.glxp.api.admin.entity.inout.IOOrderStatusEntity; -import com.glxp.api.admin.req.inout.OrderStatusFilterRequest; +import com.glxp.api.entity.inout.IOOrderStatusEntity; +import com.glxp.api.req.inout.OrderStatusFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java b/src/main/java/com/glxp/api/dao/inout/OrderDao.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java rename to src/main/java/com/glxp/api/dao/inout/OrderDao.java index ef479b7c..8e4ea241 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java +++ b/src/main/java/com/glxp/api/dao/inout/OrderDao.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.dao.inout; +package com.glxp.api.dao.inout; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.req.inout.OrderQueryRequest; -import com.glxp.api.admin.res.inout.OrderNoResult; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.req.inout.OrderFilterRequest; +import com.glxp.api.req.inout.OrderQueryRequest; +import com.glxp.api.res.inout.OrderNoResult; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDetailDao.java b/src/main/java/com/glxp/api/dao/inout/OrderDetailDao.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDetailDao.java rename to src/main/java/com/glxp/api/dao/inout/OrderDetailDao.java index eb730e63..dd0e78b4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inout/OrderDetailDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.inout; +package com.glxp.api.dao.inout; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/inout/WarehouseBussinessTypeDao.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java rename to src/main/java/com/glxp/api/dao/inout/WarehouseBussinessTypeDao.java index b68c323b..f8d8c9ec 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/inout/WarehouseBussinessTypeDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.inout; +package com.glxp.api.dao.inout; -import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; -import com.glxp.api.admin.req.basic.FilterInvBusTypeRequest; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.api.req.basic.FilterInvBusTypeRequest; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/inout/WarehouseUserDao.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java rename to src/main/java/com/glxp/api/dao/inout/WarehouseUserDao.java index f57841c7..3afc47e1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/inout/WarehouseUserDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.inout; +package com.glxp.api.dao.inout; -import com.glxp.api.admin.entity.inout.WarehouseUserEntity; -import com.glxp.api.admin.req.inventory.FilterInvUserRequest; +import com.glxp.api.entity.inout.WarehouseUserEntity; +import com.glxp.api.req.inventory.FilterInvUserRequest; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java b/src/main/java/com/glxp/api/dao/inventory/DeviceCollectOrderDao.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java rename to src/main/java/com/glxp/api/dao/inventory/DeviceCollectOrderDao.java index aeae033a..de7d2073 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/DeviceCollectOrderDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity; -import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderRequest; -import com.glxp.api.admin.res.inventory.DeviceCollectOrderResponse; +import com.glxp.api.entity.inventory.DeviceCollectOrderEntity; +import com.glxp.api.req.inventory.FilterDeviceCollectOrderRequest; +import com.glxp.api.res.inventory.DeviceCollectOrderResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inventory/DeviceCollectOrderDetailDao.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java rename to src/main/java/com/glxp/api/dao/inventory/DeviceCollectOrderDetailDao.java index b6651d77..8d4df639 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/DeviceCollectOrderDetailDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; -import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderDetailRequest; -import com.glxp.api.admin.res.inventory.DeviceCollectOrderDetailResponse; +import com.glxp.api.entity.inventory.DeviceCollectOrderDetailEntity; +import com.glxp.api.req.inventory.FilterDeviceCollectOrderDetailRequest; +import com.glxp.api.res.inventory.DeviceCollectOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java b/src/main/java/com/glxp/api/dao/inventory/DeviceMAOrderDao.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java rename to src/main/java/com/glxp/api/dao/inventory/DeviceMAOrderDao.java index 3f90f8de..016a56d0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/DeviceMAOrderDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; -import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; +import com.glxp.api.entity.inventory.DeviceMAOrderEntity; +import com.glxp.api.req.inventory.FilterDeviceMAOrderRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inventory/DeviceMaOrderDetailDao.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java rename to src/main/java/com/glxp/api/dao/inventory/DeviceMaOrderDetailDao.java index d110f5f6..2a3a231b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/DeviceMaOrderDetailDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; -import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; -import com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse; +import com.glxp.api.entity.inventory.DeviceMAOrderDetailEntity; +import com.glxp.api.req.inventory.FilterDeviceMAOrderDetailRequest; +import com.glxp.api.res.inventory.DeviceMAOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InCodeLogDao.java b/src/main/java/com/glxp/api/dao/inventory/InCodeLogDao.java similarity index 59% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InCodeLogDao.java rename to src/main/java/com/glxp/api/dao/inventory/InCodeLogDao.java index 79ffda7a..5307c8e5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InCodeLogDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InCodeLogDao.java @@ -1,9 +1,7 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inout.StockCheckEntity; -import com.glxp.api.admin.entity.inventory.InCodeLogEntity; -import com.glxp.api.admin.req.inout.FilterStockCheckRequest; -import com.glxp.api.admin.req.inventory.FilterInCodeLogRequest; +import com.glxp.api.entity.inventory.InCodeLogEntity; +import com.glxp.api.req.inventory.FilterInCodeLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDao.java b/src/main/java/com/glxp/api/dao/inventory/InnerOrderDao.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDao.java rename to src/main/java/com/glxp/api/dao/inventory/InnerOrderDao.java index ccf2454c..1196d38f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InnerOrderDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InnerOrderEntity; -import com.glxp.api.admin.req.inventory.InnerOrderRequest; +import com.glxp.api.entity.inventory.InnerOrderEntity; +import com.glxp.api.req.inventory.InnerOrderRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inventory/InnerOrderDetailDao.java similarity index 55% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDetailDao.java rename to src/main/java/com/glxp/api/dao/inventory/InnerOrderDetailDao.java index d670a344..34805a3e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InnerOrderDetailDao.java @@ -1,10 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest; -import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.inventory.InnerOrderDetailEntity; +import com.glxp.api.req.inventory.InnerOrderDetailRequest; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvBusUserDao.java b/src/main/java/com/glxp/api/dao/inventory/InvBusUserDao.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvBusUserDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvBusUserDao.java index 80dbc7d9..70e2b045 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvBusUserDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvBusUserDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvBusUserEntity; -import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; -import com.glxp.api.admin.res.inventory.InvBusUserResponse; +import com.glxp.api.entity.inventory.InvBusUserEntity; +import com.glxp.api.req.inventory.FilterInvBusUserRequest; +import com.glxp.api.res.inventory.InvBusUserResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountCodesDao.java b/src/main/java/com/glxp/api/dao/inventory/InvCountCodesDao.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountCodesDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvCountCodesDao.java index 801a55db..54eff3c4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountCodesDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvCountCodesDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvCountCodes; -import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest; +import com.glxp.api.entity.inventory.InvCountCodes; +import com.glxp.api.req.inventory.FilterInvCountCodesRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java b/src/main/java/com/glxp/api/dao/inventory/InvCountOrderDao.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvCountOrderDao.java index 92844282..c058234a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvCountOrderDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvCountOrder; -import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest; -import com.glxp.api.admin.res.inventory.InvCountOrderResponse; +import com.glxp.api.entity.inventory.InvCountOrder; +import com.glxp.api.req.inventory.FilterInvCountOrderRequest; +import com.glxp.api.res.inventory.InvCountOrderResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inventory/InvCountOrderDetailDao.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDetailDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvCountOrderDetailDao.java index ce1ee5dc..2d3f44c6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvCountOrderDetailDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvCountOrderDetail; -import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest; -import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse; +import com.glxp.api.entity.inventory.InvCountOrderDetail; +import com.glxp.api.req.inventory.FilterInvCountOrderDetailRequest; +import com.glxp.api.res.inventory.InvCountOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountSettingDao.java b/src/main/java/com/glxp/api/dao/inventory/InvCountSettingDao.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountSettingDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvCountSettingDao.java index 83fb84f4..9745e3e5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountSettingDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvCountSettingDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvCountSettingEntity; -import com.glxp.api.admin.req.inventory.FilterInvCountSettingRequest; +import com.glxp.api.entity.inventory.InvCountSettingEntity; +import com.glxp.api.req.inventory.FilterInvCountSettingRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceExplanationDao.java b/src/main/java/com/glxp/api/dao/inventory/InvMaintenanceExplanationDao.java similarity index 63% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceExplanationDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvMaintenanceExplanationDao.java index 61efdf30..294e1b22 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceExplanationDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvMaintenanceExplanationDao.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvMaintenanceExplanationEntity; +import com.glxp.api.entity.inventory.InvMaintenanceExplanationEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDao.java b/src/main/java/com/glxp/api/dao/inventory/InvMaintenanceOrderDao.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvMaintenanceOrderDao.java index b35eb5c3..9023e360 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvMaintenanceOrderDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderEntity; -import com.glxp.api.admin.req.inventory.FilterInvMAOrderRequest; -import com.glxp.api.admin.res.inventory.InvMAOrderResponse; +import com.glxp.api.entity.inventory.InvMaintenanceOrderEntity; +import com.glxp.api.req.inventory.FilterInvMAOrderRequest; +import com.glxp.api.res.inventory.InvMAOrderResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inventory/InvMaintenanceOrderDetailDao.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvMaintenanceOrderDetailDao.java index 9a85c550..66055c81 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvMaintenanceOrderDetailDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderDetailEntity; -import com.glxp.api.admin.req.inventory.FilterInvMAOrderDetailRequest; -import com.glxp.api.admin.res.inventory.InvMAOrderDetailResponse; +import com.glxp.api.entity.inventory.InvMaintenanceOrderDetailEntity; +import com.glxp.api.req.inventory.FilterInvMAOrderDetailRequest; +import com.glxp.api.res.inventory.InvMAOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.java b/src/main/java/com/glxp/api/dao/inventory/InvOrderCheckDao.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvOrderCheckDao.java index 23638ea8..7b66c5c0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvOrderCheckDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inout.StockCheckEntity; -import com.glxp.api.admin.req.inout.FilterStockCheckRequest; +import com.glxp.api.entity.inout.StockCheckEntity; +import com.glxp.api.req.inout.FilterStockCheckRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreInProductDao.java b/src/main/java/com/glxp/api/dao/inventory/InvPreInProductDao.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreInProductDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvPreInProductDao.java index 4d0d342b..72d36169 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreInProductDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvPreInProductDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.inventory.InvProductResponse; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.inventory.InvProductResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreInProductDetailDao.java b/src/main/java/com/glxp/api/dao/inventory/InvPreInProductDetailDao.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreInProductDetailDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvPreInProductDetailDao.java index 7a1231b2..540de057 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreInProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvPreInProductDetailDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.inventory.InvProductDetailJoinResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDao.java b/src/main/java/com/glxp/api/dao/inventory/InvPreProductDao.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvPreProductDao.java index 92d11ba1..ef6ec8dc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvPreProductDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.inventory.InvProductResponse; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.inventory.InvProductResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDetailDao.java b/src/main/java/com/glxp/api/dao/inventory/InvPreProductDetailDao.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDetailDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvPreProductDetailDao.java index 03df4ae9..b8d9729a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvPreProductDetailDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.inventory.InvProductDetailJoinResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDao.java b/src/main/java/com/glxp/api/dao/inventory/InvProductDao.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvProductDao.java index 2355a52b..e1365a94 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvProductDao.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.inventory.InvProductResponse; -import com.glxp.api.admin.res.inventory.MAInvProductResponse; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.inventory.InvProductResponse; +import com.glxp.api.res.inventory.MAInvProductResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java b/src/main/java/com/glxp/api/dao/inventory/InvProductDetailDao.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvProductDetailDao.java index 9c936941..80c449f0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvProductDetailDao.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.req.inventory.BindInvSpaceRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse; -import com.glxp.api.admin.res.inventory.InvProductDetailPlaceResponse; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.req.inventory.BindInvSpaceRequest; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.inventory.InvProductDetailJoinResponse; +import com.glxp.api.res.inventory.InvProductDetailPlaceResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java b/src/main/java/com/glxp/api/dao/inventory/InvStockPrintDao.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvStockPrintDao.java index 2716ab3d..442a9e0a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvStockPrintDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.StockPrintEntity; -import com.glxp.api.admin.req.basic.FilterStockprintRequest; +import com.glxp.api.entity.inventory.StockPrintEntity; +import com.glxp.api.req.basic.FilterStockprintRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java b/src/main/java/com/glxp/api/dao/inventory/InvSubWarehouseDao.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvSubWarehouseDao.java index 43b6cc72..9414e10e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvSubWarehouseDao.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.req.inventory.FilterInvSubWarehouseRequest; -import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.api.admin.res.inventory.InvSubWarehouseResponse; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.req.inventory.FilterInvSubWarehouseRequest; +import com.glxp.api.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.res.inventory.InvSubWarehouseResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvWarehouseDao.java b/src/main/java/com/glxp/api/dao/inventory/InvWarehouseDao.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvWarehouseDao.java rename to src/main/java/com/glxp/api/dao/inventory/InvWarehouseDao.java index f58b9563..84084f70 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/InvWarehouseDao.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.basic.UnitMaintainEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.req.inventory.FilterInvWarehouseRequest; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/StockPrintTempDao.java b/src/main/java/com/glxp/api/dao/inventory/StockPrintTempDao.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/StockPrintTempDao.java rename to src/main/java/com/glxp/api/dao/inventory/StockPrintTempDao.java index 51edbff6..ebe5e4fc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/StockPrintTempDao.java +++ b/src/main/java/com/glxp/api/dao/inventory/StockPrintTempDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.inventory; +package com.glxp.api.dao.inventory; -import com.glxp.api.admin.entity.inventory.StockPrintTempEntity; -import com.glxp.api.admin.req.inventory.DeleteStPrintTempRequest; -import com.glxp.api.admin.req.inventory.FilterStPrintTempRequest; +import com.glxp.api.entity.inventory.StockPrintTempEntity; +import com.glxp.api.req.inventory.DeleteStPrintTempRequest; +import com.glxp.api.req.inventory.FilterStPrintTempRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/monitor/SysLogininforMapper.java b/src/main/java/com/glxp/api/dao/monitor/SysLogininforMapper.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/dao/monitor/SysLogininforMapper.java rename to src/main/java/com/glxp/api/dao/monitor/SysLogininforMapper.java index 2f4461f2..0cdaea30 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/monitor/SysLogininforMapper.java +++ b/src/main/java/com/glxp/api/dao/monitor/SysLogininforMapper.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.monitor; +package com.glxp.api.dao.monitor; -import com.glxp.api.admin.entity.monitor.SysLogininfor; -import com.glxp.api.admin.req.monitor.SysLogininforRequest; +import com.glxp.api.entity.monitor.SysLogininfor; +import com.glxp.api.req.monitor.SysLogininforRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/monitor/SysOperLogMapper.java b/src/main/java/com/glxp/api/dao/monitor/SysOperLogMapper.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/dao/monitor/SysOperLogMapper.java rename to src/main/java/com/glxp/api/dao/monitor/SysOperLogMapper.java index b0b78313..b415b49c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/monitor/SysOperLogMapper.java +++ b/src/main/java/com/glxp/api/dao/monitor/SysOperLogMapper.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.monitor; +package com.glxp.api.dao.monitor; -import com.glxp.api.admin.entity.monitor.SysOperLog; -import com.glxp.api.admin.req.monitor.SysOperLogRequest; +import com.glxp.api.entity.monitor.SysOperLog; +import com.glxp.api.req.monitor.SysOperLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanySalesmanDao.java b/src/main/java/com/glxp/api/dao/purchase/CompanySalesmanDao.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanySalesmanDao.java rename to src/main/java/com/glxp/api/dao/purchase/CompanySalesmanDao.java index 7607a3be..8c99f561 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanySalesmanDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/CompanySalesmanDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.purchase; +package com.glxp.api.dao.purchase; -import com.glxp.api.admin.entity.purchase.CompanySalesmanEntity; -import com.glxp.api.admin.req.purchase.FilterCompanySalesmanRequest; +import com.glxp.api.entity.purchase.CompanySalesmanEntity; +import com.glxp.api.req.purchase.FilterCompanySalesmanRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanyUpdateLogDao.java b/src/main/java/com/glxp/api/dao/purchase/CompanyUpdateLogDao.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanyUpdateLogDao.java rename to src/main/java/com/glxp/api/dao/purchase/CompanyUpdateLogDao.java index 4bfe0d2a..901cfe48 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanyUpdateLogDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/CompanyUpdateLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.purchase; +package com.glxp.api.dao.purchase; -import com.glxp.api.admin.entity.purchase.CompanyUpdateLogEntity; -import com.glxp.api.admin.req.purchase.FilterCompanyUpdateLogRequest; +import com.glxp.api.entity.purchase.CompanyUpdateLogEntity; +import com.glxp.api.req.purchase.FilterCompanyUpdateLogRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CustomerContacDao.java b/src/main/java/com/glxp/api/dao/purchase/CustomerContacDao.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CustomerContacDao.java rename to src/main/java/com/glxp/api/dao/purchase/CustomerContacDao.java index e28016c5..938b0374 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CustomerContacDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/CustomerContacDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.purchase; +package com.glxp.api.dao.purchase; -import com.glxp.api.admin.entity.purchase.CustomerContactEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.purchase.CustomerContactFilterRequest; +import com.glxp.api.entity.purchase.CustomerContactEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.purchase.CustomerContactFilterRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurApplyDao.java b/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java similarity index 65% rename from api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurApplyDao.java rename to src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java index be44c936..84e72540 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurApplyDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.purchase; +package com.glxp.api.dao.purchase; -import com.glxp.api.admin.entity.purchase.PurApplyEntity; -import com.glxp.api.admin.req.purchase.PurApplyRequest; -import com.glxp.api.admin.res.purchase.PurApplyResponse; +import com.glxp.api.entity.purchase.PurApplyEntity; +import com.glxp.api.req.purchase.PurApplyRequest; +import com.glxp.api.res.purchase.PurApplyResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurApplyDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurApplyDetailDao.java rename to src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java index 21a18515..dd073e55 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurApplyDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.purchase; +package com.glxp.api.dao.purchase; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.req.purchase.PurApplyDetailRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDao.java b/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java similarity index 65% rename from api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDao.java rename to src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java index ec7e1d0d..d0503429 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.purchase; +package com.glxp.api.dao.purchase; -import com.glxp.api.admin.entity.purchase.PurPlanEntity; -import com.glxp.api.admin.req.purchase.PurPlanRequest; -import com.glxp.api.admin.res.purchase.PurPlanResponse; +import com.glxp.api.entity.purchase.PurPlanEntity; +import com.glxp.api.req.purchase.PurPlanRequest; +import com.glxp.api.res.purchase.PurPlanResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java similarity index 62% rename from api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDetailDao.java rename to src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java index 5dd22518..ce4f9528 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java @@ -1,10 +1,8 @@ -package com.glxp.api.admin.dao.purchase; +package com.glxp.api.dao.purchase; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; -import com.glxp.api.admin.req.purchase.PurPlanDetailRequest; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.req.purchase.PurPlanDetailRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java rename to src/main/java/com/glxp/api/dao/purchase/SupCertDao.java index 50a59fa1..3814833f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.purchase; +package com.glxp.api.dao.purchase; -import com.glxp.api.admin.entity.purchase.SupCertEntity; -import com.glxp.api.admin.req.purchase.FilterSupCertRequest; +import com.glxp.api.entity.purchase.SupCertEntity; +import com.glxp.api.req.purchase.FilterSupCertRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertSetDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertSetDao.java rename to src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java index c6091ea3..bca44acd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertSetDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.purchase; +package com.glxp.api.dao.purchase; -import com.glxp.api.admin.entity.purchase.SupCertSetEntity; -import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; +import com.glxp.api.entity.purchase.SupCertSetEntity; +import com.glxp.api.req.purchase.FilterCertSetsRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCompanyDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCompanyDao.java rename to src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java index 7e092849..79e19fa2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCompanyDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.purchase; +package com.glxp.api.dao.purchase; -import com.glxp.api.admin.entity.purchase.SupCompanyEntity; -import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest; +import com.glxp.api.entity.purchase.SupCompanyEntity; +import com.glxp.api.req.purchase.FilterSupCompanyRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupManufacturerDao.java b/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupManufacturerDao.java rename to src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java index 2d01fe1b..4ecf94c2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupManufacturerDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.purchase; +package com.glxp.api.dao.purchase; -import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; -import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest; +import com.glxp.api.entity.purchase.SupManufacturerEntity; +import com.glxp.api.req.purchase.FilterSupManufacturerRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupProductDao.java b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupProductDao.java rename to src/main/java/com/glxp/api/dao/purchase/SupProductDao.java index 446ce1c3..480178f0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupProductDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.purchase; +package com.glxp.api.dao.purchase; -import com.glxp.api.admin.entity.purchase.SupProductEntity; -import com.glxp.api.admin.req.purchase.FilterPoductRequest; -import com.glxp.api.admin.res.purchase.SupProductResponse; +import com.glxp.api.entity.purchase.SupProductEntity; +import com.glxp.api.req.purchase.FilterPoductRequest; +import com.glxp.api.res.purchase.SupProductResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/schedule/ScheduledDao.java b/src/main/java/com/glxp/api/dao/schedule/ScheduledDao.java similarity index 68% rename from api-admin/src/main/java/com/glxp/api/admin/dao/schedule/ScheduledDao.java rename to src/main/java/com/glxp/api/dao/schedule/ScheduledDao.java index 5c751eb7..f62eba2e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/schedule/ScheduledDao.java +++ b/src/main/java/com/glxp/api/dao/schedule/ScheduledDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.schedule; +package com.glxp.api.dao.schedule; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.req.info.ScheduledRequest; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.req.info.ScheduledRequest; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/schedule/SystemParamConfigDao.java b/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/dao/schedule/SystemParamConfigDao.java rename to src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java index 959da08b..5fa914d0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/schedule/SystemParamConfigDao.java +++ b/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.schedule; +package com.glxp.api.dao.schedule; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.req.info.SystemParamConfigRequest; -import com.glxp.api.admin.req.info.SystemParamConfigSaveRequest; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.req.info.SystemParamConfigRequest; +import com.glxp.api.req.info.SystemParamConfigSaveRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java index d6a1f306..77c3e90c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; -import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpExportLogDao.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrCorpExportLogDao.java index b8d98a8b..98a6fd5b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpExportLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrCorpExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportDetailDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpImportDetailDao.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportDetailDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrCorpImportDetailDao.java index a5f1209e..2fd84715 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportDetailDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpImportDetailDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrCorpImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpImportLogDao.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrCorpImportLogDao.java index 7ebb8a79..d848aef1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpImportLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrImportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrImportLogDao.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrImportLogDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrImportLogDao.java index c0c3e452..877bbfa8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrImportLogDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrImportLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvProductsDao.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrInvProductsDao.java index 44a01d71..c31523ca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvProductsDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; -import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDetailDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvProductsDetailDao.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDetailDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrInvProductsDetailDao.java index e21902ad..76fe4455 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDetailDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvProductsDetailDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsExportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvProductsExportLogDao.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsExportLogDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrInvProductsExportLogDao.java index c8fcc835..b1632657 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsExportLogDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvProductsExportLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsImportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvProductsImportLogDao.java similarity index 68% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsImportLogDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrInvProductsImportLogDao.java index 67d5d35a..0195e3ab 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsImportLogDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvProductsImportLogDao.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportLogEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvWarehouseDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvWarehouseDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java index e8b6741e..165bb0ce 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest; +import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.api.req.thrsys.FilterThrInvWarehouseRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java index 86e5e076..51b08f09 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; -import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.entity.thrsys.ThrOrderEntity; +import com.glxp.api.req.thrsys.FilterThrOrderRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java index e81d06cf..c9571fc5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderExportLogDao.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrOrderExportLogDao.java index 15a95242..4f3e5350 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderExportLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrOrderExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.entity.thrsys.ThrOrderExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderImportDetailDao.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrOrderImportDetailDao.java index cc252590..0aeb2f12 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderImportDetailDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrOrderImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderImportLogDao.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrOrderImportLogDao.java index 9da9f614..dfa7cf92 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderImportLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrOrderImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java index fb1b1bb1..70e93bae 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsExportLogDao.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrProductsExportLogDao.java index a0738f31..64d9e099 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsExportLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportDetailDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportDetailDao.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportDetailDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportDetailDao.java index 5a02e69b..55c3d25d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportDetailDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportDetailDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportLogDao.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportLogDao.java index c1853bbf..666c00c5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportLogDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrSubInvWarehouseDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrSubInvWarehouseDao.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrSubInvWarehouseDao.java rename to src/main/java/com/glxp/api/dao/thrsys/ThrSubInvWarehouseDao.java index 66f44ac2..6de303ad 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrSubInvWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrSubInvWarehouseDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.dao.thrsys; +package com.glxp.api.dao.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity; -import com.glxp.api.admin.req.thrsys.FilterThrSubInvWarehouseRequest; -import com.glxp.api.admin.res.thrsys.ThrSubInvWarehouseResponse; +import com.glxp.api.entity.thrsys.ThrSubInvWarehouseEntity; +import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; +import com.glxp.api.res.thrsys.ThrSubInvWarehouseResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/BaseEntity.java b/src/main/java/com/glxp/api/entity/BaseEntity.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/BaseEntity.java rename to src/main/java/com/glxp/api/entity/BaseEntity.java index 5e28a14d..ff1bddee 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/BaseEntity.java +++ b/src/main/java/com/glxp/api/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity; +package com.glxp.api.entity; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthAdmin.java b/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthAdmin.java rename to src/main/java/com/glxp/api/entity/auth/AuthAdmin.java index e3eab306..adbb9aa2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthAdmin.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; -import com.glxp.api.admin.constant.Constant; +import com.glxp.api.constant.Constant; import lombok.Data; import java.util.Date; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthCheckEntity.java b/src/main/java/com/glxp/api/entity/auth/AuthCheckEntity.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthCheckEntity.java rename to src/main/java/com/glxp/api/entity/auth/AuthCheckEntity.java index 5644d0cf..8e5701f5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthCheckEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthCheckEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthConnectEntity.java b/src/main/java/com/glxp/api/entity/auth/AuthConnectEntity.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthConnectEntity.java rename to src/main/java/com/glxp/api/entity/auth/AuthConnectEntity.java index 2e1e7466..63d7fd46 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthConnectEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthConnectEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthLicense.java b/src/main/java/com/glxp/api/entity/auth/AuthLicense.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthLicense.java rename to src/main/java/com/glxp/api/entity/auth/AuthLicense.java index 6282fb06..0ebdae9d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthLicense.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthLicense.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthPermission.java b/src/main/java/com/glxp/api/entity/auth/AuthPermission.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthPermission.java rename to src/main/java/com/glxp/api/entity/auth/AuthPermission.java index c0ba1fe8..a3b65104 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthPermission.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthPermission.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthPermissionRule.java b/src/main/java/com/glxp/api/entity/auth/AuthPermissionRule.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthPermissionRule.java rename to src/main/java/com/glxp/api/entity/auth/AuthPermissionRule.java index b11708cd..cf54fbd2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthPermissionRule.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthPermissionRule.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthRole.java b/src/main/java/com/glxp/api/entity/auth/AuthRole.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthRole.java rename to src/main/java/com/glxp/api/entity/auth/AuthRole.java index 79dd7069..2fdffbe9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthRole.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthRole.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthRoleAdmin.java b/src/main/java/com/glxp/api/entity/auth/AuthRoleAdmin.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthRoleAdmin.java rename to src/main/java/com/glxp/api/entity/auth/AuthRoleAdmin.java index f0c16429..a13fe0da 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthRoleAdmin.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthRoleAdmin.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptEntity.java rename to src/main/java/com/glxp/api/entity/auth/DeptEntity.java index e27d53d0..f1b2a60c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; -import com.glxp.api.admin.entity.BaseEntity; +import com.glxp.api.entity.BaseEntity; import lombok.Data; import org.apache.poi.ss.formula.functions.T; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptHisStatusEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptHisStatusEntity.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptHisStatusEntity.java rename to src/main/java/com/glxp/api/entity/auth/DeptHisStatusEntity.java index abe56fd7..582fe069 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptHisStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptHisStatusEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptUserEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptUserEntity.java rename to src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java index 645118ff..e857cf24 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptUserEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/LoginUser.java b/src/main/java/com/glxp/api/entity/auth/LoginUser.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/LoginUser.java rename to src/main/java/com/glxp/api/entity/auth/LoginUser.java index 11c9890f..7b774e9d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/LoginUser.java +++ b/src/main/java/com/glxp/api/entity/auth/LoginUser.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/MetaEntity.java b/src/main/java/com/glxp/api/entity/auth/MetaEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/MetaEntity.java rename to src/main/java/com/glxp/api/entity/auth/MetaEntity.java index 35d0e5e7..f0e005fb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/MetaEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/MetaEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/RoleEntity.java b/src/main/java/com/glxp/api/entity/auth/RoleEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/RoleEntity.java rename to src/main/java/com/glxp/api/entity/auth/RoleEntity.java index 5cfa4856..df7dbd36 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/RoleEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/RoleEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/RouterEntity.java b/src/main/java/com/glxp/api/entity/auth/RouterEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/RouterEntity.java rename to src/main/java/com/glxp/api/entity/auth/RouterEntity.java index cdb9a5a9..4a91d585 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/RouterEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/RouterEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysDictData.java b/src/main/java/com/glxp/api/entity/auth/SysDictData.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysDictData.java rename to src/main/java/com/glxp/api/entity/auth/SysDictData.java index bb40d3aa..c47ec2f2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysDictData.java +++ b/src/main/java/com/glxp/api/entity/auth/SysDictData.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.BaseEntity; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.BaseEntity; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysDictType.java b/src/main/java/com/glxp/api/entity/auth/SysDictType.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysDictType.java rename to src/main/java/com/glxp/api/entity/auth/SysDictType.java index 652cb3d9..8273cafc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysDictType.java +++ b/src/main/java/com/glxp/api/entity/auth/SysDictType.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; -import com.glxp.api.admin.entity.BaseEntity; +import com.glxp.api.entity.BaseEntity; import lombok.Data; import javax.validation.constraints.Pattern; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysHisStatusEntity.java b/src/main/java/com/glxp/api/entity/auth/SysHisStatusEntity.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysHisStatusEntity.java rename to src/main/java/com/glxp/api/entity/auth/SysHisStatusEntity.java index e5abcd65..b7767621 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysHisStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/SysHisStatusEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysMenu.java b/src/main/java/com/glxp/api/entity/auth/SysMenu.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysMenu.java rename to src/main/java/com/glxp/api/entity/auth/SysMenu.java index af77d220..efe5a75f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysMenu.java +++ b/src/main/java/com/glxp/api/entity/auth/SysMenu.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysRole.java b/src/main/java/com/glxp/api/entity/auth/SysRole.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysRole.java rename to src/main/java/com/glxp/api/entity/auth/SysRole.java index 068082ab..05d2f7f6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysRole.java +++ b/src/main/java/com/glxp/api/entity/auth/SysRole.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; -import com.glxp.api.admin.entity.BaseEntity; +import com.glxp.api.entity.BaseEntity; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysRoleMenu.java b/src/main/java/com/glxp/api/entity/auth/SysRoleMenu.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysRoleMenu.java rename to src/main/java/com/glxp/api/entity/auth/SysRoleMenu.java index 10643bee..1f2f9a03 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysRoleMenu.java +++ b/src/main/java/com/glxp/api/entity/auth/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysUserRole.java b/src/main/java/com/glxp/api/entity/auth/SysUserRole.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysUserRole.java rename to src/main/java/com/glxp/api/entity/auth/SysUserRole.java index 9f081135..f12d3a09 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysUserRole.java +++ b/src/main/java/com/glxp/api/entity/auth/SysUserRole.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/TreeEntity.java b/src/main/java/com/glxp/api/entity/auth/TreeEntity.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/entity/auth/TreeEntity.java rename to src/main/java/com/glxp/api/entity/auth/TreeEntity.java index c48e72c2..3f900abf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/TreeEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/TreeEntity.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.entity.auth; +package com.glxp.api.entity.auth; -import com.glxp.api.admin.entity.BaseEntity; +import com.glxp.api.entity.BaseEntity; import lombok.Data; import java.util.ArrayList; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicBusTypeChangeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicBusTypeChangeEntity.java rename to src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java index af93114e..36fd615b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicBusTypeChangeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicDownloadStatusEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicDownloadStatusEntity.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicDownloadStatusEntity.java rename to src/main/java/com/glxp/api/entity/basic/BasicDownloadStatusEntity.java index f64b5923..8d9be4d2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicDownloadStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicDownloadStatusEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicExportStatusEntity.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusEntity.java rename to src/main/java/com/glxp/api/entity/basic/BasicExportStatusEntity.java index 489e4e51..c91e76b8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicExportStatusEntity.java @@ -1,9 +1,8 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; import java.util.Date; -import java.util.List; @Data public class BasicExportStatusEntity { diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusTimeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicExportStatusTimeEntity.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusTimeEntity.java rename to src/main/java/com/glxp/api/entity/basic/BasicExportStatusTimeEntity.java index 8a13327e..746ba8af 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusTimeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicExportStatusTimeEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysBusApiEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicThirdSysBusApiEntity.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysBusApiEntity.java rename to src/main/java/com/glxp/api/entity/basic/BasicThirdSysBusApiEntity.java index 6a099662..9fb276a1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysBusApiEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicThirdSysBusApiEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicThirdSysDetailEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysDetailEntity.java rename to src/main/java/com/glxp/api/entity/basic/BasicThirdSysDetailEntity.java index 32056b43..ab4b17ab 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicThirdSysDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicThirdSysEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java rename to src/main/java/com/glxp/api/entity/basic/BasicThirdSysEntity.java index e07cf552..925a81d1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicThirdSysEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicUnitMaintainEntity.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java rename to src/main/java/com/glxp/api/entity/basic/BasicUnitMaintainEntity.java index 515233a9..d4bac6e8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicUnitMaintainEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BusDataEntity.java b/src/main/java/com/glxp/api/entity/basic/BusDataEntity.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BusDataEntity.java rename to src/main/java/com/glxp/api/entity/basic/BusDataEntity.java index 8ee6230e..dc2d99ec 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BusDataEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BusDataEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessChangeTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BussinessChangeTypeEntity.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessChangeTypeEntity.java rename to src/main/java/com/glxp/api/entity/basic/BussinessChangeTypeEntity.java index 0e716607..415bd834 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessChangeTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BussinessChangeTypeEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BussinessLocalTypeEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java rename to src/main/java/com/glxp/api/entity/basic/BussinessLocalTypeEntity.java index 5632d96c..caca31b8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BussinessLocalTypeEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessOriginTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BussinessOriginTypeEntity.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessOriginTypeEntity.java rename to src/main/java/com/glxp/api/entity/basic/BussinessOriginTypeEntity.java index 64d7674b..857f6ad9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessOriginTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BussinessOriginTypeEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BussinessTypeEntity.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java rename to src/main/java/com/glxp/api/entity/basic/BussinessTypeEntity.java index 2baaae0b..f71d75e0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BussinessTypeEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CndidateRequest.java b/src/main/java/com/glxp/api/entity/basic/CndidateRequest.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/CndidateRequest.java rename to src/main/java/com/glxp/api/entity/basic/CndidateRequest.java index 3d659583..82a154fa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CndidateRequest.java +++ b/src/main/java/com/glxp/api/entity/basic/CndidateRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CompanyProductRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/CompanyProductRelevanceEntity.java rename to src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java index 54eb1b8d..2166491d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CompanyProductRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpExportLogEntity.java b/src/main/java/com/glxp/api/entity/basic/CorpExportLogEntity.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpExportLogEntity.java rename to src/main/java/com/glxp/api/entity/basic/CorpExportLogEntity.java index afcf0009..ab57480b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpExportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/CorpExportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpImportDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/CorpImportDetailEntity.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpImportDetailEntity.java rename to src/main/java/com/glxp/api/entity/basic/CorpImportDetailEntity.java index eda14c22..1dc14c50 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpImportDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/CorpImportDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpImportLogEntity.java b/src/main/java/com/glxp/api/entity/basic/CorpImportLogEntity.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpImportLogEntity.java rename to src/main/java/com/glxp/api/entity/basic/CorpImportLogEntity.java index 9727223e..9807bf95 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpImportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/CorpImportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/DlEntrustReceEntity.java b/src/main/java/com/glxp/api/entity/basic/DlEntrustReceEntity.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/DlEntrustReceEntity.java rename to src/main/java/com/glxp/api/entity/basic/DlEntrustReceEntity.java index f3822b0e..79aea203 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/DlEntrustReceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/DlEntrustReceEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/EntrustReceEntity.java b/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/EntrustReceEntity.java rename to src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java index 86e39f81..40004307 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/EntrustReceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/FilterSysEntity.java b/src/main/java/com/glxp/api/entity/basic/FilterSysEntity.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/FilterSysEntity.java rename to src/main/java/com/glxp/api/entity/basic/FilterSysEntity.java index 1b85e7bd..352b5147 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/FilterSysEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/FilterSysEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/NewUploadDiEntity.java b/src/main/java/com/glxp/api/entity/basic/NewUploadDiEntity.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/NewUploadDiEntity.java rename to src/main/java/com/glxp/api/entity/basic/NewUploadDiEntity.java index d9349280..65da86bf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/NewUploadDiEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/NewUploadDiEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ProductInfoEntity.java b/src/main/java/com/glxp/api/entity/basic/ProductInfoEntity.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/ProductInfoEntity.java rename to src/main/java/com/glxp/api/entity/basic/ProductInfoEntity.java index 2263fa46..271cbb7d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ProductInfoEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/ProductInfoEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/SpsBusLoclTypeResponse.java b/src/main/java/com/glxp/api/entity/basic/SpsBusLoclTypeResponse.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/SpsBusLoclTypeResponse.java rename to src/main/java/com/glxp/api/entity/basic/SpsBusLoclTypeResponse.java index 4592a95b..437d316b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/SpsBusLoclTypeResponse.java +++ b/src/main/java/com/glxp/api/entity/basic/SpsBusLoclTypeResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiCompanyEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiCompanyEntity.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiCompanyEntity.java rename to src/main/java/com/glxp/api/entity/basic/UdiCompanyEntity.java index 478f1691..ed9d2b8a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiCompanyEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiCompanyEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiEntity.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiEntity.java rename to src/main/java/com/glxp/api/entity/basic/UdiEntity.java index 661c5ae4..af3d42ec 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; /** * @author 彭于晏 diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiInfoEntity.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java rename to src/main/java/com/glxp/api/entity/basic/UdiInfoEntity.java index 07e136e6..4aaef15c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiInfoEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoExportLogEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiInfoExportLogEntity.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoExportLogEntity.java rename to src/main/java/com/glxp/api/entity/basic/UdiInfoExportLogEntity.java index 56e8d80f..1fa40d05 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoExportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiInfoExportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiInfoImportDetailEntity.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportDetailEntity.java rename to src/main/java/com/glxp/api/entity/basic/UdiInfoImportDetailEntity.java index 9564f5e2..3c1508f8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiInfoImportDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportLogEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiInfoImportLogEntity.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportLogEntity.java rename to src/main/java/com/glxp/api/entity/basic/UdiInfoImportLogEntity.java index b94a036f..3960434b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiInfoImportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java rename to src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index f0a452f5..0eed23f4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UnitMaintainEntity.java b/src/main/java/com/glxp/api/entity/basic/UnitMaintainEntity.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/UnitMaintainEntity.java rename to src/main/java/com/glxp/api/entity/basic/UnitMaintainEntity.java index 1652026a..343fbca1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UnitMaintainEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UnitMaintainEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.entity.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/InvSpace.java b/src/main/java/com/glxp/api/entity/business/InvSpace.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/business/InvSpace.java rename to src/main/java/com/glxp/api/entity/business/InvSpace.java index b12fe546..297fe9b1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/InvSpace.java +++ b/src/main/java/com/glxp/api/entity/business/InvSpace.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.business; +package com.glxp.api.entity.business; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/business/StockOrderDetailEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java rename to src/main/java/com/glxp/api/entity/business/StockOrderDetailEntity.java index 73e9899f..9521dd6b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/business/StockOrderDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.business; +package com.glxp.api.entity.business; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java b/src/main/java/com/glxp/api/entity/business/StockOrderEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java rename to src/main/java/com/glxp/api/entity/business/StockOrderEntity.java index 0dd947c8..0e77187c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/business/StockOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.business; +package com.glxp.api.entity.business; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java b/src/main/java/com/glxp/api/entity/business/StockOrderPrintEntity.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java rename to src/main/java/com/glxp/api/entity/business/StockOrderPrintEntity.java index d9780d6f..00a1b769 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java +++ b/src/main/java/com/glxp/api/entity/business/StockOrderPrintEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.business; +package com.glxp.api.entity.business; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java b/src/main/java/com/glxp/api/entity/business/StockOrderRemakEntity.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java rename to src/main/java/com/glxp/api/entity/business/StockOrderRemakEntity.java index 7d92f3d3..04ef48e5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java +++ b/src/main/java/com/glxp/api/entity/business/StockOrderRemakEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.business; +package com.glxp.api.entity.business; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderUploadLogEntity.java b/src/main/java/com/glxp/api/entity/business/StockOrderUploadLogEntity.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderUploadLogEntity.java rename to src/main/java/com/glxp/api/entity/business/StockOrderUploadLogEntity.java index 2c1b6730..243e2e1d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderUploadLogEntity.java +++ b/src/main/java/com/glxp/api/entity/business/StockOrderUploadLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.business; +package com.glxp.api.entity.business; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockQRCodeTextEntity.java b/src/main/java/com/glxp/api/entity/business/StockQRCodeTextEntity.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/entity/business/StockQRCodeTextEntity.java rename to src/main/java/com/glxp/api/entity/business/StockQRCodeTextEntity.java index 6b8b60b3..12fdb42c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockQRCodeTextEntity.java +++ b/src/main/java/com/glxp/api/entity/business/StockQRCodeTextEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.business; +package com.glxp.api.entity.business; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/ClassifyCodeEntity.java b/src/main/java/com/glxp/api/entity/info/ClassifyCodeEntity.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/ClassifyCodeEntity.java rename to src/main/java/com/glxp/api/entity/info/ClassifyCodeEntity.java index 017fd0bc..b6ba10b4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/ClassifyCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/info/ClassifyCodeEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/CompanyEntity.java b/src/main/java/com/glxp/api/entity/info/CompanyEntity.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/CompanyEntity.java rename to src/main/java/com/glxp/api/entity/info/CompanyEntity.java index 329c314b..7a18b7c3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/CompanyEntity.java +++ b/src/main/java/com/glxp/api/entity/info/CompanyEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/DbVersionEntity.java b/src/main/java/com/glxp/api/entity/info/DbVersionEntity.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/DbVersionEntity.java rename to src/main/java/com/glxp/api/entity/info/DbVersionEntity.java index ec9b8082..80d7ae92 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/DbVersionEntity.java +++ b/src/main/java/com/glxp/api/entity/info/DbVersionEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/DeviceKeyEntity.java b/src/main/java/com/glxp/api/entity/info/DeviceKeyEntity.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/DeviceKeyEntity.java rename to src/main/java/com/glxp/api/entity/info/DeviceKeyEntity.java index 84e512b5..be4af970 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/DeviceKeyEntity.java +++ b/src/main/java/com/glxp/api/entity/info/DeviceKeyEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/MipsServiceEntity.java b/src/main/java/com/glxp/api/entity/info/MipsServiceEntity.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/MipsServiceEntity.java rename to src/main/java/com/glxp/api/entity/info/MipsServiceEntity.java index 6f7a3f11..ee79bcb4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/MipsServiceEntity.java +++ b/src/main/java/com/glxp/api/entity/info/MipsServiceEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/PlatformEntity.java b/src/main/java/com/glxp/api/entity/info/PlatformEntity.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/PlatformEntity.java rename to src/main/java/com/glxp/api/entity/info/PlatformEntity.java index 9761f8df..4be4bee7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/PlatformEntity.java +++ b/src/main/java/com/glxp/api/entity/info/PlatformEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/ProductRemarkSetEntity.java b/src/main/java/com/glxp/api/entity/info/ProductRemarkSetEntity.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/ProductRemarkSetEntity.java rename to src/main/java/com/glxp/api/entity/info/ProductRemarkSetEntity.java index 5ffcbacb..b72872d9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/ProductRemarkSetEntity.java +++ b/src/main/java/com/glxp/api/entity/info/ProductRemarkSetEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/ScheduledEntity.java b/src/main/java/com/glxp/api/entity/info/ScheduledEntity.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/ScheduledEntity.java rename to src/main/java/com/glxp/api/entity/info/ScheduledEntity.java index d1207f7a..1562fbaa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/ScheduledEntity.java +++ b/src/main/java/com/glxp/api/entity/info/ScheduledEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SchemaData.java b/src/main/java/com/glxp/api/entity/info/SchemaData.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/SchemaData.java rename to src/main/java/com/glxp/api/entity/info/SchemaData.java index d56235b7..96e4016f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SchemaData.java +++ b/src/main/java/com/glxp/api/entity/info/SchemaData.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SetupEntity.java b/src/main/java/com/glxp/api/entity/info/SetupEntity.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/SetupEntity.java rename to src/main/java/com/glxp/api/entity/info/SetupEntity.java index 206e77eb..9bd73b25 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SetupEntity.java +++ b/src/main/java/com/glxp/api/entity/info/SetupEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataBustypeEntity.java b/src/main/java/com/glxp/api/entity/info/SyncDataBustypeEntity.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataBustypeEntity.java rename to src/main/java/com/glxp/api/entity/info/SyncDataBustypeEntity.java index 9f500eec..b083cda9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataBustypeEntity.java +++ b/src/main/java/com/glxp/api/entity/info/SyncDataBustypeEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java b/src/main/java/com/glxp/api/entity/info/SyncDataSetEntity.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java rename to src/main/java/com/glxp/api/entity/info/SyncDataSetEntity.java index 01e28ed5..aa098b03 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java +++ b/src/main/java/com/glxp/api/entity/info/SyncDataSetEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncUploadDataSetEntity.java b/src/main/java/com/glxp/api/entity/info/SyncUploadDataSetEntity.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncUploadDataSetEntity.java rename to src/main/java/com/glxp/api/entity/info/SyncUploadDataSetEntity.java index 1670d3ef..4b02abdb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncUploadDataSetEntity.java +++ b/src/main/java/com/glxp/api/entity/info/SyncUploadDataSetEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SysServerLogEntity.java b/src/main/java/com/glxp/api/entity/info/SysServerLogEntity.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/SysServerLogEntity.java rename to src/main/java/com/glxp/api/entity/info/SysServerLogEntity.java index c4215612..7142c05c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SysServerLogEntity.java +++ b/src/main/java/com/glxp/api/entity/info/SysServerLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFModuleEntity.java b/src/main/java/com/glxp/api/entity/info/SystemPDFModuleEntity.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFModuleEntity.java rename to src/main/java/com/glxp/api/entity/info/SystemPDFModuleEntity.java index b9ea878b..a1f93138 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFModuleEntity.java +++ b/src/main/java/com/glxp/api/entity/info/SystemPDFModuleEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFTemplateEntity.java b/src/main/java/com/glxp/api/entity/info/SystemPDFTemplateEntity.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFTemplateEntity.java rename to src/main/java/com/glxp/api/entity/info/SystemPDFTemplateEntity.java index bd5eedb5..c1fca74e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFTemplateEntity.java +++ b/src/main/java/com/glxp/api/entity/info/SystemPDFTemplateEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFTemplateRelevanceEntity.java b/src/main/java/com/glxp/api/entity/info/SystemPDFTemplateRelevanceEntity.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFTemplateRelevanceEntity.java rename to src/main/java/com/glxp/api/entity/info/SystemPDFTemplateRelevanceEntity.java index 81dc5e34..11041f83 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFTemplateRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/info/SystemPDFTemplateRelevanceEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemParamConfigEntity.java b/src/main/java/com/glxp/api/entity/info/SystemParamConfigEntity.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemParamConfigEntity.java rename to src/main/java/com/glxp/api/entity/info/SystemParamConfigEntity.java index 243a4862..d1133d07 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemParamConfigEntity.java +++ b/src/main/java/com/glxp/api/entity/info/SystemParamConfigEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/ThirdSysApiEntity.java b/src/main/java/com/glxp/api/entity/info/ThirdSysApiEntity.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/ThirdSysApiEntity.java rename to src/main/java/com/glxp/api/entity/info/ThirdSysApiEntity.java index 14727623..62fb6fa6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/ThirdSysApiEntity.java +++ b/src/main/java/com/glxp/api/entity/info/ThirdSysApiEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/WebSocketEntity.java b/src/main/java/com/glxp/api/entity/info/WebSocketEntity.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/entity/info/WebSocketEntity.java rename to src/main/java/com/glxp/api/entity/info/WebSocketEntity.java index c85799c5..84916d71 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/WebSocketEntity.java +++ b/src/main/java/com/glxp/api/entity/info/WebSocketEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.info; +package com.glxp.api.entity.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/AcceptOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/AcceptOrderEntity.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/AcceptOrderEntity.java rename to src/main/java/com/glxp/api/entity/inout/AcceptOrderEntity.java index 5d5ce17a..9fba15ad 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/AcceptOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/AcceptOrderEntity.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.business.StockOrderDetailEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpDetailCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/ErpDetailCodeEntity.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpDetailCodeEntity.java rename to src/main/java/com/glxp/api/entity/inout/ErpDetailCodeEntity.java index fa3ee4dc..9e31dee5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpDetailCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/ErpDetailCodeEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/ErpOrderEntity.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java rename to src/main/java/com/glxp/api/entity/inout/ErpOrderEntity.java index e22d6eaf..53309070 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/ErpOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.java b/src/main/java/com/glxp/api/entity/inout/FilterErpOrderRequest.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.java rename to src/main/java/com/glxp/api/entity/inout/FilterErpOrderRequest.java index b490c495..9bf2ca32 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.java +++ b/src/main/java/com/glxp/api/entity/inout/FilterErpOrderRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/IOOrderStatusEntity.java b/src/main/java/com/glxp/api/entity/inout/IOOrderStatusEntity.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/IOOrderStatusEntity.java rename to src/main/java/com/glxp/api/entity/inout/IOOrderStatusEntity.java index 64303ad1..d8e811f3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/IOOrderStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IOOrderStatusEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/MipsDrugEntity.java b/src/main/java/com/glxp/api/entity/inout/MipsDrugEntity.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/MipsDrugEntity.java rename to src/main/java/com/glxp/api/entity/inout/MipsDrugEntity.java index b1c1bdf0..ad82a063 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/MipsDrugEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/MipsDrugEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inout/OrderDetailEntity.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderDetailEntity.java rename to src/main/java/com/glxp/api/entity/inout/OrderDetailEntity.java index 0568b66a..4e0f468c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/OrderDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java b/src/main/java/com/glxp/api/entity/inout/OrderEntity.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java rename to src/main/java/com/glxp/api/entity/inout/OrderEntity.java index fc467cbc..ed487c60 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/OrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockCheckEntity.java b/src/main/java/com/glxp/api/entity/inout/StockCheckEntity.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockCheckEntity.java rename to src/main/java/com/glxp/api/entity/inout/StockCheckEntity.java index 40414992..2df07bea 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockCheckEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/StockCheckEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/Unit.java b/src/main/java/com/glxp/api/entity/inout/Unit.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/Unit.java rename to src/main/java/com/glxp/api/entity/inout/Unit.java index 66760b94..01496ba9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/Unit.java +++ b/src/main/java/com/glxp/api/entity/inout/Unit.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/inout/WarehouseBussinessTypeEntity.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseBussinessTypeEntity.java rename to src/main/java/com/glxp/api/entity/inout/WarehouseBussinessTypeEntity.java index f65b2c8b..85b98b61 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/WarehouseBussinessTypeEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java b/src/main/java/com/glxp/api/entity/inout/WarehouseEntity.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java rename to src/main/java/com/glxp/api/entity/inout/WarehouseEntity.java index 31f653f4..1bbd0534 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/WarehouseEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseUserEntity.java b/src/main/java/com/glxp/api/entity/inout/WarehouseUserEntity.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseUserEntity.java rename to src/main/java/com/glxp/api/entity/inout/WarehouseUserEntity.java index 1f1e65d7..bd54242f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseUserEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/WarehouseUserEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/Warehousetemp.java b/src/main/java/com/glxp/api/entity/inout/Warehousetemp.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/Warehousetemp.java rename to src/main/java/com/glxp/api/entity/inout/Warehousetemp.java index fcbe57cd..ed97eaff 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/Warehousetemp.java +++ b/src/main/java/com/glxp/api/entity/inout/Warehousetemp.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.entity.inout; public class Warehousetemp { private Long id; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inventory/DeviceCollectOrderDetailEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderDetailEntity.java rename to src/main/java/com/glxp/api/entity/inventory/DeviceCollectOrderDetailEntity.java index 3e4e41cd..77661879 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/DeviceCollectOrderDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java b/src/main/java/com/glxp/api/entity/inventory/DeviceCollectOrderEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java rename to src/main/java/com/glxp/api/entity/inventory/DeviceCollectOrderEntity.java index f1fe0152..034a20a0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/DeviceCollectOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inventory/DeviceMAOrderDetailEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderDetailEntity.java rename to src/main/java/com/glxp/api/entity/inventory/DeviceMAOrderDetailEntity.java index 2b7ef8bb..de0f46ce 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/DeviceMAOrderDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderEntity.java b/src/main/java/com/glxp/api/entity/inventory/DeviceMAOrderEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderEntity.java rename to src/main/java/com/glxp/api/entity/inventory/DeviceMAOrderEntity.java index 3394978d..7704704d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/DeviceMAOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/ErpStockEntity.java b/src/main/java/com/glxp/api/entity/inventory/ErpStockEntity.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/ErpStockEntity.java rename to src/main/java/com/glxp/api/entity/inventory/ErpStockEntity.java index 249a347b..29f0803b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/ErpStockEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/ErpStockEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InCodeLogEntity.java b/src/main/java/com/glxp/api/entity/inventory/InCodeLogEntity.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InCodeLogEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InCodeLogEntity.java index acb1e10c..96ae0860 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InCodeLogEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InCodeLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inventory/InnerOrderDetailEntity.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderDetailEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InnerOrderDetailEntity.java index b0a77dfe..a5956901 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InnerOrderDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderEntity.java b/src/main/java/com/glxp/api/entity/inventory/InnerOrderEntity.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InnerOrderEntity.java index cb789f37..73593192 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InnerOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InsertStockPrintEntity.java b/src/main/java/com/glxp/api/entity/inventory/InsertStockPrintEntity.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InsertStockPrintEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InsertStockPrintEntity.java index 4c41cff3..17e58486 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InsertStockPrintEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InsertStockPrintEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; public class InsertStockPrintEntity { diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvBusUserEntity.java b/src/main/java/com/glxp/api/entity/inventory/InvBusUserEntity.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvBusUserEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InvBusUserEntity.java index a5cfd92b..870418cb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvBusUserEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InvBusUserEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountCodes.java b/src/main/java/com/glxp/api/entity/inventory/InvCountCodes.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountCodes.java rename to src/main/java/com/glxp/api/entity/inventory/InvCountCodes.java index e46c2d60..3efcb58c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountCodes.java +++ b/src/main/java/com/glxp/api/entity/inventory/InvCountCodes.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrder.java b/src/main/java/com/glxp/api/entity/inventory/InvCountOrder.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrder.java rename to src/main/java/com/glxp/api/entity/inventory/InvCountOrder.java index 908dd2a0..47892fbf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrder.java +++ b/src/main/java/com/glxp/api/entity/inventory/InvCountOrder.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrderDetail.java b/src/main/java/com/glxp/api/entity/inventory/InvCountOrderDetail.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrderDetail.java rename to src/main/java/com/glxp/api/entity/inventory/InvCountOrderDetail.java index c57ec7b7..a7d9e77b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrderDetail.java +++ b/src/main/java/com/glxp/api/entity/inventory/InvCountOrderDetail.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountSettingEntity.java b/src/main/java/com/glxp/api/entity/inventory/InvCountSettingEntity.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountSettingEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InvCountSettingEntity.java index 61619b39..889defd9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountSettingEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InvCountSettingEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceExplanationEntity.java b/src/main/java/com/glxp/api/entity/inventory/InvMaintenanceExplanationEntity.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceExplanationEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InvMaintenanceExplanationEntity.java index 61c14c66..a70ae62e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceExplanationEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InvMaintenanceExplanationEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inventory/InvMaintenanceOrderDetailEntity.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceOrderDetailEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InvMaintenanceOrderDetailEntity.java index 35e51ba2..78c2979a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InvMaintenanceOrderDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceOrderEntity.java b/src/main/java/com/glxp/api/entity/inventory/InvMaintenanceOrderEntity.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceOrderEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InvMaintenanceOrderEntity.java index 6a3698c9..05cab221 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InvMaintenanceOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductDetailEntity.java b/src/main/java/com/glxp/api/entity/inventory/InvProductDetailEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductDetailEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InvProductDetailEntity.java index 21734864..1ab4ab90 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InvProductDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductEntity.java b/src/main/java/com/glxp/api/entity/inventory/InvProductEntity.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InvProductEntity.java index 4523e3df..558dc8f6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InvProductEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvSubWarehouseEntity.java b/src/main/java/com/glxp/api/entity/inventory/InvSubWarehouseEntity.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvSubWarehouseEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InvSubWarehouseEntity.java index e5f196f0..bc57327d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvSubWarehouseEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InvSubWarehouseEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvWarehouseEntity.java b/src/main/java/com/glxp/api/entity/inventory/InvWarehouseEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvWarehouseEntity.java rename to src/main/java/com/glxp/api/entity/inventory/InvWarehouseEntity.java index 349eacc8..8415b9a6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvWarehouseEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/InvWarehouseEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java b/src/main/java/com/glxp/api/entity/inventory/StockPrintEntity.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java rename to src/main/java/com/glxp/api/entity/inventory/StockPrintEntity.java index 277ef1c5..9e098b5a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/StockPrintEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintTempEntity.java b/src/main/java/com/glxp/api/entity/inventory/StockPrintTempEntity.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintTempEntity.java rename to src/main/java/com/glxp/api/entity/inventory/StockPrintTempEntity.java index 06878bac..01909068 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintTempEntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/StockPrintTempEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrinttREntity.java b/src/main/java/com/glxp/api/entity/inventory/StockPrinttREntity.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrinttREntity.java rename to src/main/java/com/glxp/api/entity/inventory/StockPrinttREntity.java index 01d731cf..8a0afe47 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrinttREntity.java +++ b/src/main/java/com/glxp/api/entity/inventory/StockPrinttREntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inventory; +package com.glxp.api.entity.inventory; import java.util.Date; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/monitor/OperLogDTO.java b/src/main/java/com/glxp/api/entity/monitor/OperLogDTO.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/monitor/OperLogDTO.java rename to src/main/java/com/glxp/api/entity/monitor/OperLogDTO.java index fc6c4a4b..45c77f3f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/monitor/OperLogDTO.java +++ b/src/main/java/com/glxp/api/entity/monitor/OperLogDTO.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.monitor; +package com.glxp.api.entity.monitor; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/monitor/SysLogininfor.java b/src/main/java/com/glxp/api/entity/monitor/SysLogininfor.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/entity/monitor/SysLogininfor.java rename to src/main/java/com/glxp/api/entity/monitor/SysLogininfor.java index 74563fb8..fafc41dc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/monitor/SysLogininfor.java +++ b/src/main/java/com/glxp/api/entity/monitor/SysLogininfor.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.monitor; +package com.glxp.api.entity.monitor; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/monitor/SysOperLog.java b/src/main/java/com/glxp/api/entity/monitor/SysOperLog.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/monitor/SysOperLog.java rename to src/main/java/com/glxp/api/entity/monitor/SysOperLog.java index 621e5111..2471019c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/monitor/SysOperLog.java +++ b/src/main/java/com/glxp/api/entity/monitor/SysOperLog.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.monitor; +package com.glxp.api.entity.monitor; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanySalesmanEntity.java b/src/main/java/com/glxp/api/entity/purchase/CompanySalesmanEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanySalesmanEntity.java rename to src/main/java/com/glxp/api/entity/purchase/CompanySalesmanEntity.java index 6706fdcf..9bc978ef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanySalesmanEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/CompanySalesmanEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.purchase; +package com.glxp.api.entity.purchase; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanyUpdateLogEntity.java b/src/main/java/com/glxp/api/entity/purchase/CompanyUpdateLogEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanyUpdateLogEntity.java rename to src/main/java/com/glxp/api/entity/purchase/CompanyUpdateLogEntity.java index 480f836a..2d1ec26a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanyUpdateLogEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/CompanyUpdateLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.purchase; +package com.glxp.api.entity.purchase; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CustomerContactEntity.java b/src/main/java/com/glxp/api/entity/purchase/CustomerContactEntity.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CustomerContactEntity.java rename to src/main/java/com/glxp/api/entity/purchase/CustomerContactEntity.java index c2e866a5..38902985 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CustomerContactEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/CustomerContactEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.purchase; +package com.glxp.api.entity.purchase; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyDetailEntity.java rename to src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java index 9add7f6e..b2acf42f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.purchase; +package com.glxp.api.entity.purchase; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java rename to src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java index 8724afc9..0e5ee1a4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.purchase; +package com.glxp.api.entity.purchase; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanDetailEntity.java rename to src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java index 1aa862b0..da0055af 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.purchase; +package com.glxp.api.entity.purchase; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java rename to src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java index e943fe40..e1da5094 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java @@ -1,13 +1,10 @@ -package com.glxp.api.admin.entity.purchase; +package com.glxp.api.entity.purchase; import lombok.Data; -import lombok.EqualsAndHashCode; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; - /** * pur对象 pur_plan * diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupCertEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertEntity.java rename to src/main/java/com/glxp/api/entity/purchase/SupCertEntity.java index 17dc5854..4d10c5c0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupCertEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.purchase; +package com.glxp.api.entity.purchase; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertSetEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertSetEntity.java rename to src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java index 3addcf91..a514bce5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertSetEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.purchase; +package com.glxp.api.entity.purchase; import cn.hutool.core.util.StrUtil; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCompanyEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCompanyEntity.java rename to src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java index 64fcf324..4e61dfe0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCompanyEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.purchase; +package com.glxp.api.entity.purchase; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupManufacturerEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupManufacturerEntity.java rename to src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java index ad577fdb..ed39f014 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupManufacturerEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.purchase; +package com.glxp.api.entity.purchase; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupProductEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupProductEntity.java rename to src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java index 5731a104..6a51b956 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupProductEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.purchase; +package com.glxp.api.entity.purchase; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java index be632a2f..291c214e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpExportLogEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpExportLogEntity.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpExportLogEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrCorpExportLogEntity.java index b59212ab..4069c8ab 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpExportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpExportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpImportDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportDetailEntity.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpImportDetailEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportDetailEntity.java index 47cbc392..63ab7440 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpImportDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpImportLogEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportLogEntity.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpImportLogEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportLogEntity.java index da1e8443..b4993497 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpImportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrImportLogEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrImportLogEntity.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrImportLogEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrImportLogEntity.java index 79f41132..6ebbb04f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrImportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrImportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsEntity.java index 3de9055b..5eb5ef94 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsExportLogEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsExportLogEntity.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsExportLogEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsExportLogEntity.java index 81e87049..fee522f5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsExportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsExportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsImportDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsImportDetailEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsImportDetailEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsImportDetailEntity.java index 29ebfd67..1807ce5b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsImportDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsImportDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsImportLogEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsImportLogEntity.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsImportLogEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsImportLogEntity.java index 0c5aaac0..f476520a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsImportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsImportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvWarehouseEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvWarehouseEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java index c23c27a0..f687ae40 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvWarehouseEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderDetailEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java index b6c7000d..3e8b6b14 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java index bad726a2..5913c279 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderExportLogEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderExportLogEntity.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderExportLogEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrOrderExportLogEntity.java index 737fa1ee..03f8a07c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderExportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderExportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderImportDetailEntity.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportDetailEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrOrderImportDetailEntity.java index e6137dcc..5d49849a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderImportDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportLogEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderImportLogEntity.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportLogEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrOrderImportLogEntity.java index 7dd4c006..01918ff8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderImportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrPostOrderRequest.java b/src/main/java/com/glxp/api/entity/thrsys/ThrPostOrderRequest.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrPostOrderRequest.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrPostOrderRequest.java index 3148f897..75ed256c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrPostOrderRequest.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrPostOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java index 1286e98e..6d63a508 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsExportLogEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsExportLogEntity.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsExportLogEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrProductsExportLogEntity.java index 5018fc10..ac20ac97 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsExportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsExportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsImportDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportDetailEntity.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsImportDetailEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportDetailEntity.java index bbf03c91..4efcf70d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsImportDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsImportLogEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportLogEntity.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsImportLogEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportLogEntity.java index 425bb03c..4c0a1d21 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsImportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportLogEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrSubInvWarehouseEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrSubInvWarehouseEntity.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrSubInvWarehouseEntity.java rename to src/main/java/com/glxp/api/entity/thrsys/ThrSubInvWarehouseEntity.java index a278fa10..700514d3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrSubInvWarehouseEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrSubInvWarehouseEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.thrsys; +package com.glxp.api.entity.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/exception/JsonException.java b/src/main/java/com/glxp/api/exception/JsonException.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/exception/JsonException.java rename to src/main/java/com/glxp/api/exception/JsonException.java index ef76551a..7da45f74 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/exception/JsonException.java +++ b/src/main/java/com/glxp/api/exception/JsonException.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.exception; +package com.glxp.api.exception; import com.glxp.api.common.enums.ResultEnum; import lombok.Getter; diff --git a/api-admin/src/main/java/com/glxp/api/admin/exception/ServiceException.java b/src/main/java/com/glxp/api/exception/ServiceException.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/exception/ServiceException.java rename to src/main/java/com/glxp/api/exception/ServiceException.java index 98022d81..e193c6a0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/exception/ServiceException.java +++ b/src/main/java/com/glxp/api/exception/ServiceException.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.exception; +package com.glxp.api.exception; /** * 业务异常 diff --git a/api-admin/src/main/java/com/glxp/api/admin/handler/GlobalExceptionHandler.java b/src/main/java/com/glxp/api/handler/GlobalExceptionHandler.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/handler/GlobalExceptionHandler.java rename to src/main/java/com/glxp/api/handler/GlobalExceptionHandler.java index 18340da0..5b521317 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/handler/GlobalExceptionHandler.java +++ b/src/main/java/com/glxp/api/handler/GlobalExceptionHandler.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.handler; +package com.glxp.api.handler; -import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.exception.JsonException; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java b/src/main/java/com/glxp/api/httpclient/ErpBasicClient.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java rename to src/main/java/com/glxp/api/httpclient/ErpBasicClient.java index d82a7783..be6a35d4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/httpclient/ErpBasicClient.java @@ -1,22 +1,22 @@ -package com.glxp.api.admin.httpclient; +package com.glxp.api.httpclient; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.httpclient.req.UdiwmsBusTypeRequest; -import com.glxp.api.admin.httpclient.req.UdiwmsUnitRequest; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; -import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; -import com.glxp.api.admin.req.erp.UdiwmsWarehouseRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpProductsResponse; -import com.glxp.api.admin.res.basic.ErpUnitsResponse; -import com.glxp.api.admin.res.erp.UdiwmsWarehouseDetail; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.util.HttpOkClient; +import com.glxp.api.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.httpclient.req.UdiwmsBusTypeRequest; +import com.glxp.api.httpclient.req.UdiwmsUnitRequest; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.req.basic.FilterErpGoodsRequest; +import com.glxp.api.req.erp.UdiwmsWarehouseRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.ErpProductsResponse; +import com.glxp.api.res.basic.ErpUnitsResponse; +import com.glxp.api.res.erp.UdiwmsWarehouseDetail; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.util.HttpOkClient; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java b/src/main/java/com/glxp/api/httpclient/ErpInvClient.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java rename to src/main/java/com/glxp/api/httpclient/ErpInvClient.java index bd0f3936..e793c392 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java +++ b/src/main/java/com/glxp/api/httpclient/ErpInvClient.java @@ -1,13 +1,12 @@ -package com.glxp.api.admin.httpclient; +package com.glxp.api.httpclient; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.req.inventory.ErpOnhandRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.ErpInvProductResponse; -import com.glxp.api.admin.res.inventory.ErpOnHandResponse; -import com.glxp.api.admin.util.HttpClient; -import com.glxp.api.admin.util.HttpOkClient; +import com.glxp.api.req.inventory.ErpOnhandRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.ErpInvProductResponse; +import com.glxp.api.res.inventory.ErpOnHandResponse; +import com.glxp.api.util.HttpOkClient; import com.glxp.api.common.res.BaseResponse; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java b/src/main/java/com/glxp/api/httpclient/ErpOrderClient.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java rename to src/main/java/com/glxp/api/httpclient/ErpOrderClient.java index ae54552a..dbb80e0f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java +++ b/src/main/java/com/glxp/api/httpclient/ErpOrderClient.java @@ -1,19 +1,18 @@ -package com.glxp.api.admin.httpclient; +package com.glxp.api.httpclient; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.httpclient.req.UdiwmsOrderRequest; -import com.glxp.api.admin.req.inout.ERPPostBillRequest; -import com.glxp.api.admin.req.inout.FilterOrderRequest; -import com.glxp.api.admin.req.inout.USignRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inout.ErpOrderResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.util.HttpClient; -import com.glxp.api.admin.util.HttpOkClient; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.httpclient.req.UdiwmsOrderRequest; +import com.glxp.api.req.inout.ERPPostBillRequest; +import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.inout.USignRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.ErpOrderResponse; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.util.HttpOkClient; import com.glxp.api.common.res.BaseResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java b/src/main/java/com/glxp/api/httpclient/SpGetHttpClient.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java rename to src/main/java/com/glxp/api/httpclient/SpGetHttpClient.java index cdb2145a..fe2ed4b6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/httpclient/SpGetHttpClient.java @@ -1,22 +1,22 @@ -package com.glxp.api.admin.httpclient; +package com.glxp.api.httpclient; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.entity.basic.BasicExportStatusEntity; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; -import com.glxp.api.admin.entity.inout.IOOrderStatusEntity; -import com.glxp.api.admin.req.basic.BasicExportStatusRequest; -import com.glxp.api.admin.req.inout.OrderStatusFilterRequest; -import com.glxp.api.admin.req.sync.PostDownloadInfo; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.SpsSyncBusResponse; -import com.glxp.api.admin.res.basic.SpsSyncDataResponse; -import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; -import com.glxp.api.admin.res.basic.SpsSyncScheduleResponse; -import com.glxp.api.admin.res.inout.DlOrderResponse; -import com.glxp.api.admin.service.info.SyncDataSetService; -import com.glxp.api.admin.util.OkHttpCli; +import com.glxp.api.entity.basic.BasicExportStatusEntity; +import com.glxp.api.entity.info.SyncDataSetEntity; +import com.glxp.api.entity.inout.IOOrderStatusEntity; +import com.glxp.api.req.basic.BasicExportStatusRequest; +import com.glxp.api.req.inout.OrderStatusFilterRequest; +import com.glxp.api.req.sync.PostDownloadInfo; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.SpsSyncBusResponse; +import com.glxp.api.res.basic.SpsSyncDataResponse; +import com.glxp.api.res.basic.SpsSyncOrderResponse; +import com.glxp.api.res.basic.SpsSyncScheduleResponse; +import com.glxp.api.res.inout.DlOrderResponse; +import com.glxp.api.service.info.SyncDataSetService; +import com.glxp.api.util.OkHttpCli; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpsDirectClient.java b/src/main/java/com/glxp/api/httpclient/SpsDirectClient.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/SpsDirectClient.java rename to src/main/java/com/glxp/api/httpclient/SpsDirectClient.java index 28375be4..dbf97464 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpsDirectClient.java +++ b/src/main/java/com/glxp/api/httpclient/SpsDirectClient.java @@ -1,16 +1,15 @@ -package com.glxp.api.admin.httpclient; +package com.glxp.api.httpclient; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.req.inout.PostOrderRequest; -import com.glxp.api.admin.service.info.SyncDataSetService; -import com.glxp.api.admin.util.OkHttpCli; +import com.glxp.api.entity.info.SyncDataSetEntity; +import com.glxp.api.req.inout.OrderFilterRequest; +import com.glxp.api.req.inout.PostOrderRequest; +import com.glxp.api.service.info.SyncDataSetService; +import com.glxp.api.util.OkHttpCli; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/UHttpClient.java b/src/main/java/com/glxp/api/httpclient/UHttpClient.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/UHttpClient.java rename to src/main/java/com/glxp/api/httpclient/UHttpClient.java index 400e0317..e2c462f0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/UHttpClient.java +++ b/src/main/java/com/glxp/api/httpclient/UHttpClient.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.httpclient; +package com.glxp.api.httpclient; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java b/src/main/java/com/glxp/api/httpclient/UdiDlHttpClient.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java rename to src/main/java/com/glxp/api/httpclient/UdiDlHttpClient.java index c6cc0560..1e7ba98c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java +++ b/src/main/java/com/glxp/api/httpclient/UdiDlHttpClient.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.httpclient; +package com.glxp.api.httpclient; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.ProductInfoEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest; -import com.glxp.api.admin.service.basic.ProductInfoService; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.util.UuidUtils; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.ProductInfoEntity; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.req.receipt.ProductInfoFilterRequest; +import com.glxp.api.service.basic.ProductInfoService; +import com.glxp.api.service.basic.UdiInfoService; +import com.glxp.api.util.UuidUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsBusTypeRequest.java b/src/main/java/com/glxp/api/httpclient/req/UdiwmsBusTypeRequest.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsBusTypeRequest.java rename to src/main/java/com/glxp/api/httpclient/req/UdiwmsBusTypeRequest.java index dda2e5bc..e9803f4f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsBusTypeRequest.java +++ b/src/main/java/com/glxp/api/httpclient/req/UdiwmsBusTypeRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.httpclient.req; +package com.glxp.api.httpclient.req; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsOrderDetail.java b/src/main/java/com/glxp/api/httpclient/req/UdiwmsOrderDetail.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsOrderDetail.java rename to src/main/java/com/glxp/api/httpclient/req/UdiwmsOrderDetail.java index f52d47ae..77f08507 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsOrderDetail.java +++ b/src/main/java/com/glxp/api/httpclient/req/UdiwmsOrderDetail.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.httpclient.req; +package com.glxp.api.httpclient.req; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsOrderRequest.java b/src/main/java/com/glxp/api/httpclient/req/UdiwmsOrderRequest.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsOrderRequest.java rename to src/main/java/com/glxp/api/httpclient/req/UdiwmsOrderRequest.java index e93d7f34..511fd57d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsOrderRequest.java +++ b/src/main/java/com/glxp/api/httpclient/req/UdiwmsOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.httpclient.req; +package com.glxp.api.httpclient.req; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsPreInOrderRequest.java b/src/main/java/com/glxp/api/httpclient/req/UdiwmsPreInOrderRequest.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsPreInOrderRequest.java rename to src/main/java/com/glxp/api/httpclient/req/UdiwmsPreInOrderRequest.java index 1edf69a4..718f33fd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsPreInOrderRequest.java +++ b/src/main/java/com/glxp/api/httpclient/req/UdiwmsPreInOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.httpclient.req; +package com.glxp.api.httpclient.req; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsUnitRequest.java b/src/main/java/com/glxp/api/httpclient/req/UdiwmsUnitRequest.java similarity index 63% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsUnitRequest.java rename to src/main/java/com/glxp/api/httpclient/req/UdiwmsUnitRequest.java index 16523519..c9b7dbbf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsUnitRequest.java +++ b/src/main/java/com/glxp/api/httpclient/req/UdiwmsUnitRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.httpclient.req; +package com.glxp.api.httpclient.req; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/res/UdiwmsOrderResponse.java b/src/main/java/com/glxp/api/httpclient/res/UdiwmsOrderResponse.java similarity index 69% rename from api-admin/src/main/java/com/glxp/api/admin/httpclient/res/UdiwmsOrderResponse.java rename to src/main/java/com/glxp/api/httpclient/res/UdiwmsOrderResponse.java index ac17f60d..ecf43188 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/res/UdiwmsOrderResponse.java +++ b/src/main/java/com/glxp/api/httpclient/res/UdiwmsOrderResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.httpclient.res; +package com.glxp.api.httpclient.res; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java b/src/main/java/com/glxp/api/req/ListPageRequest.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java rename to src/main/java/com/glxp/api/req/ListPageRequest.java index 94643729..11e840f7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java +++ b/src/main/java/com/glxp/api/req/ListPageRequest.java @@ -1,7 +1,6 @@ -package com.glxp.api.admin.req; +package com.glxp.api.req; import lombok.Data; -import reactor.util.annotation.NonNull; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java b/src/main/java/com/glxp/api/req/auth/AuthAdminQueryRequest.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java rename to src/main/java/com/glxp/api/req/auth/AuthAdminQueryRequest.java index 7c99beee..f26649f1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java +++ b/src/main/java/com/glxp/api/req/auth/AuthAdminQueryRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.java b/src/main/java/com/glxp/api/req/auth/AuthAdminSaveRequest.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.java rename to src/main/java/com/glxp/api/req/auth/AuthAdminSaveRequest.java index fbcbc992..0a862a74 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.java +++ b/src/main/java/com/glxp/api/req/auth/AuthAdminSaveRequest.java @@ -1,9 +1,8 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; import lombok.Data; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthCheckRequest.java b/src/main/java/com/glxp/api/req/auth/AuthCheckRequest.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthCheckRequest.java rename to src/main/java/com/glxp/api/req/auth/AuthCheckRequest.java index 683ff498..5d797326 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthCheckRequest.java +++ b/src/main/java/com/glxp/api/req/auth/AuthCheckRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthPermissionRuleSaveRequest.java b/src/main/java/com/glxp/api/req/auth/AuthPermissionRuleSaveRequest.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthPermissionRuleSaveRequest.java rename to src/main/java/com/glxp/api/req/auth/AuthPermissionRuleSaveRequest.java index 20396bf3..05423ae9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthPermissionRuleSaveRequest.java +++ b/src/main/java/com/glxp/api/req/auth/AuthPermissionRuleSaveRequest.java @@ -1,9 +1,8 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; import lombok.Data; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; /** * 权限规则的提交保存表单 diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleAuthRequest.java b/src/main/java/com/glxp/api/req/auth/AuthRoleAuthRequest.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleAuthRequest.java rename to src/main/java/com/glxp/api/req/auth/AuthRoleAuthRequest.java index 1eaa3c2b..a765e9ba 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleAuthRequest.java +++ b/src/main/java/com/glxp/api/req/auth/AuthRoleAuthRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleQueryRequest.java b/src/main/java/com/glxp/api/req/auth/AuthRoleQueryRequest.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleQueryRequest.java rename to src/main/java/com/glxp/api/req/auth/AuthRoleQueryRequest.java index b3011b40..43cbd991 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleQueryRequest.java +++ b/src/main/java/com/glxp/api/req/auth/AuthRoleQueryRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleSaveRequest.java b/src/main/java/com/glxp/api/req/auth/AuthRoleSaveRequest.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleSaveRequest.java rename to src/main/java/com/glxp/api/req/auth/AuthRoleSaveRequest.java index 5c84e302..c84d3f20 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleSaveRequest.java +++ b/src/main/java/com/glxp/api/req/auth/AuthRoleSaveRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/ConnectRequest.java b/src/main/java/com/glxp/api/req/auth/ConnectRequest.java similarity index 61% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/ConnectRequest.java rename to src/main/java/com/glxp/api/req/auth/ConnectRequest.java index 1bce6942..30821969 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/ConnectRequest.java +++ b/src/main/java/com/glxp/api/req/auth/ConnectRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/DeptHisStatusRequest.java b/src/main/java/com/glxp/api/req/auth/DeptHisStatusRequest.java similarity index 64% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/DeptHisStatusRequest.java rename to src/main/java/com/glxp/api/req/auth/DeptHisStatusRequest.java index 9bb47a30..3439f2c7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/DeptHisStatusRequest.java +++ b/src/main/java/com/glxp/api/req/auth/DeptHisStatusRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/DeptUserReqeust.java b/src/main/java/com/glxp/api/req/auth/DeptUserReqeust.java similarity index 62% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/DeptUserReqeust.java rename to src/main/java/com/glxp/api/req/auth/DeptUserReqeust.java index d83f7b79..1acf8bff 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/DeptUserReqeust.java +++ b/src/main/java/com/glxp/api/req/auth/DeptUserReqeust.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterDeptRequest.java b/src/main/java/com/glxp/api/req/auth/FilterDeptRequest.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterDeptRequest.java rename to src/main/java/com/glxp/api/req/auth/FilterDeptRequest.java index 5ffb4a14..e0ba9a5a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterDeptRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterDeptRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterNoSelectUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java similarity index 63% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterNoSelectUserRequest.java rename to src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java index 6a9b53eb..a5cf905c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterNoSelectUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterSysHisStatusRequest.java b/src/main/java/com/glxp/api/req/auth/FilterSysHisStatusRequest.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterSysHisStatusRequest.java rename to src/main/java/com/glxp/api/req/auth/FilterSysHisStatusRequest.java index e6c33a2a..3c7bd6f4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterSysHisStatusRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterSysHisStatusRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/LoginRequest.java b/src/main/java/com/glxp/api/req/auth/LoginRequest.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/LoginRequest.java rename to src/main/java/com/glxp/api/req/auth/LoginRequest.java index a670530b..0a24ecac 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/LoginRequest.java +++ b/src/main/java/com/glxp/api/req/auth/LoginRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/PCLoginRequest.java b/src/main/java/com/glxp/api/req/auth/PCLoginRequest.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/PCLoginRequest.java rename to src/main/java/com/glxp/api/req/auth/PCLoginRequest.java index 0a4daad9..dd63ab7a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/PCLoginRequest.java +++ b/src/main/java/com/glxp/api/req/auth/PCLoginRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/SysDictDataRequest.java b/src/main/java/com/glxp/api/req/auth/SysDictDataRequest.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/SysDictDataRequest.java rename to src/main/java/com/glxp/api/req/auth/SysDictDataRequest.java index 63733f60..0829266e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/SysDictDataRequest.java +++ b/src/main/java/com/glxp/api/req/auth/SysDictDataRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/SysDictTypeRequest.java b/src/main/java/com/glxp/api/req/auth/SysDictTypeRequest.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/SysDictTypeRequest.java rename to src/main/java/com/glxp/api/req/auth/SysDictTypeRequest.java index 54158aca..5e3ae3c6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/SysDictTypeRequest.java +++ b/src/main/java/com/glxp/api/req/auth/SysDictTypeRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/SysMenuRequest.java b/src/main/java/com/glxp/api/req/auth/SysMenuRequest.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/SysMenuRequest.java rename to src/main/java/com/glxp/api/req/auth/SysMenuRequest.java index 794f471b..3b520b29 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/SysMenuRequest.java +++ b/src/main/java/com/glxp/api/req/auth/SysMenuRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/SysRoleMenuRequest.java b/src/main/java/com/glxp/api/req/auth/SysRoleMenuRequest.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/SysRoleMenuRequest.java rename to src/main/java/com/glxp/api/req/auth/SysRoleMenuRequest.java index 16342e65..06133ab4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/SysRoleMenuRequest.java +++ b/src/main/java/com/glxp/api/req/auth/SysRoleMenuRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/SysRoleRequest.java b/src/main/java/com/glxp/api/req/auth/SysRoleRequest.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/SysRoleRequest.java rename to src/main/java/com/glxp/api/req/auth/SysRoleRequest.java index 4c00b927..a011d6dc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/SysRoleRequest.java +++ b/src/main/java/com/glxp/api/req/auth/SysRoleRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/SysUserRoleRequest.java b/src/main/java/com/glxp/api/req/auth/SysUserRoleRequest.java similarity index 62% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/SysUserRoleRequest.java rename to src/main/java/com/glxp/api/req/auth/SysUserRoleRequest.java index 716cb515..286d6071 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/SysUserRoleRequest.java +++ b/src/main/java/com/glxp/api/req/auth/SysUserRoleRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/UpdatePasswordRequest.java b/src/main/java/com/glxp/api/req/auth/UpdatePasswordRequest.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/req/auth/UpdatePasswordRequest.java rename to src/main/java/com/glxp/api/req/auth/UpdatePasswordRequest.java index 58b613a8..eefdefd8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/UpdatePasswordRequest.java +++ b/src/main/java/com/glxp/api/req/auth/UpdatePasswordRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.auth; +package com.glxp.api.req.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicBusTypeChangeRequest.java b/src/main/java/com/glxp/api/req/basic/BasicBusTypeChangeRequest.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicBusTypeChangeRequest.java rename to src/main/java/com/glxp/api/req/basic/BasicBusTypeChangeRequest.java index 38929835..a9cc5142 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicBusTypeChangeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicBusTypeChangeRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicDownloadRequest.java b/src/main/java/com/glxp/api/req/basic/BasicDownloadRequest.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicDownloadRequest.java rename to src/main/java/com/glxp/api/req/basic/BasicDownloadRequest.java index 1944984e..6d278142 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicDownloadRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicDownloadRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java b/src/main/java/com/glxp/api/req/basic/BasicEntrustRecRequest.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java rename to src/main/java/com/glxp/api/req/basic/BasicEntrustRecRequest.java index 4118cb76..845ed5f2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicEntrustRecRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.Date; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportStatusRequest.java b/src/main/java/com/glxp/api/req/basic/BasicExportStatusRequest.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportStatusRequest.java rename to src/main/java/com/glxp/api/req/basic/BasicExportStatusRequest.java index 7016dbe8..aa77b3ca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportStatusRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicExportStatusRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportTimeRequest.java b/src/main/java/com/glxp/api/req/basic/BasicExportTimeRequest.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportTimeRequest.java rename to src/main/java/com/glxp/api/req/basic/BasicExportTimeRequest.java index 0012a7c7..a6025654 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicExportTimeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicExportTimeRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java rename to src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java index cb37d8bf..998022c3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; -import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.req.ListPageRequest; +import com.glxp.api.res.basic.ErpUnitsResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainSaveRequest.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainSaveRequest.java rename to src/main/java/com/glxp/api/req/basic/BasicUnitMaintainSaveRequest.java index 6f498d52..aef1ef2d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainSaveRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusNoUserRequest.java b/src/main/java/com/glxp/api/req/basic/BusNoUserRequest.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/BusNoUserRequest.java rename to src/main/java/com/glxp/api/req/basic/BusNoUserRequest.java index bd59cc97..ebb79911 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusNoUserRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BusNoUserRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusOriginJoinFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BusOriginJoinFilterRequest.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/BusOriginJoinFilterRequest.java rename to src/main/java/com/glxp/api/req/basic/BusOriginJoinFilterRequest.java index 3a6a8957..9b09689c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusOriginJoinFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BusOriginJoinFilterRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BusTypeChangeFilterRequest.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java rename to src/main/java/com/glxp/api/req/basic/BusTypeChangeFilterRequest.java index 2d903a34..978e918f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BusTypeChangeFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessLocalTypeFilterRequest.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java rename to src/main/java/com/glxp/api/req/basic/BussinessLocalTypeFilterRequest.java index 4a6561ec..d13dd28c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessLocalTypeFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessOriginTypeFilterRequest.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java rename to src/main/java/com/glxp/api/req/basic/BussinessOriginTypeFilterRequest.java index 166093c4..31961ba3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessOriginTypeFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java b/src/main/java/com/glxp/api/req/basic/CombineRequest.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java rename to src/main/java/com/glxp/api/req/basic/CombineRequest.java index 209d3462..4b75b293 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CombineRequest.java @@ -1,7 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.res.basic.ErpProductsResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.basic.ErpProductsResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineSingleUnitRequest.java b/src/main/java/com/glxp/api/req/basic/CombineSingleUnitRequest.java similarity index 64% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineSingleUnitRequest.java rename to src/main/java/com/glxp/api/req/basic/CombineSingleUnitRequest.java index b0c70ee1..c6fefa8d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineSingleUnitRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CombineSingleUnitRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.res.basic.ErpUnitsResponse; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/CompanyProductRelevanceRequest.java rename to src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index 76664918..465d25db 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CorpsExportRequest.java b/src/main/java/com/glxp/api/req/basic/CorpsExportRequest.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/CorpsExportRequest.java rename to src/main/java/com/glxp/api/req/basic/CorpsExportRequest.java index d8795450..212aeae6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CorpsExportRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CorpsExportRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysDetailRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBasicThirdSysDetailRequest.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysDetailRequest.java rename to src/main/java/com/glxp/api/req/basic/FilterBasicThirdSysDetailRequest.java index d4d6af46..1d53b86a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysDetailRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBasicThirdSysDetailRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBasicThirdSysRequest.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysRequest.java rename to src/main/java/com/glxp/api/req/basic/FilterBasicThirdSysRequest.java index ea7e4d68..3eef312c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBasicThirdSysRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java rename to src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java index 7fae042b..fbb0fe0b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java b/src/main/java/com/glxp/api/req/basic/FilterErpGoodsRequest.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java rename to src/main/java/com/glxp/api/req/basic/FilterErpGoodsRequest.java index 6d2ceabe..09848539 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterErpGoodsRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterInvBusTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterInvBusTypeRequest.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterInvBusTypeRequest.java rename to src/main/java/com/glxp/api/req/basic/FilterInvBusTypeRequest.java index b410b7b4..581f4372 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterInvBusTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterInvBusTypeRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterNewUploadDiRequest.java b/src/main/java/com/glxp/api/req/basic/FilterNewUploadDiRequest.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterNewUploadDiRequest.java rename to src/main/java/com/glxp/api/req/basic/FilterNewUploadDiRequest.java index e048a9f6..66b3dcfa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterNewUploadDiRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterNewUploadDiRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java b/src/main/java/com/glxp/api/req/basic/FilterStockprintRequest.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java rename to src/main/java/com/glxp/api/req/basic/FilterStockprintRequest.java index f987c0e5..50d7e8ca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterStockprintRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiEpLogRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiEpLogRequest.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiEpLogRequest.java rename to src/main/java/com/glxp/api/req/basic/FilterUdiEpLogRequest.java index 3af81ea9..a699c7db 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiEpLogRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiEpLogRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java rename to src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java index 30d1bc44..ab3dbaa6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiIpLogRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiIpLogRequest.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiIpLogRequest.java rename to src/main/java/com/glxp/api/req/basic/FilterUdiIpLogRequest.java index 796832bd..4b91dcfa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiIpLogRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiIpLogRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/LockUdiRequest.java b/src/main/java/com/glxp/api/req/basic/LockUdiRequest.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/LockUdiRequest.java rename to src/main/java/com/glxp/api/req/basic/LockUdiRequest.java index 680726f9..4734b68b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/LockUdiRequest.java +++ b/src/main/java/com/glxp/api/req/basic/LockUdiRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostCorpsRequest.java b/src/main/java/com/glxp/api/req/basic/PostCorpsRequest.java similarity index 61% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/PostCorpsRequest.java rename to src/main/java/com/glxp/api/req/basic/PostCorpsRequest.java index 0ec30f7c..81de1067 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostCorpsRequest.java +++ b/src/main/java/com/glxp/api/req/basic/PostCorpsRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.entity.basic.CorpImportDetailEntity; +import com.glxp.api.entity.basic.CorpImportDetailEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostSmpUdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/PostSmpUdiInfoRequest.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/PostSmpUdiInfoRequest.java rename to src/main/java/com/glxp/api/req/basic/PostSmpUdiInfoRequest.java index fb43e30d..d8759fee 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostSmpUdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/PostSmpUdiInfoRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostThirdSysPiRequest.java b/src/main/java/com/glxp/api/req/basic/PostThirdSysPiRequest.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/PostThirdSysPiRequest.java rename to src/main/java/com/glxp/api/req/basic/PostThirdSysPiRequest.java index 88958b23..c28e46c4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostThirdSysPiRequest.java +++ b/src/main/java/com/glxp/api/req/basic/PostThirdSysPiRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostUdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/PostUdiInfoRequest.java similarity index 61% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/PostUdiInfoRequest.java rename to src/main/java/com/glxp/api/req/basic/PostUdiInfoRequest.java index b32e0f04..bec64254 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostUdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/PostUdiInfoRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; +import com.glxp.api.entity.basic.UdiInfoImportDetailEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/RemoveRelRequest.java b/src/main/java/com/glxp/api/req/basic/RemoveRelRequest.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/RemoveRelRequest.java rename to src/main/java/com/glxp/api/req/basic/RemoveRelRequest.java index 0630b427..5f164cd6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/RemoveRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/RemoveRelRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/SpsSyncDataRequest.java b/src/main/java/com/glxp/api/req/basic/SpsSyncDataRequest.java similarity index 59% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/SpsSyncDataRequest.java rename to src/main/java/com/glxp/api/req/basic/SpsSyncDataRequest.java index a64531ff..92ae07a1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/SpsSyncDataRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SpsSyncDataRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/UOnhandQueryRequest.java b/src/main/java/com/glxp/api/req/basic/UOnhandQueryRequest.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/UOnhandQueryRequest.java rename to src/main/java/com/glxp/api/req/basic/UOnhandQueryRequest.java index 9fa8be25..79ef1912 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/UOnhandQueryRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UOnhandQueryRequest.java @@ -1,10 +1,8 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; -import javax.validation.constraints.NotNull; - @Data public class UOnhandQueryRequest extends ListPageRequest { diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiCompanyRequest.java b/src/main/java/com/glxp/api/req/basic/UdiCompanyRequest.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiCompanyRequest.java rename to src/main/java/com/glxp/api/req/basic/UdiCompanyRequest.java index b29bb6e7..89f4e558 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiCompanyRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiCompanyRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiInfoExportRequest.java b/src/main/java/com/glxp/api/req/basic/UdiInfoExportRequest.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiInfoExportRequest.java rename to src/main/java/com/glxp/api/req/basic/UdiInfoExportRequest.java index d615d373..94db8a29 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiInfoExportRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiInfoExportRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/UpdatePrintStatusRequest.java b/src/main/java/com/glxp/api/req/basic/UpdatePrintStatusRequest.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/req/basic/UpdatePrintStatusRequest.java rename to src/main/java/com/glxp/api/req/basic/UpdatePrintStatusRequest.java index 839f1585..0f50f073 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/UpdatePrintStatusRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UpdatePrintStatusRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.basic; +package com.glxp.api.req.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderDetailFilterRequest.java b/src/main/java/com/glxp/api/req/business/StockOrderDetailFilterRequest.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderDetailFilterRequest.java rename to src/main/java/com/glxp/api/req/business/StockOrderDetailFilterRequest.java index 692ba8ba..9e953518 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderDetailFilterRequest.java +++ b/src/main/java/com/glxp/api/req/business/StockOrderDetailFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.business; +package com.glxp.api.req.business; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.math.BigDecimal; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java b/src/main/java/com/glxp/api/req/business/StockOrderFilterRequest.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java rename to src/main/java/com/glxp/api/req/business/StockOrderFilterRequest.java index 6bb0a620..b21c8efb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java +++ b/src/main/java/com/glxp/api/req/business/StockOrderFilterRequest.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.req.business; +package com.glxp.api.req.business; import com.fasterxml.jackson.annotation.JsonFormat; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.math.BigDecimal; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java b/src/main/java/com/glxp/api/req/business/StockOrderIdsRequest.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java rename to src/main/java/com/glxp/api/req/business/StockOrderIdsRequest.java index 62fddfb8..bb803d68 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java +++ b/src/main/java/com/glxp/api/req/business/StockOrderIdsRequest.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.req.business; +package com.glxp.api.req.business; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.business.StockOrderDetailEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java b/src/main/java/com/glxp/api/req/business/StockOrderPostRequest.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java rename to src/main/java/com/glxp/api/req/business/StockOrderPostRequest.java index 9fa33663..209ba69e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java +++ b/src/main/java/com/glxp/api/req/business/StockOrderPostRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.business; +package com.glxp.api.req.business; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.business.StockOrderDetailEntity; import lombok.Data; import java.math.BigDecimal; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderQueryRequest.java b/src/main/java/com/glxp/api/req/business/StockOrderQueryRequest.java similarity index 51% rename from api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderQueryRequest.java rename to src/main/java/com/glxp/api/req/business/StockOrderQueryRequest.java index 760fb25b..63aad39b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderQueryRequest.java +++ b/src/main/java/com/glxp/api/req/business/StockOrderQueryRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.business; +package com.glxp.api.req.business; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderUploadLogRequest.java b/src/main/java/com/glxp/api/req/business/StockOrderUploadLogRequest.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderUploadLogRequest.java rename to src/main/java/com/glxp/api/req/business/StockOrderUploadLogRequest.java index b451ca7b..88dc66cf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderUploadLogRequest.java +++ b/src/main/java/com/glxp/api/req/business/StockOrderUploadLogRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.business; +package com.glxp.api.req.business; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderUploadRequest.java b/src/main/java/com/glxp/api/req/business/StockOrderUploadRequest.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderUploadRequest.java rename to src/main/java/com/glxp/api/req/business/StockOrderUploadRequest.java index 23f067c0..37083c05 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderUploadRequest.java +++ b/src/main/java/com/glxp/api/req/business/StockOrderUploadRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.business; +package com.glxp.api.req.business; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockQRCodeTextFilterRequest.java b/src/main/java/com/glxp/api/req/business/StockQRCodeTextFilterRequest.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/req/business/StockQRCodeTextFilterRequest.java rename to src/main/java/com/glxp/api/req/business/StockQRCodeTextFilterRequest.java index bb81e99e..3911811a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockQRCodeTextFilterRequest.java +++ b/src/main/java/com/glxp/api/req/business/StockQRCodeTextFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.business; +package com.glxp.api.req.business; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.Date; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java b/src/main/java/com/glxp/api/req/business/StockSelectDataEntity.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java rename to src/main/java/com/glxp/api/req/business/StockSelectDataEntity.java index b6de7bd7..4de6d1b4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java +++ b/src/main/java/com/glxp/api/req/business/StockSelectDataEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.business; +package com.glxp.api.req.business; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/erp/UdiwmsWarehouseRequest.java b/src/main/java/com/glxp/api/req/erp/UdiwmsWarehouseRequest.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/req/erp/UdiwmsWarehouseRequest.java rename to src/main/java/com/glxp/api/req/erp/UdiwmsWarehouseRequest.java index 2e261d40..9522b3eb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/erp/UdiwmsWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/erp/UdiwmsWarehouseRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.erp; +package com.glxp.api.req.erp; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/CompanyRequest.java b/src/main/java/com/glxp/api/req/info/CompanyRequest.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/CompanyRequest.java rename to src/main/java/com/glxp/api/req/info/CompanyRequest.java index ca4a7f69..8b2a3bdb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/CompanyRequest.java +++ b/src/main/java/com/glxp/api/req/info/CompanyRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/DeleteCompanyFileRequest.java b/src/main/java/com/glxp/api/req/info/DeleteCompanyFileRequest.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/DeleteCompanyFileRequest.java rename to src/main/java/com/glxp/api/req/info/DeleteCompanyFileRequest.java index 45a4bb2c..b0ebcf7e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/DeleteCompanyFileRequest.java +++ b/src/main/java/com/glxp/api/req/info/DeleteCompanyFileRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/DeleteRequest.java b/src/main/java/com/glxp/api/req/info/DeleteRequest.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/DeleteRequest.java rename to src/main/java/com/glxp/api/req/info/DeleteRequest.java index 2afbe227..66b91604 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/DeleteRequest.java +++ b/src/main/java/com/glxp/api/req/info/DeleteRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterClassifyCodeRequest.java b/src/main/java/com/glxp/api/req/info/FilterClassifyCodeRequest.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/FilterClassifyCodeRequest.java rename to src/main/java/com/glxp/api/req/info/FilterClassifyCodeRequest.java index 54f85c8f..efcb8dfe 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterClassifyCodeRequest.java +++ b/src/main/java/com/glxp/api/req/info/FilterClassifyCodeRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterDeviceKeyRequest.java b/src/main/java/com/glxp/api/req/info/FilterDeviceKeyRequest.java similarity index 63% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/FilterDeviceKeyRequest.java rename to src/main/java/com/glxp/api/req/info/FilterDeviceKeyRequest.java index 2ae473be..8b44c130 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterDeviceKeyRequest.java +++ b/src/main/java/com/glxp/api/req/info/FilterDeviceKeyRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSetupRequest.java b/src/main/java/com/glxp/api/req/info/FilterSetupRequest.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSetupRequest.java rename to src/main/java/com/glxp/api/req/info/FilterSetupRequest.java index a03c7ed3..5611c808 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSetupRequest.java +++ b/src/main/java/com/glxp/api/req/info/FilterSetupRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSysApiRequest.java b/src/main/java/com/glxp/api/req/info/FilterSysApiRequest.java similarity index 52% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSysApiRequest.java rename to src/main/java/com/glxp/api/req/info/FilterSysApiRequest.java index 614f61bb..24d203c6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSysApiRequest.java +++ b/src/main/java/com/glxp/api/req/info/FilterSysApiRequest.java @@ -1,10 +1,8 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; -import java.awt.*; - @Data public class FilterSysApiRequest extends ListPageRequest { diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSysLogRequest.java b/src/main/java/com/glxp/api/req/info/FilterSysLogRequest.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSysLogRequest.java rename to src/main/java/com/glxp/api/req/info/FilterSysLogRequest.java index 41095925..b16e8597 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSysLogRequest.java +++ b/src/main/java/com/glxp/api/req/info/FilterSysLogRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/PlatformUserInfoRequest.java b/src/main/java/com/glxp/api/req/info/PlatformUserInfoRequest.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/PlatformUserInfoRequest.java rename to src/main/java/com/glxp/api/req/info/PlatformUserInfoRequest.java index 5f263538..6d64c5db 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/PlatformUserInfoRequest.java +++ b/src/main/java/com/glxp/api/req/info/PlatformUserInfoRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/ScheduledRequest.java b/src/main/java/com/glxp/api/req/info/ScheduledRequest.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/ScheduledRequest.java rename to src/main/java/com/glxp/api/req/info/ScheduledRequest.java index 0e9280c5..10f88e94 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/ScheduledRequest.java +++ b/src/main/java/com/glxp/api/req/info/ScheduledRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleRequest.java b/src/main/java/com/glxp/api/req/info/SystemPDFModuleRequest.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleRequest.java rename to src/main/java/com/glxp/api/req/info/SystemPDFModuleRequest.java index ea3d2e10..21eb2550 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleRequest.java +++ b/src/main/java/com/glxp/api/req/info/SystemPDFModuleRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleSaveRequest.java b/src/main/java/com/glxp/api/req/info/SystemPDFModuleSaveRequest.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleSaveRequest.java rename to src/main/java/com/glxp/api/req/info/SystemPDFModuleSaveRequest.java index 40d7f714..f94ec97f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleSaveRequest.java +++ b/src/main/java/com/glxp/api/req/info/SystemPDFModuleSaveRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFTemplateRequest.java b/src/main/java/com/glxp/api/req/info/SystemPDFTemplateRequest.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFTemplateRequest.java rename to src/main/java/com/glxp/api/req/info/SystemPDFTemplateRequest.java index 6ff85809..7c4dc80c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFTemplateRequest.java +++ b/src/main/java/com/glxp/api/req/info/SystemPDFTemplateRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFTemplateSaveRequest.java b/src/main/java/com/glxp/api/req/info/SystemPDFTemplateSaveRequest.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFTemplateSaveRequest.java rename to src/main/java/com/glxp/api/req/info/SystemPDFTemplateSaveRequest.java index f2982566..88f0f1ee 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFTemplateSaveRequest.java +++ b/src/main/java/com/glxp/api/req/info/SystemPDFTemplateSaveRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigRequest.java b/src/main/java/com/glxp/api/req/info/SystemParamConfigRequest.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigRequest.java rename to src/main/java/com/glxp/api/req/info/SystemParamConfigRequest.java index 780f64c7..df36efdb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigRequest.java +++ b/src/main/java/com/glxp/api/req/info/SystemParamConfigRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigSaveRequest.java b/src/main/java/com/glxp/api/req/info/SystemParamConfigSaveRequest.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigSaveRequest.java rename to src/main/java/com/glxp/api/req/info/SystemParamConfigSaveRequest.java index 8d55c999..46f0a41c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigSaveRequest.java +++ b/src/main/java/com/glxp/api/req/info/SystemParamConfigSaveRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.info; +package com.glxp.api.req.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddCodeResult.java b/src/main/java/com/glxp/api/req/inout/AddCodeResult.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/AddCodeResult.java rename to src/main/java/com/glxp/api/req/inout/AddCodeResult.java index 9b50af58..26f2a225 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddCodeResult.java +++ b/src/main/java/com/glxp/api/req/inout/AddCodeResult.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddEnterCodeRequest.java b/src/main/java/com/glxp/api/req/inout/AddEnterCodeRequest.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/AddEnterCodeRequest.java rename to src/main/java/com/glxp/api/req/inout/AddEnterCodeRequest.java index 6875f52b..5fed7d48 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddEnterCodeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddEnterCodeRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java rename to src/main/java/com/glxp/api/req/inout/AddOrderRequest.java index 3b395885..0e137b06 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddStockOrderChangeRequest.java b/src/main/java/com/glxp/api/req/inout/AddStockOrderChangeRequest.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/AddStockOrderChangeRequest.java rename to src/main/java/com/glxp/api/req/inout/AddStockOrderChangeRequest.java index 94377790..523ff92a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddStockOrderChangeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddStockOrderChangeRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inout.WarehouseEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/CodesReplaceRequest.java b/src/main/java/com/glxp/api/req/inout/CodesReplaceRequest.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/CodesReplaceRequest.java rename to src/main/java/com/glxp/api/req/inout/CodesReplaceRequest.java index 19b1ddd5..54038fdd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/CodesReplaceRequest.java +++ b/src/main/java/com/glxp/api/req/inout/CodesReplaceRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.basic.UdiInfoEntity; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/CommitRequest.java b/src/main/java/com/glxp/api/req/inout/CommitRequest.java similarity index 69% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/CommitRequest.java rename to src/main/java/com/glxp/api/req/inout/CommitRequest.java index 51c29642..eadca018 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/CommitRequest.java +++ b/src/main/java/com/glxp/api/req/inout/CommitRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/DeleteCodeRequest.java b/src/main/java/com/glxp/api/req/inout/DeleteCodeRequest.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/DeleteCodeRequest.java rename to src/main/java/com/glxp/api/req/inout/DeleteCodeRequest.java index 848146f9..abfeb284 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/DeleteCodeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/DeleteCodeRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/DeleteRequest.java b/src/main/java/com/glxp/api/req/inout/DeleteRequest.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/DeleteRequest.java rename to src/main/java/com/glxp/api/req/inout/DeleteRequest.java index a56fe5a0..f7e64e10 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/DeleteRequest.java +++ b/src/main/java/com/glxp/api/req/inout/DeleteRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/ERPPostBillRequest.java b/src/main/java/com/glxp/api/req/inout/ERPPostBillRequest.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/ERPPostBillRequest.java rename to src/main/java/com/glxp/api/req/inout/ERPPostBillRequest.java index d278a8dc..ad31a5d6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/ERPPostBillRequest.java +++ b/src/main/java/com/glxp/api/req/inout/ERPPostBillRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailRequest.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/inout/FilterOrderDetailRequest.java index 9a549429..d1d7cb74 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterOrderRequest.java rename to src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index 2877722b..f7a380ef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterStockCheckRequest.java b/src/main/java/com/glxp/api/req/inout/FilterStockCheckRequest.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterStockCheckRequest.java rename to src/main/java/com/glxp/api/req/inout/FilterStockCheckRequest.java index 796b9d4b..9bc53942 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterStockCheckRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterStockCheckRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/ImportErpOrderRequest.java b/src/main/java/com/glxp/api/req/inout/ImportErpOrderRequest.java similarity index 62% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/ImportErpOrderRequest.java rename to src/main/java/com/glxp/api/req/inout/ImportErpOrderRequest.java index 136fbffc..56788cde 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/ImportErpOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/ImportErpOrderRequest.java @@ -1,7 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.res.inout.ErpOrderResponse; -import com.glxp.api.admin.res.inout.PurchaseinResponse; +import com.glxp.api.res.inout.ErpOrderResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderEditRequest.java b/src/main/java/com/glxp/api/req/inout/OrderEditRequest.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderEditRequest.java rename to src/main/java/com/glxp/api/req/inout/OrderEditRequest.java index 06d9e288..55cfd8b9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderEditRequest.java +++ b/src/main/java/com/glxp/api/req/inout/OrderEditRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterByCodeRequest.java b/src/main/java/com/glxp/api/req/inout/OrderFilterByCodeRequest.java similarity index 58% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterByCodeRequest.java rename to src/main/java/com/glxp/api/req/inout/OrderFilterByCodeRequest.java index 8f98b0d5..255c9e53 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterByCodeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/OrderFilterByCodeRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java b/src/main/java/com/glxp/api/req/inout/OrderFilterRequest.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java rename to src/main/java/com/glxp/api/req/inout/OrderFilterRequest.java index 541c2bef..9bcc23ab 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java +++ b/src/main/java/com/glxp/api/req/inout/OrderFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderMergeRequest.java b/src/main/java/com/glxp/api/req/inout/OrderMergeRequest.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderMergeRequest.java rename to src/main/java/com/glxp/api/req/inout/OrderMergeRequest.java index c421894d..b9df9b11 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderMergeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/OrderMergeRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderQueryRequest.java b/src/main/java/com/glxp/api/req/inout/OrderQueryRequest.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderQueryRequest.java rename to src/main/java/com/glxp/api/req/inout/OrderQueryRequest.java index 85885835..91e89ca7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderQueryRequest.java +++ b/src/main/java/com/glxp/api/req/inout/OrderQueryRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderStatusFilterRequest.java b/src/main/java/com/glxp/api/req/inout/OrderStatusFilterRequest.java similarity index 63% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderStatusFilterRequest.java rename to src/main/java/com/glxp/api/req/inout/OrderStatusFilterRequest.java index d16a907d..1417a9ef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderStatusFilterRequest.java +++ b/src/main/java/com/glxp/api/req/inout/OrderStatusFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderUploadRequest.java b/src/main/java/com/glxp/api/req/inout/OrderUploadRequest.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderUploadRequest.java rename to src/main/java/com/glxp/api/req/inout/OrderUploadRequest.java index 4e5aec03..bae1f19b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderUploadRequest.java +++ b/src/main/java/com/glxp/api/req/inout/OrderUploadRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostOrderRequest.java b/src/main/java/com/glxp/api/req/inout/PostOrderRequest.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/PostOrderRequest.java rename to src/main/java/com/glxp/api/req/inout/PostOrderRequest.java index c0e8da46..fd603e5d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/PostOrderRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inout.WarehouseEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/ScPostOrderRequest.java b/src/main/java/com/glxp/api/req/inout/ScPostOrderRequest.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/ScPostOrderRequest.java rename to src/main/java/com/glxp/api/req/inout/ScPostOrderRequest.java index 1f6bd402..7a784b71 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/ScPostOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/ScPostOrderRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inout.WarehouseEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/USignRequest.java b/src/main/java/com/glxp/api/req/inout/USignRequest.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/USignRequest.java rename to src/main/java/com/glxp/api/req/inout/USignRequest.java index 89403b1c..da7f8dce 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/USignRequest.java +++ b/src/main/java/com/glxp/api/req/inout/USignRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/UpdateExportStatusRequest.java b/src/main/java/com/glxp/api/req/inout/UpdateExportStatusRequest.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/UpdateExportStatusRequest.java rename to src/main/java/com/glxp/api/req/inout/UpdateExportStatusRequest.java index 51d59c9f..362d4534 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/UpdateExportStatusRequest.java +++ b/src/main/java/com/glxp/api/req/inout/UpdateExportStatusRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java b/src/main/java/com/glxp/api/req/inout/WarehouseQueryRequest.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java rename to src/main/java/com/glxp/api/req/inout/WarehouseQueryRequest.java index 143b6158..4822d73b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java +++ b/src/main/java/com/glxp/api/req/inout/WarehouseQueryRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseSaveRequest.java b/src/main/java/com/glxp/api/req/inout/WarehouseSaveRequest.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseSaveRequest.java rename to src/main/java/com/glxp/api/req/inout/WarehouseSaveRequest.java index 5788576e..df95257b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseSaveRequest.java +++ b/src/main/java/com/glxp/api/req/inout/WarehouseSaveRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.req.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceCollectOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inventory/AddDeviceCollectOrderDetailRequest.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceCollectOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/inventory/AddDeviceCollectOrderDetailRequest.java index 59d3f923..2dc463d1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceCollectOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/AddDeviceCollectOrderDetailRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java b/src/main/java/com/glxp/api/req/inventory/AddDeviceMAOrderRequest.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java rename to src/main/java/com/glxp/api/req/inventory/AddDeviceMAOrderRequest.java index 6ad348e7..ba78c4fa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/AddDeviceMAOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddInvCountOrderRequest.java b/src/main/java/com/glxp/api/req/inventory/AddInvCountOrderRequest.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddInvCountOrderRequest.java rename to src/main/java/com/glxp/api/req/inventory/AddInvCountOrderRequest.java index 2cead393..cef31b25 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddInvCountOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/AddInvCountOrderRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.entity.inventory.InvCountOrder; +import com.glxp.api.entity.inventory.InvCountOrder; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddMAOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inventory/AddMAOrderDetailRequest.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddMAOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/inventory/AddMAOrderDetailRequest.java index 49bfb4c4..e4b7cfbe 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddMAOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/AddMAOrderDetailRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/BindInvSpaceRequest.java b/src/main/java/com/glxp/api/req/inventory/BindInvSpaceRequest.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/BindInvSpaceRequest.java rename to src/main/java/com/glxp/api/req/inventory/BindInvSpaceRequest.java index 1ab5bf0e..d5463f5d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/BindInvSpaceRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/BindInvSpaceRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inventory/CodesTestRequest.java b/src/main/java/com/glxp/api/req/inventory/CodesTestRequest.java new file mode 100644 index 00000000..7ab3e402 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inventory/CodesTestRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.req.inventory; + +import com.glxp.api.req.ListPageRequest; +import lombok.Data; + +@Data +public class CodesTestRequest extends ListPageRequest { + + private String id; + + private String code; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/DeleteStPrintTempRequest.java b/src/main/java/com/glxp/api/req/inventory/DeleteStPrintTempRequest.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/DeleteStPrintTempRequest.java rename to src/main/java/com/glxp/api/req/inventory/DeleteStPrintTempRequest.java index 35e19b6f..e606abcd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/DeleteStPrintTempRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/DeleteStPrintTempRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java b/src/main/java/com/glxp/api/req/inventory/ErpOnhandRequest.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java rename to src/main/java/com/glxp/api/req/inventory/ErpOnhandRequest.java index 322e0ac6..becf1699 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/ErpOnhandRequest.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; -import com.glxp.api.admin.res.inventory.ErpInvProductResponse; +import com.glxp.api.req.ListPageRequest; +import com.glxp.api.res.inventory.ErpInvProductResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterCodeTraceRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterCodeTraceRequest.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterCodeTraceRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterCodeTraceRequest.java index 1f4cf8a2..f62b2d59 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterCodeTraceRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterCodeTraceRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterDeviceCollectOrderDetailRequest.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterDeviceCollectOrderDetailRequest.java index c02c852f..79475a78 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterDeviceCollectOrderDetailRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterDeviceCollectOrderRequest.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterDeviceCollectOrderRequest.java index 066c88c6..99443cc2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterDeviceCollectOrderRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterDeviceMAOrderDetailRequest.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterDeviceMAOrderDetailRequest.java index aae14754..a33738be 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterDeviceMAOrderDetailRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterDeviceMAOrderRequest.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterDeviceMAOrderRequest.java index 6374bc40..6b6d1f4e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterDeviceMAOrderRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInCodeLogRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInCodeLogRequest.java similarity index 69% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInCodeLogRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInCodeLogRequest.java index 217eb553..99984824 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInCodeLogRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInCodeLogRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvBusUserRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvBusUserRequest.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvBusUserRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvBusUserRequest.java index dd59eb38..839050a3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvBusUserRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvBusUserRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountCodesRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvCountCodesRequest.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountCodesRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvCountCodesRequest.java index ab2f1838..99a5c925 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountCodesRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvCountCodesRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvCountOrderDetailRequest.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvCountOrderDetailRequest.java index 9a7f2756..90bb132e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvCountOrderDetailRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvCountOrderRequest.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvCountOrderRequest.java index 15dcbe97..75047c93 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvCountOrderRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderSaveRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvCountOrderSaveRequest.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderSaveRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvCountOrderSaveRequest.java index 5946f402..50dad794 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderSaveRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvCountOrderSaveRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.entity.inventory.InvCountCodes; +import com.glxp.api.entity.inventory.InvCountCodes; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountSettingRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvCountSettingRequest.java similarity index 65% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountSettingRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvCountSettingRequest.java index 6c43c265..0eb97267 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountSettingRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvCountSettingRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvLinkDataRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvLinkDataRequest.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvLinkDataRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvLinkDataRequest.java index c7ace91d..f3116268 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvLinkDataRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvLinkDataRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvMAOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvMAOrderDetailRequest.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvMAOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvMAOrderDetailRequest.java index b620a8d6..9efe4888 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvMAOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvMAOrderDetailRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvMAOrderRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvMAOrderRequest.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvMAOrderRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvMAOrderRequest.java index b265c55a..1b824c3a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvMAOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvMAOrderRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductDetailRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvProductDetailRequest.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductDetailRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvProductDetailRequest.java index 3b9c1082..277d1216 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvProductDetailRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvProductRequest.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvProductRequest.java index 6da60fc4..b5d69562 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvProductRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvSpaceRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvSpaceRequest.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvSpaceRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvSpaceRequest.java index 45d1ccd7..e7f06f94 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvSpaceRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvSpaceRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvSubWarehouseRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvSubWarehouseRequest.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvSubWarehouseRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvSubWarehouseRequest.java index e882beec..deaeef54 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvSubWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvSubWarehouseRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvUserRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvUserRequest.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvUserRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvUserRequest.java index 640b8b79..73a9cb76 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvUserRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvUserRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterInvWarehouseRequest.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterInvWarehouseRequest.java index d4f52c4b..2b27ae34 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterInvWarehouseRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.Date; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterSickTraceRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterSickTraceRequest.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterSickTraceRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterSickTraceRequest.java index 7da648c3..39f7e562 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterSickTraceRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterSickTraceRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterStPrintTempRequest.java b/src/main/java/com/glxp/api/req/inventory/FilterStPrintTempRequest.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterStPrintTempRequest.java rename to src/main/java/com/glxp/api/req/inventory/FilterStPrintTempRequest.java index 3f3bb188..539ac5e0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterStPrintTempRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/FilterStPrintTempRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inventory/InnerOrderDetailRequest.java similarity index 63% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/inventory/InnerOrderDetailRequest.java index 13528525..36d9a8ca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/InnerOrderDetailRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java b/src/main/java/com/glxp/api/req/inventory/InnerOrderRequest.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java rename to src/main/java/com/glxp/api/req/inventory/InnerOrderRequest.java index b192c1e8..a2b00924 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/InnerOrderRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InvCountOrderPrintRequest.java b/src/main/java/com/glxp/api/req/inventory/InvCountOrderPrintRequest.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/InvCountOrderPrintRequest.java rename to src/main/java/com/glxp/api/req/inventory/InvCountOrderPrintRequest.java index aea0222f..9c4168c9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InvCountOrderPrintRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/InvCountOrderPrintRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inventory/PostInnerOrderRequest.java b/src/main/java/com/glxp/api/req/inventory/PostInnerOrderRequest.java new file mode 100644 index 00000000..9e121abe --- /dev/null +++ b/src/main/java/com/glxp/api/req/inventory/PostInnerOrderRequest.java @@ -0,0 +1,18 @@ +package com.glxp.api.req.inventory; + +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.inventory.InnerOrderDetailEntity; +import com.glxp.api.entity.inventory.InnerOrderEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostInnerOrderRequest { + + int editStatus; + InnerOrderEntity innerOrderEntity; + List innerOrderDetailEntities; + List subErpOrders; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostStockPrintRequest.java b/src/main/java/com/glxp/api/req/inventory/PostStockPrintRequest.java similarity index 68% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostStockPrintRequest.java rename to src/main/java/com/glxp/api/req/inventory/PostStockPrintRequest.java index 82d1551d..934a8ba9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostStockPrintRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/PostStockPrintRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.entity.inventory.StockPrintEntity; +import com.glxp.api.entity.inventory.StockPrintEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ThirdFilterInvRequest.java b/src/main/java/com/glxp/api/req/inventory/ThirdFilterInvRequest.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/ThirdFilterInvRequest.java rename to src/main/java/com/glxp/api/req/inventory/ThirdFilterInvRequest.java index d24f45d6..ccd77542 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ThirdFilterInvRequest.java +++ b/src/main/java/com/glxp/api/req/inventory/ThirdFilterInvRequest.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; import com.fasterxml.jackson.annotation.JsonProperty; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/UpdateRelBusRequset.java b/src/main/java/com/glxp/api/req/inventory/UpdateRelBusRequset.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/req/inventory/UpdateRelBusRequset.java rename to src/main/java/com/glxp/api/req/inventory/UpdateRelBusRequset.java index 096b17ea..bcde487a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/UpdateRelBusRequset.java +++ b/src/main/java/com/glxp/api/req/inventory/UpdateRelBusRequset.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inventory; +package com.glxp.api.req.inventory; -import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/InoutOrderDetailPDFCodeRequest.java b/src/main/java/com/glxp/api/req/itextpdf/InoutOrderDetailPDFCodeRequest.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/InoutOrderDetailPDFCodeRequest.java rename to src/main/java/com/glxp/api/req/itextpdf/InoutOrderDetailPDFCodeRequest.java index bc56a5a0..36c2f926 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/InoutOrderDetailPDFCodeRequest.java +++ b/src/main/java/com/glxp/api/req/itextpdf/InoutOrderDetailPDFCodeRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.itextpdf; +package com.glxp.api.req.itextpdf; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/InoutOrderDetailPDFFileRequest.java b/src/main/java/com/glxp/api/req/itextpdf/InoutOrderDetailPDFFileRequest.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/InoutOrderDetailPDFFileRequest.java rename to src/main/java/com/glxp/api/req/itextpdf/InoutOrderDetailPDFFileRequest.java index 1c3de5c2..2d5f8d9f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/InoutOrderDetailPDFFileRequest.java +++ b/src/main/java/com/glxp/api/req/itextpdf/InoutOrderDetailPDFFileRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.itextpdf; +package com.glxp.api.req.itextpdf; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/InspectionPDFTemplateRequest.java b/src/main/java/com/glxp/api/req/itextpdf/InspectionPDFTemplateRequest.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/InspectionPDFTemplateRequest.java rename to src/main/java/com/glxp/api/req/itextpdf/InspectionPDFTemplateRequest.java index 1aea1472..8c48d3cb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/InspectionPDFTemplateRequest.java +++ b/src/main/java/com/glxp/api/req/itextpdf/InspectionPDFTemplateRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.itextpdf; +package com.glxp.api.req.itextpdf; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/PdfPrintCountEntity.java b/src/main/java/com/glxp/api/req/itextpdf/PdfPrintCountEntity.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/PdfPrintCountEntity.java rename to src/main/java/com/glxp/api/req/itextpdf/PdfPrintCountEntity.java index 4b9811a5..8adb77a2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/PdfPrintCountEntity.java +++ b/src/main/java/com/glxp/api/req/itextpdf/PdfPrintCountEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.itextpdf; +package com.glxp.api.req.itextpdf; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java b/src/main/java/com/glxp/api/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java rename to src/main/java/com/glxp/api/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java index 5545be80..56c6c772 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java +++ b/src/main/java/com/glxp/api/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.itextpdf; +package com.glxp.api.req.itextpdf; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/SystemPDFTemplateRelevanceRequest.java b/src/main/java/com/glxp/api/req/itextpdf/SystemPDFTemplateRelevanceRequest.java similarity index 69% rename from api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/SystemPDFTemplateRelevanceRequest.java rename to src/main/java/com/glxp/api/req/itextpdf/SystemPDFTemplateRelevanceRequest.java index 3c254787..14a8864f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/itextpdf/SystemPDFTemplateRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/itextpdf/SystemPDFTemplateRelevanceRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.itextpdf; +package com.glxp.api.req.itextpdf; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/monitor/SysLogininforRequest.java b/src/main/java/com/glxp/api/req/monitor/SysLogininforRequest.java similarity index 68% rename from api-admin/src/main/java/com/glxp/api/admin/req/monitor/SysLogininforRequest.java rename to src/main/java/com/glxp/api/req/monitor/SysLogininforRequest.java index 25157324..54ba87b8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/monitor/SysLogininforRequest.java +++ b/src/main/java/com/glxp/api/req/monitor/SysLogininforRequest.java @@ -1,10 +1,8 @@ -package com.glxp.api.admin.req.monitor; +package com.glxp.api.req.monitor; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; -import java.util.Date; - @Data public class SysLogininforRequest extends ListPageRequest { diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/monitor/SysOperLogRequest.java b/src/main/java/com/glxp/api/req/monitor/SysOperLogRequest.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/req/monitor/SysOperLogRequest.java rename to src/main/java/com/glxp/api/req/monitor/SysOperLogRequest.java index fa80dac2..9c940aa3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/monitor/SysOperLogRequest.java +++ b/src/main/java/com/glxp/api/req/monitor/SysOperLogRequest.java @@ -1,10 +1,8 @@ -package com.glxp.api.admin.req.monitor; +package com.glxp.api.req.monitor; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; -import java.util.Date; - @Data public class SysOperLogRequest extends ListPageRequest { diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/CustomerContactFilterRequest.java b/src/main/java/com/glxp/api/req/purchase/CustomerContactFilterRequest.java similarity index 59% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/CustomerContactFilterRequest.java rename to src/main/java/com/glxp/api/req/purchase/CustomerContactFilterRequest.java index 85ce9f56..401d44ed 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/CustomerContactFilterRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/CustomerContactFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java rename to src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java index f3442c1b..8ff7f58d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanySalesmanRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterCompanySalesmanRequest.java similarity index 68% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanySalesmanRequest.java rename to src/main/java/com/glxp/api/req/purchase/FilterCompanySalesmanRequest.java index bbdeaa5b..049faf4a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanySalesmanRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterCompanySalesmanRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanyUpdateLogRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterCompanyUpdateLogRequest.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanyUpdateLogRequest.java rename to src/main/java/com/glxp/api/req/purchase/FilterCompanyUpdateLogRequest.java index 976fcb35..ec654cd4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanyUpdateLogRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterCompanyUpdateLogRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterPoductRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterPoductRequest.java rename to src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java index 813a701b..9233c174 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterPoductRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCertRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterSupCertRequest.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCertRequest.java rename to src/main/java/com/glxp/api/req/purchase/FilterSupCertRequest.java index 9fe88684..680fe299 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCertRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterSupCertRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCompanyRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterSupCompanyRequest.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCompanyRequest.java rename to src/main/java/com/glxp/api/req/purchase/FilterSupCompanyRequest.java index 30d8a152..26bd52ba 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCompanyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterSupCompanyRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupManufacturerRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterSupManufacturerRequest.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupManufacturerRequest.java rename to src/main/java/com/glxp/api/req/purchase/FilterSupManufacturerRequest.java index ee17aada..65ad7ad8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupManufacturerRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterSupManufacturerRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostPurApplyRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurApplyRequest.java similarity index 51% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostPurApplyRequest.java rename to src/main/java/com/glxp/api/req/purchase/PostPurApplyRequest.java index 4c8fdb85..d93d69a1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostPurApplyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PostPurApplyRequest.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyEntity; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.entity.purchase.PurApplyEntity; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/purchase/PostPurPlanRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurPlanRequest.java new file mode 100644 index 00000000..36b866a6 --- /dev/null +++ b/src/main/java/com/glxp/api/req/purchase/PostPurPlanRequest.java @@ -0,0 +1,18 @@ +package com.glxp.api.req.purchase; + +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.entity.purchase.PurPlanEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostPurPlanRequest { + + int editStatus; + PurPlanEntity purPlanEntity; + List purPlanDetailEntities; + List subErpOrders; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostSelCertRequest.java b/src/main/java/com/glxp/api/req/purchase/PostSelCertRequest.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostSelCertRequest.java rename to src/main/java/com/glxp/api/req/purchase/PostSelCertRequest.java index 551e198e..181d306f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostSelCertRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PostSelCertRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.entity.purchase.SupCertSetEntity; +import com.glxp.api.entity.purchase.SupCertSetEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostSupCertRequest.java b/src/main/java/com/glxp/api/req/purchase/PostSupCertRequest.java similarity index 54% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostSupCertRequest.java rename to src/main/java/com/glxp/api/req/purchase/PostSupCertRequest.java index dfdf83e5..0e39f155 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostSupCertRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PostSupCertRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.entity.purchase.SupCertEntity; +import com.glxp.api.entity.purchase.SupCertEntity; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyDetailRequest.java rename to src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java index 3bc36340..10a9de29 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java rename to src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java index 8f9b09cd..425caeac 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurPlanDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurPlanDetailRequest.java rename to src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java index ed652077..4ff8d0fb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurPlanDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurPlanRequest.java b/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurPlanRequest.java rename to src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java index 8250867b..c1ff39ab 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurPlanRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectCorpBindRequest.java b/src/main/java/com/glxp/api/req/purchase/SelectCorpBindRequest.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectCorpBindRequest.java rename to src/main/java/com/glxp/api/req/purchase/SelectCorpBindRequest.java index b9ecc4b7..3afd9fd9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectCorpBindRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/SelectCorpBindRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectProductBindRequest.java b/src/main/java/com/glxp/api/req/purchase/SelectProductBindRequest.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectProductBindRequest.java rename to src/main/java/com/glxp/api/req/purchase/SelectProductBindRequest.java index 5ac15837..e576550c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectProductBindRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/SelectProductBindRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.purchase; +package com.glxp.api.req.purchase; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/AddReceiptRequest.java b/src/main/java/com/glxp/api/req/receipt/AddReceiptRequest.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/req/receipt/AddReceiptRequest.java rename to src/main/java/com/glxp/api/req/receipt/AddReceiptRequest.java index 69f8f06e..26807da3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/AddReceiptRequest.java +++ b/src/main/java/com/glxp/api/req/receipt/AddReceiptRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.receipt; +package com.glxp.api.req.receipt; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java b/src/main/java/com/glxp/api/req/receipt/BussinessTypeFilterRequest.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java rename to src/main/java/com/glxp/api/req/receipt/BussinessTypeFilterRequest.java index 2fd4f007..3d796f48 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java +++ b/src/main/java/com/glxp/api/req/receipt/BussinessTypeFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.receipt; +package com.glxp.api.req.receipt; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ClearStockRequest.java b/src/main/java/com/glxp/api/req/receipt/ClearStockRequest.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/req/receipt/ClearStockRequest.java rename to src/main/java/com/glxp/api/req/receipt/ClearStockRequest.java index e4ae405e..96e73006 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ClearStockRequest.java +++ b/src/main/java/com/glxp/api/req/receipt/ClearStockRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.receipt; +package com.glxp.api.req.receipt; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CodeDetailRequest.java b/src/main/java/com/glxp/api/req/receipt/CodeDetailRequest.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/req/receipt/CodeDetailRequest.java rename to src/main/java/com/glxp/api/req/receipt/CodeDetailRequest.java index 89e90d89..ab9970ff 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CodeDetailRequest.java +++ b/src/main/java/com/glxp/api/req/receipt/CodeDetailRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.receipt; +package com.glxp.api.req.receipt; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CombineUnitRequest.java b/src/main/java/com/glxp/api/req/receipt/CombineUnitRequest.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/req/receipt/CombineUnitRequest.java rename to src/main/java/com/glxp/api/req/receipt/CombineUnitRequest.java index 13793f03..8b055874 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CombineUnitRequest.java +++ b/src/main/java/com/glxp/api/req/receipt/CombineUnitRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.receipt; +package com.glxp.api.req.receipt; -import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.res.basic.ErpUnitsResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ManuorderFilterRequest.java b/src/main/java/com/glxp/api/req/receipt/ManuorderFilterRequest.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/req/receipt/ManuorderFilterRequest.java rename to src/main/java/com/glxp/api/req/receipt/ManuorderFilterRequest.java index 357723f1..2df0f5ad 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ManuorderFilterRequest.java +++ b/src/main/java/com/glxp/api/req/receipt/ManuorderFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.receipt; +package com.glxp.api.req.receipt; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductFilterRequest.java b/src/main/java/com/glxp/api/req/receipt/ProductFilterRequest.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductFilterRequest.java rename to src/main/java/com/glxp/api/req/receipt/ProductFilterRequest.java index aed1c668..ea260c34 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductFilterRequest.java +++ b/src/main/java/com/glxp/api/req/receipt/ProductFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.receipt; +package com.glxp.api.req.receipt; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.java b/src/main/java/com/glxp/api/req/receipt/ProductInfoFilterRequest.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.java rename to src/main/java/com/glxp/api/req/receipt/ProductInfoFilterRequest.java index bb2c90e3..56547bb8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.java +++ b/src/main/java/com/glxp/api/req/receipt/ProductInfoFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.receipt; +package com.glxp.api.req.receipt; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ReceiptDetailRequest.java b/src/main/java/com/glxp/api/req/receipt/ReceiptDetailRequest.java similarity index 58% rename from api-admin/src/main/java/com/glxp/api/admin/req/receipt/ReceiptDetailRequest.java rename to src/main/java/com/glxp/api/req/receipt/ReceiptDetailRequest.java index fa9aa340..1ff8f007 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ReceiptDetailRequest.java +++ b/src/main/java/com/glxp/api/req/receipt/ReceiptDetailRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.receipt; +package com.glxp.api.req.receipt; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ReceiptFilterRequest.java b/src/main/java/com/glxp/api/req/receipt/ReceiptFilterRequest.java similarity index 69% rename from api-admin/src/main/java/com/glxp/api/admin/req/receipt/ReceiptFilterRequest.java rename to src/main/java/com/glxp/api/req/receipt/ReceiptFilterRequest.java index 429b0774..1ec5ef46 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ReceiptFilterRequest.java +++ b/src/main/java/com/glxp/api/req/receipt/ReceiptFilterRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.receipt; +package com.glxp.api.req.receipt; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/U8Request.java b/src/main/java/com/glxp/api/req/receipt/U8Request.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/req/receipt/U8Request.java rename to src/main/java/com/glxp/api/req/receipt/U8Request.java index ca243e3e..087ca937 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/U8Request.java +++ b/src/main/java/com/glxp/api/req/receipt/U8Request.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.receipt; +package com.glxp.api.req.receipt; public class U8Request { diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/sync/BasicDataFilterRequest.java b/src/main/java/com/glxp/api/req/sync/BasicDataFilterRequest.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/req/sync/BasicDataFilterRequest.java rename to src/main/java/com/glxp/api/req/sync/BasicDataFilterRequest.java index 0b189e0c..81ee3428 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/sync/BasicDataFilterRequest.java +++ b/src/main/java/com/glxp/api/req/sync/BasicDataFilterRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.sync; +package com.glxp.api.req.sync; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/sync/PostDownloadInfo.java b/src/main/java/com/glxp/api/req/sync/PostDownloadInfo.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/req/sync/PostDownloadInfo.java rename to src/main/java/com/glxp/api/req/sync/PostDownloadInfo.java index c04aff5d..a943f4f4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/sync/PostDownloadInfo.java +++ b/src/main/java/com/glxp/api/req/sync/PostDownloadInfo.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.sync; +package com.glxp.api.req.sync; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrCorpRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java similarity index 68% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrCorpRequest.java rename to src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java index b3b44984..c1a6e627 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrCorpRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.req.ListPageRequest; -import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.req.ListPageRequest; +import com.glxp.api.res.basic.ErpUnitsResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java rename to src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java index 4a68f44b..cda1bd43 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.req.ListPageRequest; -import com.glxp.api.admin.res.inventory.ErpInvProductResponse; +import com.glxp.api.req.ListPageRequest; +import com.glxp.api.res.inventory.ErpInvProductResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrInvWarehouseRequest.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java rename to src/main/java/com/glxp/api/req/thrsys/FilterThrInvWarehouseRequest.java index 143370ac..ce00ef1d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrInvWarehouseRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.Date; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderDetailRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderDetailRequest.java similarity index 65% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/thrsys/FilterThrOrderDetailRequest.java index c71221a5..e863cc19 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderDetailRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java rename to src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java index 1b2db6d2..e74285e4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.req.ListPageRequest; -import com.glxp.api.admin.res.inout.ErpOrderResponse; +import com.glxp.api.req.ListPageRequest; +import com.glxp.api.res.inout.ErpOrderResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java rename to src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java index 4294ed92..36cbd548 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrSubInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrSubInvWarehouseRequest.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrSubInvWarehouseRequest.java rename to src/main/java/com/glxp/api/req/thrsys/FilterThrSubInvWarehouseRequest.java index 9884893c..0627612b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrSubInvWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrSubInvWarehouseRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.req.ListPageRequest; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostFileThrOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/PostFileThrOrderRequest.java similarity index 59% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostFileThrOrderRequest.java rename to src/main/java/com/glxp/api/req/thrsys/PostFileThrOrderRequest.java index 823ce4f1..5903abea 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostFileThrOrderRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/PostFileThrOrderRequest.java @@ -1,7 +1,6 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity; -import com.glxp.api.admin.res.inout.ErpOrderResponse; +import com.glxp.api.entity.thrsys.ThrOrderImportDetailEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostSmpOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/PostSmpOrderRequest.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostSmpOrderRequest.java rename to src/main/java/com/glxp/api/req/thrsys/PostSmpOrderRequest.java index bb6880cc..e3f99738 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostSmpOrderRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/PostSmpOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrCorpRequest.java b/src/main/java/com/glxp/api/req/thrsys/PostThrCorpRequest.java similarity index 63% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrCorpRequest.java rename to src/main/java/com/glxp/api/req/thrsys/PostThrCorpRequest.java index c0b921b4..dcd845bb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrCorpRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/PostThrCorpRequest.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; -import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.res.basic.ErpUnitsResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/PostThrInvProductsRequest.java similarity index 58% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java rename to src/main/java/com/glxp/api/req/thrsys/PostThrInvProductsRequest.java index 8b92544a..8bbbfc29 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/PostThrInvProductsRequest.java @@ -1,7 +1,6 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.res.inventory.ErpInvProductResponse; -import com.glxp.api.admin.res.inventory.ErpOnHandResponse; +import com.glxp.api.res.inventory.ErpInvProductResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/PostThrOrderRequest.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrOrderRequest.java rename to src/main/java/com/glxp/api/req/thrsys/PostThrOrderRequest.java index 0bdca8e1..138ce6ab 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrOrderRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/PostThrOrderRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.res.inout.ErpOrderResponse; +import com.glxp.api.res.inout.ErpOrderResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/PostThrProductsRequest.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrProductsRequest.java rename to src/main/java/com/glxp/api/req/thrsys/PostThrProductsRequest.java index 1713a3eb..b9017b85 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/PostThrProductsRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.res.basic.ErpProductsResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrCorpExportRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrCorpExportRequest.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrCorpExportRequest.java rename to src/main/java/com/glxp/api/req/thrsys/ThrCorpExportRequest.java index 4be058c9..395e2109 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrCorpExportRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrCorpExportRequest.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; -import com.glxp.api.admin.req.ListPageRequest; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.req.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrInvProductsExportRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrInvProductsExportRequest.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrInvProductsExportRequest.java rename to src/main/java/com/glxp/api/req/thrsys/ThrInvProductsExportRequest.java index b5843e5b..5251d37b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrInvProductsExportRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrInvProductsExportRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.entity.thrsys.ThrInvProductsEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrOrderExportRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrOrderExportRequest.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrOrderExportRequest.java rename to src/main/java/com/glxp/api/req/thrsys/ThrOrderExportRequest.java index 38c82b97..0b6f605e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrOrderExportRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrOrderExportRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.res.inout.ErpOrderResponse; +import com.glxp.api.res.inout.ErpOrderResponse; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrProductsExportRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrProductsExportRequest.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrProductsExportRequest.java rename to src/main/java/com/glxp/api/req/thrsys/ThrProductsExportRequest.java index c04094af..bbb6248d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrProductsExportRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrProductsExportRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/UploadSmpRequest.java b/src/main/java/com/glxp/api/req/thrsys/UploadSmpRequest.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/req/thrsys/UploadSmpRequest.java rename to src/main/java/com/glxp/api/req/thrsys/UploadSmpRequest.java index c4d18ca2..b9d50156 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/UploadSmpRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/UploadSmpRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.thrsys; +package com.glxp.api.req.thrsys; import java.util.List; @@ -13,7 +13,7 @@ public class UploadSmpRequest { private String billFlag; private String thirdSysFk; private Integer type; - private List subErpOrders; + private List subErpOrders; public String getBillNo() { return billNo; @@ -56,11 +56,11 @@ public class UploadSmpRequest { } - public List getSubErpOrders() { + public List getSubErpOrders() { return subErpOrders; } - public void setSubErpOrders(List subErpOrders) { + public void setSubErpOrders(List subErpOrders) { this.subErpOrders = subErpOrders; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/PageSimpleResponse.java b/src/main/java/com/glxp/api/res/PageSimpleResponse.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/res/PageSimpleResponse.java rename to src/main/java/com/glxp/api/res/PageSimpleResponse.java index d4e06df9..d198d989 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/PageSimpleResponse.java +++ b/src/main/java/com/glxp/api/res/PageSimpleResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res; +package com.glxp.api.res; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminResponse.java b/src/main/java/com/glxp/api/res/auth/AuthAdminResponse.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminResponse.java rename to src/main/java/com/glxp/api/res/auth/AuthAdminResponse.java index 3b411072..068f566e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminResponse.java +++ b/src/main/java/com/glxp/api/res/auth/AuthAdminResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.auth; +package com.glxp.api.res.auth; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminRoleResponse.java b/src/main/java/com/glxp/api/res/auth/AuthAdminRoleResponse.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminRoleResponse.java rename to src/main/java/com/glxp/api/res/auth/AuthAdminRoleResponse.java index c150b638..dbaeca78 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminRoleResponse.java +++ b/src/main/java/com/glxp/api/res/auth/AuthAdminRoleResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.auth; +package com.glxp.api.res.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthPermissionRuleMergeResponse.java b/src/main/java/com/glxp/api/res/auth/AuthPermissionRuleMergeResponse.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthPermissionRuleMergeResponse.java rename to src/main/java/com/glxp/api/res/auth/AuthPermissionRuleMergeResponse.java index ed762873..8628f254 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthPermissionRuleMergeResponse.java +++ b/src/main/java/com/glxp/api/res/auth/AuthPermissionRuleMergeResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.auth; +package com.glxp.api.res.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthRoleResponse.java b/src/main/java/com/glxp/api/res/auth/AuthRoleResponse.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthRoleResponse.java rename to src/main/java/com/glxp/api/res/auth/AuthRoleResponse.java index 2caba0ab..747a537e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthRoleResponse.java +++ b/src/main/java/com/glxp/api/res/auth/AuthRoleResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.auth; +package com.glxp.api.res.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/DeptUserResponse.java b/src/main/java/com/glxp/api/res/auth/DeptUserResponse.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/res/auth/DeptUserResponse.java rename to src/main/java/com/glxp/api/res/auth/DeptUserResponse.java index fef9ee24..e3fa8579 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/auth/DeptUserResponse.java +++ b/src/main/java/com/glxp/api/res/auth/DeptUserResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.auth; +package com.glxp.api.res.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/LoginResponse.java b/src/main/java/com/glxp/api/res/auth/LoginResponse.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/res/auth/LoginResponse.java rename to src/main/java/com/glxp/api/res/auth/LoginResponse.java index 678b2359..ec0a6b6e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/auth/LoginResponse.java +++ b/src/main/java/com/glxp/api/res/auth/LoginResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.auth; +package com.glxp.api.res.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/LoginUserInfoResponse.java b/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/res/auth/LoginUserInfoResponse.java rename to src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java index e374cbc1..f50de875 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/auth/LoginUserInfoResponse.java +++ b/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.auth; +package com.glxp.api.res.auth; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicBusTypeChangeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBusTypeChangeResponse.java similarity index 57% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicBusTypeChangeResponse.java rename to src/main/java/com/glxp/api/res/basic/BasicBusTypeChangeResponse.java index 032a8f93..cfa2ba09 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicBusTypeChangeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBusTypeChangeResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; -import com.glxp.api.admin.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicProductThirdSysResponse.java b/src/main/java/com/glxp/api/res/basic/BasicProductThirdSysResponse.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicProductThirdSysResponse.java rename to src/main/java/com/glxp/api/res/basic/BasicProductThirdSysResponse.java index 5106f70f..adf68a83 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicProductThirdSysResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicProductThirdSysResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicThirdSysResponse.java b/src/main/java/com/glxp/api/res/basic/BasicThirdSysResponse.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicThirdSysResponse.java rename to src/main/java/com/glxp/api/res/basic/BasicThirdSysResponse.java index 6f70e5fb..7e74cf3b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicThirdSysResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicThirdSysResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainExportResponse.java b/src/main/java/com/glxp/api/res/basic/BasicUnitMaintainExportResponse.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainExportResponse.java rename to src/main/java/com/glxp/api/res/basic/BasicUnitMaintainExportResponse.java index 7b96e080..5e0aa770 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainExportResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicUnitMaintainExportResponse.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.thrsys.ThrCorpEntity; import lombok.Data; import java.util.ArrayList; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.java b/src/main/java/com/glxp/api/res/basic/BasicUnitMaintainResponse.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.java rename to src/main/java/com/glxp/api/res/basic/BasicUnitMaintainResponse.java index bc02c78b..ed0fd86a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicUnitMaintainResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessLocalTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BussinessLocalTypeResponse.java similarity index 69% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessLocalTypeResponse.java rename to src/main/java/com/glxp/api/res/basic/BussinessLocalTypeResponse.java index 5fc295e1..db712251 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessLocalTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BussinessLocalTypeResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.entity.basic.BussinessLocalTypeEntity; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessOriginTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BussinessOriginTypeResponse.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessOriginTypeResponse.java rename to src/main/java/com/glxp/api/res/basic/BussinessOriginTypeResponse.java index 6312c0d3..8635dad5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessOriginTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BussinessOriginTypeResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypExportResponse.java b/src/main/java/com/glxp/api/res/basic/BussinessTypExportResponse.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypExportResponse.java rename to src/main/java/com/glxp/api/res/basic/BussinessTypExportResponse.java index 1466b34d..3f39257f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypExportResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BussinessTypExportResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java b/src/main/java/com/glxp/api/res/basic/BussinessTypResponse.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java rename to src/main/java/com/glxp/api/res/basic/BussinessTypResponse.java index 4a756742..00c38c14 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BussinessTypResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/EntrustReceResponse.java b/src/main/java/com/glxp/api/res/basic/EntrustReceResponse.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/EntrustReceResponse.java rename to src/main/java/com/glxp/api/res/basic/EntrustReceResponse.java index ad5ce51d..fb081659 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/EntrustReceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/EntrustReceResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java b/src/main/java/com/glxp/api/res/basic/ErpProductsResponse.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java rename to src/main/java/com/glxp/api/res/basic/ErpProductsResponse.java index 2c079d61..ad45b35f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java +++ b/src/main/java/com/glxp/api/res/basic/ErpProductsResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpUnitsResponse.java b/src/main/java/com/glxp/api/res/basic/ErpUnitsResponse.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpUnitsResponse.java rename to src/main/java/com/glxp/api/res/basic/ErpUnitsResponse.java index 866f150e..8757b2e2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpUnitsResponse.java +++ b/src/main/java/com/glxp/api/res/basic/ErpUnitsResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/NewUploadDiResponse.java b/src/main/java/com/glxp/api/res/basic/NewUploadDiResponse.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/NewUploadDiResponse.java rename to src/main/java/com/glxp/api/res/basic/NewUploadDiResponse.java index 8c7a90a6..a9d240f4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/NewUploadDiResponse.java +++ b/src/main/java/com/glxp/api/res/basic/NewUploadDiResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpSyncUdiResponse.java b/src/main/java/com/glxp/api/res/basic/SpSyncUdiResponse.java similarity index 60% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/SpSyncUdiResponse.java rename to src/main/java/com/glxp/api/res/basic/SpSyncUdiResponse.java index 6b127904..df569864 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpSyncUdiResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SpSyncUdiResponse.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; -import com.glxp.api.admin.entity.basic.ProductInfoEntity; -import com.glxp.api.admin.entity.basic.UdiCompanyEntity; +import com.glxp.api.entity.basic.ProductInfoEntity; +import com.glxp.api.entity.basic.UdiCompanyEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java b/src/main/java/com/glxp/api/res/basic/SpsSyncBusResponse.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java rename to src/main/java/com/glxp/api/res/basic/SpsSyncBusResponse.java index f14146e4..21a46ed0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SpsSyncBusResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; -import com.glxp.api.admin.entity.basic.*; +import com.glxp.api.entity.basic.*; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java b/src/main/java/com/glxp/api/res/basic/SpsSyncDataResponse.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java rename to src/main/java/com/glxp/api/res/basic/SpsSyncDataResponse.java index ad300b19..23129bce 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SpsSyncDataResponse.java @@ -1,15 +1,15 @@ -package com.glxp.api.admin.res.basic; - -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.auth.DeptEntity; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; -import com.glxp.api.admin.entity.inout.WarehouseUserEntity; -import com.glxp.api.admin.entity.inventory.InvBusUserEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.entity.purchase.*; -import com.glxp.api.admin.entity.thrsys.*; +package com.glxp.api.res.basic; + +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.api.entity.inout.WarehouseUserEntity; +import com.glxp.api.entity.inventory.InvBusUserEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.entity.purchase.*; +import com.glxp.api.entity.thrsys.*; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java b/src/main/java/com/glxp/api/res/basic/SpsSyncOrderResponse.java similarity index 55% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java rename to src/main/java/com/glxp/api/res/basic/SpsSyncOrderResponse.java index 64fba687..8c037f12 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SpsSyncOrderResponse.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; -import com.glxp.api.admin.entity.business.StockOrderRemakEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.entity.business.StockOrderRemakEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncScheduleResponse.java b/src/main/java/com/glxp/api/res/basic/SpsSyncScheduleResponse.java similarity index 60% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncScheduleResponse.java rename to src/main/java/com/glxp/api/res/basic/SpsSyncScheduleResponse.java index c710e1f9..5cdf76c7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncScheduleResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SpsSyncScheduleResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; -import com.glxp.api.admin.entity.basic.BasicExportStatusEntity; +import com.glxp.api.entity.basic.BasicExportStatusEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SrBtResponse.java b/src/main/java/com/glxp/api/res/basic/SrBtResponse.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/SrBtResponse.java rename to src/main/java/com/glxp/api/res/basic/SrBtResponse.java index e979b464..54af9152 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SrBtResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SrBtResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SrtBasicUnitResponse.java b/src/main/java/com/glxp/api/res/basic/SrtBasicUnitResponse.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/SrtBasicUnitResponse.java rename to src/main/java/com/glxp/api/res/basic/SrtBasicUnitResponse.java index eb7cd8a0..fc91211e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SrtBasicUnitResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SrtBasicUnitResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SupCertSetResponse.java b/src/main/java/com/glxp/api/res/basic/SupCertSetResponse.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/SupCertSetResponse.java rename to src/main/java/com/glxp/api/res/basic/SupCertSetResponse.java index db620807..e31cac70 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SupCertSetResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SupCertSetResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SystemPDFTemplateRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/SystemPDFTemplateRelevanceResponse.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/SystemPDFTemplateRelevanceResponse.java rename to src/main/java/com/glxp/api/res/basic/SystemPDFTemplateRelevanceResponse.java index 47a0d701..7e60fe1f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SystemPDFTemplateRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SystemPDFTemplateRelevanceResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UOnhandQueryResponse.java b/src/main/java/com/glxp/api/res/basic/UOnhandQueryResponse.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/UOnhandQueryResponse.java rename to src/main/java/com/glxp/api/res/basic/UOnhandQueryResponse.java index 5144a805..70abf523 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UOnhandQueryResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UOnhandQueryResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; public class UOnhandQueryResponse { diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceExportJsonResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceExportJsonResponse.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceExportJsonResponse.java rename to src/main/java/com/glxp/api/res/basic/UdiRelevanceExportJsonResponse.java index fc83f90f..57d9cbb1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceExportJsonResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceExportJsonResponse.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; -import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; import lombok.Data; import java.util.ArrayList; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java rename to src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 9bda28b1..0d52e1c6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -1,9 +1,7 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; -import java.util.Date; - @Data public class UdiRelevanceResponse { private Integer id; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRlDlResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlDlResponse.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRlDlResponse.java rename to src/main/java/com/glxp/api/res/basic/UdiRlDlResponse.java index 45f23348..4e57f512 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRlDlResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRlDlResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiTraceResponse.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java rename to src/main/java/com/glxp/api/res/basic/UdiTraceResponse.java index be463136..72f274d6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiTraceResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.basic; +package com.glxp.api.res.basic; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailEntityVo.java b/src/main/java/com/glxp/api/res/business/StockOrderDetailEntityVo.java similarity index 64% rename from api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailEntityVo.java rename to src/main/java/com/glxp/api/res/business/StockOrderDetailEntityVo.java index 9c80b269..1a682420 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailEntityVo.java +++ b/src/main/java/com/glxp/api/res/business/StockOrderDetailEntityVo.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.res.business; +package com.glxp.api.res.business; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.business.StockOrderDetailEntity; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailQueryProductResponse.java b/src/main/java/com/glxp/api/res/business/StockOrderDetailQueryProductResponse.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailQueryProductResponse.java rename to src/main/java/com/glxp/api/res/business/StockOrderDetailQueryProductResponse.java index f05cd548..c96ea59d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailQueryProductResponse.java +++ b/src/main/java/com/glxp/api/res/business/StockOrderDetailQueryProductResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.business; +package com.glxp.api.res.business; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailResponse.java b/src/main/java/com/glxp/api/res/business/StockOrderDetailResponse.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailResponse.java rename to src/main/java/com/glxp/api/res/business/StockOrderDetailResponse.java index 5777c23d..edb24f7f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/business/StockOrderDetailResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.business; +package com.glxp.api.res.business; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderExportResponse.java b/src/main/java/com/glxp/api/res/business/StockOrderExportResponse.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderExportResponse.java rename to src/main/java/com/glxp/api/res/business/StockOrderExportResponse.java index 42774a52..db9ba49f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderExportResponse.java +++ b/src/main/java/com/glxp/api/res/business/StockOrderExportResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.business; +package com.glxp.api.res.business; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/erp/UdiwmsWarehouseDetail.java b/src/main/java/com/glxp/api/res/erp/UdiwmsWarehouseDetail.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/res/erp/UdiwmsWarehouseDetail.java rename to src/main/java/com/glxp/api/res/erp/UdiwmsWarehouseDetail.java index 03c0cd9a..a8f016f1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/erp/UdiwmsWarehouseDetail.java +++ b/src/main/java/com/glxp/api/res/erp/UdiwmsWarehouseDetail.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.erp; +package com.glxp.api.res.erp; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/erp/UdiwmsWarehouseResponse.java b/src/main/java/com/glxp/api/res/erp/UdiwmsWarehouseResponse.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/res/erp/UdiwmsWarehouseResponse.java rename to src/main/java/com/glxp/api/res/erp/UdiwmsWarehouseResponse.java index 7dcdbc4d..e90bc633 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/erp/UdiwmsWarehouseResponse.java +++ b/src/main/java/com/glxp/api/res/erp/UdiwmsWarehouseResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.erp; +package com.glxp.api.res.erp; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java b/src/main/java/com/glxp/api/res/info/CompanyProductRelevanceResponse.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java rename to src/main/java/com/glxp/api/res/info/CompanyProductRelevanceResponse.java index 135ac151..6801f307 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/info/CompanyProductRelevanceResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.info; +package com.glxp.api.res.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/PlatformLinkResponse.java b/src/main/java/com/glxp/api/res/info/PlatformLinkResponse.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/res/info/PlatformLinkResponse.java rename to src/main/java/com/glxp/api/res/info/PlatformLinkResponse.java index e52f246f..0139bdd1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/PlatformLinkResponse.java +++ b/src/main/java/com/glxp/api/res/info/PlatformLinkResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.info; +package com.glxp.api.res.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java b/src/main/java/com/glxp/api/res/info/SyncDataSetResponse.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java rename to src/main/java/com/glxp/api/res/info/SyncDataSetResponse.java index dff97ee5..cff8b92d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java +++ b/src/main/java/com/glxp/api/res/info/SyncDataSetResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.info; +package com.glxp.api.res.info; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; +import com.glxp.api.entity.info.SyncDataBustypeEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFModuleResponse.java b/src/main/java/com/glxp/api/res/info/SystemPDFModuleResponse.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFModuleResponse.java rename to src/main/java/com/glxp/api/res/info/SystemPDFModuleResponse.java index 17285f05..3573c92a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFModuleResponse.java +++ b/src/main/java/com/glxp/api/res/info/SystemPDFModuleResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.info; +package com.glxp.api.res.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFModuleSelectResponse.java b/src/main/java/com/glxp/api/res/info/SystemPDFModuleSelectResponse.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFModuleSelectResponse.java rename to src/main/java/com/glxp/api/res/info/SystemPDFModuleSelectResponse.java index 21e4ca34..88282ef2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFModuleSelectResponse.java +++ b/src/main/java/com/glxp/api/res/info/SystemPDFModuleSelectResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.info; +package com.glxp.api.res.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFTemplateResponse.java b/src/main/java/com/glxp/api/res/info/SystemPDFTemplateResponse.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFTemplateResponse.java rename to src/main/java/com/glxp/api/res/info/SystemPDFTemplateResponse.java index fc8a8068..2530ae90 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFTemplateResponse.java +++ b/src/main/java/com/glxp/api/res/info/SystemPDFTemplateResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.info; +package com.glxp.api.res.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFTemplateSelectResponse.java b/src/main/java/com/glxp/api/res/info/SystemPDFTemplateSelectResponse.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFTemplateSelectResponse.java rename to src/main/java/com/glxp/api/res/info/SystemPDFTemplateSelectResponse.java index dcbe1f42..c66ded0b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFTemplateSelectResponse.java +++ b/src/main/java/com/glxp/api/res/info/SystemPDFTemplateSelectResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.info; +package com.glxp.api.res.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemParamConfigResponse.java b/src/main/java/com/glxp/api/res/info/SystemParamConfigResponse.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/res/info/SystemParamConfigResponse.java rename to src/main/java/com/glxp/api/res/info/SystemParamConfigResponse.java index a152578f..a2efd64a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemParamConfigResponse.java +++ b/src/main/java/com/glxp/api/res/info/SystemParamConfigResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.info; +package com.glxp.api.res.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/DlOrderResponse.java b/src/main/java/com/glxp/api/res/inout/DlOrderResponse.java similarity index 51% rename from api-admin/src/main/java/com/glxp/api/admin/res/inout/DlOrderResponse.java rename to src/main/java/com/glxp/api/res/inout/DlOrderResponse.java index 617546a2..86ef69b5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/DlOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/DlOrderResponse.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.res.inout; +package com.glxp.api.res.inout; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java b/src/main/java/com/glxp/api/res/inout/ErpOrderResponse.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java rename to src/main/java/com/glxp/api/res/inout/ErpOrderResponse.java index 9dca286f..533e127b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/ErpOrderResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inout; +package com.glxp.api.res.inout; import java.math.BigDecimal; import java.util.List; @@ -18,7 +18,7 @@ public class ErpOrderResponse { private String thirdSysFk; - private List subErpOrders; + private List subErpOrders; //增加字段 private String startDate; //起始日期 diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/InvmandocResponse.java b/src/main/java/com/glxp/api/res/inout/InvmandocResponse.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/res/inout/InvmandocResponse.java rename to src/main/java/com/glxp/api/res/inout/InvmandocResponse.java index 34bd8d5d..c065a8fc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/InvmandocResponse.java +++ b/src/main/java/com/glxp/api/res/inout/InvmandocResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inout; +package com.glxp.api.res.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/OrderNoResult.java b/src/main/java/com/glxp/api/res/inout/OrderNoResult.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/res/inout/OrderNoResult.java rename to src/main/java/com/glxp/api/res/inout/OrderNoResult.java index bd0e2050..0a0929c6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/OrderNoResult.java +++ b/src/main/java/com/glxp/api/res/inout/OrderNoResult.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inout; +package com.glxp.api.res.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/PurchaseinResponse.java b/src/main/java/com/glxp/api/res/inout/PurchaseinResponse.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/res/inout/PurchaseinResponse.java rename to src/main/java/com/glxp/api/res/inout/PurchaseinResponse.java index 9ca32c1c..d45d75bb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/PurchaseinResponse.java +++ b/src/main/java/com/glxp/api/res/inout/PurchaseinResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inout; +package com.glxp.api.res.inout; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java b/src/main/java/com/glxp/api/res/inout/StockOrderResponse.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java rename to src/main/java/com/glxp/api/res/inout/StockOrderResponse.java index 33de8e80..62ffd9d1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/StockOrderResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.inout; +package com.glxp.api.res.inout; -import com.glxp.api.admin.entity.business.StockOrderEntity; +import com.glxp.api.entity.business.StockOrderEntity; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java b/src/main/java/com/glxp/api/res/inout/WarehouseResponse.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java rename to src/main/java/com/glxp/api/res/inout/WarehouseResponse.java index b378b361..842bf2b8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java +++ b/src/main/java/com/glxp/api/res/inout/WarehouseResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inout; +package com.glxp.api.res.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseUserResponse.java b/src/main/java/com/glxp/api/res/inout/WarehouseUserResponse.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseUserResponse.java rename to src/main/java/com/glxp/api/res/inout/WarehouseUserResponse.java index 062d22a0..8ee57e0c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseUserResponse.java +++ b/src/main/java/com/glxp/api/res/inout/WarehouseUserResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inout; +package com.glxp.api.res.inout; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inventory/DeviceCollectOrderDetailResponse.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderDetailResponse.java rename to src/main/java/com/glxp/api/res/inventory/DeviceCollectOrderDetailResponse.java index 42948328..e784c460 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/DeviceCollectOrderDetailResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; +import com.glxp.api.entity.inventory.DeviceCollectOrderDetailEntity; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderResponse.java b/src/main/java/com/glxp/api/res/inventory/DeviceCollectOrderResponse.java similarity index 65% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderResponse.java rename to src/main/java/com/glxp/api/res/inventory/DeviceCollectOrderResponse.java index 94829343..614ccc70 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/DeviceCollectOrderResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity; +import com.glxp.api.entity.inventory.DeviceCollectOrderEntity; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inventory/DeviceMAOrderDetailResponse.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderDetailResponse.java rename to src/main/java/com/glxp/api/res/inventory/DeviceMAOrderDetailResponse.java index a15cea2f..d048e7fd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/DeviceMAOrderDetailResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; -import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; +import com.glxp.api.entity.inventory.DeviceMAOrderDetailEntity; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/res/inventory/DeviceMAOrderResponse.java b/src/main/java/com/glxp/api/res/inventory/DeviceMAOrderResponse.java new file mode 100644 index 00000000..5b34bd32 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inventory/DeviceMAOrderResponse.java @@ -0,0 +1,17 @@ +package com.glxp.api.res.inventory; + +import com.glxp.api.entity.inventory.DeviceMAOrderEntity; +import lombok.Data; + +/** + * 设备养护记录接口响应结果实体 + */ +@Data +public class DeviceMAOrderResponse extends DeviceMAOrderEntity { + + /** + * 设备编号 + */ + private String code; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java b/src/main/java/com/glxp/api/res/inventory/ErpInvProductResponse.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java rename to src/main/java/com/glxp/api/res/inventory/ErpInvProductResponse.java index ba48f4b2..8af6c5e4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/ErpInvProductResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpOnHandResponse.java b/src/main/java/com/glxp/api/res/inventory/ErpOnHandResponse.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpOnHandResponse.java rename to src/main/java/com/glxp/api/res/inventory/ErpOnHandResponse.java index 1325057d..4051e2b7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpOnHandResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/ErpOnHandResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/IncodeSysParmsResponse.java b/src/main/java/com/glxp/api/res/inventory/IncodeSysParmsResponse.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/IncodeSysParmsResponse.java rename to src/main/java/com/glxp/api/res/inventory/IncodeSysParmsResponse.java index 976cf78a..7ecc341d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/IncodeSysParmsResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/IncodeSysParmsResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvBusUserResponse.java b/src/main/java/com/glxp/api/res/inventory/InvBusUserResponse.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvBusUserResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvBusUserResponse.java index 33a10871..31e05537 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvBusUserResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvBusUserResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvCountOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inventory/InvCountOrderDetailResponse.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvCountOrderDetailResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvCountOrderDetailResponse.java index 7887a4a7..f6992cb1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvCountOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvCountOrderDetailResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; -import com.glxp.api.admin.entity.inventory.InvCountOrderDetail; +import com.glxp.api.entity.inventory.InvCountOrderDetail; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvCountOrderResponse.java b/src/main/java/com/glxp/api/res/inventory/InvCountOrderResponse.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvCountOrderResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvCountOrderResponse.java index 17c39bc0..97c4a276 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvCountOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvCountOrderResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; -import com.glxp.api.admin.entity.inventory.InvCountOrder; +import com.glxp.api.entity.inventory.InvCountOrder; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvCountSettingResponse.java b/src/main/java/com/glxp/api/res/inventory/InvCountSettingResponse.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvCountSettingResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvCountSettingResponse.java index 541d9d69..e2b12f41 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvCountSettingResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvCountSettingResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; -import com.glxp.api.admin.entity.inventory.InvCountSettingEntity; +import com.glxp.api.entity.inventory.InvCountSettingEntity; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvMAOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inventory/InvMAOrderDetailResponse.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvMAOrderDetailResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvMAOrderDetailResponse.java index 1dc36119..2a0cc674 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvMAOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvMAOrderDetailResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; -import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderDetailEntity; +import com.glxp.api.entity.inventory.InvMaintenanceOrderDetailEntity; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvMAOrderResponse.java b/src/main/java/com/glxp/api/res/inventory/InvMAOrderResponse.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvMAOrderResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvMAOrderResponse.java index f4a69ed4..029a79ed 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvMAOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvMAOrderResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; -import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderEntity; +import com.glxp.api.entity.inventory.InvMaintenanceOrderEntity; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductDetailJoinResponse.java b/src/main/java/com/glxp/api/res/inventory/InvProductDetailJoinResponse.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductDetailJoinResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvProductDetailJoinResponse.java index 398611ef..6c6d2a90 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductDetailJoinResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvProductDetailJoinResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductDetailPlaceResponse.java b/src/main/java/com/glxp/api/res/inventory/InvProductDetailPlaceResponse.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductDetailPlaceResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvProductDetailPlaceResponse.java index 1518b12d..356c1edb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductDetailPlaceResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvProductDetailPlaceResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductDetailResponse.java b/src/main/java/com/glxp/api/res/inventory/InvProductDetailResponse.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductDetailResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvProductDetailResponse.java index e8b5951c..5ba70720 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvProductDetailResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductPageRespnonse.java b/src/main/java/com/glxp/api/res/inventory/InvProductPageRespnonse.java similarity index 59% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductPageRespnonse.java rename to src/main/java/com/glxp/api/res/inventory/InvProductPageRespnonse.java index e884fe9d..65c481d3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductPageRespnonse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvProductPageRespnonse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; -import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.res.PageSimpleResponse; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductResponse.java b/src/main/java/com/glxp/api/res/inventory/InvProductResponse.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvProductResponse.java index ba79ebaa..da4306a1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvProductResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductStatResponse.java b/src/main/java/com/glxp/api/res/inventory/InvProductStatResponse.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductStatResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvProductStatResponse.java index b40a5dba..b557b908 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductStatResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvProductStatResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductThirdResponse.java b/src/main/java/com/glxp/api/res/inventory/InvProductThirdResponse.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductThirdResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvProductThirdResponse.java index 49b559ad..95e6b5c9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductThirdResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvProductThirdResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvSpaceResponse.java b/src/main/java/com/glxp/api/res/inventory/InvSpaceResponse.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvSpaceResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvSpaceResponse.java index cd816193..9b2b5fec 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvSpaceResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvSpaceResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; -import com.glxp.api.admin.entity.business.InvSpace; +import com.glxp.api.entity.business.InvSpace; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvSubWarehouseResponse.java b/src/main/java/com/glxp/api/res/inventory/InvSubWarehouseResponse.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvSubWarehouseResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvSubWarehouseResponse.java index d598f3c4..11d25217 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvSubWarehouseResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvSubWarehouseResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvThirdGetResponse.java b/src/main/java/com/glxp/api/res/inventory/InvThirdGetResponse.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvThirdGetResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvThirdGetResponse.java index 948ec165..4f295c90 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvThirdGetResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvThirdGetResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvWarehouseExportResponse.java b/src/main/java/com/glxp/api/res/inventory/InvWarehouseExportResponse.java similarity index 54% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvWarehouseExportResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvWarehouseExportResponse.java index d2f84a48..291aba9e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvWarehouseExportResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvWarehouseExportResponse.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvWarehouseResponse.java b/src/main/java/com/glxp/api/res/inventory/InvWarehouseResponse.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvWarehouseResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvWarehouseResponse.java index 01de8d5c..9282a710 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvWarehouseResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvWarehouseResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvWarehouseThirdSysResponse.java b/src/main/java/com/glxp/api/res/inventory/InvWarehouseThirdSysResponse.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvWarehouseThirdSysResponse.java rename to src/main/java/com/glxp/api/res/inventory/InvWarehouseThirdSysResponse.java index 6c59e4b8..80d5c05a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvWarehouseThirdSysResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/InvWarehouseThirdSysResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/MAInvProductResponse.java b/src/main/java/com/glxp/api/res/inventory/MAInvProductResponse.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/res/inventory/MAInvProductResponse.java rename to src/main/java/com/glxp/api/res/inventory/MAInvProductResponse.java index efdc6cc9..d2b3e83f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/MAInvProductResponse.java +++ b/src/main/java/com/glxp/api/res/inventory/MAInvProductResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.inventory; +package com.glxp.api.res.inventory; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inventory/WarehouseResponse2.java b/src/main/java/com/glxp/api/res/inventory/WarehouseResponse2.java new file mode 100644 index 00000000..2e0de8bb --- /dev/null +++ b/src/main/java/com/glxp/api/res/inventory/WarehouseResponse2.java @@ -0,0 +1,26 @@ +package com.glxp.api.res.inventory; + +import lombok.Data; + +@Data +public class WarehouseResponse2 { + private String action; + private String mainAction; + private String code; + private String corpOrderId; + private String actor; + private String actDate; + private long wrongCode; + private String upperCorpOrderId; + private String fromCorpId; + private long id; + private String fromCorp; + private Integer count; + private String orderId; + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + + private String invStorageName; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java b/src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java rename to src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java index 0a97e1f0..8d9aa720 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.purchase; +package com.glxp.api.res.purchase; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java b/src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java rename to src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java index e74299ad..94959003 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.purchase; +package com.glxp.api.res.purchase; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/SupProductResponse.java b/src/main/java/com/glxp/api/res/purchase/SupProductResponse.java similarity index 60% rename from api-admin/src/main/java/com/glxp/api/admin/res/purchase/SupProductResponse.java rename to src/main/java/com/glxp/api/res/purchase/SupProductResponse.java index 517f00eb..ddfc3a07 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/SupProductResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/SupProductResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.purchase; +package com.glxp.api.res.purchase; -import com.glxp.api.admin.entity.purchase.SupProductEntity; +import com.glxp.api.entity.purchase.SupProductEntity; import lombok.Data; @Data diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrInvWarehouseResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrInvWarehouseResponse.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrInvWarehouseResponse.java rename to src/main/java/com/glxp/api/res/thrsys/ThrInvWarehouseResponse.java index 013b8e9a..730b3e7e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrInvWarehouseResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrInvWarehouseResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.res.thrsys; +package com.glxp.api.res.thrsys; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrOrderExportJsonResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrOrderExportJsonResponse.java similarity index 57% rename from api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrOrderExportJsonResponse.java rename to src/main/java/com/glxp/api/res/thrsys/ThrOrderExportJsonResponse.java index a427d161..021e737c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrOrderExportJsonResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrOrderExportJsonResponse.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.res.thrsys; +package com.glxp.api.res.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.entity.thrsys.ThrOrderEntity; import lombok.Data; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrSubInvWarehouseResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrSubInvWarehouseResponse.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrSubInvWarehouseResponse.java rename to src/main/java/com/glxp/api/res/thrsys/ThrSubInvWarehouseResponse.java index 0411d405..5858dba8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrSubInvWarehouseResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrSubInvWarehouseResponse.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.res.thrsys; +package com.glxp.api.res.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity; +import com.glxp.api.entity.thrsys.ThrSubInvWarehouseEntity; import lombok.Data; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthAdminService.java rename to src/main/java/com/glxp/api/service/auth/AuthAdminService.java index cc54aeb6..88f5fe3c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthAdminService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; -import com.glxp.api.admin.req.auth.FilterNoSelectUserRequest; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.req.auth.AuthAdminQueryRequest; +import com.glxp.api.req.auth.FilterNoSelectUserRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthCheckService.java b/src/main/java/com/glxp/api/service/auth/AuthCheckService.java similarity index 61% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthCheckService.java rename to src/main/java/com/glxp/api/service/auth/AuthCheckService.java index b8e0a2b3..8eadab71 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthCheckService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthCheckService.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.auth.AuthCheckEntity; -import com.glxp.api.admin.req.auth.AuthCheckRequest; -import org.springframework.stereotype.Service; +import com.glxp.api.entity.auth.AuthCheckEntity; +import com.glxp.api.req.auth.AuthCheckRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthLoginService.java b/src/main/java/com/glxp/api/service/auth/AuthLoginService.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthLoginService.java rename to src/main/java/com/glxp/api/service/auth/AuthLoginService.java index cf7f4fbf..429d8054 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthLoginService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthLoginService.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthPermissionRuleService.java b/src/main/java/com/glxp/api/service/auth/AuthPermissionRuleService.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthPermissionRuleService.java rename to src/main/java/com/glxp/api/service/auth/AuthPermissionRuleService.java index 17e8ee05..bbc46ae8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthPermissionRuleService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthPermissionRuleService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.auth.AuthPermissionRule; +import com.glxp.api.entity.auth.AuthPermissionRule; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthPermissionService.java b/src/main/java/com/glxp/api/service/auth/AuthPermissionService.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthPermissionService.java rename to src/main/java/com/glxp/api/service/auth/AuthPermissionService.java index 627fd058..c32ae2a1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthPermissionService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthPermissionService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.auth.AuthPermission; +import com.glxp.api.entity.auth.AuthPermission; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthRoleAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthRoleAdminService.java rename to src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java index 24d67180..56226271 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthRoleAdminService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.auth.AuthRoleAdmin; +import com.glxp.api.entity.auth.AuthRoleAdmin; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthRoleService.java b/src/main/java/com/glxp/api/service/auth/AuthRoleService.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthRoleService.java rename to src/main/java/com/glxp/api/service/auth/AuthRoleService.java index 283fe20f..a14d0585 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthRoleService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthRoleService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.req.auth.AuthRoleQueryRequest; -import com.glxp.api.admin.entity.auth.AuthRole; +import com.glxp.api.entity.auth.AuthRole; +import com.glxp.api.req.auth.AuthRoleQueryRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/CustomerService.java b/src/main/java/com/glxp/api/service/auth/CustomerService.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/CustomerService.java rename to src/main/java/com/glxp/api/service/auth/CustomerService.java index e8a40f5a..cbfe4334 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/CustomerService.java +++ b/src/main/java/com/glxp/api/service/auth/CustomerService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.exception.JsonException; import com.glxp.api.common.enums.ResultEnum; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java b/src/main/java/com/glxp/api/service/auth/DeptService.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java rename to src/main/java/com/glxp/api/service/auth/DeptService.java index e4fa6706..18b3e226 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java +++ b/src/main/java/com/glxp/api/service/auth/DeptService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.auth.DeptEntity; -import com.glxp.api.admin.req.auth.FilterDeptRequest; +import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.req.auth.FilterDeptRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptUserService.java b/src/main/java/com/glxp/api/service/auth/DeptUserService.java similarity index 63% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptUserService.java rename to src/main/java/com/glxp/api/service/auth/DeptUserService.java index f3c63e9d..59ed0a3a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptUserService.java +++ b/src/main/java/com/glxp/api/service/auth/DeptUserService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.auth.DeptUserEntity; -import com.glxp.api.admin.req.auth.DeptUserReqeust; -import com.glxp.api.admin.res.auth.DeptUserResponse; +import com.glxp.api.entity.auth.DeptUserEntity; +import com.glxp.api.req.auth.DeptUserReqeust; +import com.glxp.api.res.auth.DeptUserResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeviceKeyService.java b/src/main/java/com/glxp/api/service/auth/DeviceKeyService.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/DeviceKeyService.java rename to src/main/java/com/glxp/api/service/auth/DeviceKeyService.java index 8489e8cd..b81afc8f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeviceKeyService.java +++ b/src/main/java/com/glxp/api/service/auth/DeviceKeyService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.info.DeviceKeyEntity; -import com.glxp.api.admin.req.info.FilterDeviceKeyRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.entity.info.DeviceKeyEntity; +import com.glxp.api.req.info.FilterDeviceKeyRequest; +import com.glxp.api.req.inout.DeleteRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysDictDataService.java b/src/main/java/com/glxp/api/service/auth/ISysDictDataService.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysDictDataService.java rename to src/main/java/com/glxp/api/service/auth/ISysDictDataService.java index 1a918e67..3b59b35b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysDictDataService.java +++ b/src/main/java/com/glxp/api/service/auth/ISysDictDataService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.auth.SysDictData; -import com.glxp.api.admin.req.auth.SysDictDataRequest; +import com.glxp.api.entity.auth.SysDictData; +import com.glxp.api.req.auth.SysDictDataRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysDictTypeService.java b/src/main/java/com/glxp/api/service/auth/ISysDictTypeService.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysDictTypeService.java rename to src/main/java/com/glxp/api/service/auth/ISysDictTypeService.java index a9cc2afc..3c137514 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysDictTypeService.java +++ b/src/main/java/com/glxp/api/service/auth/ISysDictTypeService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.auth.SysDictData; -import com.glxp.api.admin.entity.auth.SysDictType; -import com.glxp.api.admin.req.auth.SysDictTypeRequest; +import com.glxp.api.entity.auth.SysDictData; +import com.glxp.api.entity.auth.SysDictType; +import com.glxp.api.req.auth.SysDictTypeRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysHisStatusService.java b/src/main/java/com/glxp/api/service/auth/ISysHisStatusService.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysHisStatusService.java rename to src/main/java/com/glxp/api/service/auth/ISysHisStatusService.java index a4eabbbd..cb2153a7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysHisStatusService.java +++ b/src/main/java/com/glxp/api/service/auth/ISysHisStatusService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; import cn.hutool.core.lang.tree.Tree; -import com.glxp.api.admin.entity.auth.SysHisStatusEntity; -import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest; +import com.glxp.api.entity.auth.SysHisStatusEntity; +import com.glxp.api.req.auth.FilterSysHisStatusRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysMenuService.java b/src/main/java/com/glxp/api/service/auth/ISysMenuService.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysMenuService.java rename to src/main/java/com/glxp/api/service/auth/ISysMenuService.java index 0b2e50ab..a4bd102c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysMenuService.java +++ b/src/main/java/com/glxp/api/service/auth/ISysMenuService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; import cn.hutool.core.lang.tree.Tree; -import com.glxp.api.admin.entity.auth.RouterEntity; -import com.glxp.api.admin.entity.auth.SysMenu; +import com.glxp.api.entity.auth.RouterEntity; +import com.glxp.api.entity.auth.SysMenu; import java.util.List; import java.util.Set; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysRoleService.java b/src/main/java/com/glxp/api/service/auth/ISysRoleService.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysRoleService.java rename to src/main/java/com/glxp/api/service/auth/ISysRoleService.java index 1bf598a9..e642d418 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysRoleService.java +++ b/src/main/java/com/glxp/api/service/auth/ISysRoleService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.auth.SysRole; -import com.glxp.api.admin.entity.auth.SysUserRole; -import com.glxp.api.admin.req.auth.SysRoleRequest; +import com.glxp.api.entity.auth.SysRole; +import com.glxp.api.entity.auth.SysUserRole; +import com.glxp.api.req.auth.SysRoleRequest; import java.util.List; import java.util.Set; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/SysPermissionService.java b/src/main/java/com/glxp/api/service/auth/SysPermissionService.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/SysPermissionService.java rename to src/main/java/com/glxp/api/service/auth/SysPermissionService.java index b0f130d7..6f7bf7b4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/SysPermissionService.java +++ b/src/main/java/com/glxp/api/service/auth/SysPermissionService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.auth; +package com.glxp.api.service.auth; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.auth.SysRole; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.SysRole; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index 4d17b280..2bf8c959 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -1,16 +1,16 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; import cn.hutool.core.util.ArrayUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.auth.AuthAdminDao; -import com.glxp.api.admin.dao.auth.SysUserRoleMapper; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.auth.SysUserRole; -import com.glxp.api.admin.exception.JsonException; -import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; -import com.glxp.api.admin.req.auth.FilterNoSelectUserRequest; -import com.glxp.api.admin.req.auth.SysUserRoleRequest; -import com.glxp.api.admin.service.auth.AuthAdminService; +import com.glxp.api.dao.auth.AuthAdminDao; +import com.glxp.api.dao.auth.SysUserRoleMapper; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.SysUserRole; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.auth.AuthAdminQueryRequest; +import com.glxp.api.req.auth.FilterNoSelectUserRequest; +import com.glxp.api.req.auth.SysUserRoleRequest; +import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.common.enums.ResultEnum; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthCheckServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthCheckServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java index b410d3be..91bcdc54 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthCheckServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java @@ -1,11 +1,10 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.auth.AuthAdminDao; -import com.glxp.api.admin.dao.auth.AuthCheckDao; -import com.glxp.api.admin.entity.auth.AuthCheckEntity; -import com.glxp.api.admin.req.auth.AuthCheckRequest; -import com.glxp.api.admin.service.auth.AuthCheckService; +import com.glxp.api.dao.auth.AuthCheckDao; +import com.glxp.api.entity.auth.AuthCheckEntity; +import com.glxp.api.req.auth.AuthCheckRequest; +import com.glxp.api.service.auth.AuthCheckService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthLoginServiceImpl.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/AuthLoginServiceImpl.java index 97111954..733600f1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthLoginServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.auth.impl; - -import com.glxp.api.admin.entity.auth.AuthPermission; -import com.glxp.api.admin.entity.auth.AuthPermissionRule; -import com.glxp.api.admin.entity.auth.AuthRoleAdmin; -import com.glxp.api.admin.service.auth.AuthLoginService; -import com.glxp.api.admin.service.auth.AuthPermissionRuleService; -import com.glxp.api.admin.service.auth.AuthPermissionService; -import com.glxp.api.admin.service.auth.AuthRoleAdminService; +package com.glxp.api.service.auth.impl; + +import com.glxp.api.entity.auth.AuthPermission; +import com.glxp.api.entity.auth.AuthPermissionRule; +import com.glxp.api.entity.auth.AuthRoleAdmin; +import com.glxp.api.service.auth.AuthLoginService; +import com.glxp.api.service.auth.AuthPermissionRuleService; +import com.glxp.api.service.auth.AuthPermissionService; +import com.glxp.api.service.auth.AuthRoleAdminService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthPermissionRuleServiceImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/AuthPermissionRuleServiceImpl.java index 5557a732..03b990db 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthPermissionRuleServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; -import com.glxp.api.admin.dao.auth.AuthPermissionRuleDao; -import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.dao.auth.AuthPermissionRuleDao; +import com.glxp.api.entity.auth.AuthPermissionRule; +import com.glxp.api.exception.JsonException; +import com.glxp.api.service.auth.AuthPermissionRuleService; import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.admin.entity.auth.AuthPermissionRule; -import com.glxp.api.admin.service.auth.AuthPermissionRuleService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthPermissionServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthPermissionServiceImpl.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthPermissionServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/AuthPermissionServiceImpl.java index 7bf61079..126ef039 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthPermissionServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthPermissionServiceImpl.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; -import com.glxp.api.admin.dao.auth.AuthPermissionDao; -import com.glxp.api.admin.entity.auth.AuthPermission; -import com.glxp.api.admin.service.auth.AuthPermissionService; +import com.glxp.api.dao.auth.AuthPermissionDao; +import com.glxp.api.entity.auth.AuthPermission; +import com.glxp.api.service.auth.AuthPermissionService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java index d6a52d49..8da7df91 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; -import com.glxp.api.admin.dao.auth.AuthRoleAdminDao; -import com.glxp.api.admin.entity.auth.AuthRoleAdmin; -import com.glxp.api.admin.service.auth.AuthRoleAdminService; +import com.glxp.api.dao.auth.AuthRoleAdminDao; +import com.glxp.api.entity.auth.AuthRoleAdmin; +import com.glxp.api.service.auth.AuthRoleAdminService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java index 6591b156..76f5c019 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.auth.AuthRoleDao; -import com.glxp.api.admin.req.auth.AuthRoleQueryRequest; -import com.glxp.api.admin.entity.auth.AuthRole; -import com.glxp.api.admin.service.auth.AuthRoleService; +import com.glxp.api.dao.auth.AuthRoleDao; +import com.glxp.api.entity.auth.AuthRole; +import com.glxp.api.req.auth.AuthRoleQueryRequest; +import com.glxp.api.service.auth.AuthRoleService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java index 30e4c137..30858c47 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.auth.DeptDao; -import com.glxp.api.admin.dao.auth.DeptHisStatusDao; -import com.glxp.api.admin.entity.auth.DeptEntity; -import com.glxp.api.admin.entity.auth.DeptHisStatusEntity; -import com.glxp.api.admin.req.auth.FilterDeptRequest; -import com.glxp.api.admin.service.auth.DeptService; +import com.glxp.api.dao.auth.DeptDao; +import com.glxp.api.dao.auth.DeptHisStatusDao; +import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.entity.auth.DeptHisStatusEntity; +import com.glxp.api.req.auth.FilterDeptRequest; +import com.glxp.api.service.auth.DeptService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptUserServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java index a7c0731e..f7701392 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.auth.DeptUserDao; -import com.glxp.api.admin.entity.auth.DeptUserEntity; -import com.glxp.api.admin.req.auth.DeptUserReqeust; -import com.glxp.api.admin.res.auth.DeptUserResponse; -import com.glxp.api.admin.service.auth.DeptUserService; +import com.glxp.api.dao.auth.DeptUserDao; +import com.glxp.api.entity.auth.DeptUserEntity; +import com.glxp.api.req.auth.DeptUserReqeust; +import com.glxp.api.res.auth.DeptUserResponse; +import com.glxp.api.service.auth.DeptUserService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeviceKeyServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeviceKeyServiceImpl.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeviceKeyServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/DeviceKeyServiceImpl.java index d61190b6..47c41edc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeviceKeyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeviceKeyServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.auth.DeviceKeyDao; -import com.glxp.api.admin.entity.info.DeviceKeyEntity; -import com.glxp.api.admin.req.info.FilterDeviceKeyRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.service.auth.DeviceKeyService; +import com.glxp.api.dao.auth.DeviceKeyDao; +import com.glxp.api.entity.info.DeviceKeyEntity; +import com.glxp.api.req.info.FilterDeviceKeyRequest; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.service.auth.DeviceKeyService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/ISysHisStatusServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/ISysHisStatusServiceImpl.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/ISysHisStatusServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/ISysHisStatusServiceImpl.java index 5a881cc3..f9e5c9ec 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/ISysHisStatusServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/ISysHisStatusServiceImpl.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.auth.SysHisStatusDao; -import com.glxp.api.admin.entity.auth.SysHisStatusEntity; -import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest; -import com.glxp.api.admin.service.auth.ISysHisStatusService; -import com.glxp.api.admin.util.TreeBuildUtils; +import com.glxp.api.dao.auth.SysHisStatusDao; +import com.glxp.api.entity.auth.SysHisStatusEntity; +import com.glxp.api.req.auth.FilterSysHisStatusRequest; +import com.glxp.api.service.auth.ISysHisStatusService; +import com.glxp.api.util.TreeBuildUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysDictDataServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysDictDataServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java index 7ce75989..2ffa9e02 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysDictDataServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.auth.SysDictDataMapper; -import com.glxp.api.admin.entity.auth.SysDictData; -import com.glxp.api.admin.exception.ServiceException; -import com.glxp.api.admin.req.auth.SysDictDataRequest; -import com.glxp.api.admin.service.auth.ISysDictDataService; +import com.glxp.api.dao.auth.SysDictDataMapper; +import com.glxp.api.entity.auth.SysDictData; +import com.glxp.api.exception.ServiceException; +import com.glxp.api.req.auth.SysDictDataRequest; +import com.glxp.api.service.auth.ISysDictDataService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysDictTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysDictTypeServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java index e45f9392..ad11506c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java @@ -1,16 +1,16 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.dao.auth.SysDictDataMapper; -import com.glxp.api.admin.dao.auth.SysDictTypeMapper; -import com.glxp.api.admin.entity.auth.SysDictData; -import com.glxp.api.admin.entity.auth.SysDictType; -import com.glxp.api.admin.exception.ServiceException; -import com.glxp.api.admin.req.auth.SysDictDataRequest; -import com.glxp.api.admin.req.auth.SysDictTypeRequest; -import com.glxp.api.admin.service.auth.ISysDictTypeService; +import com.glxp.api.constant.Constant; +import com.glxp.api.dao.auth.SysDictDataMapper; +import com.glxp.api.dao.auth.SysDictTypeMapper; +import com.glxp.api.entity.auth.SysDictData; +import com.glxp.api.entity.auth.SysDictType; +import com.glxp.api.exception.ServiceException; +import com.glxp.api.req.auth.SysDictDataRequest; +import com.glxp.api.req.auth.SysDictTypeRequest; +import com.glxp.api.service.auth.ISysDictTypeService; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysMenuServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysMenuServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java index 82369962..199fa9e4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java @@ -1,17 +1,17 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.http.HttpUtil; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.dao.auth.SysMenuDao; -import com.glxp.api.admin.dao.auth.SysRoleMapper; -import com.glxp.api.admin.dao.auth.SysRoleMenuMapper; -import com.glxp.api.admin.entity.auth.*; -import com.glxp.api.admin.req.auth.SysMenuRequest; -import com.glxp.api.admin.req.auth.SysRoleMenuRequest; -import com.glxp.api.admin.service.auth.ISysMenuService; -import com.glxp.api.admin.util.TreeBuildUtils; +import com.glxp.api.constant.Constant; +import com.glxp.api.dao.auth.SysMenuDao; +import com.glxp.api.dao.auth.SysRoleMapper; +import com.glxp.api.dao.auth.SysRoleMenuMapper; +import com.glxp.api.entity.auth.*; +import com.glxp.api.req.auth.SysMenuRequest; +import com.glxp.api.req.auth.SysRoleMenuRequest; +import com.glxp.api.service.auth.ISysMenuService; +import com.glxp.api.util.TreeBuildUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysRoleServiceImpl.java rename to src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java index f7d9404f..015a4972 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java @@ -1,19 +1,19 @@ -package com.glxp.api.admin.service.auth.impl; +package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.dao.auth.SysRoleMapper; -import com.glxp.api.admin.dao.auth.SysRoleMenuMapper; -import com.glxp.api.admin.dao.auth.SysUserRoleMapper; -import com.glxp.api.admin.entity.auth.SysRole; -import com.glxp.api.admin.entity.auth.SysRoleMenu; -import com.glxp.api.admin.entity.auth.SysUserRole; -import com.glxp.api.admin.exception.ServiceException; -import com.glxp.api.admin.req.auth.SysRoleRequest; -import com.glxp.api.admin.req.auth.SysUserRoleRequest; -import com.glxp.api.admin.service.auth.ISysRoleService; +import com.glxp.api.constant.Constant; +import com.glxp.api.dao.auth.SysRoleMapper; +import com.glxp.api.dao.auth.SysRoleMenuMapper; +import com.glxp.api.dao.auth.SysUserRoleMapper; +import com.glxp.api.entity.auth.SysRole; +import com.glxp.api.entity.auth.SysRoleMenu; +import com.glxp.api.entity.auth.SysUserRole; +import com.glxp.api.exception.ServiceException; +import com.glxp.api.req.auth.SysRoleRequest; +import com.glxp.api.req.auth.SysUserRoleRequest; +import com.glxp.api.service.auth.ISysRoleService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicBusTypeChangeService.java b/src/main/java/com/glxp/api/service/basic/BasicBusTypeChangeService.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicBusTypeChangeService.java rename to src/main/java/com/glxp/api/service/basic/BasicBusTypeChangeService.java index 8b85ca7d..033ed985 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicBusTypeChangeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicBusTypeChangeService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.admin.req.basic.BasicBusTypeChangeRequest; -import com.glxp.api.admin.res.basic.BasicBusTypeChangeResponse; +import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.api.req.basic.BasicBusTypeChangeRequest; +import com.glxp.api.res.basic.BasicBusTypeChangeResponse; import org.springframework.stereotype.Service; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java b/src/main/java/com/glxp/api/service/basic/BasicDownloadService.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java rename to src/main/java/com/glxp/api/service/basic/BasicDownloadService.java index efeee8be..a505051d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicDownloadService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.BasicDownloadStatusEntity; -import com.glxp.api.admin.req.basic.BasicDownloadRequest; +import com.glxp.api.entity.basic.BasicDownloadStatusEntity; +import com.glxp.api.req.basic.BasicDownloadRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java b/src/main/java/com/glxp/api/service/basic/BasicExportService.java similarity index 62% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java rename to src/main/java/com/glxp/api/service/basic/BasicExportService.java index f1f3a885..ad317dbc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicExportService.java @@ -1,9 +1,7 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.BasicExportStatusEntity; -import com.glxp.api.admin.req.basic.BasicExportStatusRequest; -import com.glxp.api.admin.req.inout.OrderStatusFilterRequest; -import org.apache.ibatis.annotations.Param; +import com.glxp.api.entity.basic.BasicExportStatusEntity; +import com.glxp.api.req.basic.BasicExportStatusRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportTimeService.java b/src/main/java/com/glxp/api/service/basic/BasicExportTimeService.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportTimeService.java rename to src/main/java/com/glxp/api/service/basic/BasicExportTimeService.java index aa653a27..e64d2ef6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportTimeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicExportTimeService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity; -import com.glxp.api.admin.req.basic.BasicExportTimeRequest; +import com.glxp.api.entity.basic.BasicExportStatusTimeEntity; +import com.glxp.api.req.basic.BasicExportTimeRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysBusApiService.java b/src/main/java/com/glxp/api/service/basic/BasicThirdSysBusApiService.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysBusApiService.java rename to src/main/java/com/glxp/api/service/basic/BasicThirdSysBusApiService.java index d9098cf8..1086f489 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysBusApiService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicThirdSysBusApiService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.req.basic.FilterBasicThirdSysDetailRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysDetailService.java b/src/main/java/com/glxp/api/service/basic/BasicThirdSysDetailService.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysDetailService.java rename to src/main/java/com/glxp/api/service/basic/BasicThirdSysDetailService.java index 2c355571..5b69b412 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysDetailService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicThirdSysDetailService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.req.basic.FilterBasicThirdSysDetailRequest; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysService.java b/src/main/java/com/glxp/api/service/basic/BasicThirdSysService.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysService.java rename to src/main/java/com/glxp/api/service/basic/BasicThirdSysService.java index 05765712..764714b2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicThirdSysService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.req.basic.FilterBasicThirdSysRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java b/src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java rename to src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java index 276b00ec..1d9ff16f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessChangeTypeService.java b/src/main/java/com/glxp/api/service/basic/BussinessChangeTypeService.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessChangeTypeService.java rename to src/main/java/com/glxp/api/service/basic/BussinessChangeTypeService.java index 10b04487..91444649 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessChangeTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/BussinessChangeTypeService.java @@ -1,9 +1,8 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity; -import com.glxp.api.admin.req.basic.BusTypeChangeFilterRequest; -import org.apache.ibatis.annotations.Param; +import com.glxp.api.entity.basic.BussinessChangeTypeEntity; +import com.glxp.api.req.basic.BusTypeChangeFilterRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java b/src/main/java/com/glxp/api/service/basic/BussinessLocalTypeService.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java rename to src/main/java/com/glxp/api/service/basic/BussinessLocalTypeService.java index 21644161..80be2dd5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/BussinessLocalTypeService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.req.basic.BussinessLocalTypeFilterRequest; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessOriginTypeService.java b/src/main/java/com/glxp/api/service/basic/BussinessOriginTypeService.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessOriginTypeService.java rename to src/main/java/com/glxp/api/service/basic/BussinessOriginTypeService.java index 24884a70..1aafd15f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessOriginTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/BussinessOriginTypeService.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; -import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BussinessOriginTypeEntity; +import com.glxp.api.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java b/src/main/java/com/glxp/api/service/basic/BussinessTypeService.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java rename to src/main/java/com/glxp/api/service/basic/BussinessTypeService.java index cb7361d3..f27e1be7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/BussinessTypeService.java @@ -1,12 +1,11 @@ -package com.glxp.api.admin.service.basic; - -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.admin.req.basic.BusOriginJoinFilterRequest; -import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; -import com.glxp.api.admin.res.basic.BussinessTypResponse; +package com.glxp.api.service.basic; + +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.req.basic.BusOriginJoinFilterRequest; +import com.glxp.api.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.res.basic.BussinessTypResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpExportLogService.java b/src/main/java/com/glxp/api/service/basic/CorpExportLogService.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpExportLogService.java rename to src/main/java/com/glxp/api/service/basic/CorpExportLogService.java index 964ad36a..f5ab2c2c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpExportLogService.java +++ b/src/main/java/com/glxp/api/service/basic/CorpExportLogService.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.CorpExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import org.apache.ibatis.annotations.Param; +import com.glxp.api.entity.basic.CorpExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpImportDetailService.java b/src/main/java/com/glxp/api/service/basic/CorpImportDetailService.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpImportDetailService.java rename to src/main/java/com/glxp/api/service/basic/CorpImportDetailService.java index 56c46f31..595bd8ea 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpImportDetailService.java +++ b/src/main/java/com/glxp/api/service/basic/CorpImportDetailService.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.CorpImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import org.apache.ibatis.annotations.Param; +import com.glxp.api.entity.basic.CorpImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpImportLogService.java b/src/main/java/com/glxp/api/service/basic/CorpImportLogService.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpImportLogService.java rename to src/main/java/com/glxp/api/service/basic/CorpImportLogService.java index cf0f404e..74e6f3a4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpImportLogService.java +++ b/src/main/java/com/glxp/api/service/basic/CorpImportLogService.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.CorpImportLogEntity; -import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.basic.CorpImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/CustomService.java b/src/main/java/com/glxp/api/service/basic/CustomService.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/CustomService.java rename to src/main/java/com/glxp/api/service/basic/CustomService.java index f62fc8dc..5f63f544 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/CustomService.java +++ b/src/main/java/com/glxp/api/service/basic/CustomService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.res.basic.UdiRelevanceResponse; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/EntrustReceService.java b/src/main/java/com/glxp/api/service/basic/EntrustReceService.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/EntrustReceService.java rename to src/main/java/com/glxp/api/service/basic/EntrustReceService.java index 8509ae37..c0f5fda3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/EntrustReceService.java +++ b/src/main/java/com/glxp/api/service/basic/EntrustReceService.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.DlEntrustReceEntity; -import com.glxp.api.admin.entity.basic.EntrustReceEntity; -import com.glxp.api.admin.req.basic.BasicEntrustRecRequest; -import com.glxp.api.admin.res.basic.EntrustReceResponse; +import com.glxp.api.entity.basic.DlEntrustReceEntity; +import com.glxp.api.entity.basic.EntrustReceEntity; +import com.glxp.api.req.basic.BasicEntrustRecRequest; +import com.glxp.api.res.basic.EntrustReceResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/NewUploadDiService.java b/src/main/java/com/glxp/api/service/basic/NewUploadDiService.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/NewUploadDiService.java rename to src/main/java/com/glxp/api/service/basic/NewUploadDiService.java index 8136d072..499d4147 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/NewUploadDiService.java +++ b/src/main/java/com/glxp/api/service/basic/NewUploadDiService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.NewUploadDiEntity; -import com.glxp.api.admin.req.basic.FilterNewUploadDiRequest; -import com.glxp.api.admin.res.basic.NewUploadDiResponse; +import com.glxp.api.entity.basic.NewUploadDiEntity; +import com.glxp.api.req.basic.FilterNewUploadDiRequest; +import com.glxp.api.res.basic.NewUploadDiResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/ProductInfoService.java b/src/main/java/com/glxp/api/service/basic/ProductInfoService.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/ProductInfoService.java rename to src/main/java/com/glxp/api/service/basic/ProductInfoService.java index e9cda1ff..c6e4e3ac 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/ProductInfoService.java +++ b/src/main/java/com/glxp/api/service/basic/ProductInfoService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.ProductInfoEntity; -import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest; +import com.glxp.api.entity.basic.ProductInfoEntity; +import com.glxp.api.req.receipt.ProductInfoFilterRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/SyncUdiService.java b/src/main/java/com/glxp/api/service/basic/SyncUdiService.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/SyncUdiService.java rename to src/main/java/com/glxp/api/service/basic/SyncUdiService.java index 9095be50..91bbfb8b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/SyncUdiService.java +++ b/src/main/java/com/glxp/api/service/basic/SyncUdiService.java @@ -1,13 +1,12 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.entity.basic.ProductInfoEntity; -import com.glxp.api.admin.entity.basic.UdiCompanyEntity; -import com.glxp.api.admin.req.basic.UdiCompanyRequest; -import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.entity.basic.ProductInfoEntity; +import com.glxp.api.entity.basic.UdiCompanyEntity; +import com.glxp.api.req.basic.UdiCompanyRequest; +import com.glxp.api.req.receipt.ProductInfoFilterRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiCompanyService.java b/src/main/java/com/glxp/api/service/basic/UdiCompanyService.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiCompanyService.java rename to src/main/java/com/glxp/api/service/basic/UdiCompanyService.java index a856e83b..63b79b48 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiCompanyService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiCompanyService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.UdiCompanyEntity; -import com.glxp.api.admin.req.basic.UdiCompanyRequest; +import com.glxp.api.entity.basic.UdiCompanyEntity; +import com.glxp.api.req.basic.UdiCompanyRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java rename to src/main/java/com/glxp/api/service/basic/UdiContrastService.java index b37b7e2f..ca5fdf9c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -1,21 +1,21 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.dao.basic.UdiRelevanceDao; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.httpclient.UdiDlHttpClient; -import com.glxp.api.admin.req.basic.CombineRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.service.thrsys.ThrProductsService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.UdiInfoUtil; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.httpclient.UdiDlHttpClient; +import com.glxp.api.req.basic.CombineRequest; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.UdiInfoUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoExportLogService.java b/src/main/java/com/glxp/api/service/basic/UdiInfoExportLogService.java similarity index 61% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoExportLogService.java rename to src/main/java/com/glxp/api/service/basic/UdiInfoExportLogService.java index 30303b5d..ef83625f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoExportLogService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiInfoExportLogService.java @@ -1,9 +1,7 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import org.apache.ibatis.annotations.Param; +import com.glxp.api.entity.basic.UdiInfoExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoImportDetailService.java b/src/main/java/com/glxp/api/service/basic/UdiInfoImportDetailService.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoImportDetailService.java rename to src/main/java/com/glxp/api/service/basic/UdiInfoImportDetailService.java index 7a281ebd..3cba8a47 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoImportDetailService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiInfoImportDetailService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse; +import com.glxp.api.entity.basic.UdiInfoImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoImportLogService.java b/src/main/java/com/glxp/api/service/basic/UdiInfoImportLogService.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoImportLogService.java rename to src/main/java/com/glxp/api/service/basic/UdiInfoImportLogService.java index 07bfcdc2..1a19e74a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoImportLogService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiInfoImportLogService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoService.java b/src/main/java/com/glxp/api/service/basic/UdiInfoService.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoService.java rename to src/main/java/com/glxp/api/service/basic/UdiInfoService.java index 93f0a017..03de62eb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiInfoService.java @@ -1,9 +1,8 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java rename to src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java index 5c5d8e9a..be3b2329 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UnitMaintainService.java b/src/main/java/com/glxp/api/service/basic/UnitMaintainService.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/UnitMaintainService.java rename to src/main/java/com/glxp/api/service/basic/UnitMaintainService.java index c3de1a5e..51306e50 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UnitMaintainService.java +++ b/src/main/java/com/glxp/api/service/basic/UnitMaintainService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.basic; +package com.glxp.api.service.basic; -import com.glxp.api.admin.entity.basic.UnitMaintainEntity; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.entity.basic.UnitMaintainEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicBusTypeChangeServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java index 51380d5d..4bfcb900 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BasicBusTypeChangeDao; -import com.glxp.api.admin.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.admin.req.basic.BasicBusTypeChangeRequest; -import com.glxp.api.admin.res.basic.BasicBusTypeChangeResponse; -import com.glxp.api.admin.service.basic.BasicBusTypeChangeService; +import com.glxp.api.dao.basic.BasicBusTypeChangeDao; +import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.api.req.basic.BasicBusTypeChangeRequest; +import com.glxp.api.res.basic.BasicBusTypeChangeResponse; +import com.glxp.api.service.basic.BasicBusTypeChangeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicDownloadServiceImpl.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BasicDownloadServiceImpl.java index f46a91ed..c988c5a0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicDownloadServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BasicDownloadDao; -import com.glxp.api.admin.entity.basic.BasicDownloadStatusEntity; -import com.glxp.api.admin.req.basic.BasicDownloadRequest; -import com.glxp.api.admin.service.basic.BasicDownloadService; +import com.glxp.api.dao.basic.BasicDownloadDao; +import com.glxp.api.entity.basic.BasicDownloadStatusEntity; +import com.glxp.api.req.basic.BasicDownloadRequest; +import com.glxp.api.service.basic.BasicDownloadService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicExportServiceImpl.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BasicExportServiceImpl.java index 2db1d687..8dd1d210 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicExportServiceImpl.java @@ -1,13 +1,11 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BasicExportDao; -import com.glxp.api.admin.entity.basic.BasicExportStatusEntity; -import com.glxp.api.admin.entity.inout.IOOrderStatusEntity; -import com.glxp.api.admin.req.basic.BasicExportStatusRequest; -import com.glxp.api.admin.req.inout.OrderStatusFilterRequest; -import com.glxp.api.admin.service.basic.BasicExportService; +import com.glxp.api.dao.basic.BasicExportDao; +import com.glxp.api.entity.basic.BasicExportStatusEntity; +import com.glxp.api.req.basic.BasicExportStatusRequest; +import com.glxp.api.service.basic.BasicExportService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportTimeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicExportTimeServiceImpl.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportTimeServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BasicExportTimeServiceImpl.java index 343cd22c..f3e6a94c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportTimeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicExportTimeServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.admin.dao.basic.BasicExportTimeDao; -import com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity; -import com.glxp.api.admin.req.basic.BasicExportTimeRequest; -import com.glxp.api.admin.service.basic.BasicExportTimeService; +import com.glxp.api.dao.basic.BasicExportTimeDao; +import com.glxp.api.entity.basic.BasicExportStatusTimeEntity; +import com.glxp.api.req.basic.BasicExportTimeRequest; +import com.glxp.api.service.basic.BasicExportTimeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicThirdSysBusApiServiceImpl.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BasicThirdSysBusApiServiceImpl.java index 4681de6c..2908c01a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicThirdSysBusApiServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.admin.dao.basic.BasicThirdSysBusApiDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; -import com.glxp.api.admin.service.basic.BasicThirdSysBusApiService; +import com.glxp.api.dao.basic.BasicThirdSysBusApiDao; +import com.glxp.api.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.service.basic.BasicThirdSysBusApiService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicThirdSysDetailServiceImpl.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BasicThirdSysDetailServiceImpl.java index 9e9ff229..08d068d2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicThirdSysDetailServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BasicThirdSysDetailDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.dao.basic.BasicThirdSysDetailDao; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.service.basic.BasicThirdSysDetailService; import com.glxp.api.common.res.BaseResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicThirdSysServiceImpl.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BasicThirdSysServiceImpl.java index b20fd4f2..7b900237 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicThirdSysServiceImpl.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.auth.AuthLicenseDao; -import com.glxp.api.admin.dao.basic.BasicThirdSysDao; -import com.glxp.api.admin.entity.auth.AuthLicense; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; -import com.glxp.api.admin.service.basic.BasicThirdSysService; +import com.glxp.api.dao.auth.AuthLicenseDao; +import com.glxp.api.dao.basic.BasicThirdSysDao; +import com.glxp.api.entity.auth.AuthLicense; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.service.basic.BasicThirdSysService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java index 83c206f6..01d04e25 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BasicUnitMaintainDao; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; +import com.glxp.api.dao.basic.BasicUnitMaintainDao; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.service.basic.BasicUnitMaintainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessChangeTypeServiceaImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BussinessChangeTypeServiceaImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessChangeTypeServiceaImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BussinessChangeTypeServiceaImpl.java index 80741d2f..c72866ef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessChangeTypeServiceaImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BussinessChangeTypeServiceaImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BussinessChangeTypeDao; -import com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity; -import com.glxp.api.admin.req.basic.BusTypeChangeFilterRequest; -import com.glxp.api.admin.service.basic.BussinessChangeTypeService; +import com.glxp.api.dao.basic.BussinessChangeTypeDao; +import com.glxp.api.entity.basic.BussinessChangeTypeEntity; +import com.glxp.api.req.basic.BusTypeChangeFilterRequest; +import com.glxp.api.service.basic.BussinessChangeTypeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BussinessLocalTypeServiceImpl.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BussinessLocalTypeServiceImpl.java index 2c18193e..28be1665 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BussinessLocalTypeServiceImpl.java @@ -1,16 +1,16 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BussinessLocalTypeDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.req.basic.BusOriginJoinFilterRequest; -import com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BussinessLocalTypeService; +import com.glxp.api.dao.basic.BussinessLocalTypeDao; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.req.basic.BusOriginJoinFilterRequest; +import com.glxp.api.req.basic.BussinessLocalTypeFilterRequest; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.basic.BussinessLocalTypeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BussinessOriginTypeServiceImpl.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BussinessOriginTypeServiceImpl.java index 9175c47d..6444d876 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BussinessOriginTypeServiceImpl.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BussinessOriginTypeDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; -import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BussinessOriginTypeService; +import com.glxp.api.dao.basic.BussinessOriginTypeDao; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BussinessOriginTypeEntity; +import com.glxp.api.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.basic.BussinessOriginTypeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BussinessTypeServiceImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BussinessTypeServiceImpl.java index 6e5a7e83..22408d2f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BussinessTypeServiceImpl.java @@ -1,20 +1,18 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.dao.basic.BussinessLocalTypeDao; -import com.glxp.api.admin.dao.basic.BussinessTypeDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.req.basic.BusOriginJoinFilterRequest; -import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; -import com.glxp.api.admin.res.basic.BussinessTypResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BussinessOriginTypeService; -import com.glxp.api.admin.service.basic.BussinessTypeService; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.dao.basic.BussinessLocalTypeDao; +import com.glxp.api.dao.basic.BussinessTypeDao; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.req.basic.BusOriginJoinFilterRequest; +import com.glxp.api.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.res.basic.BussinessTypResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.basic.BussinessTypeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/CorpExportLogServiceImpl.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpExportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/CorpExportLogServiceImpl.java index 8a0ac86e..276e9d59 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/CorpExportLogServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.CorpExportLogDao; -import com.glxp.api.admin.entity.basic.CorpExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import com.glxp.api.admin.service.basic.CorpExportLogService; +import com.glxp.api.dao.basic.CorpExportLogDao; +import com.glxp.api.entity.basic.CorpExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.service.basic.CorpExportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/CorpImportDetailServiceImpl.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpImportDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/CorpImportDetailServiceImpl.java index 826ef487..47b127d5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/CorpImportDetailServiceImpl.java @@ -1,11 +1,10 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.CorpImportDetailDao; -import com.glxp.api.admin.entity.basic.CorpImportDetailEntity; -import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.basic.CorpImportDetailService; +import com.glxp.api.dao.basic.CorpImportDetailDao; +import com.glxp.api.entity.basic.CorpImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.basic.CorpImportDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/CorpImportLogServiceImpl.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpImportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/CorpImportLogServiceImpl.java index a1e2ef25..f70fb2d4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/CorpImportLogServiceImpl.java @@ -1,11 +1,10 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.CorpImportLogDao; -import com.glxp.api.admin.entity.basic.CorpImportLogEntity; -import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.basic.CorpImportLogService; +import com.glxp.api.dao.basic.CorpImportLogDao; +import com.glxp.api.entity.basic.CorpImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.basic.CorpImportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/EntrustReceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/EntrustReceServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java index 5c1c31c7..cf95a724 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/EntrustReceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.EntrustReceDao; -import com.glxp.api.admin.dao.inventory.InvSubWarehouseDao; -import com.glxp.api.admin.entity.basic.DlEntrustReceEntity; -import com.glxp.api.admin.entity.basic.EntrustReceEntity; -import com.glxp.api.admin.req.basic.BasicEntrustRecRequest; -import com.glxp.api.admin.res.basic.EntrustReceResponse; -import com.glxp.api.admin.service.basic.EntrustReceService; +import com.glxp.api.dao.basic.EntrustReceDao; +import com.glxp.api.dao.inventory.InvSubWarehouseDao; +import com.glxp.api.entity.basic.DlEntrustReceEntity; +import com.glxp.api.entity.basic.EntrustReceEntity; +import com.glxp.api.req.basic.BasicEntrustRecRequest; +import com.glxp.api.res.basic.EntrustReceResponse; +import com.glxp.api.service.basic.EntrustReceService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/NewUploadDiServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/NewUploadDiServiceImpl.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/NewUploadDiServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/NewUploadDiServiceImpl.java index 09ba1d6b..59b5bccd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/NewUploadDiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/NewUploadDiServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.NewUploadDiDao; -import com.glxp.api.admin.entity.basic.NewUploadDiEntity; -import com.glxp.api.admin.req.basic.FilterNewUploadDiRequest; -import com.glxp.api.admin.res.basic.NewUploadDiResponse; -import com.glxp.api.admin.service.basic.NewUploadDiService; +import com.glxp.api.dao.basic.NewUploadDiDao; +import com.glxp.api.entity.basic.NewUploadDiEntity; +import com.glxp.api.req.basic.FilterNewUploadDiRequest; +import com.glxp.api.res.basic.NewUploadDiResponse; +import com.glxp.api.service.basic.NewUploadDiService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/ProductInfoServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/ProductInfoServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java index 6ce48e61..2c7fca5c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/ProductInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.ProductInfoDao; -import com.glxp.api.admin.entity.basic.ProductInfoEntity; -import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest; -import com.glxp.api.admin.service.basic.ProductInfoService; +import com.glxp.api.dao.basic.ProductInfoDao; +import com.glxp.api.entity.basic.ProductInfoEntity; +import com.glxp.api.req.receipt.ProductInfoFilterRequest; +import com.glxp.api.service.basic.ProductInfoService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiCompanyServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java index 1ab32318..716e96be 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.UdiCompanyDao; -import com.glxp.api.admin.entity.basic.UdiCompanyEntity; -import com.glxp.api.admin.req.basic.UdiCompanyRequest; -import com.glxp.api.admin.service.basic.UdiCompanyService; +import com.glxp.api.dao.basic.UdiCompanyDao; +import com.glxp.api.entity.basic.UdiCompanyEntity; +import com.glxp.api.req.basic.UdiCompanyRequest; +import com.glxp.api.service.basic.UdiCompanyService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiInfoExportLogServiceImpl.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoExportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/UdiInfoExportLogServiceImpl.java index 532dd557..872ba329 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiInfoExportLogServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.UdiInfoExportLogDao; -import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import com.glxp.api.admin.service.basic.UdiInfoExportLogService; +import com.glxp.api.dao.basic.UdiInfoExportLogDao; +import com.glxp.api.entity.basic.UdiInfoExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.service.basic.UdiInfoExportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiInfoImportDetailServiceImpl.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/UdiInfoImportDetailServiceImpl.java index a9d7c262..640bc7c3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiInfoImportDetailServiceImpl.java @@ -1,15 +1,14 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.*; -import com.glxp.api.admin.dao.thrsys.ThrProductsDao; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse; -import com.glxp.api.admin.service.basic.UdiInfoImportDetailService; -import com.glxp.api.admin.service.info.CompanyProductRelevanceService; +import com.glxp.api.dao.basic.*; +import com.glxp.api.dao.thrsys.ThrProductsDao; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; +import com.glxp.api.service.basic.UdiInfoImportDetailService; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiInfoImportLogServiceImpl.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/UdiInfoImportLogServiceImpl.java index ed35894f..6be142a1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiInfoImportLogServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.UdiInfoImportLogDao; -import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.basic.UdiInfoImportLogService; +import com.glxp.api.dao.basic.UdiInfoImportLogDao; +import com.glxp.api.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.basic.UdiInfoImportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiInfoServiceImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/UdiInfoServiceImpl.java index ef9c34e0..fbcfa1c2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiInfoServiceImpl.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.UdiInfoDao; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.dao.basic.UdiInfoDao; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.UdiInfoService; +import com.glxp.api.util.FilterUdiUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index f7b17070..7c96f0a8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -1,18 +1,18 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.dao.basic.UdiInfoDao; -import com.glxp.api.admin.dao.basic.UdiRelevanceDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.basic.UdiInfoDao; +import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.service.basic.UdiRelevanceService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UnitMaintainServiceImpl.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/UnitMaintainServiceImpl.java index 2c770f7e..0e57745e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UnitMaintainServiceImpl.java @@ -1,12 +1,10 @@ -package com.glxp.api.admin.service.basic.impl; +package com.glxp.api.service.basic.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.UnitMaintainDao; -import com.glxp.api.admin.entity.basic.UnitMaintainEntity; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.UnitMaintainService; +import com.glxp.api.dao.basic.UnitMaintainDao; +import com.glxp.api.entity.basic.UnitMaintainEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.service.basic.UnitMaintainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailService.java b/src/main/java/com/glxp/api/service/business/StockOrderDetailService.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailService.java rename to src/main/java/com/glxp/api/service/business/StockOrderDetailService.java index 671016c0..6825c656 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/business/StockOrderDetailService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.business; +package com.glxp.api.service.business; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; -import com.glxp.api.admin.res.business.StockOrderDetailResponse; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.res.business.StockOrderDetailResponse; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailTempService.java b/src/main/java/com/glxp/api/service/business/StockOrderDetailTempService.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailTempService.java rename to src/main/java/com/glxp/api/service/business/StockOrderDetailTempService.java index c1a0b590..699577dd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailTempService.java +++ b/src/main/java/com/glxp/api/service/business/StockOrderDetailTempService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.business; +package com.glxp.api.service.business; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderService.java b/src/main/java/com/glxp/api/service/business/StockOrderService.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderService.java rename to src/main/java/com/glxp/api/service/business/StockOrderService.java index 139d3e61..97b63e0b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderService.java +++ b/src/main/java/com/glxp/api/service/business/StockOrderService.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.business; +package com.glxp.api.service.business; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.business.StockOrderPrintEntity; -import com.glxp.api.admin.req.business.StockOrderFilterRequest; -import com.glxp.api.admin.req.business.StockOrderQueryRequest; -import com.glxp.api.admin.req.business.StockOrderUploadRequest; -import com.glxp.api.admin.res.business.StockOrderExportResponse; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.business.StockOrderPrintEntity; +import com.glxp.api.req.business.StockOrderFilterRequest; +import com.glxp.api.req.business.StockOrderQueryRequest; +import com.glxp.api.req.business.StockOrderUploadRequest; +import com.glxp.api.res.business.StockOrderExportResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderUploadLogService.java b/src/main/java/com/glxp/api/service/business/StockOrderUploadLogService.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderUploadLogService.java rename to src/main/java/com/glxp/api/service/business/StockOrderUploadLogService.java index 755cb20c..bdb6a3ed 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderUploadLogService.java +++ b/src/main/java/com/glxp/api/service/business/StockOrderUploadLogService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.business; +package com.glxp.api.service.business; -import com.glxp.api.admin.entity.business.StockOrderUploadLogEntity; -import com.glxp.api.admin.req.business.StockOrderUploadLogRequest; +import com.glxp.api.entity.business.StockOrderUploadLogEntity; +import com.glxp.api.req.business.StockOrderUploadLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockQRCodeTextService.java b/src/main/java/com/glxp/api/service/business/StockQRCodeTextService.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/business/StockQRCodeTextService.java rename to src/main/java/com/glxp/api/service/business/StockQRCodeTextService.java index 382885c8..403310ba 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockQRCodeTextService.java +++ b/src/main/java/com/glxp/api/service/business/StockQRCodeTextService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.business; +package com.glxp.api.service.business; -import com.glxp.api.admin.entity.business.StockQRCodeTextEntity; -import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest; +import com.glxp.api.entity.business.StockQRCodeTextEntity; +import com.glxp.api.req.business.StockQRCodeTextFilterRequest; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/business/impl/StockOrderDetailServiceImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/business/impl/StockOrderDetailServiceImpl.java index 4bb535de..3beab629 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/business/impl/StockOrderDetailServiceImpl.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.service.business.impl; +package com.glxp.api.service.business.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.business.StockOrderDetailDao; -import com.glxp.api.admin.dao.schedule.SystemParamConfigDao; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; -import com.glxp.api.admin.res.business.StockOrderDetailResponse; -import com.glxp.api.admin.service.business.StockOrderDetailService; +import com.glxp.api.dao.business.StockOrderDetailDao; +import com.glxp.api.dao.schedule.SystemParamConfigDao; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.res.business.StockOrderDetailResponse; +import com.glxp.api.service.business.StockOrderDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailTempServiceImpl.java b/src/main/java/com/glxp/api/service/business/impl/StockOrderDetailTempServiceImpl.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailTempServiceImpl.java rename to src/main/java/com/glxp/api/service/business/impl/StockOrderDetailTempServiceImpl.java index a619f59e..ce9b3bbf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/business/impl/StockOrderDetailTempServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.business.impl; +package com.glxp.api.service.business.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.business.StockOrderDetailTempDao; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; -import com.glxp.api.admin.service.business.StockOrderDetailTempService; +import com.glxp.api.dao.business.StockOrderDetailTempDao; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.service.business.StockOrderDetailTempService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java b/src/main/java/com/glxp/api/service/business/impl/StockOrderServiceImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java rename to src/main/java/com/glxp/api/service/business/impl/StockOrderServiceImpl.java index 5b3c3924..63350715 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/business/impl/StockOrderServiceImpl.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.service.business.impl; +package com.glxp.api.service.business.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -7,46 +7,46 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.dao.basic.BasicThirdSysBusApiDao; -import com.glxp.api.admin.dao.basic.BasicThirdSysDao; -import com.glxp.api.admin.dao.basic.BussinessLocalTypeDao; -import com.glxp.api.admin.dao.business.StockOrderDao; -import com.glxp.api.admin.dao.business.StockOrderDetailDao; -import com.glxp.api.admin.dao.inout.CodesDao; -import com.glxp.api.admin.dao.inout.OrderDao; -import com.glxp.api.admin.dao.inout.OrderDetailDao; -import com.glxp.api.admin.dao.inventory.InvPreInProductDao; -import com.glxp.api.admin.dao.inventory.InvPreInProductDetailDao; -import com.glxp.api.admin.dao.inventory.InvProductDao; -import com.glxp.api.admin.dao.inventory.InvProductDetailDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.business.StockOrderPrintEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.httpclient.req.UdiwmsOrderRequest; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; -import com.glxp.api.admin.req.business.StockOrderFilterRequest; -import com.glxp.api.admin.req.business.StockOrderQueryRequest; -import com.glxp.api.admin.req.business.StockOrderUploadRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.business.StockOrderDetailEntityVo; -import com.glxp.api.admin.res.business.StockOrderExportResponse; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.inout.CodesTempService; -import com.glxp.api.admin.util.BusTypeCheckUtils; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.HttpOkClient; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.dao.basic.BasicThirdSysBusApiDao; +import com.glxp.api.dao.basic.BasicThirdSysDao; +import com.glxp.api.dao.basic.BussinessLocalTypeDao; +import com.glxp.api.dao.business.StockOrderDao; +import com.glxp.api.dao.business.StockOrderDetailDao; +import com.glxp.api.dao.inout.CodesDao; +import com.glxp.api.dao.inout.OrderDao; +import com.glxp.api.dao.inout.OrderDetailDao; +import com.glxp.api.dao.inventory.InvPreInProductDao; +import com.glxp.api.dao.inventory.InvPreInProductDetailDao; +import com.glxp.api.dao.inventory.InvProductDao; +import com.glxp.api.dao.inventory.InvProductDetailDao; +import com.glxp.api.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.business.StockOrderPrintEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.httpclient.req.UdiwmsOrderRequest; +import com.glxp.api.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.req.business.StockOrderFilterRequest; +import com.glxp.api.req.business.StockOrderQueryRequest; +import com.glxp.api.req.business.StockOrderUploadRequest; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.business.StockOrderDetailEntityVo; +import com.glxp.api.res.business.StockOrderExportResponse; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.inout.CodesTempService; +import com.glxp.api.util.BusTypeCheckUtils; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.HttpOkClient; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderUploadLogServiceImpl.java b/src/main/java/com/glxp/api/service/business/impl/StockOrderUploadLogServiceImpl.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderUploadLogServiceImpl.java rename to src/main/java/com/glxp/api/service/business/impl/StockOrderUploadLogServiceImpl.java index c60ab5c3..ac58fac1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderUploadLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/business/impl/StockOrderUploadLogServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.business.impl; +package com.glxp.api.service.business.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.business.StockOrderUploadLogDao; -import com.glxp.api.admin.entity.business.StockOrderUploadLogEntity; -import com.glxp.api.admin.req.business.StockOrderUploadLogRequest; -import com.glxp.api.admin.service.business.StockOrderUploadLogService; +import com.glxp.api.dao.business.StockOrderUploadLogDao; +import com.glxp.api.entity.business.StockOrderUploadLogEntity; +import com.glxp.api.req.business.StockOrderUploadLogRequest; +import com.glxp.api.service.business.StockOrderUploadLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockQRCodeTextServiceImpl.java b/src/main/java/com/glxp/api/service/business/impl/StockQRCodeTextServiceImpl.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockQRCodeTextServiceImpl.java rename to src/main/java/com/glxp/api/service/business/impl/StockQRCodeTextServiceImpl.java index b3b6fb04..bcd71680 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockQRCodeTextServiceImpl.java +++ b/src/main/java/com/glxp/api/service/business/impl/StockQRCodeTextServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.business.impl; +package com.glxp.api.service.business.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.business.StockQRCodeTextDao; -import com.glxp.api.admin.entity.business.StockQRCodeTextEntity; -import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest; -import com.glxp.api.admin.service.business.StockQRCodeTextService; +import com.glxp.api.dao.business.StockQRCodeTextDao; +import com.glxp.api.entity.business.StockQRCodeTextEntity; +import com.glxp.api.req.business.StockQRCodeTextFilterRequest; +import com.glxp.api.service.business.StockQRCodeTextService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/ClassifyCodeService.java b/src/main/java/com/glxp/api/service/info/ClassifyCodeService.java similarity index 57% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/ClassifyCodeService.java rename to src/main/java/com/glxp/api/service/info/ClassifyCodeService.java index 980d8f75..53707b1c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/ClassifyCodeService.java +++ b/src/main/java/com/glxp/api/service/info/ClassifyCodeService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.info; +package com.glxp.api.service.info; -import com.glxp.api.admin.entity.info.ClassifyCodeEntity; -import com.glxp.api.admin.req.info.FilterClassifyCodeRequest; +import com.glxp.api.entity.info.ClassifyCodeEntity; +import com.glxp.api.req.info.FilterClassifyCodeRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyProductRelevanceService.java b/src/main/java/com/glxp/api/service/info/CompanyProductRelevanceService.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyProductRelevanceService.java rename to src/main/java/com/glxp/api/service/info/CompanyProductRelevanceService.java index 42f92144..68fe2c9b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyProductRelevanceService.java +++ b/src/main/java/com/glxp/api/service/info/CompanyProductRelevanceService.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.info; +package com.glxp.api.service.info; -import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; -import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; -import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; +import com.glxp.api.res.info.CompanyProductRelevanceResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyService.java b/src/main/java/com/glxp/api/service/info/CompanyService.java similarity index 58% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyService.java rename to src/main/java/com/glxp/api/service/info/CompanyService.java index 8ee903e1..862f8a85 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyService.java +++ b/src/main/java/com/glxp/api/service/info/CompanyService.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.service.info; +package com.glxp.api.service.info; -import com.glxp.api.admin.entity.info.CompanyEntity; +import com.glxp.api.entity.info.CompanyEntity; public interface CompanyService { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncDataBustypeService.java b/src/main/java/com/glxp/api/service/info/SyncDataBustypeService.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/SyncDataBustypeService.java rename to src/main/java/com/glxp/api/service/info/SyncDataBustypeService.java index 18e1fb76..9512fff7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncDataBustypeService.java +++ b/src/main/java/com/glxp/api/service/info/SyncDataBustypeService.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.service.info; +package com.glxp.api.service.info; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; +import com.glxp.api.entity.info.SyncDataBustypeEntity; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncDataSetService.java b/src/main/java/com/glxp/api/service/info/SyncDataSetService.java similarity index 52% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/SyncDataSetService.java rename to src/main/java/com/glxp/api/service/info/SyncDataSetService.java index 0401b7e7..a08739b7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncDataSetService.java +++ b/src/main/java/com/glxp/api/service/info/SyncDataSetService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.info; +package com.glxp.api.service.info; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; -import com.glxp.api.admin.res.info.SyncDataSetResponse; +import com.glxp.api.entity.info.SyncDataSetEntity; +import com.glxp.api.res.info.SyncDataSetResponse; public interface SyncDataSetService { SyncDataSetEntity findSet(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataBustypeService.java b/src/main/java/com/glxp/api/service/info/SyncUploadDataBustypeService.java similarity index 68% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataBustypeService.java rename to src/main/java/com/glxp/api/service/info/SyncUploadDataBustypeService.java index 195fa31a..9105de80 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataBustypeService.java +++ b/src/main/java/com/glxp/api/service/info/SyncUploadDataBustypeService.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.service.info; +package com.glxp.api.service.info; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; +import com.glxp.api.entity.info.SyncDataBustypeEntity; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataSetService.java b/src/main/java/com/glxp/api/service/info/SyncUploadDataSetService.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataSetService.java rename to src/main/java/com/glxp/api/service/info/SyncUploadDataSetService.java index e6dc1c8b..d221fa64 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataSetService.java +++ b/src/main/java/com/glxp/api/service/info/SyncUploadDataSetService.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.service.info; +package com.glxp.api.service.info; -import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity; +import com.glxp.api.entity.info.SyncUploadDataSetEntity; public interface SyncUploadDataSetService { diff --git a/src/main/java/com/glxp/api/service/info/SysServerLogService.java b/src/main/java/com/glxp/api/service/info/SysServerLogService.java new file mode 100644 index 00000000..bed43343 --- /dev/null +++ b/src/main/java/com/glxp/api/service/info/SysServerLogService.java @@ -0,0 +1,4 @@ +package com.glxp.api.service.info; + +public interface SysServerLogService { +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemPDFModuleService.java b/src/main/java/com/glxp/api/service/info/SystemPDFModuleService.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/SystemPDFModuleService.java rename to src/main/java/com/glxp/api/service/info/SystemPDFModuleService.java index be713a66..5a112dc7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemPDFModuleService.java +++ b/src/main/java/com/glxp/api/service/info/SystemPDFModuleService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.info; +package com.glxp.api.service.info; -import com.glxp.api.admin.entity.info.SystemPDFModuleEntity; -import com.glxp.api.admin.req.info.SystemPDFModuleRequest; -import com.glxp.api.admin.req.info.SystemPDFModuleSaveRequest; +import com.glxp.api.entity.info.SystemPDFModuleEntity; +import com.glxp.api.req.info.SystemPDFModuleRequest; +import com.glxp.api.req.info.SystemPDFModuleSaveRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemPDFTemplateRelevanceService.java b/src/main/java/com/glxp/api/service/info/SystemPDFTemplateRelevanceService.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/SystemPDFTemplateRelevanceService.java rename to src/main/java/com/glxp/api/service/info/SystemPDFTemplateRelevanceService.java index 171381a9..0c000cf1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemPDFTemplateRelevanceService.java +++ b/src/main/java/com/glxp/api/service/info/SystemPDFTemplateRelevanceService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.info; +package com.glxp.api.service.info; -import com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity; -import com.glxp.api.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; -import com.glxp.api.admin.res.basic.SystemPDFTemplateRelevanceResponse; +import com.glxp.api.entity.info.SystemPDFTemplateRelevanceEntity; +import com.glxp.api.req.itextpdf.SystemPDFTemplateRelevanceRequest; +import com.glxp.api.res.basic.SystemPDFTemplateRelevanceResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemPDFTemplateService.java b/src/main/java/com/glxp/api/service/info/SystemPDFTemplateService.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/SystemPDFTemplateService.java rename to src/main/java/com/glxp/api/service/info/SystemPDFTemplateService.java index 67cfabd8..f71efdc4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemPDFTemplateService.java +++ b/src/main/java/com/glxp/api/service/info/SystemPDFTemplateService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.info; +package com.glxp.api.service.info; -import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity; -import com.glxp.api.admin.req.info.SystemPDFTemplateRequest; -import com.glxp.api.admin.req.info.SystemPDFTemplateSaveRequest; +import com.glxp.api.entity.info.SystemPDFTemplateEntity; +import com.glxp.api.req.info.SystemPDFTemplateRequest; +import com.glxp.api.req.info.SystemPDFTemplateSaveRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java b/src/main/java/com/glxp/api/service/info/SystemParamConfigService.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java rename to src/main/java/com/glxp/api/service/info/SystemParamConfigService.java index e5680133..a376250d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java +++ b/src/main/java/com/glxp/api/service/info/SystemParamConfigService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.info; +package com.glxp.api.service.info; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.req.info.SystemParamConfigRequest; -import com.glxp.api.admin.req.info.SystemParamConfigSaveRequest; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.req.info.SystemParamConfigRequest; +import com.glxp.api.req.info.SystemParamConfigSaveRequest; import java.util.List; import java.util.Map; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/ThirdSysApiService.java b/src/main/java/com/glxp/api/service/info/ThirdSysApiService.java similarity index 50% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/ThirdSysApiService.java rename to src/main/java/com/glxp/api/service/info/ThirdSysApiService.java index ac5a6988..2b1f22f7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/ThirdSysApiService.java +++ b/src/main/java/com/glxp/api/service/info/ThirdSysApiService.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.service.info; +package com.glxp.api.service.info; -import com.glxp.api.admin.entity.info.CompanyEntity; -import com.glxp.api.admin.entity.info.ThirdSysApiEntity; -import com.glxp.api.admin.req.info.FilterSysApiRequest; +import com.glxp.api.entity.info.ThirdSysApiEntity; +import com.glxp.api.req.info.FilterSysApiRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/ClassifyCodeServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/ClassifyCodeServiceImpl.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/ClassifyCodeServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/ClassifyCodeServiceImpl.java index 101a973b..4abff710 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/ClassifyCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/ClassifyCodeServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.info.impl; +package com.glxp.api.service.info.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.info.ClassifyCodeDao; -import com.glxp.api.admin.entity.info.ClassifyCodeEntity; -import com.glxp.api.admin.req.info.FilterClassifyCodeRequest; -import com.glxp.api.admin.service.info.ClassifyCodeService; +import com.glxp.api.dao.info.ClassifyCodeDao; +import com.glxp.api.entity.info.ClassifyCodeEntity; +import com.glxp.api.req.info.FilterClassifyCodeRequest; +import com.glxp.api.service.info.ClassifyCodeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/CompanyProductRelevanceServiceImpl.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/CompanyProductRelevanceServiceImpl.java index ef735692..3afa933f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/CompanyProductRelevanceServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.info.impl; +package com.glxp.api.service.info.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.CompanyProductRelevanceDao; -import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; -import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; -import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; -import com.glxp.api.admin.service.info.CompanyProductRelevanceService; +import com.glxp.api.dao.basic.CompanyProductRelevanceDao; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; +import com.glxp.api.res.info.CompanyProductRelevanceResponse; +import com.glxp.api.service.info.CompanyProductRelevanceService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/CompanyServiceImpl.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/CompanyServiceImpl.java index 8da2e9a3..7bc71438 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/CompanyServiceImpl.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.info.impl; +package com.glxp.api.service.info.impl; -import com.glxp.api.admin.dao.info.CompanyDao; -import com.glxp.api.admin.entity.info.CompanyEntity; -import com.glxp.api.admin.service.info.CompanyService; +import com.glxp.api.dao.info.CompanyDao; +import com.glxp.api.entity.info.CompanyEntity; +import com.glxp.api.service.info.CompanyService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncDataBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/SyncDataBustypeServiceImpl.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncDataBustypeServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/SyncDataBustypeServiceImpl.java index b0cf971a..ac876d7c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncDataBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/SyncDataBustypeServiceImpl.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.info.impl; +package com.glxp.api.service.info.impl; -import com.glxp.api.admin.dao.info.SyncDataBustypeDao; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; -import com.glxp.api.admin.service.info.SyncDataBustypeService; +import com.glxp.api.dao.info.SyncDataBustypeDao; +import com.glxp.api.entity.info.SyncDataBustypeEntity; +import com.glxp.api.service.info.SyncDataBustypeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/SyncDataSetServiceImpl.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncDataSetServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/SyncDataSetServiceImpl.java index 4c04b1b2..a38437dc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/SyncDataSetServiceImpl.java @@ -1,12 +1,11 @@ -package com.glxp.api.admin.service.info.impl; - -import com.alibaba.fastjson.JSON; -import com.glxp.api.admin.dao.info.SyncDataSetDao; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; -import com.glxp.api.admin.res.info.SyncDataSetResponse; -import com.glxp.api.admin.service.info.SyncDataBustypeService; -import com.glxp.api.admin.service.info.SyncDataSetService; +package com.glxp.api.service.info.impl; + +import com.glxp.api.dao.info.SyncDataSetDao; +import com.glxp.api.entity.info.SyncDataBustypeEntity; +import com.glxp.api.entity.info.SyncDataSetEntity; +import com.glxp.api.res.info.SyncDataSetResponse; +import com.glxp.api.service.info.SyncDataBustypeService; +import com.glxp.api.service.info.SyncDataSetService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/SyncUploadDataBustypeServiceImpl.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataBustypeServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/SyncUploadDataBustypeServiceImpl.java index d901e163..adb8f522 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/SyncUploadDataBustypeServiceImpl.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.info.impl; +package com.glxp.api.service.info.impl; -import com.glxp.api.admin.dao.info.SyncUploadDataBustypeDao; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; -import com.glxp.api.admin.service.info.SyncUploadDataBustypeService; +import com.glxp.api.dao.info.SyncUploadDataBustypeDao; +import com.glxp.api.entity.info.SyncDataBustypeEntity; +import com.glxp.api.service.info.SyncUploadDataBustypeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/SyncUploadDataSetServiceImpl.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataSetServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/SyncUploadDataSetServiceImpl.java index e09125e5..d6a0730e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/SyncUploadDataSetServiceImpl.java @@ -1,11 +1,10 @@ -package com.glxp.api.admin.service.info.impl; - -import com.glxp.api.admin.dao.info.SyncUploadDataSetDao; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; -import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity; -import com.glxp.api.admin.service.info.SyncDataBustypeService; -import com.glxp.api.admin.service.info.SyncUploadDataBustypeService; -import com.glxp.api.admin.service.info.SyncUploadDataSetService; +package com.glxp.api.service.info.impl; + +import com.glxp.api.dao.info.SyncUploadDataSetDao; +import com.glxp.api.entity.info.SyncDataBustypeEntity; +import com.glxp.api.entity.info.SyncUploadDataSetEntity; +import com.glxp.api.service.info.SyncUploadDataBustypeService; +import com.glxp.api.service.info.SyncUploadDataSetService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SysServerLogServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/SysServerLogServiceImpl.java similarity index 55% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SysServerLogServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/SysServerLogServiceImpl.java index fec51cbb..f27ca7ad 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SysServerLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/SysServerLogServiceImpl.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.service.info.impl; +package com.glxp.api.service.info.impl; -import com.glxp.api.admin.service.info.SysServerLogService; +import com.glxp.api.service.info.SysServerLogService; import org.springframework.stereotype.Service; @Service diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFModuleServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/SystemPDFModuleServiceImpl.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFModuleServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/SystemPDFModuleServiceImpl.java index 1301c755..03d76c5e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFModuleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/SystemPDFModuleServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.info.impl; +package com.glxp.api.service.info.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.info.SystemPDFModuleDao; -import com.glxp.api.admin.entity.info.SystemPDFModuleEntity; -import com.glxp.api.admin.req.info.SystemPDFModuleRequest; -import com.glxp.api.admin.req.info.SystemPDFModuleSaveRequest; -import com.glxp.api.admin.service.info.SystemPDFModuleService; +import com.glxp.api.dao.info.SystemPDFModuleDao; +import com.glxp.api.entity.info.SystemPDFModuleEntity; +import com.glxp.api.req.info.SystemPDFModuleRequest; +import com.glxp.api.req.info.SystemPDFModuleSaveRequest; +import com.glxp.api.service.info.SystemPDFModuleService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFTemplateRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/SystemPDFTemplateRelevanceServiceImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFTemplateRelevanceServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/SystemPDFTemplateRelevanceServiceImpl.java index e7041703..15aaadc6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFTemplateRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/SystemPDFTemplateRelevanceServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.info.impl; +package com.glxp.api.service.info.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.info.SystemPDFTemplateRelevanceDao; -import com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity; -import com.glxp.api.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; -import com.glxp.api.admin.res.basic.SystemPDFTemplateRelevanceResponse; -import com.glxp.api.admin.service.info.SystemPDFTemplateRelevanceService; +import com.glxp.api.dao.info.SystemPDFTemplateRelevanceDao; +import com.glxp.api.entity.info.SystemPDFTemplateRelevanceEntity; +import com.glxp.api.req.itextpdf.SystemPDFTemplateRelevanceRequest; +import com.glxp.api.res.basic.SystemPDFTemplateRelevanceResponse; +import com.glxp.api.service.info.SystemPDFTemplateRelevanceService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFTemplateServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/SystemPDFTemplateServiceImpl.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFTemplateServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/SystemPDFTemplateServiceImpl.java index 70d81358..abc34f46 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemPDFTemplateServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/SystemPDFTemplateServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.info.impl; +package com.glxp.api.service.info.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.info.SystemPDFTemplateDao; -import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity; -import com.glxp.api.admin.req.info.SystemPDFTemplateRequest; -import com.glxp.api.admin.req.info.SystemPDFTemplateSaveRequest; -import com.glxp.api.admin.service.info.SystemPDFTemplateService; +import com.glxp.api.dao.info.SystemPDFTemplateDao; +import com.glxp.api.entity.info.SystemPDFTemplateEntity; +import com.glxp.api.req.info.SystemPDFTemplateRequest; +import com.glxp.api.req.info.SystemPDFTemplateSaveRequest; +import com.glxp.api.service.info.SystemPDFTemplateService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/SystemParamConfigServiceImpl.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/SystemParamConfigServiceImpl.java index 91a5f954..d2f6206e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/SystemParamConfigServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.info.impl; +package com.glxp.api.service.info.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.schedule.SystemParamConfigDao; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.req.info.SystemParamConfigRequest; -import com.glxp.api.admin.req.info.SystemParamConfigSaveRequest; -import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.dao.schedule.SystemParamConfigDao; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.req.info.SystemParamConfigRequest; +import com.glxp.api.req.info.SystemParamConfigSaveRequest; +import com.glxp.api.service.info.SystemParamConfigService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/ThirdSysApiServiceImpl.java b/src/main/java/com/glxp/api/service/info/impl/ThirdSysApiServiceImpl.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/service/info/impl/ThirdSysApiServiceImpl.java rename to src/main/java/com/glxp/api/service/info/impl/ThirdSysApiServiceImpl.java index 5ed9092e..ad49ac7b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/ThirdSysApiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/info/impl/ThirdSysApiServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.info.impl; +package com.glxp.api.service.info.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.info.ThirdSysApiDao; -import com.glxp.api.admin.entity.info.ThirdSysApiEntity; -import com.glxp.api.admin.req.info.FilterSysApiRequest; -import com.glxp.api.admin.service.info.ThirdSysApiService; +import com.glxp.api.dao.info.ThirdSysApiDao; +import com.glxp.api.entity.info.ThirdSysApiEntity; +import com.glxp.api.req.info.FilterSysApiRequest; +import com.glxp.api.service.info.ThirdSysApiService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesService.java b/src/main/java/com/glxp/api/service/inout/CodesService.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesService.java rename to src/main/java/com/glxp/api/service/inout/CodesService.java index aa35d2d4..09748b78 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesService.java +++ b/src/main/java/com/glxp/api/service/inout/CodesService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.inout; +package com.glxp.api.service.inout; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.req.inout.CodesReplaceRequest; -import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.req.inout.CodesReplaceRequest; +import com.glxp.api.req.inout.WarehouseQueryRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesTempService.java b/src/main/java/com/glxp/api/service/inout/CodesTempService.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesTempService.java rename to src/main/java/com/glxp/api/service/inout/CodesTempService.java index b5a222bf..d83184e8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesTempService.java +++ b/src/main/java/com/glxp/api/service/inout/CodesTempService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.inout; +package com.glxp.api.service.inout; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.req.inout.WarehouseQueryRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/IOOrderStatusService.java b/src/main/java/com/glxp/api/service/inout/IOOrderStatusService.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/IOOrderStatusService.java rename to src/main/java/com/glxp/api/service/inout/IOOrderStatusService.java index 8d8f9e71..5af4ee94 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/IOOrderStatusService.java +++ b/src/main/java/com/glxp/api/service/inout/IOOrderStatusService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.inout; +package com.glxp.api.service.inout; -import com.glxp.api.admin.entity.inout.IOOrderStatusEntity; -import com.glxp.api.admin.req.inout.OrderStatusFilterRequest; +import com.glxp.api.entity.inout.IOOrderStatusEntity; +import com.glxp.api.req.inout.OrderStatusFilterRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderDetailService.java b/src/main/java/com/glxp/api/service/inout/OrderDetailService.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderDetailService.java rename to src/main/java/com/glxp/api/service/inout/OrderDetailService.java index 232435a3..b6dfcbd6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inout/OrderDetailService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.inout; +package com.glxp.api.service.inout; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java b/src/main/java/com/glxp/api/service/inout/OrderService.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java rename to src/main/java/com/glxp/api/service/inout/OrderService.java index acfce749..5f686e29 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java +++ b/src/main/java/com/glxp/api/service/inout/OrderService.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.inout; - -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.req.inout.OrderQueryRequest; -import com.glxp.api.admin.res.inout.StockOrderResponse; +package com.glxp.api.service.inout; + +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.req.inout.OrderFilterRequest; +import com.glxp.api.req.inout.OrderQueryRequest; +import com.glxp.api.res.inout.StockOrderResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseBussinessTypeService.java b/src/main/java/com/glxp/api/service/inout/WarehouseBussinessTypeService.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseBussinessTypeService.java rename to src/main/java/com/glxp/api/service/inout/WarehouseBussinessTypeService.java index d129d077..f44c5186 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseBussinessTypeService.java +++ b/src/main/java/com/glxp/api/service/inout/WarehouseBussinessTypeService.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.inout; +package com.glxp.api.service.inout; -import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; -import com.glxp.api.admin.req.basic.FilterInvBusTypeRequest; -import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; -import com.glxp.api.admin.res.basic.BussinessTypResponse; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.api.req.basic.FilterInvBusTypeRequest; +import com.glxp.api.req.inventory.FilterInvLinkDataRequest; +import com.glxp.api.res.basic.BussinessTypResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java b/src/main/java/com/glxp/api/service/inout/WarehouseUserService.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java rename to src/main/java/com/glxp/api/service/inout/WarehouseUserService.java index 4f70cabb..f618442d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java +++ b/src/main/java/com/glxp/api/service/inout/WarehouseUserService.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.inout; +package com.glxp.api.service.inout; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.inout.WarehouseUserEntity; -import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; -import com.glxp.api.admin.req.inventory.FilterInvUserRequest; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.inout.WarehouseUserEntity; +import com.glxp.api.req.inventory.FilterInvLinkDataRequest; +import com.glxp.api.req.inventory.FilterInvUserRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/CodesServiceImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java rename to src/main/java/com/glxp/api/service/inout/impl/CodesServiceImpl.java index 5c0e5d44..f0c6c4d4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/CodesServiceImpl.java @@ -1,31 +1,31 @@ -package com.glxp.api.admin.service.inout.impl; +package com.glxp.api.service.inout.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.dao.business.StockOrderDao; -import com.glxp.api.admin.dao.business.StockOrderDetailDao; -import com.glxp.api.admin.dao.inout.CodesDao; -import com.glxp.api.admin.dao.inout.OrderDao; -import com.glxp.api.admin.dao.inout.OrderDetailDao; -import com.glxp.api.admin.dao.inventory.InvProductDao; -import com.glxp.api.admin.dao.inventory.InvProductDetailDao; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; -import com.glxp.api.admin.req.inout.CodesReplaceRequest; -import com.glxp.api.admin.req.inout.WarehouseQueryRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.service.inout.CodesService; -import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.dao.business.StockOrderDao; +import com.glxp.api.dao.business.StockOrderDetailDao; +import com.glxp.api.dao.inout.CodesDao; +import com.glxp.api.dao.inout.OrderDao; +import com.glxp.api.dao.inout.OrderDetailDao; +import com.glxp.api.dao.inventory.InvProductDao; +import com.glxp.api.dao.inventory.InvProductDetailDao; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.req.inout.CodesReplaceRequest; +import com.glxp.api.req.inout.WarehouseQueryRequest; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.service.inout.CodesService; +import com.glxp.api.service.inout.OrderService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesTempServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/CodesTempServiceImpl.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesTempServiceImpl.java rename to src/main/java/com/glxp/api/service/inout/impl/CodesTempServiceImpl.java index a7dc0eec..23870c36 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/CodesTempServiceImpl.java @@ -1,11 +1,10 @@ -package com.glxp.api.admin.service.inout.impl; +package com.glxp.api.service.inout.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inout.CodesDao; -import com.glxp.api.admin.dao.inout.CodesTempDao; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.req.inout.WarehouseQueryRequest; -import com.glxp.api.admin.service.inout.CodesTempService; +import com.glxp.api.dao.inout.CodesTempDao; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.req.inout.WarehouseQueryRequest; +import com.glxp.api.service.inout.CodesTempService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/IOOrderStatusServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IOOrderStatusServiceImpl.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/IOOrderStatusServiceImpl.java rename to src/main/java/com/glxp/api/service/inout/impl/IOOrderStatusServiceImpl.java index 06a7248e..d76d5aca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/IOOrderStatusServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IOOrderStatusServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.inout.impl; +package com.glxp.api.service.inout.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inout.IOOrderStatusDao; -import com.glxp.api.admin.entity.inout.IOOrderStatusEntity; -import com.glxp.api.admin.req.inout.OrderStatusFilterRequest; -import com.glxp.api.admin.service.inout.IOOrderStatusService; +import com.glxp.api.dao.inout.IOOrderStatusDao; +import com.glxp.api.entity.inout.IOOrderStatusEntity; +import com.glxp.api.req.inout.OrderStatusFilterRequest; +import com.glxp.api.service.inout.IOOrderStatusService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/OrderDetailServiceImpl.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/inout/impl/OrderDetailServiceImpl.java index 5e730fb6..1613f95e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/OrderDetailServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.inout.impl; +package com.glxp.api.service.inout.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inout.OrderDetailDao; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.api.admin.service.inout.OrderDetailService; +import com.glxp.api.dao.inout.OrderDetailDao; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; +import com.glxp.api.service.inout.OrderDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/OrderServiceImpl.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java rename to src/main/java/com/glxp/api/service/inout/impl/OrderServiceImpl.java index 1e8f0d00..9dbfd9d7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/OrderServiceImpl.java @@ -1,46 +1,46 @@ -package com.glxp.api.admin.service.inout.impl; +package com.glxp.api.service.inout.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.dao.basic.BasicThirdSysBusApiDao; -import com.glxp.api.admin.dao.basic.BussinessLocalTypeDao; -import com.glxp.api.admin.dao.basic.BussinessTypeDao; -import com.glxp.api.admin.dao.business.StockOrderDao; -import com.glxp.api.admin.dao.business.StockOrderDetailDao; -import com.glxp.api.admin.dao.inout.CodesDao; -import com.glxp.api.admin.dao.inout.CodesTempDao; -import com.glxp.api.admin.dao.inout.OrderDao; -import com.glxp.api.admin.dao.inout.OrderDetailDao; -import com.glxp.api.admin.dao.inventory.*; -import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.req.business.StockOrderFilterRequest; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.req.inout.OrderQueryRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.inout.OrderNoResult; -import com.glxp.api.admin.res.inout.StockOrderResponse; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.inventory.InvSubWarehouseService; -import com.glxp.api.admin.util.*; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.dao.basic.BasicThirdSysBusApiDao; +import com.glxp.api.dao.basic.BussinessLocalTypeDao; +import com.glxp.api.dao.basic.BussinessTypeDao; +import com.glxp.api.dao.business.StockOrderDao; +import com.glxp.api.dao.business.StockOrderDetailDao; +import com.glxp.api.dao.inout.CodesDao; +import com.glxp.api.dao.inout.CodesTempDao; +import com.glxp.api.dao.inout.OrderDao; +import com.glxp.api.dao.inout.OrderDetailDao; +import com.glxp.api.dao.inventory.*; +import com.glxp.api.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.req.business.StockOrderFilterRequest; +import com.glxp.api.req.inout.OrderFilterRequest; +import com.glxp.api.req.inout.OrderQueryRequest; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.inout.OrderNoResult; +import com.glxp.api.res.inout.StockOrderResponse; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.inventory.InvSubWarehouseService; +import com.glxp.api.util.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/WarehouseBussinessTypeServiceImpl.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java rename to src/main/java/com/glxp/api/service/inout/impl/WarehouseBussinessTypeServiceImpl.java index f8b56314..a15d3865 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/WarehouseBussinessTypeServiceImpl.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.service.inout.impl; +package com.glxp.api.service.inout.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inout.WarehouseBussinessTypeDao; -import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; -import com.glxp.api.admin.req.basic.FilterInvBusTypeRequest; -import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; -import com.glxp.api.admin.res.basic.BussinessTypResponse; -import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService; +import com.glxp.api.dao.inout.WarehouseBussinessTypeDao; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.api.req.basic.FilterInvBusTypeRequest; +import com.glxp.api.req.inventory.FilterInvLinkDataRequest; +import com.glxp.api.res.basic.BussinessTypResponse; +import com.glxp.api.service.inout.WarehouseBussinessTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/WarehouseUserServiceImpl.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java rename to src/main/java/com/glxp/api/service/inout/impl/WarehouseUserServiceImpl.java index 58cdfd32..fb26029e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/WarehouseUserServiceImpl.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.service.inout.impl; +package com.glxp.api.service.inout.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inout.WarehouseUserDao; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.inout.WarehouseUserEntity; -import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; -import com.glxp.api.admin.req.inventory.FilterInvUserRequest; -import com.glxp.api.admin.service.inout.WarehouseUserService; +import com.glxp.api.dao.inout.WarehouseUserDao; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.inout.WarehouseUserEntity; +import com.glxp.api.req.inventory.FilterInvLinkDataRequest; +import com.glxp.api.req.inventory.FilterInvUserRequest; +import com.glxp.api.service.inout.WarehouseUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderDetailService.java b/src/main/java/com/glxp/api/service/inventory/DeviceCollectOrderDetailService.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderDetailService.java rename to src/main/java/com/glxp/api/service/inventory/DeviceCollectOrderDetailService.java index 2dc0ce23..58a853e6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inventory/DeviceCollectOrderDetailService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; -import com.glxp.api.admin.req.inventory.AddDeviceCollectOrderDetailRequest; -import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderDetailRequest; -import com.glxp.api.admin.res.inventory.DeviceCollectOrderDetailResponse; +import com.glxp.api.entity.inventory.DeviceCollectOrderDetailEntity; +import com.glxp.api.req.inventory.AddDeviceCollectOrderDetailRequest; +import com.glxp.api.req.inventory.FilterDeviceCollectOrderDetailRequest; +import com.glxp.api.res.inventory.DeviceCollectOrderDetailResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderService.java b/src/main/java/com/glxp/api/service/inventory/DeviceCollectOrderService.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderService.java rename to src/main/java/com/glxp/api/service/inventory/DeviceCollectOrderService.java index 3b335f72..685b8a05 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/inventory/DeviceCollectOrderService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity; -import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderRequest; -import com.glxp.api.admin.res.inventory.DeviceCollectOrderResponse; +import com.glxp.api.entity.inventory.DeviceCollectOrderEntity; +import com.glxp.api.req.inventory.FilterDeviceCollectOrderRequest; +import com.glxp.api.res.inventory.DeviceCollectOrderResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java b/src/main/java/com/glxp/api/service/inventory/DeviceMAOrderDetailService.java similarity index 70% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java rename to src/main/java/com/glxp/api/service/inventory/DeviceMAOrderDetailService.java index e0fe0467..7d27da0c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inventory/DeviceMAOrderDetailService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; -import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; -import com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse; +import com.glxp.api.entity.inventory.DeviceMAOrderDetailEntity; +import com.glxp.api.req.inventory.FilterDeviceMAOrderDetailRequest; +import com.glxp.api.res.inventory.DeviceMAOrderDetailResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java b/src/main/java/com/glxp/api/service/inventory/DeviceMAOrderService.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java rename to src/main/java/com/glxp/api/service/inventory/DeviceMAOrderService.java index 5f4fc68c..939b5c6a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java +++ b/src/main/java/com/glxp/api/service/inventory/DeviceMAOrderService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; -import com.glxp.api.admin.req.inventory.AddDeviceMAOrderRequest; -import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; +import com.glxp.api.entity.inventory.DeviceMAOrderEntity; +import com.glxp.api.req.inventory.AddDeviceMAOrderRequest; +import com.glxp.api.req.inventory.FilterDeviceMAOrderRequest; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InCodeLogService.java b/src/main/java/com/glxp/api/service/inventory/InCodeLogService.java similarity index 68% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InCodeLogService.java rename to src/main/java/com/glxp/api/service/inventory/InCodeLogService.java index a62196e0..8cc8131a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InCodeLogService.java +++ b/src/main/java/com/glxp/api/service/inventory/InCodeLogService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InCodeLogEntity; -import com.glxp.api.admin.req.inventory.FilterInCodeLogRequest; +import com.glxp.api.entity.inventory.InCodeLogEntity; +import com.glxp.api.req.inventory.FilterInCodeLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderDetailService.java b/src/main/java/com/glxp/api/service/inventory/InnerOrderDetailService.java similarity index 64% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderDetailService.java rename to src/main/java/com/glxp/api/service/inventory/InnerOrderDetailService.java index e14f92e6..8c1d79fb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inventory/InnerOrderDetailService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity; -import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.inventory.InnerOrderDetailEntity; +import com.glxp.api.req.inventory.InnerOrderDetailRequest; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderService.java b/src/main/java/com/glxp/api/service/inventory/InnerOrderService.java similarity index 63% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderService.java rename to src/main/java/com/glxp/api/service/inventory/InnerOrderService.java index be248d4c..7b84fc66 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderService.java +++ b/src/main/java/com/glxp/api/service/inventory/InnerOrderService.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InnerOrderEntity; -import com.glxp.api.admin.req.inventory.InnerOrderRequest; -import org.apache.ibatis.annotations.Param; +import com.glxp.api.entity.inventory.InnerOrderEntity; +import com.glxp.api.req.inventory.InnerOrderRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvBusUserService.java b/src/main/java/com/glxp/api/service/inventory/InvBusUserService.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvBusUserService.java rename to src/main/java/com/glxp/api/service/inventory/InvBusUserService.java index 69f51d76..94919523 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvBusUserService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvBusUserService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvBusUserEntity; -import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; -import com.glxp.api.admin.res.inventory.InvBusUserResponse; +import com.glxp.api.entity.inventory.InvBusUserEntity; +import com.glxp.api.req.inventory.FilterInvBusUserRequest; +import com.glxp.api.res.inventory.InvBusUserResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountCodesService.java b/src/main/java/com/glxp/api/service/inventory/InvCountCodesService.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountCodesService.java rename to src/main/java/com/glxp/api/service/inventory/InvCountCodesService.java index d8e5dbbf..f3c9926d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountCodesService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvCountCodesService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvCountCodes; -import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest; +import com.glxp.api.entity.inventory.InvCountCodes; +import com.glxp.api.req.inventory.FilterInvCountCodesRequest; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountOrderDetailService.java b/src/main/java/com/glxp/api/service/inventory/InvCountOrderDetailService.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountOrderDetailService.java rename to src/main/java/com/glxp/api/service/inventory/InvCountOrderDetailService.java index 6feb3130..abaf0d90 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvCountOrderDetailService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvCountOrderDetail; -import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest; -import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse; +import com.glxp.api.entity.inventory.InvCountOrderDetail; +import com.glxp.api.req.inventory.FilterInvCountOrderDetailRequest; +import com.glxp.api.res.inventory.InvCountOrderDetailResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountOrderService.java b/src/main/java/com/glxp/api/service/inventory/InvCountOrderService.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountOrderService.java rename to src/main/java/com/glxp/api/service/inventory/InvCountOrderService.java index 0502bb9f..59a5b51a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountOrderService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvCountOrderService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvCountOrder; -import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest; -import com.glxp.api.admin.req.inventory.FilterInvCountOrderSaveRequest; -import com.glxp.api.admin.res.inventory.InvCountOrderResponse; +import com.glxp.api.entity.inventory.InvCountOrder; +import com.glxp.api.req.inventory.FilterInvCountOrderRequest; +import com.glxp.api.req.inventory.FilterInvCountOrderSaveRequest; +import com.glxp.api.res.inventory.InvCountOrderResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountSettingService.java b/src/main/java/com/glxp/api/service/inventory/InvCountSettingService.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountSettingService.java rename to src/main/java/com/glxp/api/service/inventory/InvCountSettingService.java index 7cd6ad7c..27a95d75 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountSettingService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvCountSettingService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvCountSettingEntity; -import com.glxp.api.admin.req.inventory.FilterInvCountSettingRequest; -import com.glxp.api.admin.res.inventory.InvCountSettingResponse; +import com.glxp.api.entity.inventory.InvCountSettingEntity; +import com.glxp.api.req.inventory.FilterInvCountSettingRequest; +import com.glxp.api.res.inventory.InvCountSettingResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvMAOrderDetailService.java b/src/main/java/com/glxp/api/service/inventory/InvMAOrderDetailService.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvMAOrderDetailService.java rename to src/main/java/com/glxp/api/service/inventory/InvMAOrderDetailService.java index 9b2590bc..38aff4c6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvMAOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvMAOrderDetailService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderDetailEntity; -import com.glxp.api.admin.req.inventory.AddMAOrderDetailRequest; -import com.glxp.api.admin.req.inventory.FilterInvMAOrderDetailRequest; -import com.glxp.api.admin.res.inventory.InvMAOrderDetailResponse; +import com.glxp.api.entity.inventory.InvMaintenanceOrderDetailEntity; +import com.glxp.api.req.inventory.AddMAOrderDetailRequest; +import com.glxp.api.req.inventory.FilterInvMAOrderDetailRequest; +import com.glxp.api.res.inventory.InvMAOrderDetailResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvMAOrderService.java b/src/main/java/com/glxp/api/service/inventory/InvMAOrderService.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvMAOrderService.java rename to src/main/java/com/glxp/api/service/inventory/InvMAOrderService.java index f738cdd1..5cfb36b8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvMAOrderService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvMAOrderService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderEntity; -import com.glxp.api.admin.req.inventory.FilterInvMAOrderRequest; -import com.glxp.api.admin.res.inventory.InvMAOrderResponse; +import com.glxp.api.entity.inventory.InvMaintenanceOrderEntity; +import com.glxp.api.req.inventory.FilterInvMAOrderRequest; +import com.glxp.api.res.inventory.InvMAOrderResponse; import com.glxp.api.common.res.BaseResponse; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvOrderCheckService.java b/src/main/java/com/glxp/api/service/inventory/InvOrderCheckService.java similarity index 55% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvOrderCheckService.java rename to src/main/java/com/glxp/api/service/inventory/InvOrderCheckService.java index 6b63680f..dcdd9dac 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvOrderCheckService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvOrderCheckService.java @@ -1,9 +1,7 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inout.StockCheckEntity; -import com.glxp.api.admin.req.basic.FilterStockprintRequest; -import com.glxp.api.admin.req.inout.FilterStockCheckRequest; -import org.apache.ibatis.annotations.Param; +import com.glxp.api.entity.inout.StockCheckEntity; +import com.glxp.api.req.inout.FilterStockCheckRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java b/src/main/java/com/glxp/api/service/inventory/InvPreInProductDetailService.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java rename to src/main/java/com/glxp/api/service/inventory/InvPreInProductDetailService.java index 3e376d41..eb74077c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvPreInProductDetailService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.inventory.InvProductDetailJoinResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductService.java b/src/main/java/com/glxp/api/service/inventory/InvPreInProductService.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductService.java rename to src/main/java/com/glxp/api/service/inventory/InvPreInProductService.java index a49e4160..cb8f3c6a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvPreInProductService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.inventory.InvProductResponse; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.inventory.InvProductResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreProductDetailService.java b/src/main/java/com/glxp/api/service/inventory/InvPreProductDetailService.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreProductDetailService.java rename to src/main/java/com/glxp/api/service/inventory/InvPreProductDetailService.java index ed627d18..4e5c41f7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvPreProductDetailService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.inventory.InvProductDetailJoinResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreProductService.java b/src/main/java/com/glxp/api/service/inventory/InvPreProductService.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreProductService.java rename to src/main/java/com/glxp/api/service/inventory/InvPreProductService.java index 265540b1..e06e0c62 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreProductService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvPreProductService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.inventory.InvProductResponse; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.inventory.InvProductResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductDetailService.java b/src/main/java/com/glxp/api/service/inventory/InvProductDetailService.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductDetailService.java rename to src/main/java/com/glxp/api/service/inventory/InvProductDetailService.java index 4d785eb6..e103db80 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvProductDetailService.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.req.inventory.BindInvSpaceRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse; -import com.glxp.api.admin.res.inventory.InvProductDetailPlaceResponse; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.req.inventory.BindInvSpaceRequest; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.inventory.InvProductDetailJoinResponse; +import com.glxp.api.res.inventory.InvProductDetailPlaceResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductService.java b/src/main/java/com/glxp/api/service/inventory/InvProductService.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductService.java rename to src/main/java/com/glxp/api/service/inventory/InvProductService.java index 688deb1f..d05a2850 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvProductService.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.inventory.InvProductResponse; -import com.glxp.api.admin.res.inventory.MAInvProductResponse; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.inventory.InvProductResponse; +import com.glxp.api.res.inventory.MAInvProductResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java b/src/main/java/com/glxp/api/service/inventory/InvSpaceService.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java rename to src/main/java/com/glxp/api/service/inventory/InvSpaceService.java index 2ce2a25d..baf1721b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvSpaceService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.business.InvSpace; -import com.glxp.api.admin.req.inventory.FilterInvSpaceRequest; -import com.glxp.api.admin.res.inventory.InvSpaceResponse; +import com.glxp.api.entity.business.InvSpace; +import com.glxp.api.req.inventory.FilterInvSpaceRequest; +import com.glxp.api.res.inventory.InvSpaceResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java b/src/main/java/com/glxp/api/service/inventory/InvStockPrintService.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java rename to src/main/java/com/glxp/api/service/inventory/InvStockPrintService.java index af1130d1..78085b83 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvStockPrintService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.StockPrintEntity; -import com.glxp.api.admin.req.basic.FilterStockprintRequest; +import com.glxp.api.entity.inventory.StockPrintEntity; +import com.glxp.api.req.basic.FilterStockprintRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java b/src/main/java/com/glxp/api/service/inventory/InvSubWarehouseService.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java rename to src/main/java/com/glxp/api/service/inventory/InvSubWarehouseService.java index ca3c657a..bcf96068 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvSubWarehouseService.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.req.inventory.FilterInvSubWarehouseRequest; -import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.api.admin.res.inventory.InvSubWarehouseResponse; -import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.req.inventory.FilterInvSubWarehouseRequest; +import com.glxp.api.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.res.inventory.InvSubWarehouseResponse; +import com.glxp.api.res.inventory.InvWarehouseThirdSysResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvWarehouseService.java b/src/main/java/com/glxp/api/service/inventory/InvWarehouseService.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvWarehouseService.java rename to src/main/java/com/glxp/api/service/inventory/InvWarehouseService.java index 5e98583b..322e2db6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/inventory/InvWarehouseService.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; -import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.res.inventory.InvWarehouseThirdSysResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/StockPrintTempService.java b/src/main/java/com/glxp/api/service/inventory/StockPrintTempService.java similarity index 63% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/StockPrintTempService.java rename to src/main/java/com/glxp/api/service/inventory/StockPrintTempService.java index c67dd4ee..f773cdcd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/StockPrintTempService.java +++ b/src/main/java/com/glxp/api/service/inventory/StockPrintTempService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.inventory; +package com.glxp.api.service.inventory; -import com.glxp.api.admin.entity.inventory.StockPrintTempEntity; -import com.glxp.api.admin.req.inventory.DeleteStPrintTempRequest; -import com.glxp.api.admin.req.inventory.FilterStPrintTempRequest; +import com.glxp.api.entity.inventory.StockPrintTempEntity; +import com.glxp.api.req.inventory.DeleteStPrintTempRequest; +import com.glxp.api.req.inventory.FilterStPrintTempRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java index 223b30db..2eca1698 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java @@ -1,25 +1,25 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.dao.inventory.DeviceCollectOrderDetailDao; -import com.glxp.api.admin.dao.inventory.InvProductDao; -import com.glxp.api.admin.dao.inventory.InvProductDetailDao; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inventory.AddDeviceCollectOrderDetailRequest; -import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderDetailRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.inventory.DeviceCollectOrderDetailResponse; -import com.glxp.api.admin.service.inventory.DeviceCollectOrderDetailService; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.dao.inventory.DeviceCollectOrderDetailDao; +import com.glxp.api.dao.inventory.InvProductDao; +import com.glxp.api.dao.inventory.InvProductDetailDao; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inventory.DeviceCollectOrderDetailEntity; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inventory.AddDeviceCollectOrderDetailRequest; +import com.glxp.api.req.inventory.FilterDeviceCollectOrderDetailRequest; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.inventory.DeviceCollectOrderDetailResponse; +import com.glxp.api.service.inventory.DeviceCollectOrderDetailService; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.FilterUdiUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/DeviceCollectOrderServiceImpl.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/DeviceCollectOrderServiceImpl.java index 5d3081b7..5c59be91 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/DeviceCollectOrderServiceImpl.java @@ -1,23 +1,23 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.dao.inventory.DeviceCollectOrderDao; -import com.glxp.api.admin.dao.inventory.DeviceCollectOrderDetailDao; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity; -import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderRequest; -import com.glxp.api.admin.res.inventory.DeviceCollectOrderResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.inventory.DeviceCollectOrderService; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.FilterUdiUtils; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.OrderNoTypeBean; +import com.glxp.api.constant.Constant; +import com.glxp.api.dao.inventory.DeviceCollectOrderDao; +import com.glxp.api.dao.inventory.DeviceCollectOrderDetailDao; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inventory.DeviceCollectOrderDetailEntity; +import com.glxp.api.entity.inventory.DeviceCollectOrderEntity; +import com.glxp.api.req.inventory.FilterDeviceCollectOrderRequest; +import com.glxp.api.res.inventory.DeviceCollectOrderResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.inventory.DeviceCollectOrderService; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.FilterUdiUtils; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java index 0dd18ad6..39ad63b7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inventory.DeviceCollectOrderDetailDao; -import com.glxp.api.admin.dao.inventory.DeviceMaOrderDetailDao; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; -import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; -import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; -import com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse; -import com.glxp.api.admin.service.inventory.DeviceMAOrderDetailService; +import com.glxp.api.dao.inventory.DeviceCollectOrderDetailDao; +import com.glxp.api.dao.inventory.DeviceMaOrderDetailDao; +import com.glxp.api.entity.inventory.DeviceCollectOrderDetailEntity; +import com.glxp.api.entity.inventory.DeviceMAOrderDetailEntity; +import com.glxp.api.req.inventory.FilterDeviceMAOrderDetailRequest; +import com.glxp.api.res.inventory.DeviceMAOrderDetailResponse; +import com.glxp.api.service.inventory.DeviceMAOrderDetailService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/DeviceMAOrderServiceImpl.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/DeviceMAOrderServiceImpl.java index 89bf388f..fa914552 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/DeviceMAOrderServiceImpl.java @@ -1,21 +1,21 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.dao.inventory.DeviceCollectOrderDetailDao; -import com.glxp.api.admin.dao.inventory.DeviceMAOrderDao; -import com.glxp.api.admin.dao.inventory.DeviceMaOrderDetailDao; -import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; -import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; -import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; -import com.glxp.api.admin.req.inventory.AddDeviceMAOrderRequest; -import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.inventory.DeviceMAOrderService; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.OrderNoTypeBean; +import com.glxp.api.constant.Constant; +import com.glxp.api.dao.inventory.DeviceCollectOrderDetailDao; +import com.glxp.api.dao.inventory.DeviceMAOrderDao; +import com.glxp.api.dao.inventory.DeviceMaOrderDetailDao; +import com.glxp.api.entity.inventory.DeviceCollectOrderDetailEntity; +import com.glxp.api.entity.inventory.DeviceMAOrderDetailEntity; +import com.glxp.api.entity.inventory.DeviceMAOrderEntity; +import com.glxp.api.req.inventory.AddDeviceMAOrderRequest; +import com.glxp.api.req.inventory.FilterDeviceMAOrderRequest; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.inventory.DeviceMAOrderService; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InCodeLogServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InCodeLogServiceImpl.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InCodeLogServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InCodeLogServiceImpl.java index 1aa536a7..c7323075 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InCodeLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InCodeLogServiceImpl.java @@ -1,11 +1,10 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inventory.InCodeLogDao; -import com.glxp.api.admin.entity.inventory.InCodeLogEntity; -import com.glxp.api.admin.entity.inventory.StockPrintEntity; -import com.glxp.api.admin.req.inventory.FilterInCodeLogRequest; -import com.glxp.api.admin.service.inventory.InCodeLogService; +import com.glxp.api.dao.inventory.InCodeLogDao; +import com.glxp.api.entity.inventory.InCodeLogEntity; +import com.glxp.api.req.inventory.FilterInCodeLogRequest; +import com.glxp.api.service.inventory.InCodeLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InnerOrderDetailServiceImpl.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InnerOrderDetailServiceImpl.java index 665f756b..d5f50362 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InnerOrderDetailServiceImpl.java @@ -1,12 +1,11 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inventory.InnerOrderDetailDao; -import com.glxp.api.admin.dao.purchase.PurPlanDetailDao; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity; -import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest; -import com.glxp.api.admin.service.inventory.InnerOrderDetailService; +import com.glxp.api.dao.inventory.InnerOrderDetailDao; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.inventory.InnerOrderDetailEntity; +import com.glxp.api.req.inventory.InnerOrderDetailRequest; +import com.glxp.api.service.inventory.InnerOrderDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InnerOrderServiceImpl.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InnerOrderServiceImpl.java index 418519ff..317a2496 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InnerOrderServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inventory.InnerOrderDao; -import com.glxp.api.admin.entity.inventory.InnerOrderEntity; -import com.glxp.api.admin.req.inventory.InnerOrderRequest; -import com.glxp.api.admin.service.inventory.InnerOrderService; +import com.glxp.api.dao.inventory.InnerOrderDao; +import com.glxp.api.entity.inventory.InnerOrderEntity; +import com.glxp.api.req.inventory.InnerOrderRequest; +import com.glxp.api.service.inventory.InnerOrderService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvBusUserServiceImpl.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvBusUserServiceImpl.java index 1c370052..6193d436 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvBusUserServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inventory.InvBusUserDao; -import com.glxp.api.admin.entity.inventory.InvBusUserEntity; -import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; -import com.glxp.api.admin.res.inventory.InvBusUserResponse; -import com.glxp.api.admin.service.inventory.InvBusUserService; +import com.glxp.api.dao.inventory.InvBusUserDao; +import com.glxp.api.entity.inventory.InvBusUserEntity; +import com.glxp.api.req.inventory.FilterInvBusUserRequest; +import com.glxp.api.res.inventory.InvBusUserResponse; +import com.glxp.api.service.inventory.InvBusUserService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountCodesServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvCountCodesServiceImpl.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountCodesServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvCountCodesServiceImpl.java index bd905db5..3b7f3e30 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountCodesServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvCountCodesServiceImpl.java @@ -1,19 +1,19 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.UdiRelevanceDao; -import com.glxp.api.admin.dao.inventory.InvCountCodesDao; -import com.glxp.api.admin.dao.inventory.InvCountOrderDetailDao; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.inventory.InvCountCodes; -import com.glxp.api.admin.entity.inventory.InvCountOrderDetail; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.inventory.InvCountCodesService; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.dao.inventory.InvCountCodesDao; +import com.glxp.api.dao.inventory.InvCountOrderDetailDao; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.inventory.InvCountCodes; +import com.glxp.api.entity.inventory.InvCountOrderDetail; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.inventory.FilterInvCountCodesRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.inventory.InvCountCodesService; +import com.glxp.api.util.FilterUdiUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvCountOrderDetailServiceImpl.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvCountOrderDetailServiceImpl.java index ff702151..f42faefa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvCountOrderDetailServiceImpl.java @@ -1,15 +1,15 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inventory.InvCountOrderDao; -import com.glxp.api.admin.dao.inventory.InvCountOrderDetailDao; -import com.glxp.api.admin.dao.inventory.InvProductDao; -import com.glxp.api.admin.entity.inventory.InvCountOrder; -import com.glxp.api.admin.entity.inventory.InvCountOrderDetail; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest; -import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse; -import com.glxp.api.admin.service.inventory.InvCountOrderDetailService; +import com.glxp.api.dao.inventory.InvCountOrderDao; +import com.glxp.api.dao.inventory.InvCountOrderDetailDao; +import com.glxp.api.dao.inventory.InvProductDao; +import com.glxp.api.entity.inventory.InvCountOrder; +import com.glxp.api.entity.inventory.InvCountOrderDetail; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inventory.FilterInvCountOrderDetailRequest; +import com.glxp.api.res.inventory.InvCountOrderDetailResponse; +import com.glxp.api.service.inventory.InvCountOrderDetailService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvCountOrderServiceImpl.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvCountOrderServiceImpl.java index a72e3173..a9128700 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvCountOrderServiceImpl.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -7,32 +7,32 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.dao.basic.BussinessTypeDao; -import com.glxp.api.admin.dao.basic.CompanyProductRelevanceDao; -import com.glxp.api.admin.dao.basic.UnitMaintainDao; -import com.glxp.api.admin.dao.inout.CodesDao; -import com.glxp.api.admin.dao.inout.CodesTempDao; -import com.glxp.api.admin.dao.inout.OrderDao; -import com.glxp.api.admin.dao.inventory.*; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.basic.UnitMaintainEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inventory.*; -import com.glxp.api.admin.req.inventory.*; -import com.glxp.api.admin.res.inventory.InvCountOrderResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.inventory.InvCountCodesService; -import com.glxp.api.admin.service.inventory.InvCountOrderService; -import com.glxp.api.admin.util.*; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.dao.basic.BussinessTypeDao; +import com.glxp.api.dao.basic.CompanyProductRelevanceDao; +import com.glxp.api.dao.basic.UnitMaintainDao; +import com.glxp.api.dao.inout.CodesDao; +import com.glxp.api.dao.inout.CodesTempDao; +import com.glxp.api.dao.inout.OrderDao; +import com.glxp.api.dao.inventory.*; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.basic.UnitMaintainEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inventory.*; +import com.glxp.api.req.inventory.*; +import com.glxp.api.res.inventory.InvCountOrderResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.inventory.InvCountCodesService; +import com.glxp.api.service.inventory.InvCountOrderService; +import com.glxp.api.util.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountSettingServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvCountSettingServiceImpl.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountSettingServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvCountSettingServiceImpl.java index 780be948..d8decbc9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountSettingServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvCountSettingServiceImpl.java @@ -1,15 +1,15 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BussinessTypeDao; -import com.glxp.api.admin.dao.inventory.InvCountSettingDao; -import com.glxp.api.admin.entity.inventory.InvCountSettingEntity; -import com.glxp.api.admin.req.inventory.FilterInvCountSettingRequest; -import com.glxp.api.admin.res.inventory.InvCountSettingResponse; -import com.glxp.api.admin.service.inventory.InvCountSettingService; +import com.glxp.api.dao.basic.BussinessTypeDao; +import com.glxp.api.dao.inventory.InvCountSettingDao; +import com.glxp.api.entity.inventory.InvCountSettingEntity; +import com.glxp.api.req.inventory.FilterInvCountSettingRequest; +import com.glxp.api.res.inventory.InvCountSettingResponse; +import com.glxp.api.service.inventory.InvCountSettingService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvMAOrderDetailServiceImpl.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvMAOrderDetailServiceImpl.java index 2bbea5bc..2c2eb35a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvMAOrderDetailServiceImpl.java @@ -1,20 +1,20 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.dao.inventory.*; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.inventory.*; -import com.glxp.api.admin.req.inventory.AddMAOrderDetailRequest; -import com.glxp.api.admin.req.inventory.FilterInvMAOrderDetailRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.inventory.InvMAOrderDetailResponse; -import com.glxp.api.admin.service.inventory.InvMAOrderDetailService; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.dao.inventory.*; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.inventory.*; +import com.glxp.api.req.inventory.AddMAOrderDetailRequest; +import com.glxp.api.req.inventory.FilterInvMAOrderDetailRequest; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.inventory.InvMAOrderDetailResponse; +import com.glxp.api.service.inventory.InvMAOrderDetailService; +import com.glxp.api.util.FilterUdiUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvMAOrderServiceImpl.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvMAOrderServiceImpl.java index d6fab7ed..b446d2d5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvMAOrderServiceImpl.java @@ -1,20 +1,20 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.dao.inventory.InvMaintenanceOrderDao; -import com.glxp.api.admin.dao.inventory.InvMaintenanceOrderDetailDao; -import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderEntity; -import com.glxp.api.admin.req.inventory.FilterInvMAOrderRequest; -import com.glxp.api.admin.res.inventory.InvMAOrderResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.inventory.InvMAOrderService; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.OrderNoTypeBean; +import com.glxp.api.constant.Constant; +import com.glxp.api.dao.inventory.InvMaintenanceOrderDao; +import com.glxp.api.dao.inventory.InvMaintenanceOrderDetailDao; +import com.glxp.api.entity.inventory.InvMaintenanceOrderEntity; +import com.glxp.api.req.inventory.FilterInvMAOrderRequest; +import com.glxp.api.res.inventory.InvMAOrderResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.inventory.InvMAOrderService; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvOrderCheckServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvOrderCheckServiceImpl.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvOrderCheckServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvOrderCheckServiceImpl.java index c24db6a5..41dcfed0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvOrderCheckServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvOrderCheckServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inventory.InvOrderCheckDao; -import com.glxp.api.admin.entity.inout.StockCheckEntity; -import com.glxp.api.admin.req.inout.FilterStockCheckRequest; -import com.glxp.api.admin.service.inventory.InvOrderCheckService; +import com.glxp.api.dao.inventory.InvOrderCheckDao; +import com.glxp.api.entity.inout.StockCheckEntity; +import com.glxp.api.req.inout.FilterStockCheckRequest; +import com.glxp.api.service.inventory.InvOrderCheckService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvPreInProductDetailServiceImpl.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvPreInProductDetailServiceImpl.java index 96577890..89024f51 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvPreInProductDetailServiceImpl.java @@ -1,18 +1,17 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.dao.inventory.InvPreInProductDao; -import com.glxp.api.admin.dao.inventory.InvPreInProductDetailDao; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse; -import com.glxp.api.admin.service.inventory.InvPreInProductDetailService; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.dao.inventory.InvPreInProductDao; +import com.glxp.api.dao.inventory.InvPreInProductDetailDao; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.inventory.InvProductDetailJoinResponse; +import com.glxp.api.service.inventory.InvPreInProductDetailService; +import com.glxp.api.util.FilterUdiUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvPreInProductServiceImpl.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvPreInProductServiceImpl.java index b862bb4e..f013d0ee 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvPreInProductServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inventory.InvPreInProductDao; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.inventory.InvProductResponse; -import com.glxp.api.admin.service.inventory.InvPreInProductService; +import com.glxp.api.dao.inventory.InvPreInProductDao; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.inventory.InvProductResponse; +import com.glxp.api.service.inventory.InvPreInProductService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvPreProductDetailServiceImpl.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreProductDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvPreProductDetailServiceImpl.java index d43002c2..23089823 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvPreProductDetailServiceImpl.java @@ -1,16 +1,16 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.dao.inventory.InvPreProductDetailDao; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse; -import com.glxp.api.admin.service.inventory.InvPreProductDetailService; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.dao.inventory.InvPreProductDetailDao; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.inventory.InvProductDetailJoinResponse; +import com.glxp.api.service.inventory.InvPreProductDetailService; +import com.glxp.api.util.FilterUdiUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreProductServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvPreProductServiceImpl.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreProductServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvPreProductServiceImpl.java index 0a9997a8..6e0020c1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvPreProductServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inventory.InvPreProductDao; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.inventory.InvProductResponse; -import com.glxp.api.admin.service.inventory.InvPreProductService; +import com.glxp.api.dao.inventory.InvPreProductDao; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.inventory.InvProductResponse; +import com.glxp.api.service.inventory.InvPreProductService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvProductDetailServiceImpl.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvProductDetailServiceImpl.java index bb109dfa..6c16e0e5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvProductDetailServiceImpl.java @@ -1,19 +1,19 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.dao.business.InvSpaceDao; -import com.glxp.api.admin.dao.inventory.InvProductDetailDao; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.req.inventory.BindInvSpaceRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse; -import com.glxp.api.admin.res.inventory.InvProductDetailPlaceResponse; -import com.glxp.api.admin.service.inventory.InvProductDetailService; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.dao.business.InvSpaceDao; +import com.glxp.api.dao.inventory.InvProductDetailDao; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.req.inventory.BindInvSpaceRequest; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.inventory.InvProductDetailJoinResponse; +import com.glxp.api.res.inventory.InvProductDetailPlaceResponse; +import com.glxp.api.service.inventory.InvProductDetailService; +import com.glxp.api.util.FilterUdiUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvProductServiceImpl.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvProductServiceImpl.java index c4d6a35a..5f7dbda0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvProductServiceImpl.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inventory.InvProductDao; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.res.inventory.InvProductResponse; -import com.glxp.api.admin.res.inventory.MAInvProductResponse; -import com.glxp.api.admin.service.inventory.InvProductService; +import com.glxp.api.dao.inventory.InvProductDao; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.res.inventory.InvProductResponse; +import com.glxp.api.res.inventory.MAInvProductResponse; +import com.glxp.api.service.inventory.InvProductService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvSpaceServiceImpl.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvSpaceServiceImpl.java index 85d2e0d6..e2015a0b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvSpaceServiceImpl.java @@ -1,17 +1,17 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.business.InvSpaceDao; -import com.glxp.api.admin.dao.inventory.InvCountOrderDao; -import com.glxp.api.admin.dao.inventory.InvProductDetailDao; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.business.InvSpace; -import com.glxp.api.admin.req.inventory.FilterInvSpaceRequest; -import com.glxp.api.admin.res.inventory.InvSpaceResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.inventory.InvSpaceService; +import com.glxp.api.dao.business.InvSpaceDao; +import com.glxp.api.dao.inventory.InvCountOrderDao; +import com.glxp.api.dao.inventory.InvProductDetailDao; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.business.InvSpace; +import com.glxp.api.req.inventory.FilterInvSpaceRequest; +import com.glxp.api.res.inventory.InvSpaceResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.inventory.InvSpaceService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvStockPrintServiceImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvStockPrintServiceImpl.java index 2faa93f4..85ec6bfd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvStockPrintServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inventory.InvStockPrintDao; -import com.glxp.api.admin.entity.inventory.StockPrintEntity; -import com.glxp.api.admin.req.basic.FilterStockprintRequest; -import com.glxp.api.admin.service.inventory.InvStockPrintService; -import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.dao.inventory.InvStockPrintDao; +import com.glxp.api.entity.inventory.StockPrintEntity; +import com.glxp.api.req.basic.FilterStockprintRequest; +import com.glxp.api.service.inventory.InvStockPrintService; +import com.glxp.api.util.FilterUdiUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvSubWarehouseServiceImpl.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvSubWarehouseServiceImpl.java index a4fb5f8c..7a407024 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvSubWarehouseServiceImpl.java @@ -1,18 +1,18 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BasicThirdSysDao; -import com.glxp.api.admin.dao.inventory.InvSubWarehouseDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; -import com.glxp.api.admin.req.inventory.FilterInvSubWarehouseRequest; -import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.api.admin.res.inventory.InvSubWarehouseResponse; -import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; -import com.glxp.api.admin.service.inventory.InvSubWarehouseService; +import com.glxp.api.dao.basic.BasicThirdSysDao; +import com.glxp.api.dao.inventory.InvSubWarehouseDao; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.req.inventory.FilterInvSubWarehouseRequest; +import com.glxp.api.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.res.inventory.InvSubWarehouseResponse; +import com.glxp.api.res.inventory.InvWarehouseThirdSysResponse; +import com.glxp.api.service.inventory.InvSubWarehouseService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/InvWarehouseServiceImpl.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/InvWarehouseServiceImpl.java index 32f68ce2..6687d7d2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/InvWarehouseServiceImpl.java @@ -1,19 +1,19 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BasicThirdSysDao; -import com.glxp.api.admin.dao.inventory.InvWarehouseDao; -import com.glxp.api.admin.dao.thrsys.ThrInvWarehouseDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; -import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; -import com.glxp.api.admin.service.inventory.InvWarehouseService; +import com.glxp.api.dao.basic.BasicThirdSysDao; +import com.glxp.api.dao.inventory.InvWarehouseDao; +import com.glxp.api.dao.thrsys.ThrInvWarehouseDao; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.api.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.res.inventory.InvWarehouseThirdSysResponse; +import com.glxp.api.service.inventory.InvWarehouseService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/StockPrintTempServiceImpl.java b/src/main/java/com/glxp/api/service/inventory/impl/StockPrintTempServiceImpl.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/StockPrintTempServiceImpl.java rename to src/main/java/com/glxp/api/service/inventory/impl/StockPrintTempServiceImpl.java index a0be5104..ef450232 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/StockPrintTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inventory/impl/StockPrintTempServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.inventory.impl; +package com.glxp.api.service.inventory.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inventory.StockPrintTempDao; -import com.glxp.api.admin.entity.inventory.StockPrintTempEntity; -import com.glxp.api.admin.req.inventory.DeleteStPrintTempRequest; -import com.glxp.api.admin.req.inventory.FilterStPrintTempRequest; -import com.glxp.api.admin.service.inventory.StockPrintTempService; +import com.glxp.api.dao.inventory.StockPrintTempDao; +import com.glxp.api.entity.inventory.StockPrintTempEntity; +import com.glxp.api.req.inventory.DeleteStPrintTempRequest; +import com.glxp.api.req.inventory.FilterStPrintTempRequest; +import com.glxp.api.service.inventory.StockPrintTempService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/monitor/ISysLogininforService.java b/src/main/java/com/glxp/api/service/monitor/ISysLogininforService.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/monitor/ISysLogininforService.java rename to src/main/java/com/glxp/api/service/monitor/ISysLogininforService.java index 79879425..9e97af10 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/monitor/ISysLogininforService.java +++ b/src/main/java/com/glxp/api/service/monitor/ISysLogininforService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.monitor; +package com.glxp.api.service.monitor; -import com.glxp.api.admin.entity.monitor.SysLogininfor; -import com.glxp.api.admin.req.monitor.SysLogininforRequest; +import com.glxp.api.entity.monitor.SysLogininfor; +import com.glxp.api.req.monitor.SysLogininforRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/monitor/ISysOperLogService.java b/src/main/java/com/glxp/api/service/monitor/ISysOperLogService.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/monitor/ISysOperLogService.java rename to src/main/java/com/glxp/api/service/monitor/ISysOperLogService.java index 723714a7..e7881373 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/monitor/ISysOperLogService.java +++ b/src/main/java/com/glxp/api/service/monitor/ISysOperLogService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.monitor; +package com.glxp.api.service.monitor; -import com.glxp.api.admin.entity.monitor.SysOperLog; -import com.glxp.api.admin.req.monitor.SysOperLogRequest; +import com.glxp.api.entity.monitor.SysOperLog; +import com.glxp.api.req.monitor.SysOperLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/monitor/LogininforService.java b/src/main/java/com/glxp/api/service/monitor/LogininforService.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/monitor/LogininforService.java rename to src/main/java/com/glxp/api/service/monitor/LogininforService.java index 3b9a5300..faf18667 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/monitor/LogininforService.java +++ b/src/main/java/com/glxp/api/service/monitor/LogininforService.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.service.monitor; +package com.glxp.api.service.monitor; import javax.servlet.http.HttpServletRequest; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/monitor/OperLogService.java b/src/main/java/com/glxp/api/service/monitor/OperLogService.java similarity index 65% rename from api-admin/src/main/java/com/glxp/api/admin/service/monitor/OperLogService.java rename to src/main/java/com/glxp/api/service/monitor/OperLogService.java index 8cab4bf8..6390626e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/monitor/OperLogService.java +++ b/src/main/java/com/glxp/api/service/monitor/OperLogService.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.service.monitor; +package com.glxp.api.service.monitor; -import com.glxp.api.admin.entity.monitor.OperLogDTO; +import com.glxp.api.entity.monitor.OperLogDTO; import org.springframework.scheduling.annotation.Async; /** diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/monitor/impl/SysLogininforServiceImpl.java b/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/service/monitor/impl/SysLogininforServiceImpl.java rename to src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java index 5d25517c..ffdd92db 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/monitor/impl/SysLogininforServiceImpl.java +++ b/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java @@ -1,16 +1,16 @@ -package com.glxp.api.admin.service.monitor.impl; +package com.glxp.api.service.monitor.impl; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.dao.monitor.SysLogininforMapper; -import com.glxp.api.admin.entity.monitor.SysLogininfor; -import com.glxp.api.admin.req.monitor.SysLogininforRequest; -import com.glxp.api.admin.service.monitor.ISysLogininforService; -import com.glxp.api.admin.service.monitor.LogininforService; -import com.glxp.api.admin.util.AddressUtils; -import com.glxp.api.admin.util.ServletUtils; +import com.glxp.api.constant.Constant; +import com.glxp.api.dao.monitor.SysLogininforMapper; +import com.glxp.api.entity.monitor.SysLogininfor; +import com.glxp.api.req.monitor.SysLogininforRequest; +import com.glxp.api.service.monitor.ISysLogininforService; +import com.glxp.api.service.monitor.LogininforService; +import com.glxp.api.util.AddressUtils; +import com.glxp.api.util.ServletUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/monitor/impl/SysOperLogServiceImpl.java b/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/monitor/impl/SysOperLogServiceImpl.java rename to src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java index 8cf496cf..362d1bce 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/monitor/impl/SysOperLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java @@ -1,25 +1,21 @@ -package com.glxp.api.admin.service.monitor.impl; +package com.glxp.api.service.monitor.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.monitor.SysOperLogMapper; -import com.glxp.api.admin.entity.monitor.OperLogDTO; -import com.glxp.api.admin.entity.monitor.SysOperLog; -import com.glxp.api.admin.req.monitor.SysOperLogRequest; -import com.glxp.api.admin.service.monitor.ISysOperLogService; -import com.glxp.api.admin.service.monitor.OperLogService; -import com.glxp.api.admin.util.AddressUtils; +import com.glxp.api.dao.monitor.SysOperLogMapper; +import com.glxp.api.entity.monitor.OperLogDTO; +import com.glxp.api.entity.monitor.SysOperLog; +import com.glxp.api.req.monitor.SysOperLogRequest; +import com.glxp.api.service.monitor.ISysOperLogService; +import com.glxp.api.service.monitor.OperLogService; +import com.glxp.api.util.AddressUtils; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.Date; import java.util.List; -import java.util.Map; /** * 操作日志 服务层处理 diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanySalesmanService.java b/src/main/java/com/glxp/api/service/purchase/CompanySalesmanService.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanySalesmanService.java rename to src/main/java/com/glxp/api/service/purchase/CompanySalesmanService.java index 6328da81..54049021 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanySalesmanService.java +++ b/src/main/java/com/glxp/api/service/purchase/CompanySalesmanService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.purchase; +package com.glxp.api.service.purchase; -import com.glxp.api.admin.entity.purchase.CompanySalesmanEntity; -import com.glxp.api.admin.req.purchase.FilterCompanySalesmanRequest; +import com.glxp.api.entity.purchase.CompanySalesmanEntity; +import com.glxp.api.req.purchase.FilterCompanySalesmanRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanyUpdateLogService.java b/src/main/java/com/glxp/api/service/purchase/CompanyUpdateLogService.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanyUpdateLogService.java rename to src/main/java/com/glxp/api/service/purchase/CompanyUpdateLogService.java index 082e82f3..991f6cf7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanyUpdateLogService.java +++ b/src/main/java/com/glxp/api/service/purchase/CompanyUpdateLogService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.purchase; +package com.glxp.api.service.purchase; -import com.glxp.api.admin.entity.purchase.CompanyUpdateLogEntity; -import com.glxp.api.admin.req.purchase.FilterCompanyUpdateLogRequest; +import com.glxp.api.entity.purchase.CompanyUpdateLogEntity; +import com.glxp.api.req.purchase.FilterCompanyUpdateLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CustomerContactService.java b/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java similarity index 68% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/CustomerContactService.java rename to src/main/java/com/glxp/api/service/purchase/CustomerContactService.java index 725ab38b..29870005 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CustomerContactService.java +++ b/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.purchase; +package com.glxp.api.service.purchase; -import com.glxp.api.admin.entity.purchase.CustomerContactEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.purchase.CustomerContactFilterRequest; +import com.glxp.api.entity.purchase.CustomerContactEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.purchase.CustomerContactFilterRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurApplyDetailService.java b/src/main/java/com/glxp/api/service/purchase/IPurApplyDetailService.java similarity index 59% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurApplyDetailService.java rename to src/main/java/com/glxp/api/service/purchase/IPurApplyDetailService.java index 746283b2..619fd292 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurApplyDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/IPurApplyDetailService.java @@ -1,10 +1,8 @@ -package com.glxp.api.admin.service.purchase; +package com.glxp.api.service.purchase; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyEntity; -import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; -import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.req.purchase.PurApplyDetailRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurApplyService.java b/src/main/java/com/glxp/api/service/purchase/IPurApplyService.java similarity index 57% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurApplyService.java rename to src/main/java/com/glxp/api/service/purchase/IPurApplyService.java index 5b863116..69f50df1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurApplyService.java +++ b/src/main/java/com/glxp/api/service/purchase/IPurApplyService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.purchase; +package com.glxp.api.service.purchase; -import com.glxp.api.admin.entity.purchase.PurApplyEntity; -import com.glxp.api.admin.req.purchase.PurApplyRequest; -import com.glxp.api.admin.res.purchase.PurApplyResponse; +import com.glxp.api.entity.purchase.PurApplyEntity; +import com.glxp.api.req.purchase.PurApplyRequest; +import com.glxp.api.res.purchase.PurApplyResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanDetailService.java b/src/main/java/com/glxp/api/service/purchase/IPurPlanDetailService.java similarity index 59% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanDetailService.java rename to src/main/java/com/glxp/api/service/purchase/IPurPlanDetailService.java index 097894bc..c7e74a23 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/IPurPlanDetailService.java @@ -1,10 +1,8 @@ -package com.glxp.api.admin.service.purchase; +package com.glxp.api.service.purchase; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; -import com.glxp.api.admin.req.purchase.PurPlanDetailRequest; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.req.purchase.PurPlanDetailRequest; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/purchase/IPurPlanService.java b/src/main/java/com/glxp/api/service/purchase/IPurPlanService.java new file mode 100644 index 00000000..23e2d7f6 --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/IPurPlanService.java @@ -0,0 +1,20 @@ +package com.glxp.api.service.purchase; + +import com.glxp.api.entity.purchase.PurPlanEntity; +import com.glxp.api.req.purchase.PurPlanRequest; +import com.glxp.api.res.purchase.PurPlanResponse; + +import java.util.List; + +public interface IPurPlanService { + + List queryPageList(PurPlanRequest purPlanRequest); + + Boolean insert(PurPlanEntity purPlanRequest); + + Boolean update(PurPlanEntity purPlanRequest); + + Boolean deleteByIds(List ids); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java b/src/main/java/com/glxp/api/service/purchase/SupCertService.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java rename to src/main/java/com/glxp/api/service/purchase/SupCertService.java index 4d1fa69c..b9b803de 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupCertService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.purchase; +package com.glxp.api.service.purchase; -import com.glxp.api.admin.entity.purchase.SupCertEntity; -import com.glxp.api.admin.req.purchase.FilterSupCertRequest; +import com.glxp.api.entity.purchase.SupCertEntity; +import com.glxp.api.req.purchase.FilterSupCertRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertSetService.java b/src/main/java/com/glxp/api/service/purchase/SupCertSetService.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertSetService.java rename to src/main/java/com/glxp/api/service/purchase/SupCertSetService.java index 6356dbcf..9c0d46fa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertSetService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupCertSetService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.purchase; +package com.glxp.api.service.purchase; -import com.glxp.api.admin.entity.purchase.SupCertSetEntity; -import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; +import com.glxp.api.entity.purchase.SupCertSetEntity; +import com.glxp.api.req.purchase.FilterCertSetsRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java b/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java rename to src/main/java/com/glxp/api/service/purchase/SupCompanyService.java index c2ee954e..201e6e4d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.purchase; +package com.glxp.api.service.purchase; -import com.glxp.api.admin.entity.purchase.SupCompanyEntity; -import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest; +import com.glxp.api.entity.purchase.SupCompanyEntity; +import com.glxp.api.req.purchase.FilterSupCompanyRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupManufacturerService.java b/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupManufacturerService.java rename to src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java index 0cde563c..3668b490 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupManufacturerService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.purchase; +package com.glxp.api.service.purchase; -import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; -import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest; +import com.glxp.api.entity.purchase.SupManufacturerEntity; +import com.glxp.api.req.purchase.FilterSupManufacturerRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupProductService.java b/src/main/java/com/glxp/api/service/purchase/SupProductService.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupProductService.java rename to src/main/java/com/glxp/api/service/purchase/SupProductService.java index ae0bc4fc..5abf26e3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupProductService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupProductService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.purchase; +package com.glxp.api.service.purchase; -import com.glxp.api.admin.entity.purchase.SupProductEntity; -import com.glxp.api.admin.req.purchase.FilterPoductRequest; -import com.glxp.api.admin.res.purchase.SupProductResponse; +import com.glxp.api.entity.purchase.SupProductEntity; +import com.glxp.api.req.purchase.FilterPoductRequest; +import com.glxp.api.res.purchase.SupProductResponse; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanySalesmanServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/CompanySalesmanServiceImpl.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanySalesmanServiceImpl.java rename to src/main/java/com/glxp/api/service/purchase/impl/CompanySalesmanServiceImpl.java index 73753728..3e132053 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanySalesmanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/CompanySalesmanServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.purchase.impl; +package com.glxp.api.service.purchase.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.purchase.CompanySalesmanDao; -import com.glxp.api.admin.entity.purchase.CompanySalesmanEntity; -import com.glxp.api.admin.req.purchase.FilterCompanySalesmanRequest; -import com.glxp.api.admin.service.purchase.CompanySalesmanService; +import com.glxp.api.dao.purchase.CompanySalesmanDao; +import com.glxp.api.entity.purchase.CompanySalesmanEntity; +import com.glxp.api.req.purchase.FilterCompanySalesmanRequest; +import com.glxp.api.service.purchase.CompanySalesmanService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanyUpdateLogServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/CompanyUpdateLogServiceImpl.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanyUpdateLogServiceImpl.java rename to src/main/java/com/glxp/api/service/purchase/impl/CompanyUpdateLogServiceImpl.java index 6cf9c0ff..8a955c15 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanyUpdateLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/CompanyUpdateLogServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.purchase.impl; +package com.glxp.api.service.purchase.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.purchase.CompanyUpdateLogDao; -import com.glxp.api.admin.entity.purchase.CompanyUpdateLogEntity; -import com.glxp.api.admin.req.purchase.FilterCompanyUpdateLogRequest; -import com.glxp.api.admin.service.purchase.CompanyUpdateLogService; +import com.glxp.api.dao.purchase.CompanyUpdateLogDao; +import com.glxp.api.entity.purchase.CompanyUpdateLogEntity; +import com.glxp.api.req.purchase.FilterCompanyUpdateLogRequest; +import com.glxp.api.service.purchase.CompanyUpdateLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CustomerContactServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CustomerContactServiceImpl.java rename to src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java index 670e665a..1594ad01 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CustomerContactServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.purchase.impl; +package com.glxp.api.service.purchase.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.purchase.CustomerContacDao; -import com.glxp.api.admin.entity.purchase.CustomerContactEntity; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.purchase.CustomerContactFilterRequest; -import com.glxp.api.admin.service.purchase.CustomerContactService; +import com.glxp.api.dao.purchase.CustomerContacDao; +import com.glxp.api.entity.purchase.CustomerContactEntity; +import com.glxp.api.req.inout.DeleteRequest; +import com.glxp.api.req.purchase.CustomerContactFilterRequest; +import com.glxp.api.service.purchase.CustomerContactService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurApplyDetailImplService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurApplyDetailImplService.java rename to src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java index f0b25fad..4a215212 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurApplyDetailImplService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java @@ -1,14 +1,11 @@ -package com.glxp.api.admin.service.purchase.impl; +package com.glxp.api.service.purchase.impl; -import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.purchase.PurApplyDetailDao; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; -import com.glxp.api.admin.entity.purchase.PurPlanEntity; -import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; -import com.glxp.api.admin.service.purchase.IPurApplyDetailService; -import org.apache.ibatis.annotations.Mapper; +import com.glxp.api.dao.purchase.PurApplyDetailDao; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.req.purchase.PurApplyDetailRequest; +import com.glxp.api.service.purchase.IPurApplyDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurApplyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurApplyServiceImpl.java rename to src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java index cfccb4c8..7bde7f3f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurApplyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java @@ -1,13 +1,11 @@ -package com.glxp.api.admin.service.purchase.impl; +package com.glxp.api.service.purchase.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.purchase.PurApplyDao; -import com.glxp.api.admin.entity.purchase.PurApplyEntity; -import com.glxp.api.admin.entity.purchase.PurPlanEntity; -import com.glxp.api.admin.req.purchase.PurApplyRequest; -import com.glxp.api.admin.res.purchase.PurApplyResponse; -import com.glxp.api.admin.service.purchase.IPurApplyService; -import org.apache.ibatis.annotations.Mapper; +import com.glxp.api.dao.purchase.PurApplyDao; +import com.glxp.api.entity.purchase.PurApplyEntity; +import com.glxp.api.req.purchase.PurApplyRequest; +import com.glxp.api.res.purchase.PurApplyResponse; +import com.glxp.api.service.purchase.IPurApplyService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java index b32751b8..65ac101c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java @@ -1,12 +1,11 @@ -package com.glxp.api.admin.service.purchase.impl; +package com.glxp.api.service.purchase.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.purchase.PurPlanDetailDao; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.admin.req.purchase.PurPlanDetailRequest; -import com.glxp.api.admin.service.purchase.IPurPlanDetailService; -import org.apache.ibatis.annotations.Mapper; +import com.glxp.api.dao.purchase.PurPlanDetailDao; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.req.purchase.PurPlanDetailRequest; +import com.glxp.api.service.purchase.IPurPlanDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanServiceImpl.java rename to src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java index 82ce432d..387872cf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.service.purchase.impl; +package com.glxp.api.service.purchase.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.purchase.PurPlanDao; -import com.glxp.api.admin.entity.purchase.PurPlanEntity; -import com.glxp.api.admin.req.purchase.PurPlanRequest; -import com.glxp.api.admin.res.purchase.PurPlanResponse; -import com.glxp.api.admin.service.purchase.IPurPlanService; +import com.glxp.api.dao.purchase.PurPlanDao; +import com.glxp.api.entity.purchase.PurPlanEntity; +import com.glxp.api.req.purchase.PurPlanRequest; +import com.glxp.api.res.purchase.PurPlanResponse; +import com.glxp.api.service.purchase.IPurPlanService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java rename to src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java index a592e0b7..b6231d04 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.purchase.impl; +package com.glxp.api.service.purchase.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.dao.purchase.SupCertDao; -import com.glxp.api.admin.entity.purchase.SupCertEntity; -import com.glxp.api.admin.req.purchase.FilterSupCertRequest; -import com.glxp.api.admin.service.purchase.SupCertService; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.purchase.SupCertDao; +import com.glxp.api.entity.purchase.SupCertEntity; +import com.glxp.api.req.purchase.FilterSupCertRequest; +import com.glxp.api.service.purchase.SupCertService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertSetServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertSetServiceImpl.java rename to src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java index c5c03487..e61d33a4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.purchase.impl; +package com.glxp.api.service.purchase.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.purchase.SupCertSetDao; -import com.glxp.api.admin.entity.purchase.SupCertSetEntity; -import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; -import com.glxp.api.admin.service.purchase.SupCertSetService; +import com.glxp.api.dao.purchase.SupCertSetDao; +import com.glxp.api.entity.purchase.SupCertSetEntity; +import com.glxp.api.req.purchase.FilterCertSetsRequest; +import com.glxp.api.service.purchase.SupCertSetService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java rename to src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java index 5d2a885c..54d67657 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.purchase.impl; +package com.glxp.api.service.purchase.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.purchase.SupCompanyDao; -import com.glxp.api.admin.entity.purchase.SupCompanyEntity; -import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest; -import com.glxp.api.admin.service.purchase.SupCompanyService; +import com.glxp.api.dao.purchase.SupCompanyDao; +import com.glxp.api.entity.purchase.SupCompanyEntity; +import com.glxp.api.req.purchase.FilterSupCompanyRequest; +import com.glxp.api.service.purchase.SupCompanyService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupManufacturerServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupManufacturerServiceImpl.java rename to src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java index e90b1e3f..3d1bcce5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupManufacturerServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.purchase.impl; +package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.purchase.SupManufacturerDao; -import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; -import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest; -import com.glxp.api.admin.service.purchase.SupManufacturerService; +import com.glxp.api.dao.purchase.SupManufacturerDao; +import com.glxp.api.entity.purchase.SupManufacturerEntity; +import com.glxp.api.req.purchase.FilterSupManufacturerRequest; +import com.glxp.api.service.purchase.SupManufacturerService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupProductServiceImpl.java rename to src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index ccb7055a..4ee740a6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.service.purchase.impl; +package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.dao.purchase.SupProductDao; -import com.glxp.api.admin.entity.purchase.SupProductEntity; -import com.glxp.api.admin.req.purchase.FilterPoductRequest; -import com.glxp.api.admin.res.purchase.SupProductResponse; -import com.glxp.api.admin.service.purchase.SupProductService; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.purchase.SupProductDao; +import com.glxp.api.entity.purchase.SupProductEntity; +import com.glxp.api.req.purchase.FilterPoductRequest; +import com.glxp.api.res.purchase.SupProductResponse; +import com.glxp.api.service.purchase.SupProductService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpExportLogService.java similarity index 67% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrCorpExportLogService.java index 894189fe..c6fd04fe 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpExportLogService.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrCorpExportLogEntity; -import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportDetailService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java index 87072524..e84dcf55 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrCorpImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import org.apache.ibatis.annotations.Param; +import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import org.springframework.stereotype.Service; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportLogService.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrCorpImportLogService.java index 4d09e777..16c59369 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportLogService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java index f4bf52f3..9411918e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; -import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java b/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrDataService.java index 8485cba8..a1c63ce3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java @@ -1,22 +1,22 @@ -package com.glxp.api.admin.service.thrsys; - -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; -import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; -import com.glxp.api.admin.req.business.StockOrderFilterRequest; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpProductsResponse; -import com.glxp.api.admin.res.inout.ErpOrderResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.business.StockOrderDetailService; -import com.glxp.api.admin.service.business.StockOrderService; +package com.glxp.api.service.thrsys; + +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.FilterErpGoodsRequest; +import com.glxp.api.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.req.business.StockOrderFilterRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.ErpProductsResponse; +import com.glxp.api.res.inout.ErpOrderResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.business.StockOrderDetailService; +import com.glxp.api.service.business.StockOrderService; import com.glxp.api.common.res.BaseResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrImportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrImportLogService.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrImportLogService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrImportLogService.java index f49f4524..38a6db87 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrImportLogService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrImportLogService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDetailService.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsDetailService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDetailService.java index fe5dd73a..68e1bc5e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDetailService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsExportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsExportLogService.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsExportLogService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrInvProductsExportLogService.java index f1882541..e203801e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsExportLogService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsExportLogService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsImportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsImportLogService.java similarity index 72% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsImportLogService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrInvProductsImportLogService.java index e6894aa0..f319167a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsImportLogService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsImportLogService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsService.java similarity index 71% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrInvProductsService.java index 2a27b1b5..13559b06 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsService.java @@ -1,8 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; -import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; -import org.apache.ibatis.annotations.Param; +import com.glxp.api.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvWarehouseService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvWarehouseService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java index 5e98e805..a266c617 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest; +import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.api.req.thrsys.FilterThrInvWarehouseRequest; import com.glxp.api.common.res.BaseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java index acebe70b..b1452888 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderExportLogService.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrOrderExportLogService.java index b60cf943..717bb7bc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderExportLogService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrOrderExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.entity.thrsys.ThrOrderExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderImportDetailService.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrOrderImportDetailService.java index bb4f9158..1826bcfb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderImportDetailService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrOrderImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderImportLogService.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrOrderImportLogService.java index 57c92a92..3cea1ea9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderImportLogService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrOrderImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java index 18af9210..3b5b556a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; -import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.admin.res.inout.ErpOrderResponse; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.thrsys.ThrOrderEntity; +import com.glxp.api.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.res.inout.ErpOrderResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsExportLogService.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrProductsExportLogService.java index a51fb6ca..6a5ee620 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsExportLogService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportDetailService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java index b4901fd1..5d75d5b5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import java.util.List; public interface ThrProductsImportDetailService { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java similarity index 73% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java index 9c8e8360..30a19a01 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java index 59e98aee..94b375d3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java @@ -1,9 +1,7 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import org.apache.ibatis.annotations.Param; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrSubInvWarehouseService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSubInvWarehouseService.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrSubInvWarehouseService.java rename to src/main/java/com/glxp/api/service/thrsys/ThrSubInvWarehouseService.java index 4acbeb37..7efa7cea 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrSubInvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSubInvWarehouseService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.service.thrsys; +package com.glxp.api.service.thrsys; -import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity; -import com.glxp.api.admin.req.thrsys.FilterThrSubInvWarehouseRequest; -import com.glxp.api.admin.res.thrsys.ThrSubInvWarehouseResponse; +import com.glxp.api.entity.thrsys.ThrSubInvWarehouseEntity; +import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; +import com.glxp.api.res.thrsys.ThrSubInvWarehouseResponse; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java index 9b50530a..e2994260 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrCorpExportLogDao; -import com.glxp.api.admin.entity.thrsys.ThrCorpExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrCorpExportLogService; +import com.glxp.api.dao.thrsys.ThrCorpExportLogDao; +import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.service.thrsys.ThrCorpExportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java index 05d025a7..5eb5b486 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrCorpImportDetailDao; -import com.glxp.api.admin.entity.thrsys.ThrCorpImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrCorpImportDetailService; +import com.glxp.api.dao.thrsys.ThrCorpImportDetailDao; +import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.thrsys.ThrCorpImportDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java index 572b7687..14fb4614 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrCorpImportLogDao; -import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrCorpImportLogService; +import com.glxp.api.dao.thrsys.ThrCorpImportLogDao; +import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.thrsys.ThrCorpImportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java index d0e5d271..6a857a1e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrCorpDao; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; -import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; -import com.glxp.api.admin.service.thrsys.ThrCorpService; +import com.glxp.api.dao.thrsys.ThrCorpDao; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.service.thrsys.ThrCorpService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrImportLogServiceImpl.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrImportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrImportLogServiceImpl.java index e5d28817..9ea8c143 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrImportLogServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrImportLogDao; -import com.glxp.api.admin.entity.thrsys.ThrImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrImportLogService; +import com.glxp.api.dao.thrsys.ThrImportLogDao; +import com.glxp.api.entity.thrsys.ThrImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.thrsys.ThrImportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java index 8840f348..70485f64 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java @@ -1,11 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrInvProductsDetailDao; -import com.glxp.api.admin.entity.thrsys.ThrCorpImportDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrInvProductsDetailService; +import com.glxp.api.dao.thrsys.ThrInvProductsDetailDao; +import com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.thrsys.ThrInvProductsDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java index eada5e15..399b1b23 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrInvProductsExportLogDao; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrInvProductsExportLogService; +import com.glxp.api.dao.thrsys.ThrInvProductsExportLogDao; +import com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.service.thrsys.ThrInvProductsExportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java index ddcb41c9..a899cdcc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrInvProductsImportLogDao; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrInvProductsImportLogService; +import com.glxp.api.dao.thrsys.ThrInvProductsImportLogDao; +import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.thrsys.ThrInvProductsImportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java index 44e734e3..1c5dfc71 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java @@ -1,12 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrCorpDao; -import com.glxp.api.admin.dao.thrsys.ThrInvProductsDao; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; -import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; -import com.glxp.api.admin.service.thrsys.ThrInvProductsService; +import com.glxp.api.dao.thrsys.ThrInvProductsDao; +import com.glxp.api.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.service.thrsys.ThrInvProductsService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index 66ccd099..585c5193 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -1,19 +1,18 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BasicThirdSysDao; -import com.glxp.api.admin.dao.thrsys.ThrInvWarehouseDao; -import com.glxp.api.admin.dao.thrsys.ThrSubInvWarehouseDao; -import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.erp.UdiwmsWarehouseRequest; -import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.erp.UdiwmsWarehouseDetail; -import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService; +import com.glxp.api.dao.thrsys.ThrInvWarehouseDao; +import com.glxp.api.dao.thrsys.ThrSubInvWarehouseDao; +import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.api.entity.thrsys.ThrSubInvWarehouseEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.erp.UdiwmsWarehouseRequest; +import com.glxp.api.req.thrsys.FilterThrInvWarehouseRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.erp.UdiwmsWarehouseDetail; +import com.glxp.api.service.thrsys.ThrInvWarehouseService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java index be137ec7..9aa3dd5a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java @@ -1,11 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrOrderDetailDao; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; -import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; +import com.glxp.api.dao.thrsys.ThrOrderDetailDao; +import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.service.thrsys.ThrOrderDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java index b7698494..d2aedc8d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrOrderExportLogDao; -import com.glxp.api.admin.entity.thrsys.ThrOrderExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrOrderExportLogService; +import com.glxp.api.dao.thrsys.ThrOrderExportLogDao; +import com.glxp.api.entity.thrsys.ThrOrderExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.service.thrsys.ThrOrderExportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java index 6db942d6..c2131148 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrOrderImportDetailDao; -import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrOrderImportDetailService; +import com.glxp.api.dao.thrsys.ThrOrderImportDetailDao; +import com.glxp.api.entity.thrsys.ThrOrderImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.thrsys.ThrOrderImportDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java index 49eb7906..2185f254 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java @@ -1,11 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrOrderImportLogDao; -import com.glxp.api.admin.entity.basic.CorpImportLogEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrOrderImportLogService; +import com.glxp.api.dao.thrsys.ThrOrderImportLogDao; +import com.glxp.api.entity.thrsys.ThrOrderImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.thrsys.ThrOrderImportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java index 66b9f3ac..bb2cf8b3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java @@ -1,16 +1,16 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrOrderDao; -import com.glxp.api.admin.dao.thrsys.ThrOrderDetailDao; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; -import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; -import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.admin.res.inout.ErpOrderResponse; -import com.glxp.api.admin.service.thrsys.ThrOrderService; +import com.glxp.api.dao.thrsys.ThrOrderDao; +import com.glxp.api.dao.thrsys.ThrOrderDetailDao; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.entity.thrsys.ThrOrderEntity; +import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.res.inout.ErpOrderResponse; +import com.glxp.api.service.thrsys.ThrOrderService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java index 3caf00d1..94a58f12 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrProductsExportLogDao; -import com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrProductsExportLogService; +import com.glxp.api.dao.thrsys.ThrProductsExportLogDao; +import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.service.thrsys.ThrProductsExportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java index 2c14f8f5..411155a5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrProductsImportDetailDao; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportDetailEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrProductsImportDetailService; +import com.glxp.api.dao.thrsys.ThrProductsImportDetailDao; +import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.thrsys.ThrProductsImportDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java index 5212f4a2..ae033dba 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrProductsImportLogDao; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService; +import com.glxp.api.dao.thrsys.ThrProductsImportLogDao; +import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.thrsys.ThrProductsImportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 12ddb655..f364fef9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BasicThirdSysDao; -import com.glxp.api.admin.dao.thrsys.ThrProductsDao; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.service.thrsys.ThrProductsService; +import com.glxp.api.dao.basic.BasicThirdSysDao; +import com.glxp.api.dao.thrsys.ThrProductsDao; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.service.thrsys.ThrProductsService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrSubInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSubInvWarehouseServiceImpl.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrSubInvWarehouseServiceImpl.java rename to src/main/java/com/glxp/api/service/thrsys/impl/ThrSubInvWarehouseServiceImpl.java index 9f872277..5582c23c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrSubInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSubInvWarehouseServiceImpl.java @@ -1,13 +1,13 @@ -package com.glxp.api.admin.service.thrsys.impl; +package com.glxp.api.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.thrsys.ThrSubInvWarehouseDao; -import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity; -import com.glxp.api.admin.req.thrsys.FilterThrSubInvWarehouseRequest; -import com.glxp.api.admin.res.thrsys.ThrSubInvWarehouseResponse; -import com.glxp.api.admin.service.thrsys.ThrSubInvWarehouseService; +import com.glxp.api.dao.thrsys.ThrSubInvWarehouseDao; +import com.glxp.api.entity.thrsys.ThrSubInvWarehouseEntity; +import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; +import com.glxp.api.res.thrsys.ThrSubInvWarehouseResponse; +import com.glxp.api.service.thrsys.ThrSubInvWarehouseService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java b/src/main/java/com/glxp/api/thread/BasicBackUpdateProductService.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java rename to src/main/java/com/glxp/api/thread/BasicBackUpdateProductService.java index 6b390564..02b58b7b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java +++ b/src/main/java/com/glxp/api/thread/BasicBackUpdateProductService.java @@ -1,25 +1,25 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpProductsResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.thrsys.ThrProductsService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.FilterErpGoodsRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.ErpProductsResponse; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.service.basic.UdiInfoService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.res.BaseResponse; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicCorpImportService.java b/src/main/java/com/glxp/api/thread/BasicCorpImportService.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/thread/BasicCorpImportService.java rename to src/main/java/com/glxp/api/thread/BasicCorpImportService.java index e8089bec..bd5dac6e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicCorpImportService.java +++ b/src/main/java/com/glxp/api/thread/BasicCorpImportService.java @@ -1,19 +1,19 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.dao.basic.BasicUnitMaintainDao; -import com.glxp.api.admin.dao.thrsys.ThrCorpDao; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.basic.CorpImportDetailEntity; -import com.glxp.api.admin.entity.basic.CorpImportLogEntity; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.res.basic.BasicUnitMaintainExportResponse; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.basic.CorpImportDetailService; -import com.glxp.api.admin.service.basic.CorpImportLogService; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.dao.basic.BasicUnitMaintainDao; +import com.glxp.api.dao.thrsys.ThrCorpDao; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.basic.CorpImportDetailEntity; +import com.glxp.api.entity.basic.CorpImportLogEntity; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.res.basic.BasicUnitMaintainExportResponse; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.CorpImportDetailService; +import com.glxp.api.service.basic.CorpImportLogService; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicDiUpdateHelper.java b/src/main/java/com/glxp/api/thread/BasicDiUpdateHelper.java similarity index 79% rename from api-admin/src/main/java/com/glxp/api/admin/thread/BasicDiUpdateHelper.java rename to src/main/java/com/glxp/api/thread/BasicDiUpdateHelper.java index 2e1eb0db..9cffdc5b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicDiUpdateHelper.java +++ b/src/main/java/com/glxp/api/thread/BasicDiUpdateHelper.java @@ -1,7 +1,6 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.service.basic.UdiRelevanceService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java b/src/main/java/com/glxp/api/thread/BasicGenExcelService.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java rename to src/main/java/com/glxp/api/thread/BasicGenExcelService.java index eb25c30f..9abf9a4b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/thread/BasicGenExcelService.java @@ -1,29 +1,25 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.req.basic.*; -import com.glxp.api.admin.res.basic.BasicUnitMaintainExportResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.basic.CorpExportLogService; -import com.glxp.api.admin.service.basic.UdiInfoExportLogService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.info.SyncDataSetService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.util.ExcelUtil; -import com.glxp.api.admin.util.HttpClient; -import com.glxp.api.admin.util.HttpOkClient; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.info.SyncDataSetEntity; +import com.glxp.api.req.basic.*; +import com.glxp.api.res.basic.BasicUnitMaintainExportResponse; +import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.CorpExportLogService; +import com.glxp.api.service.basic.UdiInfoExportLogService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.info.SyncDataSetService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.util.ExcelUtil; +import com.glxp.api.util.HttpOkClient; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenJsonService.java b/src/main/java/com/glxp/api/thread/BasicGenJsonService.java similarity index 89% rename from api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenJsonService.java rename to src/main/java/com/glxp/api/thread/BasicGenJsonService.java index 0f7dcc6c..48b6ae6e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenJsonService.java +++ b/src/main/java/com/glxp/api/thread/BasicGenJsonService.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -6,27 +6,27 @@ import cn.hutool.core.io.file.FileWriter; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.dao.basic.UdiInfoDao; -import com.glxp.api.admin.dao.basic.UdiRelevanceDao; -import com.glxp.api.admin.dao.thrsys.ThrCorpDao; -import com.glxp.api.admin.dao.thrsys.ThrProductsDao; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.req.basic.CorpsExportRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.basic.UdiInfoExportRequest; -import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.res.basic.BasicUnitMaintainExportResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.basic.CorpExportLogService; -import com.glxp.api.admin.service.basic.UdiInfoExportLogService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.dao.basic.UdiInfoDao; +import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.dao.thrsys.ThrCorpDao; +import com.glxp.api.dao.thrsys.ThrProductsDao; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.req.basic.CorpsExportRequest; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.basic.UdiInfoExportRequest; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.res.basic.BasicUnitMaintainExportResponse; +import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.CorpExportLogService; +import com.glxp.api.service.basic.UdiInfoExportLogService; +import com.glxp.api.service.basic.UdiRelevanceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java b/src/main/java/com/glxp/api/thread/BasicUdiInfoImportService.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java rename to src/main/java/com/glxp/api/thread/BasicUdiInfoImportService.java index 9fbf8c82..5328d015 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java +++ b/src/main/java/com/glxp/api/thread/BasicUdiInfoImportService.java @@ -1,26 +1,25 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.httpclient.UdiDlHttpClient; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.*; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.thrsys.ThrDataService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.GennerOrderUtils; -import com.glxp.api.admin.util.HttpClient; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.httpclient.UdiDlHttpClient; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.*; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.thrsys.ThrDataService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.HttpClient; import com.glxp.api.common.res.BaseResponse; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUnitImportService.java b/src/main/java/com/glxp/api/thread/BasicUnitImportService.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/thread/BasicUnitImportService.java rename to src/main/java/com/glxp/api/thread/BasicUnitImportService.java index 3c28078c..4e3aa7f4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUnitImportService.java +++ b/src/main/java/com/glxp/api/thread/BasicUnitImportService.java @@ -1,18 +1,18 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.extra.pinyin.PinyinUtil; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpUnitsResponse; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.thrsys.ThrCorpService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.ErpUnitsResponse; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.thrsys.ThrCorpService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.res.BaseResponse; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java b/src/main/java/com/glxp/api/thread/BasicUpdateErpDataTask.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java rename to src/main/java/com/glxp/api/thread/BasicUpdateErpDataTask.java index b6bfde4d..bcc8bf46 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java +++ b/src/main/java/com/glxp/api/thread/BasicUpdateErpDataTask.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; -import com.glxp.api.admin.dao.schedule.ScheduledDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.req.info.ScheduledRequest; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.req.info.ScheduledRequest; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.service.info.SystemParamConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java b/src/main/java/com/glxp/api/thread/BasicUpdateProductService.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java rename to src/main/java/com/glxp/api/thread/BasicUpdateProductService.java index 1d42be88..f4a63fc7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java +++ b/src/main/java/com/glxp/api/thread/BasicUpdateProductService.java @@ -1,28 +1,28 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.httpclient.ErpInvClient; -import com.glxp.api.admin.req.basic.CombineRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.inventory.ErpOnhandRequest; -import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpProductsResponse; -import com.glxp.api.admin.res.inventory.ErpInvProductResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.thrsys.ThrInvProductsService; -import com.glxp.api.admin.service.thrsys.ThrProductsService; -import com.glxp.api.admin.util.*; import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.httpclient.ErpInvClient; +import com.glxp.api.req.basic.CombineRequest; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.inventory.ErpOnhandRequest; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.ErpProductsResponse; +import com.glxp.api.res.inventory.ErpInvProductResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.service.basic.UdiInfoService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.thrsys.ThrInvProductsService; +import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.util.*; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/CleanDataTask.java b/src/main/java/com/glxp/api/thread/CleanDataTask.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/thread/CleanDataTask.java rename to src/main/java/com/glxp/api/thread/CleanDataTask.java index 1ce8b48c..ac3d8901 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/CleanDataTask.java +++ b/src/main/java/com/glxp/api/thread/CleanDataTask.java @@ -1,11 +1,11 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; -import com.glxp.api.admin.dao.schedule.ScheduledDao; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.req.info.ScheduledRequest; -import com.glxp.api.admin.service.basic.BasicDownloadService; -import com.glxp.api.admin.service.basic.BasicExportService; -import com.glxp.api.admin.service.thrsys.*; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.req.info.ScheduledRequest; +import com.glxp.api.service.basic.BasicDownloadService; +import com.glxp.api.service.basic.BasicExportService; +import com.glxp.api.service.thrsys.*; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/CompanyProductsRelService.java b/src/main/java/com/glxp/api/thread/CompanyProductsRelService.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/thread/CompanyProductsRelService.java rename to src/main/java/com/glxp/api/thread/CompanyProductsRelService.java index 8bc2ec38..218a9df4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/CompanyProductsRelService.java +++ b/src/main/java/com/glxp/api/thread/CompanyProductsRelService.java @@ -1,16 +1,14 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; -import cn.hutool.core.util.StrUtil; -import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.req.basic.UdiInfoExportRequest; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.info.CompanyProductRelevanceService; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.req.basic.UdiInfoExportRequest; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.info.CompanyProductRelevanceService; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/src/main/java/com/glxp/api/thread/DlBasicService.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java rename to src/main/java/com/glxp/api/thread/DlBasicService.java index da3e2344..d794aeae 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/src/main/java/com/glxp/api/thread/DlBasicService.java @@ -1,52 +1,52 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.dao.auth.AuthAdminDao; -import com.glxp.api.admin.dao.basic.*; -import com.glxp.api.admin.dao.business.StockOrderRemakDao; -import com.glxp.api.admin.dao.inout.CodesTempDao; -import com.glxp.api.admin.dao.inout.OrderDao; -import com.glxp.api.admin.dao.inout.WarehouseBussinessTypeDao; -import com.glxp.api.admin.dao.inout.WarehouseUserDao; -import com.glxp.api.admin.dao.thrsys.ThrCorpDao; -import com.glxp.api.admin.dao.thrsys.ThrOrderDao; -import com.glxp.api.admin.dao.thrsys.ThrOrderDetailDao; -import com.glxp.api.admin.dao.thrsys.ThrProductsDao; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.auth.DeptEntity; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.business.StockOrderRemakEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inout.WarehouseUserEntity; -import com.glxp.api.admin.entity.inventory.InvBusUserEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.entity.purchase.*; -import com.glxp.api.admin.entity.thrsys.*; -import com.glxp.api.admin.httpclient.SpGetHttpClient; -import com.glxp.api.admin.req.basic.BasicExportStatusRequest; -import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; -import com.glxp.api.admin.req.sync.PostDownloadInfo; -import com.glxp.api.admin.res.basic.*; -import com.glxp.api.admin.service.auth.DeptService; -import com.glxp.api.admin.service.basic.*; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.inventory.InvBusUserService; -import com.glxp.api.admin.service.inventory.InvSubWarehouseService; -import com.glxp.api.admin.service.inventory.InvWarehouseService; -import com.glxp.api.admin.service.purchase.*; -import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.auth.AuthAdminDao; +import com.glxp.api.dao.basic.*; +import com.glxp.api.dao.business.StockOrderRemakDao; +import com.glxp.api.dao.inout.CodesTempDao; +import com.glxp.api.dao.inout.OrderDao; +import com.glxp.api.dao.inout.WarehouseBussinessTypeDao; +import com.glxp.api.dao.inout.WarehouseUserDao; +import com.glxp.api.dao.thrsys.ThrCorpDao; +import com.glxp.api.dao.thrsys.ThrOrderDao; +import com.glxp.api.dao.thrsys.ThrOrderDetailDao; +import com.glxp.api.dao.thrsys.ThrProductsDao; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.business.StockOrderRemakEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inout.WarehouseUserEntity; +import com.glxp.api.entity.inventory.InvBusUserEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.entity.purchase.*; +import com.glxp.api.entity.thrsys.*; +import com.glxp.api.httpclient.SpGetHttpClient; +import com.glxp.api.req.basic.BasicExportStatusRequest; +import com.glxp.api.req.purchase.FilterCertSetsRequest; +import com.glxp.api.req.sync.PostDownloadInfo; +import com.glxp.api.res.basic.*; +import com.glxp.api.service.auth.DeptService; +import com.glxp.api.service.basic.*; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.inventory.InvBusUserService; +import com.glxp.api.service.inventory.InvSubWarehouseService; +import com.glxp.api.service.inventory.InvWarehouseService; +import com.glxp.api.service.purchase.*; +import com.glxp.api.service.thrsys.ThrInvWarehouseService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlSpOrderService.java b/src/main/java/com/glxp/api/thread/DlSpOrderService.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/thread/DlSpOrderService.java rename to src/main/java/com/glxp/api/thread/DlSpOrderService.java index ce6b5e99..6776470c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlSpOrderService.java +++ b/src/main/java/com/glxp/api/thread/DlSpOrderService.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.inout.IOOrderStatusEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.req.inout.PostOrderRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inout.DlOrderResponse; -import com.glxp.api.admin.service.inout.IOOrderStatusService; -import com.glxp.api.admin.httpclient.SpGetHttpClient; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.inout.IOOrderStatusEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.httpclient.SpGetHttpClient; +import com.glxp.api.req.inout.PostOrderRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.DlOrderResponse; +import com.glxp.api.service.inout.IOOrderStatusService; import com.glxp.api.common.res.BaseResponse; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlUploadService.java b/src/main/java/com/glxp/api/thread/DlUploadService.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/thread/DlUploadService.java rename to src/main/java/com/glxp/api/thread/DlUploadService.java index 93e73114..c7bfb733 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlUploadService.java +++ b/src/main/java/com/glxp/api/thread/DlUploadService.java @@ -1,8 +1,8 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.util.RedisUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadSpDataTask.java b/src/main/java/com/glxp/api/thread/DownloadSpDataTask.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/thread/DownloadSpDataTask.java rename to src/main/java/com/glxp/api/thread/DownloadSpDataTask.java index fb93bce9..f6f9b946 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadSpDataTask.java +++ b/src/main/java/com/glxp/api/thread/DownloadSpDataTask.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.dao.schedule.ScheduledDao; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.req.info.ScheduledRequest; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.constant.Constant; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.req.info.ScheduledRequest; +import com.glxp.api.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java b/src/main/java/com/glxp/api/thread/DownloadThirdSysDataTask.java similarity index 85% rename from api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java rename to src/main/java/com/glxp/api/thread/DownloadThirdSysDataTask.java index c855e298..d2f49d40 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java +++ b/src/main/java/com/glxp/api/thread/DownloadThirdSysDataTask.java @@ -1,32 +1,30 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.ThirdSysConstant; -import com.glxp.api.admin.dao.basic.BasicThirdSysDao; -import com.glxp.api.admin.dao.basic.BasicThirdSysDetailDao; -import com.glxp.api.admin.dao.schedule.ScheduledDao; -import com.glxp.api.admin.dao.schedule.SystemParamConfigDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; -import com.glxp.api.admin.req.info.ScheduledRequest; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.BussinessOriginTypeService; -import com.glxp.api.admin.service.thrsys.ThrCorpImportLogService; -import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService; -import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService; -import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.ThirdSysConstant; +import com.glxp.api.dao.basic.BasicThirdSysDao; +import com.glxp.api.dao.basic.BasicThirdSysDetailDao; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.dao.schedule.SystemParamConfigDao; +import com.glxp.api.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BussinessOriginTypeEntity; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.req.info.ScheduledRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.basic.BussinessOriginTypeService; +import com.glxp.api.service.thrsys.ThrCorpImportLogService; +import com.glxp.api.service.thrsys.ThrInvWarehouseService; +import com.glxp.api.service.thrsys.ThrProductsImportLogService; +import com.glxp.api.util.CustomUtil; import com.glxp.api.common.res.BaseResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java b/src/main/java/com/glxp/api/thread/HeartService.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java rename to src/main/java/com/glxp/api/thread/HeartService.java index 23aa58ec..4e72d7d8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java +++ b/src/main/java/com/glxp/api/thread/HeartService.java @@ -1,21 +1,21 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.BasicExportStatusEntity; -import com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity; -import com.glxp.api.admin.req.basic.BasicExportStatusRequest; -import com.glxp.api.admin.req.basic.SpsSyncDataRequest; -import com.glxp.api.admin.res.basic.SpsSyncBusResponse; -import com.glxp.api.admin.res.basic.SpsSyncDataResponse; -import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; -import com.glxp.api.admin.res.basic.SpsSyncScheduleResponse; -import com.glxp.api.admin.service.basic.BasicExportService; -import com.glxp.api.admin.service.basic.BasicExportTimeService; -import com.glxp.api.admin.util.CustomUtil; -import com.glxp.api.admin.util.DateUtil; -import com.glxp.api.admin.httpclient.SpGetHttpClient; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.BasicExportStatusEntity; +import com.glxp.api.entity.basic.BasicExportStatusTimeEntity; +import com.glxp.api.httpclient.SpGetHttpClient; +import com.glxp.api.req.basic.BasicExportStatusRequest; +import com.glxp.api.req.basic.SpsSyncDataRequest; +import com.glxp.api.res.basic.SpsSyncBusResponse; +import com.glxp.api.res.basic.SpsSyncDataResponse; +import com.glxp.api.res.basic.SpsSyncOrderResponse; +import com.glxp.api.res.basic.SpsSyncScheduleResponse; +import com.glxp.api.service.basic.BasicExportService; +import com.glxp.api.service.basic.BasicExportTimeService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java b/src/main/java/com/glxp/api/thread/HeartTask.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java rename to src/main/java/com/glxp/api/thread/HeartTask.java index e0b08f18..fb409fdb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java +++ b/src/main/java/com/glxp/api/thread/HeartTask.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.thread; - -import com.glxp.api.admin.dao.info.SyncDataSetDao; -import com.glxp.api.admin.dao.schedule.ScheduledDao; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; -import com.glxp.api.admin.req.info.ScheduledRequest; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.util.RedisUtil; +package com.glxp.api.thread; + +import com.glxp.api.dao.info.SyncDataSetDao; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.entity.info.SyncDataSetEntity; +import com.glxp.api.req.info.ScheduledRequest; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.util.RedisUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java b/src/main/java/com/glxp/api/thread/InvImportStockService.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java rename to src/main/java/com/glxp/api/thread/InvImportStockService.java index 31784051..8d464ecb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java +++ b/src/main/java/com/glxp/api/thread/InvImportStockService.java @@ -1,37 +1,34 @@ -package com.glxp.api.admin.thread; - -import com.glxp.api.admin.config.WebSocketServer; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.constant.IncodeStatus; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inventory.ErpStockEntity; -import com.glxp.api.admin.entity.inventory.InCodeLogEntity; -import com.glxp.api.admin.entity.inventory.StockPrintEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; -import com.glxp.api.admin.httpclient.ErpInvClient; -import com.glxp.api.admin.req.basic.FilterStockprintRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.inout.FilterStockCheckRequest; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.req.inventory.ErpOnhandRequest; -import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.inventory.ErpInvProductResponse; -import com.glxp.api.admin.res.inventory.ErpOnHandResponse; -import com.glxp.api.admin.service.basic.*; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.OrderDetailService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.inventory.InCodeLogService; -import com.glxp.api.admin.service.inventory.InvStockPrintService; -import com.glxp.api.admin.service.thrsys.ThrInvProductsService; +package com.glxp.api.thread; + +import com.glxp.api.config.WebSocketServer; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.constant.IncodeStatus; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inventory.InCodeLogEntity; +import com.glxp.api.entity.inventory.StockPrintEntity; +import com.glxp.api.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.httpclient.ErpInvClient; +import com.glxp.api.req.basic.FilterStockprintRequest; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.inout.FilterStockCheckRequest; +import com.glxp.api.req.inout.OrderFilterRequest; +import com.glxp.api.req.inventory.ErpOnhandRequest; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.inventory.ErpInvProductResponse; +import com.glxp.api.service.basic.*; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.OrderDetailService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.inventory.InCodeLogService; +import com.glxp.api.service.inventory.InvStockPrintService; +import com.glxp.api.service.thrsys.ThrInvProductsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -40,7 +37,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java b/src/main/java/com/glxp/api/thread/InvProductsTrService.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java rename to src/main/java/com/glxp/api/thread/InvProductsTrService.java index 07460303..73a02a49 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java +++ b/src/main/java/com/glxp/api/thread/InvProductsTrService.java @@ -1,27 +1,25 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.util.StrUtil; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.info.CompanyEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.*; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse; -import com.glxp.api.admin.service.basic.*; -import com.glxp.api.admin.service.info.CompanyService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.*; -import com.glxp.api.admin.service.inventory.*; -import com.glxp.api.admin.util.*; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.inventory.FilterInvProductDetailRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.inventory.InvProductDetailJoinResponse; +import com.glxp.api.service.basic.*; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.*; +import com.glxp.api.service.inventory.*; +import com.glxp.api.util.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java b/src/main/java/com/glxp/api/thread/InvUpdateStock1Task.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java rename to src/main/java/com/glxp/api/thread/InvUpdateStock1Task.java index 941ec67d..6b56b51e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java +++ b/src/main/java/com/glxp/api/thread/InvUpdateStock1Task.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; -import com.glxp.api.admin.dao.schedule.ScheduledDao; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.req.info.ScheduledRequest; -import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.req.info.ScheduledRequest; +import com.glxp.api.service.info.SystemParamConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java b/src/main/java/com/glxp/api/thread/InvUpdateStock2Task.java similarity index 86% rename from api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java rename to src/main/java/com/glxp/api/thread/InvUpdateStock2Task.java index 17307821..df4cf104 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java +++ b/src/main/java/com/glxp/api/thread/InvUpdateStock2Task.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; -import com.glxp.api.admin.dao.schedule.ScheduledDao; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.req.info.ScheduledRequest; -import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.req.info.ScheduledRequest; +import com.glxp.api.service.info.SystemParamConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java b/src/main/java/com/glxp/api/thread/IoModifyErpTask.java similarity index 60% rename from api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java rename to src/main/java/com/glxp/api/thread/IoModifyErpTask.java index fefaa8a9..d0239c96 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java +++ b/src/main/java/com/glxp/api/thread/IoModifyErpTask.java @@ -1,23 +1,13 @@ -package com.glxp.api.admin.thread; - -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.httpclient.ErpOrderClient; -import com.glxp.api.admin.dao.schedule.ScheduledDao; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.api.admin.req.inout.ERPPostBillRequest; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.req.info.ScheduledRequest; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.OrderDetailService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.common.res.BaseResponse; +package com.glxp.api.thread; + +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.httpclient.ErpOrderClient; +import com.glxp.api.req.info.ScheduledRequest; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.OrderDetailService; +import com.glxp.api.service.inout.OrderService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; @@ -27,9 +17,6 @@ import org.springframework.scheduling.support.CronTrigger; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; @Component @EnableScheduling diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/src/main/java/com/glxp/api/thread/IoTransInoutService.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java rename to src/main/java/com/glxp/api/thread/IoTransInoutService.java index 29051f2a..6db2bd8c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/src/main/java/com/glxp/api/thread/IoTransInoutService.java @@ -1,52 +1,52 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.glxp.api.admin.config.WebSocketServer; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.controller.inout.utils.CheckOrderUtils; -import com.glxp.api.admin.controller.inout.utils.InoutUtils; -import com.glxp.api.admin.dao.business.StockOrderRemakDao; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.business.StockOrderRemakEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; -import com.glxp.api.admin.entity.inventory.InvProductEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; -import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; -import com.glxp.api.admin.req.business.StockOrderFilterRequest; -import com.glxp.api.admin.req.inout.CommitRequest; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.req.inout.PostOrderRequest; -import com.glxp.api.admin.req.inout.WarehouseQueryRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductRequest; -import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.business.StockOrderDetailService; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.info.CompanyProductRelevanceService; -import com.glxp.api.admin.service.inout.CodesService; -import com.glxp.api.admin.service.inout.CodesTempService; -import com.glxp.api.admin.service.inout.OrderDetailService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.service.inventory.*; -import com.glxp.api.admin.util.*; +import com.glxp.api.config.WebSocketServer; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; +import com.glxp.api.controller.inout.utils.CheckOrderUtils; +import com.glxp.api.controller.inout.utils.InoutUtils; +import com.glxp.api.dao.business.StockOrderRemakDao; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.business.StockOrderRemakEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.entity.inout.FilterErpOrderRequest; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.entity.inventory.InvProductDetailEntity; +import com.glxp.api.entity.inventory.InvProductEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; +import com.glxp.api.req.business.StockOrderFilterRequest; +import com.glxp.api.req.inout.CommitRequest; +import com.glxp.api.req.inout.OrderFilterRequest; +import com.glxp.api.req.inout.PostOrderRequest; +import com.glxp.api.req.inout.WarehouseQueryRequest; +import com.glxp.api.req.inventory.FilterInvProductRequest; +import com.glxp.api.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.info.CompanyProductRelevanceResponse; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.basic.UdiInfoService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.business.StockOrderDetailService; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.info.CompanyProductRelevanceService; +import com.glxp.api.service.inout.CodesService; +import com.glxp.api.service.inout.CodesTempService; +import com.glxp.api.service.inout.OrderDetailService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.service.inventory.*; +import com.glxp.api.util.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java b/src/main/java/com/glxp/api/thread/IoTransInoutTask.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java rename to src/main/java/com/glxp/api/thread/IoTransInoutTask.java index 3ec5f91e..9e837dbd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java +++ b/src/main/java/com/glxp/api/thread/IoTransInoutTask.java @@ -1,10 +1,10 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; -import com.glxp.api.admin.dao.schedule.ScheduledDao; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.req.info.ScheduledRequest; -import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.req.info.ScheduledRequest; +import com.glxp.api.service.info.SystemParamConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/JaspaperService.java b/src/main/java/com/glxp/api/thread/JaspaperService.java similarity index 84% rename from api-admin/src/main/java/com/glxp/api/admin/thread/JaspaperService.java rename to src/main/java/com/glxp/api/thread/JaspaperService.java index 1fb2342a..ab305b4b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/JaspaperService.java +++ b/src/main/java/com/glxp/api/thread/JaspaperService.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; -import com.glxp.api.admin.entity.inventory.StockPrintEntity; -import com.glxp.api.admin.entity.inventory.StockPrintTempEntity; -import com.glxp.api.admin.service.inventory.StockPrintTempService; -import com.glxp.api.admin.util.JasperUtils; +import com.glxp.api.entity.inventory.StockPrintEntity; +import com.glxp.api.entity.inventory.StockPrintTempEntity; +import com.glxp.api.service.inventory.StockPrintTempService; +import com.glxp.api.util.JasperUtils; import net.sf.jasperreports.engine.JRException; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java b/src/main/java/com/glxp/api/thread/OrderSubmitTask.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java rename to src/main/java/com/glxp/api/thread/OrderSubmitTask.java index 2cd14f1d..04404a83 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java +++ b/src/main/java/com/glxp/api/thread/OrderSubmitTask.java @@ -1,42 +1,39 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.constant.ThirdSysConstant; -import com.glxp.api.admin.dao.basic.BasicThirdSysBusApiDao; -import com.glxp.api.admin.dao.basic.BasicThirdSysDao; -import com.glxp.api.admin.dao.basic.BasicThirdSysDetailDao; -import com.glxp.api.admin.dao.schedule.ScheduledDao; -import com.glxp.api.admin.dao.schedule.SystemParamConfigDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.entity.basic.NewUploadDiEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; -import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.req.basic.FilterNewUploadDiRequest; -import com.glxp.api.admin.req.info.ScheduledRequest; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.BussinessLocalTypeService; -import com.glxp.api.admin.service.basic.NewUploadDiService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.info.SyncUploadDataSetService; -import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.util.HttpOkClient; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ThirdSysConstant; +import com.glxp.api.dao.basic.BasicThirdSysBusApiDao; +import com.glxp.api.dao.basic.BasicThirdSysDao; +import com.glxp.api.dao.basic.BasicThirdSysDetailDao; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.entity.basic.NewUploadDiEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.entity.info.SyncDataBustypeEntity; +import com.glxp.api.entity.info.SyncUploadDataSetEntity; +import com.glxp.api.entity.inout.OrderEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.req.basic.FilterNewUploadDiRequest; +import com.glxp.api.req.info.ScheduledRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.BussinessLocalTypeService; +import com.glxp.api.service.basic.NewUploadDiService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.info.SyncUploadDataSetService; +import com.glxp.api.service.inout.OrderService; +import com.glxp.api.util.HttpOkClient; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/SupplementOrderTask.java b/src/main/java/com/glxp/api/thread/SupplementOrderTask.java similarity index 83% rename from api-admin/src/main/java/com/glxp/api/admin/thread/SupplementOrderTask.java rename to src/main/java/com/glxp/api/thread/SupplementOrderTask.java index 3df69b4c..1831acd5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/SupplementOrderTask.java +++ b/src/main/java/com/glxp/api/thread/SupplementOrderTask.java @@ -1,15 +1,15 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.admin.dao.schedule.ScheduledDao; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.req.info.ScheduledRequest; -import com.glxp.api.admin.res.inout.StockOrderResponse; -import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.info.ScheduledEntity; +import com.glxp.api.entity.info.SystemParamConfigEntity; +import com.glxp.api.req.info.ScheduledRequest; +import com.glxp.api.res.inout.StockOrderResponse; +import com.glxp.api.service.business.StockOrderService; +import com.glxp.api.service.info.SystemParamConfigService; +import com.glxp.api.service.inout.OrderService; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/TaskExecutorConfig.java b/src/main/java/com/glxp/api/thread/TaskExecutorConfig.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/thread/TaskExecutorConfig.java rename to src/main/java/com/glxp/api/thread/TaskExecutorConfig.java index 06a86e92..0d3ee1f0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/TaskExecutorConfig.java +++ b/src/main/java/com/glxp/api/thread/TaskExecutorConfig.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java b/src/main/java/com/glxp/api/thread/ThrCorpsDlService.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java rename to src/main/java/com/glxp/api/thread/ThrCorpsDlService.java index bb8ce50c..bbfa68c1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java +++ b/src/main/java/com/glxp/api/thread/ThrCorpsDlService.java @@ -1,33 +1,38 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.io.file.FileWriter; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.config.WebSocketServer; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; -import com.glxp.api.admin.entity.thrsys.*; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; -import com.glxp.api.admin.req.thrsys.PostThrCorpRequest; -import com.glxp.api.admin.req.thrsys.ThrCorpExportRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpUnitsResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.info.SyncDataSetService; -import com.glxp.api.admin.service.thrsys.ThrCorpExportLogService; -import com.glxp.api.admin.service.thrsys.ThrCorpImportDetailService; -import com.glxp.api.admin.service.thrsys.ThrCorpImportLogService; -import com.glxp.api.admin.service.thrsys.ThrCorpService; -import com.glxp.api.admin.util.*; import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.config.WebSocketServer; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.info.SyncDataSetEntity; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; +import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; +import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.req.thrsys.PostThrCorpRequest; +import com.glxp.api.req.thrsys.ThrCorpExportRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.ErpUnitsResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.info.SyncDataSetService; +import com.glxp.api.service.thrsys.ThrCorpExportLogService; +import com.glxp.api.service.thrsys.ThrCorpImportDetailService; +import com.glxp.api.service.thrsys.ThrCorpImportLogService; +import com.glxp.api.service.thrsys.ThrCorpService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.ExcelUtil; +import com.glxp.api.util.HttpOkClient; +import com.glxp.api.util.RedisUtil; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java b/src/main/java/com/glxp/api/thread/ThrInvProductsDlService.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java rename to src/main/java/com/glxp/api/thread/ThrInvProductsDlService.java index 294eaf7a..3917b455 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java +++ b/src/main/java/com/glxp/api/thread/ThrInvProductsDlService.java @@ -1,21 +1,21 @@ -package com.glxp.api.admin.thread; - -import com.glxp.api.admin.config.WebSocketServer; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.thrsys.*; -import com.glxp.api.admin.httpclient.ErpInvClient; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.req.inventory.ErpOnhandRequest; -import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; -import com.glxp.api.admin.req.thrsys.ThrInvProductsExportRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.ErpInvProductResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.thrsys.*; -import com.glxp.api.admin.util.ExcelUtil; -import com.glxp.api.admin.util.RedisUtil; +package com.glxp.api.thread; + +import com.glxp.api.config.WebSocketServer; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.thrsys.*; +import com.glxp.api.httpclient.ErpInvClient; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.req.inventory.ErpOnhandRequest; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.req.thrsys.ThrInvProductsExportRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inventory.ErpInvProductResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.thrsys.*; +import com.glxp.api.util.ExcelUtil; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.res.BaseResponse; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrderImportService.java b/src/main/java/com/glxp/api/thread/ThrOrderImportService.java similarity index 80% rename from api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrderImportService.java rename to src/main/java/com/glxp/api/thread/ThrOrderImportService.java index bc181083..6292a26b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrderImportService.java +++ b/src/main/java/com/glxp/api/thread/ThrOrderImportService.java @@ -1,17 +1,16 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; -import com.glxp.api.admin.service.thrsys.ThrOrderImportDetailService; -import com.glxp.api.admin.service.thrsys.ThrOrderImportLogService; -import com.glxp.api.admin.service.thrsys.ThrOrderService; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.entity.thrsys.ThrOrderEntity; +import com.glxp.api.entity.thrsys.ThrOrderImportDetailEntity; +import com.glxp.api.entity.thrsys.ThrOrderImportLogEntity; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.thrsys.ThrOrderDetailService; +import com.glxp.api.service.thrsys.ThrOrderImportDetailService; +import com.glxp.api.service.thrsys.ThrOrderImportLogService; +import com.glxp.api.service.thrsys.ThrOrderService; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java b/src/main/java/com/glxp/api/thread/ThrOrdersDlService.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java rename to src/main/java/com/glxp/api/thread/ThrOrdersDlService.java index 76a74fa6..be7be41e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java +++ b/src/main/java/com/glxp/api/thread/ThrOrdersDlService.java @@ -1,39 +1,37 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.io.file.FileWriter; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.config.WebSocketServer; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; -import com.glxp.api.admin.entity.thrsys.*; -import com.glxp.api.admin.httpclient.ErpOrderClient; -import com.glxp.api.admin.req.inout.FilterOrderRequest; -import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; -import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; -import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.admin.req.thrsys.PostThrOrderRequest; -import com.glxp.api.admin.req.thrsys.ThrOrderExportRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inout.ErpOrderResponse; -import com.glxp.api.admin.res.thrsys.ThrOrderExportJsonResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BasicUnitMaintainService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.info.SyncDataSetService; -import com.glxp.api.admin.service.thrsys.*; -import com.glxp.api.admin.util.ExcelUtil; -import com.glxp.api.admin.util.HttpClient; -import com.glxp.api.admin.util.HttpOkClient; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.config.WebSocketServer; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.info.SyncDataSetEntity; +import com.glxp.api.entity.thrsys.*; +import com.glxp.api.httpclient.ErpOrderClient; +import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.req.thrsys.PostThrOrderRequest; +import com.glxp.api.req.thrsys.ThrOrderExportRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.ErpOrderResponse; +import com.glxp.api.res.thrsys.ThrOrderExportJsonResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.BussinessTypeService; +import com.glxp.api.service.info.SyncDataSetService; +import com.glxp.api.service.thrsys.*; +import com.glxp.api.util.ExcelUtil; +import com.glxp.api.util.HttpOkClient; +import com.glxp.api.util.RedisUtil; import com.glxp.api.common.res.BaseResponse; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java b/src/main/java/com/glxp/api/thread/ThrProductsDlService.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java rename to src/main/java/com/glxp/api/thread/ThrProductsDlService.java index 078332ac..62d97065 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java +++ b/src/main/java/com/glxp/api/thread/ThrProductsDlService.java @@ -1,42 +1,41 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.io.file.FileWriter; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.glxp.api.admin.config.WebSocketServer; -import com.glxp.api.admin.constant.BasicProcessStatus; -import com.glxp.api.admin.constant.Constant; -import com.glxp.api.admin.dao.basic.UdiRelevanceDao; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; -import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; -import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.req.thrsys.PostThrProductsRequest; -import com.glxp.api.admin.req.thrsys.ThrProductsExportRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.ErpProductsResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.UdiContrastService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.info.SyncDataSetService; -import com.glxp.api.admin.service.thrsys.ThrProductsExportLogService; -import com.glxp.api.admin.service.thrsys.ThrProductsImportDetailService; -import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService; -import com.glxp.api.admin.service.thrsys.ThrProductsService; -import com.glxp.api.admin.util.*; import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.config.WebSocketServer; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.info.SyncDataSetEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; +import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.httpclient.ErpBasicClient; +import com.glxp.api.req.basic.FilterErpGoodsRequest; +import com.glxp.api.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.req.thrsys.PostThrProductsRequest; +import com.glxp.api.req.thrsys.ThrProductsExportRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.ErpProductsResponse; +import com.glxp.api.service.basic.BasicThirdSysDetailService; +import com.glxp.api.service.basic.BasicThirdSysService; +import com.glxp.api.service.basic.UdiContrastService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.info.SyncDataSetService; +import com.glxp.api.service.thrsys.ThrProductsExportLogService; +import com.glxp.api.service.thrsys.ThrProductsImportDetailService; +import com.glxp.api.service.thrsys.ThrProductsImportLogService; +import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.ExcelUtil; +import com.glxp.api.util.HttpOkClient; +import com.glxp.api.util.RedisUtil; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java b/src/main/java/com/glxp/api/thread/UpBasicService.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java rename to src/main/java/com/glxp/api/thread/UpBasicService.java index f1814910..72209dba 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java +++ b/src/main/java/com/glxp/api/thread/UpBasicService.java @@ -1,51 +1,46 @@ -package com.glxp.api.admin.thread; +package com.glxp.api.thread; import cn.hutool.core.collection.CollUtil; -import cn.hutool.db.sql.Order; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.dao.basic.UdiInfoDao; -import com.glxp.api.admin.dao.info.SyncDataSetDao; -import com.glxp.api.admin.entity.auth.AuthAdmin; -import com.glxp.api.admin.entity.auth.DeptEntity; -import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; -import com.glxp.api.admin.entity.info.SyncDataSetEntity; -import com.glxp.api.admin.entity.inout.*; -import com.glxp.api.admin.entity.inventory.InvBusUserEntity; -import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.entity.purchase.*; -import com.glxp.api.admin.entity.thrsys.*; -import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; -import com.glxp.api.admin.req.auth.FilterDeptRequest; -import com.glxp.api.admin.req.basic.*; -import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.req.inout.OrderQueryRequest; -import com.glxp.api.admin.req.inventory.FilterInvUserRequest; -import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; -import com.glxp.api.admin.req.purchase.FilterPoductRequest; -import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest; -import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest; -import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; -import com.glxp.api.admin.req.thrsys.*; -import com.glxp.api.admin.res.basic.SpsSyncBusResponse; -import com.glxp.api.admin.res.basic.SpsSyncDataResponse; -import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; -import com.glxp.api.admin.res.basic.SupCertSetResponse; -import com.glxp.api.admin.res.info.SyncDataSetResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.auth.DeptService; -import com.glxp.api.admin.service.basic.*; -import com.glxp.api.admin.service.info.CompanyProductRelevanceService; -import com.glxp.api.admin.service.info.SyncDataSetService; -import com.glxp.api.admin.service.inout.*; -import com.glxp.api.admin.service.inventory.InvBusUserService; -import com.glxp.api.admin.service.inventory.InvSubWarehouseService; -import com.glxp.api.admin.service.inventory.InvWarehouseService; -import com.glxp.api.admin.service.purchase.*; -import com.glxp.api.admin.service.thrsys.*; -import groovy.transform.WithReadLock; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.basic.UdiInfoDao; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.info.SyncDataBustypeEntity; +import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.inventory.InvBusUserEntity; +import com.glxp.api.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.entity.inventory.InvWarehouseEntity; +import com.glxp.api.entity.purchase.*; +import com.glxp.api.entity.thrsys.*; +import com.glxp.api.req.auth.AuthAdminQueryRequest; +import com.glxp.api.req.auth.FilterDeptRequest; +import com.glxp.api.req.basic.*; +import com.glxp.api.req.inout.OrderQueryRequest; +import com.glxp.api.req.inventory.FilterInvUserRequest; +import com.glxp.api.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.req.purchase.FilterCertSetsRequest; +import com.glxp.api.req.purchase.FilterPoductRequest; +import com.glxp.api.req.purchase.FilterSupCompanyRequest; +import com.glxp.api.req.purchase.FilterSupManufacturerRequest; +import com.glxp.api.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.req.thrsys.*; +import com.glxp.api.res.basic.SpsSyncBusResponse; +import com.glxp.api.res.basic.SpsSyncDataResponse; +import com.glxp.api.res.basic.SpsSyncOrderResponse; +import com.glxp.api.res.basic.SupCertSetResponse; +import com.glxp.api.res.info.SyncDataSetResponse; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.auth.DeptService; +import com.glxp.api.service.basic.*; +import com.glxp.api.service.info.CompanyProductRelevanceService; +import com.glxp.api.service.info.SyncDataSetService; +import com.glxp.api.service.inout.*; +import com.glxp.api.service.inventory.InvBusUserService; +import com.glxp.api.service.inventory.InvSubWarehouseService; +import com.glxp.api.service.inventory.InvWarehouseService; +import com.glxp.api.service.purchase.*; +import com.glxp.api.service.thrsys.*; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/upload/DownloadController.java b/src/main/java/com/glxp/api/upload/DownloadController.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/upload/DownloadController.java rename to src/main/java/com/glxp/api/upload/DownloadController.java index 602f6b2c..220f82b4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/upload/DownloadController.java +++ b/src/main/java/com/glxp/api/upload/DownloadController.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.upload; +package com.glxp.api.upload; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/api-admin/src/main/java/com/glxp/api/admin/upload/ImageController.java b/src/main/java/com/glxp/api/upload/ImageController.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/upload/ImageController.java rename to src/main/java/com/glxp/api/upload/ImageController.java index b6a8ff70..a2a55b50 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/upload/ImageController.java +++ b/src/main/java/com/glxp/api/upload/ImageController.java @@ -1,13 +1,11 @@ -package com.glxp.api.admin.upload; +package com.glxp.api.upload; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.imageio.ImageIO; import javax.servlet.http.HttpServletResponse; -import java.awt.image.BufferedImage; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/api-admin/src/main/java/com/glxp/api/admin/upload/uploadController.java b/src/main/java/com/glxp/api/upload/uploadController.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/upload/uploadController.java rename to src/main/java/com/glxp/api/upload/uploadController.java index dc7dce55..a61ab36f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/upload/uploadController.java +++ b/src/main/java/com/glxp/api/upload/uploadController.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.upload; +package com.glxp.api.upload; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/AddressUtils.java b/src/main/java/com/glxp/api/util/AddressUtils.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/util/AddressUtils.java rename to src/main/java/com/glxp/api/util/AddressUtils.java index b28f0c66..4342c825 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/AddressUtils.java +++ b/src/main/java/com/glxp/api/util/AddressUtils.java @@ -1,16 +1,15 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.lang.Dict; import cn.hutool.core.net.NetUtil; import cn.hutool.http.HtmlUtil; import cn.hutool.http.HttpUtil; -import com.glxp.api.admin.config.RuoYiConfig; -import com.glxp.api.admin.constant.Constant; +import com.glxp.api.config.RuoYiConfig; +import com.glxp.api.constant.Constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.util.bcel.Const; /** * 获取地址类 diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/BusTypeCheckUtils.java b/src/main/java/com/glxp/api/util/BusTypeCheckUtils.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/util/BusTypeCheckUtils.java rename to src/main/java/com/glxp/api/util/BusTypeCheckUtils.java index 2c45ec8f..c774d5a1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/BusTypeCheckUtils.java +++ b/src/main/java/com/glxp/api/util/BusTypeCheckUtils.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.BussinessTypeEntity; +import com.glxp.api.entity.inout.OrderEntity; public class BusTypeCheckUtils { diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/CacheUtils.java b/src/main/java/com/glxp/api/util/CacheUtils.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/CacheUtils.java rename to src/main/java/com/glxp/api/util/CacheUtils.java index 8c1c0f44..3e19f13b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/CacheUtils.java +++ b/src/main/java/com/glxp/api/util/CacheUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/CheckUtils.java b/src/main/java/com/glxp/api/util/CheckUtils.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/util/CheckUtils.java rename to src/main/java/com/glxp/api/util/CheckUtils.java index 3620c1ff..95326751 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/CheckUtils.java +++ b/src/main/java/com/glxp/api/util/CheckUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import java.util.HashSet; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/CronUtils.java b/src/main/java/com/glxp/api/util/CronUtils.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/util/CronUtils.java rename to src/main/java/com/glxp/api/util/CronUtils.java index 4d79771a..a6c97376 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/CronUtils.java +++ b/src/main/java/com/glxp/api/util/CronUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; public class CronUtils { diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java b/src/main/java/com/glxp/api/util/CustomUtil.java similarity index 90% rename from api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java rename to src/main/java/com/glxp/api/util/CustomUtil.java index 322e00f8..409111f9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java +++ b/src/main/java/com/glxp/api/util/CustomUtil.java @@ -1,8 +1,4 @@ -package com.glxp.api.admin.util; - -import org.apache.poi.ss.formula.functions.T; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.Row; +package com.glxp.api.util; import java.util.*; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/DateUtil.java b/src/main/java/com/glxp/api/util/DateUtil.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/DateUtil.java rename to src/main/java/com/glxp/api/util/DateUtil.java index 29078b1c..42f00c8c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/DateUtil.java +++ b/src/main/java/com/glxp/api/util/DateUtil.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; @@ -10,7 +10,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; -public class DateUtil extends org.apache.commons.lang3.time.DateUtils { +public class DateUtil extends DateUtils { private static String[] parsePatterns = { "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH", "yyyy-MM", diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/ExcelUtil.java b/src/main/java/com/glxp/api/util/ExcelUtil.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/util/ExcelUtil.java rename to src/main/java/com/glxp/api/util/ExcelUtil.java index b3513dee..1e2befe1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/ExcelUtil.java +++ b/src/main/java/com/glxp/api/util/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import org.apache.poi.hssf.usermodel.*; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/FastJsonUtils.java b/src/main/java/com/glxp/api/util/FastJsonUtils.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/util/FastJsonUtils.java rename to src/main/java/com/glxp/api/util/FastJsonUtils.java index f5889f2b..f1cc3d0a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/FastJsonUtils.java +++ b/src/main/java/com/glxp/api/util/FastJsonUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/FileUtils.java b/src/main/java/com/glxp/api/util/FileUtils.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/FileUtils.java rename to src/main/java/com/glxp/api/util/FileUtils.java index 3ba9fd63..b1260888 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/FileUtils.java +++ b/src/main/java/com/glxp/api/util/FileUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import java.io.*; import java.net.MalformedURLException; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/FilterUdiUtils.java b/src/main/java/com/glxp/api/util/FilterUdiUtils.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/util/FilterUdiUtils.java rename to src/main/java/com/glxp/api/util/FilterUdiUtils.java index 8ae122bf..cba420d6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/FilterUdiUtils.java +++ b/src/main/java/com/glxp/api/util/FilterUdiUtils.java @@ -1,14 +1,14 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.util.StrUtil; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.util.gs1.AI; -import com.glxp.api.admin.util.gs1.AIs; -import com.glxp.api.admin.util.gs1.Gs1128Decoder; -import com.glxp.api.admin.util.gs1.Gs1128Engine; +import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.basic.UdiInfoEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.util.gs1.AI; +import com.glxp.api.util.gs1.AIs; +import com.glxp.api.util.gs1.Gs1128Decoder; +import com.glxp.api.util.gs1.Gs1128Engine; import java.util.Map; import java.util.Optional; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/GennerOrderUtils.java b/src/main/java/com/glxp/api/util/GennerOrderUtils.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/util/GennerOrderUtils.java rename to src/main/java/com/glxp/api/util/GennerOrderUtils.java index 03797fe7..55258eee 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/GennerOrderUtils.java +++ b/src/main/java/com/glxp/api/util/GennerOrderUtils.java @@ -1,7 +1,6 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; -import com.glxp.api.admin.constant.Constant; -import org.springframework.beans.factory.annotation.Autowired; +import com.glxp.api.constant.Constant; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -9,7 +8,6 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Calendar; import java.util.Random; -import java.util.concurrent.TimeUnit; @Service public class GennerOrderUtils { diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/HardWareUtils.java b/src/main/java/com/glxp/api/util/HardWareUtils.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/HardWareUtils.java rename to src/main/java/com/glxp/api/util/HardWareUtils.java index 7c252146..90c9fbc5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/HardWareUtils.java +++ b/src/main/java/com/glxp/api/util/HardWareUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.util.CharsetUtil; import cn.hutool.crypto.SmUtil; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java b/src/main/java/com/glxp/api/util/HttpClient.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java rename to src/main/java/com/glxp/api/util/HttpClient.java index 1d2754c4..60bb1f76 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java +++ b/src/main/java/com/glxp/api/util/HttpClient.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import lombok.extern.slf4j.Slf4j; import org.springframework.web.client.RestTemplate; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/HttpOkClient.java b/src/main/java/com/glxp/api/util/HttpOkClient.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/util/HttpOkClient.java rename to src/main/java/com/glxp/api/util/HttpOkClient.java index e0699ea5..ae547f57 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/HttpOkClient.java +++ b/src/main/java/com/glxp/api/util/HttpOkClient.java @@ -1,9 +1,8 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSONObject; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.entity.basic.BasicThirdSysEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/ITextPDFCellConfig.java b/src/main/java/com/glxp/api/util/ITextPDFCellConfig.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/util/ITextPDFCellConfig.java rename to src/main/java/com/glxp/api/util/ITextPDFCellConfig.java index 877eb744..99a3bd0c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/ITextPDFCellConfig.java +++ b/src/main/java/com/glxp/api/util/ITextPDFCellConfig.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import com.itextpdf.text.Font; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/ITextPDFUtils.java b/src/main/java/com/glxp/api/util/ITextPDFUtils.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/ITextPDFUtils.java rename to src/main/java/com/glxp/api/util/ITextPDFUtils.java index fdb25da3..5d5362fa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/ITextPDFUtils.java +++ b/src/main/java/com/glxp/api/util/ITextPDFUtils.java @@ -1,12 +1,12 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.extra.qrcode.QrCodeUtil; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; -import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.req.itextpdf.InoutOrderDetailPDFCodeRequest; -import com.glxp.api.admin.req.itextpdf.InoutOrderDetailPDFFileRequest; -import com.glxp.api.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest; +import com.glxp.api.entity.business.StockOrderDetailEntity; +import com.glxp.api.entity.business.StockOrderEntity; +import com.glxp.api.entity.inout.ErpOrderEntity; +import com.glxp.api.req.itextpdf.InoutOrderDetailPDFCodeRequest; +import com.glxp.api.req.itextpdf.InoutOrderDetailPDFFileRequest; +import com.glxp.api.req.itextpdf.StockQRCodeTextPDFTemplateRequest; import com.itextpdf.text.*; import com.itextpdf.text.pdf.*; import com.itextpdf.text.pdf.draw.LineSeparator; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/IpUtils.java b/src/main/java/com/glxp/api/util/IpUtils.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/util/IpUtils.java rename to src/main/java/com/glxp/api/util/IpUtils.java index 3b4599f7..cfbda490 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/IpUtils.java +++ b/src/main/java/com/glxp/api/util/IpUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import org.springframework.scheduling.annotation.Async; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/JasperUtils.java b/src/main/java/com/glxp/api/util/JasperUtils.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/JasperUtils.java rename to src/main/java/com/glxp/api/util/JasperUtils.java index 7be6b576..3d5d1972 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/JasperUtils.java +++ b/src/main/java/com/glxp/api/util/JasperUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/JsonUtils.java b/src/main/java/com/glxp/api/util/JsonUtils.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/JsonUtils.java rename to src/main/java/com/glxp/api/util/JsonUtils.java index a02af7cd..781daf4b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/JsonUtils.java +++ b/src/main/java/com/glxp/api/util/JsonUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ArrayUtil; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/JwtUtils.java b/src/main/java/com/glxp/api/util/JwtUtils.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/util/JwtUtils.java rename to src/main/java/com/glxp/api/util/JwtUtils.java index 8dc31e91..3656677c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/JwtUtils.java +++ b/src/main/java/com/glxp/api/util/JwtUtils.java @@ -1,6 +1,9 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; -import io.jsonwebtoken.*; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.JwtBuilder; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/Md5Utils.java b/src/main/java/com/glxp/api/util/Md5Utils.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/util/Md5Utils.java rename to src/main/java/com/glxp/api/util/Md5Utils.java index c28c0897..5f151ed3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/Md5Utils.java +++ b/src/main/java/com/glxp/api/util/Md5Utils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import java.math.BigInteger; import java.security.MessageDigest; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/MessageUtils.java b/src/main/java/com/glxp/api/util/MessageUtils.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/util/MessageUtils.java rename to src/main/java/com/glxp/api/util/MessageUtils.java index e43c3f51..f00ad053 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/MessageUtils.java +++ b/src/main/java/com/glxp/api/util/MessageUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/MyHardWareUtils.groovy b/src/main/java/com/glxp/api/util/MyHardWareUtils.groovy similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/MyHardWareUtils.groovy rename to src/main/java/com/glxp/api/util/MyHardWareUtils.groovy index 667674d9..7b230f83 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/MyHardWareUtils.groovy +++ b/src/main/java/com/glxp/api/util/MyHardWareUtils.groovy @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util +package com.glxp.api.util import java.util.logging.Logger import java.util.regex.Matcher diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/MyStrUtil.java b/src/main/java/com/glxp/api/util/MyStrUtil.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/util/MyStrUtil.java rename to src/main/java/com/glxp/api/util/MyStrUtil.java index ae035843..74b26a55 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/MyStrUtil.java +++ b/src/main/java/com/glxp/api/util/MyStrUtil.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; public class MyStrUtil { diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java b/src/main/java/com/glxp/api/util/OkHttpCli.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java rename to src/main/java/com/glxp/api/util/OkHttpCli.java index f1aace9d..7821a73c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java +++ b/src/main/java/com/glxp/api/util/OkHttpCli.java @@ -1,12 +1,4 @@ -package com.glxp.api.admin.util; - -import okhttp3.*; -import okhttp3.internal.http.HttpHeaders; -import okhttp3.internal.http2.Header; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Map; +package com.glxp.api.util; import lombok.extern.slf4j.Slf4j; import okhttp3.*; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/OrderNoTypeBean.java b/src/main/java/com/glxp/api/util/OrderNoTypeBean.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/util/OrderNoTypeBean.java rename to src/main/java/com/glxp/api/util/OrderNoTypeBean.java index 1ea172ca..84faf0f6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/OrderNoTypeBean.java +++ b/src/main/java/com/glxp/api/util/OrderNoTypeBean.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/PasswordUtils.java b/src/main/java/com/glxp/api/util/PasswordUtils.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/util/PasswordUtils.java rename to src/main/java/com/glxp/api/util/PasswordUtils.java index 1700b7af..009f86fd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/PasswordUtils.java +++ b/src/main/java/com/glxp/api/util/PasswordUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; /** * 密码相关的工具类 diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java b/src/main/java/com/glxp/api/util/PermissionRuleTreeUtils.java similarity index 88% rename from api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java rename to src/main/java/com/glxp/api/util/PermissionRuleTreeUtils.java index a00138ad..3b11e519 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java +++ b/src/main/java/com/glxp/api/util/PermissionRuleTreeUtils.java @@ -1,7 +1,7 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; -import com.glxp.api.admin.entity.auth.AuthPermissionRule; -import com.glxp.api.admin.res.auth.AuthPermissionRuleMergeResponse; +import com.glxp.api.entity.auth.AuthPermissionRule; +import com.glxp.api.res.auth.AuthPermissionRuleMergeResponse; import org.springframework.beans.BeanUtils; import java.util.ArrayList; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/PublicFileUtils.java b/src/main/java/com/glxp/api/util/PublicFileUtils.java similarity index 82% rename from api-admin/src/main/java/com/glxp/api/admin/util/PublicFileUtils.java rename to src/main/java/com/glxp/api/util/PublicFileUtils.java index c735f36f..6699e409 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/PublicFileUtils.java +++ b/src/main/java/com/glxp/api/util/PublicFileUtils.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; -import com.glxp.api.admin.config.PublicFileUrlConfig; +import com.glxp.api.config.PublicFileUrlConfig; /** * 公共文件管理工具 diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/QRCodeUtil.java b/src/main/java/com/glxp/api/util/QRCodeUtil.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/QRCodeUtil.java rename to src/main/java/com/glxp/api/util/QRCodeUtil.java index f8e7fe36..60f5c989 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/QRCodeUtil.java +++ b/src/main/java/com/glxp/api/util/QRCodeUtil.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.util.StrUtil; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/RedisUtil.java b/src/main/java/com/glxp/api/util/RedisUtil.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/RedisUtil.java rename to src/main/java/com/glxp/api/util/RedisUtil.java index 66609310..02f4f0cd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/RedisUtil.java +++ b/src/main/java/com/glxp/api/util/RedisUtil.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.collection.CollUtil; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/ReflectUtils.java b/src/main/java/com/glxp/api/util/ReflectUtils.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/util/ReflectUtils.java rename to src/main/java/com/glxp/api/util/ReflectUtils.java index 9799cc5e..18c8eb5f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/ReflectUtils.java +++ b/src/main/java/com/glxp/api/util/ReflectUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.util.ReflectUtil; import lombok.AccessLevel; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/RsaUtils.java b/src/main/java/com/glxp/api/util/RsaUtils.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/util/RsaUtils.java rename to src/main/java/com/glxp/api/util/RsaUtils.java index d3fa806b..46b9e455 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/RsaUtils.java +++ b/src/main/java/com/glxp/api/util/RsaUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.io.resource.ClassPathResource; import org.apache.commons.codec.binary.Base64; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/ServletUtils.java b/src/main/java/com/glxp/api/util/ServletUtils.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/util/ServletUtils.java rename to src/main/java/com/glxp/api/util/ServletUtils.java index 0a29c3ef..4f96e1fa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/ServletUtils.java +++ b/src/main/java/com/glxp/api/util/ServletUtils.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.convert.Convert; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.HttpStatus; -import com.glxp.api.admin.constant.Constant; +import com.glxp.api.constant.Constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/SpringUtils.java b/src/main/java/com/glxp/api/util/SpringUtils.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/util/SpringUtils.java rename to src/main/java/com/glxp/api/util/SpringUtils.java index 161e7572..0bb480fa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/SpringUtils.java +++ b/src/main/java/com/glxp/api/util/SpringUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.extra.spring.SpringUtil; import org.springframework.aop.framework.AopContext; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/StockOrderBillNoUtils.java b/src/main/java/com/glxp/api/util/StockOrderBillNoUtils.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/util/StockOrderBillNoUtils.java rename to src/main/java/com/glxp/api/util/StockOrderBillNoUtils.java index 8bf336d3..82ad1bf9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/StockOrderBillNoUtils.java +++ b/src/main/java/com/glxp/api/util/StockOrderBillNoUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/StreamUtils.java b/src/main/java/com/glxp/api/util/StreamUtils.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/StreamUtils.java rename to src/main/java/com/glxp/api/util/StreamUtils.java index beafef7f..d0f73996 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/StreamUtils.java +++ b/src/main/java/com/glxp/api/util/StreamUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/TreeBuildUtils.java b/src/main/java/com/glxp/api/util/TreeBuildUtils.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/util/TreeBuildUtils.java rename to src/main/java/com/glxp/api/util/TreeBuildUtils.java index 3917341a..d8dc2d76 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/TreeBuildUtils.java +++ b/src/main/java/com/glxp/api/util/TreeBuildUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/TreeUtils.java b/src/main/java/com/glxp/api/util/TreeUtils.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/util/TreeUtils.java rename to src/main/java/com/glxp/api/util/TreeUtils.java index 30fdf087..89d94ab2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/TreeUtils.java +++ b/src/main/java/com/glxp/api/util/TreeUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; /** * 树形结构工具类 diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/UdiInfoUtil.java b/src/main/java/com/glxp/api/util/UdiInfoUtil.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/util/UdiInfoUtil.java rename to src/main/java/com/glxp/api/util/UdiInfoUtil.java index 6b715ec6..302a6d18 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/UdiInfoUtil.java +++ b/src/main/java/com/glxp/api/util/UdiInfoUtil.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.glxp.api.admin.constant.ConstantStatus; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.UdiInfoEntity; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/UdiInfoUtils.java b/src/main/java/com/glxp/api/util/UdiInfoUtils.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/util/UdiInfoUtils.java rename to src/main/java/com/glxp/api/util/UdiInfoUtils.java index 26267249..91ce4717 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/UdiInfoUtils.java +++ b/src/main/java/com/glxp/api/util/UdiInfoUtils.java @@ -1,9 +1,9 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.inout.WarehouseEntity; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.UdiRelevanceService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/UdidConfig.java b/src/main/java/com/glxp/api/util/UdidConfig.java similarity index 91% rename from api-admin/src/main/java/com/glxp/api/admin/util/UdidConfig.java rename to src/main/java/com/glxp/api/util/UdidConfig.java index ff36bc0c..7b4d7868 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/UdidConfig.java +++ b/src/main/java/com/glxp/api/util/UdidConfig.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; public class UdidConfig { diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/UuidUtils.java b/src/main/java/com/glxp/api/util/UuidUtils.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/util/UuidUtils.java rename to src/main/java/com/glxp/api/util/UuidUtils.java index 58afce51..da48470b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/UuidUtils.java +++ b/src/main/java/com/glxp/api/util/UuidUtils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util; +package com.glxp.api.util; import java.util.UUID; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/AI.java b/src/main/java/com/glxp/api/util/gs1/AI.java similarity index 78% rename from api-admin/src/main/java/com/glxp/api/admin/util/gs1/AI.java rename to src/main/java/com/glxp/api/util/gs1/AI.java index d0885de6..27ca5c32 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/AI.java +++ b/src/main/java/com/glxp/api/util/gs1/AI.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util.gs1; +package com.glxp.api.util.gs1; /** * @author guilherme.pacheco diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/AIs.java b/src/main/java/com/glxp/api/util/gs1/AIs.java similarity index 99% rename from api-admin/src/main/java/com/glxp/api/admin/util/gs1/AIs.java rename to src/main/java/com/glxp/api/util/gs1/AIs.java index e6499d7e..74df7352 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/AIs.java +++ b/src/main/java/com/glxp/api/util/gs1/AIs.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util.gs1; +package com.glxp.api.util.gs1; /** * @author guilherme.pacheco diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/AiFactory.java b/src/main/java/com/glxp/api/util/gs1/AiFactory.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/util/gs1/AiFactory.java rename to src/main/java/com/glxp/api/util/gs1/AiFactory.java index 6fcc3c8e..e305c3fc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/AiFactory.java +++ b/src/main/java/com/glxp/api/util/gs1/AiFactory.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util.gs1; +package com.glxp.api.util.gs1; /** * @author guilherme.pacheco diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Format.java b/src/main/java/com/glxp/api/util/gs1/Format.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/util/gs1/Format.java rename to src/main/java/com/glxp/api/util/gs1/Format.java index f01ab985..d61c0898 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Format.java +++ b/src/main/java/com/glxp/api/util/gs1/Format.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util.gs1; +package com.glxp.api.util.gs1; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Decoder.java b/src/main/java/com/glxp/api/util/gs1/Gs1128Decoder.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Decoder.java rename to src/main/java/com/glxp/api/util/gs1/Gs1128Decoder.java index 296e8081..9775152a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Decoder.java +++ b/src/main/java/com/glxp/api/util/gs1/Gs1128Decoder.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util.gs1; +package com.glxp.api.util.gs1; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Encoder.java b/src/main/java/com/glxp/api/util/gs1/Gs1128Encoder.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Encoder.java rename to src/main/java/com/glxp/api/util/gs1/Gs1128Encoder.java index 6104ad7e..c44183d3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Encoder.java +++ b/src/main/java/com/glxp/api/util/gs1/Gs1128Encoder.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util.gs1; +package com.glxp.api.util.gs1; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Engine.java b/src/main/java/com/glxp/api/util/gs1/Gs1128Engine.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Engine.java rename to src/main/java/com/glxp/api/util/gs1/Gs1128Engine.java index 5257d836..26fca87d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Engine.java +++ b/src/main/java/com/glxp/api/util/gs1/Gs1128Engine.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util.gs1; +package com.glxp.api.util.gs1; import java.util.Collections; import java.util.EnumSet; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Utils.java b/src/main/java/com/glxp/api/util/gs1/Gs1128Utils.java similarity index 97% rename from api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Utils.java rename to src/main/java/com/glxp/api/util/gs1/Gs1128Utils.java index 32a85c79..0c02b33c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Utils.java +++ b/src/main/java/com/glxp/api/util/gs1/Gs1128Utils.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util.gs1; +package com.glxp.api.util.gs1; import java.util.Iterator; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Segment.java b/src/main/java/com/glxp/api/util/gs1/Segment.java similarity index 95% rename from api-admin/src/main/java/com/glxp/api/admin/util/gs1/Segment.java rename to src/main/java/com/glxp/api/util/gs1/Segment.java index d2ff0333..92c049a0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Segment.java +++ b/src/main/java/com/glxp/api/util/gs1/Segment.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util.gs1; +package com.glxp.api.util.gs1; import org.apache.commons.lang3.Validate; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Session.java b/src/main/java/com/glxp/api/util/gs1/Session.java similarity index 98% rename from api-admin/src/main/java/com/glxp/api/admin/util/gs1/Session.java rename to src/main/java/com/glxp/api/util/gs1/Session.java index dbd0b444..116d3b51 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/Session.java +++ b/src/main/java/com/glxp/api/util/gs1/Session.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util.gs1; +package com.glxp.api.util.gs1; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/SessionType.java b/src/main/java/com/glxp/api/util/gs1/SessionType.java similarity index 96% rename from api-admin/src/main/java/com/glxp/api/admin/util/gs1/SessionType.java rename to src/main/java/com/glxp/api/util/gs1/SessionType.java index 36a05668..defbac5b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/gs1/SessionType.java +++ b/src/main/java/com/glxp/api/util/gs1/SessionType.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util.gs1; +package com.glxp.api.util.gs1; import org.apache.commons.lang3.StringUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/serializer/Date2LongSerializer.java b/src/main/java/com/glxp/api/util/serializer/Date2LongSerializer.java similarity index 94% rename from api-admin/src/main/java/com/glxp/api/admin/util/serializer/Date2LongSerializer.java rename to src/main/java/com/glxp/api/util/serializer/Date2LongSerializer.java index bc2ed5e6..49f02b16 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/serializer/Date2LongSerializer.java +++ b/src/main/java/com/glxp/api/util/serializer/Date2LongSerializer.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.util.serializer; +package com.glxp.api.util.serializer; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 00000000..39a693c1 --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,54 @@ +server: + port: 9991 + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + type: com.zaxxer.hikari.HikariDataSource + jdbc-url: jdbc:mysql://192.168.235.137:33306/udiwms_wqq?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: root + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 + + + redis: + database: 8 + host: 192.168.235.137 + port: 6379 + password: 123456 + timeout: 300 + jedis: + pool: + max-active: 8 + max-wait: -1 + max-idle: 8 + min-idle: 0 + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + servlet: + multipart: + max-file-size: 500MB + max-request-size: 500MB + +ok: + http: + connect-timeout: 3000 + read-timeout: 3000 + write-timeout: 3000 + max-idle-connections: 200 + keep-alive-duration: 300 + + +logging: + level: + com.glxp.api.dao: debug + +file_path: D:/udi/udiwms/udiwmsfile/ +UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df +UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test +SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs + diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml new file mode 100644 index 00000000..d6b91d74 --- /dev/null +++ b/src/main/resources/application-pro.yml @@ -0,0 +1,51 @@ +server: + port: 9991 + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://192.168.235.137:33306/udiwms_wqq?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: root + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 + redis: + database: 8 + host: 192.168.235.137 + port: 6379 + password: 123456 + timeout: 300 + jedis: + pool: + max-active: 8 + max-wait: -1 + max-idle: 8 + min-idle: 0 + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + servlet: + multipart: + max-file-size: 500MB + max-request-size: 500MB + +ok: + http: + connect-timeout: 3000 + read-timeout: 3000 + write-timeout: 3000 + max-idle-connections: 200 + keep-alive-duration: 300 + + +logging: + level: + com.glxp.api.dao: debug + +file_path: D:/udi/udiwms/udiwmsfile/ +UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df +UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test +SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 00000000..afaae9e7 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,26 @@ +spring: + profiles: + active: dev + jmx: + enabled: true + +mybatis-plus: + mapper-locations: classpath:mybatis/mapper/*/*.xml + configuration: + use-generated-keys: true + use-column-label: true + map-underscore-to-camel-case: false + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +pagehelper: + helperDialect: mysql + support-methods-arguments: false + params: count=countsql + offset-as-page-num: false + row-bounds-with-count: false + page-size-zero: true + reasonable: false + returnPageInfo: none + auto-dialect: true + auto-runtime-dialect: true + diff --git a/api-admin/src/main/resources/config.txt b/src/main/resources/config.txt similarity index 100% rename from api-admin/src/main/resources/config.txt rename to src/main/resources/config.txt diff --git a/api-admin/src/main/resources/fonts/STSONG.TTF b/src/main/resources/fonts/STSONG.TTF similarity index 100% rename from api-admin/src/main/resources/fonts/STSONG.TTF rename to src/main/resources/fonts/STSONG.TTF diff --git a/api-admin/src/main/resources/fonts/fonts.xml b/src/main/resources/fonts/fonts.xml similarity index 100% rename from api-admin/src/main/resources/fonts/fonts.xml rename to src/main/resources/fonts/fonts.xml diff --git a/api-admin/src/main/resources/fonts/heiti.ttf b/src/main/resources/fonts/heiti.ttf similarity index 100% rename from api-admin/src/main/resources/fonts/heiti.ttf rename to src/main/resources/fonts/heiti.ttf diff --git a/api-admin/src/main/resources/fonts/mircblack.ttf b/src/main/resources/fonts/mircblack.ttf similarity index 100% rename from api-admin/src/main/resources/fonts/mircblack.ttf rename to src/main/resources/fonts/mircblack.ttf diff --git a/api-admin/src/main/resources/fonts/simsun.ttc b/src/main/resources/fonts/simsun.ttc similarity index 100% rename from api-admin/src/main/resources/fonts/simsun.ttc rename to src/main/resources/fonts/simsun.ttc diff --git a/api-admin/src/main/resources/fonts/simsun.ttf b/src/main/resources/fonts/simsun.ttf similarity index 100% rename from api-admin/src/main/resources/fonts/simsun.ttf rename to src/main/resources/fonts/simsun.ttf diff --git a/api-admin/src/main/resources/fonts/simsunNew.ttf b/src/main/resources/fonts/simsunNew.ttf similarity index 100% rename from api-admin/src/main/resources/fonts/simsunNew.ttf rename to src/main/resources/fonts/simsunNew.ttf diff --git a/api-admin/src/main/resources/fonts/songti.ttf b/src/main/resources/fonts/songti.ttf similarity index 100% rename from api-admin/src/main/resources/fonts/songti.ttf rename to src/main/resources/fonts/songti.ttf diff --git a/api-admin/src/main/resources/jasperreports_extension.properties b/src/main/resources/jasperreports_extension.properties similarity index 100% rename from api-admin/src/main/resources/jasperreports_extension.properties rename to src/main/resources/jasperreports_extension.properties diff --git a/api-admin/src/main/resources/jaspers/isn_print_1.jasper b/src/main/resources/jaspers/isn_print_1.jasper similarity index 100% rename from api-admin/src/main/resources/jaspers/isn_print_1.jasper rename to src/main/resources/jaspers/isn_print_1.jasper diff --git a/api-admin/src/main/resources/jaspers/isn_print_1.jrxml b/src/main/resources/jaspers/isn_print_1.jrxml similarity index 100% rename from api-admin/src/main/resources/jaspers/isn_print_1.jrxml rename to src/main/resources/jaspers/isn_print_1.jrxml diff --git a/api-admin/src/main/resources/jaspers/order_print_1.jasper b/src/main/resources/jaspers/order_print_1.jasper similarity index 100% rename from api-admin/src/main/resources/jaspers/order_print_1.jasper rename to src/main/resources/jaspers/order_print_1.jasper diff --git a/api-admin/src/main/resources/jaspers/order_print_1.jrxml b/src/main/resources/jaspers/order_print_1.jrxml similarity index 100% rename from api-admin/src/main/resources/jaspers/order_print_1.jrxml rename to src/main/resources/jaspers/order_print_1.jrxml diff --git a/api-admin/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml similarity index 100% rename from api-admin/src/main/resources/logback-spring.xml rename to src/main/resources/logback-spring.xml diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml similarity index 65% rename from api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml rename to src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 92adcbfc..f5f3aca0 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -1,10 +1,10 @@ - + - SELECT auth_user.*,auth_dept.name deptName FROM auth_user left join auth_dept on auth_user.dept = auth_dept.code @@ -34,7 +34,7 @@ DESC - SELECT * FROM auth_user @@ -43,7 +43,7 @@ LIMIT 1 - SELECT * FROM auth_user @@ -52,7 +52,7 @@ LIMIT 1 - SELECT passWord FROM auth_user @@ -61,7 +61,7 @@ LIMIT 1 - + INSERT INTO auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag ,employeeName,CustomerId,lastModifyTime,locInvCode,locSubInvCode,dept,comments) @@ -103,7 +103,7 @@ #{dept},#{comments}) - + replace INTO auth_user(id, userName, passWord, lastLoginIp, lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId,locInvCode,locSubInvCode,dept,comments) @@ -120,13 +120,12 @@ #{CustomerId}, #{locInvCode}, #{locSubInvCode}, - #{dept}, - #{comments} + #{dept},#{comments} ) - + UPDATE auth_user userName=#{userName}, @@ -149,66 +148,9 @@ from auth_user where id = #{id} - select * from auth_user where userFlag != 0 - - - - - - - - - \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthCheckDao.xml b/src/main/resources/mybatis/mapper/auth/AuthCheckDao.xml similarity index 77% rename from api-admin/src/main/resources/mybatis/mapper/auth/AuthCheckDao.xml rename to src/main/resources/mybatis/mapper/auth/AuthCheckDao.xml index 56a6c682..7e78af1e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthCheckDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthCheckDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM auth_device_check @@ -22,7 +22,7 @@ DESC - SELECT * FROM auth_device_check @@ -32,7 +32,7 @@ - + INSERT INTO auth_device_check (machineInfo, remark, registerCode, createDate) values (#{machineInfo}, @@ -40,7 +40,7 @@ #{registerCode}, #{createDate}) - + UPDATE auth_device_check remark=#{remark}, diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml b/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml similarity index 83% rename from api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml rename to src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml index ef33b71e..f9160c53 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml @@ -1,19 +1,19 @@ - - SELECT * FROM auth_license where id = #{id} - + INSERT INTO auth_license(id, appid, name, apiKey, secretKey, createDate, customerId, companyName) values (#{id}, #{appid}, #{name,jdbcType=VARCHAR}, #{apiKey,jdbcType=VARCHAR}, #{secretKey,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{customerId}, #{companyName}) - + UPDATE auth_license appid=#{appid}, @@ -39,7 +39,7 @@ where customerId = #{customerId} - select apikey, secretkey from auth_license where name = #{name} diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionDao.xml b/src/main/resources/mybatis/mapper/auth/AuthPermissionDao.xml similarity index 80% rename from api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionDao.xml rename to src/main/resources/mybatis/mapper/auth/AuthPermissionDao.xml index 199cd862..1f9d4e1b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthPermissionDao.xml @@ -1,9 +1,9 @@ - + - SELECT permissionRuleId FROM auth_permission where roleId IN @@ -12,7 +12,7 @@ - SELECT permissionRuleId FROM auth_permission where roleId = #{roleId} diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml b/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml similarity index 78% rename from api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml rename to src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml index 192b5680..09175a20 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml @@ -1,9 +1,9 @@ - + - SELECT `name` FROM auth_permission_rule where id IN @@ -12,25 +12,25 @@ - SELECT `id`,`pid`,`name`,`title`,`status`,`condition`,`listorder` FROM auth_permission_rule where pid = #{pid} - SELECT `id`,`pid`,`name`,`title`,`status`,`condition`,`listorder` FROM auth_permission_rule - SELECT `id` FROM auth_permission_rule where `name` = #{name} limit 1 - + INSERT INTO auth_permission_rule(pid,`name`,`title`,`status`,`condition`,`listorder`,create_time,update_time) values (#{pid}, @@ -50,7 +50,7 @@ #{updateTime}) - + UPDATE auth_permission_rule pid=#{pid}, diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml similarity index 77% rename from api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml rename to src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml index 91f75dcc..897ccdcf 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml @@ -1,15 +1,15 @@ - + - SELECT role_id FROM auth_role_admin where admin_id = #{adminId} - SELECT * FROM auth_role_admin where admin_id in @@ -18,7 +18,7 @@ - SELECT admin_id FROM auth_role_admin where role_id = #{roleId} diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml b/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml similarity index 82% rename from api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml rename to src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml index ca9ed9cb..2ff8886a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml @@ -1,10 +1,10 @@ - + - SELECT id,name,status,remark,create_time,listorder FROM auth_role @@ -17,7 +17,7 @@ - SELECT id,name FROM auth_role @@ -27,14 +27,14 @@ - SELECT id FROM auth_role where `name` = #{name} - + INSERT INTO auth_role(`name`,pid,`status`,`remark`,`listorder`,create_time,update_time) values ( @@ -69,7 +69,7 @@ ) - + UPDATE auth_role `name`=#{name}, diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/src/main/resources/mybatis/mapper/auth/DeptDao.xml similarity index 65% rename from api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml rename to src/main/resources/mybatis/mapper/auth/DeptDao.xml index 881e591c..55c39264 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml +++ b/src/main/resources/mybatis/mapper/auth/DeptDao.xml @@ -1,22 +1,16 @@ - + - SELECT * FROM auth_dept - - and id = #{id} - - + and flag = #{flag} - - and parentId = #{parentId} - AND `name` LIKE CONCAT('%',#{name},'%') @@ -27,14 +21,14 @@ - - INSERT INTO auth_dept(`name`, `flag`, `remark`, updateTime, code, parentId) + + INSERT INTO auth_dept(`name`, `flag`, `remark`, updateTime, code) values (#{name}, #{flag}, - #{remark}, #{updateTime}, #{code}, #{parentId}) + #{remark}, #{updateTime}, #{code}) - + UPDATE auth_dept `name`=#{name}, @@ -42,7 +36,6 @@ remark=#{remark}, code=#{code}, updateTime=#{updateTime}, - parentId=#{parentId}, WHERE id=#{id} @@ -57,7 +50,7 @@ from auth_dept - select * from auth_dept where code = #{code} \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml similarity index 85% rename from api-admin/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml rename to src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml index d9cb0945..e515c3c8 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM basic_bustype_change @@ -22,8 +22,8 @@ - SELECT basic_bustype_change.* ,basic_bustype_local.name targetBusName FROM basic_bustype_change left join basic_bustype_local on basic_bustype_change.targetBusAction = basic_bustype_local.action @@ -48,7 +48,7 @@ + parameterType="com.glxp.api.entity.basic.BasicBusTypeChangeEntity"> insert INTO basic_bustype_change (`originAction`, originName, `targetBusAction`, targetScAction, `type`, updateTime, remark, enable, @@ -61,7 +61,7 @@ - + UPDATE basic_bustype_change originAction = #{originAction}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml b/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml similarity index 87% rename from api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml rename to src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml index 6c0f6345..103f326e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml @@ -1,10 +1,10 @@ - + - select * from basic_download_status @@ -32,7 +32,7 @@ + parameterType="com.glxp.api.entity.basic.BasicDownloadStatusEntity"> replace INTO basic_download_status(id,taskId,idDatas,status,type,updateTime,scheduleType,startTime,endTime,remark) values( @@ -49,7 +49,7 @@ ) - + UPDATE basic_download_status idDatas=#{idDatas}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml b/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml similarity index 88% rename from api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml rename to src/main/resources/mybatis/mapper/basic/BasicExportDao.xml index e8e1d098..0fe0fa01 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml @@ -1,10 +1,10 @@ - + - select * from basic_export_status @@ -34,7 +34,7 @@ + parameterType="com.glxp.api.entity.basic.BasicExportStatusEntity"> replace INTO basic_export_status(id,idDatas,status,`type`,updateTime,scheduleType,startTime,endTime,remark,receiveStatus) values( @@ -51,7 +51,7 @@ ) - + UPDATE basic_export_status idDatas=#{idDatas}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml similarity index 78% rename from api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml rename to src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml index ead10aff..f0d5493a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml @@ -1,10 +1,10 @@ - + - select * from basic_export_status_time @@ -18,7 +18,7 @@ + parameterType="com.glxp.api.entity.basic.BasicExportStatusTimeEntity"> replace INTO basic_export_status_time(`key`,lastUpdateTime,remark) values( @@ -28,7 +28,7 @@ ) - + UPDATE basic_export_status_time lastUpdateTime=#{lastUpdateTime}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml b/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml similarity index 84% rename from api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml rename to src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml index 9de5f6a9..6b7a4207 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml @@ -1,9 +1,9 @@ - + - + UPDATE basic_third_sys_bus_api code=#{code}, @@ -18,8 +18,8 @@ WHERE id=#{id} - SELECT * FROM basic_third_sys_bus_api @@ -42,7 +42,7 @@ + parameterType="com.glxp.api.entity.basic.BasicThirdSysBusApiEntity"> insert ignore INTO basic_third_sys_bus_api @@ -77,7 +77,7 @@ from basic_third_sys_bus_api where id = #{id} - select * from basic_third_sys_bus_api where code = #{code} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml b/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml similarity index 84% rename from api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml rename to src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml index 525c6122..e0913402 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml @@ -1,9 +1,9 @@ - + - + UPDATE basic_third_sys thirdId=#{thirdId}, @@ -20,8 +20,8 @@ WHERE id=#{id} - SELECT * FROM basic_third_sys @@ -38,7 +38,7 @@ - select * FROM basic_third_sys WHERE thirdId = #{thirdId} @@ -50,7 +50,7 @@ - select * from basic_third_sys where thirdId = #{thirdId} and thirdName = #{thirdName} + + - select * FROM basic_corp @@ -72,7 +72,7 @@ limit 1 + parameterType="com.glxp.api.entity.basic.BasicUnitMaintainEntity"> REPLACE INTO basic_corp (thirdId,erpId,name,spell, @@ -106,7 +106,7 @@ + parameterType="com.glxp.api.entity.basic.BasicUnitMaintainEntity"> insert ignore INTO basic_corp @@ -140,7 +140,7 @@ ) - + insert INTO basic_corp(thirdId, erpId, name, spell, addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType, outType) @@ -160,7 +160,7 @@ - + UPDATE basic_corp thirdId=#{thirdId}, @@ -196,13 +196,13 @@ - select * FROM basic_corp WHERE id = #{id} - select * from basic_corp where id in @@ -210,7 +210,7 @@ - select * from basic_corp where erpId in @@ -220,7 +220,7 @@ + + resultType="com.glxp.api.entity.basic.BussinessChangeTypeEntity"> SELECT basic_bustype_pre.*, basic_bussiness_type.name, inv_warehouse.`name` defautInvName, @@ -18,8 +18,8 @@ - SELECT basic_bustype_pre.*,invA.name defautSubInvName,invB.name locSubInvName , busTypeA.name originName,busTypeB.name targetName FROM basic_bustype_pre @@ -46,7 +46,7 @@ + parameterType="com.glxp.api.entity.basic.BussinessChangeTypeEntity"> insert INTO basic_bustype_pre ( `action`, scAction, `index`, remark, beforeTime, intro, changeType, defaultInv, defaultSubInv @@ -61,7 +61,7 @@ - + UPDATE basic_bustype_pre action = #{action}, @@ -100,7 +100,7 @@ WHERE `action` = #{action} - select * FROM basic_bustype_pre WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml similarity index 86% rename from api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml rename to src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index fa778e2d..959d27ac 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -1,10 +1,10 @@ - + - SELECT basic_bustype_local.* ,basic_bussiness_type.mainAction ,basic_bustype_origin.name originName from basic_bustype_local LEFT JOIN basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action @@ -27,8 +27,8 @@ - select basic_bustype_local.* from basic_bustype_local LEFT JOIN basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction @@ -46,8 +46,8 @@ - SELECT * from basic_bustype_local @@ -69,8 +69,8 @@ - SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action localAction,originAction, basic_bussiness_type.name , @@ -102,8 +102,8 @@ - select basic_bussiness_type.action,basic_bussiness_type.`name`, basic_bussiness_type.localAction,basic_bustype_local.`name` localName, @@ -126,8 +126,8 @@ GROUP BY basic_bussiness_type.id - SELECT basic_bustype_local.id, basic_bustype_local.NAME localName, @@ -189,8 +189,8 @@ - SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action localAction,originAction, basic_bussiness_type.name , @@ -214,7 +214,7 @@ + parameterType="com.glxp.api.entity.basic.BussinessLocalTypeEntity"> replace INTO basic_bustype_local (action, name, remark, originAction, advanceType, changeEnable, spUse,updateTime,prefix,preIn,supplementAll) @@ -233,7 +233,7 @@ ) - + UPDATE basic_bustype_local action = #{action}, @@ -259,13 +259,13 @@ - select * FROM basic_bustype_local WHERE id = #{id} - select action, name from basic_bustype_local where action not in ( @@ -282,7 +282,7 @@ ) - select * FROM basic_bustype_local diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml similarity index 86% rename from api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml rename to src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml index 1c20c833..fcc8a511 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM basic_bustype_origin @@ -19,8 +19,8 @@ - select basic_bustype_origin.name, basic_bustype_origin.action thirdAction,basic_bustype_origin.name thirdName, basic_bussiness_type.action,basic_bussiness_type.mainAction, @@ -51,8 +51,8 @@ GROUP BY basic_bustype_origin.action; - select * from basic_bustype_origin LEFT JOIN basic_third_sys_detail on basic_bustype_origin.thirdSys = basic_third_sys_detail.thirdSysFk @@ -86,7 +86,7 @@ + parameterType="com.glxp.api.entity.basic.BussinessOriginTypeEntity"> replace INTO basic_bustype_origin (`action`, `name`, enable, remark, thirdSys, thirdSysName,inoutType,updateTime) @@ -103,7 +103,7 @@ - + UPDATE basic_bustype_origin action = #{action}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml similarity index 94% rename from api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml rename to src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index fc13cf7b..1b4f80af 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -1,10 +1,10 @@ - + - SELECT basic_bussiness_type.id,basic_bussiness_type.action,basic_bussiness_type.name, basic_bussiness_type.enable,basic_bussiness_type.remark,basic_bussiness_type.mainAction, @@ -50,8 +50,8 @@ - SELECT * FROM basic_bussiness_type @@ -79,8 +79,8 @@ - select basic_bussiness_type.*, basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,defaultUnit, @@ -124,8 +124,8 @@ order by basic_bussiness_type.`index` - SELECT basic_bussiness_type.id,basic_bussiness_type.action,basic_bussiness_type.name, basic_bussiness_type.enable,basic_bussiness_type.remark,basic_bussiness_type.mainAction, @@ -189,7 +189,7 @@ + parameterType="com.glxp.api.entity.basic.BussinessTypeEntity"> replace INTO basic_bussiness_type (`action`,`name`,enable,remark,mainAction,localAction,thirdSysFk, @@ -249,7 +249,7 @@ + parameterType="com.glxp.api.entity.basic.BussinessTypeEntity"> insert ignore INTO basic_bussiness_type @@ -308,7 +308,7 @@ - + UPDATE basic_bussiness_type action = #{action}, @@ -378,14 +378,14 @@ - select * FROM basic_bussiness_type WHERE id = #{id} - select * from basic_bussiness_type where action = #{action} @@ -396,7 +396,7 @@ where action in (select action from io_order where id = #{billNo}) - select name, action from basic_bussiness_type where mainAction = #{mainAction} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml similarity index 90% rename from api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml rename to src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml index 1a99b4de..4c42e099 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -1,11 +1,11 @@ - + - select company_product_relevance.id,company_product_relevance.customerId,company_product_relevance.auditStatus, basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.id rlId, @@ -161,21 +161,21 @@ + parameterType="com.glxp.api.entity.basic.CompanyProductRelevanceEntity" + resultType="com.glxp.api.entity.basic.CompanyProductRelevanceEntity"> SELECT * FROM company_product_relevance @@ -204,8 +204,8 @@ + parameterType="com.glxp.api.entity.basic.CompanyProductRelevanceEntity"> UPDATE company_product_relevance customerId=#{customerId}, @@ -245,7 +245,7 @@ + parameterType="com.glxp.api.entity.basic.CompanyProductRelevanceEntity"> replace INTO company_product_relevance(customerId,productId,enterpriseId,registrationId, create_time,update_time,auditStatus,productUuid,udiRlIdFk,unitFk,price) values @@ -265,7 +265,7 @@ + parameterType="com.glxp.api.entity.basic.CompanyProductRelevanceEntity"> replace INTO company_product_relevance(id,customerId,productId,enterpriseId,registrationId, create_time,update_time,auditStatus,productUuid,udiRlIdFk,unitFk,price) values diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CorpExportLogDao.xml b/src/main/resources/mybatis/mapper/basic/CorpExportLogDao.xml similarity index 84% rename from api-admin/src/main/resources/mybatis/mapper/basic/CorpExportLogDao.xml rename to src/main/resources/mybatis/mapper/basic/CorpExportLogDao.xml index 840ef188..b872431f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/CorpExportLogDao.xml +++ b/src/main/resources/mybatis/mapper/basic/CorpExportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM basic_corps_export_log @@ -25,7 +25,7 @@ + parameterType="com.glxp.api.entity.basic.CorpExportLogEntity"> insert INTO basic_corps_export_log (genKey,updateTime,dlCount,status,filePath,remark,`type`) values @@ -41,7 +41,7 @@ DELETE FROM basic_corps_export_log WHERE id = #{id} - + UPDATE basic_corps_export_log updateTime=#{updateTime}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CorpImportDetailDao.xml b/src/main/resources/mybatis/mapper/basic/CorpImportDetailDao.xml similarity index 90% rename from api-admin/src/main/resources/mybatis/mapper/basic/CorpImportDetailDao.xml rename to src/main/resources/mybatis/mapper/basic/CorpImportDetailDao.xml index 69b57bbd..88a990c3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/CorpImportDetailDao.xml +++ b/src/main/resources/mybatis/mapper/basic/CorpImportDetailDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM basic_corps_import_detail @@ -22,7 +22,7 @@ + parameterType="com.glxp.api.entity.basic.CorpImportDetailEntity"> insert INTO basic_corps_import_detail ( thirdId,erpId,name,spell, @@ -81,7 +81,7 @@ DELETE FROM basic_corps_import_detail WHERE genKeyFk = #{genKey} - + UPDATE basic_corps_import_detail thirdId=#{thirdId}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CorpImportLogDao.xml b/src/main/resources/mybatis/mapper/basic/CorpImportLogDao.xml similarity index 78% rename from api-admin/src/main/resources/mybatis/mapper/basic/CorpImportLogDao.xml rename to src/main/resources/mybatis/mapper/basic/CorpImportLogDao.xml index 458d6a89..c1102307 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/CorpImportLogDao.xml +++ b/src/main/resources/mybatis/mapper/basic/CorpImportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM basic_corps_import_log @@ -21,7 +21,7 @@ - + insert INTO basic_corps_import_log (genKey,fromType,updateTime,remark,status) values @@ -38,7 +38,7 @@ DELETE FROM basic_corps_import_log WHERE id = #{id} - + UPDATE basic_corps_import_log genKey=#{genKey}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml similarity index 89% rename from api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml rename to src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml index de114485..fe8f6ea6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -1,10 +1,10 @@ - + - select * from basic_entrust_accept @@ -39,8 +39,8 @@ - select basic_entrust_accept.id,b.name,b.action,b.mainAction from basic_entrust_accept @@ -70,8 +70,8 @@ - select basic_entrust_accept.* , a.name as curName, b.name as entrustName,auth_user.employeeName ,c.name as entrustInvName,d.name as curInvName @@ -110,7 +110,7 @@ + parameterType="com.glxp.api.entity.basic.EntrustReceEntity"> replace INTO basic_entrust_accept(`action`, entrustInv, `entrustUser`, userId, updateTime, remark,entrustAction,finishRece,curInv,entrustSubInv,invWarehouseCode) @@ -128,7 +128,7 @@ + parameterType="com.glxp.api.entity.basic.EntrustReceEntity"> replace INTO basic_entrust_accept(id,`action`, entrustInv, `entrustUser`, userId, updateTime, remark, entrustAction,finishRece,curInv,entrustSubInv,invWarehouseCode) @@ -146,7 +146,7 @@ ) - + UPDATE basic_entrust_accept action=#{action}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/NewUploadDiDao.xml b/src/main/resources/mybatis/mapper/basic/NewUploadDiDao.xml similarity index 87% rename from api-admin/src/main/resources/mybatis/mapper/basic/NewUploadDiDao.xml rename to src/main/resources/mybatis/mapper/basic/NewUploadDiDao.xml index 1b0d0413..5fd953e9 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/NewUploadDiDao.xml +++ b/src/main/resources/mybatis/mapper/basic/NewUploadDiDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM basic_new_udi_upload @@ -30,8 +30,8 @@ - SELECT basic_new_udi_upload.* ,basic_products.nameCode ,basic_products.cpmctymc productName FROM basic_new_udi_upload INNER JOIN basic_udirel on basic_new_udi_upload.relId = basic_udirel.id INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid @@ -59,7 +59,7 @@ - + replace INTO basic_new_udi_upload (relId, thirdSysFk, uploadStatus, uploadMsg, uploadCode, remark, updateTime, submitTime) @@ -82,7 +82,7 @@ WHERE id = #{id} - + UPDATE basic_new_udi_upload relId=#{relId}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml similarity index 91% rename from api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml rename to src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml index a047f2db..a3e4b5cb 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml +++ b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM productinfo @@ -36,8 +36,8 @@ - SELECT * FROM productinfo @@ -68,8 +68,8 @@ GROUP BY uuid - select * from productinfo @@ -92,8 +92,8 @@ - SELECT * FROM productinfo diType = 1 @@ -117,7 +117,7 @@ - select p.* from productinfo p INNER JOIN (select deviceRecordKey ,max(versionNumber) versionNumber from productinfo @@ -166,8 +166,8 @@ - SELECT * FROM productinfo @@ -189,7 +189,7 @@ - - select * from productinfo @@ -260,8 +260,8 @@ - select * from productinfo @@ -308,7 +308,7 @@ - + resultType="com.glxp.api.entity.basic.ProductInfoEntity"> select * from productinfo where @@ -366,8 +366,8 @@ ]]> - SELECT * FROM productinfo @@ -402,7 +402,7 @@ + parameterType="com.glxp.api.entity.basic.ProductInfoEntity"> REPLACE INTO productinfo ( @@ -468,7 +468,7 @@ + parameterType="com.glxp.api.entity.basic.ProductInfoEntity"> REPLACE INTO productinfo ( id,nameCode,packRatio,packLevel,bhxjsl, @@ -540,7 +540,7 @@ - + UPDATE productinfo nameCode=#{nameCode}, @@ -585,7 +585,7 @@ WHERE id = #{id} - + UPDATE productinfo scbssfbhph=#{scbssfbhph}, @@ -617,7 +617,7 @@ - SELECT uuid from device group by uuid limit #{page}, #{limit} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml b/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml similarity index 83% rename from api-admin/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml rename to src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml index 278cf7ad..fc1c3323 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml @@ -1,10 +1,10 @@ - + + parameterType="com.glxp.api.req.basic.UdiCompanyRequest" + resultType="com.glxp.api.entity.basic.UdiCompanyEntity"> SELECT * FROM udicompany @@ -37,7 +37,7 @@ - + REPLACE INTO udicompany ( @@ -56,7 +56,7 @@ ) - + replace INTO udicompany(id, tyshxydm,ylqxzcrbarmc,ylqxzcrbarywmc,qylxrdh, qylxrcz,qylxryx) @@ -88,7 +88,7 @@ - + UPDATE udicompany tyshxydm=#{tyshxydm}, @@ -101,8 +101,8 @@ WHERE id = #{id} - SELECT * FROM udicompany diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml similarity index 93% rename from api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml rename to src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index 4a933752..1f299f4b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM basic_products @@ -29,8 +29,8 @@ - SELECT basic_products.id, basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, @@ -98,14 +98,14 @@ - + replace INTO basic_products (id, @@ -230,7 +230,7 @@ WHERE uuid = #{uuid} - + UPDATE basic_products packRatio=#{packRatio}, @@ -282,7 +282,7 @@ WHERE uuid = #{uuid} - + update basic_products ggxh=#{ggxh}, @@ -303,7 +303,7 @@ where uuid = #{uuid} - select * from basic_products where uuid in @@ -312,7 +312,7 @@ - select * from basic_products where originUuid in diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoExportLogDao.xml b/src/main/resources/mybatis/mapper/basic/UdiInfoExportLogDao.xml similarity index 84% rename from api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoExportLogDao.xml rename to src/main/resources/mybatis/mapper/basic/UdiInfoExportLogDao.xml index 73cc8e6f..e67acf91 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoExportLogDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiInfoExportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM basic_products_export_log @@ -22,7 +22,7 @@ + parameterType="com.glxp.api.entity.basic.UdiInfoExportLogEntity"> insert INTO basic_products_export_log (genKey,updateTime,dlCount,status,filePath,remark,`type`) values @@ -38,7 +38,7 @@ DELETE FROM basic_products_export_log WHERE id = #{id} - + UPDATE basic_products_export_log updateTime=#{updateTime}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml b/src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml similarity index 90% rename from api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml rename to src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml index f39d2212..6b55c112 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM basic_products_import_detail @@ -25,7 +25,7 @@ + parameterType="com.glxp.api.entity.basic.UdiInfoImportDetailEntity"> insert INTO basic_products_import_detail (udiCode,ybbm,sptm,thirdId1,thirdId2, thirdId3,thirdId4,thirdId,status,updateTime,remark,genKeyFk,isUseDy) @@ -60,7 +60,7 @@ DELETE FROM basic_products_import_detail WHERE genKeyFk = #{genKey} - + UPDATE basic_products_import_detail udiCode=#{udiCode}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportLogDao.xml b/src/main/resources/mybatis/mapper/basic/UdiInfoImportLogDao.xml similarity index 80% rename from api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportLogDao.xml rename to src/main/resources/mybatis/mapper/basic/UdiInfoImportLogDao.xml index f9f5ca1e..07c3ade0 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportLogDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiInfoImportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM basic_products_import_log @@ -27,7 +27,7 @@ - + insert INTO basic_products_import_log (genKey,fromType,updateTime,thirdSysFk,status) values @@ -44,7 +44,7 @@ DELETE FROM basic_products_import_log WHERE id = #{id} - + UPDATE basic_products_import_log genKey=#{genKey}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml similarity index 94% rename from api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml rename to src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 2038884b..22c0cd14 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1,9 +1,9 @@ - - select basic_udirel.id, basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, @@ -94,8 +94,8 @@ ORDER BY modifyTime DESC - select basic_udirel.id, basic_udirel.thirdId, basic_udirel.thirdName, @@ -237,8 +237,8 @@ - select basic_udirel.id, basic_udirel.thirdId, basic_udirel.thirdName, @@ -408,7 +408,7 @@ - select * from basic_udirel INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid @@ -459,13 +459,13 @@ - select * FROM basic_udirel @@ -491,8 +491,8 @@ limit 1 - select * FROM basic_udirel @@ -507,8 +507,8 @@ - select * FROM basic_udirel @@ -543,7 +543,7 @@ - + replace INTO basic_udirel (id, @@ -587,7 +587,7 @@ + parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity"> insert ignore INTO basic_udirel @@ -650,7 +650,7 @@ WHERE uuid = #{uuid} - + UPDATE basic_udirel @@ -740,14 +740,14 @@ WHERE id = #{id} - select * from basic_udirel where uuid in #{item} - select * from basic_udirel where id in diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml b/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml similarity index 76% rename from api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml rename to src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml index 526ccc54..009daec7 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM basic_corp @@ -22,7 +22,7 @@ + parameterType="com.glxp.api.entity.basic.UnitMaintainEntity"> INSERT INTO basic_corp (thirdId,erpId,name,spell, addr,status,type,contact,mobile,creditNo) @@ -46,23 +46,23 @@ - select * FROM basic_corp WHERE id = #{id} - select thirdId, thirdName from basic_corp where erpId = #{erpId} - select * from basic_corp where ${thirdIdSys} = #{thirdId} - select * from basic_corp where erpId = #{erpId} diff --git a/api-admin/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml b/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml similarity index 96% rename from api-admin/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml rename to src/main/resources/mybatis/mapper/business/InvSpaceDao.xml index 6c32739a..c54c1c5e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml +++ b/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml @@ -1,7 +1,7 @@ - - + + @@ -44,7 +44,7 @@ where id = #{id,jdbcType=INTEGER} - insert into inv_space (code, `name`, type, invStorageCode, invWarehouseCode, `status`, createTime, @@ -58,7 +58,7 @@ + parameterType="com.glxp.api.entity.business.InvSpace" useGeneratedKeys="true"> insert into inv_space @@ -132,7 +132,7 @@ - + update inv_space @@ -172,7 +172,7 @@ where id = #{id,jdbcType=INTEGER} - + update inv_space set code = #{code,jdbcType=VARCHAR}, `name` = #{name,jdbcType=VARCHAR}, @@ -269,7 +269,7 @@ - select s.*, w.name invStorageName, iws.name invSubStorageName @@ -315,7 +315,7 @@ - select inv_space.code, inv_space.name, iws.name invSubStorageName, iw.name invStorageName from inv_space left join inv_warehouse_sub iws on iws.code = inv_space.invWarehouseCode diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/src/main/resources/mybatis/mapper/business/StockOrderDao.xml similarity index 91% rename from api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml rename to src/main/resources/mybatis/mapper/business/StockOrderDao.xml index a9e8a789..01fd9dbb 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml +++ b/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM stock_order INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code` @@ -12,8 +12,8 @@ group by stock_order.id - select * from stock_order @@ -25,12 +25,12 @@ + parameterType="com.glxp.api.entity.business.StockOrderEntity"> insert INTO stock_order(id, billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, status, statusInfo, `type`, sourceType, printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk, totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime, - updateTime, invWarehouseCode, fromSubInvCode, dept) + updateTime, invWarehouseCode, fromSubInvCode, dept, noInvOut) values (#{id}, #{billNo}, #{billdate}, @@ -45,9 +45,9 @@ #{sourceType}, #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice}, #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd}, #{auditTime}, - #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept}) + #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept} ,#{noInvOut}) - + UPDATE stock_order billNo=#{billNo}, @@ -77,6 +77,7 @@ invWarehouseCode=#{invWarehouseCode}, fromSubInvCode=#{fromSubInvCode}, dept=#{dept}, + noInvOut=#{noInvOut}, WHERE id = #{id} @@ -105,8 +106,8 @@ where billNo = #{billNo} - SELECT stock_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bustype_local.name billTypeName,iws2.name fromSubInvName,auth_dept.name deptName,auth_user.employeeName reviewUserName FROM stock_order @@ -228,8 +229,8 @@ - SELECT stock_order.* FROM stock_order INNER JOIN basic_entrust_accept on locStorageCode = basic_entrust_accept.curInv @@ -248,8 +249,8 @@ - SELECT * FROM stock_order @@ -286,8 +287,8 @@ limit 1 - SELECT stock_order.*, stock_order_detail.productId, stock_order_detail.productName, stock_order_detail.spec, stock_order_detail.batchNo, stock_order_detail.productDate, stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount, @@ -335,8 +336,8 @@ - select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count, basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh, @@ -361,7 +362,7 @@ group by io_codes.id - SELECT billNo, orderIdFk, `status` @@ -375,12 +376,12 @@ != '') - select * from stock_order where id = #{id} - select * from stock_order where id = #{id} @@ -413,13 +414,13 @@ - select * from stock_order where billNo = #{billNo} - select t1.* from stock_order t1 left join io_order t2 on t1.billNo = t2.erpFk t2.erpFk is not null diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml b/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml similarity index 87% rename from api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml rename to src/main/resources/mybatis/mapper/business/StockOrderDetail.xml index 9c53c27b..4936c2e0 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml +++ b/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml @@ -1,10 +1,10 @@ - + - select stock_order_detail.* from stock_order_detail left join basic_udirel on stock_order_detail.relId = basic_udirel.id @@ -28,8 +28,8 @@ ORDER BY id DESC - select stock_order_detail.id,stock_order_detail.orderIdFk,stock_order_detail.productId, basic_products.cpmctymc,basic_products.ggxh, @@ -60,8 +60,8 @@ ORDER BY id DESC - select * from stock_order_detail @@ -78,7 +78,7 @@ + parameterType="com.glxp.api.entity.business.StockOrderDetailEntity"> replace INTO stock_order_detail(id, orderIdFk,productId,productName,spec,batchNo,productDate, @@ -109,7 +109,7 @@ + parameterType="com.glxp.api.entity.business.StockOrderDetailEntity"> replace INTO stock_order_detail(id, orderIdFk,productId,productName,spec,batchNo,productDate, expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate) @@ -136,7 +136,7 @@ - + UPDATE stock_order_detail batchNo=#{batchNo}, @@ -170,13 +170,13 @@ - select * from stock_order_detail where orderIdFk = (select billNo from stock_order where stock_order.orderIdFk = #{scanOrderId}) diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetailTemp.xml b/src/main/resources/mybatis/mapper/business/StockOrderDetailTemp.xml similarity index 84% rename from api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetailTemp.xml rename to src/main/resources/mybatis/mapper/business/StockOrderDetailTemp.xml index 84a529dd..c1a2e9e1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetailTemp.xml +++ b/src/main/resources/mybatis/mapper/business/StockOrderDetailTemp.xml @@ -1,10 +1,10 @@ - + - select * from stock_order_detail_temp @@ -26,7 +26,7 @@ ORDER BY id DESC - + replace INTO stock_order_detail_temp(id, orderIdFk,productId,productName,spec,batchNo,productDate, @@ -46,7 +46,7 @@ ) - + replace INTO stock_order_detail_temp(id, orderIdFk,productId,productName,spec,batchNo,productDate, expireDate,count,reCount,sweepCount) @@ -70,7 +70,7 @@ - + UPDATE stock_order_detail_temp batchNo=#{batchNo}, @@ -94,7 +94,7 @@ + resultType="com.glxp.api.entity.business.StockOrderRemakEntity"> select stock_order_remak.* from stock_order_remak WHERE orderIdFk = #{id} @@ -12,7 +12,7 @@ + parameterType="com.glxp.api.entity.business.StockOrderRemakEntity"> insert INTO stock_order_remak( orderIdFk,batchNo,price,relId ,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,remark) diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml b/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml similarity index 89% rename from api-admin/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml rename to src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml index 8defeb97..28672ef1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml +++ b/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml @@ -1,7 +1,7 @@ - - + + @@ -30,7 +30,7 @@ where id = #{id,jdbcType=INTEGER} + parameterType="com.glxp.api.entity.business.StockOrderUploadLogEntity" useGeneratedKeys="true"> insert into stock_order_upload_log (billNo, billDate, billType, thrBillNo, submitTime, `status`, @@ -40,7 +40,7 @@ #{result,jdbcType=VARCHAR},#{fromType}) + parameterType="com.glxp.api.entity.business.StockOrderUploadLogEntity" useGeneratedKeys="true"> insert into stock_order_upload_log @@ -99,7 +99,7 @@ + parameterType="com.glxp.api.entity.business.StockOrderUploadLogEntity"> update stock_order_upload_log @@ -131,7 +131,7 @@ where id = #{id,jdbcType=INTEGER} - + update stock_order_upload_log set billNo = #{billNo,jdbcType=VARCHAR}, @@ -146,8 +146,8 @@ + - + replace INTO stock_qrcode_text(id, orderId,detailId,text,textTag,status,param,create_time,update_time) @@ -37,7 +37,7 @@ ) - + replace INTO stock_qrcode_text(id, orderId,detailId,text,textTag,status,param,create_time,update_time) values @@ -58,7 +58,7 @@ - + UPDATE stock_qrcode_text orderId=#{orderId}, @@ -86,7 +86,7 @@ + + resultType="com.glxp.api.entity.info.CompanyEntity"> SELECT * FROM auth_company limit 1 - + UPDATE auth_company SET name = #{name}, category = #{category}, @@ -21,7 +21,7 @@ appSecret = #{appSecret} - + INSERT INTO auth_company(name,category,creditCode,addr,productAddr,classes,appId,appSecret) values ( #{name}, #{category}, diff --git a/api-admin/src/main/resources/mybatis/mapper/info/DbVersionDao.xml b/src/main/resources/mybatis/mapper/info/DbVersionDao.xml similarity index 90% rename from api-admin/src/main/resources/mybatis/mapper/info/DbVersionDao.xml rename to src/main/resources/mybatis/mapper/info/DbVersionDao.xml index 9a21fa58..d76dcda1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/DbVersionDao.xml +++ b/src/main/resources/mybatis/mapper/info/DbVersionDao.xml @@ -1,7 +1,7 @@ - + + - SELECT * FROM device_check @@ -28,7 +28,7 @@ - + UPDATE device_check @@ -47,7 +47,7 @@ - + UPDATE device_check @@ -65,7 +65,7 @@ WHERE imei=#{imei} - + replace INTO device_check( imei, isCheck, diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SyncDataBustypeDao.xml b/src/main/resources/mybatis/mapper/info/SyncDataBustypeDao.xml similarity index 72% rename from api-admin/src/main/resources/mybatis/mapper/info/SyncDataBustypeDao.xml rename to src/main/resources/mybatis/mapper/info/SyncDataBustypeDao.xml index 756df4bb..ba67ee0b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SyncDataBustypeDao.xml +++ b/src/main/resources/mybatis/mapper/info/SyncDataBustypeDao.xml @@ -1,11 +1,11 @@ - + @@ -16,7 +16,7 @@ FROM sync_data_bustypes - + insert INTO sync_data_bustypes ( `action`, `name`, outChange) values diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml b/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml similarity index 86% rename from api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml rename to src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml index 9602c3fa..197b1969 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml +++ b/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml @@ -1,17 +1,17 @@ - + - + replace INTO sync_data_set(id,typeBus, typeScan, typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataBustypeDao.xml b/src/main/resources/mybatis/mapper/info/SyncUploadDataBustypeDao.xml similarity index 71% rename from api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataBustypeDao.xml rename to src/main/resources/mybatis/mapper/info/SyncUploadDataBustypeDao.xml index e1f81bc2..5d3b2649 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataBustypeDao.xml +++ b/src/main/resources/mybatis/mapper/info/SyncUploadDataBustypeDao.xml @@ -1,11 +1,11 @@ - + @@ -16,7 +16,7 @@ FROM thr_order_upload_bustypes - + insert INTO thr_order_upload_bustypes ( `action`, `name`) values diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml b/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml similarity index 77% rename from api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml rename to src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml index faa32d08..9941dcf4 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml +++ b/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml @@ -1,17 +1,17 @@ - + - + replace INTO thr_order_upload(id,autoUpload, orderSyncTime,orderUnCheck,orderUnReceive, orderScanFinish, checkUdims, checkPdaEd, checkPdaUn, checkPc, diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SystemPDFModuleDao.xml b/src/main/resources/mybatis/mapper/info/SystemPDFModuleDao.xml similarity index 78% rename from api-admin/src/main/resources/mybatis/mapper/info/SystemPDFModuleDao.xml rename to src/main/resources/mybatis/mapper/info/SystemPDFModuleDao.xml index 91a23077..5749ee5e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SystemPDFModuleDao.xml +++ b/src/main/resources/mybatis/mapper/info/SystemPDFModuleDao.xml @@ -1,10 +1,10 @@ - + - SELECT id,name,param,fieldExplain,remark,templateId,create_time,update_time,templateDlUrl,templateType ,remark1,remark2,remark3 FROM system_pdf_module @@ -18,21 +18,21 @@ - SELECT * FROM system_pdf_module WHERE id = #{id} - + UPDATE system_pdf_module name=#{name}, @@ -53,7 +53,7 @@ WHERE id=#{id} - + insert INTO system_pdf_module( name, param, fieldExplain, remark, templateId, create_time, update_time , templateDlUrl, templateType , remark1, remark2, remark3) @@ -67,7 +67,7 @@ diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SystemPDFTemplateDao.xml b/src/main/resources/mybatis/mapper/info/SystemPDFTemplateDao.xml similarity index 77% rename from api-admin/src/main/resources/mybatis/mapper/info/SystemPDFTemplateDao.xml rename to src/main/resources/mybatis/mapper/info/SystemPDFTemplateDao.xml index 5973d371..4e790545 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SystemPDFTemplateDao.xml +++ b/src/main/resources/mybatis/mapper/info/SystemPDFTemplateDao.xml @@ -1,10 +1,10 @@ - + - SELECT id,name,type,module,param,path,rowCount,qrcodeCount,remark,create_time,update_time,jrxmlPath FROM system_pdf_template @@ -18,21 +18,21 @@ order by update_time desc - SELECT * FROM system_pdf_template WHERE id = #{id} - + UPDATE system_pdf_template name=#{name}, @@ -51,7 +51,7 @@ WHERE id=#{id} - + insert INTO system_pdf_template(name, type, module, param, path, rowCount, qrcodeCount, remark, create_time, update_time, jrxmlPath) @@ -68,7 +68,7 @@ diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SystemPDFTemplateRelevanceDao.xml b/src/main/resources/mybatis/mapper/info/SystemPDFTemplateRelevanceDao.xml similarity index 80% rename from api-admin/src/main/resources/mybatis/mapper/info/SystemPDFTemplateRelevanceDao.xml rename to src/main/resources/mybatis/mapper/info/SystemPDFTemplateRelevanceDao.xml index 9328630b..79754aaa 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SystemPDFTemplateRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/info/SystemPDFTemplateRelevanceDao.xml @@ -1,16 +1,16 @@ - + - SELECT templateId FROM system_pdf_template_relevance where customerId = #{customerId} - select basic_bustype_local.`name` localActionName,system_pdf_template_relevance.id, basic_bustype_local.action localAction, templateId, @@ -37,7 +37,7 @@ - SELECT * FROM system_pdf_template_relevance where customerId in @@ -46,7 +46,7 @@ - SELECT customerId FROM system_pdf_template_relevance where templateId = #{templateId} @@ -63,7 +63,7 @@ - + insert ignore INTO system_pdf_template_relevance @@ -80,7 +80,7 @@ #{printType} ) - + UPDATE system_pdf_template_relevance templateId = #{templateId}, diff --git a/api-admin/src/main/resources/mybatis/mapper/info/ThirdSysApiDao.xml b/src/main/resources/mybatis/mapper/info/ThirdSysApiDao.xml similarity index 61% rename from api-admin/src/main/resources/mybatis/mapper/info/ThirdSysApiDao.xml rename to src/main/resources/mybatis/mapper/info/ThirdSysApiDao.xml index 87441e18..02c44d7d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/ThirdSysApiDao.xml +++ b/src/main/resources/mybatis/mapper/info/ThirdSysApiDao.xml @@ -1,11 +1,11 @@ - + - SELECT * FROM sys_thirdsys_api @@ -14,7 +14,7 @@ - + UPDATE sys_thirdsys_api SET name = #{name}, apiUrl = #{apiUrl}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/src/main/resources/mybatis/mapper/inout/CodesDao.xml similarity index 89% rename from api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml rename to src/main/resources/mybatis/mapper/inout/CodesDao.xml index c9398987..ea87b17d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml +++ b/src/main/resources/mybatis/mapper/inout/CodesDao.xml @@ -1,17 +1,17 @@ - + - SELECT * FROM io_codes where `corpOrderId` = #{corpOrderId} - SELECT * FROM io_codes @@ -45,7 +45,7 @@ - + INSERT INTO io_codes(`action`, mainAction, code, corpOrderId, actor, actDate, fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo, `count`, reCount, packageLevel, warehouseCode, nameCode, supId, relId, status, @@ -98,23 +98,23 @@ - - SELECT * FROM io_codes WHERE `code` = #{code} AND 'action' ]]> 'StockCheck' - SELECT * FROM io_codes WHERE `orderId` = #{orderId} AND 'action' ]]> 'StockCheck' - SELECT * FROM io_codes WHERE nameCode = #{code} @@ -130,7 +130,7 @@ WHERE `orderId` = #{orderId} - select * from io_codes where corpOrderId = #{corpOrderId} @@ -202,7 +202,7 @@ + resultType="com.glxp.api.entity.inout.WarehouseEntity"> select * FROM io_codes_temp WHERE id = #{id} @@ -42,7 +42,7 @@ - + INSERT INTO io_codes_temp(`action`, mainAction, code, corpOrderId, actor, actDate, fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo, `count`, reCount, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId) @@ -66,7 +66,7 @@ + parameterType="com.glxp.api.entity.inout.WarehouseEntity"> insert ignore INTO io_codes_temp(`action`, mainAction, code, corpOrderId, actor, actDate, @@ -97,8 +97,8 @@ ) - SELECT io_codes_temp.*,basic_corp.name supName FROM io_codes_temp left join basic_corp on io_codes_temp.supId = basic_corp.erpId @@ -117,8 +117,8 @@ - SELECT * FROM io_codes_temp @@ -132,7 +132,7 @@ - + UPDATE io_codes_temp `count`=#{count}, @@ -153,7 +153,7 @@ - + UPDATE io_codes_temp `action`=#{action}, @@ -173,7 +173,7 @@ WHERE id=#{id} - + UPDATE io_codes_temp `action`=#{action}, @@ -204,7 +204,7 @@ - + DELETE FROM io_codes_temp WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/IOOrderStatusDao.xml b/src/main/resources/mybatis/mapper/inout/IOOrderStatusDao.xml similarity index 70% rename from api-admin/src/main/resources/mybatis/mapper/inout/IOOrderStatusDao.xml rename to src/main/resources/mybatis/mapper/inout/IOOrderStatusDao.xml index 721f6b45..c35e7f4d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/IOOrderStatusDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IOOrderStatusDao.xml @@ -1,10 +1,10 @@ - + - select * from io_order_status @@ -14,7 +14,7 @@ - + replace INTO io_order_status(orderId,status,updateTime) values( @@ -24,7 +24,7 @@ ) - + UPDATE io_order_status status=#{status}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/src/main/resources/mybatis/mapper/inout/OrderDao.xml similarity index 92% rename from api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml rename to src/main/resources/mybatis/mapper/inout/OrderDao.xml index e44d966d..8c588397 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -1,17 +1,17 @@ - + - SELECT * FROM io_order where status = 'success' - select * from io_order @@ -19,8 +19,8 @@ ORDER BY actDate DESC - select * from io_order @@ -28,7 +28,7 @@ ORDER BY actDate DESC - + insert INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction, fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId, @@ -60,7 +60,7 @@ #{codeFillCheck}, #{preInBillNo}, #{preOutBillNo}) - + insert ignore INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction, @@ -115,7 +115,7 @@ - + UPDATE io_order `action`=#{action}, @@ -175,7 +175,7 @@ WHERE id = #{orderId} - + UPDATE io_order SET fromCorpId = #{fromCorpId}, fromCorp = #{fromCorp} @@ -208,8 +208,8 @@ where id = #{orderId} - SELECT io_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bussiness_type.name billTypeName,auth_dept.name deptName FROM io_order @@ -304,8 +304,8 @@ - SELECT io_order.* , inv_warehouse.name as invName, inv_warehouse_sub.name as subInvName @@ -389,8 +389,8 @@ - SELECT io_order.* FROM io_order LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code` LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.code = io_order.invWarehouseCode @@ -470,8 +470,8 @@ ORDER BY actDate DESC - SELECT io_order.* FROM io_order LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code` LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.code = io_order.invWarehouseCode @@ -544,8 +544,8 @@ group by io_order.id - SELECT * FROM io_order @@ -573,8 +573,8 @@ limit 1 - SELECT * FROM io_order @@ -598,7 +598,7 @@ - select * from io_order where status = 4 and (id = #{billNo} or erpFk = #{billNo}) - select * from io_order where id in @@ -657,13 +657,13 @@ where id = #{orderId} - select id, supplementNo, originUllageSupNo, ullageSupNo, replicateNo, preInBillNo, preOutBillNo from io_order where id = #{id} - select io_order.*, auth_dept.name deptName from io_order left join auth_dept on io_order.deptCode = auth_dept.code diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml b/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml similarity index 88% rename from api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml rename to src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml index 4bb19cd6..50dd632c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml @@ -1,10 +1,10 @@ - + - select io_order_detail.* ,basic_corp.name supName from io_order_detail left join basic_corp on io_order_detail.supId = basic_corp.erpId @@ -25,7 +25,7 @@ - select * from io_order_detail @@ -48,8 +48,8 @@ - select * from io_order_detail @@ -66,7 +66,7 @@ - - select erpOrderId,orderIdFk from io_order_detail @@ -110,7 +110,7 @@ group by erpOrderId - + replace INTO io_order_detail(id, companyid,erpOrderId,iodtlId,inoutId,goodsunit,goodsid, @@ -161,7 +161,7 @@ ) - + replace INTO io_order_detail(id, companyid,erpOrderId,iodtlId,inoutId,goodsunit,goodsid,batchNoId,goodsname,companyname, batchNo,erpCount,credate,nameCode,productCompany, @@ -199,7 +199,7 @@ - + UPDATE io_order_detail goodsid=#{goodsid}, @@ -244,13 +244,13 @@ - select * from io_order_detail diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml similarity index 91% rename from api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml rename to src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml index 18559df6..9c3fe4f8 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml @@ -1,7 +1,7 @@ - - + + @@ -27,7 +27,7 @@ + parameterType="com.glxp.api.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true"> insert into inv_warehouse_bussiness_type (code, `action`, `name` ) @@ -35,7 +35,7 @@ ) + parameterType="com.glxp.api.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true"> insert into inv_warehouse_bussiness_type @@ -62,7 +62,7 @@ + parameterType="com.glxp.api.entity.inout.WarehouseBussinessTypeEntity"> update inv_warehouse_bussiness_type @@ -78,7 +78,7 @@ where id = #{id,jdbcType=INTEGER} - + update inv_warehouse_bussiness_type set code = #{code,jdbcType=VARCHAR}, @@ -153,7 +153,7 @@ + parameterType="com.glxp.api.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true"> insert into inv_warehouse_bussiness_type @@ -184,7 +184,7 @@ + parameterType="com.glxp.api.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true"> insert into inv_warehouse_bussiness_type @@ -244,8 +244,8 @@ - SELECT * FROM inv_warehouse_bussiness_type @@ -283,7 +283,7 @@ where code = #{code} - select * from inv_warehouse_bussiness_type where code = #{subInvCode} and action in #{item} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml similarity index 92% rename from api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml rename to src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml index 28ef981b..19b81841 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml +++ b/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml @@ -1,7 +1,7 @@ - - + + @@ -33,7 +33,7 @@ where userid = #{id} and code=#{code} + parameterType="com.glxp.api.entity.inout.WarehouseUserEntity" useGeneratedKeys="true"> insert into inv_warehouse_user (code, userId, userName, isDirector ) @@ -41,7 +41,7 @@ ) + parameterType="com.glxp.api.entity.inout.WarehouseUserEntity" useGeneratedKeys="true"> insert into inv_warehouse_user @@ -69,7 +69,7 @@ #{isDirector} - + update inv_warehouse_user @@ -86,7 +86,7 @@ isDirector = #{isDirector} where id = #{id,jdbcType=INTEGER} - + update inv_warehouse_user set code = #{code,jdbcType=VARCHAR}, @@ -163,7 +163,7 @@ + parameterType="com.glxp.api.entity.inout.WarehouseUserEntity" useGeneratedKeys="true"> insert into inv_warehouse_user @@ -196,7 +196,7 @@ + parameterType="com.glxp.api.entity.inout.WarehouseUserEntity" useGeneratedKeys="true"> insert into inv_warehouse_user @@ -253,8 +253,8 @@ - SELECT * FROM inv_warehouse_user diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml b/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml similarity index 91% rename from api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml rename to src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml index 1e34dfdc..d9c9b502 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml @@ -1,7 +1,7 @@ - - + + @@ -39,7 +39,7 @@ + parameterType="com.glxp.api.entity.inventory.DeviceCollectOrderEntity" useGeneratedKeys="true"> insert into device_collect_order (orderId, deptCode, `createUser`, auditUser, createTime, updateTime, `status`, collectUser) @@ -49,7 +49,7 @@ + parameterType="com.glxp.api.entity.inventory.DeviceCollectOrderEntity" useGeneratedKeys="true"> insert into device_collect_order @@ -106,7 +106,7 @@ + parameterType="com.glxp.api.entity.inventory.DeviceCollectOrderEntity"> update device_collect_order @@ -137,7 +137,7 @@ where id = #{id,jdbcType=INTEGER} - + update device_collect_order set orderId = #{orderId,jdbcType=VARCHAR}, deptCode = #{deptCode,jdbcType=VARCHAR}, @@ -150,7 +150,7 @@ where id = #{id,jdbcType=INTEGER} - select dco.id, dco.orderId, dco.deptCode, @@ -174,6 +174,7 @@ AND dco.deptCode = #{deptCode} + order by dco.updateTime desc - select dcod.id, dcod.orderIdFk, dcod.originCode, @@ -335,7 +335,7 @@ - select dcod.id, dcod.orderIdFk, dcod.originCode, @@ -381,6 +381,8 @@ AND dco.deptCode = #{deptCode} + + AND dco.status = #{status} group by dcod.code @@ -395,4 +397,24 @@ limit 1 + + + + update device_collect_order_detail + + + code = #{item.code} + + + where id = #{item.id} + + + + + update device_collect_order_detail + set code = null, + serialNo = null + where orderIdFk = #{orderId} + and code like '%#' + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml b/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml similarity index 85% rename from api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml rename to src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml index 4d402246..d6b0fb2e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml @@ -1,7 +1,7 @@ - - + + @@ -39,7 +39,7 @@ + parameterType="com.glxp.api.entity.inventory.DeviceMAOrderEntity" useGeneratedKeys="true"> insert into device_ma_order (orderId, collOrderId, createTime, updateTime, `createUser`, auditUser, remark, `status`) @@ -49,7 +49,7 @@ + parameterType="com.glxp.api.entity.inventory.DeviceMAOrderEntity" useGeneratedKeys="true"> insert into device_ma_order @@ -105,7 +105,7 @@ - + update device_ma_order @@ -136,7 +136,7 @@ where id = #{id,jdbcType=INTEGER} - + update device_ma_order set orderId = #{orderId,jdbcType=VARCHAR}, collOrderId = #{collOrderId,jdbcType=VARCHAR}, @@ -149,19 +149,22 @@ where id = #{id,jdbcType=INTEGER} - + select dmo.*, dmod.code + from device_ma_order dmo + left join device_ma_order_detail dmod on dmo.orderId = dmod.orderIdFk - AND orderId like concat('%', #{orderId}, '%') + AND dmo.orderId like concat('%', #{orderId}, '%') - AND status = #{status} + AND dmo.status = #{status} - AND collOrderId like concat('%', #{collOrderId}, '%') + AND dmo.collOrderId like concat('%', #{collOrderId}, '%') + + + AND dmod.code like concat('%', #{code}, '%') diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml similarity index 92% rename from api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml rename to src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml index 233b10ed..3c01854a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml @@ -1,7 +1,7 @@ - - + + @@ -51,7 +51,7 @@ + parameterType="com.glxp.api.entity.inventory.DeviceMAOrderDetailEntity" useGeneratedKeys="true"> insert into device_ma_order_detail (orderIdFk, code, productId, batchNo, produceDate, expireDate, serialNo, createTime, updateTime, @@ -65,7 +65,7 @@ + parameterType="com.glxp.api.entity.inventory.DeviceMAOrderDetailEntity" useGeneratedKeys="true"> insert into device_ma_order_detail @@ -158,7 +158,7 @@ + parameterType="com.glxp.api.entity.inventory.DeviceMAOrderDetailEntity"> update device_ma_order_detail @@ -207,7 +207,7 @@ where id = #{id,jdbcType=INTEGER} - + update device_ma_order_detail set orderIdFk = #{orderIdFk,jdbcType=VARCHAR}, code = #{code,jdbcType=VARCHAR}, @@ -226,7 +226,7 @@ where id = #{id,jdbcType=INTEGER} - select dmod.id, dmod.orderIdFk, dmod.code, @@ -267,7 +267,7 @@ from device_ma_order_detail where orderIdFk = #{orderId} - select ip.productsName productName, ip.ggxh, ip.batchNo, @@ -278,6 +278,7 @@ from inv_product ip left join basic_udirel bu on bu.id = ip.relIdFk left join basic_products bp on bu.uuid = bp.uuid - where bu.id = #{productId} + where ip.relIdFk = #{productId} + group by ip.relIdFk \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml b/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml similarity index 79% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml rename to src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml index 585fe0e6..68f754c9 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM inv_incode_log @@ -24,7 +24,7 @@ - + insert INTO inv_incode_log (genKey,fromType,updateTime,thirdSysFk,status) values @@ -41,7 +41,7 @@ DELETE FROM inv_incode_log WHERE id = #{id} - + UPDATE inv_incode_log genKey=#{genKey}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml b/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml similarity index 83% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml rename to src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml index bcf1da8b..f32bb6f3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml @@ -1,10 +1,10 @@ - + - select inv_inner_order.*,cb.employeeName createByName from inv_inner_order INNER JOIN auth_user cb on inv_inner_order.createBy = cb.id @@ -20,7 +20,7 @@ + parameterType="com.glxp.api.entity.inventory.InnerOrderEntity" useGeneratedKeys="true"> replace INTO inv_inner_order ( @@ -53,7 +53,7 @@ WHERE id = #{id} - + UPDATE inv_inner_order recordKey=#{recordKey}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inventory/InnerOrderDetailDao.xml similarity index 83% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDetailDao.xml rename to src/main/resources/mybatis/mapper/inventory/InnerOrderDetailDao.xml index 9f09abc8..e858601f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InnerOrderDetailDao.xml @@ -1,11 +1,11 @@ - + - select inv_inner_order_detail.*, basic_products.ggxh spec,basic_udirel.measname,basic_udirel.manufactory @@ -24,7 +24,7 @@ + parameterType="com.glxp.api.entity.inventory.InnerOrderDetailEntity"> replace INTO inv_inner_order_detail ( @@ -63,7 +63,7 @@ - + UPDATE inv_inner_order_detail orderIdFk=#{orderIdFk}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml b/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml similarity index 80% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml index 7f8f57e9..b48ca2e3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml @@ -1,10 +1,10 @@ - + - select * FROM inv_bustype_user @@ -22,8 +22,8 @@ - select inv_bustype_user.*,basic_bussiness_type.name billTypeName FROM inv_bustype_user left join basic_bussiness_type on inv_bustype_user.scAction = basic_bussiness_type.action @@ -44,7 +44,7 @@ + parameterType="com.glxp.api.entity.inventory.InvBusUserEntity"> replace INTO inv_bustype_user (userId, `subInvCode`, scAction, remark) @@ -69,7 +69,7 @@ WHERE subInvCode = #{subInvCode} and userId = #{userId} - + UPDATE inv_bustype_user userId=#{userId}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountCodesDao.xml b/src/main/resources/mybatis/mapper/inventory/InvCountCodesDao.xml similarity index 95% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvCountCodesDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvCountCodesDao.xml index de03cf00..e4a932cd 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountCodesDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvCountCodesDao.xml @@ -1,7 +1,7 @@ - - + + @@ -35,7 +35,7 @@ + parameterType="com.glxp.api.entity.inventory.InvCountCodes" useGeneratedKeys="true"> insert into inv_count_codes (orderIdFk, productId, code, `status`, batchNo, count) values (#{orderIdFk,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, @@ -43,7 +43,7 @@ + parameterType="com.glxp.api.entity.inventory.InvCountCodes" useGeneratedKeys="true"> insert into inv_count_codes @@ -87,7 +87,7 @@ - + update inv_count_codes @@ -112,7 +112,7 @@ where id = #{id,jdbcType=INTEGER} - + update inv_count_codes set orderIdFk = #{orderIdFk,jdbcType=VARCHAR}, productId = #{productId,jdbcType=VARCHAR}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml b/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml similarity index 97% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml index 4534ecb5..ce7c20ca 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml @@ -1,7 +1,7 @@ - - + + @@ -50,7 +50,7 @@ where id = #{id,jdbcType=INTEGER} - insert into inv_count_order (orderId, invStorageCode, invWarehouseCode, invSpaceCode, `createUser`, @@ -63,7 +63,7 @@ #{inOrderIds,jdbcType=VARCHAR}, #{outOrderIds,jdbcType=VARCHAR}, #{countType,jdbcType=TINYINT}) - + insert into inv_count_order @@ -161,7 +161,7 @@ - + update inv_count_order @@ -210,7 +210,7 @@ where id = #{id,jdbcType=INTEGER} - + update inv_count_order set orderId = #{orderId,jdbcType=VARCHAR}, invStorageCode = #{invStorageCode,jdbcType=VARCHAR}, @@ -325,7 +325,7 @@ - select co.id, co.orderId, co.invStorageCode, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inventory/InvCountOrderDetailDao.xml similarity index 96% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDetailDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvCountOrderDetailDao.xml index 96e0168d..73ee4900 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvCountOrderDetailDao.xml @@ -1,7 +1,7 @@ - - + + @@ -47,7 +47,7 @@ + parameterType="com.glxp.api.entity.inventory.InvCountOrderDetail" useGeneratedKeys="true"> insert into inv_count_order_detail (orderIdFk, productId, nameCode, batchNo, produceDate, expireDate, serialNo, countNum, invNum, profitNum, @@ -60,7 +60,7 @@ + parameterType="com.glxp.api.entity.inventory.InvCountOrderDetail" useGeneratedKeys="true"> insert into inv_count_order_detail @@ -140,7 +140,7 @@ - + update inv_count_order_detail @@ -183,7 +183,7 @@ where id = #{id,jdbcType=INTEGER} - + update inv_count_order_detail set orderIdFk = #{orderIdFk,jdbcType=VARCHAR}, productId = #{productId,jdbcType=VARCHAR}, @@ -303,7 +303,7 @@ where orderIdFk = #{orderIdFk} - select od.*, ip.productsName productName, ip.ggxh, ip.ylqxzcrbarmc, ip.zczbhhzbapzbh from inv_count_order_detail od left join inv_count_order ico on od.orderIdFk = ico.orderId diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountSettingDao.xml b/src/main/resources/mybatis/mapper/inventory/InvCountSettingDao.xml similarity index 91% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvCountSettingDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvCountSettingDao.xml index 63557ee0..c445408d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountSettingDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvCountSettingDao.xml @@ -1,7 +1,7 @@ - - + + @@ -26,13 +26,13 @@ where id = #{id,jdbcType=INTEGER} - insert into inv_count_setting (inAction, outAction) values (#{inAction,jdbcType=VARCHAR}, #{outAction,jdbcType=VARCHAR}) - insert into inv_count_setting @@ -53,7 +53,7 @@ - + update inv_count_setting @@ -66,7 +66,7 @@ where id = #{id,jdbcType=INTEGER} - + update inv_count_setting set inAction = #{inAction,jdbcType=VARCHAR}, outAction = #{outAction,jdbcType=VARCHAR} diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceExplanationDao.xml b/src/main/resources/mybatis/mapper/inventory/InvMaintenanceExplanationDao.xml similarity index 56% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceExplanationDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvMaintenanceExplanationDao.xml index 0e8b4b55..acad69a0 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceExplanationDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvMaintenanceExplanationDao.xml @@ -1,7 +1,7 @@ - - select * from inv_maintenance_explanation where status = #{status} diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml b/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml similarity index 92% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml index 17324435..c7d4f8ab 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml @@ -1,7 +1,7 @@ - - + + @@ -43,7 +43,7 @@ + parameterType="com.glxp.api.entity.inventory.InvMaintenanceOrderEntity" useGeneratedKeys="true"> insert into inv_maintenance_order (orderId, invWarehouseCode, invSpaceCode, `status`, createTime, updateTime, auditTime, `createUser`, auditUser, @@ -55,7 +55,7 @@ + parameterType="com.glxp.api.entity.inventory.InvMaintenanceOrderEntity" useGeneratedKeys="true"> insert into inv_maintenance_order @@ -124,7 +124,7 @@ + parameterType="com.glxp.api.entity.inventory.InvMaintenanceOrderEntity"> update inv_maintenance_order @@ -161,7 +161,7 @@ where id = #{id,jdbcType=INTEGER} - + update inv_maintenance_order set orderId = #{orderId,jdbcType=VARCHAR}, invWarehouseCode = #{invWarehouseCode,jdbcType=VARCHAR}, @@ -176,7 +176,7 @@ where id = #{id,jdbcType=INTEGER} - select ma.id, ma.orderId, ma.invWarehouseCode, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml similarity index 94% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml index b6b8e780..b5daf465 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml @@ -1,7 +1,7 @@ - - + + @@ -49,7 +49,7 @@ + parameterType="com.glxp.api.entity.inventory.InvMaintenanceOrderDetailEntity" useGeneratedKeys="true"> insert into inv_maintenance_order_detail (orderIdFk, code, productId, nameCode, batchNo, produceDate, expireDate, `count`, maintenanceStatus, @@ -62,7 +62,7 @@ + parameterType="com.glxp.api.entity.inventory.InvMaintenanceOrderDetailEntity" useGeneratedKeys="true"> insert into inv_maintenance_order_detail @@ -149,7 +149,7 @@ + parameterType="com.glxp.api.entity.inventory.InvMaintenanceOrderDetailEntity"> update inv_maintenance_order_detail @@ -195,7 +195,7 @@ where id = #{id,jdbcType=INTEGER} - + update inv_maintenance_order_detail set orderIdFk = #{orderIdFk,jdbcType=VARCHAR}, code = #{code,jdbcType=VARCHAR}, @@ -225,7 +225,7 @@ where orderIdFk = #{orderId} - SELECT mad.id, mad.orderIdFk, mad.CODE, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml b/src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml similarity index 82% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml index 72465ad7..b1c79c56 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM inv_stockcheck @@ -30,7 +30,7 @@ - + insert INTO inv_stockcheck ( action,actDate,status,remark,endTime,whouse,houseCard @@ -49,7 +49,7 @@ DELETE FROM inv_stockcheck WHERE id = #{id} - + UPDATE inv_stockcheck action=#{action}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml similarity index 93% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml index 93aad7ac..67475660 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM inv_prein_product @@ -65,7 +65,7 @@ + resultType="com.glxp.api.entity.inventory.InvProductEntity"> SELECT * FROM inv_prein_product @@ -105,7 +105,7 @@ - SELECT inv_prein_product.id, basic_products.cpmctymc,basic_products.nameCode,inv_prein_product.relIdFk,basic_products.ggxh, @@ -204,7 +204,7 @@ order by inv_prein_product.updateTime desc + parameterType="com.glxp.api.entity.inventory.InvProductEntity"> insert INTO inv_prein_product (productsName, nameCode, relIdFk, ggxh, batchNo, productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, @@ -237,7 +237,7 @@ FROM inv_prein_product - + UPDATE inv_prein_product productsName=#{productsName}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml b/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml similarity index 92% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml index be263ac9..95e50a17 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM inv_prein_product_detail @@ -59,7 +59,7 @@ - - SELECT inv_prein_product_detail.* ,io_order.fromCorp,io_order.fromCorpId FROM inv_prein_product_detail inner join io_order on inv_prein_product_detail.orderIdFk = io_order.id @@ -164,7 +164,7 @@ + parameterType="com.glxp.api.entity.inventory.InvProductDetailEntity"> insert INTO inv_prein_product_detail (code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime, purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode @@ -178,7 +178,7 @@ + parameterType="com.glxp.api.entity.inventory.InvProductDetailEntity"> insert INTO inv_prein_product_detail (code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime, purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode @@ -206,7 +206,7 @@ WHERE id = #{id} - + DELETE FROM inv_prein_product_detail @@ -234,7 +234,7 @@ where orderIdFk = #{orderIdFk} - + UPDATE inv_prein_product_detail code=#{code}, @@ -256,7 +256,7 @@ WHERE id = #{id} - + - SELECT inv_pre_product.id, basic_products.cpmctymc,basic_products.nameCode,inv_pre_product.relIdFk,basic_products.ggxh, @@ -196,7 +196,7 @@ order by inv_pre_product.updateTime desc + parameterType="com.glxp.api.entity.inventory.InvProductEntity"> insert INTO inv_pre_product (productsName, nameCode, relIdFk, ggxh, batchNo, productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, @@ -216,7 +216,7 @@ WHERE id = #{id} - + UPDATE inv_pre_product productsName=#{productsName}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml b/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml similarity index 91% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml index b0477125..ec0af89c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM inv_pre_product_detail @@ -54,8 +54,8 @@ - SELECT inv_pre_product_detail.* ,io_order.fromCorp,io_order.fromCorpId FROM inv_pre_product_detail inner join io_order on inv_pre_product_detail.orderIdFk = io_order.id @@ -109,7 +109,7 @@ + parameterType="com.glxp.api.entity.inventory.InvProductDetailEntity"> insert INTO inv_pre_product_detail (code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime, purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode @@ -123,7 +123,7 @@ + parameterType="com.glxp.api.entity.inventory.InvProductDetailEntity"> insert INTO inv_pre_product_detail (code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime, purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode @@ -151,7 +151,7 @@ WHERE id = #{id} - + DELETE FROM inv_pre_product_detail @@ -174,7 +174,7 @@ - + UPDATE inv_pre_product_detail code=#{code}, @@ -196,7 +196,7 @@ WHERE id = #{id} - + + + resultType="com.glxp.api.entity.inventory.InvProductEntity"> SELECT * FROM inv_product @@ -110,8 +110,8 @@ limit 1 - SELECT inv_product.id, basic_products.cpmctymc, basic_products.nameCode, @@ -204,8 +204,8 @@ order by inv_product.updateTime desc - select bp.cpmctymc, bp.nameCode, ip.relIdFk, @@ -264,7 +264,7 @@ + parameterType="com.glxp.api.entity.inventory.InvProductEntity"> insert INTO inv_product (productsName, nameCode, relIdFk, ggxh, batchNo, productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, @@ -284,7 +284,7 @@ WHERE id = #{id} - + UPDATE inv_product @@ -361,7 +361,7 @@ - select * from inv_product @@ -380,7 +380,7 @@ - select inv_product_detail.id, inv_product.relIdFk, inv_product.nameCode, @@ -421,7 +421,7 @@ - select ip.id, bp.nameCode, bp.cpmctymc, ip.ggxh, ip.batchNo, ip.productionDate, ip.expireDate from inv_product ip left join inv_product_detail ipd diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml b/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml similarity index 93% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml index 933c1db1..7bf40520 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml @@ -1,9 +1,9 @@ - - SELECT * FROM inv_product_detail @@ -68,8 +68,8 @@ - SELECT inv_product_detail.*, io_order.fromCorp, io_order.fromCorpId FROM inv_product_detail inner join io_order on inv_product_detail.orderIdFk = io_order.id @@ -125,7 +125,7 @@ + parameterType="com.glxp.api.entity.inventory.InvProductDetailEntity"> insert INTO inv_product_detail (code, productIdFk, orderIdFk, customerId, mainAction, `action`, `count`, updateTime, purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode, @@ -140,7 +140,7 @@ + parameterType="com.glxp.api.entity.inventory.InvProductDetailEntity"> insert INTO inv_product_detail (code, productIdFk, orderIdFk, customerId, mainAction, `action`, `count`, updateTime, purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode, @@ -165,7 +165,7 @@ FROM inv_product_detail WHERE id = #{id} - + DELETE FROM inv_product_detail @@ -187,7 +187,7 @@ - + UPDATE inv_product_detail @@ -244,7 +244,7 @@ WHERE id = #{id} - - SELECT * FROM inv_product_detail @@ -341,7 +341,7 @@ and code = #{code} - select pd.id, pd.code, pd.productIdFk, @@ -398,7 +398,7 @@ - select * from inv_product_detail where invStorageCode = #{invStorageCode} diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml b/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml similarity index 92% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml index 2f164f63..6c9a6cbf 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM inv_stockprint @@ -45,8 +45,8 @@ - SELECT inv_stockprint.id, inv_stockprint.udiCode,inv_stockprint.nameCode,inv_stockprint.batchNo,inv_stockprint.produceDate, @@ -98,14 +98,14 @@ - SELECT * FROM inv_stockprint WHERE udiRlIdFk = #{udiRlIdFk} @@ -114,7 +114,7 @@ and spaceCode = #{spaceCode} and genKeyFk = #{genKeyFk}limit 1 - + replace INTO inv_stockprint ( @@ -203,7 +203,7 @@ WHERE sOrderId = #{sOrderId} - + UPDATE inv_stockprint udiCode=#{udiCode}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml b/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml similarity index 86% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml index 891c93ea..c18c5963 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml @@ -1,10 +1,10 @@ - + - select * FROM inv_warehouse_sub a @@ -29,7 +29,7 @@ - select inv_warehouse_sub.*, inv_warehouse.`name` AS warehouseName from inv_warehouse_sub INNER JOIN inv_warehouse on inv_warehouse_sub.parentId = inv_warehouse.code @@ -84,8 +84,8 @@ group by inv_warehouse_sub.id - select inv_warehouse_sub.* from inv_warehouse_sub @@ -96,8 +96,8 @@ - select max(code) as code from inv_warehouse_sub @@ -118,7 +118,7 @@ + parameterType="com.glxp.api.entity.inventory.InvSubWarehouseEntity"> replace INTO inv_warehouse_sub (id, code, `name`, parentId, remark,defaultInv) @@ -146,7 +146,7 @@ WHERE parentId = #{code} - + UPDATE inv_warehouse_sub name=#{name}, @@ -192,7 +192,7 @@ - select inv_warehouse_sub.*, inv_warehouse.`name` AS warehouseName from inv_warehouse_sub INNER JOIN inv_warehouse on inv_warehouse_sub.parentId = inv_warehouse.code @@ -231,7 +231,7 @@ - select a.id, a.code, a.name, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml similarity index 88% rename from api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml rename to src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml index 70d0b9ad..dda6c6f6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml @@ -1,10 +1,10 @@ - + - select * ,(select name from inv_warehouse WHERE a.pcode = code) pName FROM inv_warehouse a @@ -43,8 +43,8 @@ - select inv_warehouse.* from inv_warehouse INNER JOIN inv_warehouse_sub on inv_warehouse.`code` =inv_warehouse_sub.parentId INNER JOIN inv_warehouse_user on inv_warehouse_user.`code` = inv_warehouse_sub.code @@ -87,15 +87,15 @@ - select max(code) as code from inv_warehouse @@ -127,8 +127,8 @@ - SELECT * FROM inv_warehouse @@ -173,7 +173,7 @@ where code = #{fromCorpId} + parameterType="com.glxp.api.entity.inventory.InvWarehouseEntity"> replace INTO inv_warehouse (pid, code, `name`, advanceType, isDefault, @@ -205,7 +205,7 @@ WHERE id = #{id} - + UPDATE inv_warehouse pid=#{pid}, @@ -261,13 +261,13 @@ - select * from inv_warehouse where ${thirdIdSys} = #{thirdId} - select * from inv_warehouse where code = #{code} diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/StockPrintTempDao.xml b/src/main/resources/mybatis/mapper/inventory/StockPrintTempDao.xml similarity index 81% rename from api-admin/src/main/resources/mybatis/mapper/inventory/StockPrintTempDao.xml rename to src/main/resources/mybatis/mapper/inventory/StockPrintTempDao.xml index 41bf7763..26846653 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/StockPrintTempDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/StockPrintTempDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM inv_stockprint_pdf_temp @@ -22,7 +22,7 @@ + parameterType="com.glxp.api.entity.inventory.StockPrintTempEntity"> insert INTO inv_stockprint_pdf_temp (fileName, filePath, status, printCodeIdFk, stockOrderFk, genKey) values (#{fileName}, @@ -32,7 +32,7 @@ - + DELETE FROM inv_stockprint_pdf_temp @@ -48,7 +48,7 @@ - + UPDATE inv_stockprint_pdf_temp fileName=#{fileName}, diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/CompanySalesmanDao.xml b/src/main/resources/mybatis/mapper/purchase/CompanySalesmanDao.xml similarity index 83% rename from api-admin/src/main/resources/mybatis/mapper/purchase/CompanySalesmanDao.xml rename to src/main/resources/mybatis/mapper/purchase/CompanySalesmanDao.xml index bd0e4ad0..c02c488a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/CompanySalesmanDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/CompanySalesmanDao.xml @@ -1,10 +1,10 @@ - + - select * from company_salesman @@ -21,17 +21,17 @@ - SELECT * FROM company_salesman @@ -44,7 +44,7 @@ - + UPDATE company_salesman customerId=#{customerId}, @@ -63,7 +63,7 @@ WHERE id = #{id} - + INSERT INTO company_salesman(customerId,name,tel,phone,email,certType,certCode,filePath,filePath2,create_time,update_time, auditStatus) values ( diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/CompanyUpdateLogDao.xml b/src/main/resources/mybatis/mapper/purchase/CompanyUpdateLogDao.xml similarity index 84% rename from api-admin/src/main/resources/mybatis/mapper/purchase/CompanyUpdateLogDao.xml rename to src/main/resources/mybatis/mapper/purchase/CompanyUpdateLogDao.xml index c1c5a1d0..e1eb5570 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/CompanyUpdateLogDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/CompanyUpdateLogDao.xml @@ -1,10 +1,10 @@ - + - select * from company_update_log @@ -27,17 +27,17 @@ - SELECT * FROM company_update_log @@ -56,7 +56,7 @@ - + UPDATE company_update_log customerId=#{customerId}, @@ -73,7 +73,7 @@ WHERE id = #{id} - + INSERT INTO company_update_log(customerId,updateCause,status,create_time,update_time, submit,auditor,noPassCause,param,logType) values ( diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml b/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml similarity index 73% rename from api-admin/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml rename to src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml index c38a309a..d2c3c0d3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM customer_contact @@ -16,7 +16,7 @@ + parameterType="com.glxp.api.entity.purchase.CustomerContactEntity"> INSERT INTO customer_contact (customerId, contacts, mobile, tel, email, @@ -26,7 +26,7 @@ #{comments}) - + UPDATE customer_contact contacts=#{contacts}, @@ -38,12 +38,12 @@ WHERE customerId=#{customerId} - + delete from customer_contact where customerId = #{customerId} - + delete from customer_contact where customerId = #{customerId} @@ -51,7 +51,7 @@ + + parameterType="com.glxp.api.entity.purchase.PurApplyEntity" useGeneratedKeys="true"> replace INTO pur_apply ( @@ -99,7 +99,7 @@ WHERE id = #{id} - + UPDATE pur_apply billNo=#{billNo}, diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml similarity index 81% rename from api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml rename to src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index 45c0910f..982d5b1b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -1,10 +1,10 @@ - + - select * FROM pur_apply_detail @@ -21,8 +21,8 @@ - select pur_apply_detail.*, basic_products.ggxh spec,basic_udirel.measname,basic_udirel.manufactory,basic_products.ylqxzcrbarmc,basic_corp.`name` supName @@ -40,12 +40,13 @@ AND supId = #{supId} + GROUP BY productId + parameterType="com.glxp.api.entity.purchase.PurApplyDetailEntity"> replace INTO pur_apply_detail ( @@ -82,7 +83,7 @@ - + UPDATE pur_apply_detail orderIdFk=#{orderIdFk}, diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml similarity index 91% rename from api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml rename to src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml index b46da8b4..87a9df33 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml @@ -1,10 +1,10 @@ - + - select pur_plan.* , cb.employeeName createByName,ab.employeeName auditByName, @@ -53,7 +53,7 @@ + parameterType="com.glxp.api.entity.purchase.PurPlanEntity" useGeneratedKeys="true"> replace INTO pur_plan ( @@ -99,7 +99,7 @@ WHERE id = #{id} - + UPDATE pur_plan billNo=#{billNo}, diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml similarity index 82% rename from api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml rename to src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml index 239c874e..23ad9daf 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml @@ -1,10 +1,10 @@ - + - select * FROM pur_plan_detail @@ -21,8 +21,8 @@ - select pur_plan_detail.*, basic_products.ggxh spec,basic_udirel.measname,basic_udirel.manufactory,basic_products.ylqxzcrbarmc @@ -48,7 +48,7 @@ + parameterType="com.glxp.api.entity.purchase.PurPlanDetailEntity"> replace INTO pur_plan_detail ( @@ -84,7 +84,7 @@ WHERE orderIdFk = #{orderIdFk} - + UPDATE pur_plan_detail orderIdFk=#{orderIdFk}, diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml similarity index 86% rename from api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml rename to src/main/resources/mybatis/mapper/purchase/SupCertDao.xml index 6b8253c7..ba0a1a04 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml @@ -1,10 +1,10 @@ - + - select * from sup_cert @@ -38,14 +38,14 @@ - SELECT * FROM sup_cert @@ -62,7 +62,7 @@ - + UPDATE sup_cert name=#{name}, @@ -116,7 +116,7 @@ - + INSERT INTO sup_cert( `name`, customerId, filePath, remark, createTime, updateTime , vailDate, expireDate, `type`, manufacturerIdFk, productIdFk, code, auditStatus , auditComment, status) @@ -138,7 +138,7 @@ - + DELETE FROM sup_cert diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml similarity index 82% rename from api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml rename to src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml index 2a6c88c9..16827435 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml @@ -1,10 +1,10 @@ - + - select * from sup_cert_set @@ -31,7 +31,7 @@ - + UPDATE sup_cert_set name=#{name}, @@ -49,7 +49,7 @@ - + INSERT INTO sup_cert_set(`name`, `need`, `foreign`, remark, cplx, updateTime, hchzsb, flbm, imports, `type`) values (#{name}, #{need}, diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml similarity index 86% rename from api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml rename to src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml index fa1b2bd1..b20dd41d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml @@ -1,19 +1,19 @@ - + - SELECT * FROM sup_company @@ -49,22 +49,22 @@ - + delete from sup_company where customerId = #{customerId} - SELECT * FROM sup_company @@ -90,8 +90,8 @@ - SELECT * FROM (company inner JOIN company_product_relevance @@ -121,7 +121,7 @@ - + UPDATE sup_company @@ -152,7 +152,7 @@ - + replace INTO sup_company(companyName, bussinessStatus, creditNum, classes, area, detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode, auditStatus, unitIdFk, createTime, createBy, updateTime, auditTime, auditComment, diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml b/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml similarity index 90% rename from api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml rename to src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml index 777e09ac..531467d0 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml @@ -1,24 +1,24 @@ - + - SELECT sup_manufacturer.* ,sup_company.companyName as supName FROM sup_manufacturer inner join sup_company on sup_manufacturer.customerId = sup_company.customerId @@ -65,7 +65,7 @@ - + UPDATE sup_manufacturer @@ -101,7 +101,7 @@ - + replace INTO sup_manufacturer(companyName, creditCode, companyType, placeArea, placeAreaCode, placeAddress, legalPersonName, legalPersonPapersType, legalPersonPapersCode, @@ -126,8 +126,8 @@ WHERE id = #{id} - SELECT sup_manufacturer.* ,sup_company.companyName as supName FROM sup_manufacturer inner join sup_company on sup_manufacturer.customerId = sup_company.customerId diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml similarity index 93% rename from api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml rename to src/main/resources/mybatis/mapper/purchase/SupProductDao.xml index 2fff3f02..133d9bbb 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml @@ -1,24 +1,24 @@ - + - SELECT sup_product.* FROM sup_product @@ -65,8 +65,8 @@ - SELECT sup_product.* ,sup_company.companyName supName,sup_manufacturer.companyName manufacturerName FROM sup_product inner join sup_company @@ -118,7 +118,7 @@ - + UPDATE sup_product @@ -169,7 +169,7 @@ - + replace INTO sup_product(enterpriseId, recordCode, recordProductName, productManageType, recordPeopleName, recordPeopleArea, diff --git a/api-admin/src/main/resources/mybatis/mapper/schedule/ScheduleDao.xml b/src/main/resources/mybatis/mapper/schedule/ScheduleDao.xml similarity index 72% rename from api-admin/src/main/resources/mybatis/mapper/schedule/ScheduleDao.xml rename to src/main/resources/mybatis/mapper/schedule/ScheduleDao.xml index e55ebfc1..0b5e0b03 100644 --- a/api-admin/src/main/resources/mybatis/mapper/schedule/ScheduleDao.xml +++ b/src/main/resources/mybatis/mapper/schedule/ScheduleDao.xml @@ -1,11 +1,11 @@ - + + parameterType="com.glxp.api.entity.info.ScheduledEntity"> insert INTO sys_scheduled (cronName, cron, customerId) values (#{cronName}, @@ -13,7 +13,7 @@ #{customerId}) - + UPDATE sys_scheduled cron=#{cron}, @@ -27,8 +27,8 @@ - select * from sys_scheduled diff --git a/api-admin/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml similarity index 57% rename from api-admin/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml rename to src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml index 092380ca..6e6fd840 100644 --- a/api-admin/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml +++ b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml @@ -1,52 +1,46 @@ - + - SELECT * FROM sys_param_config AND `paramStatus` = #{paramStatus} - AND `paramName` LIKE CONCAT('%',#{paramName},'%') + AND `paramName` LIKE CONCAT(#{paramName},'%') and paramType = #{paramType} - - and (`paramName` like CONCAT('%',#{key},'%') or `paramType` like CONCAT('%',#{key},'%')) - - order BY id - SELECT * FROM sys_param_config WHERE id = #{id} - + SELECT * FROM sys_param_config WHERE paramName=#{paramName} - SELECT * FROM sys_param_config WHERE paramKey = #{paramKey} - + UPDATE sys_param_config paramName=#{paramName}, @@ -59,7 +53,7 @@ WHERE id=#{id} - + UPDATE sys_param_config paramStatus=#{paramStatus}, @@ -67,7 +61,7 @@ WHERE parentId=#{parentId} - + insert INTO sys_param_config(paramName, paramKey, paramValue, paramStatus, paramType, paramExplain) values (#{paramName}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml similarity index 87% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml index ee53728d..58204431 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_corp @@ -24,7 +24,7 @@ - + replace INTO thr_corp ( @@ -84,7 +84,7 @@ DELETE FROM thr_corp - + UPDATE thr_corp unitId=#{unitId}, @@ -101,7 +101,7 @@ WHERE id = #{id} - + replace into thr_corp (unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, name, updateTime) values ( diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml similarity index 85% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml index b831e27c..1024e141 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_corp_export_log @@ -25,7 +25,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrCorpExportLogEntity"> insert INTO thr_corp_export_log (genKey,updateTime,dlCount,status,filePath,remark,`type`) values @@ -41,7 +41,7 @@ DELETE FROM thr_corp_export_log WHERE id = #{id} - + UPDATE thr_corp_export_log updateTime=#{updateTime}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml similarity index 90% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml index 39150627..c0ea9077 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_corp_import_detail @@ -25,7 +25,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity"> insert INTO thr_corp_import_detail ( unitId,name,spell,addr,creditNo, @@ -72,7 +72,7 @@ DELETE FROM thr_corp_import_detail WHERE genKeyFk = #{genKey} - + UPDATE thr_corp_import_detail unitId=#{unitId}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml similarity index 81% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml index 830ddb0f..0ca9da4b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_corp_import_log @@ -25,7 +25,7 @@ - + insert INTO thr_corp_import_log (genKey,fromType,updateTime,thirdSysFk,status) values @@ -42,7 +42,7 @@ DELETE FROM thr_corp_import_log WHERE id = #{id} - + UPDATE thr_corp_import_log genKey=#{genKey}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml similarity index 82% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml index 630c16b2..6c6d9fcd 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_import_log @@ -29,7 +29,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrImportLogEntity"> insert INTO thr_import_log (genKey, fromType, updateTime, thirdSysFk, status,importType) values (#{genKey}, @@ -45,7 +45,7 @@ WHERE id = #{id} - + UPDATE thr_import_log genKey=#{genKey}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml similarity index 93% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml index 93eca917..81f6b622 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_inv_products @@ -35,11 +35,11 @@ ORDER BY updateTime DESC - select * FROM thr_inv_products WHERE id = #{id} + parameterType="com.glxp.api.entity.thrsys.ThrInvProductsEntity"> replace INTO thr_inv_products ( inventoryCode,inventoryName,count,spec, @@ -90,7 +90,7 @@ DELETE FROM thr_inv_products - + UPDATE thr_inv_products inventoryCode=#{inventoryCode}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDetailDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDetailDao.xml similarity index 91% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDetailDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDetailDao.xml index f33977ac..569967c7 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDetailDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDetailDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_inv_products_import_detail @@ -25,7 +25,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity"> insert INTO thr_inv_products_import_detail ( inventoryCode,inventoryName,count,spec, @@ -67,7 +67,7 @@ DELETE FROM thr_inv_products_import_detail WHERE genKeyFk = #{genKey} - + UPDATE thr_inv_products_import_detail inventoryCode=#{inventoryCode}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml similarity index 81% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml index 1bfa2c67..10edddae 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_inv_products_export_log @@ -22,7 +22,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity"> insert INTO thr_inv_products_export_log (genKey,updateTime,dlCount,status,filePath,remark,`type`) values @@ -38,7 +38,7 @@ DELETE FROM thr_inv_products_export_log WHERE id = #{id} - + UPDATE thr_inv_products_export_log updateTime=#{updateTime}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml similarity index 79% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml index 5e9d4c2f..9003b168 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_inv_products_import_log @@ -24,7 +24,7 @@ - + insert INTO thr_inv_products_import_log (genKey,fromType,updateTime,thirdSysFk,status) values @@ -41,7 +41,7 @@ DELETE FROM thr_inv_products_import_log WHERE id = #{id} - + UPDATE thr_inv_products_import_log genKey=#{genKey}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml similarity index 89% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml index b1dfb194..b3fc9143 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml @@ -1,9 +1,9 @@ - - SELECT * FROM thr_inv_warehouse thrInv left join basic_third_sys thrSys on thrInv.thirdSysFk = thrSys.thirdId @@ -43,14 +43,14 @@ - SELECT * FROM thr_inv_warehouse @@ -78,7 +78,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrInvWarehouseEntity"> replace INTO thr_inv_warehouse (pid, code, name, advanceType, isDefault, @@ -117,7 +117,7 @@ WHERE id = #{id} - + UPDATE thr_inv_warehouse pid=#{pid}, @@ -133,13 +133,13 @@ WHERE id = #{id} - select * from thr_inv_warehouse where code = #{code} - select max(code) as code from thr_inv_warehouse diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml similarity index 94% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml index 3d939001..d6d04aff 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml @@ -1,10 +1,10 @@ - + - SELECT thr_order.*,basic_bustype_origin.name billTypeName FROM thr_order left join basic_bustype_origin on thr_order.billType = basic_bustype_origin.action @@ -54,8 +54,8 @@ ORDER BY thr_order.updateTime DESC - SELECT thr_order.*,basic_bustype_change.originName billTypeName,s1.name as invWarehouseName,s2.name as fromSubInvName FROM thr_order left join basic_bustype_change on thr_order.billType = basic_bustype_change.originAction LEFT JOIN inv_warehouse_sub s1 ON thr_order.invWarehouseCode=s1.`code` @@ -111,7 +111,7 @@ - + replace INTO thr_order (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk, @@ -150,7 +150,7 @@ ) - + replace INTO thr_order (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, @@ -219,7 +219,7 @@ FROM thr_order - + UPDATE thr_order billNo=#{billNo}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml similarity index 91% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml index 8541c036..3241eab9 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_order_detail @@ -18,7 +18,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrOrderDetailEntity"> replace INTO thr_order_detail (productId, productName, spec, batchNo, expireDate, @@ -44,7 +44,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrOrderDetailEntity"> replace INTO thr_order_detail (id,productId, productName, spec, batchNo, expireDate, @@ -97,7 +97,7 @@ WHERE orderIdFk = #{orderIdFk} - + UPDATE thr_order_detail productId=#{productId}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml similarity index 83% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml index fba76704..b4a232b6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_order_export_log @@ -22,7 +22,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrOrderExportLogEntity"> insert INTO thr_order_export_log (genKey,updateTime,dlCount,status,filePath,remark,`type`) values @@ -38,7 +38,7 @@ DELETE FROM thr_order_export_log WHERE id = #{id} - + UPDATE thr_order_export_log updateTime=#{updateTime}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml similarity index 92% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml index c665cc30..5108022c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_order_import_detail @@ -25,7 +25,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrOrderImportDetailEntity"> insert INTO thr_order_import_detail ( billNo,billdate,corpId,corpName,billType,billFlag,productId,productName,spec,batchNo,expireDate, @@ -61,7 +61,7 @@ DELETE FROM thr_order_import_detail WHERE genKeyFk = #{genKey} - + UPDATE thr_order_import_detail billNo=#{billNo}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml similarity index 81% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml index cd990e98..88668f2f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_order_import_log @@ -24,7 +24,7 @@ - + insert INTO thr_order_import_log (genKey,fromType,updateTime,thirdSysFk,status) values @@ -41,7 +41,7 @@ DELETE FROM thr_order_import_log WHERE id = #{id} - + UPDATE thr_order_import_log genKey=#{genKey}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml similarity index 93% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index e0346d52..2dfe0d29 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_products @@ -50,8 +50,8 @@ - SELECT * FROM thr_products @@ -74,7 +74,7 @@ - select * from thr_products where code in @@ -82,7 +82,7 @@ and thirdSysFk = #{thirdSysFk} - select * FROM thr_products WHERE code = #{code} @@ -90,14 +90,14 @@ - select * FROM thr_products WHERE id = #{id} + parameterType="com.glxp.api.entity.thrsys.ThrProductsEntity"> replace INTO thr_products (code, `name`, measname, spec, registerNo, manufactory, @@ -160,7 +160,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrProductsEntity"> insert INTO thr_products (code, `name`, measname, spec, registerNo, manufactory, @@ -234,7 +234,7 @@ WHERE id = #{id} - + UPDATE thr_products code=#{code}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml similarity index 84% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml index 0a240c48..8add6141 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_products_export_log @@ -25,7 +25,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrProductsExportLogEntity"> insert INTO thr_products_export_log (genKey,updateTime,dlCount,status,filePath,remark,`type`) values @@ -41,7 +41,7 @@ DELETE FROM thr_products_export_log WHERE id = #{id} - + UPDATE thr_products_export_log updateTime=#{updateTime}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml similarity index 91% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml index e0d86e8d..a421adec 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_products_import_detail @@ -25,7 +25,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity"> insert INTO thr_products_import_detail (code, name, measname, spec, registerNo, manufactory, cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, @@ -74,7 +74,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity"> UPDATE thr_products_import_detail code=#{code}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml similarity index 80% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml index bf76ba29..f1b0178f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM thr_porducts_import_log @@ -24,7 +24,7 @@ - + insert INTO thr_porducts_import_log (genKey,fromType,updateTime,thirdSysFk,status) values @@ -41,7 +41,7 @@ DELETE FROM thr_porducts_import_log WHERE id = #{id} - + UPDATE thr_porducts_import_log genKey=#{genKey}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml similarity index 86% rename from api-admin/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml rename to src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml index 24c1bb02..b77f3229 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml @@ -1,9 +1,9 @@ - - SELECT * FROM thr_inv_warehouse_sub @@ -26,7 +26,7 @@ + parameterType="com.glxp.api.entity.thrsys.ThrSubInvWarehouseEntity"> replace INTO thr_inv_warehouse_sub (id, code, `name`, parentId, remark, thirdSysFk) @@ -95,7 +95,7 @@ WHERE id = #{id} - + UPDATE thr_inv_warehouse_sub `name`=#{name}, diff --git a/api-admin/src/main/resources/schemas/init.sql b/src/main/resources/schemas/init.sql similarity index 100% rename from api-admin/src/main/resources/schemas/init.sql rename to src/main/resources/schemas/init.sql diff --git a/api-admin/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql similarity index 99% rename from api-admin/src/main/resources/schemas/schema_v2.1.sql rename to src/main/resources/schemas/schema_v2.1.sql index 3bf3d7f1..7b16d267 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -2,11 +2,11 @@ CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1); +CALL Pro_Temp_ColumnWork ('stock_order','noInvOut','tinyint ', 1); CALL Pro_Temp_ColumnWork ('sup_cert','filePath','varchar(255) ', 2); -CALL Pro_Temp_ColumnWork ('auth_dept','parentId','int ', 1); -- 创建表时必须 create table if not exists 表名