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/show/ComprehensiveController.java | 310 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 271 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 ca34bd9..c19eb80 100644
--- a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
+++ b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
@@ -1,15 +1,29 @@
package com.lf.server.controller.show;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.lf.server.aspect.SysLog;
-import com.lf.server.controller.all.BaseController;
+import com.lf.server.annotation.SysLog;
+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.ShpRecordEntity;
+import com.lf.server.entity.all.StaticData;
+import com.lf.server.entity.ctrl.DownloadReqEntity;
+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.data.PublishEntity;
+import com.lf.server.entity.show.PipelineEntity;
+import com.lf.server.entity.sys.AttachEntity;
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.StringHelper;
+import com.lf.server.helper.WebHelper;
+import com.lf.server.service.all.BaseQueryService;
+import com.lf.server.service.all.BaseUploadService;
+import com.lf.server.service.all.UploadAttachService;
+import com.lf.server.service.data.DataQueryService;
+import com.lf.server.service.data.DownloadService;
+import com.lf.server.service.data.PublishService;
+import com.lf.server.service.show.MarkService;
+import com.lf.server.service.show.PipelineService;
+import com.lf.server.service.sys.AttachService;
+import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -17,6 +31,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -26,79 +41,296 @@
* 缁煎悎灞曠ず
* @author WWW
*/
-@Api(tags = "缁煎悎灞曠ず\\缁煎悎灞曠ず")
+@Api(tags = "缁煎悎灞曠ず\\棣栭〉")
@RestController
@RequestMapping("/comprehensive")
-public class ComprehensiveController extends BaseController {
+public class ComprehensiveController extends ModelController {
+ @Autowired
+ BaseQueryService baseQueryService;
+
+ @Autowired
+ MarkService markService;
+
@Autowired
TokenService tokenService;
@Autowired
- UploaderService uploaderService;
+ AttachService attachService;
@Autowired
- ComprehensiveService comprehensiveService;
+ DownlogService downlogService;
- private final static int FOUR = 4;
+ @Autowired
+ PublishService publishService;
+
+ @Autowired
+ DownloadService downloadService;
+
+ @Autowired
+ PipelineService pipelineService;
+
+ @Autowired
+ DataQueryService dataQueryService;
+
+ @Autowired
+ BaseUploadService baseUploadService;
+
+ @Autowired
+ UploadAttachService uploadAttachService;
@SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟-鍦板悕鍦板潃")
+ @ApiOperation(value = "鏍规嵁ID鏌ヨ鍙戝竷娓呭崟")
@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 = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
})
- @GetMapping(value = "/selectAddrByPage")
- public ResponseMsg<List<DlgAgnpEntity>> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
+ @GetMapping(value = "/selectPubById")
+ public ResponseMsg<PublishEntity> selectPubById(int id) {
try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
+ PublishEntity entity = publishService.selectById(id);
- Page<DlgAgnpEntity> paged = comprehensiveService.selectAddrByPage(name, pageSize, pageIndex);
-
- return success(paged.getTotal(), paged.getRecords());
+ return success(entity);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
}
@SysLog()
- @ApiOperation(value = "鏍规嵁ID鏌ヨWKT-鍦板悕鍦板潃")
+ @ApiOperation(value = "鏌ヨ绠＄嚎")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗挎皵涓滆緭"),
})
- @GetMapping(value = "/selectWktById")
- public ResponseMsg<String> selectWktById(Integer id) {
+ @GetMapping(value = "/selectPipelines")
+ public ResponseMsg<Object> selectPipelines(String name) {
try {
- String wkt = comprehensiveService.selectWktById(id);
+ List<PipelineEntity> rs = pipelineService.selectPipelines(name);
- return success(wkt);
+ return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "涓婁紶Shp鏂囦欢鑾峰彇绗竴鏉¤褰曠殑WKT")
+ @ApiOperation(value = "鏌ヨ璺綉")
+ @ApiImplicitParams({
+ @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 = "/selectRoute")
+ public ResponseMsg<Object> selectRoute(double x1, double y1, double x2, double y2) {
+ try {
+ String route = baseQueryService.selectRoute(x1, y1, x2, y2);
+
+ return success(route);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "涓婁紶ShapeFile鏂囦欢")
@ResponseBody
- @PostMapping(value = "/uploadShp")
- public ResponseMsg<ShpRecordEntity> 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);
}
- ShpRecordEntity 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 = "涓婁紶鏂囦欢")
+ @ResponseBody
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "tabName", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "lf.sys_style"),
+ @ApiImplicitParam(name = "eventid", value = "涓婚敭", dataType = "String", paramType = "query", example = "fa25979a5ef8b43ba82a0be35b3fb0d4")
+ })
+ @PostMapping(value = "/uploadFiles")
+ public ResponseMsg<Integer> uploadFiles(String tabName, String eventid, @RequestParam("file") MultipartFile[] files, HttpServletRequest req) {
+ try {
+ if (StringHelper.isEmpty(tabName) || StringHelper.isEmpty(eventid)) {
+ return fail("鍙傛暟涓嶈兘涓虹┖", null);
+ }
+ if (null == files || files.length == 0) {
+ return fail("鏂囦欢涓婁紶涓虹┖", 0);
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ Integer count = dataQueryService.uploadFiles(ue, tabName, eventid, files, req);
+
+ return success(count);
+ } catch (Exception ex) {
+ return fail(ex, 0);
+ }
+ }
+
+ @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 = downloadService.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);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ョ湅鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body")
+ })
+ @GetMapping(value = "/downloadForView")
+ public void downloadForView(String guid, HttpServletResponse res) {
+ uploadAttachService.download(guid, true, res);
+ }
+
+ @SysLog()
+ @ApiOperation(value = "璇锋眰涓嬭浇")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guids", value = "闄勪欢Guid鏁扮粍", dataType = "String", paramType = "body", allowMultiple = true, example = "e5b6ae0889b88111f13a4b6e048348db,fa4f299e901a0c46e634f8fcc8185c0c")
+ })
+ @ResponseBody
+ @PostMapping(value = "/downloadReqForGuids")
+ public ResponseMsg<Object> downloadReqForGuids(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (null == dre || null == dre.getGuids() || dre.getGuids().isEmpty()) {
+ return fail("Guid鏁扮粍涓虹┖");
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ String guid = uploadAttachService.downloadReqForGuids(ue, dre.getGuids());
+
+ return success(guid);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "璇锋眰涓嬭浇")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "body", example = "bd.b_borehole"),
+ @ApiImplicitParam(name = "guids", value = "闄勪欢Guid鏁扮粍", dataType = "String", paramType = "body", allowMultiple = true, example = "08e5b4ad-93b8-46f6-adaa-46a6274af4ce,6f94f4f8-6e8d-44e7-8803-3d068d34983f")
+ })
+ @ResponseBody
+ @PostMapping(value = "/downloadReqForTabGuids")
+ public ResponseMsg<Object> downloadReqForTabGuids(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (null == dre || StringHelper.isEmpty(dre.getTab())) {
+ return fail("琛ㄥ悕涓虹┖");
+ }
+ if (null != dre.getGuids() && dre.getGuids().size() == 0) {
+ dre.setIds(null);
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ String guid = uploadAttachService.downloadReqForTabGuids(ue, dre.getTab(), dre.getGuids());
+
+ return success(guid);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "tabName", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "lf.sys_style"),
+ @ApiImplicitParam(name = "eventid", value = "涓婚敭", dataType = "String", paramType = "query", example = "fa25979a5ef8b43ba82a0be35b3fb0d4")
+ })
+ @GetMapping(value = "/selectFiles")
+ public ResponseMsg<List<AttachEntity>> selectFiles(String tabName, String eventid) {
+ try {
+ if (StringHelper.isEmpty(tabName) || StringHelper.isEmpty(eventid)) {
+ return fail("鍙傛暟涓嶈兘涓虹┖", null);
+ }
+
+ List<AttachEntity> list = attachService.selectByTab(tabName, eventid);
+
+ 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")
+ })
+ @GetMapping(value = "/deletes")
+ public ResponseMsg<Integer> deleteFiles(@RequestParam List<Integer> ids) {
+ try {
+ if (ids == null || ids.isEmpty()) {
+ return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
+ }
+
+ int rows = attachService.deletes(ids);
+
+ return success(rows);
+ } catch (Exception ex) {
+ return fail(ex, 0);
}
}
}
--
Gitblit v1.9.3