@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX ;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils ;
import cn.iocoder.yudao.module.infra.api.job.JobApi ;
import cn.iocoder.yudao.module.system.controller.admin.auth.vo.RoleNameAndSelectTypeVO ;
import cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo.EnterpriseInspectionsPageReqVO ;
import cn.iocoder.yudao.module.system.controller.admin.tasktag.vo.TaskTagPageReqVO ;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO ;
@ -18,6 +19,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.enterpriseinspections.Enterprise
import cn.iocoder.yudao.module.system.dal.mysql.taglibrary.TagLibraryMapper ;
import cn.iocoder.yudao.module.system.dal.mysql.tasktag.TaskTagMapper ;
import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper ;
import cn.iocoder.yudao.module.system.service.auth.AdminAuthService ;
import cn.iocoder.yudao.module.system.service.dept.DeptService ;
import cn.iocoder.yudao.module.system.service.taglibrary.TagLibraryService ;
import cn.iocoder.yudao.module.system.service.user.AdminUserService ;
@ -63,17 +65,11 @@ public class TaskInfoServiceImpl implements TaskInfoService {
@Resource
private TaskTagMapper taskTagMapper ;
@Resource
private JobApi jobApi ;
@Resource
private EnterpriseMapper enterpriseMapper ;
@Resource
private EnterpriseInspectionsMapper enterpriseInspectionsMapper ;
@Resource
private TagLibraryMapper tagLibraryMapper ;
@Resource
private AdminUserService adminUserService ;
@Resource
private AdminUserMapper adminUserMapper ;
private AdminAuthService authService ;
@Resource
private DeptService deptService ;
@Resource
@ -123,17 +119,6 @@ public class TaskInfoServiceImpl implements TaskInfoService {
enterpriseInspectionsMapper . insertBatch ( list ) ;
}
if ( taskInfo . getId ( ) > 0 ) {
// //添加定时任务
// JobSaveReqVO jobSaveReqVO = new JobSaveReqVO();
// try {
// jobApi.createJob(jobSaveReqVO);
// } catch (Throwable e) {
// throw new RuntimeException(e);
// }
}
// 返回
return taskInfo . getId ( ) ;
}
@ -223,16 +208,6 @@ public class TaskInfoServiceImpl implements TaskInfoService {
@Override
public PageResult < TaskInfoDO > getTaskInfoAppPage ( TaskInfoPageReqVO pageReqVO ) {
// //按标签查询
// if (pageReqVO.getTagList() != null && pageReqVO.getTagList().size() > 0) {
// LambdaQueryWrapper<TaskTagDO> wrapper = new LambdaQueryWrapper<>();
// wrapper.in(TaskTagDO::getTagId, pageReqVO.getTagList());
// final List<TaskTagDO> taskTagDOS = taskTagMapper.selectList(wrapper);
// if (taskTagDOS != null && taskTagDOS.size() > 0) {
// pageReqVO.setTagList(taskTagDOS.stream().map(item->item.getTaskId()).collect(Collectors.toList()));
// }
// }
//按时间查询
if ( pageReqVO . getSelectWeek ( ) ! = null ) {
LocalDateTime now = LocalDateTime . now ( ) ;
@ -258,27 +233,15 @@ public class TaskInfoServiceImpl implements TaskInfoService {
pageReqVO . setStartTime ( startTime ) ;
}
//根据不同的角色查询
/ *
管理员 , 局长 , 查全部
检查员 , 查自己的
队长 查本部门
* /
Long loginUserId = SecurityFrameworkUtils . getLoginUserId ( ) ;
final AdminUserDO user1 = adminUserService . getUser ( loginUserId ) ;
if ( user1 . getPostIds ( ) . contains ( 1l ) | | user1 . getPostIds ( ) . contains ( 2l ) ) {
//全部
} else if ( user1 . getPostIds ( ) . contains ( 4l ) ) {
//本部门
pageReqVO . setDeptId ( user1 . getDeptId ( ) ) ;
} else if ( user1 . getPostIds ( ) . contains ( 5l ) ) {
//自己
pageReqVO . setUserId ( loginUserId ) ;
RoleNameAndSelectTypeVO typeVO = authService . roleTypeByUserId ( ) ;
if ( "self" . equals ( typeVO . getRoleName ( ) ) ) {
pageReqVO . setUserId ( typeVO . getValue ( ) ) ;
}
// final PageResult<TaskInfoDO> taskInfoDOPageResult = taskInfoMapper.selectAppPage(pageReqVO);
if ( "queue" . equals ( typeVO . getRoleName ( ) ) ) {
pageReqVO . setDeptId ( typeVO . getValue ( ) ) ;
}
Page < TaskInfoDO > page = new Page < > ( pageReqVO . getPageNo ( ) , pageReqVO . getPageSize ( ) ) ;
final IPage < TaskInfoDO > taskInfoDOIPage = taskInfoMapper . selectMyPage ( page , pageReqVO ) ;
@ -286,16 +249,6 @@ public class TaskInfoServiceImpl implements TaskInfoService {
if ( taskInfoDOPageResult . getList ( ) ! = null & & taskInfoDOPageResult . getList ( ) . size ( ) > 0 ) {
taskInfoDOPageResult . getList ( ) . forEach ( item - > {
// item.setTaskExecNum(0);
//
// List<EnterpriseInspectionsDO> enterpriseInspectionsDOList = enterpriseInspectionsMapper.selectList(wrapper);
// log.info("enterpriseInspectionsDOList:{}", enterpriseInspectionsDOList);
// if (enterpriseInspectionsDOList != null && enterpriseInspectionsDOList.size() > 0) {
// item.setTaskExecNum(enterpriseInspectionsDOList.size());
// final List<EnterpriseInspectionsDO> collect = enterpriseInspectionsDOList.stream().filter(res -> res.getStatus() == 5).collect(Collectors.toList());
// item.setTaskFinishNum(collect.size());
// }
//获取任务标签
final List < TagLibraryDO > tagLibraryDOS1 = tagLibraryService . listByTaskId ( item . getId ( ) ) ;
if ( tagLibraryDOS1 ! = null & & tagLibraryDOS1 . size ( ) > 0 ) {
@ -304,13 +257,6 @@ public class TaskInfoServiceImpl implements TaskInfoService {
} ) ;
}
// //筛选出 TaskExecNum 为0的
// if (taskInfoDOPageResult.getList() != null && taskInfoDOPageResult.getList().size() > 0) {
// final List<TaskInfoDO> collect = taskInfoDOPageResult.getList().stream().filter(res -> res.getTaskExecNum() > 0).collect(Collectors.toList());
// taskInfoDOPageResult.setList(collect);
// taskInfoDOPageResult.setTotal(Long.valueOf(collect.size()));
// }
return taskInfoDOPageResult ;
}