From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期三, 02 七月 2025 16:43:13 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service --- src/main/java/com/lf/server/controller/data/ProjectController.java | 51 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 37 insertions(+), 14 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 80f9916..b149628 100644 --- a/src/main/java/com/lf/server/controller/data/ProjectController.java +++ b/src/main/java/com/lf/server/controller/data/ProjectController.java @@ -7,6 +7,7 @@ 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.ctrl.KeyValueEntity; import com.lf.server.entity.data.DictEntity; import com.lf.server.entity.data.DirEntity; import com.lf.server.entity.sys.DepEntity; @@ -60,32 +61,35 @@ List<DepEntity> list = depService.selectDepAll(); return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @SysLog() - @ApiOperation(value = "鏌ヨ鏍圭洰褰�") - @GetMapping(value = "/selectDirRoot") - public ResponseMsg<List<DirEntity>> selectDirRoot() { + @ApiOperation(value = "鏌ヨ椤圭洰") + @ApiImplicitParams({ + @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗�") + }) + @GetMapping(value = "/selectProject") + public ResponseMsg<List<DirEntity>> selectProject(String name) { try { - List<DirEntity> list = dirService.selectDirRoot(); + List<DirEntity> list = dirService.selectProject(name); return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @SysLog() @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟") @ApiImplicitParams({ - @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"), + @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "String", paramType = "query", example = "1"), @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<Object> selectByPageAndCount(Integer dirid, Integer pageSize, Integer pageIndex) { + public ResponseMsg<Object> selectByPageAndCount(String dirid, Integer pageSize, Integer pageIndex) { try { QueryWrapper<BsprojectEntity> wrapper = new QueryWrapper<>(); wrapper.select("ST_AsText(geom) as geom, *"); @@ -94,12 +98,12 @@ } Page<BsprojectEntity> page = new Page<>(pageIndex, pageSize); - page.addOrder(OrderItem.asc("gid")); + page.addOrder(OrderItem.desc("gid")); Page paged = bsprojectMapper.selectPage(page, wrapper); return success(paged.getTotal(), paged.getRecords()); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -118,7 +122,25 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); + } + } + + @SysLog() + @ApiOperation(value = "鏌ヨ浣嶇疆") + @ApiImplicitParams({ + @ApiImplicitParam(name = "x", value = "X", dataType = "Double", paramType = "query", example = "114.178955"), + @ApiImplicitParam(name = "y", value = "Y", dataType = "Double", paramType = "query", example = "38.991743") + }) + @GetMapping(value = "/selectLocation") + public ResponseMsg<Object> selectLocation(double x, double y) { + try { + String wkt = String.format("POINT(%f %f)", x, y); + List<KeyValueEntity> list = baseQueryService.selectLocation(wkt); + + return success(list); + } catch (Exception ex) { + return fail(ex, null); } } @@ -134,7 +156,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -152,6 +174,7 @@ UserEntity ue = tokenService.getCurrentUser(req); entity.setCreateuser(ue.getId()); + entity.setEventid(StringHelper.getGuid()); entity.setCreatetime(WebHelper.getCurrentTimestamp()); entity.setGeom(StringHelper.getGeomWkt(entity.getGeom())); @@ -162,7 +185,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -191,7 +214,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } } -- Gitblit v1.9.3