From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 69 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/UploadController.java b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
index 7d5ee1d..b9ab916 100644
--- a/src/main/java/com/lf/server/controller/data/upload/UploadController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
@@ -2,7 +2,7 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.entity.all.ResponseMsg;
-import com.lf.server.entity.all.StaticData;
+import com.lf.server.entity.ctrl.KeyValueEntity;
import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
@@ -21,7 +21,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
-import java.util.Map;
/**
* 鏁版嵁鍏ュ簱
@@ -46,7 +45,8 @@
return success(pathName);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ log.error(ex.getMessage(), ex);
+ return fail(ex, null);
}
}
@@ -59,7 +59,7 @@
@PostMapping(value = "/uploadFiles")
public ResponseMsg<Object> uploadFiles(String path, HttpServletRequest req, HttpServletResponse res) {
try {
- List<MetaFileEntity> list = uploadService.uploadData(null, path, req, res);
+ List<MetaFileEntity> list = uploadService.uploadData(null, path, false, req, res);
if (null == list || list.isEmpty()) {
return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
}
@@ -68,7 +68,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -82,12 +82,16 @@
@ApiOperation(value = "涓婁紶Excel闄勪欢")
@ApiImplicitParams({
@ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query"),
- @ApiImplicitParam(name = "ids", value = "鍏冩暟鎹泦鍚�", dataType = "Integer", paramType = "query")
+ @ApiImplicitParam(name = "ids", value = "鍏冩暟鎹泦鍚�", dataType = "Integer", allowMultiple = true, paramType = "query")
})
@ResponseBody
@PostMapping(value = "/uploadXlsAnnex")
public ResponseMsg<Object> uploadXlsAnnex(String path, Integer[] ids, HttpServletRequest req, HttpServletResponse res) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
if (null == ids || ids.length == 0) {
return fail("鎵句笉鍒板厓鏁版嵁鐨処D闆嗗悎");
}
@@ -97,19 +101,19 @@
return fail("鎵句笉鍒拌涓婁紶闄勪欢鐨勫厓鏁版嵁");
}
- List<MetaFileEntity> list = uploadService.uploadData(null, path, req, res);
+ List<MetaFileEntity> list = uploadService.uploadData(null, path, false, req, res);
if (null == list || list.isEmpty()) {
return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
}
- Map<String, Integer> map = uploadAttachService.uploadXlsAnnex(ms, list);
- if (null == map || map.size() == 0) {
+ List<KeyValueEntity> rs = uploadAttachService.uploadXlsAnnex(ue, ms, list, path);
+ if (null == rs || rs.size() == 0) {
return fail("娌℃湁瑕佹洿鏂扮殑鍏冩暟鎹�");
}
- return success(map);
+ return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -121,11 +125,11 @@
@GetMapping(value = "/selectFiles")
public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
try {
- List<MetaFileEntity> list = uploadService.selectFiles(path, StaticData.ALL_EXTENSION);
+ List<MetaFileEntity> list = uploadService.selectFiles(path, false);
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -150,15 +154,15 @@
return success("鎴愬姛", rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "鏌ヨ鏄犲皠")
@ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20230110010101"),
- @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "163"),
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20230722"),
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "verid", value = "鐗堟湰ID", dataType = "Integer", paramType = "query", example = "0"),
@ApiImplicitParam(name = "epsgCode", value = "鍧愭爣缂栫爜", dataType = "String", paramType = "query", example = "EPSG:4490")
})
@@ -185,7 +189,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -210,14 +214,39 @@
return success("鎴愬姛", list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鎻掑叆KML鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "list", value = "鍏冩暟鎹枃浠堕泦鍚�", dataType = "MetaFileEntity", paramType = "body")
+ })
+ @ResponseBody
+ @PostMapping(value = "/insertKml")
+ public ResponseMsg<Object> insertKml(@RequestBody List<MetaFileEntity> list, HttpServletRequest req){
+ try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (null == ue) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
+ if (null == list || list.isEmpty()) {
+ return fail("鍏冩暟鎹枃浠堕泦鍚堜负绌�", null);
+ }
+
+ uploadService.insertKml(ue, list);
+
+ return success("鎴愬姛", list);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "鍒犻櫎鍏冩暟鎹�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
+ @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", allowMultiple = true, example = "1")
})
@GetMapping(value = "/deleteMetas")
public ResponseMsg<Integer> deleteMetas(@RequestParam List<Integer> ids) {
@@ -230,7 +259,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
}
--
Gitblit v1.9.3