From 2f3d783999935f06228705e75fac26ebf099bf87 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 15 四月 2022 18:02:14 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 1a767db..96b6c1c 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
@@ -7,6 +7,7 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.VnnoxParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.LedPlayerEntityService;
import com.sandu.ximon.admin.service.PoleBindingService;
@@ -18,6 +19,7 @@
import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.MenuEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,7 +38,8 @@
//@AllArgsConstructor
@RequestMapping("/v1/Vnnox")
public class VnnoxController {
-
+ @Autowired
+ private PermissionConfig permissionConfig;
@Autowired
private VnnoxService vnnoxService;
@Autowired
@@ -134,6 +137,9 @@
@GetMapping("/list")
public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
LambdaQueryWrapper<LedPlayerEntity> wrapper = Wrappers.lambdaQuery(LedPlayerEntity.class);
if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
@@ -145,14 +151,18 @@
querywrapper -> {
querywrapper.like(LedPlayerEntity::getName, keyword);
}
+ ).or(
+ sn->{
+ sn.like(LedPlayerEntity::getSn,keyword);
+ }
);
List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
entities.forEach(
- led->{
+ led -> {
PoleBinding binding = bindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class)
.eq(PoleBinding::getDeviceType, 1).eq(PoleBinding::getDeviceCode, led.getSn()));
- if(binding!=null){
+ if (binding != null) {
led.setPoleId(poleService.getById(binding.getPoleId()).getId());
led.setPoleName(poleService.getById(binding.getPoleId()).getPoleName());
}
@@ -184,4 +194,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