From e525cffa5ae93048d0ac1208d100e08bc69a4a3a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 06 一月 2022 14:52:51 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
index 4f40bc7..340712d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -1,15 +1,23 @@
package com.sandu.ximon.admin.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
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;
+import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+/**
+ *瀹㈡埛妯″潡
+ */
@RestController
@AllArgsConstructor
@RequestMapping("v1/client")
@@ -17,7 +25,7 @@
private final ClientService clientService;
- @GetMapping("/add")
+ @PostMapping("/add")
public ResponseVO<Object> addClient(@RequestBody ClientPrarm clientPrarm){
boolean b = clientService.addClient(clientPrarm);
if(b){
@@ -28,7 +36,7 @@
}
- @GetMapping ("/update/{id}")
+ @PostMapping ("/update/{id}")
public ResponseVO<Object> updateClient(@PathVariable Long id,@RequestBody ClientPrarm clientPrarm){
boolean b = clientService.updateClient(id,clientPrarm);
if(b){
@@ -38,7 +46,7 @@
}
}
- @GetMapping("/delete/{id}")
+ @PostMapping("/delete/{id}")
public ResponseVO<Object> deleteClient(@PathVariable Long id){
boolean b = clientService.deleteClient(id);
if(b){
@@ -49,24 +57,29 @@
}
- @PostMapping("/list")
- public ResponseVO<Object> listClient(){
- // 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 {
-
- }*/
+ /* @GetMapping("/list")
+ public ResponseVO<Object> listClient(BaseConditionVO baseConditionVO) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
- return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
+ return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId(),baseConditionVO));
// }else if("0".equals(SecurityUtils.getAdministratorIdentity())){
}else {
- return ResponseUtil.success(clientService.list());
+ return ResponseUtil.successPage(clientService.list());
}
+ }*/
+ @GetMapping("/list")
+ public ResponseVO<Object> listLikeClient(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ LambdaQueryWrapper<Client> wrapper = Wrappers.lambdaQuery(Client.class);
+ if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())){
+ wrapper.eq(Client::getSuperiorId,SecurityUtils.getUserId());
+ }
+ if(null!=keyword){
+ wrapper.like(Client::getClientName,keyword)
+ .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile,keyword))
+ .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan,keyword));
+ }
+ return ResponseUtil.successPage(clientService.list(wrapper));
}
}
--
Gitblit v1.9.3