From 5dac9847a6de1012c9b99ac0468ee2dc4b6a5cc3 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 09 三月 2022 10:30:24 +0800
Subject: [PATCH] 功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 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 340712d..5170987 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
@@ -7,16 +7,18 @@
 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.AddClientPrarm;
 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
@@ -26,32 +28,32 @@
     private final ClientService clientService;
 
     @PostMapping("/add")
-    public ResponseVO<Object> addClient(@RequestBody ClientPrarm clientPrarm){
-        boolean b = clientService.addClient(clientPrarm);
-        if(b){
+    public ResponseVO<Object> addClient(@RequestBody @Validated AddClientPrarm addClientPrarm) {
+        boolean b = clientService.addClient(addClientPrarm);
+        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("鍒犻櫎澶辫触");
         }
     }
@@ -72,13 +74,13 @@
     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 (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));
+        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