From 427bee04bfacf44abe5d595e2dad976747d83dba Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 15:48:48 +0800
Subject: [PATCH] 1.8.5
---
src/main/java/com/lf/server/controller/data/upload/QueryController.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/QueryController.java b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
index f8ee1ea..0c4ffdc 100644
--- a/src/main/java/com/lf/server/controller/data/upload/QueryController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
@@ -8,10 +8,7 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.TabEntity;
-import com.lf.server.entity.data.DictEntity;
-import com.lf.server.entity.data.DirEntity;
-import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.VerEntity;
+import com.lf.server.entity.data.*;
import com.lf.server.entity.sys.DepEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.ClassHelper;
@@ -49,6 +46,9 @@
@Autowired
protected TokenService tokenService;
+
+ @Autowired
+ protected UploadService uploadService;
@Autowired
protected BaseQueryService baseQueryService;
@@ -95,6 +95,35 @@
if (null == list || list.isEmpty()) {
list = verService.selectByDirid(0);
}
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鍧愭爣绯�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "zoning", value = "甯﹀彿", dataType = "String", paramType = "query", example = "6搴︽湁甯﹀彿")
+ })
+ @GetMapping(value = "/selectCoords")
+ public ResponseMsg<Object> selectCoords(String zoning) {
+ try {
+ List<CoordEntity> list = uploadService.selectCoords(zoning);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ椤圭洰鍚嶇О")
+ @GetMapping(value = "/selectProject")
+ public ResponseMsg<Object> selectProject() {
+ try {
+ List<DirEntity> list = uploadService.selectProject();
return success(list);
} catch (Exception ex) {
@@ -163,11 +192,7 @@
}
QueryWrapper wrapper = new QueryWrapper();
- //wrapper.eq("dirid", meta.getDirid());
- //wrapper.eq("depid", meta.getDepid());
- //wrapper.eq("verid", meta.getVerid());
- wrapper.eq("createuser", meta.getCreateUser());
- wrapper.eq("createtime", meta.getCreateTime());
+ wrapper.eq("parentid", meta.getEventid());
Page<Object> page = new Page<>(pageIndex, pageSize);
page.addOrder(OrderItem.asc("gid"));
--
Gitblit v1.9.3