diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 05bb656..30c9a38 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -411,20 +411,6 @@ } /** - * 接收工单 - */ - @RequestMapping(value = "/getJob") - @ResponseBody - public Object getJob(Long id) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())) { - return ResponseData.success(); - } else { - return ResponseData.error("接单失败"); - } - } - - /** * 确认工单,并保存图片 */ @RequestMapping(value = "/confirmJob") @@ -464,7 +450,6 @@ } } - /** * 保存工单信息及图片 */ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 05bb656..30c9a38 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -411,20 +411,6 @@ } /** - * 接收工单 - */ - @RequestMapping(value = "/getJob") - @ResponseBody - public Object getJob(Long id) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())) { - return ResponseData.success(); - } else { - return ResponseData.error("接单失败"); - } - } - - /** * 确认工单,并保存图片 */ @RequestMapping(value = "/confirmJob") @@ -464,7 +450,6 @@ } } - /** * 保存工单信息及图片 */ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index 9e8d154..da7aa76 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -23,13 +23,13 @@ private static final Logger logger = LoggerFactory.getLogger(DelayJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractApplicationContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } @@ -57,7 +57,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if (!"3".equals(alarmJob.getJobStatus()) && !"4".equals(alarmJob.getJobStatus())) { // 超时未处理 // 延时标签 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 05bb656..30c9a38 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -411,20 +411,6 @@ } /** - * 接收工单 - */ - @RequestMapping(value = "/getJob") - @ResponseBody - public Object getJob(Long id) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())) { - return ResponseData.success(); - } else { - return ResponseData.error("接单失败"); - } - } - - /** * 确认工单,并保存图片 */ @RequestMapping(value = "/confirmJob") @@ -464,7 +450,6 @@ } } - /** * 保存工单信息及图片 */ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index 9e8d154..da7aa76 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -23,13 +23,13 @@ private static final Logger logger = LoggerFactory.getLogger(DelayJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractApplicationContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } @@ -57,7 +57,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if (!"3".equals(alarmJob.getJobStatus()) && !"4".equals(alarmJob.getJobStatus())) { // 超时未处理 // 延时标签 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index b17ba5b..5dbd6ae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -25,14 +25,14 @@ private static final Logger logger = LoggerFactory.getLogger(HandleAlarmJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractPermissionContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; private List clientIds; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } public void setIAlarmJobService(IAlarmJobService iAlarmJobService) { @@ -64,7 +64,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if ("0".equals(alarmJob.getJobStatus())) { // 超时未接收 @@ -72,12 +72,12 @@ alarmJob.setJobFlag1("1"); iAlarmJobService.updateById(alarmJob); // 更新记录 if (clientIds.size() > 0) { - String appMsg = "您有一条编号为[" + id + "]的工单未处理，请及时处理"; + String appMsg = "您有一条编号为[" + id + "]的工单未接收，请及时接收"; IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未接收工单推送成功:" + id.toString()); } else { - logger.info("超时未处理工单推送失败:" + id.toString()); + logger.info("超时未接收工单推送失败:" + id.toString()); } } else { logger.info("超时未接收工单找不到责任人，未推送:" + id.toString()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 05bb656..30c9a38 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -411,20 +411,6 @@ } /** - * 接收工单 - */ - @RequestMapping(value = "/getJob") - @ResponseBody - public Object getJob(Long id) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())) { - return ResponseData.success(); - } else { - return ResponseData.error("接单失败"); - } - } - - /** * 确认工单,并保存图片 */ @RequestMapping(value = "/confirmJob") @@ -464,7 +450,6 @@ } } - /** * 保存工单信息及图片 */ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index 9e8d154..da7aa76 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -23,13 +23,13 @@ private static final Logger logger = LoggerFactory.getLogger(DelayJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractApplicationContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } @@ -57,7 +57,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if (!"3".equals(alarmJob.getJobStatus()) && !"4".equals(alarmJob.getJobStatus())) { // 超时未处理 // 延时标签 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index b17ba5b..5dbd6ae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -25,14 +25,14 @@ private static final Logger logger = LoggerFactory.getLogger(HandleAlarmJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractPermissionContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; private List clientIds; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } public void setIAlarmJobService(IAlarmJobService iAlarmJobService) { @@ -64,7 +64,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if ("0".equals(alarmJob.getJobStatus())) { // 超时未接收 @@ -72,12 +72,12 @@ alarmJob.setJobFlag1("1"); iAlarmJobService.updateById(alarmJob); // 更新记录 if (clientIds.size() > 0) { - String appMsg = "您有一条编号为[" + id + "]的工单未处理，请及时处理"; + String appMsg = "您有一条编号为[" + id + "]的工单未接收，请及时接收"; IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未接收工单推送成功:" + id.toString()); } else { - logger.info("超时未处理工单推送失败:" + id.toString()); + logger.info("超时未接收工单推送失败:" + id.toString()); } } else { logger.info("超时未接收工单找不到责任人，未推送:" + id.toString()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index fac1b98..79117c3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,8 +39,6 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(Long id, long personId); - boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); boolean transferJob(Long id, long transferPerson, String flowRec); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 05bb656..30c9a38 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -411,20 +411,6 @@ } /** - * 接收工单 - */ - @RequestMapping(value = "/getJob") - @ResponseBody - public Object getJob(Long id) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())) { - return ResponseData.success(); - } else { - return ResponseData.error("接单失败"); - } - } - - /** * 确认工单,并保存图片 */ @RequestMapping(value = "/confirmJob") @@ -464,7 +450,6 @@ } } - /** * 保存工单信息及图片 */ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index 9e8d154..da7aa76 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -23,13 +23,13 @@ private static final Logger logger = LoggerFactory.getLogger(DelayJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractApplicationContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } @@ -57,7 +57,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if (!"3".equals(alarmJob.getJobStatus()) && !"4".equals(alarmJob.getJobStatus())) { // 超时未处理 // 延时标签 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index b17ba5b..5dbd6ae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -25,14 +25,14 @@ private static final Logger logger = LoggerFactory.getLogger(HandleAlarmJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractPermissionContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; private List clientIds; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } public void setIAlarmJobService(IAlarmJobService iAlarmJobService) { @@ -64,7 +64,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if ("0".equals(alarmJob.getJobStatus())) { // 超时未接收 @@ -72,12 +72,12 @@ alarmJob.setJobFlag1("1"); iAlarmJobService.updateById(alarmJob); // 更新记录 if (clientIds.size() > 0) { - String appMsg = "您有一条编号为[" + id + "]的工单未处理，请及时处理"; + String appMsg = "您有一条编号为[" + id + "]的工单未接收，请及时接收"; IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未接收工单推送成功:" + id.toString()); } else { - logger.info("超时未处理工单推送失败:" + id.toString()); + logger.info("超时未接收工单推送失败:" + id.toString()); } } else { logger.info("超时未接收工单找不到责任人，未推送:" + id.toString()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index fac1b98..79117c3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,8 +39,6 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(Long id, long personId); - boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); boolean transferJob(Long id, long transferPerson, String flowRec); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index fa92688..b102f65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -135,37 +135,6 @@ return this.baseMapper.countMyJob(userId, deptId, spanDays); } - @Override - public boolean getJob(Long id, long personId) { - Calendar now = Calendar.getInstance(); - Date getTime = now.getTime(); - if (isWeekend(now)) { - now.add(Calendar.WEEK_OF_YEAR, 1); - now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY); - now.set(Calendar.HOUR_OF_DAY, 8); - now.set(Calendar.MINUTE, 0); - now.set(Calendar.SECOND, 0); - } else { - now.add(Calendar.HOUR, 24); - while (isWeekend(now)) { - now.add(Calendar.HOUR, 24); - } - } - Date shouldHandleTime = now.getTime(); - if (useOverTime.equals("true")) { - System.out.println(shouldHandleTime); - String jobName = "getJobDelay" + id; - Map map = new HashMap<>(); - map.put("jobId", id); - map.put("iAlarmJobService", this); - map.put("iCommonUserService", iCommonUserService); - map.put("iQuartzManager", quartzManager); - map.put("webSocket", webSocket); - quartzManager.addJob(jobName, DelayJob.class, shouldHandleTime, map); - } - return this.baseMapper.getJob(id, personId, getTime, shouldHandleTime); - } - private boolean isWeekend(Calendar cal) { if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { return true; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 05bb656..30c9a38 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -411,20 +411,6 @@ } /** - * 接收工单 - */ - @RequestMapping(value = "/getJob") - @ResponseBody - public Object getJob(Long id) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())) { - return ResponseData.success(); - } else { - return ResponseData.error("接单失败"); - } - } - - /** * 确认工单,并保存图片 */ @RequestMapping(value = "/confirmJob") @@ -464,7 +450,6 @@ } } - /** * 保存工单信息及图片 */ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index 9e8d154..da7aa76 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -23,13 +23,13 @@ private static final Logger logger = LoggerFactory.getLogger(DelayJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractApplicationContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } @@ -57,7 +57,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if (!"3".equals(alarmJob.getJobStatus()) && !"4".equals(alarmJob.getJobStatus())) { // 超时未处理 // 延时标签 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index b17ba5b..5dbd6ae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -25,14 +25,14 @@ private static final Logger logger = LoggerFactory.getLogger(HandleAlarmJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractPermissionContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; private List clientIds; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } public void setIAlarmJobService(IAlarmJobService iAlarmJobService) { @@ -64,7 +64,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if ("0".equals(alarmJob.getJobStatus())) { // 超时未接收 @@ -72,12 +72,12 @@ alarmJob.setJobFlag1("1"); iAlarmJobService.updateById(alarmJob); // 更新记录 if (clientIds.size() > 0) { - String appMsg = "您有一条编号为[" + id + "]的工单未处理，请及时处理"; + String appMsg = "您有一条编号为[" + id + "]的工单未接收，请及时接收"; IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未接收工单推送成功:" + id.toString()); } else { - logger.info("超时未处理工单推送失败:" + id.toString()); + logger.info("超时未接收工单推送失败:" + id.toString()); } } else { logger.info("超时未接收工单找不到责任人，未推送:" + id.toString()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index fac1b98..79117c3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,8 +39,6 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(Long id, long personId); - boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); boolean transferJob(Long id, long transferPerson, String flowRec); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index fa92688..b102f65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -135,37 +135,6 @@ return this.baseMapper.countMyJob(userId, deptId, spanDays); } - @Override - public boolean getJob(Long id, long personId) { - Calendar now = Calendar.getInstance(); - Date getTime = now.getTime(); - if (isWeekend(now)) { - now.add(Calendar.WEEK_OF_YEAR, 1); - now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY); - now.set(Calendar.HOUR_OF_DAY, 8); - now.set(Calendar.MINUTE, 0); - now.set(Calendar.SECOND, 0); - } else { - now.add(Calendar.HOUR, 24); - while (isWeekend(now)) { - now.add(Calendar.HOUR, 24); - } - } - Date shouldHandleTime = now.getTime(); - if (useOverTime.equals("true")) { - System.out.println(shouldHandleTime); - String jobName = "getJobDelay" + id; - Map map = new HashMap<>(); - map.put("jobId", id); - map.put("iAlarmJobService", this); - map.put("iCommonUserService", iCommonUserService); - map.put("iQuartzManager", quartzManager); - map.put("webSocket", webSocket); - quartzManager.addJob(jobName, DelayJob.class, shouldHandleTime, map); - } - return this.baseMapper.getJob(id, personId, getTime, shouldHandleTime); - } - private boolean isWeekend(Calendar cal) { if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { return true; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java index c95a6f7..e71ac32 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.MessagePusherService; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,22 @@ this.messagePusherService = messagePusherService; } + + /** + * 接收工单 + */ + @RequestMapping(value = "/job/getJob") + @ResponseBody + public Object getJob(Long id) { + AuthUser currentUser = permissionService.getAuthService().getLoginUser(); + if (messagePusherService.getJob(id, currentUser.getDeptId(), currentUser.getId())) { + return ResponseData.success(); + } else { + return ResponseData.error("接单失败"); + } + } + + /*** * 更新sink生成工单的接单时间，及建立超期未接工单的处理任务 * @param id diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 05bb656..30c9a38 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -411,20 +411,6 @@ } /** - * 接收工单 - */ - @RequestMapping(value = "/getJob") - @ResponseBody - public Object getJob(Long id) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())) { - return ResponseData.success(); - } else { - return ResponseData.error("接单失败"); - } - } - - /** * 确认工单,并保存图片 */ @RequestMapping(value = "/confirmJob") @@ -464,7 +450,6 @@ } } - /** * 保存工单信息及图片 */ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index 9e8d154..da7aa76 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -23,13 +23,13 @@ private static final Logger logger = LoggerFactory.getLogger(DelayJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractApplicationContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } @@ -57,7 +57,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if (!"3".equals(alarmJob.getJobStatus()) && !"4".equals(alarmJob.getJobStatus())) { // 超时未处理 // 延时标签 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index b17ba5b..5dbd6ae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -25,14 +25,14 @@ private static final Logger logger = LoggerFactory.getLogger(HandleAlarmJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractPermissionContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; private List clientIds; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } public void setIAlarmJobService(IAlarmJobService iAlarmJobService) { @@ -64,7 +64,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if ("0".equals(alarmJob.getJobStatus())) { // 超时未接收 @@ -72,12 +72,12 @@ alarmJob.setJobFlag1("1"); iAlarmJobService.updateById(alarmJob); // 更新记录 if (clientIds.size() > 0) { - String appMsg = "您有一条编号为[" + id + "]的工单未处理，请及时处理"; + String appMsg = "您有一条编号为[" + id + "]的工单未接收，请及时接收"; IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未接收工单推送成功:" + id.toString()); } else { - logger.info("超时未处理工单推送失败:" + id.toString()); + logger.info("超时未接收工单推送失败:" + id.toString()); } } else { logger.info("超时未接收工单找不到责任人，未推送:" + id.toString()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index fac1b98..79117c3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,8 +39,6 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(Long id, long personId); - boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); boolean transferJob(Long id, long transferPerson, String flowRec); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index fa92688..b102f65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -135,37 +135,6 @@ return this.baseMapper.countMyJob(userId, deptId, spanDays); } - @Override - public boolean getJob(Long id, long personId) { - Calendar now = Calendar.getInstance(); - Date getTime = now.getTime(); - if (isWeekend(now)) { - now.add(Calendar.WEEK_OF_YEAR, 1); - now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY); - now.set(Calendar.HOUR_OF_DAY, 8); - now.set(Calendar.MINUTE, 0); - now.set(Calendar.SECOND, 0); - } else { - now.add(Calendar.HOUR, 24); - while (isWeekend(now)) { - now.add(Calendar.HOUR, 24); - } - } - Date shouldHandleTime = now.getTime(); - if (useOverTime.equals("true")) { - System.out.println(shouldHandleTime); - String jobName = "getJobDelay" + id; - Map map = new HashMap<>(); - map.put("jobId", id); - map.put("iAlarmJobService", this); - map.put("iCommonUserService", iCommonUserService); - map.put("iQuartzManager", quartzManager); - map.put("webSocket", webSocket); - quartzManager.addJob(jobName, DelayJob.class, shouldHandleTime, map); - } - return this.baseMapper.getJob(id, personId, getTime, shouldHandleTime); - } - private boolean isWeekend(Calendar cal) { if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { return true; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java index c95a6f7..e71ac32 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.MessagePusherService; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,22 @@ this.messagePusherService = messagePusherService; } + + /** + * 接收工单 + */ + @RequestMapping(value = "/job/getJob") + @ResponseBody + public Object getJob(Long id) { + AuthUser currentUser = permissionService.getAuthService().getLoginUser(); + if (messagePusherService.getJob(id, currentUser.getDeptId(), currentUser.getId())) { + return ResponseData.success(); + } else { + return ResponseData.error("接单失败"); + } + } + + /*** * 更新sink生成工单的接单时间，及建立超期未接工单的处理任务 * @param id diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 1bf49c2..596dab3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -50,9 +50,6 @@ List> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId); - // boolean getJob(@Param("id") int id,@Param("personId") long personId); - boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); - boolean confirmJob(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); boolean confirmOverJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 05bb656..30c9a38 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -411,20 +411,6 @@ } /** - * 接收工单 - */ - @RequestMapping(value = "/getJob") - @ResponseBody - public Object getJob(Long id) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())) { - return ResponseData.success(); - } else { - return ResponseData.error("接单失败"); - } - } - - /** * 确认工单,并保存图片 */ @RequestMapping(value = "/confirmJob") @@ -464,7 +450,6 @@ } } - /** * 保存工单信息及图片 */ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index 9e8d154..da7aa76 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -23,13 +23,13 @@ private static final Logger logger = LoggerFactory.getLogger(DelayJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractApplicationContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } @@ -57,7 +57,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if (!"3".equals(alarmJob.getJobStatus()) && !"4".equals(alarmJob.getJobStatus())) { // 超时未处理 // 延时标签 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index b17ba5b..5dbd6ae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -25,14 +25,14 @@ private static final Logger logger = LoggerFactory.getLogger(HandleAlarmJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractPermissionContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; private List clientIds; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } public void setIAlarmJobService(IAlarmJobService iAlarmJobService) { @@ -64,7 +64,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if ("0".equals(alarmJob.getJobStatus())) { // 超时未接收 @@ -72,12 +72,12 @@ alarmJob.setJobFlag1("1"); iAlarmJobService.updateById(alarmJob); // 更新记录 if (clientIds.size() > 0) { - String appMsg = "您有一条编号为[" + id + "]的工单未处理，请及时处理"; + String appMsg = "您有一条编号为[" + id + "]的工单未接收，请及时接收"; IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未接收工单推送成功:" + id.toString()); } else { - logger.info("超时未处理工单推送失败:" + id.toString()); + logger.info("超时未接收工单推送失败:" + id.toString()); } } else { logger.info("超时未接收工单找不到责任人，未推送:" + id.toString()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index fac1b98..79117c3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,8 +39,6 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(Long id, long personId); - boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); boolean transferJob(Long id, long transferPerson, String flowRec); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index fa92688..b102f65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -135,37 +135,6 @@ return this.baseMapper.countMyJob(userId, deptId, spanDays); } - @Override - public boolean getJob(Long id, long personId) { - Calendar now = Calendar.getInstance(); - Date getTime = now.getTime(); - if (isWeekend(now)) { - now.add(Calendar.WEEK_OF_YEAR, 1); - now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY); - now.set(Calendar.HOUR_OF_DAY, 8); - now.set(Calendar.MINUTE, 0); - now.set(Calendar.SECOND, 0); - } else { - now.add(Calendar.HOUR, 24); - while (isWeekend(now)) { - now.add(Calendar.HOUR, 24); - } - } - Date shouldHandleTime = now.getTime(); - if (useOverTime.equals("true")) { - System.out.println(shouldHandleTime); - String jobName = "getJobDelay" + id; - Map map = new HashMap<>(); - map.put("jobId", id); - map.put("iAlarmJobService", this); - map.put("iCommonUserService", iCommonUserService); - map.put("iQuartzManager", quartzManager); - map.put("webSocket", webSocket); - quartzManager.addJob(jobName, DelayJob.class, shouldHandleTime, map); - } - return this.baseMapper.getJob(id, personId, getTime, shouldHandleTime); - } - private boolean isWeekend(Calendar cal) { if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { return true; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java index c95a6f7..e71ac32 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.MessagePusherService; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,22 @@ this.messagePusherService = messagePusherService; } + + /** + * 接收工单 + */ + @RequestMapping(value = "/job/getJob") + @ResponseBody + public Object getJob(Long id) { + AuthUser currentUser = permissionService.getAuthService().getLoginUser(); + if (messagePusherService.getJob(id, currentUser.getDeptId(), currentUser.getId())) { + return ResponseData.success(); + } else { + return ResponseData.error("接单失败"); + } + } + + /*** * 更新sink生成工单的接单时间，及建立超期未接工单的处理任务 * @param id diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 1bf49c2..596dab3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -50,9 +50,6 @@ List> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId); - // boolean getJob(@Param("id") int id,@Param("personId") long personId); - boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); - boolean confirmJob(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); boolean confirmOverJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/MessagePusherMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/MessagePusherMapper.java index 51b0450..5ab0389 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/MessagePusherMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/MessagePusherMapper.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.model.UserPush; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -14,6 +15,8 @@ List getUserIdList(@Param("ownerDeptId") Long ownerDeptId); + boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); + Map getDeptIdsByDevcode(@Param("devcode") String devcode); UserPush getPushByUserId(@Param("userId") Long userId, diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 05bb656..30c9a38 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -411,20 +411,6 @@ } /** - * 接收工单 - */ - @RequestMapping(value = "/getJob") - @ResponseBody - public Object getJob(Long id) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())) { - return ResponseData.success(); - } else { - return ResponseData.error("接单失败"); - } - } - - /** * 确认工单,并保存图片 */ @RequestMapping(value = "/confirmJob") @@ -464,7 +450,6 @@ } } - /** * 保存工单信息及图片 */ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index 9e8d154..da7aa76 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -23,13 +23,13 @@ private static final Logger logger = LoggerFactory.getLogger(DelayJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractApplicationContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } @@ -57,7 +57,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if (!"3".equals(alarmJob.getJobStatus()) && !"4".equals(alarmJob.getJobStatus())) { // 超时未处理 // 延时标签 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index b17ba5b..5dbd6ae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -25,14 +25,14 @@ private static final Logger logger = LoggerFactory.getLogger(HandleAlarmJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractPermissionContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; private List clientIds; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } public void setIAlarmJobService(IAlarmJobService iAlarmJobService) { @@ -64,7 +64,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if ("0".equals(alarmJob.getJobStatus())) { // 超时未接收 @@ -72,12 +72,12 @@ alarmJob.setJobFlag1("1"); iAlarmJobService.updateById(alarmJob); // 更新记录 if (clientIds.size() > 0) { - String appMsg = "您有一条编号为[" + id + "]的工单未处理，请及时处理"; + String appMsg = "您有一条编号为[" + id + "]的工单未接收，请及时接收"; IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未接收工单推送成功:" + id.toString()); } else { - logger.info("超时未处理工单推送失败:" + id.toString()); + logger.info("超时未接收工单推送失败:" + id.toString()); } } else { logger.info("超时未接收工单找不到责任人，未推送:" + id.toString()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index fac1b98..79117c3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,8 +39,6 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(Long id, long personId); - boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); boolean transferJob(Long id, long transferPerson, String flowRec); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index fa92688..b102f65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -135,37 +135,6 @@ return this.baseMapper.countMyJob(userId, deptId, spanDays); } - @Override - public boolean getJob(Long id, long personId) { - Calendar now = Calendar.getInstance(); - Date getTime = now.getTime(); - if (isWeekend(now)) { - now.add(Calendar.WEEK_OF_YEAR, 1); - now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY); - now.set(Calendar.HOUR_OF_DAY, 8); - now.set(Calendar.MINUTE, 0); - now.set(Calendar.SECOND, 0); - } else { - now.add(Calendar.HOUR, 24); - while (isWeekend(now)) { - now.add(Calendar.HOUR, 24); - } - } - Date shouldHandleTime = now.getTime(); - if (useOverTime.equals("true")) { - System.out.println(shouldHandleTime); - String jobName = "getJobDelay" + id; - Map map = new HashMap<>(); - map.put("jobId", id); - map.put("iAlarmJobService", this); - map.put("iCommonUserService", iCommonUserService); - map.put("iQuartzManager", quartzManager); - map.put("webSocket", webSocket); - quartzManager.addJob(jobName, DelayJob.class, shouldHandleTime, map); - } - return this.baseMapper.getJob(id, personId, getTime, shouldHandleTime); - } - private boolean isWeekend(Calendar cal) { if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { return true; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java index c95a6f7..e71ac32 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.MessagePusherService; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,22 @@ this.messagePusherService = messagePusherService; } + + /** + * 接收工单 + */ + @RequestMapping(value = "/job/getJob") + @ResponseBody + public Object getJob(Long id) { + AuthUser currentUser = permissionService.getAuthService().getLoginUser(); + if (messagePusherService.getJob(id, currentUser.getDeptId(), currentUser.getId())) { + return ResponseData.success(); + } else { + return ResponseData.error("接单失败"); + } + } + + /*** * 更新sink生成工单的接单时间，及建立超期未接工单的处理任务 * @param id diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 1bf49c2..596dab3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -50,9 +50,6 @@ List> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId); - // boolean getJob(@Param("id") int id,@Param("personId") long personId); - boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); - boolean confirmJob(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); boolean confirmOverJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/MessagePusherMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/MessagePusherMapper.java index 51b0450..5ab0389 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/MessagePusherMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/MessagePusherMapper.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.model.UserPush; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -14,6 +15,8 @@ List getUserIdList(@Param("ownerDeptId") Long ownerDeptId); + boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); + Map getDeptIdsByDevcode(@Param("devcode") String devcode); UserPush getPushByUserId(@Param("userId") Long userId, diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 20ef3d2..8bb2bac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -1054,15 +1054,6 @@ - - update alarm_job set job_status = 1, - JOB_BELONG_TO = #{personId}, - GET_JOB_PERSON = #{personId}, - GET_JOB_TIME = #{getTime}, - SHOULD_HANDLE_TIME = #{shouldHandleTime} - where id = #{id} - - update alarm_job set confirm_job_person = #{personId}, @@ -1148,9 +1139,9 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 05bb656..30c9a38 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -411,20 +411,6 @@ } /** - * 接收工单 - */ - @RequestMapping(value = "/getJob") - @ResponseBody - public Object getJob(Long id) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())) { - return ResponseData.success(); - } else { - return ResponseData.error("接单失败"); - } - } - - /** * 确认工单,并保存图片 */ @RequestMapping(value = "/confirmJob") @@ -464,7 +450,6 @@ } } - /** * 保存工单信息及图片 */ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java index 9e8d154..da7aa76 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/DelayJob.java @@ -23,13 +23,13 @@ private static final Logger logger = LoggerFactory.getLogger(DelayJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractApplicationContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } @@ -57,7 +57,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if (!"3".equals(alarmJob.getJobStatus()) && !"4".equals(alarmJob.getJobStatus())) { // 超时未处理 // 延时标签 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index b17ba5b..5dbd6ae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -25,14 +25,14 @@ private static final Logger logger = LoggerFactory.getLogger(HandleAlarmJob.class); - private Integer jobId; + private Long jobId; private IAlarmJobService iAlarmJobService; private AbstractPermissionContext iCommonUserService; private IQuartzManager iQuartzManager; private WebSocket webSocket; private List clientIds; - public void setJobId(Integer jobId) { + public void setJobId(Long jobId) { this.jobId = jobId; } public void setIAlarmJobService(IAlarmJobService iAlarmJobService) { @@ -64,7 +64,7 @@ getJobDelay(jobId); } - private void getJobDelay(Integer id) { + private void getJobDelay(Long id) { AlarmJob alarmJob = iAlarmJobService.getById(id); if ("0".equals(alarmJob.getJobStatus())) { // 超时未接收 @@ -72,12 +72,12 @@ alarmJob.setJobFlag1("1"); iAlarmJobService.updateById(alarmJob); // 更新记录 if (clientIds.size() > 0) { - String appMsg = "您有一条编号为[" + id + "]的工单未处理，请及时处理"; + String appMsg = "您有一条编号为[" + id + "]的工单未接收，请及时接收"; IPushResult pushResult = PushList.pushToUser(clientIds, "工单提醒", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { logger.info("超时未接收工单推送成功:" + id.toString()); } else { - logger.info("超时未处理工单推送失败:" + id.toString()); + logger.info("超时未接收工单推送失败:" + id.toString()); } } else { logger.info("超时未接收工单找不到责任人，未推送:" + id.toString()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index fac1b98..79117c3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,8 +39,6 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(Long id, long personId); - boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); boolean transferJob(Long id, long transferPerson, String flowRec); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index fa92688..b102f65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -135,37 +135,6 @@ return this.baseMapper.countMyJob(userId, deptId, spanDays); } - @Override - public boolean getJob(Long id, long personId) { - Calendar now = Calendar.getInstance(); - Date getTime = now.getTime(); - if (isWeekend(now)) { - now.add(Calendar.WEEK_OF_YEAR, 1); - now.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY); - now.set(Calendar.HOUR_OF_DAY, 8); - now.set(Calendar.MINUTE, 0); - now.set(Calendar.SECOND, 0); - } else { - now.add(Calendar.HOUR, 24); - while (isWeekend(now)) { - now.add(Calendar.HOUR, 24); - } - } - Date shouldHandleTime = now.getTime(); - if (useOverTime.equals("true")) { - System.out.println(shouldHandleTime); - String jobName = "getJobDelay" + id; - Map map = new HashMap<>(); - map.put("jobId", id); - map.put("iAlarmJobService", this); - map.put("iCommonUserService", iCommonUserService); - map.put("iQuartzManager", quartzManager); - map.put("webSocket", webSocket); - quartzManager.addJob(jobName, DelayJob.class, shouldHandleTime, map); - } - return this.baseMapper.getJob(id, personId, getTime, shouldHandleTime); - } - private boolean isWeekend(Calendar cal) { if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { return true; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java index c95a6f7..e71ac32 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.service.MessagePusherService; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,22 @@ this.messagePusherService = messagePusherService; } + + /** + * 接收工单 + */ + @RequestMapping(value = "/job/getJob") + @ResponseBody + public Object getJob(Long id) { + AuthUser currentUser = permissionService.getAuthService().getLoginUser(); + if (messagePusherService.getJob(id, currentUser.getDeptId(), currentUser.getId())) { + return ResponseData.success(); + } else { + return ResponseData.error("接单失败"); + } + } + + /*** * 更新sink生成工单的接单时间，及建立超期未接工单的处理任务 * @param id diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 1bf49c2..596dab3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -50,9 +50,6 @@ List> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId); - // boolean getJob(@Param("id") int id,@Param("personId") long personId); - boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); - boolean confirmJob(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); boolean confirmOverJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/MessagePusherMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/MessagePusherMapper.java index 51b0450..5ab0389 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/MessagePusherMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/MessagePusherMapper.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.model.UserPush; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -14,6 +15,8 @@ List getUserIdList(@Param("ownerDeptId") Long ownerDeptId); + boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); + Map getDeptIdsByDevcode(@Param("devcode") String devcode); UserPush getPushByUserId(@Param("userId") Long userId, diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 20ef3d2..8bb2bac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -1054,15 +1054,6 @@ - - update alarm_job set job_status = 1, - JOB_BELONG_TO = #{personId}, - GET_JOB_PERSON = #{personId}, - GET_JOB_TIME = #{getTime}, - SHOULD_HANDLE_TIME = #{shouldHandleTime} - where id = #{id} - - update alarm_job set confirm_job_person = #{personId}, @@ -1148,9 +1139,9 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index f4e675e..d92b4a4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -14,6 +14,17 @@ TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + update alarm_job set job_status = 1, + JOB_BELONG_TO = #{personId}, + GET_JOB_PERSON = #{personId}, + GET_JOB_TIME = #{getTime}, + SHOULD_HANDLE_TIME = #{shouldHandleTime} + where id = #{id} + + + + - - update alarm_job set job_status = 1, - JOB_BELONG_TO = #{personId}, - GET_JOB_PERSON = #{personId}, - GET_JOB_TIME = #{getTime}, - SHOULD_HANDLE_TIME = #{shouldHandleTime} - where id = #{id} - - update alarm_job set confirm_job_person = #{personId}, @@ -1148,9 +1139,9 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index f4e675e..d92b4a4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -14,6 +14,17 @@ TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + update alarm_job set job_status = 1, + JOB_BELONG_TO = #{personId}, + GET_JOB_PERSON = #{personId}, + GET_JOB_TIME = #{getTime}, + SHOULD_HANDLE_TIME = #{shouldHandleTime} + where id = #{id} + + + + - - update alarm_job set job_status = 1, - JOB_BELONG_TO = #{personId}, - GET_JOB_PERSON = #{personId}, - GET_JOB_TIME = #{getTime}, - SHOULD_HANDLE_TIME = #{shouldHandleTime} - where id = #{id} - - update alarm_job set confirm_job_person = #{personId}, @@ -1148,9 +1139,9 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index f4e675e..d92b4a4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -14,6 +14,17 @@ TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + update alarm_job set job_status = 1, + JOB_BELONG_TO = #{personId}, + GET_JOB_PERSON = #{personId}, + GET_JOB_TIME = #{getTime}, + SHOULD_HANDLE_TIME = #{shouldHandleTime} + where id = #{id} + + + + - - update alarm_job set job_status = 1, - JOB_BELONG_TO = #{personId}, - GET_JOB_PERSON = #{personId}, - GET_JOB_TIME = #{getTime}, - SHOULD_HANDLE_TIME = #{shouldHandleTime} - where id = #{id} - - update alarm_job set confirm_job_person = #{personId}, @@ -1148,9 +1139,9 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index f4e675e..d92b4a4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -14,6 +14,17 @@ TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + update alarm_job set job_status = 1, + JOB_BELONG_TO = #{personId}, + GET_JOB_PERSON = #{personId}, + GET_JOB_TIME = #{getTime}, + SHOULD_HANDLE_TIME = #{shouldHandleTime} + where id = #{id} + + + + - - update alarm_job set job_status = 1, - JOB_BELONG_TO = #{personId}, - GET_JOB_PERSON = #{personId}, - GET_JOB_TIME = #{getTime}, - SHOULD_HANDLE_TIME = #{shouldHandleTime} - where id = #{id} - - update alarm_job set confirm_job_person = #{personId}, @@ -1148,9 +1139,9 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index f4e675e..d92b4a4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -14,6 +14,17 @@ TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + update alarm_job set job_status = 1, + JOB_BELONG_TO = #{personId}, + GET_JOB_PERSON = #{personId}, + GET_JOB_TIME = #{getTime}, + SHOULD_HANDLE_TIME = #{shouldHandleTime} + where id = #{id} + + + + - - update alarm_job set job_status = 1, - JOB_BELONG_TO = #{personId}, - GET_JOB_PERSON = #{personId}, - GET_JOB_TIME = #{getTime}, - SHOULD_HANDLE_TIME = #{shouldHandleTime} - where id = #{id} - - update alarm_job set confirm_job_person = #{personId}, @@ -1148,9 +1139,9 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index f4e675e..d92b4a4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -14,6 +14,17 @@ TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + update alarm_job set job_status = 1, + JOB_BELONG_TO = #{personId}, + GET_JOB_PERSON = #{personId}, + GET_JOB_TIME = #{getTime}, + SHOULD_HANDLE_TIME = #{shouldHandleTime} + where id = #{id} + + + + - - update alarm_job set job_status = 1, - JOB_BELONG_TO = #{personId}, - GET_JOB_PERSON = #{personId}, - GET_JOB_TIME = #{getTime}, - SHOULD_HANDLE_TIME = #{shouldHandleTime} - where id = #{id} - - update alarm_job set confirm_job_person = #{personId}, @@ -1148,9 +1139,9 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index f4e675e..d92b4a4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -14,6 +14,17 @@ TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + update alarm_job set job_status = 1, + JOB_BELONG_TO = #{personId}, + GET_JOB_PERSON = #{personId}, + GET_JOB_TIME = #{getTime}, + SHOULD_HANDLE_TIME = #{shouldHandleTime} + where id = #{id} + + + + - - update alarm_job set job_status = 1, - JOB_BELONG_TO = #{personId}, - GET_JOB_PERSON = #{personId}, - GET_JOB_TIME = #{getTime}, - SHOULD_HANDLE_TIME = #{shouldHandleTime} - where id = #{id} - - update alarm_job set confirm_job_person = #{personId}, @@ -1148,9 +1139,9 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index f4e675e..d92b4a4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -14,6 +14,17 @@ TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + update alarm_job set job_status = 1, + JOB_BELONG_TO = #{personId}, + GET_JOB_PERSON = #{personId}, + GET_JOB_TIME = #{getTime}, + SHOULD_HANDLE_TIME = #{shouldHandleTime} + where id = #{id} + + + + - - update alarm_job set job_status = 1, - JOB_BELONG_TO = #{personId}, - GET_JOB_PERSON = #{personId}, - GET_JOB_TIME = #{getTime}, - SHOULD_HANDLE_TIME = #{shouldHandleTime} - where id = #{id} - - update alarm_job set confirm_job_person = #{personId}, @@ -1148,9 +1139,9 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index f4e675e..d92b4a4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -14,6 +14,17 @@ TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + update alarm_job set job_status = 1, + JOB_BELONG_TO = #{personId}, + GET_JOB_PERSON = #{personId}, + GET_JOB_TIME = #{getTime}, + SHOULD_HANDLE_TIME = #{shouldHandleTime} + where id = #{id} + + + +