Browse Source

视频后台获取完成

master
蟑螂恶霸 3 years ago
parent
commit
5c6cf7c1ff
  1. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/add.html
  2. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/detail.html
  3. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/edit.html
  4. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/index.html
  5. 6
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/view.html
  6. 4
      lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneQuestionController.java
  7. 2
      lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneQuestionService.java
  8. 38
      lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java

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

@ -92,7 +92,7 @@
<script type="text/javascript" th:inline="javascript">
var type = [[${type}]];
var parentId = [[${parentId}]];
var prefix = ctx + "project/question"
var prefix = ctx + "small/project/question"
$("#form-question-add").validate({
focusCleanup: true

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

@ -91,7 +91,7 @@
<th:block th:include="zdxtInclude :: footer"/>
<th:block th:include="zdxtInclude :: bootstrap-fileinput-js"/>
<script type="text/javascript" th:inline="javascript">
var prefix = ctx + "project/question";
var prefix = ctx + "small/project/question";
var sceneObj = [[${sceneQuestion}]];
// if (sceneObj.name == null || sceneObj.name === "") {

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

@ -91,7 +91,7 @@
<th:block th:include="zdxtInclude :: bootstrap-fileinput-js"/>
<script type="text/javascript" th:inline="javascript">
var type = [[${type}]];
var prefix = ctx + "project/question";
var prefix = ctx + "small/project/question";
$("#form-question-edit").validate({
focusCleanup: true
});

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

@ -409,7 +409,7 @@
}
function editQuestion(guid){
$.modal.open("新增题目", "/project/question/addNew?guid="+guid+"&parentId=" + sceneRole.guid, 600, 450);
$.modal.open("新增题目", "/small/project/question/addNew?guid="+guid+"&parentId=" + sceneRole.guid, 600, 450);
}
function getUuid() {

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

@ -47,7 +47,7 @@
var removeFlag = [[${@permission.hasPermi('project:question:remove')}]];
var detailFlag = [[${@permission.hasPermi('project:question:detail')}]];
var bindFlag = [[${@permission.hasPermi('project:question:bind')}]];
var prefix = ctx + "project/question";
var prefix = ctx + "small/project/question";
var parentId = [[${parentId}]];
$(function () {
@ -111,11 +111,11 @@
});
function detail(id, width, height) {
$.modal.open("查看场景题目", ctx + "project/question/detail/" + id, width, height);
$.modal.open("查看场景题目", ctx + "small/project/question/detail/" + id, width, height);
}
function add() {
$.modal.open("新增场景题目", ctx + "project/question/add/" + parentId, 800, 450);
$.modal.open("新增场景题目", ctx + "small/project/question/add/" + parentId, 800, 450);
}
// function bindNew(id, width, height) {

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

@ -211,7 +211,7 @@ public class SceneQuestionController extends BaseController {
@PostMapping("/getBindJsonApp")
@ResponseBody
public ZDResponse getBindJsonApp(@RequestBody String guid) {
Map<String, Object> map = sceneQuestionService.selectQuestionTree(guid);
return ZDResponse.success("成功", map);
List<Map<String, Object>> list = sceneQuestionService.selectQuestionTree(guid);
return ZDResponse.success("成功", list);
}
}

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

@ -84,5 +84,5 @@ public interface ISceneQuestionService
* @param guid
* @return
*/
Map<String, Object> selectQuestionTree(String guid);
List<Map<String, Object>> selectQuestionTree(String guid);
}

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

@ -202,7 +202,7 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService {
* @return 场景题目
*/
@Override
public Map<String, Object> selectQuestionTree(String guid) {
public List<Map<String, Object>> selectQuestionTree(String guid) {
SceneRole sceneRole = iSceneRoleService.selectSceneRoleById(guid);
JSONObject json = JSON.parseObject(sceneRole.getContent());
JSONObject dataJson = json.getJSONObject("drawflow").getJSONObject("Home").getJSONObject("data");
@ -212,12 +212,13 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService {
JSONObject data = dataJson.getJSONObject(i+"");
Map<String, Object> params = new HashMap<>();
params.put("questionId", data.get("name"));
params.put("nodeId", data.get("id"));
Set outList = new HashSet();
Set<Integer> outList = new HashSet();
JSONArray outs = data.getJSONObject("outputs").getJSONObject("output_1").getJSONArray("connections");
for (int j=0; j<outs.size(); j++) {
JSONObject ot = outs.getJSONObject(j);
outList.add(ot.getString("node"));
outList.add(ot.getInteger("node"));
}
params.put("outs", outList);
@ -231,16 +232,39 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService {
} else {
continue;
}
} else {
continue;
}
paramsList.add(params);
}
System.out.println(paramsList);
// recursionFn(paramsList, root);
return new HashMap<>();
return paramsList;
}
private void recursionFn(List<Map<String, Object>> params, Map<String, Object> p) {
List<Map<String, Object>> childList = getChildList(params, p);
p.put("children", childList);
for (Map<String, Object> child : childList) {
if (hasChild(params, child)) {
recursionFn(params, child);
}
}
}
private List<Map<String, Object>> getChildList(List<Map<String, Object>> params, Map<String, Object> p) {
List<Map<String, Object>> list = new ArrayList<>();
for (Map<String, Object> param : params) {
if (((Set) p.get("outs")).contains(Integer.parseInt(param.get("nodeId").toString()))) {
list.add(param);
}
}
return list;
}
private boolean hasChild(List<Map<String, Object>> params, Map<String, Object> p) {
return getChildList(params, p).size() > 0 ? true : false;
}
}

Loading…
Cancel
Save