diff --git a/pom.xml b/pom.xml index a1626be..6bd7b38 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,11 @@ web-infrastructure ${project.version} + + com.alibaba.cloud + spring-cloud-starter-stream-rocketmq + ${spring-cloud-alibaba.version} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanDayJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanDayJob.java index 712195c..0387dec 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanDayJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanDayJob.java @@ -29,8 +29,8 @@ public class FireCheckRecordPlanDayJob implements Job { private FireCheckListServiceI fireCheckListServiceI; @Override -// @JobRegister(cron = "0 10 0 * * ?", jobDesc = "每半年超期未检查记录",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.FireCheckRecordPlanDayJob") + @JobRegister(cron = "0 10 0 * * ?", jobDesc = "每半年超期未检查记录",triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.FireCheckRecordPlanDayJob") public ReturnT execute(String param) { System.out.println("开始执行计划任务"); diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanHalfMonthlyJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanHalfMonthlyJob.java index 7832095..f187b84 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanHalfMonthlyJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanHalfMonthlyJob.java @@ -27,8 +27,8 @@ public class FireCheckRecordPlanHalfMonthlyJob implements Job { private FireCheckListServiceI fireCheckListServiceI; @Override -// @JobRegister(cron = "0 0 0 1,16 * ? ", jobDesc = "每半月超期未检查记录",triggerStatus = 1) -// @XxlJob(" com.zcloud.fire.check.plan.FireCheckRecordPlanHalfMonthlyJob") + @JobRegister(cron = "0 0 0 1,16 * ? ", jobDesc = "每半月超期未检查记录",triggerStatus = 1) + @XxlJob(" com.zcloud.fire.check.plan.FireCheckRecordPlanHalfMonthlyJob") public ReturnT execute(String param) { XxlJobHelper.log( "============开始定时每半月超期未检查记录=========="); Map params =new HashMap<>(); diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanHalfYearlyJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanHalfYearlyJob.java index f1bb37f..901dade 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanHalfYearlyJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanHalfYearlyJob.java @@ -27,8 +27,8 @@ public class FireCheckRecordPlanHalfYearlyJob implements Job { private FireCheckListServiceI fireCheckListServiceI; @Override -// @JobRegister(cron = "0 5 0 1 1,7 ?", jobDesc = "每半年超期未检查记录",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.CheckRecordPlanHalfYearlyJob") + @JobRegister(cron = "0 5 0 1 1,7 ?", jobDesc = "每半年超期未检查记录",triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.CheckRecordPlanHalfYearlyJob") public ReturnT execute(String param) { XxlJobHelper.log( "============开始定时增加每半年超期未检查记录=========="); Map params =new HashMap<>(); diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanMonthlyJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanMonthlyJob.java index 0c9d5a1..0031b5c 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanMonthlyJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanMonthlyJob.java @@ -27,8 +27,8 @@ public class FireCheckRecordPlanMonthlyJob implements Job { private FireCheckListServiceI fireCheckListServiceI; @Override -// @JobRegister(cron = "0 5 0 1 * ?", jobDesc = "每月超期未检查记录",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.CheckRecordPlanMonthlyJob") + @JobRegister(cron = "0 5 0 1 * ?", jobDesc = "每月超期未检查记录",triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.CheckRecordPlanMonthlyJob") public ReturnT execute(String param) { XxlJobHelper.log( "============开始定时增加每月超期未检查记录=========="); Map params =new HashMap<>(); diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanQuarterlyJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanQuarterlyJob.java index f8c3c56..5b7eb3a 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanQuarterlyJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanQuarterlyJob.java @@ -27,8 +27,8 @@ public class FireCheckRecordPlanQuarterlyJob implements Job { private FireCheckListServiceI fireCheckListServiceI; @Override -// @JobRegister(cron = "0 5 0 1 1,4,7,10 ?", jobDesc = "每季度超期未检查记录",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.CheckRecordPlanQuarterlyJob") + @JobRegister(cron = "0 5 0 1 1,4,7,10 ?", jobDesc = "每季度超期未检查记录",triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.CheckRecordPlanQuarterlyJob") public ReturnT execute(String param) { XxlJobHelper.log( "============开始定时每季度超期未检查记录=========="); Map params =new HashMap<>(); diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanTenDayJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanTenDayJob.java index 2f68b06..96558e1 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanTenDayJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanTenDayJob.java @@ -1,8 +1,10 @@ package com.zcloud.fire.check.plan; import com.jjb.saas.framework.job.Job; +import com.jjb.saas.framework.job.annotation.JobRegister; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; import com.zcloud.fire.check.api.FireCheckListServiceI; import com.zcloud.fire.check.domain.enums.ListManagerCheckPeriodEnum; import com.zcloud.fire.check.domain.model.DateTimeE; @@ -25,8 +27,8 @@ public class FireCheckRecordPlanTenDayJob implements Job { private FireCheckListServiceI fireCheckListServiceI; @Override -// @JobRegister(cron = "0 5 0 1,11,21 * ?", jobDesc = "每询超期未检查记录",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.CheckRecordPlanTenDayJob") + @JobRegister(cron = "0 5 0 1,11,21 * ?", jobDesc = "每询超期未检查记录",triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.CheckRecordPlanTenDayJob") public ReturnT execute(String param) { XxlJobHelper.log( "============开始定时增加每询超期未检查记录=========="); Map params =new HashMap<>(); diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanWeeklyJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanWeeklyJob.java index d068dc1..bea2dc4 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanWeeklyJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanWeeklyJob.java @@ -28,8 +28,8 @@ public class FireCheckRecordPlanWeeklyJob implements Job { private FireCheckListServiceI fireCheckListServiceI; @Override -// @JobRegister(cron = "0 5 0 ? * MON", jobDesc = "每周超期未检查记录",triggerStatus = 1) -// @XxlJob("com.zcloud.zcGbsServicer.plan.CheckRecordPlanWeeklyJob") + @JobRegister(cron = "0 5 0 ? * MON", jobDesc = "每周超期未检查记录",triggerStatus = 1) + @XxlJob("com.zcloud.zcGbsServicer.plan.CheckRecordPlanWeeklyJob") public ReturnT execute(String param) { Map params =new HashMap<>(); FireCheckListE fireCheckListE = new FireCheckListE(); diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanYearlyJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanYearlyJob.java index 95278e3..e46d631 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanYearlyJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/FireCheckRecordPlanYearlyJob.java @@ -27,8 +27,8 @@ public class FireCheckRecordPlanYearlyJob implements Job { private FireCheckListServiceI fireCheckListServiceI; @Override -// @JobRegister(cron = "0 5 0 1 1 ?", jobDesc = "每年超期未检查记录",triggerStatus = 1) -// @XxlJob("com.zcloud.zcGbsServicer.plan.CheckRecordPlanYearlyJob") + @JobRegister(cron = "0 5 0 1 1 ?", jobDesc = "每年超期未检查记录",triggerStatus = 1) + @XxlJob("com.zcloud.zcGbsServicer.plan.CheckRecordPlanYearlyJob") public ReturnT execute(String param) { XxlJobHelper.log( "============开始定时每年超期未检查记录=========="); Map params =new HashMap<>(); diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckLisTenJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckLisTenJob.java index 09205e0..15f926a 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckLisTenJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckLisTenJob.java @@ -1,8 +1,10 @@ package com.zcloud.fire.check.plan; import com.jjb.saas.framework.job.Job; +import com.jjb.saas.framework.job.annotation.JobRegister; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; import com.zcloud.fire.check.api.FireCheckListServiceI; import com.zcloud.fire.check.domain.enums.ListManagerCheckPeriodEnum; import lombok.RequiredArgsConstructor; @@ -19,8 +21,8 @@ public class WaitFireCheckLisTenJob implements Job { private FireCheckListServiceI fireCheckListServiceI; @Override - // @JobRegister(cron = "0 5 0 1,11,21 * ?", jobDesc = "待排查消息提醒",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckLisTenJob") + @JobRegister(cron = "0 5 0 1,11,21 * ?", jobDesc = "待排查消息提醒",triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckLisTenJob") public ReturnT execute(String param) { log.info( "============待排查消息提醒(消防点检)==========开始"); diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListDayJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListDayJob.java index e454719..5d8eeaf 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListDayJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListDayJob.java @@ -1,8 +1,10 @@ package com.zcloud.fire.check.plan; import com.jjb.saas.framework.job.Job; +import com.jjb.saas.framework.job.annotation.JobRegister; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; import com.zcloud.fire.check.api.FireCheckListServiceI; import com.zcloud.fire.check.domain.enums.ListManagerCheckPeriodEnum; import lombok.RequiredArgsConstructor; @@ -19,8 +21,8 @@ public class WaitFireCheckListDayJob implements Job { private FireCheckListServiceI fireCheckListServiceI; @Override -// @JobRegister(cron = "0 30 0 * * ?", jobDesc = "待排查消息提醒",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListDayJob") + @JobRegister(cron = "0 30 0 * * ?", jobDesc = "待排查消息提醒",triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListDayJob") public ReturnT execute(String param) { log.info( "============待排查消息提醒(消防点检)==========开始"); diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListHalfMonthlyJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListHalfMonthlyJob.java index 6934d58..bbf24d0 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListHalfMonthlyJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListHalfMonthlyJob.java @@ -1,8 +1,10 @@ package com.zcloud.fire.check.plan; import com.jjb.saas.framework.job.Job; +import com.jjb.saas.framework.job.annotation.JobRegister; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; import com.zcloud.fire.check.api.FireCheckListServiceI; import com.zcloud.fire.check.domain.enums.ListManagerCheckPeriodEnum; import lombok.RequiredArgsConstructor; @@ -15,18 +17,18 @@ import org.springframework.stereotype.Component; @Slf4j public class WaitFireCheckListHalfMonthlyJob implements Job { - @Autowired - private FireCheckListServiceI fireCheckListServiceI; + @Autowired + private FireCheckListServiceI fireCheckListServiceI; @Override - // @JobRegister(cron = "0 0 0 1,16 * ? ", jobDesc = "待排查消息提醒",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListHalfMonthlyJob") + @JobRegister(cron = "0 0 0 1,16 * ? ", jobDesc = "待排查消息提醒", triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListHalfMonthlyJob") public ReturnT execute(String param) { - log.info( "============待排查消息提醒(消防点检)==========开始"); - XxlJobHelper.log( "============待排查消息提醒(消防点检)==========开始"); + log.info("============待排查消息提醒(消防点检)==========开始"); + XxlJobHelper.log("============待排查消息提醒(消防点检)==========开始"); fireCheckListServiceI.waitFireCheckList(ListManagerCheckPeriodEnum.HALF_MONTH.getCode()); - log.info( "============待排查消息提醒(消防点检)==========结束"); + log.info("============待排查消息提醒(消防点检)==========结束"); return ReturnT.SUCCESS; } } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListHalfYearlyJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListHalfYearlyJob.java index cbf333c..66ed840 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListHalfYearlyJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListHalfYearlyJob.java @@ -1,8 +1,10 @@ package com.zcloud.fire.check.plan; import com.jjb.saas.framework.job.Job; +import com.jjb.saas.framework.job.annotation.JobRegister; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; import com.zcloud.fire.check.api.FireCheckListServiceI; import com.zcloud.fire.check.domain.enums.ListManagerCheckPeriodEnum; import lombok.RequiredArgsConstructor; @@ -15,18 +17,18 @@ import org.springframework.stereotype.Component; @Slf4j public class WaitFireCheckListHalfYearlyJob implements Job { - @Autowired - private FireCheckListServiceI fireCheckListServiceI; + @Autowired + private FireCheckListServiceI fireCheckListServiceI; @Override - // @JobRegister(cron = "0 5 0 1 1,7 ?", jobDesc = "待排查消息提醒",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListHalfYearlyJob") + @JobRegister(cron = "0 5 0 1 1,7 ?", jobDesc = "待排查消息提醒", triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListHalfYearlyJob") public ReturnT execute(String param) { - log.info( "============待排查消息提醒(消防点检)==========开始"); - XxlJobHelper.log( "============待排查消息提醒(消防点检)==========开始"); + log.info("============待排查消息提醒(消防点检)==========开始"); + XxlJobHelper.log("============待排查消息提醒(消防点检)==========开始"); fireCheckListServiceI.waitFireCheckList(ListManagerCheckPeriodEnum.HALF_YEAR.getCode()); - log.info( "============待排查消息提醒(消防点检)==========结束"); + log.info("============待排查消息提醒(消防点检)==========结束"); return ReturnT.SUCCESS; } } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListMonthlyJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListMonthlyJob.java index 16e6ac0..b49456d 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListMonthlyJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListMonthlyJob.java @@ -1,8 +1,10 @@ package com.zcloud.fire.check.plan; import com.jjb.saas.framework.job.Job; +import com.jjb.saas.framework.job.annotation.JobRegister; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; import com.zcloud.fire.check.api.FireCheckListServiceI; import com.zcloud.fire.check.domain.enums.ListManagerCheckPeriodEnum; import lombok.RequiredArgsConstructor; @@ -15,18 +17,18 @@ import org.springframework.stereotype.Component; @Slf4j public class WaitFireCheckListMonthlyJob implements Job { - @Autowired - private FireCheckListServiceI fireCheckListServiceI; + @Autowired + private FireCheckListServiceI fireCheckListServiceI; @Override - // @JobRegister(cron = "0 5 0 1 * ?", jobDesc = "待排查消息提醒",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListMonthlyJob") + @JobRegister(cron = "0 5 0 1 * ?", jobDesc = "待排查消息提醒", triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListMonthlyJob") public ReturnT execute(String param) { - log.info( "============待排查消息提醒(消防点检)==========开始"); - XxlJobHelper.log( "============待排查消息提醒(消防点检)==========开始"); + log.info("============待排查消息提醒(消防点检)==========开始"); + XxlJobHelper.log("============待排查消息提醒(消防点检)==========开始"); fireCheckListServiceI.waitFireCheckList(ListManagerCheckPeriodEnum.MONTHLY.getCode()); - log.info( "============待排查消息提醒(消防点检)==========结束"); + log.info("============待排查消息提醒(消防点检)==========结束"); return ReturnT.SUCCESS; } } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListQuarterlyJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListQuarterlyJob.java index 846b4f2..0b85abd 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListQuarterlyJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListQuarterlyJob.java @@ -1,8 +1,10 @@ package com.zcloud.fire.check.plan; import com.jjb.saas.framework.job.Job; +import com.jjb.saas.framework.job.annotation.JobRegister; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; import com.zcloud.fire.check.api.FireCheckListServiceI; import com.zcloud.fire.check.domain.enums.ListManagerCheckPeriodEnum; import lombok.RequiredArgsConstructor; @@ -15,18 +17,18 @@ import org.springframework.stereotype.Component; @Slf4j public class WaitFireCheckListQuarterlyJob implements Job { - @Autowired - private FireCheckListServiceI fireCheckListServiceI; + @Autowired + private FireCheckListServiceI fireCheckListServiceI; @Override - // @JobRegister(cron = "0 5 0 1 1,4,7,10 ?", jobDesc = "待排查消息提醒",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListQuarterlyJob") + @JobRegister(cron = "0 5 0 1 1,4,7,10 ?", jobDesc = "待排查消息提醒", triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListQuarterlyJob") public ReturnT execute(String param) { - log.info( "============待排查消息提醒(消防点检)==========开始"); - XxlJobHelper.log( "============待排查消息提醒(消防点检)==========开始"); + log.info("============待排查消息提醒(消防点检)==========开始"); + XxlJobHelper.log("============待排查消息提醒(消防点检)==========开始"); fireCheckListServiceI.waitFireCheckList(ListManagerCheckPeriodEnum.QUARTERLY.getCode()); - log.info( "============待排查消息提醒(消防点检)==========结束"); + log.info("============待排查消息提醒(消防点检)==========结束"); return ReturnT.SUCCESS; } } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListWeeklyJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListWeeklyJob.java index 88a1ab6..c451989 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListWeeklyJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListWeeklyJob.java @@ -4,6 +4,7 @@ import com.jjb.saas.framework.job.Job; import com.jjb.saas.framework.job.annotation.JobRegister; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; import com.zcloud.fire.check.api.FireCheckListServiceI; import com.zcloud.fire.check.domain.enums.ListManagerCheckPeriodEnum; import lombok.RequiredArgsConstructor; @@ -20,8 +21,8 @@ public class WaitFireCheckListWeeklyJob implements Job { private FireCheckListServiceI fireCheckListServiceI; @Override -// @JobRegister(cron = "0 5 0 ? * MON", jobDesc = "待排查消息提醒",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListYearlyJob") + @JobRegister(cron = "0 5 0 ? * MON", jobDesc = "待排查消息提醒",triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListWeeklyJob") public ReturnT execute(String param) { log.info( "============待排查消息提醒(消防点检)==========开始"); diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListYearlyJob.java b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListYearlyJob.java index 94e38df..de29c62 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListYearlyJob.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/plan/WaitFireCheckListYearlyJob.java @@ -1,8 +1,10 @@ package com.zcloud.fire.check.plan; import com.jjb.saas.framework.job.Job; +import com.jjb.saas.framework.job.annotation.JobRegister; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; import com.zcloud.fire.check.api.FireCheckListServiceI; import com.zcloud.fire.check.domain.enums.ListManagerCheckPeriodEnum; import lombok.RequiredArgsConstructor; @@ -15,18 +17,18 @@ import org.springframework.stereotype.Component; @Slf4j public class WaitFireCheckListYearlyJob implements Job { - @Autowired - private FireCheckListServiceI fireCheckListServiceI; + @Autowired + private FireCheckListServiceI fireCheckListServiceI; @Override - // @JobRegister(cron = "0 5 0 1 1 ?", jobDesc = "待排查消息提醒",triggerStatus = 1) -// @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListYearlyJob") + @JobRegister(cron = "0 5 0 1 1 ?", jobDesc = "待排查消息提醒", triggerStatus = 1) + @XxlJob("com.zcloud.fire.check.plan.WaitFireCheckListYearlyJob") public ReturnT execute(String param) { - log.info( "============待排查消息提醒(消防点检)==========开始"); - XxlJobHelper.log( "============待排查消息提醒(消防点检)==========开始"); + log.info("============待排查消息提醒(消防点检)==========开始"); + XxlJobHelper.log("============待排查消息提醒(消防点检)==========开始"); fireCheckListServiceI.waitFireCheckList(ListManagerCheckPeriodEnum.YEARLY.getCode()); - log.info( "============待排查消息提醒(消防点检)==========结束"); + log.info("============待排查消息提醒(消防点检)==========结束"); return ReturnT.SUCCESS; } } diff --git a/web-app/pom.xml b/web-app/pom.xml index 3b9010a..d4d7eaf 100644 --- a/web-app/pom.xml +++ b/web-app/pom.xml @@ -21,6 +21,9 @@ com.zcloud.fire.check web-infrastructure - + + com.alibaba.cloud + spring-cloud-starter-stream-rocketmq + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java index f2fd89c..b11f0d6 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java @@ -1,6 +1,12 @@ package com.zcloud.fire.check.command; +import cn.hutool.json.JSONUtil; +import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.exception.BizException; +import com.alibaba.fastjson.JSONObject; +import com.jjb.saas.message.client.message.facede.MessageFacade; +import com.jjb.saas.message.client.message.request.MessageSendCmd; +import com.jjb.saas.message.client.message.request.MessageTargetCmd; import com.zcloud.fire.check.domain.gateway.FireCheckListGateway; import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway; import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway; @@ -8,13 +14,25 @@ import com.zcloud.fire.check.domain.model.FireCheckListE; import com.zcloud.fire.check.domain.model.FireCheckListItemE; import com.zcloud.fire.check.domain.model.FireCheckListUserE; import com.zcloud.fire.check.dto.FireCheckListAddCmd; +import com.zcloud.fire.check.persistence.dataobject.UserDO; import com.zcloud.fire.check.persistence.repository.FireCheckListRepository; +import com.zcloud.fire.check.persistence.repository.UserRepository; +import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil; +import com.zcloud.gbscommon.todolistmq.event.TodoListAddBatchEvent; +import com.zcloud.gbscommon.todolistmq.event.TodoListAddEvent; +import com.zcloud.gbscommon.utils.UuidUtil; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** @@ -25,12 +43,16 @@ import java.util.List; */ @Component @AllArgsConstructor +@Slf4j public class FireCheckListAddExe { private final FireCheckListGateway fireCheckListGateway; private final FireCheckListRepository fireCheckListRepository; private final FireCheckListItemGateway fireCheckListItemGateway; private final FireCheckListUserGateway fireCheckListUserGateway; - + private final TodoListEventPusherUtil todoListEventPusherUtil; + private final UserRepository userRepository; + @DubboReference + private MessageFacade messageFacade; @Transactional(rollbackFor = Exception.class) public boolean execute(FireCheckListAddCmd cmd) { //可以是多个负责人 @@ -60,6 +82,47 @@ public class FireCheckListAddExe { } }); //TODO 消息提醒 + try{ + List userDOList = userRepository.getListById(cmd.getUserIdList()); + Map userNameMap = userDOList.stream() + .collect(Collectors.toMap( + UserDO::getId, + UserDO::getName)); + List todoListAddEventList = new ArrayList<>(); + cmd.getUserIdList().forEach(userId -> { + MessageSendCmd messageSendCmd = new MessageSendCmd(); + messageSendCmd.setBusinessId(UuidUtil.get32UUID()); + MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); + messageTargetCmd.setUserId(userId); + messageSendCmd.setTargetCmd(messageTargetCmd); + messageSendCmd.setSourceCode("MS000103"); + messageSendCmd.setNeedTokenEnum(false); + Map sendParams = new HashMap(); + sendParams.put("FirefightinglistName", cmd.getFireCheckName()); + sendParams.put("checkPeriod", cmd.getFireCheckTypeName()); + messageSendCmd.setParams(sendParams); + log.info("创建清单,提醒发送消息参数:messageSendCmd: {}", JSONUtil.toJsonStr(messageSendCmd)); + SingleResponse d = messageFacade.send(messageSendCmd); + log.info("创建清单,超期提醒发送消息结果:d: {}", JSONUtil.toJsonStr(d)); + //待排查 待办 + TodoListAddEvent event = new TodoListAddEvent(); + event.setTitle(userNameMap.get(userId) + "-待排查"); + event.setContent("您有一条[" + cmd.getFireCheckName() + "(" + cmd.getFireCheckTypeName() + ")】待检查，请您及时排查，避免超期。"); + event.setForeignKey(fireCheckListE.getId()); // 业务表ID -申请 + event.setForeignSubsidiaryKey(fireCheckListE.getId()); // 业务附表ID 没有附表时为foreignKey的值 + event.setReceiveUser(userId);// user表ID + event.setPcFlag(0); // 是否PC端待办 1是 0否 + event.setAppFlag(1); // 是否APP端待办 1是 0否 + event.setOtherParams(new JSONObject()); + todoListAddEventList.add(event); + }); + + TodoListAddBatchEvent event3 = new TodoListAddBatchEvent(); + event3.setTodoListAddEventList(new ArrayList<>()); + todoListEventPusherUtil.sendMessageAddBatchEvent(event3); + }catch (Exception e){ + log.error("发送消息异常",e); + } return true; } } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUpdateExe.java index 24c2d43..8f09912 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUpdateExe.java @@ -13,6 +13,8 @@ import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO; import com.zcloud.fire.check.persistence.repository.FireCheckListItemRepository; import com.zcloud.fire.check.persistence.repository.FireCheckListRepository; import com.zcloud.fire.check.persistence.repository.FireCheckListUserRepository; +import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil; +import com.zcloud.gbscommon.todolistmq.event.TodoListDeleteEvent; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -36,6 +38,7 @@ public class FireCheckListUpdateExe { private final FireCheckListItemRepository fireCheckListItemRepository; private final FireCheckListUserRepository fireCheckListUserRepository; private final FireCheckListUserGateway fireCheckListUserGateway; + private final TodoListEventPusherUtil todoListEventPusherUtil; @Transactional(rollbackFor = Exception.class) public void execute(FireCheckListUpdateCmd fireCheckListUpdateCmd) { @@ -82,6 +85,12 @@ public class FireCheckListUpdateExe { if (!res) { throw new BizException("修改失败"); } + if(fireCheckListUpdateStateCmd.getState() == 2){ + //删除清单 + TodoListDeleteEvent event2 = new TodoListDeleteEvent(); + event2.setForeignSubsidiaryKey(fireCheckListUpdateStateCmd.getId());// 业务附表ID 没有附表时为foreignKey的值 + todoListEventPusherUtil.sendMessageDeleteEvent(event2); + } } } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordAddExe.java index 8297695..a8779cc 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordAddExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordAddExe.java @@ -19,10 +19,14 @@ import com.zcloud.fire.check.dto.FireCheckRecordUserAddCmd; import com.zcloud.fire.check.dto.clientobject.CorpStatisticsCO; import com.zcloud.fire.check.dto.clientobject.FireCheckRecordCO; import com.zcloud.fire.check.dto.clientobject.FireCheckRecordPointCO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO; import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDO; import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordHiddenDO; +import com.zcloud.fire.check.persistence.repository.FireCheckListRepository; import com.zcloud.fire.check.persistence.repository.FireCheckRecordHiddenRepository; import com.zcloud.fire.check.persistence.repository.FireCheckRecordRepository; +import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil; +import com.zcloud.gbscommon.todolistmq.event.TodoListCompleteEvent; import com.zcloud.gbscommon.zcloudhidden.face.ZcloudHiddenFacade; import com.zcloud.gbscommon.zcloudhidden.request.HiddenAddCmd; import lombok.AllArgsConstructor; @@ -55,6 +59,8 @@ public class FireCheckRecordAddExe { private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository; @DubboReference private final ZcloudHiddenFacade zcloudHiddenFacade; + private final TodoListEventPusherUtil todoListEventPusherUtil; + private final FireCheckListRepository fireCheckListRepository; @Transactional(rollbackFor = Exception.class) public boolean execute(FireCheckRecordAddCmd cmd) { @@ -118,6 +124,15 @@ public class FireCheckRecordAddExe { FireCheckRecordCO fireCheckRecordCO = new FireCheckRecordCO(); BeanUtils.copyProperties(fireCheckRecordDO, fireCheckRecordCO); + try{ + ; + FireCheckListDO fireCheckListDO = fireCheckListRepository.getInfoByUUId(fireCheckRecordDO.getFireCheckId()); + TodoListCompleteEvent event1 = new TodoListCompleteEvent(); + event1.setForeignSubsidiaryKey(fireCheckListDO.getId());// 业务附表ID 没有附表时为foreignKey的值 + todoListEventPusherUtil.sendMessageCompleteEvent(event1); + }catch (Exception e){ + log.error("发送待办消息失败",e); + } return fireCheckRecordCO; } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java index f941f97..879a3c4 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java @@ -4,8 +4,13 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.exception.BizException; +import com.alibaba.fastjson.JSONObject; import com.jjb.saas.framework.auth.utils.AuthContext; +import com.jjb.saas.message.client.message.facede.MessageFacade; +import com.jjb.saas.message.client.message.request.MessageSendCmd; +import com.jjb.saas.message.client.message.request.MessageTargetCmd; import com.zcloud.fire.check.command.convertor.*; import com.zcloud.fire.check.domain.enums.HiddenCheckTypeEnum; import com.zcloud.fire.check.domain.model.FireCheckListE; @@ -14,7 +19,12 @@ import com.zcloud.fire.check.dto.clientobject.*; import com.zcloud.fire.check.persistence.FireCheckPointListDO; import com.zcloud.fire.check.persistence.dataobject.*; import com.zcloud.fire.check.persistence.repository.*; +import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil; +import com.zcloud.gbscommon.todolistmq.event.TodoListAddBatchEvent; +import com.zcloud.gbscommon.todolistmq.event.TodoListAddEvent; +import com.zcloud.gbscommon.todolistmq.event.TodoListDeleteEvent; import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.UuidUtil; import com.zcloud.gbscommon.zcloudhidden.face.ZcloudHiddenFacade; import com.zcloud.gbscommon.zcloudhidden.request.HiddenStatisticsQry; import com.zcloud.gbscommon.zcloudhidden.response.HiddenListCO; @@ -57,9 +67,12 @@ public class FireCheckListQueryExe { private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository; private final FireCheckRecordHiddenCoConvertor fireCheckRecordHiddenCoConvertor; private final FireCheckListUserCoConvertor fireCheckListUserCoConvertor; - + private final TodoListEventPusherUtil todoListEventPusherUtil; + private final UserRepository userRepository; @DubboReference private ZcloudHiddenFacade zcloudHiddenFacade; + @DubboReference + private MessageFacade messageFacade; /** * 分页 @@ -541,18 +554,43 @@ public class FireCheckListQueryExe { List fireCheckIdList = noFinishedCheckList.stream().map(FireCheckListDO::getFireCheckId).collect(Collectors.toList()); //查找所有负责人 List fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList); - //fireCheckListUserDOList转换为key value map - /*Map fireCheckListUserDONameMap = fireCheckListUserDOList.stream() - .collect(Collectors.groupingBy( - FireCheckListUserDO::getFireCheckId, - Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(","))));*/ + Map> fireCheckListUserDONameMap = fireCheckListUserDOList.stream() + .collect(Collectors.groupingBy( + FireCheckListUserDO::getFireCheckId, + Collectors.mapping(FireCheckListUserDO::getUserId, Collectors.toList()))); noFinishedCheckList.forEach(info->{ //TODO 进行超期 提醒 /** * 清单负责人-待检查 * "您有一条【点检表名称（排查周期）】已超期，请尽快处理。" */ + try{ + for (Long userId : fireCheckListUserDONameMap.get(info.getFireCheckId())) { + MessageSendCmd messageSendCmd = new MessageSendCmd(); + messageSendCmd.setBusinessId(UuidUtil.get32UUID()); + MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); + messageTargetCmd.setUserId(userId); + messageSendCmd.setTargetCmd(messageTargetCmd); + messageSendCmd.setSourceCode("MS000104"); + messageSendCmd.setNeedTokenEnum(false); + Map sendParams = new HashMap(); + sendParams.put("FirefightinglistName", info.getFireCheckName()); + sendParams.put("checkPeriod", info.getFireCheckTypeName()); + messageSendCmd.setParams(sendParams); + log.info("超期提醒发送消息参数:messageSendCmd: {}", JSONUtil.toJsonStr(messageSendCmd)); + SingleResponse d = messageFacade.send(messageSendCmd); + log.info("超期提醒发送消息结果:d: {}", JSONUtil.toJsonStr(d)); + } + //删除代办 + TodoListDeleteEvent event2 = new TodoListDeleteEvent(); + event2.setForeignSubsidiaryKey(info.getId());// 业务附表ID 没有附表时为foreignKey的值 + log.info("删除待办,请求：{}",info.getId()); + boolean b = todoListEventPusherUtil.sendMessageDeleteEvent(event2); + log.info("删除待办,结果：{}",b); + }catch (Exception e){ + log.error("发送消息异常",e); + } }); } @@ -562,22 +600,63 @@ public class FireCheckListQueryExe { List fireCheckIdList = waitCheckList.stream().map(FireCheckListDO::getFireCheckId).collect(Collectors.toList()); //查找所有负责人 List fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList); - //fireCheckListUserDOList转换为key value map - /*Map fireCheckListUserDONameMap = fireCheckListUserDOList.stream() + + Map> fireCheckListUserDONameMap = fireCheckListUserDOList.stream() .collect(Collectors.groupingBy( FireCheckListUserDO::getFireCheckId, - Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(","))));*/ - waitCheckList.forEach(info->{ - //TODO 未完成 提醒 + Collectors.mapping(FireCheckListUserDO::getUserId, Collectors.toList()))); + for (FireCheckListDO info : waitCheckList) { + //TODO 待排查 提醒 /** * 清单负责人-待检查 * "您有一条【点检表名称（排查周期）】已超期，请尽快处理。" */ + if (CollUtil.isEmpty(fireCheckListUserDONameMap.get(info.getFireCheckId()))) { + continue; + } + try { + List userDOList = userRepository.getListById(fireCheckListUserDONameMap.get(info.getFireCheckId())); + Map userNameMap = userDOList.stream() + .collect(Collectors.toMap( + UserDO::getId, + UserDO::getName)); + List todoListAddEventList = new ArrayList<>(); + for (Long userId : fireCheckListUserDONameMap.get(info.getFireCheckId())) { + MessageSendCmd messageSendCmd = new MessageSendCmd(); + messageSendCmd.setBusinessId(UuidUtil.get32UUID()); + MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); + messageTargetCmd.setUserId(userId); + messageSendCmd.setTargetCmd(messageTargetCmd); + messageSendCmd.setSourceCode("MS000103"); + messageSendCmd.setNeedTokenEnum(false); + Map sendParams = new HashMap(); + sendParams.put("FirefightinglistName", info.getFireCheckName()); + sendParams.put("checkPeriod", info.getFireCheckTypeName()); + messageSendCmd.setParams(sendParams); + log.info("待排查提醒发送消息参数:messageSendCmd: {}", JSONUtil.toJsonStr(messageSendCmd)); + SingleResponse d = messageFacade.send(messageSendCmd); + log.info("待排查提醒发送消息结果:d: {}", JSONUtil.toJsonStr(d)); - }); - - + //待排查 待办 + TodoListAddEvent event = new TodoListAddEvent(); + event.setTitle(userNameMap.get(userId) + "-待排查"); + event.setContent("您有一条[" + info.getFireCheckName() + "(" + info.getFireCheckTypeName() + ")】待检查，请您及时排查，避免超期。"); + event.setForeignKey(info.getId()); // 业务表ID -申请 + event.setForeignSubsidiaryKey(info.getId()); // 业务附表ID 没有附表时为foreignKey的值 + event.setReceiveUser(userId);// user表ID + event.setPcFlag(0); // 是否PC端待办 1是 0否 + event.setAppFlag(1); // 是否APP端待办 1是 0否 + event.setOtherParams(new JSONObject()); + todoListAddEventList.add(event); + } + TodoListAddBatchEvent event3 = new TodoListAddBatchEvent(); + event3.setTodoListAddEventList(new ArrayList<>()); + todoListEventPusherUtil.sendMessageAddBatchEvent(event3); + } catch (Exception e) { + log.error("发送消息异常", e); + } + } } } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListGatewayImpl.java index 1c4103b..e6de3fa 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListGatewayImpl.java @@ -38,6 +38,7 @@ public class FireCheckListGatewayImpl implements FireCheckListGateway { FireCheckListDO d = new FireCheckListDO(); BeanUtils.copyProperties(fireCheckListE, d); fireCheckListRepository.save(d); + fireCheckListE.setId(d.getId()); return true; } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java index 8d4009e..b76ef37 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java @@ -43,5 +43,7 @@ public interface FireCheckListRepository extends BaseRepository List waitFireCheckList(String checkType); List overTimeRecord(@Param("params") Map params); + + FireCheckListDO getInfoByUUId(String fireCheckId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/UserRepository.java index bfc7b87..35e4c1e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/UserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/UserRepository.java @@ -14,5 +14,7 @@ import java.util.List; public interface UserRepository extends BaseRepository { List listByCorpinfoId(Long corpinfoId); + + List getListById(List longs); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java index 87fa02a..dfde360 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java @@ -189,5 +189,12 @@ public class FireCheckListRepositoryImpl extends BaseRepositoryImpl result = fireCheckListMapper.overTimeRecord(params); return result; } + + @Override + public FireCheckListDO getInfoByUUId(String fireCheckId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_check_id", fireCheckId); + return fireCheckListMapper.selectOne(queryWrapper); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/UserRepositoryImpl.java index c7dc4b0..5697000 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/UserRepositoryImpl.java @@ -26,5 +26,12 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i queryWrapper.eq("corpinfo_id", corpinfoId); return list(queryWrapper); } + + @Override + public List getListById(List longs) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", longs); + return list(queryWrapper); + } }