From fee67ca8a0760315047a52fc4101a8f4f80b7a7f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 11 十一月 2024 15:02:54 +0800
Subject: [PATCH] 1
---
src/main/java/com/moon/server/controller/data/MetaController.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/data/MetaController.java b/src/main/java/com/moon/server/controller/data/MetaController.java
index a3bfa9a..866e291 100644
--- a/src/main/java/com/moon/server/controller/data/MetaController.java
+++ b/src/main/java/com/moon/server/controller/data/MetaController.java
@@ -30,6 +30,7 @@
import com.moon.server.helper.StringHelper;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -38,14 +39,12 @@
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-/**
- * 鍏冩暟鎹�
- * @author WWW
- */
@Api(tags = "鏁版嵁绠＄悊\\淇℃伅绠＄悊")
@RestController
+@SuppressWarnings("ALL")
@RequestMapping("/meta")
public class MetaController extends BaseController {
@Autowired
@@ -76,22 +75,33 @@
@ApiImplicitParam(name = "dircode", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00"),
@ApiImplicitParam(name = "verid", value = "鐗堟湰ID", dataType = "Integer", paramType = "query", example = "0"),
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "sensorType", value = "浼犳劅鍣ㄧ被鍨�", dataType = "Integer", paramType = "query", example = "0"),
+ @ApiImplicitParam(name = "mataType", value = "鍏冩暟鎹被鍨�", dataType = "Integer", paramType = "query", example = "0"),
+ @ApiImplicitParam(name = "startDate", value = "寮�濮嬫棩鏈�", dataType = "Date", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "endDate", value = "缁撴潫鏃ユ湡", dataType = "Date", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "wkt", value = "WKT瀛楃涓�", dataType = "String", paramType = "query", example = "gAPpDbZ53XfoQfvT8dj/uhBWX5os8kBJQ1LrNvH3VX7byFQdUJMPiEr8Fkj0q2i1pw+L8KFrvR0MLXq2xaO21nlQQXmEPofJxpDQZwEWUIFZsToXo1kLRD3t6WQezxWB8YTzXHM20Ba73x/ZuuezVhOFOq1U8HKf1dXQdv7gBzEB6fWMmFDc3FuH8GDDHv3LfT86Gio9VgMO6ohlrUdf3ZKtTHeLSuzGF4t0RZuX97YBNo25IIzpeTfRTXBxfdxA"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<MetaEntity>> selectByPageAndCount(String depcode, String dircode, Integer verid, String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<MetaEntity>> selectByPageAndCount(String depcode, String dircode, Integer verid, String name, Integer sensorType, Integer mataType, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startDate, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endDate, String wkt, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
+ if (startDate != null && endDate != null && startDate.getTime() > endDate.getTime()) {
+ Date tmp = startDate;
+ startDate = endDate;
+ endDate = tmp;
+ }
+ wkt = metaService.getGeometryFilter(wkt);
- int count = metaService.selectCount(depcode, dircode, verid, name);
+ int count = metaService.selectCount(depcode, dircode, verid, name, sensorType, mataType, startDate, endDate, wkt);
if (count == 0) {
return success(0, null);
}
- List<MetaEntity> rs = metaService.selectByPage(depcode, dircode, verid, name, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> rs = metaService.selectByPage(depcode, dircode, verid, name, sensorType, mataType, startDate, endDate, wkt, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -100,6 +110,26 @@
}
@SysLog()
+ @ApiOperation(value = "鏍规嵁GUID鏌ヨGDB")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guid", value = "GUID", dataType = "String", paramType = "query", example = "d58e66d9606a4b85e7c8ab43b3db0b55")
+ })
+ @GetMapping(value = "/selectGdbByGuid")
+ public ResponseMsg<Object> selectGdbByGuid(String guid) {
+ try {
+ if (StringHelper.isEmpty(guid)) {
+ return fail("鏂囦欢GUID鍊间笉鑳戒负绌�", null);
+ }
+
+ List<MetaEntity> rs = metaService.selectGdbByGuid(guid);
+
+ return success(null == rs ? 0 : rs.size(), rs);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏍规嵁鐖禝D鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
@ApiImplicitParam(name = "metaid", value = "鐖禝D", dataType = "String", paramType = "query", example = "0"),
--
Gitblit v1.9.3