From bcd9fda2a06e49195b038c18307511caf78bf615 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 29 八月 2022 16:06:30 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 96 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
index 92eacaf..07c40e7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -1,7 +1,9 @@
package com.sandu.ximon.admin.service;
+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.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
@@ -11,6 +13,8 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.IpUtil;
import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.dto.ClientDto;
+import com.sandu.ximon.admin.dto.ClientDtoNode;
import com.sandu.ximon.admin.param.AddClientPrarm;
import com.sandu.ximon.admin.param.PwdParam;
import com.sandu.ximon.admin.param.UpdateClientPrarm;
@@ -18,17 +22,17 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.MenuNode;
-import com.sandu.ximon.dao.domain.Client;
-import com.sandu.ximon.dao.domain.ClientRoleRelation;
-import com.sandu.ximon.dao.domain.Role;
-import com.sandu.ximon.dao.domain.RoleMenuRelation;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.ClientMapper;
import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.ArrayList;
import java.util.Collection;
@@ -39,7 +43,6 @@
@AllArgsConstructor
public class ClientService extends BaseServiceImpl<ClientMapper, Client> {
- private final ClientMapper clientMapper;
private final PasswordEncoder passwordEncoder;
private final ClientRoleRelationService clientRoleRelationService;
private final RoleService roleService;
@@ -271,8 +274,94 @@
return flag;
}
- public List<Client> clientList(Long userId, BaseConditionVO baseConditionVO) {
- return clientMapper.clientList(userId, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ /**
+ * 鐢ㄦ埛鍒楄〃
+ *
+ * @param keyword
+ * @param order
+ * @param seq
+ * @return
+ */
+ public List<ClientDtoNode> listLikeClient(String keyword, Integer order, Integer seq) {
+
+
+ LambdaQueryWrapper<Client> wrapper = Wrappers.lambdaQuery(Client.class);
+ if (AdministratorEnums.NORMAL.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId()).or(w -> w.eq(
+ Client::getId, SecurityUtils.getUserId()
+ ));
+ }
+ if (keyword != null && !keyword.isEmpty()) {
+ wrapper.like(Client::getClientName, keyword)
+ .or(w1 -> w1.like(Client::getMobile, keyword))
+ .or(w2 -> w2.like(Client::getLinkMan, keyword));
+ }
+ //鎺掑簭瀛楁
+ String orderByResult = "id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.CLIENT_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = OrderByEnums.ASC.getCode();
+ break;
+ case 2:
+ orderBySeq = OrderByEnums.DESC.getCode();
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+
+// if (baseConditionVO != null) {
+// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+// }
+
+ List<Client> clientList = 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 clientDtoList.stream()
+ .filter(bean -> null == bean.getSuperiorId())
+ .map(bean -> covertClientDtoNode(bean, clientDtoList)).collect(Collectors.toList());
+ }
+
+ /**
+ * 鏁版嵁鏁寸悊鎴愭爲鐘跺浘
+ *
+ * @param clientDto
+ * @param clientDtoList
+ * @return
+ */
+ private ClientDtoNode covertClientDtoNode(ClientDto clientDto, List<ClientDto> clientDtoList) {
+ ClientDtoNode node = new ClientDtoNode();
+ BeanUtils.copyProperties(clientDto, node);
+ List<ClientDtoNode> children = clientDtoList.stream()
+ .filter(subClientDto -> (subClientDto.getSuperiorId() != null && subClientDto.getSuperiorId().equals(clientDto.getId())))
+ .map(subClientDto -> covertClientDtoNode(subClientDto, clientDtoList)).collect(Collectors.toList());
+ node.setChildren(children);
+ return node;
}
public Client findByPhone(String phone) {
--
Gitblit v1.9.3