admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

合并解决冲突或升级jdk17语法

Browse Source
This commit is contained in:
guoshengxiong 2025-10-23 10:40:52 +08:00
parent f5060c81a1
commit 9da505964a
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/frontier/controller/FrontierProtectionDevAlarmController.java
View File

@ -209,7 +209,7 @@ public class FrontierProtectionDevAlarmController {
@ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"),
}) })
@PostMapping(value = "/countAlarmType") @PostMapping(value = "/countAlarmType")
public Result<SectorVo> countAlarmType(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) { public Result<SectorVo> countAlarmType(@Parameter(hidden = true) @RequestBody HashMap<String, Object> paramMap) {
ArrayList<SectorOneVo> list = frontierProtectionDevAlarmService.countAlarmType(paramMap); ArrayList<SectorOneVo> list = frontierProtectionDevAlarmService.countAlarmType(paramMap);
return Result.success(SectorVo.getSectorVoByEnum(list, ParamEnum.FrontierProtectionDevAlarmTypeEnum.values(), false)); return Result.success(SectorVo.getSectorVoByEnum(list, ParamEnum.FrontierProtectionDevAlarmTypeEnum.values(), false));
} }

2
src/main/java/com/zhgd/xmgl/modules/frontier/service/IFrontierProtectionDevAlarmService.java
View File

@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.frontier.entity.vo.CountFrontierProtectionDevAlarmVo; import com.zhgd.xmgl.modules.frontier.entity.vo.CountFrontierProtectionDevAlarmVo;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

2
src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevAlarmServiceImpl.java
View File

@ -20,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;

4
src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevServiceImpl.java
View File

@ -96,13 +96,13 @@ public class FrontierProtectionDevServiceImpl extends ServiceImpl<FrontierProtec
.eq(FrontierProtectionDev::getProjectSn, projectSn)))); .eq(FrontierProtectionDev::getProjectSn, projectSn))));
vo.setOnlineNum(vo.getDeviceNum()); vo.setOnlineNum(vo.getDeviceNum());
vo.setOfflineNum(0); vo.setOfflineNum(0);
int count = frontierProtectionDevAlarmService.count(new LambdaQueryWrapper<FrontierProtectionDevAlarm>() int count = (int) frontierProtectionDevAlarmService.count(new LambdaQueryWrapper<FrontierProtectionDevAlarm>()
.eq(FrontierProtectionDevAlarm::getProjectSn, projectSn) .eq(FrontierProtectionDevAlarm::getProjectSn, projectSn)
.ge(FrontierProtectionDevAlarm::getAlarmTime, DateUtil.formatDateTime(DateUtil.beginOfDay(new Date()))) .ge(FrontierProtectionDevAlarm::getAlarmTime, DateUtil.formatDateTime(DateUtil.beginOfDay(new Date())))
.le(FrontierProtectionDevAlarm::getAlarmTime, DateUtil.formatDateTime(DateUtil.endOfDay(new Date()))) .le(FrontierProtectionDevAlarm::getAlarmTime, DateUtil.formatDateTime(DateUtil.endOfDay(new Date())))
); );
vo.setAlarmNumToday(count); vo.setAlarmNumToday(count);
int count1 = frontierProtectionDevAlarmService.count(new LambdaQueryWrapper<FrontierProtectionDevAlarm>() int count1 = (int) frontierProtectionDevAlarmService.count(new LambdaQueryWrapper<FrontierProtectionDevAlarm>()
.eq(FrontierProtectionDevAlarm::getProjectSn, projectSn) .eq(FrontierProtectionDevAlarm::getProjectSn, projectSn)
.ge(FrontierProtectionDevAlarm::getAlarmTime, DateUtil.formatDateTime(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -1)))) .ge(FrontierProtectionDevAlarm::getAlarmTime, DateUtil.formatDateTime(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -1))))
.le(FrontierProtectionDevAlarm::getAlarmTime, DateUtil.formatDateTime(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), -1)))) .le(FrontierProtectionDevAlarm::getAlarmTime, DateUtil.formatDateTime(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), -1))))