From bf9b8c673781965d02b5b262ab59430ac11ad8df Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Thu, 25 Jan 2024 17:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E9=A2=98=E7=9B=AEtree?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SceneQuestionController.java | 13 +++- .../controller/SceneRoleController.java | 2 + .../service/ISceneQuestionService.java | 9 +++ .../impl/SceneQuestionServiceImpl.java | 59 +++++++++++++++++-- 4 files changed, 78 insertions(+), 5 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneQuestionController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneQuestionController.java index 237f730d..1108bebf 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneQuestionController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneQuestionController.java @@ -1,11 +1,14 @@ package com.zdxt.knowledge.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.zdxt.auth.feign.RoleApi; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; import com.zdxt.common.util.TableDataInfo; import com.zdxt.knowledge.domain.SceneManage; import com.zdxt.knowledge.domain.SceneQuestion; +import com.zdxt.knowledge.domain.SceneRole; import com.zdxt.knowledge.mapper.SceneManageMapper; import com.zdxt.knowledge.mapper.SceneRoleMapper; import com.zdxt.knowledge.service.ISceneQuestionService; @@ -18,6 +21,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 场景题目Controller @@ -26,7 +30,7 @@ import java.util.List; * @date 2023-12-26 */ @Controller -@RequestMapping("/project/question") +@RequestMapping("/small/project/question") public class SceneQuestionController extends BaseController { private String prefix = "project/question"; @@ -203,4 +207,11 @@ public class SceneQuestionController extends BaseController { // mmap.put("list", list); // return prefix + "/index"; // } + + @PostMapping("/getBindJsonApp") + @ResponseBody + public ZDResponse getBindJsonApp(@RequestBody String guid) { + Map map = sceneQuestionService.selectQuestionTree(guid); + return ZDResponse.success("成功", map); + } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneRoleController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneRoleController.java index ac44c6b1..32a7d5d3 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneRoleController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneRoleController.java @@ -1,5 +1,7 @@ package com.zdxt.knowledge.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; import com.zdxt.common.util.TableDataInfo; diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneQuestionService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneQuestionService.java index 4d911a57..d4ab7203 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneQuestionService.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneQuestionService.java @@ -5,6 +5,8 @@ import com.zdxt.knowledge.domain.SceneQuestion; import org.springframework.web.multipart.MultipartFile; import java.util.List; +import java.util.Map; +import java.util.Objects; /** * 场景题目Service接口 @@ -76,4 +78,11 @@ public interface ISceneQuestionService * @return */ public int removeFile(String key); + + /** + * 查出问题树 + * @param guid + * @return + */ + Map selectQuestionTree(String guid); } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java index dd1a6777..62503560 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java @@ -2,6 +2,9 @@ package com.zdxt.knowledge.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.zdxt.auth.dto.RoleBean; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.dto.ZdxtFileBean; @@ -16,17 +19,16 @@ import com.zdxt.common.zdxtFile.AttFileRespDTO; import com.zdxt.common.zdxtFile.FilePreviewUtilBean; import com.zdxt.common.zdxtFile.ZdxtFileCommon; import com.zdxt.knowledge.domain.SceneQuestion; +import com.zdxt.knowledge.domain.SceneRole; import com.zdxt.knowledge.mapper.SceneQuestionMapper; import com.zdxt.knowledge.service.ISceneQuestionService; +import com.zdxt.knowledge.service.ISceneRoleService; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -39,6 +41,7 @@ import java.util.stream.Collectors; public class SceneQuestionServiceImpl implements ISceneQuestionService { @Autowired private SceneQuestionMapper sceneQuestionMapper; + @Autowired private ISceneRoleService iSceneRoleService; @Autowired private UserApi userApi; @Autowired @@ -192,4 +195,52 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService { return zdxtFileCommonApi.deleteZdxtFileById(key); } + /** + * 查出问题树 + * + * @param guid 场景题目ID + * @return 场景题目 + */ + @Override + public Map selectQuestionTree(String guid) { + SceneRole sceneRole = iSceneRoleService.selectSceneRoleById(guid); + JSONObject json = JSON.parseObject(sceneRole.getContent()); + JSONObject dataJson = json.getJSONObject("drawflow").getJSONObject("Home").getJSONObject("data"); + Map root = new HashMap<>(); + List> paramsList = new ArrayList<>(); + for (int i=1; i<=dataJson.size(); i++) { + JSONObject data = dataJson.getJSONObject(i+""); + Map params = new HashMap<>(); + params.put("questionId", data.get("name")); + + Set outList = new HashSet(); + JSONArray outs = data.getJSONObject("outputs").getJSONObject("output_1").getJSONArray("connections"); + for (int j=0; j(); + } + }