From d647b819f2a73b98df27469e09846dcc34bc383d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 14 三月 2022 12:00:00 +0800
Subject: [PATCH] C3充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 80 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 21 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
index c9e1fc6..bbd845f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.api.R;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
@@ -10,6 +11,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.LedPlayerEntityService;
import com.sandu.ximon.admin.service.VnnoxService;
+import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
@@ -18,6 +20,8 @@
import org.springframework.web.bind.annotation.*;
import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
/**
@@ -35,20 +39,27 @@
private VnnoxService vnnoxService;
@Autowired
private LedPlayerEntityService ledPlayerEntityService;
+ @Autowired
+ private VnnoxAPIUtil vnnoxAPIUtil;
/**
* 鎴睆
+ *
* @param vnnoxWebRequest
* @return
*/
@GetMapping("/screenShot")
public ResponseVO<Object> screenShot(@RequestBody VnnoxParam vnnoxWebRequest) {
Map<String, String> map = vnnoxService.getScreenShotUrl(vnnoxWebRequest.getId());
+ if(map.get("code").equals("500")) {
+ return ResponseUtil.fail(map.get("msg"));
+ }
return ResponseUtil.success(map.get("url"));
}
/**
* 閲嶅惎
+ *
* @param vnnoxWebRequest
* @return
*/
@@ -59,59 +70,56 @@
}
/**
- *
* @param vnnoxWebRequest
- * @return
+ * @return 寮�鍏冲睆骞�
*/
@GetMapping("/screenStatusChange")
public ResponseVO<Object> screenStatusChange(@RequestBody VnnoxParam vnnoxWebRequest) {
- VnnoxResult vnnoxResult = vnnoxService.screenStatusChange(vnnoxWebRequest.getPlayerList(),vnnoxWebRequest.getScreenStatus());
+ VnnoxResult vnnoxResult = vnnoxService.screenStatusChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getScreenStatus());
return ResponseUtil.success(vnnoxResult);
}
/**
* 闊抽噺璋冭妭
+ *
* @param vnnoxWebRequest
* @return
*/
@GetMapping("/volChange")
public ResponseVO<Object> volChange(@RequestBody VnnoxParam vnnoxWebRequest) {
- VnnoxResult vnnoxResult = vnnoxService.volChange(vnnoxWebRequest.getPlayerList(),vnnoxWebRequest.getVol());
+ VnnoxResult vnnoxResult = vnnoxService.volChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getVol());
return ResponseUtil.success(vnnoxResult);
}
/**
* 浜害璋冭妭
+ *
* @param vnnoxWebRequest
* @return
*/
@GetMapping("/brightnessChange")
public ResponseVO<Object> brightnessChange(@RequestBody VnnoxParam vnnoxWebRequest) {
- VnnoxResult vnnoxResult = vnnoxService.brightnessChange(vnnoxWebRequest.getPlayerList(),vnnoxWebRequest.getBrightness());
+ VnnoxResult vnnoxResult = vnnoxService.brightnessChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getBrightness());
return ResponseUtil.success(vnnoxResult);
}
- /* @RequestMapping("/changeLedName")
- public R changeLedName(@RequestBody VnnoxParam vnnoxWebRequest) {
- vnnoxService.changeLedName(vnnoxWebRequest.getId(),vnnoxWebRequest.getPlayerName());
- return ResponseUtil.success();
- }*/
@PostMapping("/validateSN")
public ResponseVO<Object> validateSN(@RequestBody Map map) throws URISyntaxException {
- String sn = (String)map.get("sn");
- String name = (String)map.get("name");
- LedV2RegisterResultEntity ledV2RegisterResultEntity = vnnoxService.validateSN(name,sn);
+ String sn = (String) map.get("sn");
+ String name = (String) map.get("name");
+ LedV2RegisterResultEntity ledV2RegisterResultEntity = vnnoxService.validateSN(name, sn);
return ResponseUtil.success(ledV2RegisterResultEntity);
}
@PostMapping("/updateLedName/{id}")
- public ResponseVO<Object> updateLedName(@PathVariable Long id,@RequestBody Map map) {
- String name = (String)map.get("name");
+ public ResponseVO<Object> updateLedName(@PathVariable Long id, @RequestBody Map map) {
+ String name = (String) map.get("name");
boolean b = vnnoxService.updateDataName(id, name);
- if(b){
+ if (b) {
return ResponseUtil.success("鏇存敼鎴愬姛");
- }{
+ }
+ {
return ResponseUtil.success("鏇存敼澶辫触");
}
@@ -123,12 +131,42 @@
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
LambdaQueryWrapper<LedPlayerEntity> wrapper = Wrappers.lambdaQuery(LedPlayerEntity.class);
- if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
//wrapper.eq(LedPlayerEntity::get)
return ResponseUtil.success(""); // todo
- }else {
- wrapper.like(LedPlayerEntity::getPlayerName,keyword);
- return ResponseUtil.success(ledPlayerEntityService.list(wrapper));
+ } else {
+ wrapper.like(LedPlayerEntity::getPlayerName, keyword)
+ .or(
+ querywrapper->{
+ querywrapper.like(LedPlayerEntity::getName, keyword);
+ }
+ );
+ List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
+ List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
+ return ResponseUtil.success(entities);
+ }
+ }
+
+ @GetMapping("/onLineList")
+ public ResponseVO<Object> onLineList(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+// public ResponseVO<Object> onLineList(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ LambdaQueryWrapper<LedPlayerEntity> wrapper = Wrappers.lambdaQuery(LedPlayerEntity.class);
+
+ if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ //wrapper.eq(LedPlayerEntity::get)
+ return ResponseUtil.success(""); // todo
+ } else {
+ wrapper.like(LedPlayerEntity::getPlayerName, keyword);
+ List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
+ List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
+ List<LedPlayerEntity> online = new ArrayList<>();
+ for (LedPlayerEntity ledPlayer : entities) {
+ if (ledPlayer.getOnlineStatus() == 1) {
+ online.add(ledPlayer);
+ }
+ }
+ return ResponseUtil.success(online);
}
}
}
--
Gitblit v1.9.3