From 76020b953482ebf68472c4f4d32ee9007582b835 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 18 三月 2022 14:16:04 +0800
Subject: [PATCH] 诺瓦相关
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 84aaf05..0fcf390 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
@@ -10,11 +10,14 @@
import com.sandu.ximon.admin.param.VnnoxParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.LedPlayerEntityService;
+import com.sandu.ximon.admin.service.PoleBindingService;
+import com.sandu.ximon.admin.service.PoleService;
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;
+import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -41,6 +44,10 @@
private LedPlayerEntityService ledPlayerEntityService;
@Autowired
private VnnoxAPIUtil vnnoxAPIUtil;
+ @Autowired
+ private PoleBindingService bindingService;
+ @Autowired
+ private PoleService poleService;
/**
* 鎴睆
@@ -48,7 +55,7 @@
* @param vnnoxWebRequest
* @return
*/
- @GetMapping("/screenShot")
+ @PostMapping("/screenShot")
public ResponseVO<Object> screenShot(@RequestBody VnnoxParam vnnoxWebRequest) {
Map<String, String> map = vnnoxService.getScreenShotUrl(vnnoxWebRequest.getId());
if(map.get("code").equals("500")) {
@@ -71,7 +78,7 @@
/**
* @param vnnoxWebRequest
- * @return
+ * @return 寮�鍏冲睆骞�
*/
@GetMapping("/screenStatusChange")
public ResponseVO<Object> screenStatusChange(@RequestBody VnnoxParam vnnoxWebRequest) {
@@ -103,11 +110,6 @@
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 {
@@ -135,7 +137,6 @@
public ResponseVO<Object> list(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
@@ -148,6 +149,16 @@
);
List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
+ entities.forEach(
+ led->{
+ PoleBinding binding = bindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class)
+ .eq(PoleBinding::getDeviceType, 1).eq(PoleBinding::getDeviceCode, led.getSn()));
+ if(binding!=null){
+ led.setPoleId(poleService.getById(binding.getPoleId()).getId());
+ led.setPoleName(poleService.getById(binding.getPoleId()).getPoleName());
+ }
+ }
+ );
return ResponseUtil.success(entities);
}
}
--
Gitblit v1.9.3