From edaa688bea08de0c3586583848dde2373ba56e3e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 19 Jul 2024 07:30:39 +0800
Subject: [PATCH] 代码优化
---
src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java | 4 +++-
src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java | 7 ++++++-
pom.xml | 20 ++++++++++++++++++++
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index def6489..5d0bce9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,19 @@
</dependencyManagement>
<dependencies>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
+ <version>2.7.12</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>5.3.26</version>
+ </dependency>
+
<!-- Blade -->
<dependency>
<groupId>org.springblade</groupId>
@@ -353,6 +366,13 @@
<version>23.1</version>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot</artifactId>-->
+<!-- <version>2.7.12</version>-->
+<!-- </dependency>-->
+
+
</dependencies>
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java b/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
index a21c691..2331292 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
@@ -183,11 +183,16 @@
@GetMapping("/synchronousData")
@ApiOperationSupport(order = 8)
- @ApiOperation(value = "信息同步")
+ @ApiOperation(value = "E呼基本信息入录同步到新E呼即办")
public void synchronousData() {
IECallEventService bean = SpringUtils.getBean(IECallEventService.class);
List<ECallEventEntity> list = bean.list(Wrappers.<ECallEventEntity>lambdaQuery().eq(ECallEventEntity::getIsDeleted, 0));
for (ECallEventEntity eCallEventEntity : list) {
+ long count = eCallEventTwoService.count(Wrappers.<ECallEventTwoEntity>lambdaQuery()
+ .eq(ECallEventTwoEntity::getOrderId, eCallEventEntity.getId()));
+ if (count > 0) {
+ continue;
+ }
ECallEventTwoEntity eCallEventTwoEntity = new ECallEventTwoEntity();
eCallEventTwoEntity.setLocation(eCallEventEntity.getLocation());
eCallEventTwoEntity.setSceneGeoLat(new BigDecimal(eCallEventEntity.getLat()));
diff --git a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
index 6015305..87214bf 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
@@ -364,7 +364,9 @@
} else {
menuQueryWrapper.ne(Menu::getId, menu.getId()).eq(Menu::getIsDeleted, 0).and(
wrapper -> wrapper.eq(Menu::getCode, menu.getCode()).or(
- o -> o.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY)
+ o -> o.eq(Menu::getName, menu.getName())
+ .eq(Menu::getCategory, MENU_CATEGORY)
+ .eq(Menu::getMenuType, menu.getMenuType())
)
);
}
--
Gitblit v1.9.3