From e5ea4469c4f9625147d3caffc207be5db4fd4add Mon Sep 17 00:00:00 2001 From: yanyan Date: Mon, 8 Jan 2024 14:52:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E7=AE=A1=E7=90=86=E7=AD=94?= =?UTF-8?q?=E6=A1=88=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/project/question/bindNew.html | 143 ++++++++++++++++++ .../templates/project/question/view.html | 5 + .../controller/SceneManageController.java | 4 +- .../controller/SceneQuestionController.java | 13 ++ .../domain/SceneImportDataModel.java | 7 + .../resources/mapper/SceneQuestionMapper.xml | 4 +- 6 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/bindNew.html diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/bindNew.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/bindNew.html new file mode 100644 index 00000000..b32234cf --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/bindNew.html @@ -0,0 +1,143 @@ + + + + + Tree Diagram with Tooltips + + + +
+ + + + diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/view.html index 5c491de5..e46c68e6 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/view.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/view.html @@ -103,6 +103,7 @@ actions.push('删除'); actions.push('查看 '); actions.push('绑定'); + actions.push('绑定新'); return actions.join(''); } }] @@ -122,6 +123,10 @@ $.modal.open("", ctx + "project/question/bind/" + id, width, height); } + function bindNew(id, width, height) { + $.modal.open("", ctx + "project/question/bindNew/" + id, width, height); + } + function reset() { $("[name='name']").val(""); $("[name='createTime']").val(""); diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java index f854275e..18639364 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java @@ -116,7 +116,7 @@ public class SceneManageController extends BaseController { } /** - * 删除 + * 导出记录 */ @PostMapping("/export") @ApiOperation("导出记录") @@ -125,7 +125,7 @@ public class SceneManageController extends BaseController { } /** - * 删除 + * 导入记录 */ @PostMapping("/importData") @ResponseBody 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 fb1606df..216f7e3e 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 @@ -82,6 +82,19 @@ public class SceneQuestionController extends BaseController { return prefix + "/bind"; } + @RequiresPermissions("project:question:bind") + @GetMapping("/bindNew/{id}") + public String bindNew(@PathVariable("id") Long id, ModelMap mmap) { + SceneQuestion sceneQuestion = sceneQuestionService.selectSceneQuestionById(id); + List list = sceneQuestionService.selectSceneQuestionList(new SceneQuestion()); + if (CollectionUtils.isNotEmpty(list)) { + list = list.stream().filter(item -> !Objects.equals(item.getId(), id)).collect(Collectors.toList()); + } + mmap.put("sceneQuestion", sceneQuestion); + mmap.put("list", list); + return prefix + "/bindNew"; + } + // /** // * 导出场景题目列表 // */ diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneImportDataModel.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneImportDataModel.java index 83da24fe..20523f53 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneImportDataModel.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneImportDataModel.java @@ -95,4 +95,11 @@ public class SceneImportDataModel { public void setDescribe(String describe) { this.describe = describe; } + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneQuestionMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneQuestionMapper.xml index 35469230..cb6e124f 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneQuestionMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneQuestionMapper.xml @@ -11,12 +11,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, name, parent_id, role_id, status, creator, create_time, update_time from scene_question + select id, name, parent_id, role_id, status, creator, create_time, answer, next_question_id, update_time from scene_question