Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 96e033e6 authored by chenzhao's avatar chenzhao
Browse files
Options

Merge branch 'dev_upgrade' of…

Merge branch 'dev_upgrade' of http://39.98.45.134:8090/station/YeeAmosFireAutoSysRoot into dev_upgrade # Conflicts: # YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/EmergencyTaskMapper.java # YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EmergencyTaskServiceImpl.java # YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IEmergencyTaskService.java # YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_emergency_task.xml
parents 68a6eb26 74bd50c0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 76 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/ContingencyPlanController.java
View file @ 96e033e6
...@@ -265,14 +265,15 @@ public class ContingencyPlanController extends BaseController { ...@@ -265,14 +265,15 @@ public class ContingencyPlanController extends BaseController {
@RequestMapping(value = "/getUserOperateCountAndTaskName", method = RequestMethod.GET) @RequestMapping(value = "/getUserOperateCountAndTaskName", method = RequestMethod.GET)
public ResponseModel getUserOperateCountAndTaskName() { public ResponseModel getUserOperateCountAndTaskName() {
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
List<RoleModel> roleModelList = new ArrayList<>();
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
for (Long key : user.getOrgRoles().keySet()) {
roleModelList.addAll(user.getOrgRoles().get(key));
}
String obligationIds = emergencyTaskService.getRolesByUserId(user.getUserId()); String obligationIds = emergencyTaskService.getRolesByUserId(user.getUserId());
map.put("roleCodes",obligationIds); map.put("roleCodes", obligationIds);
return CommonResponseUtil2.success(contingencyPlanService.getUserOperateCountAndTaskName(roleModelList,map)); List<String> list = new ArrayList<>();
if (!StringUtils.isEmpty(obligationIds)) {
String[] ids = new String(obligationIds).split(",");
list = Arrays.asList(ids);
}
return CommonResponseUtil2.success(contingencyPlanService.getUserOperateCountAndTaskName(list, map));
} }
@ApiOperation(value = "获取当前登录人待处置任务及预案信息") @ApiOperation(value = "获取当前登录人待处置任务及预案信息")
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java
View file @ 96e033e6
package com.yeejoin.amos.fas.business.controller; package com.yeejoin.amos.fas.business.controller;
import com.yeejoin.amos.fas.business.service.impl.EmergencyTaskServiceImpl;
import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService; import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
import com.yeejoin.amos.fas.business.util.StringUtil; import com.yeejoin.amos.fas.business.util.StringUtil;
import com.yeejoin.amos.fas.business.vo.ContingencyPlanInstanceVO; import com.yeejoin.amos.fas.business.vo.ContingencyPlanInstanceVO;
...@@ -27,9 +28,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -27,9 +28,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
@RestController @RestController
@RequestMapping(value = "/api/visual") @RequestMapping(value = "/api/visual")
...@@ -46,6 +45,9 @@ public class PlanVisual3dController extends BaseController { ...@@ -46,6 +45,9 @@ public class PlanVisual3dController extends BaseController {
private IPlanVisual3dService planVisual3dService; private IPlanVisual3dService planVisual3dService;
@Autowired @Autowired
private EmergencyTaskServiceImpl emergencyTaskService;
@Autowired
HttpServletResponse response; HttpServletResponse response;
@Autowired @Autowired
HttpServletRequest request; HttpServletRequest request;
...@@ -263,11 +265,15 @@ public class PlanVisual3dController extends BaseController { ...@@ -263,11 +265,15 @@ public class PlanVisual3dController extends BaseController {
} }
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
List<RoleModel> roleModelList = new ArrayList<>(); Map<String, Object> map = new HashMap<>();
for (Long key : user.getOrgRoles().keySet()) { String obligationIds = emergencyTaskService.getRolesByUserId(user.getUserId());
roleModelList.addAll(user.getOrgRoles().get(key)); map.put("roleCodes", obligationIds);
List<String> list = new ArrayList<>();
if (!StringUtils.isEmpty(obligationIds)) {
String[] ids = new String(obligationIds).split(",");
list = Arrays.asList(ids);
} }
return CommonResponseUtil2.success(planVisual3dService.selectTaskActionPage(current, size, batchNo, roleModelList, dataType)); return CommonResponseUtil2.success(planVisual3dService.selectTaskActionPage(current, size, batchNo, list, dataType));
} }
@Permission @Permission
...@@ -277,11 +283,15 @@ public class PlanVisual3dController extends BaseController { ...@@ -277,11 +283,15 @@ public class PlanVisual3dController extends BaseController {
@RequestParam(value = "dataType") int dataType @RequestParam(value = "dataType") int dataType
) { ) {
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
List<RoleModel> roleModelList = new ArrayList<>(); Map<String, Object> map = new HashMap<>();
for (Long key : user.getOrgRoles().keySet()) { String obligationIds = emergencyTaskService.getRolesByUserId(user.getUserId());
roleModelList.addAll(user.getOrgRoles().get(key)); map.put("roleCodes", obligationIds);
List<String> list = new ArrayList<>();
if (!StringUtils.isEmpty(obligationIds)) {
String[] ids = new String(obligationIds).split(",");
list = Arrays.asList(ids);
} }
return CommonResponseUtil2.success(planVisual3dService.selectTaskActionList(batchNo, roleModelList, dataType)); return CommonResponseUtil2.success(planVisual3dService.selectTaskActionList(batchNo, list, dataType));
} }
@Permission @Permission
...@@ -295,6 +305,8 @@ public class PlanVisual3dController extends BaseController { ...@@ -295,6 +305,8 @@ public class PlanVisual3dController extends BaseController {
@ApiOperation(value = "修改任务动作执行状态", notes = "修改任务动作执行状态") @ApiOperation(value = "修改任务动作执行状态", notes = "修改任务动作执行状态")
@PostMapping(value = "/status/modify") @PostMapping(value = "/status/modify")
public ResponseModel updateTaskStatusById(@RequestParam("id") String id, @RequestParam("runStatus") Boolean runStatus) { public ResponseModel updateTaskStatusById(@RequestParam("id") String id, @RequestParam("runStatus") Boolean runStatus) {
return CommonResponseUtil.successNew(planVisual3dService.updateTaskStatusById(id, runStatus)); AgencyUserModel user = getUserInfo();
String roleNames = emergencyTaskService.getRolesNameByUserId(user.getUserId());
return CommonResponseUtil.successNew(planVisual3dService.updateTaskStatusById(id, runStatus, user.getRealName(), user.getUserId(), roleNames));
} }
} }
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ContingencyPlanInstanceMapper.java
View file @ 96e033e6
...@@ -46,4 +46,6 @@ public interface ContingencyPlanInstanceMapper extends BaseMapper<ContingencyPla ...@@ -46,4 +46,6 @@ public interface ContingencyPlanInstanceMapper extends BaseMapper<ContingencyPla
Integer getPlanInstanceCountByCondition(@Param("category") String category, @Param("recordType") String recordType, @Param("batchNo") String batchNo, @Param("content") String content); Integer getPlanInstanceCountByCondition(@Param("category") String category, @Param("recordType") String recordType, @Param("batchNo") String batchNo, @Param("content") String content);
String getInstanceIdByBatchNOAndCategory(@Param("recordType") String recordType, @Param("category") String category, @Param("batchNo") String batchNo); String getInstanceIdByBatchNOAndCategory(@Param("recordType") String recordType, @Param("category") String category, @Param("batchNo") String batchNo);
Boolean updateTaskStatusById(@Param("id") String id, @Param("content") String content, Boolean runStatus, @Param("userName") String userName, @Param("userId") String userId, @Param("personImg") String personImg, @Param("fileType") String fileType, @Param("roleNames") String roleNames);
} }
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java
View file @ 96e033e6
package com.yeejoin.amos.fas.business.service.impl; package com.yeejoin.amos.fas.business.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.component.rule.RuleTrigger; import com.yeejoin.amos.component.rule.RuleTrigger;
...@@ -497,32 +498,86 @@ public class ContingencyInstanceImpl implements IContingencyInstance { ...@@ -497,32 +498,86 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
@Override @Override
public Optional<Equipment> clickButton(String batchNo, String stepCode, String buttonJson, String contingencyPlanId, String buttonCode, String buttonState, String stepStateOnbutton, String isExecute, String isAuto, String token, String product, String appKey,String startUserName) throws Exception { public Optional<Equipment> clickButton(String batchNo, String stepCode, String buttonJson, String contingencyPlanId, String buttonCode, String buttonState, String stepStateOnbutton, String isExecute, String isAuto, String token, String product, String appKey,String startUserName) throws Exception {
List<String> strs = list.stream().filter(x -> x.equals(stepCode)).collect(Collectors.toList()); List<String> strs = list.stream().filter(x -> x.equals(stepCode)).collect(Collectors.toList());
if (0 < strs.size()) { ContingencyPlanInstance instance = contingencyPlanInstanceMapper.getMessageById(contingencyPlanId);
PlanExecuteVo vo = new PlanExecuteVo(); instance.setId(null);
vo.setConfirm(buttonState); instance.setRecordType("MESSAGE");
vo.setStepState(stepStateOnbutton); instance.setCreateDate(new Date());
vo.setBatchNo(batchNo); instance.setContent(instance.getCategory());
vo.setStepCode(stepCode); ContingencyPlanInstance res = repository.save(instance);
vo.setButtonCode(buttonCode); if (!ObjectUtils.isEmpty(res)) {
vo.setContingencyPlanId(contingencyPlanId); List<String> models = new ArrayList<>();
vo.setButtonJson(buttonJson); models.add(instance.getRoleCode());
vo.setIsAuto(isAuto); List<ContingencyPlanInstanceVO> list = planVisual3dService.selectTaskActionList(instance.getBatchNo(), models, 1);
vo.setIsExecute(isExecute); if (redisTemplate.hasKey("planTask")) {
redisTemplate.delete("planTask");
ContingecyExecEvent fireEvent = new ContingecyExecEvent(this); String planTask = "";
fireEvent.setEventType(EventType.FIRE_NEXT_RULE.name()); List<ContingencyPlanInstanceVO> arr = list.stream().filter(x -> !x.getId().equalsIgnoreCase(contingencyPlanId)).collect(Collectors.toList());
fireEvent.setPlanExecute(vo); if (0 < list.size()) {
fireEvent.setContext(RequestContext.cloneRequestContext()); planTask = JSON.toJSONString(arr);
applicationContext.publishEvent(fireEvent); }
ContingecyExecEvent updateEvent = new ContingecyExecEvent(this); JSONArray taskObjects = JSON.parseArray(planTask);
updateEvent.setEventType(EventType.UPDATE_CONTINGENCY_DATE.name()); redisTemplate.opsForValue().set("planTask", taskObjects);
updateEvent.setPlanExecute(vo);
updateEvent.setContext(RequestContext.cloneRequestContext());
try {
applicationContext.publishEvent(updateEvent);
} catch (Exception e) {
e.printStackTrace();
} }
if (0 < strs.size()) {
PlanExecuteVo vo = new PlanExecuteVo();
vo.setConfirm(buttonState);
vo.setStepState(stepStateOnbutton);
vo.setBatchNo(batchNo);
vo.setStepCode(stepCode);
vo.setButtonCode(buttonCode);
vo.setContingencyPlanId(contingencyPlanId);
vo.setButtonJson(buttonJson);
vo.setIsAuto(isAuto);
vo.setIsExecute(isExecute);
ContingecyExecEvent fireEvent = new ContingecyExecEvent(this);
fireEvent.setEventType(EventType.FIRE_NEXT_RULE.name());
fireEvent.setPlanExecute(vo);
fireEvent.setContext(RequestContext.cloneRequestContext());
applicationContext.publishEvent(fireEvent);
ContingecyExecEvent updateEvent = new ContingecyExecEvent(this);
updateEvent.setEventType(EventType.UPDATE_CONTINGENCY_DATE.name());
updateEvent.setPlanExecute(vo);
updateEvent.setContext(RequestContext.cloneRequestContext());
try {
applicationContext.publishEvent(updateEvent);
} catch (Exception e) {
e.printStackTrace();
}
} else {
String planStep = "";
if (redisTemplate.hasKey("planStep")) {
planStep = Objects.requireNonNull(redisTemplate.opsForValue().get("planStep")).toString();
} else {
planStep = planStepService.getPlanStep();
}
JSONArray objects = JSON.parseArray(planStep);
String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan");
Map<String, Object> result = new HashMap<>();
result.put("contingency", new ContingencyRo());
result.put("msgContext", Collections.EMPTY_MAP);
result.put("msgType", "getStepList");
result.put("planStep", objects);
String planTask = "";
if (redisTemplate.hasKey("planTask")) {
planTask = Objects.requireNonNull(redisTemplate.opsForValue().get("planTask")).toString();
} else {
List<ContingencyPlanInstanceVO> lists = planVisual3dService.selectTaskActionList(batchNo, models, 1);
if (0 < list.size()) {
planTask = JSON.toJSONString(lists);
}
}
JSONArray taskObjects = JSON.parseArray(planTask);
result.put("planTask", taskObjects);
webMqttComponent.publish(topic, JSON.toJSONString(result));
}
String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan");
Map<String, Object> map = new HashMap<>();
map.put("contingency", new ContingencyRo());
map.put("msgContext", Collections.EMPTY_MAP);
map.put("msgType", "refreshTaskRecord");
webMqttComponent.publish(topic, JSON.toJSONString(map));
} }
return Optional.empty(); return Optional.empty();
} }
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java
View file @ 96e033e6
...@@ -887,7 +887,6 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService { ...@@ -887,7 +887,6 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
@Override @Override
public Page<ContingencyPlanInstanceVO> selectTaskActionPage(int current, int size, String batchNo, String runState, String updateDate, List<String> roleList) { public Page<ContingencyPlanInstanceVO> selectTaskActionPage(int current, int size, String batchNo, String runState, String updateDate, List<String> roleList) {
List<String> roles = new ArrayList<>();
String type = "TASKOPERATE"; String type = "TASKOPERATE";
Page<ContingencyPlanInstanceVO> page = new Page<>(current, size); Page<ContingencyPlanInstanceVO> page = new Page<>(current, size);
int total = 0; int total = 0;
...@@ -900,7 +899,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService { ...@@ -900,7 +899,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
page.setCurrent(1); page.setCurrent(1);
start = 0; start = 0;
} }
List<ContingencyPlanInstanceVO> list = contingencyInstanceInfoMapper.getTaskActionPage((int) start, size, batchNo, type, runState, updateDate, roles); List<ContingencyPlanInstanceVO> list = contingencyInstanceInfoMapper.getTaskActionPage((int) start, size, batchNo, type, runState, updateDate, roleList);
page.setRecords(list); page.setRecords(list);
page.setTotal(total); page.setTotal(total);
} }
...@@ -926,7 +925,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService { ...@@ -926,7 +925,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
} }
@Override @Override
public Map<String, Object> getUserOperateCountAndTaskName(List<RoleModel> roleModelList,Map<String, Object> map) { public Map<String, Object> getUserOperateCountAndTaskName(List<String> roleList, Map<String, Object> map) {
List<PlanOperationRecord> recordList = planOperationRecordDao.findByStatus(0); List<PlanOperationRecord> recordList = planOperationRecordDao.findByStatus(0);
if (!CollectionUtils.isEmpty(recordList)) { if (!CollectionUtils.isEmpty(recordList)) {
...@@ -936,7 +935,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService { ...@@ -936,7 +935,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
if (instanceInfo != null) { if (instanceInfo != null) {
map.put("planName", instanceInfo.getName()); map.put("planName", instanceInfo.getName());
map.put("batchNo", batchNo); map.put("batchNo", batchNo);
List<ContingencyPlanInstanceVO> list = planVisual3dService.selectTaskActionList(batchNo, roleModelList, 1); List<ContingencyPlanInstanceVO> list = planVisual3dService.selectTaskActionList(batchNo, roleList, 1);
map.put("taskNum", list.size()); map.put("taskNum", list.size());
} }
} }
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java
View file @ 96e033e6
...@@ -20,6 +20,7 @@ import com.yeejoin.amos.fas.business.service.model.ToipResponse; ...@@ -20,6 +20,7 @@ import com.yeejoin.amos.fas.business.service.model.ToipResponse;
import com.yeejoin.amos.fas.business.util.JSONUtil; import com.yeejoin.amos.fas.business.util.JSONUtil;
import com.yeejoin.amos.fas.business.util.StringUtil; import com.yeejoin.amos.fas.business.util.StringUtil;
import com.yeejoin.amos.fas.business.vo.*; import com.yeejoin.amos.fas.business.vo.*;
import com.yeejoin.amos.fas.common.enums.PlanReplyMessageEnum;
import com.yeejoin.amos.fas.core.util.CommonResponse; import com.yeejoin.amos.fas.core.util.CommonResponse;
import com.yeejoin.amos.fas.core.util.CommonResponseUtil; import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
import com.yeejoin.amos.fas.dao.entity.*; import com.yeejoin.amos.fas.dao.entity.*;
...@@ -118,6 +119,9 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService { ...@@ -118,6 +119,9 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
@Value("${aurora.push.switch}") @Value("${aurora.push.switch}")
private Boolean auroraPushSwitch; private Boolean auroraPushSwitch;
@Autowired
private IPlanVisual3dService planVisual3dService;
@Override @Override
public void uploadTextPlan(String appId, Map<String, String> pathNameMap) { public void uploadTextPlan(String appId, Map<String, String> pathNameMap) {
if (null != pathNameMap && !pathNameMap.isEmpty()) { if (null != pathNameMap && !pathNameMap.isEmpty()) {
...@@ -536,19 +540,22 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService { ...@@ -536,19 +540,22 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
} }
@Override @Override
public Page<ContingencyPlanInstanceVO> selectTaskActionPage(int current, int size, String disposalId, List<RoleModel> roleModelList, int dataType) { public Page<ContingencyPlanInstanceVO> selectTaskActionPage(int current, int size, String disposalId, List<String> roleModelList, int dataType) {
List<String> roles = new ArrayList<>();
String type = "TASKOPERATE"; String type = "TASKOPERATE";
String status = ""; String status = "";
Page<ContingencyPlanInstanceVO> page = new Page<>(current, size); Page<ContingencyPlanInstanceVO> page = new Page<>(current, size);
for (RoleModel roleModel : roleModelList) { // for (RoleModel roleModel : roleModelList) {
roles.add(roleModel.getRoleName()); // roles.add(roleModel.getRoleName());
// }
if ("1".equals(String.valueOf(dataType))) {
// 根据当前用户预案角色、未执行动作 (dataType = 2 查询所有)
status = "1";
} }
int total = 0; int total = 0;
if (ObjectUtils.isEmpty(status)) { if (ObjectUtils.isEmpty(status)) {
total = contingencyInstanceInfoMapper.selectCountTaskActionPage(type, null, roles, disposalId); total = contingencyInstanceInfoMapper.selectCountTaskActionPage(type, null, roleModelList, disposalId);
} else { } else {
total = contingencyInstanceInfoMapper.selectCountTaskActionPage(type, status, roles, disposalId); total = contingencyInstanceInfoMapper.selectCountTaskActionPage(type, status, roleModelList, disposalId);
} }
long start = (page.getCurrent() - 1) * page.getSize(); long start = (page.getCurrent() - 1) * page.getSize();
...@@ -559,7 +566,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService { ...@@ -559,7 +566,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
page.setCurrent(1); page.setCurrent(1);
start = 0; start = 0;
} }
List<ContingencyPlanInstanceVO> list = contingencyInstanceInfoMapper.selectTaskActionPage((int) start, size, type, status, roles, disposalId); List<ContingencyPlanInstanceVO> list = contingencyInstanceInfoMapper.selectTaskActionPage((int) start, size, type, status, roleModelList, disposalId);
page.setRecords(list); page.setRecords(list);
page.setTotal(total); page.setTotal(total);
} }
...@@ -567,25 +574,14 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService { ...@@ -567,25 +574,14 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
} }
@Override @Override
public List<ContingencyPlanInstanceVO> selectTaskActionList(String batchNo, List<RoleModel> roleModelList, int dataType) { public List<ContingencyPlanInstanceVO> selectTaskActionList(String batchNo, List<String> roleModelList, int dataType) {
List<String> roles = new ArrayList<>();
String type = "TASKOPERATE"; String type = "TASKOPERATE";
String status = ""; String status = "";
if ("1".equals(String.valueOf(dataType))) { if ("1".equals(String.valueOf(dataType))) {
if (null != roleModelList && 0 < roleModelList.size()) { // 根据当前用户预案角色、未执行动作 (dataType = 2 查询所有)
for (RoleModel roleModel : roleModelList) {
roles.add(roleModel.getRoleName());
}
}
// 根据当前用户预案角色、未执行动作
status = "1"; status = "1";
} else if ("2".equals(String.valueOf(dataType))) {
// 当前用户预案角色、全部动作数据
for (RoleModel roleModel : roleModelList) {
roles.add(roleModel.getRoleName());
}
} }
return contingencyInstanceInfoMapper.selectTaskActionList(type, status, roles, batchNo); return contingencyInstanceInfoMapper.selectTaskActionList(type, status, roleModelList, batchNo);
} }
@Override @Override
...@@ -665,16 +661,33 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService { ...@@ -665,16 +661,33 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
} }
@Override @Override
public boolean updateTaskStatusById(String id, Boolean runStatus) { public boolean updateTaskStatusById(String id, Boolean runStatus, String userName, String userId, String roleNames) {
boolean bool = false; boolean bool = false;
Map<String, String> userInfo = contingencyPlanInstanceMapper.getUserByUserId(userId);
if (!ObjectUtils.isEmpty(userInfo)) {
String img = userInfo.get("personImg");
personImg = (StringUtils.isBlank(img) ? personImg : img);
}
if (runStatus) { if (runStatus) {
ContingencyPlanInstance instance = contingencyPlanInstanceMapper.getMessageById(id); ContingencyPlanInstance instance = contingencyPlanInstanceMapper.getMessageById(id);
ContingencyPlanInstance contingencyPlanInstance = deleteButton(instance); ContingencyPlanInstance contingencyPlanInstance = deleteButton(instance);
bool = contingencyPlanInstanceMapper.updateStatusById(id, contingencyPlanInstance.getContent(), runStatus); bool = contingencyPlanInstanceMapper.updateTaskStatusById(id, contingencyPlanInstance.getContent(), runStatus, userName, userId, personImg, PlanReplyMessageEnum.TEXT.getCode(), roleNames);
} else { } else {
bool = contingencyPlanInstanceMapper.updateStatusById(id, null, runStatus); bool = contingencyPlanInstanceMapper.updateTaskStatusById(id, null, runStatus, userName, userId, personImg, PlanReplyMessageEnum.TEXT.getCode(), roleNames);
}
if (redisTemplate.hasKey("planTask")) {
redisTemplate.delete("planTask");
String planTask = "";
ContingencyPlanInstance instance = contingencyPlanInstanceMapper.getMessageById(id);
List<String> models = new ArrayList<>();
models.add(instance.getRoleCode());
List<ContingencyPlanInstanceVO> list = this.selectTaskActionList(instance.getBatchNo(), models, 1);
if (0 < list.size()) {
planTask = JSON.toJSONString(list);
}
JSONArray taskObjects = JSON.parseArray(planTask);
redisTemplate.opsForValue().set("planTask", taskObjects);
} }
if (bool) { if (bool) {
String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan"); String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyPlanService.java
View file @ 96e033e6
...@@ -138,7 +138,7 @@ public interface IContingencyPlanService { ...@@ -138,7 +138,7 @@ public interface IContingencyPlanService {
Map<String, Object> getUserOperateCountAndPlanName(List<RoleModel> roleModelList); Map<String, Object> getUserOperateCountAndPlanName(List<RoleModel> roleModelList);
Map<String, Object> getUserOperateCountAndTaskName(List<RoleModel> roleModelList,Map<String, Object> map); Map<String, Object> getUserOperateCountAndTaskName(List<String> list, Map<String, Object> map);
String getPlanBatchNo(); String getPlanBatchNo();
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IPlanVisual3dService.java
View file @ 96e033e6
...@@ -91,7 +91,7 @@ public interface IPlanVisual3dService { ...@@ -91,7 +91,7 @@ public interface IPlanVisual3dService {
Page<ContingencyPlanInstanceVO> selectDisposalActionPage(int current, int size, String batchNo, List<RoleModel> roleModelList, int dataType); Page<ContingencyPlanInstanceVO> selectDisposalActionPage(int current, int size, String batchNo, List<RoleModel> roleModelList, int dataType);
Page<ContingencyPlanInstanceVO> selectTaskActionPage(int current, int size, String batchNo, List<RoleModel> roleModelList, int dataType); Page<ContingencyPlanInstanceVO> selectTaskActionPage(int current, int size, String batchNo, List<String> roleModelList, int dataType);
/** /**
* 根据批次号获取预案的消息等记录 * 根据批次号获取预案的消息等记录
...@@ -105,7 +105,7 @@ public interface IPlanVisual3dService { ...@@ -105,7 +105,7 @@ public interface IPlanVisual3dService {
List<ContingencyPlanInstanceVO> selectDisposalActionList(String batchNo, List<RoleModel> roleModelList, int dataType); List<ContingencyPlanInstanceVO> selectDisposalActionList(String batchNo, List<RoleModel> roleModelList, int dataType);
List<ContingencyPlanInstanceVO> selectTaskActionList(String batchNo, List<RoleModel> roleModelList, int dataType); List<ContingencyPlanInstanceVO> selectTaskActionList(String batchNo, List<String> roleModelList, int dataType);
/** /**
* 极光推送消息 * 极光推送消息
...@@ -124,7 +124,7 @@ public interface IPlanVisual3dService { ...@@ -124,7 +124,7 @@ public interface IPlanVisual3dService {
*/ */
boolean updateStatusById(String id, Boolean runStatus); boolean updateStatusById(String id, Boolean runStatus);
boolean updateTaskStatusById(String id, Boolean runStatus); boolean updateTaskStatusById(String id, Boolean runStatus, String userName, String userId, String roleNames);
/** /**
* 修改动作执行状态-web * 修改动作执行状态-web
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/ContingencyPlanInstanceVO.java
View file @ 96e033e6
...@@ -58,6 +58,10 @@ public class ContingencyPlanInstanceVO { ...@@ -58,6 +58,10 @@ public class ContingencyPlanInstanceVO {
private String updateUser; private String updateUser;
private String createTime;
private String updateTime;
private Boolean isDelete = false; private Boolean isDelete = false;
} }
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/ContingencyPlanInstanceMapper.xml
View file @ 96e033e6
...@@ -12,6 +12,32 @@ ...@@ -12,6 +12,32 @@
</if> </if>
where id = #{id} where id = #{id}
</update> </update>
<update id="updateTaskStatusById">
UPDATE
contingency_plan_instance
SET
runstate = ${runStatus}
<if test="content != null and content != ''">
, content = #{content}
</if>
<if test="userName != null and userName != ''">
, start_user_name = #{userName}
</if>
<if test="userId != null and userId != ''">
, start_user_id = #{userId}
</if>
<if test="personImg != null and personImg != ''">
, person_img = #{personImg}
</if>
<if test="fileType != null and fileType != ''">
, file_type = #{fileType}
</if>
<if test="roleNames != null and roleNames != ''">
, role_name = #{roleNames}
</if>
where id = #{id}
</update>
<update id="updateMessageById"> <update id="updateMessageById">
UPDATE `contingency_plan_instance` UPDATE `contingency_plan_instance`
SET SET
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment