From a8aff82baef60ef185041309355edb8e6661299c Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 1 Apr 2024 11:23:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=BD=93=E5=A4=A9?= =?UTF-8?q?=E5=B7=B2=E5=B7=A1=E6=9F=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yxgh/df/controller/DfPlanController.java | 8 ++++++++ .../com/kms/yxgh/df/service/DfPlanService.java | 14 ++++++++++++++ .../kms/yxgh/sz/controller/SzPlanController.java | 7 +++++++ .../com/kms/yxgh/sz/service/SzPlanService.java | 15 +++++++++++++++ 4 files changed, 44 insertions(+) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java index 6dbe06a8..ef1c0f01 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java @@ -102,4 +102,12 @@ public class DfPlanController { public Response> addPoints(@PathVariable("id") String id) { return Response.ok(dfPlanService.getPoints(id)); } + + //当天已巡查 + @ApiOperation("堤防巡视检查计划当天已巡查") + @Log(title = "堤防巡视检查计划当天已巡查", businessType = BusinessType.SEARCH) + @GetMapping("/today/{id}") + public Response today(@PathVariable("id") String id) { + return Response.ok(dfPlanService.today(id)); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index e4fa75f6..f18886cc 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -28,6 +28,9 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.Date; import java.util.List; import java.util.function.Consumer; @@ -200,5 +203,16 @@ public class DfPlanService extends BaseService { return this.getBaseMapper().selectCount(wp) > 0; } + //获取当天零点时间 + private Date getZeroTime() { + return Date.from(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant()); + } + + public Boolean today(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfRecord::getPlanId, id) + .eq(DfRecord::getCreateTime, getZeroTime()); + return dfRecordMapper.selectCount(wp) > 0; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java index 7ac6a55f..9279c010 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java @@ -96,4 +96,11 @@ public class SzPlanController { public Response> addPoints(@PathVariable("id") String id) { return Response.ok(szPlanService.getPoints(id)); } + + //当天已巡查 + @ApiOperation("水闸巡视检查计划当天已巡查") + @GetMapping("/today/{id}") + public Response today(@PathVariable("id") String id) { + return Response.ok(szPlanService.today(id)); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java index 17fd41b7..11c7bb83 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java @@ -28,6 +28,9 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.Date; import java.util.List; import java.util.function.Consumer; @@ -200,4 +203,16 @@ public class SzPlanService extends BaseService { .eq(SzPlan::getId, id); return this.getBaseMapper().selectCount(wp) > 0; } + + //获取当天零点时间 + private Date getZeroTime() { + return Date.from(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant()); + } + + public Boolean today(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(SzRecord::getPlanId, id) + .eq(SzRecord::getCreateTime, getZeroTime()); + return szCheckRecordMapper.selectCount(wp) > 0; + } }