|
|
@@ -10,9 +10,7 @@ import com.siwei.common.core.web.controller.BaseController;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* 决策任务控制器
|
|
|
@@ -38,6 +36,24 @@ public class DecisionTaskController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ @PostMapping("analyse")
|
|
|
+ public R<DecisionTask> analyse(@RequestBody Map<String,?> paramData) {
|
|
|
+ try {
|
|
|
+ //参数校验
|
|
|
+ String name = Objects.nonNull(paramData.get("name")) ? String.valueOf(paramData.get("name")):"";
|
|
|
+ String shape = Objects.nonNull(paramData.get("shape")) ? String.valueOf(paramData.get("shape")):"";//ewkt
|
|
|
+ Integer shapeType = Objects.nonNull(paramData.get("shapeType")) ? (Integer) paramData.get("shapeType") : -1;
|
|
|
+ String shapeFilePath = Objects.nonNull(paramData.get("shapeFilePath")) ? String.valueOf(paramData.get("shapeFilePath")):"";
|
|
|
+ List<Integer> dataType = Objects.nonNull(paramData.get("dataType")) ? (List<Integer>) paramData.get("dataType"):new ArrayList<>();
|
|
|
+ DecisionTask decisionTask = decisionTaskService.analyse(name, shape, shapeType, shapeFilePath, dataType);
|
|
|
+ return R.ok(decisionTask);
|
|
|
+ } catch (Exception e) {
|
|
|
+ return R.fail(e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@GetMapping("/{id}")
|
|
|
public R<DecisionTask> get(@PathVariable String id) {
|
|
|
try {
|
|
|
@@ -100,11 +116,13 @@ public class DecisionTaskController extends BaseController {
|
|
|
subMap1.put("zddm", "123456789");
|
|
|
subMap1.put("area", 1234567);
|
|
|
subMap1.put("qlr", "张三");
|
|
|
+ subMap1.put("id", "bad6ca22b2e54f46b6c9835cc2040b57");
|
|
|
|
|
|
Map<String, Object> subMap2 = new HashMap<>();
|
|
|
subMap2.put("zddm", "123456789");
|
|
|
subMap2.put("area", 1234567);
|
|
|
subMap2.put("qlr", "张三");
|
|
|
+ subMap2.put("id", "bad6ca22b2e54f46b6c9835cc20445567");
|
|
|
|
|
|
List<Map<String,Object>> dataList = List.of(
|
|
|
subMap1,
|