From 9a52c9f6d5d824c367e1cc0c5d07f0cf0cb8a428 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期一, 24 六月 2024 18:13:09 +0800
Subject: [PATCH] 登录界面字体特效
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 70 insertions(+), 45 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 088a3ee..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
@@ -110,44 +110,43 @@
*/
@Override
public int deleteHoleByIds(String ids) {
-
// 鎵归噺鍒犻櫎閽诲瓟涓嬮潰鐨勫叧鑱旀暟鎹�
- String[] strings = Convert.toStrArray(ids);
- if (!ObjectUtils.isEmpty(strings)) {
- for (String holeId : strings) {
-
- // =======鏍囪疮==========
- List<HoleBiaoguan> biaoguans = holeBiaoguanMapper.selectHoleBiaoguanByHoleId(holeId);
- String[] biaoguanIds = biaoguans.stream().map(HoleBiaoguan::getIds).toArray(String[]::new);
-
- // =======鍥炴==========
- List<HoleHuici> holeHuicis = holeHuiciMapper.selectHoleHuiciByHoleId(holeId);
- String[] huiCiIds = holeHuicis.stream().map(HoleHuici::getIds).toArray(String[]::new);
-
- // =======浜哄憳==========
- List<HolePerson> persons = holePersonMapper.selectHolePersonByHoleId(holeId);
- String[] personIds = persons.stream().map(HolePerson::getIds).toArray(String[]::new);
-
- // =======鍙栧湡==========
- List<HoleQutu> qutus = holeQutuMapper.selectHoleQutuByHoleId(holeId);
- String[] qutuIds = qutus.stream().map(HoleQutu::getIds).toArray(String[]::new);
-
- // =======姘翠綅==========
- List<HoleShuiwei> shuiweis = holeShuiweiMapper.selectHoleShuiWeiByHoleId(holeId);
- String[] shuiweiIds = shuiweis.stream().map(HoleShuiwei::getIds).toArray(String[]::new);
-
- // =======宀╁湡==========
- List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuListByHoleId(holeId);
- String[] yantusIds = yantus.stream().map(HoleYantu::getIds).toArray(String[]::new);
-
- holeBiaoguanMapper.deleteHoleBiaoguanByIds(biaoguanIds);
- holeHuiciMapper.deleteHoleHuiciByIds(huiCiIds);
- holePersonMapper.deleteHolePersonByIds(personIds);
- holeQutuMapper.deleteHoleQutuByIds(qutuIds);
- holeShuiweiMapper.deleteHoleShuiweiByIds(shuiweiIds);
- holeYantuMapper.deleteHoleYantuByIds(yantusIds);
- }
- }
+// String[] strings = Convert.toStrArray(ids);
+// if (!ObjectUtils.isEmpty(strings)) {
+// for (String holeId : strings) {
+//
+// // =======鏍囪疮==========
+// List<HoleBiaoguan> biaoguans = holeBiaoguanMapper.selectHoleBiaoguanByHoleId(holeId);
+// String[] biaoguanIds = biaoguans.stream().map(HoleBiaoguan::getIds).toArray(String[]::new);
+//
+// // =======鍥炴==========
+// List<HoleHuici> holeHuicis = holeHuiciMapper.selectHoleHuiciByHoleId(holeId);
+// String[] huiCiIds = holeHuicis.stream().map(HoleHuici::getIds).toArray(String[]::new);
+//
+// // =======浜哄憳==========
+// List<HolePerson> persons = holePersonMapper.selectHolePersonByHoleId(holeId);
+// String[] personIds = persons.stream().map(HolePerson::getIds).toArray(String[]::new);
+//
+// // =======鍙栧湡==========
+// List<HoleQutu> qutus = holeQutuMapper.selectHoleQutuByHoleId(holeId);
+// String[] qutuIds = qutus.stream().map(HoleQutu::getIds).toArray(String[]::new);
+//
+// // =======姘翠綅==========
+// List<HoleShuiwei> shuiweis = holeShuiweiMapper.selectHoleShuiWeiByHoleId(holeId);
+// String[] shuiweiIds = shuiweis.stream().map(HoleShuiwei::getIds).toArray(String[]::new);
+//
+// // =======宀╁湡==========
+// List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuListByHoleId(holeId);
+// String[] yantusIds = yantus.stream().map(HoleYantu::getIds).toArray(String[]::new);
+//
+// holeBiaoguanMapper.deleteHoleBiaoguanByIds(biaoguanIds);
+// holeHuiciMapper.deleteHoleHuiciByIds(huiCiIds);
+// holePersonMapper.deleteHolePersonByIds(personIds);
+// holeQutuMapper.deleteHoleQutuByIds(qutuIds);
+// holeShuiweiMapper.deleteHoleShuiweiByIds(shuiweiIds);
+// holeYantuMapper.deleteHoleYantuByIds(yantusIds);
+// }
+// }
return holeMapper.deleteHoleByIds(Convert.toStrArray(ids));
}
@@ -171,9 +170,11 @@
try {
String dest = saveExcel(file);
List<Hole> list = readData(dest);
- for (Hole item : list) {
-
- insertHole(item);
+ if(!ObjectUtils.isEmpty(list)){
+ for (Hole item : list) {
+ item.setProjectId(projectId);
+ insertHole(item);
+ }
}
} catch (Exception e) {
return e.toString();
@@ -181,13 +182,34 @@
return "瀵煎叆瀹屾瘯" ;
}
+ /**
+ * 鎬昏繘搴�
+ * @return
+ */
+ @Override
+ public Hole selectHoleTotalProcess() {
+ return holeMapper.selectHoleTotalProcess();
+ }
+
+ /**
+ * 鍦哄湴杩涘害
+ * @return
+ */
+ @Override
+ public List<Hole> selectHoleProjectProcess() {
+ return holeMapper.selectHoleProjectProcess();
+ }
+
+
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);
@@ -200,11 +222,14 @@
private List<Hole> readData(String filepath) {
ExcelReader reader = ExcelUtil.getReader(filepath, 0);
reader.addHeaderAlias("閽诲瓟缂栧彿", "code");
- reader.addHeaderAlias("瀛斿彛楂樼▼", "elevation");
- reader.addHeaderAlias("璁捐瀛旀繁", "depth");
+ reader.addHeaderAlias("閽诲瓟绫诲瀷", "type");
+ reader.addHeaderAlias("瀛斿彛楂樼▼(m)", "elevation");
+ reader.addHeaderAlias("璁捐瀛旀繁(m)", "depth");
+ reader.addHeaderAlias("閽诲瓟鐘舵��", "status");
reader.addHeaderAlias("閽诲瓟缁忓害", "longitude");
reader.addHeaderAlias("閽诲瓟绾害", "latitude");
- reader.addHeaderAlias("杩涘害", "pic1");
+ reader.addHeaderAlias("鎬昏繘灏�(m)", "footage");
+ reader.addHeaderAlias("宸插畬鎴愯繘灏�(m)", "footageCpl");
List<Hole> list = reader.readAll(Hole.class);
return list;
--
Gitblit v1.9.1