演练完成及重新挑战逻辑

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html

@@ -23,6 +23,12 @@
                 </div>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">问答：</label>
+            <div class="col-sm-8">
+                <input class="form-control" type="text" name="ask" id="ask" required>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">答案：</label>
             <div class="col-sm-8">
@@ -30,7 +36,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">选项：</label>
+            <label class="col-sm-3 control-label is-required">选项：</label>
             <div class="col-sm-8">
                 <table id="tab11" style="display: none">
                     <tbody>
@@ -70,6 +76,8 @@
 <th:block th:include="zdxtInclude :: bootstrap-fileinput-js"/>
 <script type="text/javascript" th:inline="javascript">
     var prefix = ctx + "small/project/question"
+    var sceneQuestion = [[${sceneQuestion}]];
+    $("#ask").val(sceneQuestion.ask);
     var id = document.getElementById("drawflow");
     const editor = new Drawflow(id);
 
@@ -188,7 +196,8 @@
                 data.parentId =  [[${parentId}]];
                 data.guid =  [[${guid}]];
                 let answer = $("#answer").val();
-                parent.updateNodeFromParent(data.guid,{'option': optionList, 'correct': answer })
+                let ask = $("#ask").val();
+                parent.updateNodeFromParent(data.guid,{'option': optionList, 'ask': ask, 'correct': answer })
                 //let nodeId = editor.getNodesFromName(data.guid).at(0);
                 //saveOption(optionList);
                 return data;

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionAnswerController.java

@@ -1,6 +1,7 @@
 package com.zdxt.knowledge.controller;
 
 import java.util.List;
+import java.util.Map;
 
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
@@ -48,6 +49,17 @@ public class QuestionAnswerController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 小程序查询选择所有题目
+     */
+    @PostMapping("/listAll")
+    @ResponseBody
+    public ZDResponse listAll(@RequestBody QuestionAnswer questionAnswer)
+    {
+        List<QuestionAnswer> list = questionAnswerService.selectQuestionAnswerList(questionAnswer);
+        return ZDResponse.success("成功",list);
+    }
+
     /**
      * 新增选择
      */

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionFreController.java

@@ -1,7 +1,5 @@
 package com.zdxt.knowledge.controller;
 
-import java.util.List;
-
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
 import com.zdxt.common.util.StringUtils;
@@ -14,6 +12,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 题次Controller
  *
@@ -22,8 +23,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Controller
 @RequestMapping("/small/questionFre")
