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 61a6d2d5..a07dc48d 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 @@ -3,11 +3,16 @@ 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.QuestionFre; import com.zdxt.knowledge.domain.SceneImportDataModel; import com.zdxt.knowledge.domain.SceneManage; +import com.zdxt.knowledge.domain.SceneRole; +import com.zdxt.knowledge.service.IQuestionFreService; import com.zdxt.knowledge.service.ISceneManageService; +import com.zdxt.knowledge.service.ISceneRoleService; import com.zdxt.knowledge.utils.ExcelUtil; import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; @@ -17,9 +22,11 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.stream.Collectors; /** @@ -36,6 +43,12 @@ public class SceneManageController extends BaseController { @Autowired private ISceneManageService sceneManageService; + @Autowired + private ISceneRoleService sceneRoleService; + + @Autowired + private IQuestionFreService questionFreService; + @RequiresPermissions("project:manage:view") @GetMapping() public String manage() { @@ -63,6 +76,19 @@ public class SceneManageController extends BaseController { public TableDataInfo listApp(@RequestBody SceneManage sceneManage) { startPage(); List list = sceneManageService.selectSceneManageListAll(sceneManage); + if (CollectionUtils.isNotEmpty(list)) { + list = list.stream() + .map(item -> { + SceneRole sceneRole = new SceneRole(); + sceneRole.setSceneId(item.getGuid()); + item.setRoleTotal(sceneRoleService.selectSceneRoleList(sceneRole).size()); + QuestionFre questionFre = new QuestionFre(); + questionFre.setSceneId(item.getGuid()); + item.setUseTotal((long) questionFreService.selectQuestionFreList(questionFre).size()); + return item; + }) + .collect(Collectors.toList()); + } return getDataTable(list); } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionFre.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionFre.java index f60a0647..8d9a97eb 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionFre.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionFre.java @@ -29,6 +29,11 @@ public class QuestionFre { */ private String userId; + /** + * 场景id + */ + private String sceneId; + /** * 创建人 */ @@ -118,4 +123,12 @@ public class QuestionFre { public void setUserId(String userId) { this.userId = userId; } + + public String getSceneId() { + return sceneId; + } + + public void setSceneId(String sceneId) { + this.sceneId = sceneId; + } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java index 29763465..3743f779 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java @@ -95,6 +95,12 @@ public class SceneManage extends PageDomain { @Excel(name = "使用人数") private Long useTotal; + /** + * 演练角色 + */ + @Excel(name = "演练角色") + private Integer roleTotal; + /** * 创建时间 */ @@ -275,4 +281,12 @@ public class SceneManage extends PageDomain { public void setUploadPath(String uploadPath) { this.uploadPath = uploadPath; } + + public Integer getRoleTotal() { + return roleTotal; + } + + public void setRoleTotal(Integer roleTotal) { + this.roleTotal = roleTotal; + } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/QuestionFreMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/QuestionFreMapper.xml index 67390a45..d002a280 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/QuestionFreMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/QuestionFreMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -15,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select guid, user_id, role_id, creator, create_time, updator, update_time from question_fre + select guid, user_id, role_id, scene_id, creator, create_time, updator, update_time from question_fre - select cu.guid, cu.name, cu.sort, cu.status, cu.is_open, zd.upload_path from scene_manage as cu + select cu.guid, cu.name, cu.sort, cu.status, cu.is_open, cu.use_total, zd.upload_path from scene_manage as cu inner join zdxt_file as zd on cu.guid = zd.business_id