From e845cb09ab27e98a86b30bcedd84d8b559e1ca4b Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 30 十一月 2021 11:37:38 +0800
Subject: [PATCH] 新功能
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 32 +++++++++++++++++++-------------
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java | 19 +++++++++++++++----
dao/src/main/java/com/sandu/ximon/dao/mapper/ClientMapper.java | 4 ++++
dao/src/main/resources/mapper/ClientMapper.xml | 5 +++++
4 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/ClientMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/ClientMapper.java
index 2b26bd6..6011bd4 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/ClientMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/ClientMapper.java
@@ -4,8 +4,12 @@
import com.sandu.ximon.dao.domain.Client;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
@Mapper
public interface ClientMapper extends BaseMapper<Client> {
+ List<Client> clientList(Long userId);
+
}
diff --git a/dao/src/main/resources/mapper/ClientMapper.xml b/dao/src/main/resources/mapper/ClientMapper.xml
index 1be7bc1..0d57080 100644
--- a/dao/src/main/resources/mapper/ClientMapper.xml
+++ b/dao/src/main/resources/mapper/ClientMapper.xml
@@ -14,5 +14,10 @@
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
+ <select id="clientList" resultType="com.sandu.ximon.dao.domain.Client">
+ select * from client where superiorId=#{userId}
+
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java
index c23bab6..cd5ebba 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java
@@ -2,6 +2,7 @@
import com.sandu.common.domain.ResponseVO;
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;
@@ -49,10 +50,20 @@
@GetMapping("/list")
public ResponseVO<Object> listClient(){
- SecurityUtils.getUserId();
- clientService.list();
+ Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();
+ if(administratorIdentity==0){//鍒ゆ柇 濡傛灉鏄鐞嗗憳 灏卞垽鏂笅CustomerInspectContextHolder.getCustomerId() 鏈夋病鏈夊��
return ResponseUtil.success(clientService.list());
+ }else {
+ return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
+ }
+/*
+ Long customerId = CustomerInspectContextHolder.getCustomerId();
+ if (customerId!=null){
+ return ResponseUtil.success(clientService.list());
+ }else {
+ //return ResponseUtil.success(clientService.list());
+ return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
+ }*/
+
}
-
-
}
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 b941ba3..48325bf 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
@@ -9,19 +9,21 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service
@AllArgsConstructor
public class ClientService extends BaseServiceImpl<ClientMapper, Client> {
-
+ private final ClientMapper clientMapper;
public boolean addClient(ClientPrarm clientPrarm) {
- Client client=new Client();
- if(clientPrarm.getClientSuperior()!=null){
+ Client client = new Client();
+ if (clientPrarm.getClientSuperior() != null) {
Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientSuperior, clientPrarm.getClientSuperior()));
- if(one!=null){
+ if (one != null) {
client.setSuperiorId(one.getId());
- }else {
+ } else {
throw new BusinessException("涓婄骇瀹㈡埛涓嶅瓨鍦�");
}
}
@@ -35,31 +37,35 @@
}
- public boolean updateClient(Long id,ClientPrarm clientPrarm){
+ public boolean updateClient(Long id, ClientPrarm clientPrarm) {
//Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, id));
- Client one=getById(id);
- if(one==null){
+ Client one = getById(id);
+ if (one == null) {
throw new BusinessException("璇ュ鎴蜂笉瀛樺湪");
}
- Client client=new Client();
+ Client client = new Client();
client.setId(id);
client.setClientName(clientPrarm.getClientName());
client.setLinkMan(clientPrarm.getLinkMan());
client.setMobile(clientPrarm.getMobile());
client.setClientSuperior(clientPrarm.getClientSuperior());
- // update(client);
- return updateById(client);
+ // update(client);
+ return updateById(client);
}
- public boolean deleteClient(Long id){
- Client one=getById(id);
+ public boolean deleteClient(Long id) {
+ Client one = getById(id);
if (one == null) {
throw new BusinessException("璇ュ鎴蜂笉瀛樺湪");
}
return removeById(id);
}
+ public List<Client> clientList(Long userId) {
+ return clientMapper.clientList(userId);
+ }
+
public Client findByPhone(String phone) {
return getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getMobile, phone).last("limit 1"));
}
--
Gitblit v1.9.3