From e5386898d7ec30e090f70f3acb9e8acecd5dc68f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 11 九月 2023 15:56:56 +0800
Subject: [PATCH] 检查栅格-点分析结果
---
src/main/java/com/moon/server/controller/data/PublishController.java | 92 +++++++++++++++++++++++++++++----------------
1 files changed, 59 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/data/PublishController.java b/src/main/java/com/moon/server/controller/data/PublishController.java
index 6ef2f9f..7cec1ee 100644
--- a/src/main/java/com/moon/server/controller/data/PublishController.java
+++ b/src/main/java/com/moon/server/controller/data/PublishController.java
@@ -8,7 +8,6 @@
import com.moon.server.entity.data.PublishEntity;
import com.moon.server.entity.sys.UserEntity;
import com.moon.server.helper.StringHelper;
-import com.moon.server.helper.WebHelper;
import com.moon.server.service.all.PermsService;
import com.moon.server.service.data.PublishService;
import com.moon.server.service.data.ShuJianService;
@@ -22,7 +21,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
import java.util.List;
/**
@@ -138,13 +136,13 @@
switch (type) {
case "DOM":
- return "type = 'DOM'";
+ return "a.type = 'DOM'";
case "DEM":
- return "type = 'DEM'";
+ return "a.type = 'DEM'";
case "Vector":
- return "type = 'Vector'";
+ return "a.type = 'Vector'";
case "Model":
- return "type = 'Model'";
+ return "a.type = 'Model'";
default:
throw new Exception("鏁版嵁绫诲瀷涓嶅尮閰�");
}
@@ -169,84 +167,109 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ鏁扮畝鐨勯鑹茶〃")
@ApiImplicitParams({
+ @ApiImplicitParam(name = "port", value = "绔彛", dataType = "int", paramType = "query", example = "50001"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "int", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "int", paramType = "query", example = "1")
})
- @GetMapping(value = "/selectColorTables")
- public void selectColorTables(int pageSize, int pageIndex, HttpServletRequest req, HttpServletResponse res) {
+ @GetMapping(value = "/selectSjColorTables")
+ public void selectSjColorTables(Integer port, int pageSize, int pageIndex, HttpServletRequest req, HttpServletResponse res) {
pageIndex = Math.max(pageIndex, 1);
pageSize = Math.max(pageSize, 5);
- shuJianService.selectColorTables(pageSize, pageIndex, req, res);
+ shuJianService.selectSjColorTables(port, pageSize, pageIndex, req, res);
}
@SysLog()
- @ApiOperation(value = "鎻掑叆鍙戝竷鏁版嵁")
+ @ApiOperation(value = "鏌ヨ鏁扮畝鍥惧眰")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "port", value = "绔彛", dataType = "int", paramType = "query", example = "50001")
+ })
+ @GetMapping(value = "/selectSjLayers")
+ public void selectSjLayers(Integer port, HttpServletRequest req, HttpServletResponse res) {
+ shuJianService.selectSjLayers(port, req, res);
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鎻掑叆鏁扮畝鏈嶅姟")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "PubEntity", paramType = "body")
})
- @PostMapping(value = "/insertForPub", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Object> insertForPub(@RequestBody PubEntity entity, HttpServletRequest req) {
+ @ResponseBody
+ @PostMapping(value = "/insertSjService", produces = "application/json; charset=UTF-8")
+ public ResponseMsg<Object> insertSjService(@RequestBody PubEntity entity, HttpServletRequest req, HttpServletResponse res) {
try {
if (null == entity || null == entity.getIds() || entity.getIds().isEmpty()) {
return fail("瀹炰綋绫讳负绌烘垨鎵句笉鍒板厓鏁版嵁ID", 0);
}
if (StringHelper.isEmpty(entity.getType())) {
- return fail("鏁版嵁绫诲埆涓虹┖", null);
+ return fail("鍙戝竷绫诲埆涓虹┖", null);
+ }
+ if (!ShuJianService.TYPES.contains(entity.getType())) {
+ return fail("鍙戝竷绫诲埆涓嶆敮鎸�", null);
}
UserEntity ue = tokenService.getCurrentUser(req);
- if (ue != null) {
+ if (null != ue) {
entity.setUserId(ue.getId());
+ entity.setDepcode(ue.getDepcode());
}
+ entity.setDefault();
permsService.clearPermsCache();
- // String method = getConvertMethod(entity.getType())
- long count = publishService.postForPub(entity, "", req);
+ Integer rows = shuJianService.insertSjService(entity);
- return success(count);
+ return success(rows);
} catch (Exception ex) {
return fail(ex.getMessage(), -1);
}
}
@SysLog()
- @ApiOperation(value = "鍙戝竷鏁扮畝鏈嶅姟")
+ @ApiOperation(value = "鏇存柊鏁扮畝鏈嶅姟")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "PubEntity", paramType = "body")
})
- public ResponseMsg<Object> insertShuJianService(@RequestBody PubEntity entity, HttpServletRequest req) {
+ @ResponseBody
+ @PostMapping(value = "/updateSjService", produces = "application/json; charset=UTF-8")
+ public ResponseMsg<Object> updateSjService(@RequestBody PubEntity entity, HttpServletRequest req, HttpServletResponse res) {
try {
- if (null == entity || null == entity.getIds() || entity.getIds().isEmpty()) {
- return fail("瀹炰綋绫讳负绌烘垨鎵句笉鍒板厓鏁版嵁ID", 0);
+ if (null == entity || null == entity.getPubid()) {
+ return fail("瀹炰綋绫讳负绌烘垨鍙戝竷ID涓虹┖", 0);
+ }
+ if (StringHelper.isEmpty(entity.getType())) {
+ return fail("鍙戝竷绫诲埆涓虹┖", null);
}
- return success(null);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (null != ue) {
+ entity.setUserId(ue.getId());
+ entity.setDepcode(ue.getDepcode());
+ }
+ entity.setDefault();
+
+ permsService.clearPermsCache();
+ Integer rows = shuJianService.updateSjService(entity);
+
+ return success(rows);
} catch (Exception ex) {
return fail(ex.getMessage(), -1);
}
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎澶氭潯")
+ @ApiOperation(value = "鍒犻櫎鏁扮畝鏈嶅姟")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", allowMultiple = true, example = "1")
})
- @GetMapping(value = "/deletes")
- public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids, HttpServletRequest req) {
+ @GetMapping(value = "/deletesSjServices")
+ public ResponseMsg<Integer> deletesSjServices(@RequestParam List<Integer> ids) {
try {
- if (ids == null || ids.isEmpty()) {
+ if (null == ids || ids.isEmpty()) {
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
}
- String strs = StringHelper.join(ids, ",");
- List<PublishEntity> list = publishService.selectByIds(strs);
- if (null == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌瑕佸垹闄ょ殑鏁版嵁", -1);
- }
-
permsService.clearPermsCache();
- int count = publishService.deletes(ids, req);
+ int count = shuJianService.deletesSjServices(ids);
return success(count);
} catch (Exception ex) {
@@ -267,6 +290,9 @@
if (ue != null) {
entity.setUpdateUser(ue.getId());
}
+ if (StringHelper.isEmpty(entity.getGeom())) {
+ entity.setGeom("null");
+ }
permsService.clearPermsCache();
int count = publishService.update(entity);
--
Gitblit v1.9.3