From a57229048537819328479bc84d3579b956962675 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 30 十一月 2021 14:26:14 +0800
Subject: [PATCH] 客户功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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/ClientCollector.java
index c23bab6..534b2e7 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/ClientCollector.java
@@ -2,6 +2,7 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.context.CustomerInspectContextHolder;
import com.sandu.ximon.admin.param.ClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.ClientService;
@@ -26,8 +27,8 @@
}
- @PostMapping("/update")
- public ResponseVO<Object> updateClient(@RequestBody Long id,@RequestBody ClientPrarm clientPrarm){
+ @PostMapping("/update/{id}")
+ public ResponseVO<Object> updateClient(@PathVariable Long id,@RequestBody ClientPrarm clientPrarm){
boolean b = clientService.updateClient(id,clientPrarm);
if(b){
return ResponseUtil.success("鏇存柊鎴愬姛");
@@ -36,8 +37,8 @@
}
}
- @PostMapping("/delete")
- public ResponseVO<Object> deleteClient(@RequestBody Long id){
+ @PostMapping("/delete/{id}")
+ public ResponseVO<Object> deleteClient(@PathVariable Long id){
boolean b = clientService.deleteClient(id);
if(b){
return ResponseUtil.success("鍒犻櫎鎴愬姛");
@@ -49,10 +50,24 @@
@GetMapping("/list")
public ResponseVO<Object> listClient(){
- SecurityUtils.getUserId();
- clientService.list();
+ 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()));
+ }*/
+
}
-
-
}
--
Gitblit v1.9.3