From 34768217f342b700f2da6c3be6df13465c68ab3b Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 02 十二月 2021 16:16:15 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
similarity index 76%
rename from ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java
rename to ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
index a9b00cd..1d2b6f3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -12,7 +12,7 @@
@RestController
@AllArgsConstructor
@RequestMapping("v1/client")
-public class ClientCollector {
+public class ClientController {
private final ClientService clientService;
@@ -50,24 +50,22 @@
@PostMapping("/list")
public ResponseVO<Object> listClient(){
- Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();//0 涓虹鐞嗗憳
- if(administratorIdentity==0){//鍒ゆ柇 濡傛灉鏄鐞嗗憳 灏卞垽鏂笅CustomerInspectContextHolder.getCustomerId() 鏈夋病鏈夊��
- Long customerId = CustomerInspectContextHolder.getCustomerId();
+ // Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();//0 涓虹鐞嗗憳
+ /* if(administratorIdentity==0){//鍒ゆ柇 濡傛灉鏄鐞嗗憳 灏卞垽鏂笅CustomerInspectContextHolder.getCustomerId() 鏈夋病鏈夊��
+ // Long customerId = CustomerInspectContextHolder.getCustomerId();
if(customerId!=null){
return ResponseUtil.success(clientService.list());
}
return ResponseUtil.success(clientService.list());
}else {
- return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
- }
-/*
- Long customerId = CustomerInspectContextHolder.getCustomerId();
- if (customerId!=null){
- return ResponseUtil.success(clientService.list());
- }else {
- //return ResponseUtil.success(clientService.list());
- return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
+
}*/
+ if(SecurityUtils.getClientId().equals(SecurityUtils.getAdministratorIdentity())) {
+ return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
+ // }else if("0".equals(SecurityUtils.getAdministratorIdentity())){
+ }else {
+ return ResponseUtil.success(clientService.list());
+ }
}
}
--
Gitblit v1.9.3