|
@@ -217,7 +217,7 @@ public class IncidentController extends BaseController {
|
|
|
@Security
|
|
|
public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody IncidentBo bo) {
|
|
|
// 新增初始化为预警状态
|
|
|
- bo.setStatus(1);
|
|
|
+ bo.setStatus(2);
|
|
|
LoginUser cacheLoginUser = UserUtil.getCacheLoginUser();
|
|
|
bo.setCreateBy(cacheLoginUser.getUsername());
|
|
|
bo.setCreateDept(cacheLoginUser.getUser().getDeptId());
|
|
@@ -279,9 +279,9 @@ public class IncidentController extends BaseController {
|
|
|
List<IncidentVo> list = iIncidentService.listVo(Wrappers.<Incident>lambdaQuery().in(Incident::getStatus, 1, 2, 3));
|
|
|
Map<Integer, List<IncidentVo>> collect = list.stream().collect(Collectors.groupingBy(IncidentVo::getStatus, Collectors.mapping(a -> a, Collectors.toList())));
|
|
|
Map<String, List<IncidentVo>> result = new HashMap<>();
|
|
|
- result.put("预警事件", CollUtil.defaultIfEmpty(collect.get(1), new ArrayList<>()));
|
|
|
- result.put("待派发", CollUtil.defaultIfEmpty(collect.get(2), new ArrayList<>()));
|
|
|
- result.put("待处置", CollUtil.defaultIfEmpty(collect.get(3), new ArrayList<>()));
|
|
|
+ result.put("预警事件", CollUtil.defaultIfEmpty(collect.get(2), new ArrayList<>()));
|
|
|
+// result.put("待派发", CollUtil.defaultIfEmpty(collect.get(2), new ArrayList<>()));
|
|
|
+ result.put("处置", CollUtil.defaultIfEmpty(collect.get(3), new ArrayList<>()));
|
|
|
return AjaxResult.success(result);
|
|
|
}
|
|
|
|