提交 f1931037 authored 作者: Matrix's avatar Matrix

[核查模块] 重构了日志表相关的代码,使得日志的上传是隐式的

上级 701979ad
package com.tykj.dev.device.confirmcheck.controller; package com.tykj.dev.device.confirmcheck.controller;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.tykj.dev.config.GlobalMap;
import com.tykj.dev.config.swagger.AutoDocument; import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.confirmcheck.entity.cache.AreaCache; import com.tykj.dev.device.confirmcheck.entity.cache.AreaCache;
import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckBillEntity; import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckBillEntity;
...@@ -25,7 +26,6 @@ import com.tykj.dev.device.user.subject.entity.Area; ...@@ -25,7 +26,6 @@ import com.tykj.dev.device.user.subject.entity.Area;
import com.tykj.dev.device.user.subject.entity.Units; import com.tykj.dev.device.user.subject.entity.Units;
import com.tykj.dev.device.user.subject.entity.User; import com.tykj.dev.device.user.subject.entity.User;
import com.tykj.dev.device.user.util.AuthenticationUtils; import com.tykj.dev.device.user.util.AuthenticationUtils;
import com.tykj.dev.misc.base.GlobalMap;
import com.tykj.dev.misc.base.ResultObj; import com.tykj.dev.misc.base.ResultObj;
import com.tykj.dev.misc.base.StatusEnum; import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.utils.JacksonUtil; import com.tykj.dev.misc.utils.JacksonUtil;
...@@ -79,8 +79,6 @@ public class DeviceCheckController { ...@@ -79,8 +79,6 @@ public class DeviceCheckController {
@Autowired @Autowired
private TaskService taskService; private TaskService taskService;
@Autowired @Autowired
private TaskLogService logService;
@Autowired
private AuthenticationUtils AuthenticationUtils; private AuthenticationUtils AuthenticationUtils;
@Autowired @Autowired
...@@ -146,7 +144,7 @@ public class DeviceCheckController { ...@@ -146,7 +144,7 @@ public class DeviceCheckController {
TaskBto provStatTask = new Task(CHECK_STAT_0.id, "省自动核查", 0, ".0.", CONFIRM_CHECK_STAT.id, provStat.getId(), provUnit.getUnitId()) TaskBto provStatTask = new Task(CHECK_STAT_0.id, "省自动核查", 0, ".0.", CONFIRM_CHECK_STAT.id, provStat.getId(), provUnit.getUnitId())
.parse2Bto(); .parse2Bto();
provStatTask.setInvolveUserIdList(Lists.newArrayList(-1)); provStatTask.setInvolveUserIdList(Lists.newArrayList(-1));
provStatTask = taskService.start(provStatTask).parse2Bto(); provStatTask = taskService.start(provStatTask);
resultIds.get("taskId").add(provStatTask.getId()); resultIds.get("taskId").add(provStatTask.getId());
List<CheckDeviceStatVo> statVoList = new ArrayList<>(); List<CheckDeviceStatVo> statVoList = new ArrayList<>();
...@@ -172,7 +170,7 @@ public class DeviceCheckController { ...@@ -172,7 +170,7 @@ public class DeviceCheckController {
TaskBto cityStatTask = new Task(CHECK_STAT_0.id, cityUnit.getName() + "自动核查统计", provStatTask.getId(), addNode(provStatTask.getNodeIdDetail(), provinceStatDo.getId()), CONFIRM_CHECK_STAT.id, cityStat.getId(), cityUnit.getUnitId()) TaskBto cityStatTask = new Task(CHECK_STAT_0.id, cityUnit.getName() + "自动核查统计", provStatTask.getId(), addNode(provStatTask.getNodeIdDetail(), provinceStatDo.getId()), CONFIRM_CHECK_STAT.id, cityStat.getId(), cityUnit.getUnitId())
.parse2Bto(); .parse2Bto();
cityStatTask.setInvolveUserIdList(Lists.newArrayList(-1)); cityStatTask.setInvolveUserIdList(Lists.newArrayList(-1));
cityStatTask = taskService.start(cityStatTask).parse2Bto(); cityStatTask = taskService.start(cityStatTask);
resultIds.get("taskId").add(cityStatTask.getId()); resultIds.get("taskId").add(cityStatTask.getId());
// 构建市自查账单 // 构建市自查账单
...@@ -194,7 +192,7 @@ public class DeviceCheckController { ...@@ -194,7 +192,7 @@ public class DeviceCheckController {
statVoList.addAll(cityStatVoList); statVoList.addAll(cityStatVoList);
// 构建市自查TASK // 构建市自查TASK
TaskBto cityDetailTask = new TaskBto(CHECK_DETAIL_0.id, cityUnit.getName() + "自动核查自查", cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, cityDetail.getId(), cityUnit.getUnitId(), 0); TaskBto cityDetailTask = new TaskBto(CHECK_DETAIL_0.id, cityUnit.getName() + "自动核查自查", cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, cityDetail.getId(), cityUnit.getUnitId(), 0);
cityDetailTask = taskService.start(cityDetailTask).parse2Bto(); cityDetailTask = taskService.start(cityDetailTask);
resultIds.get("taskId").add(cityDetailTask.getId()); resultIds.get("taskId").add(cityDetailTask.getId());
// 构建县任务 // 构建县任务
...@@ -219,7 +217,7 @@ public class DeviceCheckController { ...@@ -219,7 +217,7 @@ public class DeviceCheckController {
//构建县自查TASK //构建县自查TASK
TaskBto countyDetailTask = new TaskBto(CHECK_DETAIL_0.id, countyUnit.getName() + "自动核查自查", cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, countyDetail.getId(), countyUnit.getUnitId(), 0); TaskBto countyDetailTask = new TaskBto(CHECK_DETAIL_0.id, countyUnit.getName() + "自动核查自查", cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, countyDetail.getId(), countyUnit.getUnitId(), 0);
countyDetailTask = taskService.start(countyDetailTask).parse2Bto(); countyDetailTask = taskService.start(countyDetailTask);
resultIds.get("taskId").add(countyDetailTask.getId()); resultIds.get("taskId").add(countyDetailTask.getId());
} }
...@@ -324,7 +322,7 @@ public class DeviceCheckController { ...@@ -324,7 +322,7 @@ public class DeviceCheckController {
provStatTask.getInvolveUserIdList().add(AuthenticationUtils.getAuthentication().getCurrentUserInfo().getUserId()); provStatTask.getInvolveUserIdList().add(AuthenticationUtils.getAuthentication().getCurrentUserInfo().getUserId());
provStatTask.getInvolveUserIdList().add(-1); provStatTask.getInvolveUserIdList().add(-1);
provStatTask.setCurrentPoint(1); provStatTask.setCurrentPoint(1);
provStatTask = taskService.start(provStatTask).parse2Bto(); provStatTask = taskService.start(provStatTask);
// 3 构建被查单位的 自查账单 与 自查任务 // 3 构建被查单位的 自查账单 与 自查任务
// 获取所有在库装备与不在库装备 // 获取所有在库装备与不在库装备
...@@ -378,7 +376,6 @@ public class DeviceCheckController { ...@@ -378,7 +376,6 @@ public class DeviceCheckController {
TaskBto currentTask = taskService.get(id, CONFIRM_CHECK_DETAIL.id); TaskBto currentTask = taskService.get(id, CONFIRM_CHECK_DETAIL.id);
currentTask.getInvolveUserIdList().set(0, AuthenticationUtils.getAuthentication().getCurrentUserInfo().getUserId()); currentTask.getInvolveUserIdList().set(0, AuthenticationUtils.getAuthentication().getCurrentUserInfo().getUserId());
taskService.moveToNext(currentTask, assignUserId); taskService.moveToNext(currentTask, assignUserId);
logService.addLog(new TaskLogBto(currentTask.getId(), "A岗核查成功"));
log.info("[核查模块] A岗核查操作成功"); log.info("[核查模块] A岗核查操作成功");
return ResponseEntity.ok(new ResultObj("专管员A操作成功")); return ResponseEntity.ok(new ResultObj("专管员A操作成功"));
} }
...@@ -418,17 +415,14 @@ public class DeviceCheckController { ...@@ -418,17 +415,14 @@ public class DeviceCheckController {
detailRepo.updateCheckStatus(id, checkStatus); detailRepo.updateCheckStatus(id, checkStatus);
if (userAId > 0 && userBId > 0) { if (userAId > 0 && userBId > 0) {
currentTask = taskService.moveToNext(currentTask, checkUserAId); currentTask = taskService.moveToNext(currentTask, checkUserAId);
logService.addLog(new TaskLogBto(currentTask.getId(), "B岗审核成功,等待核查组确认"));
} else { } else {
// 如果是2流程的,则直接结束该任务 // 如果是2流程的,则直接结束该任务
taskService.moveToEnd(currentTask); taskService.moveToEnd(currentTask);
logService.addLog(new TaskLogBto(currentTask.getId(), "B岗审核成功"));
} }
} else { } else {
//不通过则回到第一阶段 //不通过则回到第一阶段
StatusEnum firstStatus = getFirstStatus(currentTask.getBillStatus()); StatusEnum firstStatus = getFirstStatus(currentTask.getBillStatus());
taskService.moveToSpecial(currentTask, firstStatus, currentTask.getFirstUserId()); taskService.moveToSpecial(currentTask, firstStatus, currentTask.getFirstUserId());
logService.addLog(new TaskLogBto(currentTask.getId(), "B岗审核失败,跳回A岗人员操作"));
} }
log.info("[核查模块] 专管员B操作成功"); log.info("[核查模块] 专管员B操作成功");
...@@ -450,7 +444,6 @@ public class DeviceCheckController { ...@@ -450,7 +444,6 @@ public class DeviceCheckController {
return ResponseEntity.status(400).body(new ResultObj(String.format("当前任务的状态异常!当前任务状态为 %s , 任务状态应该为 %s", GlobalMap.getStatusEnumMap().get(currentTask.getBillStatus()), CHECK_DETAIL_2.name))); return ResponseEntity.status(400).body(new ResultObj(String.format("当前任务的状态异常!当前任务状态为 %s , 任务状态应该为 %s", GlobalMap.getStatusEnumMap().get(currentTask.getBillStatus()), CHECK_DETAIL_2.name)));
} }
currentTask = taskService.moveToNext(currentTask, currentDetail.getCheckUserBId()); currentTask = taskService.moveToNext(currentTask, currentDetail.getCheckUserBId());
logService.addLog(new TaskLogBto(currentTask.getId(), "核查组A审核成功"));
log.info("[核查模块] C 操作完毕"); log.info("[核查模块] C 操作完毕");
} else if (currentTask.getBillStatus() % 10 == 3) { } else if (currentTask.getBillStatus() % 10 == 3) {
if (!currentTask.getBillStatus().equals(CHECK_DETAIL_3.id)) { if (!currentTask.getBillStatus().equals(CHECK_DETAIL_3.id)) {
...@@ -460,7 +453,6 @@ public class DeviceCheckController { ...@@ -460,7 +453,6 @@ public class DeviceCheckController {
// 如果当前是第4步,则直接结束任务,并且进行结果汇总 // 如果当前是第4步,则直接结束任务,并且进行结果汇总
log.info("[核查模块] D 检查组成员A正在进行核查操作,核查详情账单id为 : {}", id); log.info("[核查模块] D 检查组成员A正在进行核查操作,核查详情账单id为 : {}", id);
currentTask = taskService.moveToEnd(currentTask); currentTask = taskService.moveToEnd(currentTask);
logService.addLog(new TaskLogBto(currentTask.getId(), "核查组B审核成功"));
// 任务结束后需要将当前城市的统计信息汇总上去 // 任务结束后需要将当前城市的统计信息汇总上去
Units units = unitsRepo.findById(currentTask.getOwnUnit()).get(); Units units = unitsRepo.findById(currentTask.getOwnUnit()).get();
int level = units.getLevel(); int level = units.getLevel();
...@@ -485,7 +477,6 @@ public class DeviceCheckController { ...@@ -485,7 +477,6 @@ public class DeviceCheckController {
//如果上一个id是-1 则证明是所有人的跟踪统计,即自动核查,那么下一步推进到所有人的待办 //如果上一个id是-1 则证明是所有人的跟踪统计,即自动核查,那么下一步推进到所有人的待办
Integer lastUserId = fatherTask.getLastUserId() == -1 ? 0 : fatherTask.getLastUserId(); Integer lastUserId = fatherTask.getLastUserId() == -1 ? 0 : fatherTask.getLastUserId();
TaskBto statTask = taskService.moveToNext(fatherTask, lastUserId); TaskBto statTask = taskService.moveToNext(fatherTask, lastUserId);
logService.addLog(new TaskLogBto(statTask.getId(), "地区数据已统计完毕,等待确认", new ArrayList<>(), fatherTask.getFirstUserId()));
} }
log.info("[核查模块] D 操作完毕"); log.info("[核查模块] D 操作完毕");
} }
...@@ -494,7 +485,6 @@ public class DeviceCheckController { ...@@ -494,7 +485,6 @@ public class DeviceCheckController {
// 如果没通过则返回第1步 // 如果没通过则返回第1步
StatusEnum firstStatus = getFirstStatus(currentTask.getBillStatus()); StatusEnum firstStatus = getFirstStatus(currentTask.getBillStatus());
currentTask = taskService.moveToSpecial(currentTask, firstStatus, currentTask.getFirstUserId()); currentTask = taskService.moveToSpecial(currentTask, firstStatus, currentTask.getFirstUserId());
logService.addLog(new TaskLogBto(currentTask.getId(), "核查组B审核未过,返回到初始状态"));
} }
return ResponseEntity.ok(new ResultObj("操作成功")); return ResponseEntity.ok(new ResultObj("操作成功"));
...@@ -511,7 +501,6 @@ public class DeviceCheckController { ...@@ -511,7 +501,6 @@ public class DeviceCheckController {
//将当前的统计task完结 //将当前的统计task完结
TaskBto currentTask = taskService.get(statId, CONFIRM_CHECK_STAT.id); TaskBto currentTask = taskService.get(statId, CONFIRM_CHECK_STAT.id);
currentTask = taskService.moveToEnd(currentTask); currentTask = taskService.moveToEnd(currentTask);
logService.addLog(new TaskLogBto(currentTask.getId(), "地区数据已统计完毕,等待确认"));
//如果有上级统计任务 则累加当前地区数据 //如果有上级统计任务 则累加当前地区数据
Integer parentTaskId = currentTask.getParentTaskId(); Integer parentTaskId = currentTask.getParentTaskId();
...@@ -528,7 +517,6 @@ public class DeviceCheckController { ...@@ -528,7 +517,6 @@ public class DeviceCheckController {
if (allOver) { if (allOver) {
log.info("[核查任务] 所有市的核查统计任务已经完毕,推进省级的核查统计任务"); log.info("[核查任务] 所有市的核查统计任务已经完毕,推进省级的核查统计任务");
TaskBto statTask = taskService.moveToNext(parentTask, 0); TaskBto statTask = taskService.moveToNext(parentTask, 0);
logService.addLog(new TaskLogBto(statTask.getId(), "省级统计任务状态推进"));
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论