From 074a2ae28d6053d27f5de0d6b76f6a81071aa70f Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 1 Jun 2023 14:15:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-algorithm/algorithm-api/pom.xml | 7 +------ .../java/com/njcn/autocode/utils/GenerateCode.java | 8 ++++---- pqs-common/common-db/pom.xml | 10 +++++----- .../main/java/com/njcn/db/config/MybatisConfig.java | 8 ++++---- .../main/java/com/njcn/db/handler/BatchInjector.java | 3 ++- .../mapper/{BatchMapper.java => BatchBaseMapper.java} | 2 +- pqs-device/pq-device/pq-device-api/pom.xml | 9 +-------- pqs-prepare/prepare-boot/pom.xml | 6 ------ .../main/java/com/njcn/prepare/PrepareApplication.java | 3 --- pqs-process/process-api/pom.xml | 7 +------ pqs-process/process-boot/pom.xml | 7 +------ .../main/java/com/njcn/process/ProcessApplication.java | 2 -- pqs-system/system-api/pom.xml | 5 +---- .../src/main/java/com/njcn/system/SystemBootMain.java | 2 -- .../java/com/njcn/system/mapper/UserLogMapper.java | 5 ++--- 15 files changed, 23 insertions(+), 61 deletions(-) rename pqs-common/common-db/src/main/java/com/njcn/db/mapper/{BatchMapper.java => BatchBaseMapper.java} (82%) diff --git a/pqs-algorithm/algorithm-api/pom.xml b/pqs-algorithm/algorithm-api/pom.xml index 2a9f51a6a..07686f726 100644 --- a/pqs-algorithm/algorithm-api/pom.xml +++ b/pqs-algorithm/algorithm-api/pom.xml @@ -28,12 +28,7 @@ ${project.version} - - com.github.jeffreyning - mybatisplus-plus - 1.5.1-RELEASE - compile - + org.projectlombok lombok diff --git a/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java b/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java index ba1f6dc01..6c7685006 100644 --- a/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java +++ b/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java @@ -19,9 +19,9 @@ import java.util.stream.Stream; */ public class GenerateCode { - private static final String TARGET_DIR = "C://code"; + private static final String TARGET_DIR = "D://code"; - private static final String DB_URL = "jdbc:mysql://192.168.1.18:13306/pqsinfo_test"; + private static final String DB_URL = "jdbc:mysql://192.168.1.18:13306/pqsinfo_hb_pv"; private static final String USERNAME = "root"; @@ -30,8 +30,8 @@ public class GenerateCode { public static void main(String[] args) { List modules = Stream.of( - new Module("xuyang", "com.njcn.access", "zl", Stream.of( - "ele_epd_pqd" + new Module("hongawen", "com.hongawen.mybatis", "zl", Stream.of( + "r_dis_mp_measure_phase_report_d" ).collect(Collectors.toList()), "") ).collect(Collectors.toList()); generateJavaFile(modules); diff --git a/pqs-common/common-db/pom.xml b/pqs-common/common-db/pom.xml index c160a2fd6..7f60c489e 100644 --- a/pqs-common/common-db/pom.xml +++ b/pqs-common/common-db/pom.xml @@ -26,6 +26,10 @@ common-web ${project.version} + + com.github.jeffreyning + mybatisplus-plus + org.mybatis.spring.boot @@ -53,11 +57,7 @@ com.baomidou mybatis-plus-boot-starter - - - - - + diff --git a/pqs-common/common-db/src/main/java/com/njcn/db/config/MybatisConfig.java b/pqs-common/common-db/src/main/java/com/njcn/db/config/MybatisConfig.java index 7835b81e8..358e1ad5d 100644 --- a/pqs-common/common-db/src/main/java/com/njcn/db/config/MybatisConfig.java +++ b/pqs-common/common-db/src/main/java/com/njcn/db/config/MybatisConfig.java @@ -43,10 +43,10 @@ public class MybatisConfig { * @date 2023/5/30 14:53 * @return BatchInjector */ -// @Bean -// public BatchInjector BatchInjector() { -// return new BatchInjector(); -// } + @Bean + public BatchInjector BatchInjector() { + return new BatchInjector(); + } } diff --git a/pqs-common/common-db/src/main/java/com/njcn/db/handler/BatchInjector.java b/pqs-common/common-db/src/main/java/com/njcn/db/handler/BatchInjector.java index 94788f3e2..d083c6d1c 100644 --- a/pqs-common/common-db/src/main/java/com/njcn/db/handler/BatchInjector.java +++ b/pqs-common/common-db/src/main/java/com/njcn/db/handler/BatchInjector.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector; import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn; +import com.github.jeffreyning.mybatisplus.base.MppSqlInjector; import java.util.List; @@ -12,7 +13,7 @@ import java.util.List; * @version 1.0.0 * @date 2023年05月30日 14:51 */ -public class BatchInjector extends DefaultSqlInjector { +public class BatchInjector extends MppSqlInjector { @Override public List getMethodList(Class mapperClass) { diff --git a/pqs-common/common-db/src/main/java/com/njcn/db/mapper/BatchMapper.java b/pqs-common/common-db/src/main/java/com/njcn/db/mapper/BatchBaseMapper.java similarity index 82% rename from pqs-common/common-db/src/main/java/com/njcn/db/mapper/BatchMapper.java rename to pqs-common/common-db/src/main/java/com/njcn/db/mapper/BatchBaseMapper.java index a4687c5c9..e8720f825 100644 --- a/pqs-common/common-db/src/main/java/com/njcn/db/mapper/BatchMapper.java +++ b/pqs-common/common-db/src/main/java/com/njcn/db/mapper/BatchBaseMapper.java @@ -9,7 +9,7 @@ import java.util.List; * @version 1.0.0 * @date 2023年05月30日 14:54 */ -public interface BatchMapper extends BaseMapper { +public interface BatchBaseMapper extends BaseMapper { /** * 真正的批量插入 diff --git a/pqs-device/pq-device/pq-device-api/pom.xml b/pqs-device/pq-device/pq-device-api/pom.xml index 5d1a712d1..4d18af850 100644 --- a/pqs-device/pq-device/pq-device-api/pom.xml +++ b/pqs-device/pq-device/pq-device-api/pom.xml @@ -22,13 +22,6 @@ common-device-biz ${project.version} - - com.github.jeffreyning - mybatisplus-plus - - - com.github.jeffreyning - mybatisplus-plus - + diff --git a/pqs-prepare/prepare-boot/pom.xml b/pqs-prepare/prepare-boot/pom.xml index ae88621a6..d1d8b0724 100644 --- a/pqs-prepare/prepare-boot/pom.xml +++ b/pqs-prepare/prepare-boot/pom.xml @@ -90,12 +90,6 @@ ${project.version} compile - - com.github.jeffreyning - mybatisplus-plus - 1.5.1-RELEASE - compile - org.mapstruct mapstruct diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareApplication.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareApplication.java index bc639fb61..dae94963f 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareApplication.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareApplication.java @@ -1,12 +1,10 @@ package com.njcn.prepare; -import com.github.jeffreyning.mybatisplus.conf.EnableMPP; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.DependsOn; /** * @author hongawen @@ -17,7 +15,6 @@ import org.springframework.context.annotation.DependsOn; @MapperScan("com.njcn.**.mapper") @EnableFeignClients(basePackages = "com.njcn") @SpringBootApplication(scanBasePackages = "com.njcn") -@EnableMPP public class PrepareApplication { public static void main(String[] args) { diff --git a/pqs-process/process-api/pom.xml b/pqs-process/process-api/pom.xml index 402e5c50c..ee25454bc 100644 --- a/pqs-process/process-api/pom.xml +++ b/pqs-process/process-api/pom.xml @@ -54,12 +54,7 @@ compile - - com.github.jeffreyning - mybatisplus-plus - 1.5.1-RELEASE - compile - + com.njcn prepare-api diff --git a/pqs-process/process-boot/pom.xml b/pqs-process/process-boot/pom.xml index 92a2fb884..a8be926fb 100644 --- a/pqs-process/process-boot/pom.xml +++ b/pqs-process/process-boot/pom.xml @@ -67,12 +67,7 @@ ${project.version} - - com.github.jeffreyning - mybatisplus-plus - 1.5.1-RELEASE - compile - + com.belerweb pinyin4j diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/ProcessApplication.java b/pqs-process/process-boot/src/main/java/com/njcn/process/ProcessApplication.java index 77b88204b..494de5864 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/ProcessApplication.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/ProcessApplication.java @@ -1,6 +1,5 @@ package com.njcn.process; -import com.github.jeffreyning.mybatisplus.conf.EnableMPP; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -17,7 +16,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @MapperScan("com.njcn.**.mapper") @EnableFeignClients(basePackages = "com.njcn") @SpringBootApplication(scanBasePackages = "com.njcn") -@EnableMPP public class ProcessApplication { public static void main(String[] args) { diff --git a/pqs-system/system-api/pom.xml b/pqs-system/system-api/pom.xml index d32937665..08412f66c 100644 --- a/pqs-system/system-api/pom.xml +++ b/pqs-system/system-api/pom.xml @@ -39,10 +39,7 @@ 4.4.0 compile - - com.github.jeffreyning - mybatisplus-plus - + com.alibaba easyexcel diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/SystemBootMain.java b/pqs-system/system-boot/src/main/java/com/njcn/system/SystemBootMain.java index 596cd53a3..b1ad05045 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/SystemBootMain.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/SystemBootMain.java @@ -1,6 +1,5 @@ package com.njcn.system; -import com.github.jeffreyning.mybatisplus.conf.EnableMPP; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -16,7 +15,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @MapperScan("com.njcn.**.mapper") @EnableFeignClients(basePackages = "com.njcn") @SpringBootApplication(scanBasePackages = "com.njcn") -@EnableMPP public class SystemBootMain { public static void main(String[] args) { SpringApplication.run(SystemBootMain.class, args); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/UserLogMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/UserLogMapper.java index 9bc5b2520..a09effe34 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/UserLogMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/UserLogMapper.java @@ -1,11 +1,10 @@ package com.njcn.system.mapper; -import com.njcn.db.mapper.BatchMapper; +import com.njcn.db.mapper.BatchBaseMapper; import com.njcn.system.excel.UserLogExcel; import com.njcn.system.pojo.po.UserLog; import org.apache.ibatis.annotations.Param; -import java.util.HashSet; import java.util.List; @@ -17,7 +16,7 @@ import java.util.List; * @author hongawen * @since 2021-12-13 */ -public interface UserLogMapper extends BatchMapper { +public interface UserLogMapper extends BatchBaseMapper { /**