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/PublishController.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/PublishController.java b/src/main/java/com/lf/server/controller/data/PublishController.java
index 7d45cc5..f7db163 100644
--- a/src/main/java/com/lf/server/controller/data/PublishController.java
+++ b/src/main/java/com/lf/server/controller/data/PublishController.java
@@ -3,14 +3,19 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.PubEntity;
import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.data.PublishEntity;
import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
import com.lf.server.service.data.LayerService;
+import com.lf.server.service.data.MetaService;
import com.lf.server.service.data.PublishService;
+import com.lf.server.service.data.RasterService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -20,6 +25,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -39,6 +46,34 @@
@Resource
LayerService layerService;
+
+ @Resource
+ MetaService metaService;
+
+ @Resource
+ RasterService rasterService;
+
+ @Resource
+ PathHelper pathHelper;
+
+ @ApiOperation(value = "娴嬭瘯鏌ヨ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "seconds", value = "绉�", dataType = "Integer", paramType = "query", example = "30")
+ })
+ @GetMapping(value = "/selectForTest")
+ public ResponseMsg<Object> selectForTest(Integer seconds) {
+ try {
+ if (null == seconds || seconds < 1) {
+ seconds = 1;
+ }
+
+ String str = publishService.selectForTest(seconds);
+
+ return success(str);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
@@ -231,6 +266,70 @@
}
@SysLog()
+ @ApiOperation(value = "鏌ヨ鏍呮牸鏁版嵁鐨勫潗鏍囩郴ID")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "ids", value = "鍏冩暟鎹甀D闆嗗悎", dataType = "Integer[]", paramType = "query", example = "10531,10527,10526")
+ })
+ @GetMapping(value = "/selectRasterCs")
+ public ResponseMsg<Object> selectRasterCs(Integer[] ids, HttpServletRequest req) {
+ try {
+ if (null == ids || ids.length == 0) {
+ return fail("鍏冩暟鎹甀D闆嗗悎涓嶈兘涓虹┖");
+ }
+
+ List<MetaEntity> list = metaService.selectByIds(StringHelper.join(Arrays.asList(ids), ","));
+ if (null == list || list.isEmpty()) {
+ return fail("鏌ユ棤鏁版嵁");
+ }
+
+ String basePath = pathHelper.getConfig().getUploadPath() + File.separator;
+ List<MetaEntity> errList = new ArrayList<>();
+ for (MetaEntity me : list) {
+ if (!StaticData.RASTER_EXT.contains("." + me.getType())) {
+ me.setBak("涓嶆槸鏍呮牸鏁版嵁");
+ errList.add(me);
+ continue;
+ }
+
+ String filePath = basePath + me.getPath();
+ File f = new File(filePath);
+ if (!f.exists() || f.isDirectory()) {
+ me.setBak("鏂囦欢涓嶅瓨鍦�");
+ errList.add(me);
+ continue;
+ }
+
+ // Integer epsg = rasterService.getRaterEpsg(filePath)
+ Integer epsg = rasterService.getEpsgByGdal(filePath);
+ if (null == epsg || epsg < 1) {
+ me.setBak("鍧愭爣绯籌D鏃犳晥");
+ errList.add(me);
+ }
+ }
+
+ return success(errList.size(), errList);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鍧愭爣杞崲")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "x", value = "X鍧愭爣", dataType = "double", paramType = "query", example = "400925.079"),
+ @ApiImplicitParam(name = "y", value = "Y鍧愭爣", dataType = "double", paramType = "query", example = "2541768.173"),
+ @ApiImplicitParam(name = "epsg", value = "EPSG缂栫爜", dataType = "int", paramType = "query", example = "4548")
+ })
+ @GetMapping(value = "/selectCsTransform")
+ public Object selectCsTransform(double x, double y, int epsg) {
+ try {
+ return rasterService.transformByProj4j(x, y, epsg);
+ } catch (Exception ex) {
+ return null;
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鎻掑叆鍙戝竷鏁版嵁")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "PubEntity", paramType = "body")
@@ -251,11 +350,9 @@
entity.setToken(WebHelper.getToken(req));
}
+ layerService.clearCache();
String method = getConvertMethod(entity.getType());
long count = publishService.postForPub(entity, method, req);
- if (count > 0) {
- layerService.clearCache();
- }
return success(count);
} catch (Exception ex) {
@@ -279,7 +376,7 @@
case "BIM":
return "/Convert/ToTileset";
case "LAS":
- return "/Convert/ToLas";
+ return "/Convert/ToLasByPy";
case "OSGB":
return "/Convert/ToOsgb";
default:
@@ -305,11 +402,11 @@
return fail("娌℃湁鎵惧埌瑕佸垹闄ょ殑鏁版嵁", -1);
}
- publishService.deleteFiles(list);
+ // publishService.deleteFiles(list)
+ layerService.clearCache();
+ publishService.deleteFiles(ids, req);
+
int count = publishService.deletes(ids, req);
- if (count > 0) {
- layerService.clearCache();
- }
return success(count);
} catch (Exception ex) {
@@ -331,10 +428,8 @@
entity.setUpdateUser(ue.getId());
}
+ layerService.clearCache();
int count = publishService.update(entity);
- if (count > 0) {
- layerService.clearCache();
- }
return success(count);
} catch (Exception ex) {
--
Gitblit v1.9.3