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

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());