From 09a61ca5857ecaa6918f2e0c942e2f0f1f4aa830 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 28 二月 2022 16:06:53 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 3 +++
dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java | 13 +++++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 15 ++++++++++++---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java | 1 +
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java | 8 ++++----
5 files changed, 33 insertions(+), 7 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 c47d3c9..961bfcf 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
@@ -92,4 +92,17 @@
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+
+ /**
+ * led灞忓箷寮�鍏�
+ */
+ @TableField(exist = false)
+ private Boolean isOpen;
+
+ /*
+ * 鐏潌鍚嶇О
+ */
+ @TableField(exist = false)
+ private String streetlightName;
+
}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
index 0e4e7ed..826bcbd 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
@@ -11,6 +11,7 @@
* @Author liuhaonan
* @Date 2021/12/22 15:27
* @Version 1.0
+ * 璇虹摝璁惧
*/
@Service
@AllArgsConstructor
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 aaa77c5..c9b6746 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
@@ -27,7 +27,9 @@
import java.io.IOException;
import java.util.*;
-
+/**
+ * 鐔欒璁惧
+ */
@Service
@EnableCaching
public class PoleLightemitService extends BaseServiceImpl<PoleLightemitEntityMapper, PoleLightemitEntity> {
@@ -180,12 +182,19 @@
}
*/
-/* public void ledOnlineCheck(List<PoleLightemitEntity> list) {
+
+
+ public List<PoleLightemitEntity> ledOnlineCheck(List<PoleLightemitEntity> list) {
+ List<PoleLightemitEntity> onLineList=new ArrayList<>();
for(PoleLightemitEntity poleLightemitEntity : list){
poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
+ if(poleLightemitEntity.getIsOpen()){
+ onLineList.add(poleLightemitEntity);
+ }
}
- }*/
+ return onLineList;
+ }
public void savePoleLightemit(PoleLightemitEntity poleLightemit) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
index 3fe82b5..51b248f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -21,6 +21,9 @@
import java.util.*;
+/**
+ * 鐔欒鑺傜洰
+ */
@Service
@AllArgsConstructor
public class XiXunPlayerService extends BaseServiceImpl<PoleXixunPlayerEntityMapper, PoleXixunPlayerEntity> {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
index c4e4bf3..b01c089 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
@@ -32,10 +32,10 @@
private OkHttpClient client = new OkHttpClient();
-// public void init(){
-// //閲嶆柊鑾峰彇鍗曚緥
-// poleLightemitService = applicationContext.getBean(PoleLightemitService.class);
-// }
+ public void init(){
+ //閲嶆柊鑾峰彇鍗曚緥
+ poleLightemitService = applicationContext.getBean(PoleLightemitService.class);
+ }
/**
* post璇锋眰灏佽鏂规硶
--
Gitblit v1.9.3