From ceb66c0a1dcfcfdd7c331d104f66be9e033ac902 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 21 三月 2022 16:47:15 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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 bbe477b..071225b 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,10 +1,10 @@
package com.sandu.ximon.admin.controller;
+import cn.hutool.core.bean.BeanUtil;
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.enums.AdminStatusStatus;
import com.sandu.common.enums.ResponseStatusEnums;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.LoginUserInfo;
@@ -13,17 +13,17 @@
import com.sandu.common.security.token.TokenProvider;
import com.sandu.common.util.IpUtil;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.context.CustomerInspectContextHolder;
+import com.sandu.ximon.admin.dto.ClientDto;
import com.sandu.ximon.admin.param.AddClientPrarm;
import com.sandu.ximon.admin.param.AdminLoginParam;
-import com.sandu.ximon.admin.param.ClientPrarm;
+import com.sandu.ximon.admin.param.UpdateClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.service.ClientRoleRelationService;
import com.sandu.ximon.admin.service.ClientService;
import com.sandu.ximon.admin.service.RoleService;
-import com.sandu.ximon.dao.domain.Admin;
import com.sandu.ximon.dao.domain.Client;
+import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
-import jodd.cli.Cli;
import lombok.AllArgsConstructor;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -31,9 +31,7 @@
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -48,6 +46,7 @@
private final ClientService clientService;
private final PasswordEncoder passwordEncoder;
private final RoleService roleService;
+ private final ClientRoleRelationService clientRoleRelationService;
private final TokenProvider tokenProvider;
@PostMapping("/add")
@@ -62,8 +61,8 @@
@PostMapping("/update/{id}")
- public ResponseVO<Object> updateClient(@PathVariable Long id, @RequestBody @Validated ClientPrarm clientPrarm) {
- boolean b = clientService.updateClient(id, clientPrarm);
+ public ResponseVO<Object> updateClient(@PathVariable Long id, @RequestBody @Validated UpdateClientPrarm updateClientPrarm) {
+ boolean b = clientService.updateClient(id, updateClientPrarm);
if (b) {
return ResponseUtil.success("鏇存柊鎴愬姛");
} else {
@@ -93,7 +92,22 @@
.or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile, keyword))
.or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan, keyword));
}
- return ResponseUtil.successPage(clientService.list(wrapper));
+ List<Client> clientList = clientService.list(wrapper);
+ List<ClientDto> clientDtoList = new ArrayList<>();
+
+ for (Client demo : clientList) {
+ ClientDto clientDto = new ClientDto();
+ BeanUtil.copyProperties(demo, clientDto);
+ ClientRoleRelation one = clientRoleRelationService.getOne(Wrappers.lambdaQuery(ClientRoleRelation.class)
+ .eq(ClientRoleRelation::getClientId, demo.getId()));
+
+ if (one != null) {
+ clientDto.setRoleId(one.getRoleId());
+ }
+ clientDtoList.add(clientDto);
+
+ }
+ return ResponseUtil.successPage(clientDtoList);
}
@AnonymousAccess
--
Gitblit v1.9.3