-public class QuestionFreController extends BaseController
+public class QuestionFreController extends BaseController {
-{
     private String prefix = "system/fre";
 
     @Autowired
@@ -31,8 +31,7 @@ public class QuestionFreController extends BaseController
 
     @RequiresPermissions("system:fre:view")
     @GetMapping()
-    public String fre()
+    public String fre() {
-    {
         return prefix + "/fre";
     }
 
@@ -42,19 +41,34 @@ public class QuestionFreController extends BaseController
     @RequiresPermissions("system:fre:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(QuestionFre questionFre)
+    public TableDataInfo list(QuestionFre questionFre) {
-    {
         startPage();
         List<QuestionFre> list = questionFreService.selectQuestionFreList(questionFre);
         return getDataTable(list);
     }
 
+    /**
+     * 小程序查询题次列表
+     */
+    @PostMapping("/listAll")
+    @ResponseBody
+    public ZDResponse listAll(@RequestBody QuestionFre questionFre) {
+        List<QuestionFre> list = questionFreService.selectQuestionFreList(questionFre);
+        return ZDResponse.success("成功", list);
+    }
+
+    @PostMapping("/getRelationInfo")
+    @ResponseBody
+    public ZDResponse getRelationInfo(@RequestBody String guid) {
+        Map<String, Object> map = questionFreService.getRelationInfo(guid);
+        return ZDResponse.success("成功", map);
+    }
+
     /**
      * 新增题次
      */
     @GetMapping("/add")
-    public String add()
+    public String add() {
-    {
         return prefix + "/add";
     }
 
@@ -63,18 +77,16 @@ public class QuestionFreController extends BaseController
      */
     @PostMapping("/add")
     @ResponseBody
-    public ZDResponse addSave(@RequestBody QuestionFre questionFre)
+    public ZDResponse addSave(@RequestBody QuestionFre questionFre) {
-    {
         String guid = questionFreService.insertQuestionFre(questionFre);
-        return StringUtils.isNotEmpty(guid)?ZDResponse.success("操作成功", guid):ZDResponse.error("操作失败", guid);
+        return StringUtils.isNotEmpty(guid) ? ZDResponse.success("操作成功", guid) : ZDResponse.error("操作失败", guid);
     }
 
     /**
      * 修改题次
      */
     @GetMapping("/edit/{guid}")
-    public String edit(@PathVariable("guid") String guid, ModelMap mmap)
+    public String edit(@PathVariable("guid") String guid, ModelMap mmap) {
-    {
         QuestionFre questionFre = questionFreService.selectQuestionFreById(guid);
         mmap.put("questionFre", questionFre);
         return prefix + "/edit";
@@ -86,21 +98,19 @@ public class QuestionFreController extends BaseController
     @RequiresPermissions("system:fre:edit")
     @PostMapping("/edit")
     @ResponseBody
-    public ZDResponse editSave(QuestionFre questionFre)
+    public ZDResponse editSave(QuestionFre questionFre) {
-    {
         int resNum = questionFreService.updateQuestionFre(questionFre);
-        return resNum>0?ZDResponse.success("操作成功", resNum):ZDResponse.error("操作失败", resNum);
+        return resNum > 0 ? ZDResponse.success("操作成功", resNum) : ZDResponse.error("操作失败", resNum);
     }
 
     /**
      * 删除题次
      */
     @RequiresPermissions("system:fre:remove")
-    @PostMapping( "/remove")
+    @PostMapping("/remove")
     @ResponseBody
-    public ZDResponse remove(String ids)
+    public ZDResponse remove(String ids) {
-    {
         int resNum = questionFreService.deleteQuestionFreByIds(ids);
-        return resNum>0?ZDResponse.success("操作成功", resNum):ZDResponse.error("操作失败", resNum);
+        return resNum > 0 ? ZDResponse.success("操作成功", resNum) : ZDResponse.error("操作失败", resNum);
     }
 }

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionAnswer.java

@@ -21,6 +21,9 @@ public class QuestionAnswer extends BaseDomain
     /** 问题id */
     private String questionId;
 
+    /** 问答 */
+    private String ask;
+
     /** 所选答案 */
     private String answer;
 
@@ -84,4 +87,12 @@ public class QuestionAnswer extends BaseDomain
     {
         return correct;
     }
+
+    public String getAsk() {
+        return ask;
+    }
+
+    public void setAsk(String ask) {
+        this.ask = ask;
+    }
 }

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionFre.java

@@ -1,6 +1,9 @@
 package com.zdxt.knowledge.domain;
 
-import com.zdxt.common.BaseDomain;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.Map;
 
 /**
  * 题次对象 question_fre
@@ -8,32 +11,111 @@ import com.zdxt.common.BaseDomain;
  * @author ruoyi
  * @date 2024-02-04
  */
-public class QuestionFre extends BaseDomain
+public class QuestionFre {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 主键 */
+    /**
+     * 主键
+     */
     private String guid;
 
-    /** 角色id */
+    /**
+     * 角色id
+     */
     private String roleId;
 
-    public void setGuid(String guid) 
+    /**
-    {
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updator;
+
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    /**
+     * 数据权限参数
+     */
+    private Map<String, Object> params;
+
+    public void setGuid(String guid) {
         this.guid = guid;
     }
 
-    public String getGuid() 
+    public String getGuid() {
-    {
         return guid;
     }
-    public void setRoleId(String roleId) 
+
-    {
+    public void setRoleId(String roleId) {
         this.roleId = roleId;
     }
 
-    public String getRoleId() 
+    public String getRoleId() {
-    {
         return roleId;
     }
+
+    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 getUpdator() {
+        return updator;
+    }
+
+    public void setUpdator(String updator) {
+        this.updator = updator;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Map<String, Object> getParams() {
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params) {
+        this.params = params;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneQuestion.java

@@ -77,6 +77,11 @@ public class SceneQuestion implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    /**
+     * 问答
+     */
+    private String ask;
+
     /**
      * 答案
      */
@@ -245,4 +250,12 @@ public class SceneQuestion implements Serializable {
     public void setUploadPath(String uploadPath) {
         this.uploadPath = uploadPath;
     }
+
+    public String getAsk() {
+        return ask;
+    }
+
+    public void setAsk(String ask) {
+        this.ask = ask;
+    }
 }

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IQuestionAnswerService.java

@@ -3,6 +3,7 @@ package com.zdxt.knowledge.service;
 import com.zdxt.knowledge.domain.QuestionAnswer;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 选择Service接口

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IQuestionFreService.java

@@ -3,6 +3,7 @@ package com.zdxt.knowledge.service;
 import com.zdxt.knowledge.domain.QuestionFre;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 题次Service接口
@@ -59,4 +60,6 @@ public interface IQuestionFreService
      * @return 结果
      */
     public int deleteQuestionFreById(String guid);
+
+    Map<String, Object> getRelationInfo(String guid);
 }

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/QuestionFreServiceImpl.java

@@ -1,11 +1,21 @@
 package com.zdxt.knowledge.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
+import com.zdxt.auth.dto.ZdxtFileBean;
+import com.zdxt.auth.feign.ZdxtFileCommonApi;
 import com.zdxt.common.util.Convert;
 import com.zdxt.common.util.StringUtils;
+import com.zdxt.knowledge.domain.QuestionAnswer;
 import com.zdxt.knowledge.domain.QuestionFre;
+import com.zdxt.knowledge.domain.SceneManage;
+import com.zdxt.knowledge.domain.SceneRole;
 import com.zdxt.knowledge.mapper.QuestionFreMapper;
+import com.zdxt.knowledge.mapper.SceneManageMapper;
+import com.zdxt.knowledge.mapper.SceneRoleMapper;
 import com.zdxt.knowledge.service.IQuestionFreService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,6 +32,14 @@ public class QuestionFreServiceImpl implements IQuestionFreService
     @Autowired
     private QuestionFreMapper questionFreMapper;
 
+    @Autowired
+    private SceneManageMapper sceneManageMapper;
+
+    @Autowired
+    private SceneRoleMapper sceneRoleMapper;
+
+    @Autowired
+    private ZdxtFileCommonApi zdxtFileCommonApi;
     /**
      * 查询题次
      * 
@@ -98,4 +116,25 @@ public class QuestionFreServiceImpl implements IQuestionFreService
     {
         return questionFreMapper.deleteQuestionFreById(guid);
     }
+
+    @Override
+    public Map<String, Object> getRelationInfo(String guid) {
+        Map<String, Object> map = new HashMap<>();
+        QuestionFre questionFre = questionFreMapper.selectQuestionFreById(guid);
+        if (Objects.nonNull(questionFre)) {
+            SceneRole sceneRole = sceneRoleMapper.selectSceneRoleById(questionFre.getRoleId());
+            if (Objects.nonNull(sceneRole)) {
+                map.put("sceneRole",sceneRole);
+                SceneManage sceneManage = sceneManageMapper.selectSceneManageById(sceneRole.getSceneId());
+                if (Objects.nonNull(sceneManage)) {
+                    ZdxtFileBean zdxtFileBeanCondition = new ZdxtFileBean();
+                    zdxtFileBeanCondition.setBusinessId(sceneManage.getGuid());
+                    List<ZdxtFileBean> fileBeanList = zdxtFileCommonApi.selectZdxtFileList(zdxtFileBeanCondition);
+                    map.put("file",fileBeanList);
+                    map.put("sceneManage",sceneManage);
+                }
+            }
+        }
+        return map;
+    }
 }

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java

@@ -228,10 +228,11 @@ public class SceneManageServiceImpl implements ISceneManageService {
     public ZDResponse deleteSceneManageByIds(String guids) {
         List<SceneManage> sceneManageList = sceneManageMapper.selectSceneManageByIds(Convert.toStrArray(guids));
         if (CollectionUtils.isNotEmpty(sceneManageList)) {
-            long count = sceneManageList.stream().filter(item -> !Objects.equals(item.getStatus(), 4)).count();
+              //由于工作流还没实现，暂时注释此段代码
-            if (count > 0) {
+//            long count = sceneManageList.stream().filter(item -> !Objects.equals(item.getStatus(), 4)).count();
-                return ZDResponse.error("仅支持已下架的场景进行删除操作");
+//            if (count > 0) {
-            }
+//                return ZDResponse.error("仅支持已下架的场景进行删除操作");
+//            }
         }
         return sceneManageMapper.deleteSceneManageByIds(Convert.toStrArray(guids)) > 0
                 ? ZDResponse.success() : ZDResponse.error("删除失败");

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java

@@ -246,6 +246,10 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService {
                 if (StringUtils.isNotEmpty(correct)) {
                     params.put("correct", correct);
                 }
+                String ask = dataTmp.getString("ask");
+                if (StringUtils.isNotEmpty(ask)) {
+                    params.put("ask", ask);
+                }
                 JSONArray option = dataTmp.getJSONArray("option");
                 if (Objects.nonNull(option) && option.size() != 0) {
                     Map<String, String> map = new HashMap<>();

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/QuestionAnswerMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="guid"    column="guid"    />
         <result property="questionFreId"    column="question_fre_id"    />
         <result property="questionId"    column="question_id"    />
+        <result property="ask"    column="ask"    />
         <result property="answer"    column="answer"    />
         <result property="correctAnswer"    column="correct_answer"    />
         <result property="correct"    column="correct"    />
@@ -18,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQuestionAnswerVo">
-        select guid, question_fre_id, question_id, answer, correct_answer, correct, creator, create_time, updator, update_time from question_answer
+        select guid, question_fre_id, question_id, ask, answer, correct_answer, correct, creator, create_time, updator, update_time from question_answer
     </sql>
 
     <select id="selectQuestionAnswerList" parameterType="QuestionAnswer" resultMap="QuestionAnswerResult">
@@ -45,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="guid != null  and guid != ''">guid,</if>
             <if test="questionFreId != null  and questionFreId != ''">question_fre_id,</if>
             <if test="questionId != null  and questionId != ''">question_id,</if>
+            <if test="ask != null  and ask != ''">ask,</if>
             <if test="answer != null  and answer != ''">answer,</if>
             <if test="correctAnswer != null  and correctAnswer != ''">correct_answer,</if>
             <if test="correct != null ">correct,</if>
@@ -57,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="guid != null  and guid != ''">#{guid},</if>
             <if test="questionFreId != null  and questionFreId != ''">#{questionFreId},</if>
             <if test="questionId != null  and questionId != ''">#{questionId},</if>
+            <if test="ask != null  and ask != ''">#{ask},</if>
             <if test="answer != null  and answer != ''">#{answer},</if>
             <if test="correctAnswer != null  and correctAnswer != ''">#{correctAnswer},</if>
             <if test="correct != null ">#{correct},</if>
@@ -72,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="questionFreId != null  and questionFreId != ''">question_fre_id = #{questionFreId},</if>
             <if test="questionId != null  and questionId != ''">question_id = #{questionId},</if>
+            <if test="ask != null ">ask = #{ask},</if>
             <if test="answer != null  and answer != ''">answer = #{answer},</if>
             <if test="correctAnswer != null  and correctAnswer != ''">correct_answer = #{correctAnswer},</if>
             <if test="correct != null ">correct = #{correct},</if>

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/QuestionFreMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="creator != null  and creator != ''"> and creator = #{creator}</if>
             <if test="updator != null  and updator != ''"> and updator = #{updator}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectQuestionFreById" parameterType="String" resultMap="QuestionFreResult">

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneQuestionMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"    column="status"    />
         <result property="creator"    column="creator"    />
         <result property="option"    column="option"    />
+        <result property="ask"    column="ask"    />
         <result property="answer"    column="answer"    />
         <result property="uploadPath"    column="upload_path"    />
         <result property="nextQuestionId"    column="next_question_id"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSceneQuestionVo">
-        select guid, code, name, parent_id, role_id, status, creator, create_time, answer, upload_path, `option`, next_question_id, update_time from scene_question
+        select guid, code, name, parent_id, role_id, status, creator, create_time, ask, answer, upload_path, `option`, next_question_id, update_time from scene_question
     </sql>
 
     <select id="selectSceneQuestionList" parameterType="SceneQuestion" resultMap="SceneQuestionResult">
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="roleId != null  and roleId != ''">role_id,</if>
             <if test="status != null ">status,</if>
             <if test="option != null  and option != ''">`option`,</if>
+            <if test="ask != null  and ask != ''">ask,</if>
             <if test="answer != null  and answer != ''">answer,</if>
             <if test="uploadPath != null  and uploadPath != ''">upload_path,</if>
             <if test="creator != null  and creator != ''">creator,</if>
@@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="roleId != null  and roleId != ''">#{roleId},</if>
             <if test="status != null ">#{status},</if>
             <if test="option != null  and option != ''">#{option},</if>
+            <if test="ask != null  and ask != ''">#{ask},</if>
             <if test="answer != null  and answer != ''">#{answer},</if>
             <if test="uploadPath != null  and uploadPath != ''">#{uploadPath},</if>
             <if test="creator != null  and creator != ''">#{creator},</if>
@@ -85,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="roleId != null  and roleId != ''">role_id = #{roleId},</if>
             <if test="status != null ">status = #{status},</if>
             <if test="option != null  and option != ''">`option` = #{option},</if>
+            <if test="ask != null  and ask != ''">ask = #{ask},</if>
             <if test="answer != null  and answer != ''">answer = #{answer},</if>
             <if test="uploadPath != null  and uploadPath != ''">upload_path = #{uploadPath},</if>
             <if test="creator != null  and creator != ''">creator = #{creator},</if>