From dadc7e65322eb58032b09d7a87d428c280856fd5 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 14 三月 2022 11:49:45 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
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 90324d1..3989271 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
@@ -15,11 +15,10 @@
import com.sandu.ximon.admin.param.SetScreenOpenParam;
import com.sandu.ximon.admin.param.SetVolumeParam;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.service.ClientService;
-import com.sandu.ximon.admin.service.LedScheduleService;
-import com.sandu.ximon.admin.service.PoleLightemitService;
-import com.sandu.ximon.admin.service.XiXunPlayerService;
+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;
import com.sandu.ximon.dao.enums.AdministratorEnums;
@@ -43,6 +42,8 @@
private final PoleLightemitService poleLightemitService;
private final LightemitUtils lightemitUtils;
private final LedScheduleService scheduleService;
+ private final PoleBindingService bindingService;
+ private final PoleService poleService;
// private final ListPageUtil listPageUtil;
/**
@@ -225,9 +226,22 @@
}
);
}
+ List<PoleBinding> bindings = bindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceType, 1));
List<PoleLightemitEntity> list = poleLightemitService.list(wrapper);
- if(isOnLine){
+ if (isOnLine) {
List<PoleLightemitEntity> results = poleLightemitService.ledOnline(list);
+ results.forEach(
+ led -> {
+ bindings.forEach(
+ bind -> {
+ if (bind.getDeviceCode() != null && led.getLightemitControlCode() == bind.getDeviceCode()) {
+ led.setStreetlightId(bind.getPoleId());
+ led.setStreetlightName(poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, bind.getPoleId())).getPoleName());
+ }
+ }
+ );
+ }
+ );
CommonPage commonPage = CommonPage.restPage(results);
int size = results.size();
commonPage.setTotal((long) size);
@@ -236,9 +250,29 @@
commonPage.setTotalPage(size / baseConditionVO.getPageSize());
}
return ResponseUtil.success(commonPage);
- }else {
+ } else {
poleLightemitService.ledOnlineCheck(list);
- return ResponseUtil.success(list);
+ list.forEach(
+ led -> {
+ bindings.forEach(
+ bind -> {
+ if (bind.getDeviceCode() != null && led.getLightemitControlCode().equals(bind.getDeviceCode())) {
+ led.setStreetlightId(bind.getPoleId());
+ led.setStreetlightName(poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, bind.getPoleId())).getPoleName());
+ }
+ }
+ );
+ }
+ );
+ CommonPage commonPage = CommonPage.restPage(list);
+ int size = list.size();
+ commonPage.setTotal((long) size);
+ commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
+ if (size % baseConditionVO.getPageSize() == 0) {
+ commonPage.setTotalPage(size / baseConditionVO.getPageSize());
+ }
+ return ResponseUtil.success(commonPage);
+ // return ResponseUtil.success(list);
}
// return ResponseUtil.success(poleLightemitService.list(wrapper));
}
@@ -248,8 +282,8 @@
*/
@PostMapping("/setScreenOpen")
- public ResponseVO<Object> setScreenOpen(@RequestBody SetScreenOpenParam setScreenOpenEntity){
- if(setScreenOpenEntity.getIds() == null || setScreenOpenEntity.getIds().length == 0 || setScreenOpenEntity.getBool() == null){
+ public ResponseVO<Object> setScreenOpen(@RequestBody SetScreenOpenParam setScreenOpenEntity) {
+ if (setScreenOpenEntity.getIds() == null || setScreenOpenEntity.getIds().length == 0 || setScreenOpenEntity.getBool() == null) {
throw new BusinessException("鏈�夋嫨LED灞�");
}
Collection poleLightemitControllers = poleLightemitService.listByIds(Arrays.asList(setScreenOpenEntity.getIds()));
@@ -263,15 +297,15 @@
//缁撴灉鏌ヨ
String result = lightemitUtils.setScreenOpen(poleLightemitEntity.getLightemitControlCode(), setScreenOpenEntity.getBool());
- System.out.println("result:---------------------"+result);
- if(result.isEmpty() || !"true".equals(result)){
+ System.out.println("result:---------------------" + result);
+ if (result.isEmpty() || !"true".equals(result)) {
}
map.put(poleLightemitEntity.getLightemitId(), result);
}
return ResponseUtil.success(map);
- }else {
+ } else {
throw new BusinessException("鏈纭�夋嫨LED灞�");
}
}
--
Gitblit v1.9.3