diff --git a/cjy-dependencies/.flattened-pom.xml b/cjy-dependencies/.flattened-pom.xml deleted file mode 100644 index 364ec8d..0000000 --- a/cjy-dependencies/.flattened-pom.xml +++ /dev/null @@ -1,558 +0,0 @@ - - - 4.0.0 - com.cjy - cjy-dependencies - 2.0.1-jdk8-snapshot - pom - ${project.artifactId} - 基础 bom 文件，管理整个项目的依赖版本 - https://github.com/YunaiV/ruoyi-vue-pro - - 1.4.10 - 7.2.11.RELEASE - 2.3 - 2.7.18 - 2.9.1 - 2.2.7 - 3.5.0 - 5.1.0 - 1.18.30 - 2.12.2 - 1.17.2 - 1.2.83 - 3.10.0 - 5.8.25 - 1.7.1 - 2.14.5 - 6.8.0 - 3.18.0 - 4.11.0 - 3.0.6 - 3.5.5 - 1.2.21 - 2.15.1 - 3.3.3 - 1.6.15 - 8.5.7 - 4.11.0 - 1.0.13 - 3.1.880 - 8.1.3.62 - 2.2.3 - 2.7.0 - 0.1.55 - 4.6.0 - 4.6.4 - 1.0.10 - 4.3.0 - 2.5 - 2.2.9 - 4.3.0 - 2.7.15 - 1.5.5.Final - 1.6.6 - 2.2.1 - 1.0.8 - 1.0.5 - 33.0.0-jre - 8.12.0 - 0.33.0 - 3.5.5 - 1.5.0 - 2.0.1-jdk8-snapshot - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - com.cjy - cjy-spring-boot-starter-biz-operatelog - 2.0.1-jdk8-snapshot - - - io.github.mouzt - bizlog-sdk - ${bizlog-sdk.version} - - - spring-boot-starter - org.springframework.boot - - - - - com.cjy - cjy-spring-boot-starter-biz-tenant - 2.0.1-jdk8-snapshot - - - com.cjy - cjy-spring-boot-starter-biz-data-permission - 2.0.1-jdk8-snapshot - - - com.cjy - cjy-spring-boot-starter-biz-ip - 2.0.1-jdk8-snapshot - - - org.springframework.boot - spring-boot-configuration-processor - ${spring.boot.version} - - - com.cjy - cjy-spring-boot-starter-web - 2.0.1-jdk8-snapshot - - - com.cjy - cjy-spring-boot-starter-security - 2.0.1-jdk8-snapshot - - - com.cjy - cjy-spring-boot-starter-websocket - 2.0.1-jdk8-snapshot - - - com.github.xiaoymin - knife4j-openapi3-spring-boot-starter - ${knife4j.version} - - - org.springdoc - springdoc-openapi-ui - ${springdoc.version} - - - com.cjy - cjy-spring-boot-starter-mybatis - 2.0.1-jdk8-snapshot - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-generator - ${mybatis-plus-generator.version} - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic-datasource.version} - - - com.github.yulichang - mybatis-plus-join-boot-starter - ${mybatis-plus-join.version} - - - com.cjy - cjy-spring-boot-starter-redis - 2.0.1-jdk8-snapshot - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - - - spring-boot-starter-actuator - org.springframework.boot - - - - - com.dameng - DmJdbcDriver18 - ${dm8.jdbc.version} - - - com.cjy - cjy-spring-boot-starter-job - 2.0.1-jdk8-snapshot - - - com.cjy - cjy-spring-boot-starter-mq - 2.0.1-jdk8-snapshot - - - org.apache.rocketmq - rocketmq-spring-boot-starter - ${rocketmq-spring.version} - - - com.cjy - cjy-spring-boot-starter-protection - 2.0.1-jdk8-snapshot - - - com.baomidou - lock4j-redisson-spring-boot-starter - ${lock4j.version} - - - redisson-spring-boot-starter - org.redisson - - - - - io.github.resilience4j - resilience4j-ratelimiter - ${resilience4j.version} - - - io.github.resilience4j - resilience4j-spring-boot2 - ${resilience4j.version} - - - com.cjy - cjy-spring-boot-starter-monitor - 2.0.1-jdk8-snapshot - - - org.apache.skywalking - apm-toolkit-trace - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-logback-1.x - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-opentracing - ${skywalking.version} - - - io.opentracing - opentracing-api - ${opentracing.version} - - - io.opentracing - opentracing-util - ${opentracing.version} - - - io.opentracing - opentracing-noop - ${opentracing.version} - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - spring-boot-admin-server-cloud - de.codecentric - - - - - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - - com.cjy - cjy-spring-boot-starter-test - 2.0.1-jdk8-snapshot - test - - - org.mockito - mockito-inline - ${mockito-inline.version} - - - org.springframework.boot - spring-boot-starter-test - ${spring.boot.version} - - - asm - org.ow2.asm - - - mockito-core - org.mockito - - - - - com.github.fppt - jedis-mock - ${jedis-mock.version} - - - uk.co.jemos.podam - podam - ${podam.version} - - - org.flowable - flowable-spring-boot-starter-process - ${flowable.version} - - - org.flowable - flowable-spring-boot-starter-actuator - ${flowable.version} - - - com.cjy - cjy-common - 2.0.1-jdk8-snapshot - - - com.cjy - cjy-spring-boot-starter-excel - 2.0.1-jdk8-snapshot - - - org.projectlombok - lombok - ${lombok.version} - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - org.mapstruct - mapstruct-jdk8 - ${mapstruct.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - cn.hutool - hutool-all - ${hutool.version} - - - com.alibaba - easyexcel - ${easyexcel.verion} - - - commons-io - commons-io - ${commons-io.version} - - - org.apache.tika - tika-core - ${tika-core.version} - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - com.alibaba - fastjson - ${fastjson.version} - - - cn.smallbun.screw - screw-core - ${screw.version} - - - freemarker - org.freemarker - - - fastjson - com.alibaba - - - - - com.google.guava - guava - ${guava.version} - - - com.google.inject - guice - ${guice.version} - - - com.alibaba - transmittable-thread-local - ${transmittable-thread-local.version} - - - commons-net - commons-net - ${commons-net.version} - - - com.jcraft - jsch - ${jsch.version} - - - com.xingyuv - spring-boot-starter-captcha-plus - ${captcha-plus.version} - - - org.lionsoul - ip2region - ${ip2region.version} - - - org.jsoup - jsoup - ${jsoup.version} - - - com.squareup.okio - okio - ${okio.version} - - - com.squareup.okhttp3 - okhttp - ${okhttp3.version} - - - io.minio - minio - ${minio.version} - - - com.aliyun - aliyun-java-sdk-core - ${aliyun-java-sdk-core.version} - - - opentracing-api - io.opentracing - - - opentracing-util - io.opentracing - - - - - com.aliyun - aliyun-java-sdk-dysmsapi - ${aliyun-java-sdk-dysmsapi.version} - - - com.tencentcloudapi - tencentcloud-sdk-java-sms - ${tencentcloud-sdk-java.version} - - - com.xingyuv - spring-boot-starter-justauth - ${justauth.version} - - - hutool-core - cn.hutool - - - - - com.github.binarywang - weixin-java-pay - ${weixin-java.version} - - - com.github.binarywang - wx-java-mp-spring-boot-starter - ${weixin-java.version} - - - com.github.binarywang - wx-java-miniapp-spring-boot-starter - ${weixin-java.version} - - - org.jeecgframework.jimureport - jimureport-spring-boot-starter - ${jimureport.version} - - - druid - com.alibaba - - - - - xerces - xercesImpl - ${xercesImpl.version} - - - com.bstek.ureport - ureport2-console - ${ureport2.version} - - - - - - - org.codehaus.mojo - flatten-maven-plugin - ${flatten-maven-plugin.version} - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - resolveCiFriendliesOnly - true - - - - - diff --git a/cjy-framework/.flattened-pom.xml b/cjy-framework/.flattened-pom.xml deleted file mode 100644 index 8107b14..0000000 --- a/cjy-framework/.flattened-pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy - 2.0.1-jdk8-snapshot - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - pom - 该包是技术组件，每个子包，代表一个组件。每个组件包括两部分： - 1. core 包：是该组件的核心封装 - 2. config 包：是该组件基于 Spring 的配置 - - 技术组件，也分成两类： - 1. 框架组件：和我们熟悉的 MyBatis、Redis 等等的拓展 - 2. 业务组件：和业务相关的组件的封装，例如说数据字典、操作日志等等。 - 如果是业务组件，Maven 名字会包含 biz - https://github.com/YunaiV/ruoyi-vue-pro - - cjy-common - cjy-spring-boot-starter-mybatis - cjy-spring-boot-starter-redis - cjy-spring-boot-starter-web - cjy-spring-boot-starter-security - cjy-spring-boot-starter-websocket - cjy-spring-boot-starter-monitor - cjy-spring-boot-starter-protection - cjy-spring-boot-starter-job - cjy-spring-boot-starter-mq - cjy-spring-boot-starter-excel - cjy-spring-boot-starter-test - cjy-spring-boot-starter-biz-operatelog - cjy-spring-boot-starter-biz-tenant - cjy-spring-boot-starter-biz-data-permission - cjy-spring-boot-starter-biz-ip - - diff --git a/cjy-framework/cjy-common/.flattened-pom.xml b/cjy-framework/cjy-common/.flattened-pom.xml deleted file mode 100644 index dc7d670..0000000 --- a/cjy-framework/cjy-common/.flattened-pom.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-common - 2.0.1-jdk8-snapshot - ${project.artifactId} - 定义基础 pojo 类、枚举、工具类等等 - https://github.com/YunaiV/ruoyi-vue-pro - - - org.springframework - spring-core - provided - - - org.springframework - spring-expression - provided - - - org.springframework - spring-aop - provided - - - org.aspectj - aspectjweaver - provided - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework - spring-web - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.springdoc - springdoc-openapi-ui - provided - - - org.apache.skywalking - apm-toolkit-trace - - - org.projectlombok - lombok - - - org.mapstruct - mapstruct - - - org.mapstruct - mapstruct-jdk8 - - - org.mapstruct - mapstruct-processor - - - com.google.guava - guava - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - provided - - - org.slf4j - slf4j-api - provided - - - jakarta.validation - jakarta.validation-api - provided - - - cn.hutool - hutool-all - - - com.alibaba - transmittable-thread-local - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/cjy-framework/cjy-spring-boot-starter-biz-data-permission/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-biz-data-permission/.flattened-pom.xml deleted file mode 100644 index 65b9fa8..0000000 --- a/cjy-framework/cjy-spring-boot-starter-biz-data-permission/.flattened-pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-biz-data-permission - 2.0.1-jdk8-snapshot - ${project.artifactId} - 数据权限 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - com.cjy - cjy-spring-boot-starter-security - true - - - com.cjy - cjy-spring-boot-starter-mybatis - - - com.cjy - cjy-module-system-api - ${revision} - - - com.cjy - cjy-spring-boot-starter-test - test - - - diff --git a/cjy-framework/cjy-spring-boot-starter-biz-ip/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-biz-ip/.flattened-pom.xml deleted file mode 100644 index 290db2c..0000000 --- a/cjy-framework/cjy-spring-boot-starter-biz-ip/.flattened-pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-biz-ip - 2.0.1-jdk8-snapshot - ${project.artifactId} - IP 拓展，支持如下功能： - 1. IP 功能：查询 IP 对应的城市信息 - 基于 https://gitee.com/lionsoul/ip2region 实现 - 2. 城市功能：查询城市编码对应的城市信息 - 基于 https://github.com/modood/Administrative-divisions-of-China 实现 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - org.lionsoul - ip2region - - - org.projectlombok - lombok - - - org.slf4j - slf4j-api - provided - - - com.cjy - cjy-spring-boot-starter-test - test - - - diff --git a/cjy-framework/cjy-spring-boot-starter-biz-operatelog/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-biz-operatelog/.flattened-pom.xml deleted file mode 100644 index 90897c6..0000000 --- a/cjy-framework/cjy-spring-boot-starter-biz-operatelog/.flattened-pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-biz-operatelog - 2.0.1-jdk8-snapshot - ${project.artifactId} - 操作日志 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - org.springframework.boot - spring-boot-starter-aop - - - com.cjy - cjy-spring-boot-starter-web - provided - - - com.cjy - cjy-module-system-api - ${revision} - - - com.google.guava - guava - - - diff --git a/cjy-framework/cjy-spring-boot-starter-biz-tenant/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-biz-tenant/.flattened-pom.xml deleted file mode 100644 index c62e205..0000000 --- a/cjy-framework/cjy-spring-boot-starter-biz-tenant/.flattened-pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-biz-tenant - 2.0.1-jdk8-snapshot - ${project.artifactId} - 多租户 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - com.cjy - cjy-spring-boot-starter-security - - - com.cjy - cjy-spring-boot-starter-mybatis - - - com.cjy - cjy-spring-boot-starter-redis - - - com.cjy - cjy-spring-boot-starter-job - - - com.cjy - cjy-spring-boot-starter-mq - true - - - org.springframework.kafka - spring-kafka - true - - - org.springframework.amqp - spring-rabbit - true - - - org.apache.rocketmq - rocketmq-spring-boot-starter - true - - - com.cjy - cjy-spring-boot-starter-test - test - - - com.google.guava - guava - - - diff --git a/cjy-framework/cjy-spring-boot-starter-excel/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-excel/.flattened-pom.xml deleted file mode 100644 index 1d157b1..0000000 --- a/cjy-framework/cjy-spring-boot-starter-excel/.flattened-pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-excel - 2.0.1-jdk8-snapshot - ${project.artifactId} - Excel 拓展 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - org.springframework.boot - spring-boot-starter - - - com.cjy - cjy-module-system-api - ${revision} - - - org.springframework - spring-web - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - - com.alibaba - easyexcel - - - com.google.guava - guava - - - com.cjy - cjy-spring-boot-starter-biz-ip - true - - - com.cjy - cjy-spring-boot-starter-test - test - - - diff --git a/cjy-framework/cjy-spring-boot-starter-job/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-job/.flattened-pom.xml deleted file mode 100644 index b6778a7..0000000 --- a/cjy-framework/cjy-spring-boot-starter-job/.flattened-pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-job - 2.0.1-jdk8-snapshot - ${project.artifactId} - 任务拓展 - 1. 定时任务，基于 Quartz 拓展 - 2. 异步任务，基于 Spring Async 拓展 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - org.springframework.boot - spring-boot-starter-quartz - - - jakarta.validation - jakarta.validation-api - - - diff --git a/cjy-framework/cjy-spring-boot-starter-monitor/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-monitor/.flattened-pom.xml deleted file mode 100644 index 402a36e..0000000 --- a/cjy-framework/cjy-spring-boot-starter-monitor/.flattened-pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-monitor - 2.0.1-jdk8-snapshot - ${project.artifactId} - 服务监控，提供链路追踪、日志服务、指标收集等等功能 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework - spring-web - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - - io.opentracing - opentracing-util - - - org.apache.skywalking - apm-toolkit-trace - - - org.apache.skywalking - apm-toolkit-logback-1.x - - - org.apache.skywalking - apm-toolkit-opentracing - - - io.micrometer - micrometer-registry-prometheus - - - de.codecentric - spring-boot-admin-starter-client - - - diff --git a/cjy-framework/cjy-spring-boot-starter-mq/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-mq/.flattened-pom.xml deleted file mode 100644 index 04a296a..0000000 --- a/cjy-framework/cjy-spring-boot-starter-mq/.flattened-pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-mq - 2.0.1-jdk8-snapshot - ${project.artifactId} - 消息队列，支持 Redis、RocketMQ、RabbitMQ、Kafka 四种 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-spring-boot-starter-redis - - - org.springframework.kafka - spring-kafka - true - - - org.springframework.amqp - spring-rabbit - true - - - org.apache.rocketmq - rocketmq-spring-boot-starter - true - - - diff --git a/cjy-framework/cjy-spring-boot-starter-mybatis/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-mybatis/.flattened-pom.xml deleted file mode 100644 index e25cbdb..0000000 --- a/cjy-framework/cjy-spring-boot-starter-mybatis/.flattened-pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-mybatis - 2.0.1-jdk8-snapshot - ${project.artifactId} - 数据库连接池、多数据源、事务、MyBatis 拓展 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - com.cjy - cjy-spring-boot-starter-web - provided - - - com.mysql - mysql-connector-j - - - com.oracle.database.jdbc - ojdbc8 - true - - - org.postgresql - postgresql - true - - - com.microsoft.sqlserver - mssql-jdbc - true - - - com.dameng - DmJdbcDriver18 - true - - - com.alibaba - druid-spring-boot-starter - - - com.baomidou - mybatis-plus-boot-starter - - - com.baomidou - dynamic-datasource-spring-boot-starter - - - com.github.yulichang - mybatis-plus-join-boot-starter - - - diff --git a/cjy-framework/cjy-spring-boot-starter-protection/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-protection/.flattened-pom.xml deleted file mode 100644 index 5ea95a1..0000000 --- a/cjy-framework/cjy-spring-boot-starter-protection/.flattened-pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-protection - 2.0.1-jdk8-snapshot - ${project.artifactId} - 服务保证，提供分布式锁、幂等、限流、熔断等等功能 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-spring-boot-starter-redis - - - com.baomidou - lock4j-redisson-spring-boot-starter - true - - - io.github.resilience4j - resilience4j-spring-boot2 - true - - - diff --git a/cjy-framework/cjy-spring-boot-starter-redis/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-redis/.flattened-pom.xml deleted file mode 100644 index 1a4a062..0000000 --- a/cjy-framework/cjy-spring-boot-starter-redis/.flattened-pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-redis - 2.0.1-jdk8-snapshot - ${project.artifactId} - Redis 封装拓展 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - org.redisson - redisson-spring-boot-starter - - - org.springframework.boot - spring-boot-starter-cache - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - diff --git a/cjy-framework/cjy-spring-boot-starter-security/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-security/.flattened-pom.xml deleted file mode 100644 index 50ca917..0000000 --- a/cjy-framework/cjy-spring-boot-starter-security/.flattened-pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-security - 2.0.1-jdk8-snapshot - ${project.artifactId} - 1. security：用户的认证、权限的校验，实现「谁」可以做「什么事」 - 2. operatelog：操作日志，实现「谁」在「什么时间」对「什么」做了「什么事」 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - org.springframework.boot - spring-boot-starter-aop - - - com.cjy - cjy-spring-boot-starter-web - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.boot - spring-boot-starter-security - - - com.google.guava - guava - - - io.github.mouzt - bizlog-sdk - - - com.cjy - cjy-module-system-api - ${revision} - - - diff --git a/cjy-framework/cjy-spring-boot-starter-test/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-test/.flattened-pom.xml deleted file mode 100644 index c35028b..0000000 --- a/cjy-framework/cjy-spring-boot-starter-test/.flattened-pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-test - 2.0.1-jdk8-snapshot - ${project.artifactId} - 测试组件，用于单元测试、集成测试 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - com.cjy - cjy-spring-boot-starter-mybatis - - - com.cjy - cjy-spring-boot-starter-redis - - - org.mockito - mockito-inline - - - org.springframework.boot - spring-boot-starter-test - - - com.h2database - h2 - - - com.github.fppt - jedis-mock - - - uk.co.jemos.podam - podam - - - diff --git a/cjy-framework/cjy-spring-boot-starter-web/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-web/.flattened-pom.xml deleted file mode 100644 index 88ab80c..0000000 --- a/cjy-framework/cjy-spring-boot-starter-web/.flattened-pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-web - 2.0.1-jdk8-snapshot - ${project.artifactId} - Web 框架，全局异常、API 日志、脱敏、错误码等 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-configuration-processor - true - - - com.github.xiaoymin - knife4j-openapi3-spring-boot-starter - - - org.springdoc - springdoc-openapi-ui - - - org.springframework.security - spring-security-core - provided - - - com.cjy - cjy-module-infra-api - ${revision} - - - com.cjy - cjy-module-system-api - ${revision} - - - org.jsoup - jsoup - - - org.springframework.boot - spring-boot-starter-test - test - - - org.mockito - mockito-inline - test - - - diff --git a/cjy-framework/cjy-spring-boot-starter-websocket/.flattened-pom.xml b/cjy-framework/cjy-spring-boot-starter-websocket/.flattened-pom.xml deleted file mode 100644 index 4f3f1ed..0000000 --- a/cjy-framework/cjy-spring-boot-starter-websocket/.flattened-pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-framework - 2.0.1-jdk8-snapshot - - com.cjy - cjy-spring-boot-starter-websocket - 2.0.1-jdk8-snapshot - ${project.artifactId} - WebSocket 框架，支持多节点的广播 - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-common - - - com.cjy - cjy-spring-boot-starter-security - provided - - - org.springframework.boot - spring-boot-starter-websocket - - - com.cjy - cjy-spring-boot-starter-mq - - - org.springframework.kafka - spring-kafka - true - - - org.springframework.amqp - spring-rabbit - true - - - org.apache.rocketmq - rocketmq-spring-boot-starter - true - - - com.cjy - cjy-spring-boot-starter-biz-tenant - provided - - - diff --git a/cjy-module-infra/.flattened-pom.xml b/cjy-module-infra/.flattened-pom.xml deleted file mode 100644 index 98460c0..0000000 --- a/cjy-module-infra/.flattened-pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy - 2.0.1-jdk8-snapshot - - com.cjy - cjy-module-infra - 2.0.1-jdk8-snapshot - pom - ${project.artifactId} - infra 模块，主要提供两块能力： - 1. 我们放基础设施的运维与管理，支撑上层的通用与核心业务。 例如说：定时任务的管理、服务器的信息等等 - 2. 研发工具，提升研发效率与质量。 例如说：代码生成器、接口文档等等 - - cjy-module-infra-api - cjy-module-infra-biz - - diff --git a/cjy-module-infra/cjy-module-infra-api/.flattened-pom.xml b/cjy-module-infra/cjy-module-infra-api/.flattened-pom.xml deleted file mode 100644 index 0628e93..0000000 --- a/cjy-module-infra/cjy-module-infra-api/.flattened-pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-module-infra - 2.0.1-jdk8-snapshot - - com.cjy - cjy-module-infra-api - 2.0.1-jdk8-snapshot - ${project.artifactId} - infra 模块 API，暴露给其它模块调用 - - - com.cjy - cjy-common - - - org.springframework.boot - spring-boot-starter-validation - true - - - diff --git a/cjy-module-infra/cjy-module-infra-biz/.flattened-pom.xml b/cjy-module-infra/cjy-module-infra-biz/.flattened-pom.xml deleted file mode 100644 index d17580b..0000000 --- a/cjy-module-infra/cjy-module-infra-biz/.flattened-pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-module-infra - 2.0.1-jdk8-snapshot - - com.cjy - cjy-module-infra-biz - 2.0.1-jdk8-snapshot - ${project.artifactId} - infra 模块，主要提供两块能力： - 1. 我们放基础设施的运维与管理，支撑上层的通用与核心业务。 例如说：定时任务的管理、服务器的信息等等 - 2. 研发工具，提升研发效率与质量。 例如说：代码生成器、接口文档等等 - - - com.cjy - cjy-module-system-api - ${revision} - - - com.cjy - cjy-module-infra-api - ${revision} - - - com.cjy - cjy-spring-boot-starter-biz-operatelog - - - com.cjy - cjy-spring-boot-starter-biz-tenant - - - com.cjy - cjy-spring-boot-starter-security - - - com.cjy - cjy-spring-boot-starter-websocket - - - com.cjy - cjy-spring-boot-starter-mybatis - - - com.baomidou - mybatis-plus-generator - - - com.cjy - cjy-spring-boot-starter-redis - - - com.cjy - cjy-spring-boot-starter-job - - - com.cjy - cjy-spring-boot-starter-mq - - - com.cjy - cjy-spring-boot-starter-test - test - - - com.cjy - cjy-spring-boot-starter-excel - - - org.apache.velocity - velocity-engine-core - - - cn.smallbun.screw - screw-core - - - com.cjy - cjy-spring-boot-starter-monitor - - - de.codecentric - spring-boot-admin-starter-server - - - commons-net - commons-net - - - com.jcraft - jsch - - - io.minio - minio - - - org.apache.tika - tika-core - - - diff --git a/cjy-module-report/.flattened-pom.xml b/cjy-module-report/.flattened-pom.xml deleted file mode 100644 index b641ec8..0000000 --- a/cjy-module-report/.flattened-pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy - 2.0.1-jdk8-snapshot - - com.cjy - cjy-module-report - 2.0.1-jdk8-snapshot - pom - ${project.artifactId} - report 模块，主要实现数据可视化报表等功能。 - - cjy-module-report-api - cjy-module-report-biz - - diff --git a/cjy-module-report/cjy-module-report-api/.flattened-pom.xml b/cjy-module-report/cjy-module-report-api/.flattened-pom.xml deleted file mode 100644 index a987d90..0000000 --- a/cjy-module-report/cjy-module-report-api/.flattened-pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-module-report - 2.0.1-jdk8-snapshot - - com.cjy - cjy-module-report-api - 2.0.1-jdk8-snapshot - ${project.artifactId} - report 模块 API，暴露给其它模块调用 - - - com.cjy - cjy-common - - - diff --git a/cjy-module-report/cjy-module-report-biz/.flattened-pom.xml b/cjy-module-report/cjy-module-report-biz/.flattened-pom.xml deleted file mode 100644 index 886434c..0000000 --- a/cjy-module-report/cjy-module-report-biz/.flattened-pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-module-report - 2.0.1-jdk8-snapshot - - com.cjy - cjy-module-report-biz - 2.0.1-jdk8-snapshot - ${project.artifactId} - report 模块，主要实现数据可视化报表等功能： - 1. 基于「积木报表」实现，打印设计、报表设计、图形设计、大屏设计等。 - - - com.cjy - cjy-module-report-api - ${revision} - - - com.cjy - cjy-module-system-api - ${revision} - - - com.cjy - cjy-spring-boot-starter-biz-operatelog - - - com.cjy - cjy-spring-boot-starter-biz-tenant - - - com.cjy - cjy-spring-boot-starter-web - - - com.cjy - cjy-spring-boot-starter-security - - - com.cjy - cjy-spring-boot-starter-mybatis - - - com.cjy - cjy-spring-boot-starter-test - - - org.jeecgframework.jimureport - jimureport-spring-boot-starter - - - xerces - xercesImpl - - - com.bstek.ureport - ureport2-console - - - com.cjy - cjy-spring-boot-starter-excel - - - diff --git a/cjy-module-system/.flattened-pom.xml b/cjy-module-system/.flattened-pom.xml deleted file mode 100644 index 25d719f..0000000 --- a/cjy-module-system/.flattened-pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy - 2.0.1-jdk8-snapshot - - com.cjy - cjy-module-system - 2.0.1-jdk8-snapshot - pom - ${project.artifactId} - system 模块下，我们放通用业务，支撑上层的核心业务。 - 例如说：用户、部门、权限、数据字典等等 - - cjy-module-system-api - cjy-module-system-biz - - diff --git a/cjy-module-system/cjy-module-system-api/.flattened-pom.xml b/cjy-module-system/cjy-module-system-api/.flattened-pom.xml deleted file mode 100644 index 601104d..0000000 --- a/cjy-module-system/cjy-module-system-api/.flattened-pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-module-system - 2.0.1-jdk8-snapshot - - com.cjy - cjy-module-system-api - 2.0.1-jdk8-snapshot - ${project.artifactId} - system 模块 API，暴露给其它模块调用 - - - com.cjy - cjy-common - - - org.springframework.boot - spring-boot-starter-validation - true - - - diff --git a/cjy-module-system/cjy-module-system-biz/.flattened-pom.xml b/cjy-module-system/cjy-module-system-biz/.flattened-pom.xml deleted file mode 100644 index 3c3d198..0000000 --- a/cjy-module-system/cjy-module-system-biz/.flattened-pom.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-module-system - 2.0.1-jdk8-snapshot - - com.cjy - cjy-module-system-biz - 2.0.1-jdk8-snapshot - ${project.artifactId} - system 模块下，我们放通用业务，支撑上层的核心业务。 - 例如说：用户、部门、权限、数据字典等等 - - - com.cjy - cjy-module-system-api - ${revision} - - - com.cjy - cjy-module-infra-api - ${revision} - - - com.cjy - cjy-spring-boot-starter-biz-operatelog - - - com.cjy - cjy-spring-boot-starter-biz-data-permission - - - com.cjy - cjy-spring-boot-starter-biz-tenant - - - com.cjy - cjy-spring-boot-starter-biz-ip - - - com.cjy - cjy-spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-validation - - - com.cjy - cjy-spring-boot-starter-mybatis - - - com.cjy - cjy-spring-boot-starter-redis - - - com.cjy - cjy-spring-boot-starter-job - - - com.cjy - cjy-spring-boot-starter-mq - - - com.cjy - cjy-spring-boot-starter-test - test - - - com.cjy - cjy-spring-boot-starter-excel - - - org.springframework.boot - spring-boot-starter-mail - - - com.xingyuv - spring-boot-starter-justauth - - - com.github.binarywang - wx-java-mp-spring-boot-starter - - - com.github.binarywang - wx-java-miniapp-spring-boot-starter - - - com.aliyun - aliyun-java-sdk-core - - - com.aliyun - aliyun-java-sdk-dysmsapi - - - com.tencentcloudapi - tencentcloud-sdk-java-sms - - - com.xingyuv - spring-boot-starter-captcha-plus - - - diff --git a/cjy-module-traceability/.flattened-pom.xml b/cjy-module-traceability/.flattened-pom.xml deleted file mode 100644 index bd2d8b3..0000000 --- a/cjy-module-traceability/.flattened-pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy - 2.0.1-jdk8-snapshot - - com.cjy - cjy-module-traceability - 2.0.1-jdk8-snapshot - pom - ${project.artifactId} - system 模块下，我们放通用业务，支撑上层的核心业务。 - 例如说：用户、部门、权限、数据字典等等 - - cjy-module-traceability-api - cjy-module-traceability-biz - - diff --git a/cjy-module-traceability/cjy-module-traceability-api/.flattened-pom.xml b/cjy-module-traceability/cjy-module-traceability-api/.flattened-pom.xml deleted file mode 100644 index c0fad49..0000000 --- a/cjy-module-traceability/cjy-module-traceability-api/.flattened-pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-module-traceability - 2.0.1-jdk8-snapshot - - com.cjy - cjy-module-traceability-api - 2.0.1-jdk8-snapshot - ${project.artifactId} - traceability 模块 API，暴露给其它模块调用 - - - com.cjy - cjy-common - - - org.springframework.boot - spring-boot-starter-validation - true - - - diff --git a/cjy-module-traceability/cjy-module-traceability-api/pom.xml b/cjy-module-traceability/cjy-module-traceability-api/pom.xml index de46002..564af1b 100644 --- a/cjy-module-traceability/cjy-module-traceability-api/pom.xml +++ b/cjy-module-traceability/cjy-module-traceability-api/pom.xml @@ -2,21 +2,19 @@ - 4.0.0 + com.cjy cjy-module-traceability - 2.0.1-jdk8-snapshot + ${revision} - + 4.0.0 cjy-module-traceability-api - - - 8 - 8 - UTF-8 - - + jar + ${project.artifactId} + + traceability 模块 API，暴露给其它模块调用 + com.cjy diff --git a/cjy-module-traceability/cjy-module-traceability-biz/.flattened-pom.xml b/cjy-module-traceability/cjy-module-traceability-biz/.flattened-pom.xml deleted file mode 100644 index ec9cb7a..0000000 --- a/cjy-module-traceability/cjy-module-traceability-biz/.flattened-pom.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy-module-traceability - 2.0.1-jdk8-snapshot - - com.cjy - cjy-module-traceability-biz - 2.0.1-jdk8-snapshot - ${project.artifactId} - traceability 模块下，我们放通用业务，支撑上层的核心业务。 - - - - com.cjy - cjy-module-traceability-api - ${revision} - - - com.cjy - cjy-module-infra-api - ${revision} - - - com.cjy - cjy-spring-boot-starter-biz-operatelog - - - com.cjy - cjy-spring-boot-starter-biz-data-permission - - - com.cjy - cjy-spring-boot-starter-biz-tenant - - - com.cjy - cjy-spring-boot-starter-biz-ip - - - com.cjy - cjy-spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-validation - - - com.cjy - cjy-spring-boot-starter-mybatis - - - com.cjy - cjy-spring-boot-starter-redis - - - com.cjy - cjy-spring-boot-starter-job - - - com.cjy - cjy-spring-boot-starter-mq - - - com.cjy - cjy-spring-boot-starter-test - test - - - com.cjy - cjy-spring-boot-starter-excel - - - org.springframework.boot - spring-boot-starter-mail - - - com.xingyuv - spring-boot-starter-justauth - - - com.github.binarywang - wx-java-mp-spring-boot-starter - - - com.github.binarywang - wx-java-miniapp-spring-boot-starter - - - com.aliyun - aliyun-java-sdk-core - - - com.aliyun - aliyun-java-sdk-dysmsapi - - - com.tencentcloudapi - tencentcloud-sdk-java-sms - - - com.xingyuv - spring-boot-starter-captcha-plus - - - diff --git a/cjy-module-traceability/cjy-module-traceability-biz/pom.xml b/cjy-module-traceability/cjy-module-traceability-biz/pom.xml index 02d3df5..dde900e 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/pom.xml +++ b/cjy-module-traceability/cjy-module-traceability-biz/pom.xml @@ -2,20 +2,20 @@ - 4.0.0 + com.cjy cjy-module-traceability - 2.0.1-jdk8-snapshot + ${revision} - + 4.0.0 cjy-module-traceability-biz + jar + ${project.artifactId} + + traceability 模块 API，暴露给其它模块调用 + - - 8 - 8 - UTF-8 - com.cjy diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/processingworkshop/ProcessingWorkshopController.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/processingworkshop/ProcessingWorkshopController.java deleted file mode 100644 index e6af17c..0000000 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/processingworkshop/ProcessingWorkshopController.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.cjy.traceability.module.traceability.controller.admin.processingworkshop; - -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.cjy.traceability.framework.common.pojo.PageParam; -import com.cjy.traceability.framework.common.pojo.PageResult; -import com.cjy.traceability.framework.common.pojo.CommonResult; -import com.cjy.traceability.framework.common.util.object.BeanUtils; -import static com.cjy.traceability.framework.common.pojo.CommonResult.success; - -import com.cjy.traceability.framework.excel.core.util.ExcelUtils; - -import com.cjy.traceability.framework.operatelog.core.annotations.OperateLog; -import static com.cjy.traceability.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.cjy.traceability.module.traceability.controller.admin.processingworkshop.vo.*; -import com.cjy.traceability.module.traceability.dal.dataobject.processingworkshop.ProcessingWorkshopDO; -import com.cjy.traceability.module.traceability.service.processingworkshop.ProcessingWorkshopService; - -@Tag(name = "管理后台 - 加工车间") -@RestController -@RequestMapping("/traceability/processing-workshop") -@Validated -public class ProcessingWorkshopController { - - @Resource - private ProcessingWorkshopService processingWorkshopService; - - @PostMapping("/create") - @Operation(summary = "创建加工车间") - @PreAuthorize("@ss.hasPermission('traceability:processing-workshop:create')") - public CommonResult createProcessingWorkshop(@Valid @RequestBody ProcessingWorkshopSaveReqVO createReqVO) { - return success(processingWorkshopService.createProcessingWorkshop(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新加工车间") - @PreAuthorize("@ss.hasPermission('traceability:processing-workshop:update')") - public CommonResult updateProcessingWorkshop(@Valid @RequestBody ProcessingWorkshopSaveReqVO updateReqVO) { - processingWorkshopService.updateProcessingWorkshop(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除加工车间") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('traceability:processing-workshop:delete')") - public CommonResult deleteProcessingWorkshop(@RequestParam("id") Long id) { - processingWorkshopService.deleteProcessingWorkshop(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得加工车间") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('traceability:processing-workshop:query')") - public CommonResult getProcessingWorkshop(@RequestParam("id") Long id) { - ProcessingWorkshopDO processingWorkshop = processingWorkshopService.getProcessingWorkshop(id); - return success(BeanUtils.toBean(processingWorkshop, ProcessingWorkshopRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得加工车间分页") - @PreAuthorize("@ss.hasPermission('traceability:processing-workshop:query')") - public CommonResult> getProcessingWorkshopPage(@Valid ProcessingWorkshopPageReqVO pageReqVO) { - PageResult pageResult = processingWorkshopService.getProcessingWorkshopPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, ProcessingWorkshopRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出加工车间 Excel") - @PreAuthorize("@ss.hasPermission('traceability:processing-workshop:export')") - @OperateLog(type = EXPORT) - public void exportProcessingWorkshopExcel(@Valid ProcessingWorkshopPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = processingWorkshopService.getProcessingWorkshopPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "加工车间.xls", "数据", ProcessingWorkshopRespVO.class, - BeanUtils.toBean(list, ProcessingWorkshopRespVO.class)); - } - -} \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/processingworkshop/vo/ProcessingWorkshopPageReqVO.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/processingworkshop/vo/ProcessingWorkshopPageReqVO.java deleted file mode 100644 index a9a8163..0000000 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/processingworkshop/vo/ProcessingWorkshopPageReqVO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cjy.traceability.module.traceability.controller.admin.processingworkshop.vo; - -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.cjy.traceability.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static com.cjy.traceability.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 加工车间分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class ProcessingWorkshopPageReqVO extends PageParam { - - @Schema(description = "车间名称", example = "李四") - private String workshopName; - - @Schema(description = "省") - private String areaProvince; - - @Schema(description = "市") - private String areaCity; - - @Schema(description = "县") - private String areaCounty; - - @Schema(description = "详细地址") - private String address; - - @Schema(description = "经度") - private String lon; - - @Schema(description = "纬度") - private String lat; - - @Schema(description = "车间面积") - private String workshopArea; - - @Schema(description = "负责人") - private String principal; - - @Schema(description = "联系电话") - private String contactNumber; - - @Schema(description = "车间状态1启用 2未启用") - private Integer state; - - @Schema(description = "车间图片") - private String workshopImage; - - @Schema(description = "数据状态 新增：0 修改：1删除：2") - private String delFlag; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/processingworkshop/vo/ProcessingWorkshopRespVO.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/processingworkshop/vo/ProcessingWorkshopRespVO.java deleted file mode 100644 index 4b4932a..0000000 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/processingworkshop/vo/ProcessingWorkshopRespVO.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.cjy.traceability.module.traceability.controller.admin.processingworkshop.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 加工车间 Response VO") -@Data -@ExcelIgnoreUnannotated -public class ProcessingWorkshopRespVO { - - @Schema(description = "唯一id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21784") - @ExcelProperty("唯一id") - private Long id; - - @Schema(description = "车间名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - @ExcelProperty("车间名称") - private String workshopName; - - @Schema(description = "省") - @ExcelProperty("省") - private String areaProvince; - - @Schema(description = "市") - @ExcelProperty("市") - private String areaCity; - - @Schema(description = "县") - @ExcelProperty("县") - private String areaCounty; - - @Schema(description = "详细地址") - @ExcelProperty("详细地址") - private String address; - - @Schema(description = "经度") - @ExcelProperty("经度") - private String lon; - - @Schema(description = "纬度") - @ExcelProperty("纬度") - private String lat; - - @Schema(description = "车间面积") - @ExcelProperty("车间面积") - private String workshopArea; - - @Schema(description = "负责人") - @ExcelProperty("负责人") - private String principal; - - @Schema(description = "联系电话") - @ExcelProperty("联系电话") - private String contactNumber; - - @Schema(description = "车间状态1启用 2未启用", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("车间状态1启用 2未启用") - private Integer state; - - @Schema(description = "车间图片") - @ExcelProperty("车间图片") - private String workshopImage; - - @Schema(description = "数据状态 新增：0 修改：1删除：2", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("数据状态 新增：0 修改：1删除：2") - private String delFlag; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("创建时间") - private LocalDateTime createTime; - -} \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/processingworkshop/vo/ProcessingWorkshopSaveReqVO.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/processingworkshop/vo/ProcessingWorkshopSaveReqVO.java deleted file mode 100644 index c3043a7..0000000 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/processingworkshop/vo/ProcessingWorkshopSaveReqVO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cjy.traceability.module.traceability.controller.admin.processingworkshop.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; - -@Schema(description = "管理后台 - 加工车间新增/修改 Request VO") -@Data -public class ProcessingWorkshopSaveReqVO { - - @Schema(description = "唯一id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21784") - private Long id; - - @Schema(description = "车间名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - @NotEmpty(message = "车间名称不能为空") - private String workshopName; - - @Schema(description = "省") - private String areaProvince; - - @Schema(description = "市") - private String areaCity; - - @Schema(description = "县") - private String areaCounty; - - @Schema(description = "详细地址") - private String address; - - @Schema(description = "经度") - private String lon; - - @Schema(description = "纬度") - private String lat; - - @Schema(description = "车间面积") - private String workshopArea; - - @Schema(description = "负责人") - private String principal; - - @Schema(description = "联系电话") - private String contactNumber; - - @Schema(description = "车间状态1启用 2未启用", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "车间状态1启用 2未启用不能为空") - private Integer state; - - @Schema(description = "车间图片") - private String workshopImage; - - @Schema(description = "数据状态 新增：0 修改：1删除：2", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "数据状态 新增：0 修改：1删除：2不能为空") - private String delFlag; - -} \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/processingworkshop/ProcessingWorkshopDO.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/processingworkshop/ProcessingWorkshopDO.java deleted file mode 100644 index 118d053..0000000 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/processingworkshop/ProcessingWorkshopDO.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.cjy.traceability.module.traceability.dal.dataobject.processingworkshop; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.cjy.traceability.framework.mybatis.core.dataobject.BaseDO; - -/** - * 加工车间 DO - * - * @author 芋道源码 - */ -@TableName("traceability_processing_workshop") -@KeySequence("traceability_processing_workshop_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class ProcessingWorkshopDO extends BaseDO { - - /** - * 唯一id - */ - @TableId - private Long id; - /** - * 车间名称 - */ - private String workshopName; - /** - * 省 - */ - private String areaProvince; - /** - * 市 - */ - private String areaCity; - /** - * 县 - */ - private String areaCounty; - /** - * 详细地址 - */ - private String address; - /** - * 经度 - */ - private String lon; - /** - * 纬度 - */ - private String lat; - /** - * 车间面积 - */ - private String workshopArea; - /** - * 负责人 - */ - private String principal; - /** - * 联系电话 - */ - private String contactNumber; - /** - * 车间状态1启用 2未启用 - */ - private Integer state; - /** - * 车间图片 - */ - private String workshopImage; - /** - * 数据状态 新增：0 修改：1删除：2 - */ - private String delFlag; - -} \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/processingworkshop/ProcessingWorkshopMapper.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/processingworkshop/ProcessingWorkshopMapper.java deleted file mode 100644 index f3118e6..0000000 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/processingworkshop/ProcessingWorkshopMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cjy.traceability.module.traceability.dal.mysql.processingworkshop; - -import java.util.*; - -import com.cjy.traceability.framework.common.pojo.PageResult; -import com.cjy.traceability.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cjy.traceability.framework.mybatis.core.mapper.BaseMapperX; -import com.cjy.traceability.module.traceability.dal.dataobject.processingworkshop.ProcessingWorkshopDO; -import org.apache.ibatis.annotations.Mapper; -import com.cjy.traceability.module.traceability.controller.admin.processingworkshop.vo.*; - -/** - * 加工车间 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface ProcessingWorkshopMapper extends BaseMapperX { - - default PageResult selectPage(ProcessingWorkshopPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(ProcessingWorkshopDO::getWorkshopName, reqVO.getWorkshopName()) - .eqIfPresent(ProcessingWorkshopDO::getAreaProvince, reqVO.getAreaProvince()) - .eqIfPresent(ProcessingWorkshopDO::getAreaCity, reqVO.getAreaCity()) - .eqIfPresent(ProcessingWorkshopDO::getAreaCounty, reqVO.getAreaCounty()) - .eqIfPresent(ProcessingWorkshopDO::getAddress, reqVO.getAddress()) - .eqIfPresent(ProcessingWorkshopDO::getLon, reqVO.getLon()) - .eqIfPresent(ProcessingWorkshopDO::getLat, reqVO.getLat()) - .eqIfPresent(ProcessingWorkshopDO::getWorkshopArea, reqVO.getWorkshopArea()) - .eqIfPresent(ProcessingWorkshopDO::getPrincipal, reqVO.getPrincipal()) - .eqIfPresent(ProcessingWorkshopDO::getContactNumber, reqVO.getContactNumber()) - .eqIfPresent(ProcessingWorkshopDO::getState, reqVO.getState()) - .eqIfPresent(ProcessingWorkshopDO::getWorkshopImage, reqVO.getWorkshopImage()) - .eqIfPresent(ProcessingWorkshopDO::getDelFlag, reqVO.getDelFlag()) - .betweenIfPresent(ProcessingWorkshopDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(ProcessingWorkshopDO::getId)); - } - -} \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/processingworkshop/ProcessingWorkshopService.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/processingworkshop/ProcessingWorkshopService.java deleted file mode 100644 index 076506a..0000000 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/processingworkshop/ProcessingWorkshopService.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cjy.traceability.module.traceability.service.processingworkshop; - -import java.util.*; -import javax.validation.*; -import com.cjy.traceability.module.traceability.controller.admin.processingworkshop.vo.*; -import com.cjy.traceability.module.traceability.dal.dataobject.processingworkshop.ProcessingWorkshopDO; -import com.cjy.traceability.framework.common.pojo.PageResult; -import com.cjy.traceability.framework.common.pojo.PageParam; - -/** - * 加工车间 Service 接口 - * - * @author 芋道源码 - */ -public interface ProcessingWorkshopService { - - /** - * 创建加工车间 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createProcessingWorkshop(@Valid ProcessingWorkshopSaveReqVO createReqVO); - - /** - * 更新加工车间 - * - * @param updateReqVO 更新信息 - */ - void updateProcessingWorkshop(@Valid ProcessingWorkshopSaveReqVO updateReqVO); - - /** - * 删除加工车间 - * - * @param id 编号 - */ - void deleteProcessingWorkshop(Long id); - - /** - * 获得加工车间 - * - * @param id 编号 - * @return 加工车间 - */ - ProcessingWorkshopDO getProcessingWorkshop(Long id); - - /** - * 获得加工车间分页 - * - * @param pageReqVO 分页查询 - * @return 加工车间分页 - */ - PageResult getProcessingWorkshopPage(ProcessingWorkshopPageReqVO pageReqVO); - -} \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/processingworkshop/ProcessingWorkshopServiceImpl.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/processingworkshop/ProcessingWorkshopServiceImpl.java deleted file mode 100644 index d659d16..0000000 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/processingworkshop/ProcessingWorkshopServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.cjy.traceability.module.traceability.service.processingworkshop; - -import com.cjy.traceability.framework.common.pojo.PageResult; -import com.cjy.traceability.framework.common.util.object.BeanUtils; -import com.cjy.traceability.module.traceability.controller.admin.processingworkshop.vo.ProcessingWorkshopPageReqVO; -import com.cjy.traceability.module.traceability.controller.admin.processingworkshop.vo.ProcessingWorkshopSaveReqVO; -import com.cjy.traceability.module.traceability.dal.dataobject.processingworkshop.ProcessingWorkshopDO; -import com.cjy.traceability.module.traceability.dal.mysql.processingworkshop.ProcessingWorkshopMapper; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; - -import static com.cjy.traceability.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cjy.traceability.module.traceability.enums.ErrorCodeConstants.*; - -/** - * 加工车间 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class ProcessingWorkshopServiceImpl implements ProcessingWorkshopService { - - @Resource - private ProcessingWorkshopMapper processingWorkshopMapper; - - @Override - public Long createProcessingWorkshop(ProcessingWorkshopSaveReqVO createReqVO) { - // 插入 - ProcessingWorkshopDO processingWorkshop = BeanUtils.toBean(createReqVO, ProcessingWorkshopDO.class); - processingWorkshopMapper.insert(processingWorkshop); - // 返回 - return processingWorkshop.getId(); - } - - @Override - public void updateProcessingWorkshop(ProcessingWorkshopSaveReqVO updateReqVO) { - // 校验存在 - validateProcessingWorkshopExists(updateReqVO.getId()); - // 更新 - ProcessingWorkshopDO updateObj = BeanUtils.toBean(updateReqVO, ProcessingWorkshopDO.class); - processingWorkshopMapper.updateById(updateObj); - } - - @Override - public void deleteProcessingWorkshop(Long id) { - // 校验存在 - validateProcessingWorkshopExists(id); - // 删除 - processingWorkshopMapper.deleteById(id); - } - - private void validateProcessingWorkshopExists(Long id) { - if (processingWorkshopMapper.selectById(id) == null) { - throw exception(PROCESSING_WORKSHOP_NOT_EXISTS); - } - } - - @Override - public ProcessingWorkshopDO getProcessingWorkshop(Long id) { - return processingWorkshopMapper.selectById(id); - } - - @Override - public PageResult getProcessingWorkshopPage(ProcessingWorkshopPageReqVO pageReqVO) { - return processingWorkshopMapper.selectPage(pageReqVO); - } - -} \ No newline at end of file diff --git a/cjy-module-traceability/pom.xml b/cjy-module-traceability/pom.xml index 676ff79..f693b45 100644 --- a/cjy-module-traceability/pom.xml +++ b/cjy-module-traceability/pom.xml @@ -6,14 +6,13 @@ com.cjy cjy - 2.0.1-jdk8-snapshot - + ${revision} cjy-module-traceability-api cjy-module-traceability-biz - + ${project.artifactId} cjy-module-traceability pom diff --git a/cjy-server/.flattened-pom.xml b/cjy-server/.flattened-pom.xml deleted file mode 100644 index 6969a84..0000000 --- a/cjy-server/.flattened-pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - - com.cjy - cjy - 2.0.1-jdk8-snapshot - - com.cjy - cjy-server - 2.0.1-jdk8-snapshot - ${project.artifactId} - 后端 Server 的主项目，通过引入需要 cjy-module-xxx 的依赖， - 从而实现提供 RESTful API 给 cjy-ui-admin、cjy-ui-user 等前端项目。 - 本质上来说，它就是个空壳（容器）！ - https://github.com/YunaiV/ruoyi-vue-pro - - - com.cjy - cjy-module-system-biz - ${revision} - - - com.cjy - cjy-module-infra-biz - ${revision} - - - com.cjy - cjy-module-report-biz - ${revision} - - - org.springframework.boot - spring-boot-configuration-processor - true - - - com.cjy - cjy-spring-boot-starter-protection - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - - repackage - - - - - - - diff --git a/cjy-server/pom.xml b/cjy-server/pom.xml index b3a47e7..a7b99bd 100644 --- a/cjy-server/pom.xml +++ b/cjy-server/pom.xml @@ -45,6 +45,11 @@ cjy-module-report-biz ${revision} + + com.cjy + cjy-module-traceability-biz + ${revision} +