From 874e9b0384e53f1a6b0bc24a10878753fc144411 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 13 四月 2022 18:34:36 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
index ced56c0..bb903df 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.gson.Gson;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
@@ -185,14 +186,7 @@
}
*/
- public List<PoleLightemitEntity> ledList() {
-// Wrappers.lambdaQuery()
- List<PoleLightemitEntity> list = list();
- return ledOnlineCheck(list);
- }
-
-
- public List<PoleLightemitEntity> ledOnlineCheck(List<PoleLightemitEntity> list) {
+ public List<PoleLightemitEntity> ledOnline(List<PoleLightemitEntity> list) {
List<PoleLightemitEntity> onLineList = new ArrayList<>();
for (PoleLightemitEntity poleLightemitEntity : list) {
poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
@@ -201,6 +195,33 @@
}
}
return onLineList;
+ }
+
+
+ public void ledOnlineCheck(List<PoleLightemitEntity> list) {
+ for (PoleLightemitEntity poleLightemitEntity : list) {
+ poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
+
+ }
+ }
+
+
+ /**
+ * 鏌ヨ鍗曚釜LED
+ * @param lightControlCode
+ * @return
+ */
+ public PoleLightemitEntity getLedByLightControlCode(String lightControlCode) {
+ PoleLightemitEntity xiXun = getOne(Wrappers.lambdaQuery(PoleLightemitEntity.class).eq(PoleLightemitEntity::getLightemitControlCode, lightControlCode));
+ if(xiXun==null){
+ return null;
+ }
+ String isScreenOpen = lightemitUtils.getIsScreenOpen(xiXun.getLightemitControlCode());
+ if(isScreenOpen.contains("true")){
+ xiXun.setIsOpen(true);
+ }
+ xiXun.setIsOpen(false);
+ return xiXun;
}
@@ -230,7 +251,7 @@
if (b && poleLightemit.getStreetlightId() != null) {
//鍏堝垹闄ょ粦瀹氬叧绯�
- poleBindingService.unBindPole(poleLightemit.getLightemitControlCode());
+ poleBindingService.unBindPole(null, poleLightemit.getLightemitControlCode());
//鍐嶇粦瀹�
PoleBindingParam poleBindingParam = new PoleBindingParam();
poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
@@ -545,6 +566,15 @@
public void setVolume(String lightemitControlCode, Integer volume) {
lightemitUtils.setVoiume(lightemitControlCode, volume);
}
+ /*
+ 鏍规嵁led灞忕紪鐮佽缃煶閲�
+ */
+
+ @Async("taskExecutor")
+ public void setBrightness(String lightemitControlCode, Integer brightness) {
+ lightemitUtils.setBrightness(lightemitControlCode, brightness);
+ }
+
// public List<PoleLightemitEntity> listOfStreetlight(String streetlightId) {
--
Gitblit v1.9.3