From 64d3e9657fb45b6415b19e23f483d46a82efe939 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 06 三月 2023 13:56:42 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/ComprehensiveController.java | 151 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 112 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
index 115aa27..3d3d371 100644
--- a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
+++ b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
@@ -1,16 +1,25 @@
package com.lf.server.controller.show;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
+import com.lf.server.entity.all.HttpStatus;
import com.lf.server.entity.all.ResponseMsg;
-import com.lf.server.entity.bd.DlgAgnpEntity;
-import com.lf.server.entity.ctrl.ShpRecord;
-import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.all.StaticData;
+import com.lf.server.entity.ctrl.MarkJsonEntity;
+import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.show.PipelineEntity;
import com.lf.server.entity.sys.UserEntity;
-import com.lf.server.service.data.UploaderService;
-import com.lf.server.service.show.ComprehensiveService;
+import com.lf.server.helper.PathHelper;
+import com.lf.server.helper.StringHelper;
+import com.lf.server.helper.WebHelper;
+import com.lf.server.mapper.show.MarkMapper;
+import com.lf.server.service.all.BaseQueryService;
+import com.lf.server.service.all.BaseUploadService;
+import com.lf.server.service.data.DownloadService;
+import com.lf.server.service.show.MarkService;
+import com.lf.server.service.show.PipelineService;
+import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -27,79 +36,143 @@
* 缁煎悎灞曠ず
* @author WWW
*/
-@Api(tags = "缁煎悎灞曠ず\\缁煎悎灞曠ず")
+@Api(tags = "缁煎悎灞曠ず\\棣栭〉")
@RestController
@RequestMapping("/comprehensive")
public class ComprehensiveController extends BaseController {
@Autowired
+ BaseQueryService baseQueryService;
+
+ @Autowired
+ MarkService markService;
+
+ @Autowired
TokenService tokenService;
@Autowired
- UploaderService uploaderService;
+ BaseUploadService baseUploadService;
@Autowired
- ComprehensiveService comprehensiveService;
+ DownlogService downlogService;
- private final static int FOUR = 4;
+ @Autowired
+ DownloadService downloadService;
+
+ @Autowired
+ PipelineService pipelineService;
@SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟-鍦板悕鍦板潃")
+ @ApiOperation(value = "鏌ヨ绠＄嚎")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "澶�"),
- @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
- @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗挎皵涓滆緭"),
})
- @GetMapping(value = "/selectAddrByPage")
- public ResponseMsg<List<DlgAgnpEntity>> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
+ @GetMapping(value = "/selectPipelines")
+ public ResponseMsg<Object> selectPipelines(String name) {
try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
+ List<PipelineEntity> rs = pipelineService.selectPipelines(name);
- Page<DlgAgnpEntity> paged = comprehensiveService.selectAddrByPage(name, pageSize, pageIndex);
-
- return success(paged.getTotal(), paged.getRecords());
+ return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "鏍规嵁ID鏌ヨWKT-鍦板悕鍦板潃")
+ @ApiOperation(value = "鏌ヨ璺綉")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "x1", value = "X1", dataType = "Double", paramType = "query", example = "116.78999"),
+ @ApiImplicitParam(name = "y1", value = "Y1", dataType = "Double", paramType = "query", example = "39.9468"),
+ @ApiImplicitParam(name = "x2", value = "X2", dataType = "Double", paramType = "query", example = "116.80458"),
+ @ApiImplicitParam(name = "y2", value = "Y2", dataType = "Double", paramType = "query", example = "39.94758")
})
- @GetMapping(value = "/selectWktById")
- public ResponseMsg<String> selectWktById(Integer id) {
+ @GetMapping(value = "/selectRoute")
+ public ResponseMsg<Object> selectRoute(double x1, double y1, double x2, double y2) {
try {
- String wkt = comprehensiveService.selectWktById(id);
+ String route = baseQueryService.selectRoute(x1, y1, x2, y2);
- return success(wkt);
+ return success(route);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "涓婁紶Shp鏂囦欢鑾峰彇绗竴鏉¤褰曠殑WKT")
+ @ApiOperation(value = "涓婁紶ShapeFile鏂囦欢")
@ResponseBody
- @PostMapping(value = "/uploadShp")
- public ResponseMsg<ShpRecord> uploadShp(HttpServletRequest req, HttpServletResponse res) {
+ @PostMapping(value = "/uploadShp", produces = "application/json; charset=UTF-8")
+ public ResponseMsg<Object> uploadShp(HttpServletRequest req, HttpServletResponse res) {
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue == null) {
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<MetaFileEntity> list = uploaderService.uploadData(null, ue, req, res);
- if (list.size() < FOUR) {
+ List<MetaFileEntity> meList = baseUploadService.uploadData(null, null, false, req, res);
+ if (meList == null || meList.size() < StaticData.FOUR) {
return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
}
- ShpRecord sr = comprehensiveService.readShpFirstRecord(list);
- return success(sr);
+ List<MarkJsonEntity> list = markService.readShpForMarks(meList);
+
+ return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "涓嬭浇ShapeFile鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "list", value = "鏍囩粯JSON瀹炰綋绫婚泦鍚�", dataType = "MarkJsonEntity", paramType = "body")
+ })
+ @ResponseBody
+ @PostMapping(value = "/downloadShp", produces = "application/json; charset=UTF-8")
+ public ResponseMsg<String> downloadShp(@RequestBody List<MarkJsonEntity> list, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
+ if (list == null || list.isEmpty()) {
+ return fail("鎵句笉鍒版爣缁樻暟鎹�", null);
+ }
+
+ String guid = markService.downloadShp(ue, list);
+ if (StringHelper.isNull(guid)) {
+ return fail("鐢熸垚ShapeFile鏂囦欢澶辫触", null);
+ }
+
+ return success(guid);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "涓嬭浇鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guid", value = "鏂囦欢GUID", dataType = "String", paramType = "query")
+ })
+ @RequestMapping(value = "/downloadFile", method = RequestMethod.GET)
+ public void downloadFile(String guid, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ WebHelper.writeStr2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, "鐢ㄦ埛鏈櫥褰�"));
+ }
+
+ DownloadEntity de = downloadService.selectByGuid(guid);
+ if (de == null) {
+ WebHelper.writeStr2Page(res, WebHelper.getErrJson(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�"));
+ }
+
+ downlogService.updateInfos(ue, de, req);
+
+ String filePath = markService.getDownloadFilePath(de);
+ WebHelper.download(filePath, de.getName(), res);
+ } catch (Exception ex) {
+ WebHelper.writeStr2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, ex.getMessage()));
+ log.error(ex.getMessage(), ex);
}
}
}
--
Gitblit v1.9.3