From dc59d63cfa8cac113c4834e6b7d90c0af61df31f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 27 十月 2022 20:38:20 +0800
Subject: [PATCH] 1
---
data/menu.xls | 0
/dev/null | 110 ------------------
src/main/java/com/lf/server/controller/show/InquiryController.java | 51 ++++++++
src/main/java/com/lf/server/controller/show/LocateController.java | 74 ++++++++++++
src/main/java/com/lf/server/helper/GdalHelper.java | 2
src/main/java/com/lf/server/service/show/InquiryService.java | 41 ++++++
src/main/java/com/lf/server/service/show/LocateService.java | 26 ----
7 files changed, 165 insertions(+), 139 deletions(-)
diff --git a/data/menu.xls b/data/menu.xls
index 4230440..9cf3832 100644
--- a/data/menu.xls
+++ b/data/menu.xls
Binary files differ
diff --git a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
deleted file mode 100644
index a78d553..0000000
--- a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-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.entity.all.ResponseMsg;
-import com.lf.server.entity.bd.DlgAgnpEntity;
-import com.lf.server.entity.ctrl.ShpRecordEntity;
-import com.lf.server.entity.data.MetaFileEntity;
-import com.lf.server.entity.sys.UserEntity;
-import com.lf.server.helper.AesHelper;
-import com.lf.server.helper.StringHelper;
-import com.lf.server.service.data.UploaderService;
-import com.lf.server.service.show.ComprehensiveService;
-import com.lf.server.service.sys.TokenService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 缁煎悎灞曠ず
- * @author WWW
- */
-@Api(tags = "缁煎悎灞曠ず\\缁煎悎灞曠ず")
-@RestController
-@RequestMapping("/comprehensive")
-public class ComprehensiveController extends BaseController {
- @Autowired
- TokenService tokenService;
-
- @Autowired
- UploaderService uploaderService;
-
- @Autowired
- ComprehensiveService comprehensiveService;
-
- private final static int FOUR = 4;
-
- @SysLog()
- @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")
- })
- @GetMapping(value = "/selectAddrByPage")
- public ResponseMsg<List<DlgAgnpEntity>> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
-
- Page<DlgAgnpEntity> paged = comprehensiveService.selectAddrByPage(name, pageSize, pageIndex);
-
- return success(paged.getTotal(), paged.getRecords());
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏍规嵁ID鏌ヨWKT-鍦板悕鍦板潃")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/selectWktById")
- public ResponseMsg<String> selectWktById(Integer id) {
- try {
- String wkt = comprehensiveService.selectWktById(id);
-
- return success(wkt);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "涓婁紶Shp鏂囦欢鑾峰彇绗竴鏉¤褰曠殑WKT")
- @ResponseBody
- @PostMapping(value = "/uploadShp")
- public ResponseMsg<ShpRecordEntity> 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) {
- return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
- }
-
- ShpRecordEntity sr = comprehensiveService.readShpFirstRecord(list);
- if (sr != null && !StringHelper.isEmpty(sr.getWkt())) {
- sr.setWkt(AesHelper.encrypt(sr.getWkt()));
- }
-
- return success(sr);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-}
diff --git a/src/main/java/com/lf/server/controller/show/InquiryController.java b/src/main/java/com/lf/server/controller/show/InquiryController.java
index 95ec4e4..f657ed4 100644
--- a/src/main/java/com/lf/server/controller/show/InquiryController.java
+++ b/src/main/java/com/lf/server/controller/show/InquiryController.java
@@ -7,18 +7,25 @@
import com.lf.server.aspect.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.ctrl.ShpRecordEntity;
+import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.ClassHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.all.GeomBaseMapper;
+import com.lf.server.service.data.UploaderService;
+import com.lf.server.service.show.InquiryService;
+import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -29,6 +36,17 @@
@RestController
@RequestMapping("/inquiry")
public class InquiryController extends BaseController {
+ private final static int FOUR = 4;
+
+ @Autowired
+ TokenService tokenService;
+
+ @Autowired
+ UploaderService uploaderService;
+
+ @Autowired
+ InquiryService inquiryService;
+
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@ApiImplicitParams({
@@ -118,4 +136,31 @@
return fail(ex.getMessage(), null);
}
}
+
+ @SysLog()
+ @ApiOperation(value = "涓婁紶Shp鏂囦欢璇诲彇绗竴鏉¤褰曠殑WKT")
+ @ResponseBody
+ @PostMapping(value = "/uploadShp")
+ public ResponseMsg<ShpRecordEntity> 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) {
+ return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
+ }
+
+ ShpRecordEntity sr = inquiryService.readShpFirstRecord(list);
+ if (sr != null && !StringHelper.isEmpty(sr.getWkt())) {
+ sr.setWkt(AesHelper.encrypt(sr.getWkt()));
+ }
+
+ return success(sr);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
}
diff --git a/src/main/java/com/lf/server/controller/show/LocateController.java b/src/main/java/com/lf/server/controller/show/LocateController.java
new file mode 100644
index 0000000..d1de478
--- /dev/null
+++ b/src/main/java/com/lf/server/controller/show/LocateController.java
@@ -0,0 +1,74 @@
+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.entity.all.ResponseMsg;
+import com.lf.server.entity.bd.DlgAgnpEntity;
+import com.lf.server.service.data.UploaderService;
+import com.lf.server.service.show.LocateService;
+import com.lf.server.service.sys.TokenService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 缁煎悎灞曠ず
+ * @author WWW
+ */
+@Api(tags = "缁煎悎灞曠ず\\瀹氫綅")
+@RestController
+@RequestMapping("/locate")
+public class LocateController extends BaseController {
+ @Autowired
+ TokenService tokenService;
+
+ @Autowired
+ UploaderService uploaderService;
+
+ @Autowired
+ LocateService locateService;
+
+ @SysLog()
+ @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")
+ })
+ @GetMapping(value = "/selectAddrByPage")
+ public ResponseMsg<List<DlgAgnpEntity>> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
+ try {
+ if (pageSize < 1 || pageIndex < 1) {
+ return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ }
+
+ Page<DlgAgnpEntity> paged = locateService.selectAddrByPage(name, pageSize, pageIndex);
+
+ return success(paged.getTotal(), paged.getRecords());
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁ID鏌ヨWKT-鍦板悕鍦板潃")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectWktById")
+ public ResponseMsg<String> selectWktById(Integer id) {
+ try {
+ String wkt = locateService.selectWktById(id);
+
+ return success(wkt);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+}
diff --git a/src/main/java/com/lf/server/helper/GdalHelper.java b/src/main/java/com/lf/server/helper/GdalHelper.java
index c4e7e46..1d0f0df 100644
--- a/src/main/java/com/lf/server/helper/GdalHelper.java
+++ b/src/main/java/com/lf/server/helper/GdalHelper.java
@@ -45,7 +45,7 @@
}
/**
- * 鑾峰彇Shp绗竴鏉¤褰曠殑WKT
+ * 璇诲彇Shp绗竴鏉¤褰曠殑WKT
*/
public static ShpRecordEntity readShpFirstRecord(String filePath) {
try {
diff --git a/src/main/java/com/lf/server/service/show/InquiryService.java b/src/main/java/com/lf/server/service/show/InquiryService.java
new file mode 100644
index 0000000..e2b2e46
--- /dev/null
+++ b/src/main/java/com/lf/server/service/show/InquiryService.java
@@ -0,0 +1,41 @@
+package com.lf.server.service.show;
+
+import com.lf.server.entity.ctrl.ShpRecordEntity;
+import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.helper.FileHelper;
+import com.lf.server.helper.GdalHelper;
+import com.lf.server.helper.StringHelper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鏌ヨ鏈嶅姟绫�
+ * @author WWW
+ */
+@Service
+public class InquiryService {
+ /**
+ * 璇诲彇Shp绗竴鏉¤褰曠殑WKT
+ *
+ * @param list
+ * @return
+ */
+ public ShpRecordEntity readShpFirstRecord(List<MetaFileEntity> list) {
+ String fileName = null;
+ for (MetaFileEntity mf : list) {
+ if (mf.getName().toLowerCase().indexOf(".shp") > -1) {
+ fileName = mf.getPath();
+ break;
+ }
+ }
+ if (StringHelper.isEmpty(fileName)) {
+ return null;
+ }
+
+ ShpRecordEntity sr = GdalHelper.readShpFirstRecord(fileName);
+ FileHelper.deleteFiles(list);
+
+ return sr;
+ }
+}
diff --git a/src/main/java/com/lf/server/service/show/ComprehensiveService.java b/src/main/java/com/lf/server/service/show/LocateService.java
similarity index 60%
rename from src/main/java/com/lf/server/service/show/ComprehensiveService.java
rename to src/main/java/com/lf/server/service/show/LocateService.java
index 83d6e13..c11f74a 100644
--- a/src/main/java/com/lf/server/service/show/ComprehensiveService.java
+++ b/src/main/java/com/lf/server/service/show/LocateService.java
@@ -4,23 +4,17 @@
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lf.server.entity.bd.DlgAgnpEntity;
-import com.lf.server.entity.ctrl.ShpRecordEntity;
-import com.lf.server.entity.data.MetaFileEntity;
-import com.lf.server.helper.FileHelper;
-import com.lf.server.helper.GdalHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.bd.DlgAgnpMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.List;
/**
* 缁煎悎灞曠ず
* @author WWW
*/
@Service
-public class ComprehensiveService {
+public class LocateService {
@Autowired
DlgAgnpMapper dlgAgnpMapper;
@@ -39,23 +33,5 @@
public String selectWktById(Integer id) {
return dlgAgnpMapper.selectWktById(id);
- }
-
- public ShpRecordEntity readShpFirstRecord(List<MetaFileEntity> list) {
- String fileName = null;
- for (MetaFileEntity mf : list) {
- if (mf.getName().toLowerCase().indexOf(".shp") > -1) {
- fileName = mf.getPath();
- break;
- }
- }
- if (StringHelper.isEmpty(fileName)) {
- return null;
- }
-
- ShpRecordEntity sr = GdalHelper.readShpFirstRecord(fileName);
- FileHelper.deleteFiles(list);
-
- return sr;
}
}
--
Gitblit v1.9.3