From 9bce48a9f30f7d80c43f43f46d40df20fcb00e15 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 03 二月 2023 09:39:59 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/ComprehensiveController.java | 89 +++++++-------------------------------------
1 files changed, 15 insertions(+), 74 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..8843aa0 100644
--- a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
+++ b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
@@ -1,26 +1,17 @@
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.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.service.data.UploaderService;
-import com.lf.server.service.show.ComprehensiveService;
-import com.lf.server.service.sys.TokenService;
+import com.lf.server.service.all.BaseQueryService;
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;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* 缁煎悎灞曠ず
@@ -31,72 +22,22 @@
@RequestMapping("/comprehensive")
public class ComprehensiveController extends BaseController {
@Autowired
- TokenService tokenService;
-
- @Autowired
- UploaderService uploaderService;
-
- @Autowired
- ComprehensiveService comprehensiveService;
-
- private final static int FOUR = 4;
+ BaseQueryService baseQueryService;
@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 = "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 = "/selectAddrByPage")
- public ResponseMsg<List<DlgAgnpEntity>> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
+ @GetMapping(value = "/selectRoute")
+ public ResponseMsg<Object> selectRoute(double x1, double y1, double x2, double y2) {
try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
+ String route = baseQueryService.selectRoute(x1, y1, x2, y2);
- 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);
- return success(sr);
+ return success(route);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
--
Gitblit v1.9.3