2021与蓝度共同重构项目,服务端
liuhaonan
2021-11-30 a57229048537819328479bc84d3579b956962675
客户功能完善
已修改3个文件
25 ■■■■ 文件已修改
dao/src/main/resources/mapper/ClientMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/ClientMapper.xml
@@ -12,7 +12,6 @@
        <result property="mobile" column="mobile" jdbcType="VARCHAR"/>
        <result property="countLight" column="count_light" jdbcType="INTEGER"/>
        <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}
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java
@@ -27,8 +27,8 @@
    }
    @PostMapping("/update")
    public ResponseVO<Object> updateClient(@RequestBody Long id,@RequestBody ClientPrarm clientPrarm){
    @PostMapping("/update/{id}")
    public ResponseVO<Object> updateClient(@PathVariable Long id,@RequestBody ClientPrarm clientPrarm){
        boolean b = clientService.updateClient(id,clientPrarm);
        if(b){
            return ResponseUtil.success("更新成功");
@@ -37,8 +37,8 @@
        }
    }
    @PostMapping("/delete")
    public ResponseVO<Object> deleteClient(@RequestBody Long id){
    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteClient(@PathVariable Long id){
        boolean b = clientService.deleteClient(id);
        if(b){
            return ResponseUtil.success("删除成功");
@@ -50,8 +50,12 @@
    @GetMapping("/list")
    public ResponseVO<Object> listClient(){
        Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();
        Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();//0 为管理员
        if(administratorIdentity==0){//判断 如果是管理员 就判断下CustomerInspectContextHolder.getCustomerId() 有没有值
            Long customerId = CustomerInspectContextHolder.getCustomerId();
            if(customerId!=null){
                return ResponseUtil.success(clientService.list());
            }
            return ResponseUtil.success(clientService.list());
        }else {
            return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -20,7 +20,7 @@
    public boolean addClient(ClientPrarm clientPrarm) {
        Client client = new Client();
        if (clientPrarm.getClientSuperior() != null) {
            Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientSuperior, clientPrarm.getClientSuperior()));
            Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientSuperior()));
            if (one != null) {
                client.setSuperiorId(one.getId());
            } else {
@@ -44,6 +44,14 @@
            throw new BusinessException("该客户不存在");
        }
        Client client = new Client();
        if (clientPrarm.getClientSuperior() != null) {
            Client superior = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientSuperior()));
            if (one != null) {
                client.setSuperiorId(superior.getId());
            } else {
                throw new BusinessException("上级客户不存在");
            }
        }
        client.setId(id);
        client.setClientName(clientPrarm.getClientName());
        client.setLinkMan(clientPrarm.getLinkMan());