2021与蓝度共同重构项目,服务端
liuhaonan
2021-11-30 e845cb09ab27e98a86b30bcedd84d8b559e1ca4b
新功能
已修改4个文件
60 ■■■■ 文件已修改
dao/src/main/java/com/sandu/ximon/dao/mapper/ClientMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/ClientMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
}
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>
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()));
        }*/
    }
}
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"));
    }