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-25 17:14:20 +08:00
parent 59339cc59e
commit 1629688cd4
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ public class FrontierProtectionDevServiceImpl extends ServiceImpl<FrontierProtec
String projectSn = MapUtils.getString(paramMap, "projectSn");
CountFrontierProtectionVo vo = frontierProtectionDevAlarmMapper.countFrontierProtectionDev(paramMap);
vo.setDeviceNum(Math.toIntExact(frontierProtectionDevMapper.selectCount(new LambdaQueryWrapper<FrontierProtectionDev>()
.eq(FrontierProtectionDev::getProjectSn, projectSn)));
.eq(FrontierProtectionDev::getProjectSn, projectSn))));
vo.setOnlineNum(vo.getDeviceNum());
vo.setOfflineNum(0);
int count =(int) frontierProtectionDevAlarmService.count(new LambdaQueryWrapper<FrontierProtectionDevAlarm>()

2
src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java
View File

@ -35,6 +35,8 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import java.time.LocalTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

1
src/main/java/com/zhgd/xmgl/task/MessageDevRuleTask.java
View File

@ -28,6 +28,7 @@ import com.zhgd.xmgl.modules.xz.entity.XzAiDeductRule;
import com.zhgd.xmgl.modules.xz.service.IXzAiDeductRuleService;
import lombok.extern.slf4j.Slf4j;
import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Scheduled;