From 4a59a2d8a8951981ad8d3fb624b6fbae90225783 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 26 Nov 2024 12:02:24 +0800
Subject: [PATCH] 三道防线查询及应急空间导入调整
---
src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java b/src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java
index 35c3c45..2b5a360 100644
--- a/src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java
@@ -60,17 +60,21 @@
for (EmergencySpaceExcel emergencySpaceExcel : data) {
// 数据拷贝
EmergencySpaceEntity emergencySpaceEntity = Objects.requireNonNull(BeanUtil.copy(emergencySpaceExcel, EmergencySpaceEntity.class));
- // 防控转换
+ // 类型转换
+ if (!Strings.isBlank(emergencySpaceExcel.getType())){
+ emergencySpaceEntity.setType(Integer.parseInt(emergencySpaceExcel.getType()));
+ }
+ // 防控级别转换
if (!Strings.isBlank(emergencySpaceExcel.getPreLevel())){
emergencySpaceEntity.setPreLevel(Integer.parseInt(emergencySpaceExcel.getPreLevel()));
}
// 经纬度转换
- if (!Strings.isBlank(emergencySpaceExcel.getLng())) {
- emergencySpaceEntity.setLng(PositionUtil.tranformPos(emergencySpaceExcel.getLng()).toString());
- }
- if (!Strings.isBlank(emergencySpaceExcel.getLat())) {
- emergencySpaceEntity.setLat(PositionUtil.tranformPos(emergencySpaceExcel.getLat()).toString());
- }
+// if (!Strings.isBlank(emergencySpaceExcel.getLng())) {
+// emergencySpaceEntity.setLng(PositionUtil.tranformPos(emergencySpaceExcel.getLng()).toString());
+// }
+// if (!Strings.isBlank(emergencySpaceExcel.getLat())) {
+// emergencySpaceEntity.setLat(PositionUtil.tranformPos(emergencySpaceExcel.getLat()).toString());
+// }
// 设置企业id
setFirm(emergencySpaceExcel,emergencySpaceEntity);
// 是否已入库
@@ -98,6 +102,9 @@
QueryWrapper<EmergencySpaceEntity> wrapper = new QueryWrapper<>();
wrapper.eq("name",emergencySpaceEntity.getName())
.eq("is_deleted",0);
+ if (null!=emergencySpaceEntity.getFirmId()){
+ wrapper.eq("firm_id",emergencySpaceEntity.getFirmId());
+ }
EmergencySpaceEntity one = getOne(wrapper);
if (null!=one){
return one.getId();
--
Gitblit v1.9.3