diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java index 5effb1e..2e3511f 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java @@ -193,6 +193,9 @@ public interface ErrorCodeConstants { ErrorCode ENTERPRISE_INSPECTIONS_STATUS_ERROR2 = new ErrorCode(1-003-002-001, "任务不能转给自己"); + ErrorCode ENTERPRISE_INSPECTIONS_STATUS_ERROR3 = new ErrorCode(1-003-002-002, "请选择要转交的检查记录"); + + ErrorCode SIGN_IN_LOG_ERROR = new ErrorCode(1-003-005-001, "打卡记录不存在"); ErrorCode SIGN_IN_LOG_ERROR2 = new ErrorCode(1-003-005-001, "已经打卡，不能重复打卡"); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java index 51ad83b..c2f9d4c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java @@ -155,7 +155,12 @@ public class EnterpriseController { //通过userID获取专管人 - enterprise.setInviterName(adminUserService.getUser(Long.valueOf(enterprise.getUserId())).getNickname()); + if (enterprise.getUserId() != null) { + final AdminUserDO user = adminUserService.getUser(Long.valueOf(enterprise.getUserId())); + if (user != null) { + enterprise.setInviterName(user.getNickname()); + } + } //获取资质 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/datapermission/config/DataPermissionConfiguration.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/datapermission/config/DataPermissionConfiguration.java index d36f635..dd5ba17 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/datapermission/config/DataPermissionConfiguration.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/datapermission/config/DataPermissionConfiguration.java @@ -19,13 +19,13 @@ public class DataPermissionConfiguration { public DeptDataPermissionRuleCustomizer sysDeptDataPermissionRuleCustomizer() { return rule -> { // dept - rule.addDeptColumn(AdminUserDO.class); - rule.addDeptColumn(DeptDO.class, "id"); +// rule.addDeptColumn(AdminUserDO.class); +// rule.addDeptColumn(DeptDO.class, "id"); // user - rule.addUserColumn(AdminUserDO.class, "id"); +// rule.addUserColumn(AdminUserDO.class, "id"); //enterprise - rule.addDeptColumn(EnterpriseDO.class, "department_id"); - rule.addUserColumn(EnterpriseDO.class, "user_id"); +// rule.addDeptColumn(EnterpriseDO.class, "department_id"); +// rule.addUserColumn(EnterpriseDO.class, "user_id"); }; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/InspectionsSendStartMessageJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/InspectionsSendStartMessageJob.java new file mode 100644 index 0000000..874044b --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/InspectionsSendStartMessageJob.java @@ -0,0 +1,77 @@ +package cn.iocoder.yudao.module.system.job; + +import cn.hutool.core.date.DateUtil; +import cn.iocoder.yudao.framework.common.util.date.DateUtils; +import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler; +import cn.iocoder.yudao.module.system.api.social.SocialClientApi; +import cn.iocoder.yudao.module.system.api.social.dto.SocialWxaSubscribeMessageSendReqDTO; +import cn.iocoder.yudao.module.system.controller.admin.taskinfo.vo.TaskInfoRespVO; +import cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO; +import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO; +import cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog.InspectionsLogDO; +import cn.iocoder.yudao.module.system.dal.mysql.enterpriseinspections.EnterpriseInspectionsMapper; +import cn.iocoder.yudao.module.system.service.enterprise.EnterpriseService; +import cn.iocoder.yudao.module.system.service.inspectionslog.InspectionsLogService; +import cn.iocoder.yudao.module.system.service.taskinfo.TaskInfoService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component +@Slf4j +public class InspectionsSendStartMessageJob implements JobHandler { + + @Resource + InspectionsLogService inspectionsLogService; + + @Resource + SocialClientApi socialClientApi; + @Resource + EnterpriseInspectionsMapper enterpriseInspectionsMapper; + @Resource + EnterpriseService enterpriseService; + + @Override + public String execute(String param) throws Exception { + //要发送的信息 + + final Long id = Long.valueOf(param); + final InspectionsLogDO inspectionsLog = inspectionsLogService.getInspectionsLog(id); + if (inspectionsLog != null && inspectionsLog.getCreator() != null) { + + final EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectById(id); + if (enterpriseInspectionsDO != null) { + final EnterpriseDO enterprise = enterpriseService.getEnterprise(enterpriseInspectionsDO.getEnterpriseId()); + + try { + Long userId = Long.valueOf(inspectionsLog.getCreator()); + //发送消息); + SocialWxaSubscribeMessageSendReqDTO reqDTO = new SocialWxaSubscribeMessageSendReqDTO(); + reqDTO.setUserType(1); + reqDTO.setTemplateTitle("环保任务通知"); + reqDTO.setPage("sub/task/detail?id="+inspectionsLog.getInspectionsId()); + reqDTO.setUserId(userId); + Map message = new HashMap<>(); + message.put("thing2", enterprise.getEnterprisesName()); + message.put("time3", DateUtil.format(inspectionsLog.getCorrectionTime(), DateUtils.FORMAT_YEAR_MONTH_DAY)); +// message.put("thing4", beforeTaskInfo.getDescription()); +// message.put("time5", DateUtil.format(beforeTaskInfo.getEndDate().atStartOfDay(), DateUtils.FORMAT_YEAR_MONTH_DAY)); + reqDTO.setMessages(message); + socialClientApi.sendWxaSubscribeMessage(reqDTO); + } + catch (Exception e){ + log.error("任务发送通知错误：",e.toString()); + } + + + } + } + + return "发送整个信息成功"; + } +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/QualificationTimeOutSendStartMessageJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/QualificationTimeOutSendStartMessageJob.java new file mode 100644 index 0000000..88e900d --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/QualificationTimeOutSendStartMessageJob.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.system.job; + +import cn.hutool.core.date.DateUtil; +import cn.iocoder.yudao.framework.common.util.date.DateUtils; +import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler; +import cn.iocoder.yudao.module.system.api.social.SocialClientApi; +import cn.iocoder.yudao.module.system.api.social.dto.SocialWxaSubscribeMessageSendReqDTO; +import cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO; +import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO; +import cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog.InspectionsLogDO; +import cn.iocoder.yudao.module.system.dal.mysql.enterpriseinspections.EnterpriseInspectionsMapper; +import cn.iocoder.yudao.module.system.service.enterprise.EnterpriseService; +import cn.iocoder.yudao.module.system.service.inspectionslog.InspectionsLogService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +@Component +@Slf4j +public class QualificationTimeOutSendStartMessageJob implements JobHandler { + + @Resource + InspectionsLogService inspectionsLogService; + + @Resource + SocialClientApi socialClientApi; + @Resource + EnterpriseInspectionsMapper enterpriseInspectionsMapper; + @Resource + EnterpriseService enterpriseService; + + @Override + public String execute(String param) throws Exception { + //要发送的信息 + + final Long id = Long.valueOf(param); + final InspectionsLogDO inspectionsLog = inspectionsLogService.getInspectionsLog(id); + if (inspectionsLog != null && inspectionsLog.getCreator() != null) { + + final EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectById(id); + if (enterpriseInspectionsDO != null) { + final EnterpriseDO enterprise = enterpriseService.getEnterprise(enterpriseInspectionsDO.getEnterpriseId()); + + try { + Long userId = Long.valueOf(inspectionsLog.getCreator()); + //发送消息); + SocialWxaSubscribeMessageSendReqDTO reqDTO = new SocialWxaSubscribeMessageSendReqDTO(); + reqDTO.setUserType(1); + reqDTO.setTemplateTitle("环保任务通知"); + reqDTO.setPage("sub/task/detail?id="+inspectionsLog.getInspectionsId()); + reqDTO.setUserId(userId); + Map message = new HashMap<>(); + message.put("thing2", enterprise.getEnterprisesName()); + message.put("time3", DateUtil.format(inspectionsLog.getCorrectionTime(), DateUtils.FORMAT_YEAR_MONTH_DAY)); +// message.put("thing4", beforeTaskInfo.getDescription()); +// message.put("time5", DateUtil.format(beforeTaskInfo.getEndDate().atStartOfDay(), DateUtils.FORMAT_YEAR_MONTH_DAY)); + reqDTO.setMessages(message); + socialClientApi.sendWxaSubscribeMessage(reqDTO); + } + catch (Exception e){ + log.error("任务发送通知错误：",e.toString()); + } + + + } + } + + return "发送整个信息成功"; + } +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java index f0e83e1..202ba3b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java @@ -59,21 +59,15 @@ public class TaskSendStartMessageJob implements JobHandler { } } //执法任务更改状态 - if (beforeTaskInfoList != null && beforeTaskInfoList.size() > 0) { - beforeTaskInfoList.forEach(item->{ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(EnterpriseInspectionsDO::getTaskId, item.getId()); - List enterpriseInspectionsDOList = enterpriseInspectionsMapper.selectList(wrapper); - if(enterpriseInspectionsDOList!=null && enterpriseInspectionsDOList.size()>0){ - for (EnterpriseInspectionsDO enterpriseInspectionsDO : enterpriseInspectionsDOList) { - enterpriseInspectionsDO.setStatus(2); - } - } - enterpriseInspectionsMapper.updateBatch(enterpriseInspectionsDOList); - }); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(EnterpriseInspectionsDO::getTaskId, x.getId()); + List enterpriseInspectionsDOList = enterpriseInspectionsMapper.selectList(wrapper); + if(enterpriseInspectionsDOList!=null && enterpriseInspectionsDOList.size()>0){ + for (EnterpriseInspectionsDO enterpriseInspectionsDO : enterpriseInspectionsDOList) { + enterpriseInspectionsDO.setStatus(2); + } } - - + enterpriseInspectionsMapper.updateBatch(enterpriseInspectionsDOList); }); }); return "发送消息任务数量："+ beforeTaskInfoList.size(); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java index 01416e4..31de72e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java @@ -108,7 +108,7 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe wrapper.eq(InspectionsLogDO::getStatus, 1); wrapper.orderByDesc(InspectionsLogDO::getCreateTime); List list = inspectionsLogMapper.selectList(wrapper); - if (list != null) { + if (list != null && list.size() > 0) { return signInLogMapper.selectList(new LambdaQueryWrapper().eq(SignInLogDO::getInsId, list.get(0).getId())); } return Collections.emptyList(); @@ -324,7 +324,7 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe //查看任务状态，未签到， 整改 if (passOnSaveVO.getInspectionsId() == null || passOnSaveVO.getInspectionsId().size() == 0) { - throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS); //请选择要转交的检查记录 + throw exception(ENTERPRISE_INSPECTIONS_STATUS_ERROR3); //请选择要转交的检查记录 } //循环记录id列表 passOnSaveVO.getInspectionsId().forEach(item->{ @@ -342,31 +342,17 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe if (enterpriseInspectionsDO.getStatus() == 1 || enterpriseInspectionsDO.getStatus() == 2) { InspectionsLogDO inspectionsLogNew = this.getInspectionsLogNew(item); - if (inspectionsLogNew != null && inspectionsLogNew.getStatus() == 3) { + + if (inspectionsLogNew == null || (inspectionsLogNew != null && inspectionsLogNew.getStatus() == 3)) { //已经开始 就要判断是否是整改状态 整改状态才能转 - enterpriseInspectionsDO.setStatus(4); - } else { - enterpriseInspectionsDO.setStatus(1); + enterpriseInspectionsDO.setStatus(2); enterpriseInspectionsDO.setUserId(passOnSaveVO.getUserId()); + } else { + throw exception(ENTERPRISE_INSPECTIONS_STATUS_ERROR); } enterpriseInspectionsMapper.updateById(enterpriseInspectionsDO); -// if (enterpriseInspectionsDO.getStatus() == 4) { -// AdminUserDO user = adminUserService.getUser(passOnSaveVO.getUserId()); -// if (user == null) { -// throw exception(USER_NOT_EXISTS); -// } -// EnterpriseInspectionsDO inspectionsDO = new EnterpriseInspectionsDO(); -// inspectionsDO.setEnterpriseId(enterpriseInspectionsDO.getEnterpriseId()); -// inspectionsDO.setTaskId(enterpriseInspectionsDO.getTaskId()); -// inspectionsDO.setUserId(passOnSaveVO.getUserId()); -// inspectionsDO.setInspectName(user.getRealName()); -// enterpriseInspectionsMapper.insert(inspectionsDO); -// } - - } else { - throw exception(ENTERPRISE_INSPECTIONS_STATUS_ERROR); } }); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/inspectionslog/InspectionsLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/inspectionslog/InspectionsLogServiceImpl.java index 520deb1..338b890 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/inspectionslog/InspectionsLogServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/inspectionslog/InspectionsLogServiceImpl.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.system.service.inspectionslog; +import cn.iocoder.yudao.framework.common.pojo.JobSaveReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO; import cn.iocoder.yudao.module.system.dal.dataobject.signinlog.SignInLogDO; -import cn.iocoder.yudao.module.system.dal.dataobject.taskinfo.TaskInfoDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.dal.mysql.enterpriseinspections.EnterpriseInspectionsMapper; import cn.iocoder.yudao.module.system.dal.mysql.signinlog.SignInLogMapper; @@ -11,21 +11,21 @@ import cn.iocoder.yudao.module.system.dal.mysql.taskinfo.TaskInfoMapper; import cn.iocoder.yudao.module.system.service.dept.DeptService; import cn.iocoder.yudao.module.system.service.enterpriseinspections.EnterpriseInspectionsService; import cn.iocoder.yudao.module.system.service.fileInfo.FileInfoService; +import cn.iocoder.yudao.module.system.service.job.SystemJobService; import cn.iocoder.yudao.module.system.service.user.AdminUserService; -import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; import cn.iocoder.yudao.module.system.controller.admin.inspectionslog.vo.*; import cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog.InspectionsLogDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.system.dal.mysql.inspectionslog.InspectionsLogMapper; @@ -33,7 +33,6 @@ import cn.iocoder.yudao.module.system.dal.mysql.inspectionslog.InspectionsLogMap import javax.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; @@ -62,6 +61,8 @@ public class InspectionsLogServiceImpl implements InspectionsLogService { private DeptService deptService; @Resource private FileInfoService fileInfoService; + @Resource + private SystemJobService jobService; @Override @Transactional @@ -78,13 +79,18 @@ public class InspectionsLogServiceImpl implements InspectionsLogService { final AdminUserDO user = adminUserService.getUser(loginUserId); //根据查询出的列表判断执行到哪一步 - final InspectionsLogDO inspectionsLogNew = enterpriseInspectionsService.getInspectionsLogNew(createReqVO.getInspectionsId()); + InspectionsLogDO inspectionsLogNew = enterpriseInspectionsService.getInspectionsLogNew(createReqVO.getInspectionsId()); //没有记录和整改状态为打卡 if (inspectionsLogNew == null || (inspectionsLogNew != null && inspectionsLogNew.getStatus() == 3)) { createReqVO.setStatus(0); InspectionsLogDO inspectionsLog = BeanUtils.toBean(createReqVO, InspectionsLogDO.class); final int insert = inspectionsLogMapper.insert(inspectionsLog); + + if (inspectionsLogNew == null) { + inspectionsLogNew = new InspectionsLogDO(); + } + if (insert > 0) { inspectionsLogNew.setId(inspectionsLog.getId()); } @@ -151,6 +157,25 @@ public class InspectionsLogServiceImpl implements InspectionsLogService { return inspectionsLogMapper.selectById(id); } + /** + * 生成 Cron 表达式 + * @return java.lang.String + * @Date 2025-02-06 上午11:39 + **/ + public static String generateCronExpression(LocalDateTime dateTime) { + + // 获取年月日 + int second = dateTime.getSecond(); + int minute = dateTime.getMinute(); + int hour = dateTime.getHour(); + int dayOfMonth = dateTime.getDayOfMonth(); + int month = dateTime.getMonthValue(); + int year = dateTime.getYear(); + + return String.format("%d %d %d %d %d ? %d", second, minute, hour, dayOfMonth, month, year); + + } + @Override public List getInspectionsLogPage(InspectionsLogPageReqVO pageReqVO) { //不显示待确认签到的状态 @@ -171,7 +196,7 @@ public class InspectionsLogServiceImpl implements InspectionsLogService { if (listOld != null && listOld.size() > 0) { listOld.forEach(item->{ - item.setUserList(this.getInspectionsLogAppListVO(inspectionsLogNew.getId())); + item.setUserList(this.getInspectionsLogAppListVO(item.getId())); list.add(item); }); } @@ -306,6 +331,22 @@ public class InspectionsLogServiceImpl implements InspectionsLogService { //插入图片 fileInfoService.saveFilesByDictData(createReqVO.getFileIds(), 644l,2l, updateObj.getId().toString()); + if (createReqVO.getStatus() == 3 && createReqVO.getCorrectionTime() != null ) { + try { + JobSaveReqVO jobSaveReqVO = new JobSaveReqVO(); + jobSaveReqVO.setName("整改任务到期提醒"); + jobSaveReqVO.setHandlerName("inspectionsSendStartMessageJob"); + jobSaveReqVO.setHandlerParam(updateObj.getId().toString()); + jobSaveReqVO.setCronExpression(this.generateCronExpression(createReqVO.getCorrectionTime())); + jobSaveReqVO.setRetryCount(0); + jobSaveReqVO.setRetryInterval(0); + jobSaveReqVO.setMonitorTimeout(0); + jobService.createInspectionsJob(jobSaveReqVO); + } catch (Throwable e) { + throw new RuntimeException(e); + } + } + //插入签到人 方便查询 if (signInLogDOS == null || signInLogDOS.size() > 0) { List newList = new ArrayList<>(); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/job/SystemJobService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/job/SystemJobService.java new file mode 100644 index 0000000..a686608 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/job/SystemJobService.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.module.system.service.job; + +import cn.iocoder.yudao.framework.common.pojo.JobSaveReqVO; + +public interface SystemJobService { + + /** + * 整改任务,创建定时任务 + * + * @param jobSaveReqVO + * @return + * @throws Throwable + */ + Long createInspectionsJob(JobSaveReqVO jobSaveReqVO) throws Throwable; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/job/SystemJobServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/job/SystemJobServiceImpl.java new file mode 100644 index 0000000..f481488 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/job/SystemJobServiceImpl.java @@ -0,0 +1,28 @@ +package cn.iocoder.yudao.module.system.service.job; + +import cn.iocoder.yudao.framework.common.pojo.JobSaveReqVO; +import cn.iocoder.yudao.module.infra.api.job.JobApi; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class SystemJobServiceImpl implements SystemJobService { + /** + * 创建定时任务 + * + * @param jobSaveReqVO + * @return + * @throws Throwable + */ + + @Resource + private JobApi jobApi; + + @Override + public Long createInspectionsJob(JobSaveReqVO jobSaveReqVO) throws Throwable { + return jobApi.createJob(jobSaveReqVO); + } + + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java index ddaeb48..c72807a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java @@ -139,23 +139,6 @@ public class TaskInfoServiceImpl implements TaskInfoService { return taskInfo.getId(); } - /** - * 生成 Cron 表达式 - * @param year - * @param month - * @param day - * @return java.lang.String - * @Date 2025-02-06 上午11:39 - **/ - public static String generateCronExpression(int year, int month, int day) { - // 校验输入的年月日 - LocalDate date = LocalDate.of(year, month, day); - - // 生成 Cron 表达式 - String cronExpression = String.format("0 0 %d %d *", day, month); - - return cronExpression; - } @Override public void updateTaskInfo(TaskInfoSaveReqVO updateReqVO) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/taskinfo/TaskInfoMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/taskinfo/TaskInfoMapper.xml index 7fa883f..2c19b69 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/taskinfo/TaskInfoMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/taskinfo/TaskInfoMapper.xml @@ -87,6 +87,9 @@ and e.department_id = #{deptId} + + and e.department_id != 100 + GROUP BY ei.user_id