From 71726a1cb05790d6841595ef7daef5173f2cddfa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 29 三月 2023 09:43:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/PublishController.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/PublishController.java b/src/main/java/com/lf/server/controller/data/PublishController.java
index c012f21..6496a5f 100644
--- a/src/main/java/com/lf/server/controller/data/PublishController.java
+++ b/src/main/java/com/lf/server/controller/data/PublishController.java
@@ -3,10 +3,12 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.ctrl.PubEntity;
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.PublishEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
+import com.lf.server.helper.WebHelper;
import com.lf.server.service.data.PublishService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
@@ -51,7 +53,7 @@
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
if (StringHelper.isEmpty(type)) {
- return fail("璇疯緭鍏ユ暟鎹被鍒�");
+ return fail("鏁版嵁绫诲埆涓虹┖", null);
}
String types = getType(type);
@@ -130,23 +132,49 @@
}
@SysLog()
- @ApiOperation(value = "鎻掑叆涓�鏉�")
+ @ApiOperation(value = "鎻掑叆鍙戝竷鏁版嵁")
@ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "PublishEntity", paramType = "body")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "PubEntity", paramType = "body")
})
- @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insert(@RequestBody PublishEntity entity, HttpServletRequest req) {
+ @PostMapping(value = "/insertForPub", produces = "application/json; charset=UTF-8")
+ public ResponseMsg<Object> insertForPub(@RequestBody PubEntity entity, HttpServletRequest req) {
try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue != null) {
- entity.setCreateUser(ue.getId());
+ if (null == entity || null == entity.getIds() || entity.getIds().isEmpty()) {
+ return fail("瀹炰綋绫讳负绌烘垨鎵句笉鍒板厓鏁版嵁ID", 0);
+ }
+ if (StringHelper.isEmpty(entity.getType())) {
+ return fail("鏁版嵁绫诲埆涓虹┖", null);
}
- int count = publishService.insert(entity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setUserId(ue.getId());
+ entity.setToken(WebHelper.getToken(req));
+ }
+
+ String method = getConvertMethod(entity.getType());
+ long count = publishService.postForPub(entity, method, req);
return success(count);
} catch (Exception ex) {
return fail(ex.getMessage(), -1);
+ }
+ }
+
+ /**
+ * 鑾峰彇杞崲鏂规硶
+ */
+ private String getConvertMethod(String type) throws Exception {
+ switch (type) {
+ case "DOM":
+ return "/Convert/ToTiles";
+ case "MPT":
+ case "3DML":
+ return "/Convert/ToSG";
+ case "BIM":
+ return "/Convert/ToTileset";
+ default:
+ throw new Exception("鏁版嵁绫诲瀷涓嶅尮閰�");
}
}
@@ -156,13 +184,13 @@
@ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", allowMultiple = true, example = "1")
})
@GetMapping(value = "/deletes")
- public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids) {
+ public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids, HttpServletRequest req) {
try {
if (ids == null || ids.isEmpty()) {
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
}
- int count = publishService.deletes(StringHelper.join(ids, ","));
+ int count = publishService.deletes(ids, req);
return success(count);
} catch (Exception ex) {
--
Gitblit v1.9.3