From 93d6fdb255ebd9d33adebc4e96ecc5f74b6281ea Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 08 三月 2022 14:11:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 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 dd3e4a7..94aa0d8 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,17 +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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
- *瀹㈡埛妯″潡
+ * 瀹㈡埛妯″潡
*/
@RestController
@AllArgsConstructor
@@ -21,45 +27,60 @@
private final ClientService clientService;
@PostMapping("/add")
- public ResponseVO<Object> addClient(@RequestBody ClientPrarm clientPrarm){
+ public ResponseVO<Object> addClient(@RequestBody @Validated ClientPrarm clientPrarm) {
boolean b = clientService.addClient(clientPrarm);
- if(b){
+ if (b) {
return ResponseUtil.success("娣诲姞鎴愬姛");
- }else {
+ } else {
return ResponseUtil.fail("娣诲姞澶辫触");
}
}
- @PostMapping ("/update/{id}")
- public ResponseVO<Object> updateClient(@PathVariable Long id,@RequestBody ClientPrarm clientPrarm){
- boolean b = clientService.updateClient(id,clientPrarm);
- if(b){
+ @PostMapping("/update/{id}")
+ public ResponseVO<Object> updateClient(@PathVariable Long id, @RequestBody @Validated ClientPrarm clientPrarm) {
+ boolean b = clientService.updateClient(id, clientPrarm);
+ if (b) {
return ResponseUtil.success("鏇存柊鎴愬姛");
- }else {
+ } else {
return ResponseUtil.fail("鏇存柊澶辫触");
}
}
@PostMapping("/delete/{id}")
- public ResponseVO<Object> deleteClient(@PathVariable Long id){
+ public ResponseVO<Object> deleteClient(@PathVariable Long id) {
boolean b = clientService.deleteClient(id);
- if(b){
+ if (b) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
- }else {
+ } else {
return ResponseUtil.fail("鍒犻櫎澶辫触");
}
}
- @GetMapping("/list")
- public ResponseVO<Object> listClient(){
+ /* @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