From 2cdd27390521349c69348a56255ef754ef19d92c Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 12 六月 2024 17:16:00 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
index 6db62e6..405098b 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
@@ -202,12 +202,14 @@
private String saveExcel(MultipartFile file) {
+ String fileSaveDir2 = Global.getProfile() + "\\template\\" ;
+
String filename = file.getOriginalFilename();
- File dir = new File(fileSaveDir);
+ File dir = new File(fileSaveDir2);
if (!dir.exists()) {
dir.mkdir();
}
- String addr = fileSaveDir + filename;
+ String addr = fileSaveDir2 + filename;
try {
File dest = new File(addr);
file.transferTo(dest);
@@ -220,8 +222,10 @@
private List<Hole> readData(String filepath) {
ExcelReader reader = ExcelUtil.getReader(filepath, 0);
reader.addHeaderAlias("閽诲瓟缂栧彿", "code");
+ reader.addHeaderAlias("閽诲瓟绫诲瀷", "type");
reader.addHeaderAlias("瀛斿彛楂樼▼(m)", "elevation");
reader.addHeaderAlias("璁捐瀛旀繁(m)", "depth");
+ reader.addHeaderAlias("閽诲瓟鐘舵��", "status");
reader.addHeaderAlias("閽诲瓟缁忓害", "longitude");
reader.addHeaderAlias("閽诲瓟绾害", "latitude");
reader.addHeaderAlias("鎬昏繘灏�(m)", "footage");
--
Gitblit v1.9.1