From 7e6bcf78c99a507454a07000b00e86ab1f9213c8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 14 三月 2022 10:14:57 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 15 +++++++++------
dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java | 3 +++
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
index 961bfcf..2beb140 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
@@ -85,6 +85,9 @@
@TableField(exist = false)
private Long streetlightId;
+ @TableField(exist = false)
+ private String poleName;
+
/**
*
*/
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index 257dff5..607b135 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -17,6 +17,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.admin.utils.LightemitUtils;
+import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
@@ -42,6 +43,7 @@
private final LightemitUtils lightemitUtils;
private final LedScheduleService scheduleService;
private final PoleBindingService bindingService;
+ private final PoleService poleService;
// private final ListPageUtil listPageUtil;
/**
@@ -229,10 +231,10 @@
if (isOnLine) {
List<PoleLightemitEntity> results = poleLightemitService.ledOnline(list);
results.forEach(
- led->{
+ led -> {
bindings.forEach(
- bind->{
- if(bind.getDeviceCode()!=null&&led.getLightemitControlCode()==bind.getDeviceCode()){
+ bind -> {
+ if (bind.getDeviceCode() != null && led.getLightemitControlCode() == bind.getDeviceCode()) {
led.setStreetlightId(bind.getPoleId());
}
}
@@ -250,11 +252,12 @@
} else {
poleLightemitService.ledOnlineCheck(list);
list.forEach(
- led->{
+ led -> {
bindings.forEach(
- bind->{
- if(bind.getDeviceCode()!=null&&led.getLightemitControlCode().equals(bind.getDeviceCode())){
+ bind -> {
+ if (bind.getDeviceCode() != null && led.getLightemitControlCode().equals(bind.getDeviceCode())) {
led.setStreetlightId(bind.getPoleId());
+ led.setPoleName(poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, bind.getPoleId())).getPoleName());
}
}
);
--
Gitblit v1.9.3