From 4d08f39afcf6f458373dfd26c47f06b191560f92 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 01 三月 2022 15:36:46 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 14 +++++++-------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 1 -
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 17 +++++++++--------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 21 +++++++++++----------
4 files changed, 27 insertions(+), 26 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..1dbff1b 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
@@ -226,7 +226,7 @@
);
}
List<PoleLightemitEntity> list = poleLightemitService.list(wrapper);
- if(isOnLine){
+ if (isOnLine) {
List<PoleLightemitEntity> results = poleLightemitService.ledOnline(list);
CommonPage commonPage = CommonPage.restPage(results);
int size = results.size();
@@ -236,7 +236,7 @@
commonPage.setTotalPage(size / baseConditionVO.getPageSize());
}
return ResponseUtil.success(commonPage);
- }else {
+ } else {
poleLightemitService.ledOnlineCheck(list);
return ResponseUtil.success(list);
}
@@ -248,8 +248,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 +263,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灞�");
}
}
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..fc94add 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
@@ -185,14 +185,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"));
@@ -204,6 +197,14 @@
}
+ public void ledOnlineCheck(List<PoleLightemitEntity> list) {
+ for (PoleLightemitEntity poleLightemitEntity : list) {
+ poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
+
+ }
+ }
+
+
public void savePoleLightemit(PoleLightemitEntity poleLightemit) {
boolean save = this.save(poleLightemit);
// 缁戝畾鐏潌
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index b2fe1a5..b64c155 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -35,7 +35,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
index f64b1b9..fb78b52 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
@@ -30,11 +30,11 @@
@AllArgsConstructor
public class VnnoxService {
- // @Autowired
+ // @Autowired
private VnnoxAPIUtil vnnoxAPIUtil;
- // @Autowired
+ // @Autowired
private RedisUtils redisUtils;
- // @Autowired
+ // @Autowired
private LedPlayerEntityService ledPlayerEntityService;
/**
@@ -44,7 +44,7 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public LedV2RegisterResultEntity validateSN(String name,String sn) throws URISyntaxException {
+ public LedV2RegisterResultEntity validateSN(String name, String sn) throws URISyntaxException {
LedV2RegisterResultEntity ledV2RegisterResultEntity = new LedV2RegisterResultEntity();
// 鍒ゆ柇鏁版嵁搴撴槸鍚﹀瓨鍦紝鑻ヤ笉瀛樺湪锛屽垽鏂槸鍚﹀凡缁忔敞鍐屽埌Vnnox鏈嶅姟鍣�
@@ -61,13 +61,13 @@
Integer limit = 100;
List<VnnoxPlayerResponse> playerList;
// 鑾峰彇Vnnox鏈嶅姟鍣ㄥ垪琛�
- VnnoxPlayerListResponse response = vnnoxAPIUtil.getPlayerList(limit, page,name);
+ VnnoxPlayerListResponse response = vnnoxAPIUtil.getPlayerList(limit, page, name);
playerList = response.getRows();
Integer total = response.getTotal() - limit;
while (total > 0) {
page = page + 1;
total = total - limit;
- response = vnnoxAPIUtil.getPlayerList(limit, page,name);
+ response = vnnoxAPIUtil.getPlayerList(limit, page, name);
playerList.addAll(response.getRows());
}
ledPlayerEntity = new LedPlayerEntity();
@@ -141,6 +141,7 @@
}
+ //鎴睆
public Map<String, String> getScreenShotUrl(Integer id) {
Map<String, String> map = new HashMap();
@@ -182,7 +183,7 @@
return map;
}
-
+ //閲嶅惎
public VnnoxResult reboot(List<LedPlayerEntity> playerList) {
return vnnoxAPIUtil.reboot(
playerList.stream().map(
@@ -191,12 +192,12 @@
);
}
- public boolean updateDataName(Long id, String name){
+ public boolean updateDataName(Long id, String name) {
LedPlayerEntity byId = ledPlayerEntityService.getById(id);
- if(byId==null){
+ if (byId == null) {
throw new BusinessException("鏈壘鍒拌璁惧");
}
- LedPlayerEntity led=new LedPlayerEntity();
+ LedPlayerEntity led = new LedPlayerEntity();
led.setId(id);
led.setName(name);
return ledPlayerEntityService.updateById(led);
--
Gitblit v1.9.3