From 957ce4a101415487eb2d747a59243bfbbadccc4d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 24 Dec 2024 13:57:38 +0800
Subject: [PATCH] 相关导入和处理修改
---
src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java | 4 ++--
src/main/java/org/springblade/modules/yw/excel/SuppliesExcel.java | 7 +++++++
src/main/java/org/springblade/modules/yw/controller/TestController.java | 14 ++++++++++++++
src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/yw/excel/FirmInfoExcel.java | 4 ++--
src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java | 3 +++
src/main/resources/application-dev.yml | 2 +-
src/main/java/org/springblade/modules/yw/service/impl/ProTarServiceImpl.java | 24 ++++++++++++------------
8 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/controller/TestController.java b/src/main/java/org/springblade/modules/yw/controller/TestController.java
index 23b2fce..f3353fb 100644
--- a/src/main/java/org/springblade/modules/yw/controller/TestController.java
+++ b/src/main/java/org/springblade/modules/yw/controller/TestController.java
@@ -33,6 +33,20 @@
/**
* 测试数据处理
*/
+ @GetMapping("/all")
+ public void all(){
+ handleDataEmeSpace();
+ handleDataFac();
+ handleDataFirm();
+ handleDataInd();
+ handleDataPan();
+ handleDataPro();
+ handleDataSup();
+ }
+
+ /**
+ * 测试数据处理
+ */
@GetMapping("/emeSpace")
public void handleDataEmeSpace(){
// 查询数据
diff --git a/src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java b/src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java
index 7949e0c..54a1eea 100644
--- a/src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java
+++ b/src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java
@@ -22,7 +22,7 @@
private static final long serialVersionUID = 1L;
@ColumnWidth(20)
- @ExcelProperty("应急空间名称*")
+ @ExcelProperty("应急空间名称")
private String name;
@ColumnWidth(20)
@@ -50,7 +50,7 @@
@ExcelProperty("纬度")
private String lat;
- @ExcelProperty("可用容量(立方米)或转输(处置)能力(立方米/小时)")
+ @ExcelProperty("可用容量(立方米)（应急池）")
private Double capacity;
@ExcelProperty("备注")
diff --git a/src/main/java/org/springblade/modules/yw/excel/FirmInfoExcel.java b/src/main/java/org/springblade/modules/yw/excel/FirmInfoExcel.java
index 450927f..e92f370 100644
--- a/src/main/java/org/springblade/modules/yw/excel/FirmInfoExcel.java
+++ b/src/main/java/org/springblade/modules/yw/excel/FirmInfoExcel.java
@@ -38,8 +38,8 @@
private String address;
@ColumnWidth(20)
- @ExcelProperty(value = "行业类别",converter = ExcelDictConverter.class)
- @ExcelDictItemLabel(type = "industry_category")
+// @ExcelProperty(value = "行业类别",converter = ExcelDictConverter.class)
+// @ExcelDictItemLabel(type = "industry_category")
private String category;
@ExcelProperty("应急联络人")
diff --git a/src/main/java/org/springblade/modules/yw/excel/SuppliesExcel.java b/src/main/java/org/springblade/modules/yw/excel/SuppliesExcel.java
index 501a069..ff14aae 100644
--- a/src/main/java/org/springblade/modules/yw/excel/SuppliesExcel.java
+++ b/src/main/java/org/springblade/modules/yw/excel/SuppliesExcel.java
@@ -27,6 +27,13 @@
@ExcelProperty("仓库名称")
private String name;
+ @ExcelProperty("经度")
+ private String lng;
+
+ @ColumnWidth(20)
+ @ExcelProperty("纬度")
+ private String lat;
+
@ExcelProperty("位置")
private String address;
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 2b5a360..af3fc5c 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.DictBizCache;
import org.springblade.common.cache.SysCache;
@@ -27,6 +28,7 @@
* @author BladeX
* @since 2024-10-28
*/
+@Slf4j
@Service
public class EmergencySpaceServiceImpl extends ServiceImpl<EmergencySpaceMapper, EmergencySpaceEntity> implements IEmergencySpaceService {
@@ -77,6 +79,7 @@
// }
// 设置企业id
setFirm(emergencySpaceExcel,emergencySpaceEntity);
+ log.info("应急空间名称：{},企业名称：{}",emergencySpaceEntity.getName(),emergencySpaceExcel.getFirmName());
// 是否已入库
Long id = isSave(emergencySpaceEntity);
if (null!=id){
diff --git a/src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java b/src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java
index a182447..87dc0fc 100644
--- a/src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java
+++ b/src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java
@@ -62,7 +62,7 @@
// 数据转换
FirmInfo firmInfo = Objects.requireNonNull(BeanUtil.copy(firmInfoExcel, FirmInfo.class));
// 经纬度转换
- positionConvert(firmInfo);
+// positionConvert(firmInfo);
// 判断信息是否已录入
FirmInfo oldFirmInfo = isSave(firmInfo);
// 已存在并且不更新
diff --git a/src/main/java/org/springblade/modules/yw/service/impl/ProTarServiceImpl.java b/src/main/java/org/springblade/modules/yw/service/impl/ProTarServiceImpl.java
index c9bbe88..fdd9793 100644
--- a/src/main/java/org/springblade/modules/yw/service/impl/ProTarServiceImpl.java
+++ b/src/main/java/org/springblade/modules/yw/service/impl/ProTarServiceImpl.java
@@ -52,18 +52,18 @@
proTarEntity.setCategory(Integer.parseInt(proTarExcel.getCategory()));
}
// 经纬度处理
- if (!Strings.isBlank(proTarExcel.getLng())){
- proTarEntity.setLng(PositionUtil.tranformPos(proTarExcel.getLng()).toString());
- }
- if (!Strings.isBlank(proTarExcel.getLat())){
- proTarEntity.setLat(PositionUtil.tranformPos(proTarExcel.getLat()).toString());
- }
- if (!Strings.isBlank(proTarExcel.getEndLng())){
- proTarEntity.setEndLng(PositionUtil.tranformPos(proTarExcel.getEndLng()).toString());
- }
- if (!Strings.isBlank(proTarExcel.getEndLat())){
- proTarEntity.setEndLat(PositionUtil.tranformPos(proTarExcel.getEndLat()).toString());
- }
+// if (!Strings.isBlank(proTarExcel.getLng())){
+// proTarEntity.setLng(PositionUtil.tranformPos(proTarExcel.getLng()).toString());
+// }
+// if (!Strings.isBlank(proTarExcel.getLat())){
+// proTarEntity.setLat(PositionUtil.tranformPos(proTarExcel.getLat()).toString());
+// }
+// if (!Strings.isBlank(proTarExcel.getEndLng())){
+// proTarEntity.setEndLng(PositionUtil.tranformPos(proTarExcel.getEndLng()).toString());
+// }
+// if (!Strings.isBlank(proTarExcel.getEndLat())){
+// proTarEntity.setEndLat(PositionUtil.tranformPos(proTarExcel.getEndLat()).toString());
+// }
// 判断是否已经入库
Long id = isSave(proTarExcel);
if (null!=id){
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index bba5d51..ce48add 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
host: 127.0.0.1
port: 6379
password:
- database: 7
+ database: 11
ssl: false
##redis 集群环境配置
#cluster:
--
Gitblit v1.9.3