Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1、预告警单待处理

Browse Source 
2、终端周期检测待检测
This commit is contained in:
hongawen
2024-09-14 10:22:55 +08:00
parent ba6762587f
commit f9b8c6d28a
4 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmTaskController.java
View File

@@ -151,18 +151,21 @@ public class BpmTaskController extends BaseController {
public HttpResult<List<TodoVO>> allTodoList() {
String methodDescribe = getMethodDescribe("allTodoList");
List<TodoVO> result = new ArrayList<>();
// 获取当前用户所有待办工作流程
HttpResult<List<BpmTaskVO>> todoAllList = this.todoAllList();
if(CollectionUtil.isNotEmpty(todoAllList.getData())){
// 转为统一的todoVO3
result.addAll(TodoVOConvert.convertByBpmTaskVO(todoAllList.getData()));
}
// 获取当前用户所有不通过的工作流程
List<BpmProcessInstanceVO> rejectProcessInstanceList = getRejectProcessInstanceList();
if(CollectionUtil.isNotEmpty(rejectProcessInstanceList)){
// 转为统一的todoVO3
result.addAll(TodoVOConvert.convertByBpmProcessInstance(rejectProcessInstanceList));
}
// 获取当前用户所有待办工作流程
HttpResult<List<BpmTaskVO>> todoAllList = this.todoAllList();
if(CollectionUtil.isNotEmpty(todoAllList.getData())){
// 转为统一的todoVO3
result.addAll(TodoVOConvert.convertByBpmTaskVO(todoAllList.getData()));
}
// 获取没有流程的一些待办信息
result.addAll(businessCommonFeignClient.getTodoBusiness().getData());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);

3
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java
View File

@@ -19,6 +19,8 @@ public enum SupervisionKeyEnum {
TIMING_CHECK_DEVICE("timing_check_device", "device", "终端周期检测", "CheckDeviceServiceImpl","terminalNetwotk"),
// 试运行评估
LINE_RUN_TEST("line_run_test", "device", "监测点试运行评估流程", "SupervisionTempLineRunTestServiceImpl","testRun"),
// 台账管理 干扰源用户台账
BUILD_USER_INFO_ARCHIVIST("build_user_info_archivist","user","干扰源用户台账归档流程","UserReportPOServiceImpl",""),
// 技术监督计划
SUP_PLAN_ADD("sup_plan_add", "plan", "技术监督计划流程（计划和测试）", "SupervisionPlanPOServiceImpl","supervision/harmonicmanagement"),
SURVEY_PLAN("survey_plan", "survey", "监督计划流程", "SurveyPlanServiceImpl","supervision/harmonicmanagement"),
@@ -28,7 +30,6 @@ public enum SupervisionKeyEnum {
// 终端状态管理
QUIT_RUNNING_DEVICE("quit_running_device", "device", "终端状态变更流程", "QuitRunningDeviceServiceImpl","supervision/retire"),
BUILD_USER_INFO_ARCHIVIST("build_user_info_archivist","user","干扰源用户台账归档流程","UserReportPOServiceImpl",""),
// 弃用
USER_REPORT_DELETE("user_report_delete", "user", "干扰源常态化信息删除流程", "UserReportDeleteServiceImpl","");

13
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/CheckDeviceServiceImpl.java
View File

@@ -35,13 +35,16 @@ import com.njcn.supervision.pojo.vo.device.CheckDeviceVo;
import com.njcn.supervision.service.device.ICheckDeviceService;
import com.njcn.supervision.utils.InstanceUtil;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.api.UserFeignClient;
import com.njcn.user.pojo.po.Dept;
import com.njcn.user.pojo.vo.UserVO;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
@@ -70,6 +73,8 @@ public class CheckDeviceServiceImpl extends MppServiceImpl<CheckDeviceMapper, Ch
private final DeviceFeignClient deviceFeignClient;
private final UserFeignClient userFeignClient;
@Override
public void addCheckDevice() {
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
@@ -206,6 +211,11 @@ public class CheckDeviceServiceImpl extends MppServiceImpl<CheckDeviceMapper, Ch
@Override
public List<TodoVO> getTodoBusiness() {
List<TodoVO> todoVOList = new ArrayList<>();
//如果用户为管理员则不查
UserVO userVO = userFeignClient.getUserById(RequestUtil.getUserIndex()).getData();
if(Objects.nonNull(userVO) && userVO.getType() == 1){
return todoVOList;
}
QueryWrapper<CheckDeviceVo> queryWrapper = new QueryWrapper<>();
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(RequestUtil.getDeptIndex());
@@ -239,7 +249,8 @@ public class CheckDeviceServiceImpl extends MppServiceImpl<CheckDeviceMapper, Ch
todoVO.setStartUser("系统扫描");
todoVO.setTaskCreateTime(item.getCreateTime());
todoVO.setSource(3);
todoVO.setRoutePath("");
todoVO.setRoutePath("terminalNetwotk");
todoVO.setTabValue(4);
return todoVO;
}).collect(Collectors.toList());
}

8
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
View File

@@ -44,6 +44,7 @@ import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.api.UserFeignClient;
import com.njcn.user.pojo.po.Dept;
import com.njcn.user.pojo.vo.UserVO;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.utils.RequestUtil;
import org.springframework.beans.BeanUtils;
@@ -439,6 +440,11 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
@Override
public List<TodoVO> getTodoBusiness() {
List<TodoVO> todoVOList = new ArrayList<>();
//如果用户为管理员则不查
UserVO userVO = userFeignClient.getUserById(RequestUtil.getUserIndex()).getData();
if(Objects.nonNull(userVO) && userVO.getType() == 1){
return todoVOList;
}
QueryWrapper<WarningLeafletVO> queryWrapper = new QueryWrapper<>();
List<String> deptIds = deptFeignClient.getDepSonIdtByDeptId(RequestUtil.getDeptIndex()).getData();
if(CollectionUtil.isEmpty(deptIds)){
@@ -465,7 +471,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
todoVO.setId(item.getId());
todoVO.setTaskCreateTime(item.getCreateTime());
todoVO.setSource(3);
todoVO.setRoutePath("");
todoVO.setRoutePath("supervision/supervision/manage");
todoVO.setTabValue(tabValue);
return todoVO;
}).collect(Collectors.toList());