+
+
+ 题目
+
+
+ 答案
+
+
+ 结束
+
-
-
+ function getUuid() {
+ var s = [];
+ var hexDigits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ for (var i = 0; i < 32; i++) {
+ s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1)
+ }
+ s[14] = "4"
+ s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+ let uuid = s.join("")
+ return uuid
+ }
+
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 86a58c33..c018af86 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
@@ -102,8 +102,7 @@
actions.push('
编辑 ');
actions.push('
删除');
actions.push('
查看 ');
- // actions.push('
绑定');
- actions.push('
绑定');
+ //actions.push('
绑定');
return actions.join('');
}
}]
@@ -119,16 +118,9 @@
$.modal.open("新增场景题目", ctx + "project/question/add/" + parentId, 800, 450);
}
- function bind(id, width, height) {
- $.modal.open("", ctx + "project/question/bind/" + id, width, height);
- }
-
- function bindNew(id, width, height) {
- $.modal.open("", ctx + "project/question/bindNew/" + id, width, height);
- // $.get(ctx + "project/question/bindNew/" + id,
- // function(){}
- // );
- }
+ // function bindNew(id, width, height) {
+ // $.modal.open("", ctx + "project/question/bindNew/" + id, width, height);
+ // }
function reset() {
$("[name='name']").val("");
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/add.html
new file mode 100644
index 00000000..8199394f
--- /dev/null
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/add.html
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/edit.html
new file mode 100755
index 00000000..2e2c117c
--- /dev/null
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/edit.html
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/view.html
new file mode 100644
index 00000000..bc8986ae
--- /dev/null
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/role/view.html
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html
index c7de1d4e..00e98843 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html
@@ -152,7 +152,7 @@
actions.push('
编辑 ');
actions.push('
删除');
actions.push('
查看 ');
- actions.push('
题目');
+ actions.push('
角色');
actions.push('
上移');
return actions.join('');
}
@@ -187,10 +187,11 @@
$.modal.openFull("场景详情", url);
}
- function question(id, name) {
- table.set();
- $.modal.openFull("场景名称 >>" + name, ctx + "project/question/view/" + id);
- }
+ // function question(id, name) {
+ // table.set();
+ // //$.modal.openFull("场景名称 >>" + name, ctx + "project/question/view/" + id);
+ // $.modal.openFull("", ctx + "project/question/bindNew/" + id);
+ // }
function sort(id) {
$.get(ctx + "scene/manage/sort/" + id, null, function (res) {
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 62a56138..237f730d 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
@@ -7,8 +7,8 @@ import com.zdxt.common.util.TableDataInfo;
import com.zdxt.knowledge.domain.SceneManage;
import com.zdxt.knowledge.domain.SceneQuestion;
import com.zdxt.knowledge.mapper.SceneManageMapper;
+import com.zdxt.knowledge.mapper.SceneRoleMapper;
import com.zdxt.knowledge.service.ISceneQuestionService;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -18,8 +18,6 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
/**
* 场景题目Controller
@@ -38,6 +36,8 @@ public class SceneQuestionController extends BaseController {
@Autowired
private SceneManageMapper sceneManageMapper;
+ @Autowired
+ private SceneRoleMapper sceneRoleMapper;
@Autowired
private RoleApi roleApi;
@@ -69,54 +69,12 @@ public class SceneQuestionController extends BaseController {
return prefix + "/detail";
}
- @RequiresPermissions("project:question:bind")
- @GetMapping("/bind/{guid}")
- public String bind(@PathVariable("guid") String guid, ModelMap mmap) {
- SceneQuestion sceneQuestion = sceneQuestionService.selectSceneQuestionById(guid);
- List
list = sceneQuestionService.selectSceneQuestionList(new SceneQuestion());
- if (CollectionUtils.isNotEmpty(list)) {
- list = list.stream().filter(item -> !Objects.equals(item.getGuid(), guid)).collect(Collectors.toList());
- }
- mmap.put("sceneQuestion", sceneQuestion);
- mmap.put("list", list);
- return prefix + "/bind";
- }
-
- @RequiresPermissions("project:question:bind")
- @GetMapping("/bindNew/{guid}")
- public String bindNew(@PathVariable("guid") String guid, ModelMap mmap) {
- SceneQuestion sceneQuestion = sceneQuestionService.selectSceneQuestionById(guid);
- List list = sceneQuestionService.selectSceneQuestionList(new SceneQuestion());
- if (CollectionUtils.isNotEmpty(list)) {
- list = list.stream().filter(item -> !Objects.equals(item.getGuid(), guid)).collect(Collectors.toList());
- }
- mmap.put("sceneQuestion", sceneQuestion);
- mmap.put("list", list);
- return prefix + "/index";
- }
-
-// /**
-// * 导出场景题目列表
-// */
-// @RequiresPermissions("project:question:export")
-// @PostMapping("/export")
-// @ResponseBody
-// public AjaxResult export(SceneQuestion sceneQuestion)
-// {
-// List list = sceneQuestionService.selectSceneQuestionList(sceneQuestion);
-// ExcelUtil util = new ExcelUtil(SceneQuestion.class);
-// return util.exportExcel(list, "question");
-// }
-
/**
* 新增场景题目
*/
- @GetMapping("/add/{parentId}")
- public String add(@PathVariable("parentId") String parentId, ModelMap mmap) {
- SceneManage sceneManage = sceneManageMapper.selectSceneManageById(parentId);
+ @GetMapping("/add")
+ public String add(@RequestParam("parentId") String parentId, ModelMap mmap) {
mmap.put("parentId", parentId);
- mmap.put("type", sceneManage.getType());
- mmap.put("roles", roleApi.getRolesAll());
return prefix + "/add";
}
@@ -211,13 +169,38 @@ public class SceneQuestionController extends BaseController {
}
/**
- * 绑定场景题目
+ * 新增场景题目
*/
- @RequiresPermissions("project:question:bind")
- @PostMapping("/bindAnswer")
+ @GetMapping("/addNew")
+ public String addNew(@RequestParam("guid") String guid, @RequestParam("parentId") String parentId, ModelMap mmap) {
+ SceneQuestion sceneQuestion = sceneQuestionService.selectSceneQuestionById(guid);
+ mmap.put("parentId", parentId);
+ mmap.put("guid", guid);
+ mmap.put("sceneQuestion", sceneQuestion);
+ return prefix + "/addNew";
+ }
+
+ /**
+ * 流程图-新增/修改场景题目节点
+ */
+ @RequiresPermissions("project:question:add")
+ @PostMapping("/addSaveNew")
@ResponseBody
- public ZDResponse bindAnswer(SceneQuestion sceneQuestion) {
- return sceneQuestionService.bindAnswer(sceneQuestion) > 0
- ? ZDResponse.success() : ZDResponse.error("绑定失败");
+ public ZDResponse addSaveNew(@RequestParam("file") MultipartFile[] files, SceneQuestion sceneQuestion) {
+ return sceneQuestionService.editSceneQuestion(files, sceneQuestion) > 0
+ ? ZDResponse.success() : ZDResponse.error("新增失败");
}
+
+// @RequiresPermissions("project:question:bind")
+// @GetMapping("/bindNew/{guid}")
+// public String bindNew(@PathVariable("guid") String guid, ModelMap mmap) {
+// SceneQuestion sceneQuestion = sceneQuestionService.selectSceneQuestionById(guid);
+// List list = sceneQuestionService.selectSceneQuestionList(new SceneQuestion());
+// if (CollectionUtils.isNotEmpty(list)) {
+// list = list.stream().filter(item -> !Objects.equals(item.getGuid(), guid)).collect(Collectors.toList());
+// }
+// mmap.put("sceneQuestion", sceneQuestion);
+// mmap.put("list", list);
+// return prefix + "/index";
+// }
}
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
new file mode 100644
index 00000000..ac44c6b1
--- /dev/null
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneRoleController.java
@@ -0,0 +1,116 @@
+package com.zdxt.knowledge.controller;
+
+import com.zdxt.common.ZDResponse;
+import com.zdxt.common.controller.BaseController;
+import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.knowledge.domain.SceneRole;
+import com.zdxt.knowledge.service.ISceneRoleService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 场景角色Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-26
+ */
+@Controller
+@RequestMapping("/small/project/role")
+public class SceneRoleController extends BaseController {
+ private String prefix = "project/role";
+
+ @Autowired
+ private ISceneRoleService sceneRoleService;
+
+ @RequiresPermissions("project:role:view")
+ @GetMapping("/view/{sceneId}")
+ public String view(@PathVariable("sceneId") String sceneId, ModelMap mmap) {
+ mmap.put("sceneId", sceneId);
+ return prefix + "/view";
+ }
+
+ /**
+ * 查询场景角色列表
+ */
+ @RequiresPermissions("project:role:list")
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(SceneRole sceneRole) {
+ startPage();
+ List list = sceneRoleService.selectSceneRoleList(sceneRole);
+ return getDataTable(list);
+ }
+
+ @RequiresPermissions("project:role:detail")
+ @GetMapping("/detail/{guid}")
+ public String detail(@PathVariable("guid") String guid, ModelMap mmap) {
+ SceneRole SceneRole = sceneRoleService.selectSceneRoleById(guid);
+ mmap.put("sceneRole", SceneRole);
+ return prefix + "/detail";
+ }
+
+ /**
+ * 新增场景角色
+ */
+ @GetMapping("/add/{sceneId}")
+ public String add(@PathVariable("sceneId") String sceneId, ModelMap mmap) {
+ mmap.put("sceneId", sceneId);
+ return prefix + "/add";
+ }
+
+ /**
+ * 新增保存场景角色
+ */
+ @RequiresPermissions("project:role:add")
+ @PostMapping("/add")
+ @ResponseBody
+ public ZDResponse addSave(SceneRole sceneRole) {
+ return sceneRoleService.insertSceneRole(sceneRole) > 0
+ ? ZDResponse.success() : ZDResponse.error("新增失败");
+ }
+
+ /**
+ * 修改场景角色
+ */
+ @GetMapping("/edit/{guid}")
+ public String edit(@PathVariable("guid") String guid, ModelMap mmap) {
+ SceneRole sceneRole = sceneRoleService.selectSceneRoleById(guid);
+ mmap.put("sceneRole", sceneRole);
+ return prefix + "/edit";
+ }
+
+ /**
+ * 修改保存场景角色
+ */
+ @RequiresPermissions("project:role:edit")
+ @PostMapping("/edit")
+ @ResponseBody
+ public ZDResponse editSave(SceneRole sceneRole) {
+ return sceneRoleService.updateSceneRole(sceneRole) > 0
+ ? ZDResponse.success() : ZDResponse.error("修改失败");
+ }
+
+ /**
+ * 删除场景角色
+ */
+ @RequiresPermissions("project:role:remove")
+ @PostMapping("/remove")
+ @ResponseBody
+ public ZDResponse remove(String ids) {
+ return sceneRoleService.deleteSceneRoleByIds(ids) > 0
+ ? ZDResponse.success() : ZDResponse.error("删除失败");
+ }
+
+ @RequiresPermissions("project:role:bind")
+ @GetMapping("/bindNew/{guid}")
+ public String bindNew(@PathVariable("guid") String guid, ModelMap mmap) {
+ SceneRole sceneRole = sceneRoleService.selectSceneRoleById(guid);
+ mmap.put("sceneRole", sceneRole);
+ return "project/question/index";
+ }
+}
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneRole.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneRole.java
new file mode 100644
index 00000000..b05c153f
--- /dev/null
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneRole.java
@@ -0,0 +1,147 @@
+package com.zdxt.knowledge.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 场景角色 scene_role
+ *
+ * @author ruoyi
+ * @date 2023-12-26
+ */
+public class SceneRole implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String guid;
+
+ /**
+ * 题目名称
+ */
+ private String name;
+
+ /**
+ * 场景id
+ */
+ private String sceneId;
+
+
+ /**
+ * 状态0有效1无效
+ */
+ private Integer status;
+
+ /**
+ * 绑定的题目流程图内容
+ */
+ private String content;
+
+ /**
+ * 创建人
+ */
+ private String creator;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 修改人
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ /**
+ * 请求参数
+ */
+ private Map params;
+
+ public String getGuid() {
+ return guid;
+ }
+
+ public void setGuid(String guid) {
+ this.guid = guid;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSceneId() {
+ return sceneId;
+ }
+
+ public void setSceneId(String sceneId) {
+ this.sceneId = sceneId;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getCreator() {
+ return creator;
+ }
+
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Map getParams() {
+ return params;
+ }
+
+ public void setParams(Map params) {
+ this.params = params;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+}
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneRoleMapper.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneRoleMapper.java
new file mode 100644
index 00000000..ebbffefd
--- /dev/null
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneRoleMapper.java
@@ -0,0 +1,53 @@
+package com.zdxt.knowledge.mapper;
+
+import com.zdxt.knowledge.domain.SceneRole;
+
+import java.util.List;
+
+/**
+ * 场景角色Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-26
+ */
+public interface SceneRoleMapper {
+ /**
+ * 查询场景角色
+ *
+ * @param guid 场景角色ID
+ * @return 场景角色
+ */
+ public SceneRole selectSceneRoleById(String guid);
+
+ /**
+ * 查询场景角色列表
+ *
+ * @param sceneRole 场景角色
+ * @return 场景角色集合
+ */
+ public List selectSceneRoleList(SceneRole sceneRole);
+
+ /**
+ * 新增场景角色
+ *
+ * @param sceneRole 场景角色
+ * @return 结果
+ */
+ public int insertSceneRole(SceneRole sceneRole);
+
+ /**
+ * 修改场景角色
+ *
+ * @param sceneRole 场景角色
+ * @return 结果
+ */
+ public int updateSceneRole(SceneRole sceneRole);
+
+ /**
+ * 批量删除场景角色
+ *
+ * @param guids 需要删除的数据ID
+ * @return 结果
+ */
+ public int deleteSceneRoleByIds(String[] guids);
+}
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 94786177..4d911a57 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
@@ -38,6 +38,15 @@ public interface ISceneQuestionService
*/
public int insertSceneQuestion(MultipartFile[] files, SceneQuestion sceneQuestion);
+
+ /**
+ * 流程图-新增/修改场景题目节点
+ *
+ * @param sceneQuestion 场景题目
+ * @return 结果
+ */
+ public int editSceneQuestion(MultipartFile[] files, SceneQuestion sceneQuestion);
+
/**
* 修改场景题目
*
@@ -54,22 +63,6 @@ public interface ISceneQuestionService
*/
public int deleteSceneQuestionByIds(String guids);
- /**
- * 删除场景题目信息
- *
- * @param guid 场景题目ID
- * @return 结果
- */
- public int deleteSceneQuestionById(String guid);
-
- /**
- * 绑定场景题目信息
- *
- * @param sceneQuestion
- * @return 结果
- */
- public int bindAnswer(SceneQuestion sceneQuestion);
-
/**
* 查询附件
* @param key
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneRoleService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneRoleService.java
new file mode 100644
index 00000000..6e900a8e
--- /dev/null
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneRoleService.java
@@ -0,0 +1,54 @@
+package com.zdxt.knowledge.service;
+
+import com.zdxt.knowledge.domain.SceneRole;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 场景角色Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-26
+ */
+public interface ISceneRoleService {
+ /**
+ * 查询场景角色
+ *
+ * @param guid 场景角色ID
+ * @return 场景角色
+ */
+ public SceneRole selectSceneRoleById(String guid);
+
+ /**
+ * 查询场景角色列表
+ *
+ * @param sceneRole 场景角色
+ * @return 场景角色集合
+ */
+ public List selectSceneRoleList(SceneRole sceneRole);
+
+ /**
+ * 新增场景角色
+ *
+ * @param sceneRole 场景角色
+ * @return 结果
+ */
+ public int insertSceneRole(SceneRole sceneRole);
+
+ /**
+ * 修改场景角色
+ *
+ * @param sceneRole 场景角色
+ * @return 结果
+ */
+ public int updateSceneRole(SceneRole sceneRole);
+
+ /**
+ * 批量删除场景角色
+ *
+ * @param guids 需要删除的数据ID
+ * @return 结果
+ */
+ public int deleteSceneRoleByIds(String guids);
+}
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 5bb3925a..1e0f2d88 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
@@ -88,6 +88,39 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService {
return questionList;
}
+ /**
+ * 新增场景题目
+ *
+ * @param sceneQuestion 场景题目
+ * @return 结果
+ */
+ @Override
+ public int editSceneQuestion(MultipartFile[] files, SceneQuestion sceneQuestion) {
+ int result;
+ UserBean userBean = userApi.getCurrentUser();
+ SceneQuestion questionEntity = sceneQuestionMapper.selectSceneQuestionById(sceneQuestion.getGuid());
+ if (Objects.isNull(questionEntity)) {
+ if (Objects.nonNull(userBean)) {
+ sceneQuestion.setCreator(userBean.getUserName());
+ sceneQuestion.setCreateTime(DateUtils.getNowDate());
+ }
+ result = sceneQuestionMapper.insertSceneQuestion(sceneQuestion);
+ } else {
+ if (Objects.nonNull(userBean)) {
+ sceneQuestion.setUpdateTime(DateUtils.getNowDate());
+ }
+ result = sceneQuestionMapper.updateSceneQuestion(sceneQuestion);
+ zdxtFileCommonApi.deleteZdxtFileByIds(sceneQuestion.getGuid());
+ }
+ // 上传文件，并在附件表中添加记录
+ if (result > 0 && ObjectUtil.isNotEmpty(files)) {
+ for (MultipartFile file : files) {
+ zdxtFileCommonApi.insertZdxtFile(file, sceneQuestion.getGuid() + "", fileUploadApi.upload(file));
+ }
+ }
+ return result;
+ }
+
/**
* 新增场景题目
*
@@ -101,7 +134,7 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService {
sceneQuestion.setCreator(userBean.getUserName());
sceneQuestion.setCreateTime(DateUtils.getNowDate());
}
- sceneQuestion.setGuid(StringUtils.getUUID());
+ sceneQuestion.setGuid(StringUtils.isEmpty(sceneQuestion.getGuid()) ? StringUtils.getUUID() : sceneQuestion.getGuid());
int result = sceneQuestionMapper.insertSceneQuestion(sceneQuestion);
// 上传文件，并在附件表中添加记录
if (result > 0 && ObjectUtil.isNotEmpty(files)) {
@@ -135,17 +168,6 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService {
return sceneQuestionMapper.deleteSceneQuestionByIds(Convert.toStrArray(guids));
}
- /**
- * 删除场景题目信息
- *
- * @param guid 场景题目ID
- * @return 结果
- */
- @Override
- public int deleteSceneQuestionById(String guid) {
- return sceneQuestionMapper.deleteSceneQuestionById(guid);
- }
-
@Override
public AttFileRespDTO queryFiles(String key) {
ZdxtFileBean zdxtFileBeanCondition = new ZdxtFileBean();
@@ -168,14 +190,4 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService {
return zdxtFileCommonApi.deleteZdxtFileById(key);
}
- /**
- * 绑定场景题目信息
- *
- * @param sceneQuestion
- * @return 结果
- */
- @Override
- public int bindAnswer(SceneQuestion sceneQuestion) {
- return sceneQuestionMapper.bindAnswer(sceneQuestion);
- }
}
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneRoleServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneRoleServiceImpl.java
new file mode 100644
index 00000000..f0c35488
--- /dev/null
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneRoleServiceImpl.java
@@ -0,0 +1,97 @@
+package com.zdxt.knowledge.service.impl;
+
+import com.zdxt.auth.dto.UserBean;
+import com.zdxt.auth.feign.UserApi;
+import com.zdxt.common.util.Convert;
+import com.zdxt.common.util.DateUtils;
+import com.zdxt.common.util.StringUtils;
+import com.zdxt.knowledge.domain.SceneRole;
+import com.zdxt.knowledge.mapper.SceneRoleMapper;
+import com.zdxt.knowledge.service.ISceneRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 场景题目Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-12-26
+ */
+@Service
+public class SceneRoleServiceImpl implements ISceneRoleService {
+ @Autowired
+ private SceneRoleMapper sceneRoleMapper;
+ @Autowired
+ private UserApi userApi;
+
+ /**
+ * 查询场景题目
+ *
+ * @param guid 场景题目ID
+ * @return 场景题目
+ */
+ @Override
+ public SceneRole selectSceneRoleById(String guid) {
+ return sceneRoleMapper.selectSceneRoleById(guid);
+ }
+
+ /**
+ * 查询场景题目列表
+ *
+ * @param sceneRole 场景题目
+ * @return 场景题目
+ */
+ @Override
+ public List selectSceneRoleList(SceneRole sceneRole) {
+ return sceneRoleMapper.selectSceneRoleList(sceneRole);
+ }
+
+ /**
+ * 新增场景题目
+ *
+ * @param sceneRole 场景题目
+ * @return 结果
+ */
+ @Override
+ public int insertSceneRole(SceneRole sceneRole) {
+ UserBean userBean = userApi.getCurrentUser();
+ if (Objects.nonNull(userBean)) {
+ sceneRole.setCreator(userBean.getUserName());
+ sceneRole.setCreateTime(DateUtils.getNowDate());
+ }
+ sceneRole.setGuid(StringUtils.getUUID());
+ return sceneRoleMapper.insertSceneRole(sceneRole);
+ }
+
+ /**
+ * 修改场景题目
+ *
+ * @param sceneRole 场景题目
+ * @return 结果
+ */
+ @Override
+ public int updateSceneRole( SceneRole sceneRole) {
+ UserBean userBean = userApi.getCurrentUser();
+ if (Objects.nonNull(userBean)) {
+ sceneRole.setUpdateBy(userBean.getUserName());
+ }
+ sceneRole.setUpdateTime(DateUtils.getNowDate());
+ return sceneRoleMapper.updateSceneRole(sceneRole);
+ }
+
+ /**
+ * 删除场景题目对象
+ *
+ * @param guids 需要删除的数据ID
+ * @return 结果
+ */
+ @Override
+ public int deleteSceneRoleByIds(String guids) {
+ return sceneRoleMapper.deleteSceneRoleByIds(Convert.toStrArray(guids));
+ }
+
+}
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneRoleMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneRoleMapper.xml
new file mode 100644
index 00000000..5b952660
--- /dev/null
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneRoleMapper.xml
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select guid,
+ name,
+ scene_id,
+ status,
+ content,
+ creator,
+ create_time,
+ update_by,
+ update_time
+ from scene_role
+
+
+
+
+
+
+
+ insert into scene_role
+
+ guid,
+ `name`,
+ scene_id,
+ status,
+ creator,
+ update_by,
+ create_time,
+ update_time,
+
+
+ #{guid},
+ #{name},
+ #{sceneId},
+ #{status},
+ #{creator},
+ #{updateBy},
+ #{createTime},
+ #{updateTime},
+
+
+
+
+ update scene_role
+
+ name = #{name},
+ content = #{content},
+ status = #{status},
+ update_by = #{updateBy},
+ update_time = #{updateTime},
+
+ where guid = #{guid}
+
+
+
+ delete
+ from scene_role
+ where guid = #{guid}
+
+
+
+ delete from scene_role where guid in
+
+ #{guid}
+
+
+
+
\ No newline at end of file