From d30a66350f1db8591406b68100464f7b0528c571 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 04 十二月 2022 16:14:40 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/ProjectController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/ProjectController.java b/src/main/java/com/lf/server/controller/data/ProjectController.java
index dc2897f..1c4f4a7 100644
--- a/src/main/java/com/lf/server/controller/data/ProjectController.java
+++ b/src/main/java/com/lf/server/controller/data/ProjectController.java
@@ -1,15 +1,17 @@
package com.lf.server.controller.data;
import com.lf.server.annotation.SysLog;
-import com.lf.server.controller.all.BaseQueryController;
+import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.bs.BsprojectEntity;
+import com.lf.server.entity.data.DictEntity;
import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.sys.DepEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
import com.lf.server.mapper.bs.BsprojectMapper;
+import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.data.DirService;
import com.lf.server.service.sys.DepService;
import com.lf.server.service.sys.TokenService;
@@ -33,7 +35,7 @@
@Api(tags = "鏁版嵁绠＄悊\\椤圭洰绠＄悊")
@RestController
@RequestMapping("/project")
-public class ProjectController extends BaseQueryController {
+public class ProjectController extends BaseController {
@Autowired
DepService depService;
@@ -45,6 +47,9 @@
@Autowired
BsprojectMapper bsprojectMapper;
+
+ @Autowired
+ BaseQueryService baseQueryService;
@SysLog()
@ApiOperation(value = "鏌ヨ鎵�鏈夊崟浣嶆暟鎹�")
@@ -93,6 +98,25 @@
}
@SysLog()
+ @ApiOperation(value = "鏌ヨ瀛楁淇℃伅")
+ @GetMapping(value = "/selectFields")
+ public ResponseMsg<List<DictEntity>> selectFields() {
+ try {
+ String tabName = BaseQueryService.getTabName(bsprojectMapper);
+ if (tabName == null) {
+ return null;
+ }
+
+ String[] strs = tabName.split("\\.");
+ List<DictEntity> list = baseQueryService.selectFields(strs[0], strs[1]);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鍒犻櫎涓�鏉�")
@ApiImplicitParams({
@ApiImplicitParam(name = "gid", value = "ID", dataType = "int", paramType = "query", example = "1")
@@ -123,7 +147,7 @@
UserEntity ue = tokenService.getCurrentUser(req);
entity.setCreateuser(ue.getId());
entity.setCreatetime(WebHelper.getCurrentTimestamp());
- entity.setGeom(StringHelper.getGeomWKT(entity.getGeom()));
+ entity.setGeom(StringHelper.getGeomWkt(entity.getGeom()));
List<BsprojectEntity> list = new ArrayList<>();
list.add(entity);
@@ -152,7 +176,7 @@
UserEntity ue = tokenService.getCurrentUser(req);
entity.setUpdateuser(ue.getId());
entity.setUpdatetime(WebHelper.getCurrentTimestamp());
- entity.setGeom(StringHelper.getGeomWKT(entity.getGeom()));
+ entity.setGeom(StringHelper.getGeomWkt(entity.getGeom()));
List<BsprojectEntity> list = new ArrayList<>();
list.add(entity);
--
Gitblit v1.9.3