From f3fe6e47bccc96f911c52642f44db4abfa025f42 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 14 四月 2022 10:10:43 +0800
Subject: [PATCH] 修改用户头像
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 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 4a1fc05..39f6d1c 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,7 +2,6 @@
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,11 +9,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 +43,10 @@
private LedPlayerEntityService ledPlayerEntityService;
@Autowired
private VnnoxAPIUtil vnnoxAPIUtil;
+ @Autowired
+ private PoleBindingService bindingService;
+ @Autowired
+ private PoleService poleService;
/**
* 鎴睆
@@ -51,8 +57,8 @@
@PostMapping("/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"));
+ if (map.get("code").equals("500")) {
+ return ResponseUtil.fail(map.get("msg"));
}
return ResponseUtil.success(map.get("url"));
}
@@ -63,7 +69,7 @@
* @param vnnoxWebRequest
* @return
*/
- @GetMapping("/reboot")
+ @PostMapping("/reboot")
public ResponseVO<Object> reboot(@RequestBody VnnoxParam vnnoxWebRequest) {
VnnoxResult vnnoxResult = vnnoxService.reboot(vnnoxWebRequest.getPlayerList());
return ResponseUtil.success(vnnoxResult);
@@ -71,9 +77,9 @@
/**
* @param vnnoxWebRequest
- * @return 寮�鍏冲睆骞�
+ * @return 寮�鍏冲睆骞�
*/
- @GetMapping("/screenStatusChange")
+ @PostMapping("/screenStatusChange")
public ResponseVO<Object> screenStatusChange(@RequestBody VnnoxParam vnnoxWebRequest) {
VnnoxResult vnnoxResult = vnnoxService.screenStatusChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getScreenStatus());
return ResponseUtil.success(vnnoxResult);
@@ -85,7 +91,7 @@
* @param vnnoxWebRequest
* @return
*/
- @GetMapping("/volChange")
+ @PostMapping("/volChange")
public ResponseVO<Object> volChange(@RequestBody VnnoxParam vnnoxWebRequest) {
VnnoxResult vnnoxResult = vnnoxService.volChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getVol());
return ResponseUtil.success(vnnoxResult);
@@ -97,7 +103,7 @@
* @param vnnoxWebRequest
* @return
*/
- @GetMapping("/brightnessChange")
+ @PostMapping("/brightnessChange")
public ResponseVO<Object> brightnessChange(@RequestBody VnnoxParam vnnoxWebRequest) {
VnnoxResult vnnoxResult = vnnoxService.brightnessChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getBrightness());
return ResponseUtil.success(vnnoxResult);
@@ -130,19 +136,28 @@
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
} else {
wrapper.like(LedPlayerEntity::getPlayerName, keyword)
.or(
- querywrapper->{
+ querywrapper -> {
querywrapper.like(LedPlayerEntity::getName, keyword);
}
);
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);
}
}
@@ -169,4 +184,9 @@
return ResponseUtil.success(online);
}
}
+
+ @GetMapping("/getVnnoxInfo/{sn}")
+ public ResponseVO<Object> getBySnAndPlayerId(@PathVariable String sn) {
+ return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerSn(sn));
+ }
}
--
Gitblit v1.9.3