Commit 28ae1447ef6fb135b96de3e238ebda14aa4fff42
1 parent
c1cf0e8a
派单短信催办短信过滤停用用户
Showing
4 changed files
with
23 additions
and
2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java
| @@ -117,5 +117,7 @@ public class AssignTasksInfoDO extends BaseDO { | @@ -117,5 +117,7 @@ public class AssignTasksInfoDO extends BaseDO { | ||
| 117 | * 是否打回0:正常 1:打回 | 117 | * 是否打回0:正常 1:打回 |
| 118 | */ | 118 | */ |
| 119 | private Integer isReject; | 119 | private Integer isReject; |
| 120 | + /*是否发送成功 0:未发送 1:已发送*/ | ||
| 121 | + private Integer remindStatue; | ||
| 120 | 122 | ||
| 121 | } | 123 | } |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/job/task/ExpireRemindJob.java
| @@ -85,7 +85,7 @@ public class ExpireRemindJob implements Job { | @@ -85,7 +85,7 @@ public class ExpireRemindJob implements Job { | ||
| 85 | executeRemindLogic(task); | 85 | executeRemindLogic(task); |
| 86 | 86 | ||
| 87 | // 4. 提醒成功后,更新任务状态+移除触发器(核心优化:成功也移除) | 87 | // 4. 提醒成功后,更新任务状态+移除触发器(核心优化:成功也移除) |
| 88 | - //updateTaskRemindStatus(taskId); | 88 | + updateTaskRemindStatus(taskId); |
| 89 | removeRemindJobSafely(taskId); | 89 | removeRemindJobSafely(taskId); |
| 90 | log.info("【到期提醒Job】执行成功,任务ID:{}", taskId); | 90 | log.info("【到期提醒Job】执行成功,任务ID:{}", taskId); |
| 91 | 91 | ||
| @@ -136,7 +136,7 @@ public class ExpireRemindJob implements Job { | @@ -136,7 +136,7 @@ public class ExpireRemindJob implements Job { | ||
| 136 | private void updateTaskRemindStatus(Long taskId) { | 136 | private void updateTaskRemindStatus(Long taskId) { |
| 137 | try { | 137 | try { |
| 138 | // 实际业务:更新数据库中任务的提醒状态(如remind_status=1 表示已提醒) | 138 | // 实际业务:更新数据库中任务的提醒状态(如remind_status=1 表示已提醒) |
| 139 | - //assignTasksInfoService.updateRemindStatus(taskId, 1); | 139 | + assignTasksInfoService.updateRemindStatus(taskId, 1); |
| 140 | log.debug("【到期提醒Job】更新任务提醒状态成功,任务ID:{}", taskId); | 140 | log.debug("【到期提醒Job】更新任务提醒状态成功,任务ID:{}", taskId); |
| 141 | } catch (Exception e) { | 141 | } catch (Exception e) { |
| 142 | // 状态更新失败单独捕获,不影响触发器移除 | 142 | // 状态更新失败单独捕获,不影响触发器移除 |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java
| @@ -121,4 +121,11 @@ public interface AssignTasksInfoService { | @@ -121,4 +121,11 @@ public interface AssignTasksInfoService { | ||
| 121 | * @Return void | 121 | * @Return void |
| 122 | */ | 122 | */ |
| 123 | public void createRemindJob(LocalDateTime deadline, Long id); | 123 | public void createRemindJob(LocalDateTime deadline, Long id); |
| 124 | + | ||
| 125 | + /** | ||
| 126 | + * @Author wangqian | ||
| 127 | + * @Description 更新发送标识 | ||
| 128 | + * @Return void | ||
| 129 | + */ | ||
| 130 | + public void updateRemindStatus(Long taskId,int remindStatue); | ||
| 124 | } | 131 | } |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java
| @@ -219,6 +219,14 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { | @@ -219,6 +219,14 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { | ||
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | @Override | 221 | @Override |
| 222 | + public void updateRemindStatus(Long taskId, int remindStatue) { | ||
| 223 | + AssignTasksInfoDO assignTasksInfoDO = new AssignTasksInfoDO(); | ||
| 224 | + assignTasksInfoDO.setId(taskId); | ||
| 225 | + assignTasksInfoDO.setRemindStatue(remindStatue); | ||
| 226 | + assignTasksInfoMapper.updateById(assignTasksInfoDO); | ||
| 227 | + } | ||
| 228 | + | ||
| 229 | + @Override | ||
| 222 | public List<AssignTasksInfoDO> getAssignTasksInfos(Long taskId) { | 230 | public List<AssignTasksInfoDO> getAssignTasksInfos(Long taskId) { |
| 223 | if (taskId == null) { | 231 | if (taskId == null) { |
| 224 | throw exception(ASSIGN_TASKS_INFO_TASKID_NOT_EXISTS); | 232 | throw exception(ASSIGN_TASKS_INFO_TASKID_NOT_EXISTS); |
| @@ -402,6 +410,10 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { | @@ -402,6 +410,10 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { | ||
| 402 | if (user == null || user.getDeptId() == null) { | 410 | if (user == null || user.getDeptId() == null) { |
| 403 | return false; | 411 | return false; |
| 404 | } | 412 | } |
| 413 | + // 过滤停用 | ||
| 414 | + if (1 == user.getStatus()) { | ||
| 415 | + return false; | ||
| 416 | + } | ||
| 405 | // 安全比较companyId和deptId(兼容null) | 417 | // 安全比较companyId和deptId(兼容null) |
| 406 | return Objects.equals(companyId, user.getDeptId()); | 418 | return Objects.equals(companyId, user.getDeptId()); |
| 407 | }) | 419 | }) |