|
@@ -39,95 +39,68 @@ public class EpiAdminController {
|
|
@Autowired
|
|
@Autowired
|
|
private ScanService scanService;
|
|
private ScanService scanService;
|
|
|
|
|
|
- @ApiOperation("升级业委会角色")
|
|
|
|
- @PostMapping("/whepi/epi/admin/addRole")
|
|
|
|
- public ModelOps adminAddRole(@Pd(name = "we", desc = "手机号码") String we) {
|
|
|
|
- if (!StringUtils.isNullOrEmpty(we)) {
|
|
|
|
- List<UptownHome> list = uptownHomeMapper.getUptownHomeByPhone(we);
|
|
|
|
- if (list.size() != 1) {
|
|
|
|
- return ModelOps.newFail("该电话号码不存在,或多人注册该号码");
|
|
|
|
- }
|
|
|
|
- Long userId = uptownHomeMapper.getUserIdByPhone(we);
|
|
|
|
- List<UserRole> list1 = userRoleMapper.getUserRoleByUserId(userId);
|
|
|
|
- if (list1.size() >= 2) {
|
|
|
|
- return ModelOps.newFail("该电话已经升级过业委会角色");
|
|
|
|
- }
|
|
|
|
- UserRole userRole = userRoleMapper.getUserRoleByPropertyId(list.get(0).getHouseId(), 1);
|
|
|
|
- return ModelOps.newSuccess(epiAdminService.addYwhRole(list.get(0), userRole.getUserId()));
|
|
|
|
- }
|
|
|
|
- return null;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- @Scheduled(cron = "0 0 9 * * ?") //每天9点执行一次
|
|
|
|
- public void scheduledTaskByFixedDelay9() {
|
|
|
|
- this.fixedDelay(1);
|
|
|
|
- }
|
|
|
|
- @Scheduled(cron = "0 0 10 * * ?") //每天10点执行一次
|
|
|
|
- public void scheduledTaskByFixedDelay10() {
|
|
|
|
- this.fixedDelay(2);
|
|
|
|
- }
|
|
|
|
- @Scheduled(cron = "0 0 11 * * ?") //每天11点执行一次
|
|
|
|
- public void scheduledTaskByFixedDelay11() {
|
|
|
|
- this.fixedDelay(3);
|
|
|
|
- }
|
|
|
|
- @Scheduled(cron = "0 0 12 * * ?") //每天12点执行一次
|
|
|
|
- public void scheduledTaskByFixedDelay12() {
|
|
|
|
- this.fixedDelay(0);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 每天上午的推送取余,分成四个批次推送
|
|
|
|
- */
|
|
|
|
- public void fixedDelay(int i) {
|
|
|
|
- log.info("==============执行定时任务开始================");
|
|
|
|
- Long start = 0L, count = 100L;
|
|
|
|
- while (true) {
|
|
|
|
- List<UserOpen> userOpens = userOpenMapper.getOpenUser(start, count);
|
|
|
|
- int re = 0;
|
|
|
|
- for (UserOpen userOpen : userOpens) {
|
|
|
|
- if ((userOpen.getUserId()&3) == i) {
|
|
|
|
- re += epiTemplateMessageService.systemSendRemindMessage(userOpen.getUserId(), userOpen.getOpenId());
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- log.info("==============执行定时任务" + re + "================");
|
|
|
|
- start += count;
|
|
|
|
- if (userOpens == null || userOpens.size() < count) {
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- log.info("==============执行定时任务完毕================");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- @Scheduled(cron = "0 0 19 * * ?") //每天19点执行一次
|
|
|
|
- public void scheduledTaskByFixedDelay2() {
|
|
|
|
- log.info("==============执行定时任务开始================");
|
|
|
|
- Long start = 0L, count = 100L;
|
|
|
|
- while (true) {
|
|
|
|
- List<UserOpen> userOpens = userOpenMapper.getOpenUser(start, count);
|
|
|
|
- int re = 0;
|
|
|
|
- for (UserOpen userOpen : userOpens) {
|
|
|
|
- re += epiTemplateMessageService.systemSendRemindMessage(userOpen.getUserId(), userOpen.getOpenId());
|
|
|
|
- }
|
|
|
|
- log.info("==============执行定时任务" + re + "================");
|
|
|
|
- start += count;
|
|
|
|
- if (userOpens == null || userOpens.size() < count) {
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- log.info("==============执行定时任务完毕================");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-// @Scheduled(cron = "0 25 22 * * ?")
|
|
|
|
-// public void returnWorkTaskByFixedDelay() {
|
|
|
|
|
|
+// @ApiOperation("升级业委会角色")
|
|
|
|
+// @PostMapping("/whepi/epi/admin/addRole")
|
|
|
|
+// public ModelOps adminAddRole(@Pd(name = "we", desc = "手机号码") String we) {
|
|
|
|
+// if (!StringUtils.isNullOrEmpty(we)) {
|
|
|
|
+// List<UptownHome> list = uptownHomeMapper.getUptownHomeByPhone(we);
|
|
|
|
+// if (list.size() != 1) {
|
|
|
|
+// return ModelOps.newFail("该电话号码不存在,或多人注册该号码");
|
|
|
|
+// }
|
|
|
|
+// Long userId = uptownHomeMapper.getUserIdByPhone(we);
|
|
|
|
+// List<UserRole> list1 = userRoleMapper.getUserRoleByUserId(userId);
|
|
|
|
+// if (list1.size() >= 2) {
|
|
|
|
+// return ModelOps.newFail("该电话已经升级过业委会角色");
|
|
|
|
+// }
|
|
|
|
+// UserRole userRole = userRoleMapper.getUserRoleByPropertyId(list.get(0).getHouseId(), 1);
|
|
|
|
+// return ModelOps.newSuccess(epiAdminService.addYwhRole(list.get(0), userRole.getUserId()));
|
|
|
|
+// }
|
|
|
|
+// return null;
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// @Scheduled(cron = "0 0 9 * * ?") //每天9点执行一次
|
|
|
|
+// public void scheduledTaskByFixedDelay9() {
|
|
|
|
+// this.fixedDelay(1);
|
|
|
|
+// }
|
|
|
|
+// @Scheduled(cron = "0 0 10 * * ?") //每天10点执行一次
|
|
|
|
+// public void scheduledTaskByFixedDelay10() {
|
|
|
|
+// this.fixedDelay(2);
|
|
|
|
+// }
|
|
|
|
+// @Scheduled(cron = "0 0 11 * * ?") //每天11点执行一次
|
|
|
|
+// public void scheduledTaskByFixedDelay11() {
|
|
|
|
+// this.fixedDelay(3);
|
|
|
|
+// }
|
|
|
|
+// @Scheduled(cron = "0 0 12 * * ?") //每天12点执行一次
|
|
|
|
+// public void scheduledTaskByFixedDelay12() {
|
|
|
|
+// this.fixedDelay(0);
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// /**
|
|
|
|
+// * 每天上午的推送取余,分成四个批次推送
|
|
|
|
+// */
|
|
|
|
+// public void fixedDelay(int i) {
|
|
// log.info("==============执行定时任务开始================");
|
|
// log.info("==============执行定时任务开始================");
|
|
-// scanService.returnWorkLY(0L);
|
|
|
|
|
|
+// Long start = 0L, count = 100L;
|
|
|
|
+// while (true) {
|
|
|
|
+// List<UserOpen> userOpens = userOpenMapper.getOpenUser(start, count);
|
|
|
|
+// int re = 0;
|
|
|
|
+// for (UserOpen userOpen : userOpens) {
|
|
|
|
+// if ((userOpen.getUserId()&3) == i) {
|
|
|
|
+// re += epiTemplateMessageService.systemSendRemindMessage(userOpen.getUserId(), userOpen.getOpenId());
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// log.info("==============执行定时任务" + re + "================");
|
|
|
|
+// start += count;
|
|
|
|
+// if (userOpens == null || userOpens.size() < count) {
|
|
|
|
+// break;
|
|
|
|
+// }
|
|
|
|
+// }
|
|
// log.info("==============执行定时任务完毕================");
|
|
// log.info("==============执行定时任务完毕================");
|
|
// }
|
|
// }
|
|
-
|
|
|
|
- // @Scheduled(cron = "0 0 0 * * ?") //每天0点执行一次
|
|
|
|
- public void scheduledReportByFixedDelay() {
|
|
|
|
- log.info("==============执行定时任务开始================");
|
|
|
|
- msReportService.getNowByYesterdayDate();
|
|
|
|
|
|
+//
|
|
|
|
+// @Scheduled(cron = "0 0 19 * * ?") //每天19点执行一次
|
|
|
|
+// public void scheduledTaskByFixedDelay2() {
|
|
|
|
+// log.info("==============执行定时任务开始================");
|
|
// Long start = 0L, count = 100L;
|
|
// Long start = 0L, count = 100L;
|
|
// while (true) {
|
|
// while (true) {
|
|
// List<UserOpen> userOpens = userOpenMapper.getOpenUser(start, count);
|
|
// List<UserOpen> userOpens = userOpenMapper.getOpenUser(start, count);
|
|
@@ -135,13 +108,40 @@ public class EpiAdminController {
|
|
// for (UserOpen userOpen : userOpens) {
|
|
// for (UserOpen userOpen : userOpens) {
|
|
// re += epiTemplateMessageService.systemSendRemindMessage(userOpen.getUserId(), userOpen.getOpenId());
|
|
// re += epiTemplateMessageService.systemSendRemindMessage(userOpen.getUserId(), userOpen.getOpenId());
|
|
// }
|
|
// }
|
|
-// log.info("==============执行定时任务"+re+"================");
|
|
|
|
|
|
+// log.info("==============执行定时任务" + re + "================");
|
|
// start += count;
|
|
// start += count;
|
|
-// if (userOpens == null || userOpens.size()<count) {
|
|
|
|
|
|
+// if (userOpens == null || userOpens.size() < count) {
|
|
// break;
|
|
// break;
|
|
// }
|
|
// }
|
|
// }
|
|
// }
|
|
-
|
|
|
|
- log.info("==============执行定时任务完毕================");
|
|
|
|
- }
|
|
|
|
|
|
+// log.info("==============执行定时任务完毕================");
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+//// @Scheduled(cron = "0 25 22 * * ?")
|
|
|
|
+//// public void returnWorkTaskByFixedDelay() {
|
|
|
|
+//// log.info("==============执行定时任务开始================");
|
|
|
|
+//// scanService.returnWorkLY(0L);
|
|
|
|
+//// log.info("==============执行定时任务完毕================");
|
|
|
|
+//// }
|
|
|
|
+//
|
|
|
|
+// // @Scheduled(cron = "0 0 0 * * ?") //每天0点执行一次
|
|
|
|
+// public void scheduledReportByFixedDelay() {
|
|
|
|
+// log.info("==============执行定时任务开始================");
|
|
|
|
+// msReportService.getNowByYesterdayDate();
|
|
|
|
+//// Long start = 0L, count = 100L;
|
|
|
|
+//// while (true) {
|
|
|
|
+//// List<UserOpen> userOpens = userOpenMapper.getOpenUser(start, count);
|
|
|
|
+//// int re = 0;
|
|
|
|
+//// for (UserOpen userOpen : userOpens) {
|
|
|
|
+//// re += epiTemplateMessageService.systemSendRemindMessage(userOpen.getUserId(), userOpen.getOpenId());
|
|
|
|
+//// }
|
|
|
|
+//// log.info("==============执行定时任务"+re+"================");
|
|
|
|
+//// start += count;
|
|
|
|
+//// if (userOpens == null || userOpens.size()<count) {
|
|
|
|
+//// break;
|
|
|
|
+//// }
|
|
|
|
+//// }
|
|
|
|
+//
|
|
|
|
+// log.info("==============执行定时任务完毕================");
|
|
|
|
+// }
|
|
}
|
|
}
|