diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/controller/FrontierProtectionDevAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/frontier/controller/FrontierProtectionDevAlarmController.java index 46b3c4da9..082df1058 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/controller/FrontierProtectionDevAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/controller/FrontierProtectionDevAlarmController.java @@ -209,7 +209,7 @@ public class FrontierProtectionDevAlarmController { @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"), }) @PostMapping(value = "/countAlarmType") - public Result countAlarmType(@ApiIgnore @RequestBody HashMap paramMap) { + public Result countAlarmType(@Parameter(hidden = true) @RequestBody HashMap paramMap) { ArrayList list = frontierProtectionDevAlarmService.countAlarmType(paramMap); return Result.success(SectorVo.getSectorVoByEnum(list, ParamEnum.FrontierProtectionDevAlarmTypeEnum.values(), false)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/service/IFrontierProtectionDevAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/frontier/service/IFrontierProtectionDevAlarmService.java index afaa8f284..405d83d9a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/service/IFrontierProtectionDevAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/service/IFrontierProtectionDevAlarmService.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.frontier.entity.vo.CountFrontierProtectionDevAlarmVo; import jakarta.servlet.http.HttpServletRequest; + +import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevAlarmServiceImpl.java index 050843b5e..c9802c77b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevAlarmServiceImpl.java @@ -20,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import jakarta.servlet.http.HttpServletRequest; + +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevServiceImpl.java index f86443405..9dd115a87 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevServiceImpl.java @@ -96,13 +96,13 @@ public class FrontierProtectionDevServiceImpl extends ServiceImpl() + int count = (int) frontierProtectionDevAlarmService.count(new LambdaQueryWrapper() .eq(FrontierProtectionDevAlarm::getProjectSn, projectSn) .ge(FrontierProtectionDevAlarm::getAlarmTime, DateUtil.formatDateTime(DateUtil.beginOfDay(new Date()))) .le(FrontierProtectionDevAlarm::getAlarmTime, DateUtil.formatDateTime(DateUtil.endOfDay(new Date()))) ); vo.setAlarmNumToday(count); - int count1 = frontierProtectionDevAlarmService.count(new LambdaQueryWrapper() + int count1 = (int) frontierProtectionDevAlarmService.count(new LambdaQueryWrapper() .eq(FrontierProtectionDevAlarm::getProjectSn, projectSn) .ge(FrontierProtectionDevAlarm::getAlarmTime, DateUtil.formatDateTime(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -1)))) .le(FrontierProtectionDevAlarm::getAlarmTime, DateUtil.formatDateTime(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), -1))))