修改电销綁定用戶先关接口问题

src/main/java/com/ydtech/modules/admin/controller/SysUserLinkDxUserIdController.java

@@ -0,0 +1,106 @@
+package com.ydtech.modules.admin.controller;
+
+
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.dto.SysUserLinkQueryUserDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkUserDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkZzbUserIdDto;
+import com.ydtech.modules.admin.model.po.SysUserZzbOrZgd;
+import com.ydtech.modules.admin.model.po.Uuser;
+import com.ydtech.modules.admin.model.vo.SysUserLinkZzbUserIdVo;
+import com.ydtech.modules.admin.service.SysUserLinkDxUserIdService;
+import com.ydtech.modules.admin.service.SysUserLinkZzbUserIdService;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.order.entity.BasePageResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/9/6 18:52
+ *  @Description: 电销用户关联
+ */
+@Api(tags = "系统关联用户表")
+@RequestMapping("/sysUserLinkDxUser")
+@RestController
+public class SysUserLinkDxUserIdController extends BaseController {
+
+
+    @Autowired
+    private SysUserLinkDxUserIdService sysUserLinkDxUserIdService;
+
+
+    @PostMapping("addOrUpdate")
+    @ApiOperation("添加修改")
+    public HttpResult<Object> addOrUpdate(@RequestBody SysUserLinkZzbUserIdVo sysUserLinkZzbUserIdVo) {
+        if(StringUtils.isBlank(sysUserLinkZzbUserIdVo.getUserId())) {
+            return HttpResult.error("用户工号不能为空");
+        }
+        if(StringUtils.isBlank(sysUserLinkZzbUserIdVo.getLinkUserId())) {
+            return HttpResult.error("关联系统用户id不能为空");
+        }
+        try{
+            sysUserLinkDxUserIdService.addOrUpdate(sysUserLinkZzbUserIdVo);
+            return HttpResult.ok("操作成功");
+        }catch (Exception e){
+            return HttpResult.error("操作失败"+e.getMessage());
+        }
+    }
+
+    @PostMapping("delete")
+    @ApiOperation("系统关联清空")
+    public HttpResult<Object> delete(@RequestBody SysUserLinkZzbUserIdVo sysUserLinkZzbUserIdVo) {
+        if(StringUtils.isBlank(sysUserLinkZzbUserIdVo.getUserId())) {
+            return HttpResult.error("用户工号不能为空");
+        }
+        try{
+            sysUserLinkDxUserIdService.deleteByUserId(sysUserLinkZzbUserIdVo);
+            return HttpResult.ok("删除成功");
+        }catch (Exception e){
+            return HttpResult.error("删除失败"+e.getMessage());
+        }
+    }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/9 09:50
+     *  @Description: 查询掌中保的用户关联掌中宝的用户id
+     */
+    @PostMapping("queryUserPage")
+    @ApiOperation(value = "查询用户关联数据集合")
+    public HttpResult<BasePageResult<SysUserLinkUserDto>> queryUserPage(@RequestBody  SysUserLinkQueryUserDto sysUserLinkQueryUserDto) {
+
+        try{
+            BasePageResult<SysUserLinkUserDto> result = sysUserLinkDxUserIdService.queryUserPage(sysUserLinkQueryUserDto);
+            return HttpResult.ok("查询数据成功", result);
+        }catch (Exception e){
+            return HttpResult.error("查询错误"+e.getMessage());
+        }
+    }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/9 09:50
+     *  @Description: 查询掌中保的用户
+     */
+    @PostMapping("queryUserDxPage")
+    @ApiOperation(value = "查询用户关联数据集合")
+    public HttpResult<BasePageResult<Uuser>> queryUserDxPage(@RequestBody  SysUserLinkQueryUserDto sysUserLinkQueryUserDto) {
+
+        try{
+            BasePageResult<Uuser> result = sysUserLinkDxUserIdService.queryUserDxPage(sysUserLinkQueryUserDto);
+            return HttpResult.ok("查询数据成功", result);
+        }catch (Exception e){
+            return HttpResult.error("查询错误"+e.getMessage());
+        }
+    }
+}

src/main/java/com/ydtech/modules/admin/dao/SysUserLinkDxUserIdMapper.java

@@ -0,0 +1,29 @@
+package com.ydtech.modules.admin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.modules.admin.model.dto.SysUserLinkQueryUserDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkUserDto;
+import com.ydtech.modules.admin.model.po.SysUserLinkDxUserId;
+import com.ydtech.modules.admin.model.po.SysUserZzbOrZgd;
+import org.apache.ibatis.annotations.Param;
+
+/**
+* @author Administrator
+* @description 针对表【sys_user(用户信息表)】的数据库操作Mapper
+* @createDate 2024-09-06 18:13:19
+* @Entity generator.domain.SysUser
+*/
+public interface SysUserLinkDxUserIdMapper extends BaseMapper<SysUserLinkDxUserId> {
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/10 14:39
+     *  @Description: 查询数据
+     */
+    Page<SysUserLinkUserDto> queryPage(@Param("page") Page<SysUserLinkUserDto> page, @Param("vo") SysUserLinkQueryUserDto sysUserLinkQueryUserDto);
+}
+
+
+
+

src/main/java/com/ydtech/modules/admin/model/po/SysUserLinkDxUserId.java

@@ -0,0 +1,104 @@
+package com.ydtech.modules.admin.model.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 掌柜用户关联客户管理掌中宝用户关联表
+ * @TableName sys_user_link_dx_user_id
+ */
+@TableName(value ="sys_user_link_dx_user_id")
+@Data
+public class SysUserLinkDxUserId implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 掌柜系统id
+     */
+    private String userId;
+
+    /**
+     * 电销系统用户id
+     */
+    private String dxUserId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String createUserId;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        SysUserLinkDxUserId other = (SysUserLinkDxUserId) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getDxUserId() == null ? other.getDxUserId() == null : this.getDxUserId().equals(other.getDxUserId()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getCreateUserId() == null ? other.getCreateUserId() == null : this.getCreateUserId().equals(other.getCreateUserId()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getDxUserId() == null) ? 0 : getDxUserId().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getCreateUserId() == null) ? 0 : getCreateUserId().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", userId=").append(userId);
+        sb.append(", dxUserId=").append(dxUserId);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", createUserId=").append(createUserId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+
+    public SysUserLinkDxUserId() {
+    }
+
+    public SysUserLinkDxUserId(Long id, String userId, String dxUserId, Date createTime, String createUserId) {
+        this.id = id;
+        this.userId = userId;
+        this.dxUserId = dxUserId;
+        this.createTime = createTime;
+        this.createUserId = createUserId;
+    }
+}

src/main/java/com/ydtech/modules/admin/model/po/Uuser.java

@@ -0,0 +1,87 @@
+package com.ydtech.modules.admin.model.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@TableName(value ="u_user")
+@Data
+public class Uuser {
+
+    @TableField(value = "id")
+    private Integer id;
+
+    @TableField(value = "name")
+    private String  name;
+
+    @TableField(value = "upass")
+    private String  upass;
+
+    @TableField(value = "privid")
+    private Integer  privid;
+
+    @TableField(value = "deptid")
+    private Integer  deptid;
+
+    @TableField(value = "mobile")
+    private String  mobile;
+
+    @TableField(value = "email")
+    private String  email;
+
+    @TableField(value = "nickname")
+    private String  nickname;
+
+    @TableField(value = "sex")
+    private String  sex;
+
+    @TableField(value = "extension")
+    private Integer  extension;
+
+    @TableField(value = "openpop")
+    private Integer  openpop;
+
+    @TableField(value = "repace")
+    private Integer  repace;
+
+    @TableField(value = "status")
+    private Long  status;
+
+    @TableField(value = "hiddenphone")
+    private String  hiddenphone;
+
+    @TableField(value = "remarks")
+    private String  remarks;
+
+    @TableField(value = "userfield")
+    private String  userfield;
+
+    @TableField(value = "ico")
+    private String  ico;
+
+    @TableField(value = "heart_time")
+    private  Date   heartTime;
+
+    @TableField(value = "ec_name")
+    private String   ecName;
+
+    @TableField(value = "ec_num")
+    private String ecNum;
+
+    @TableField(value = "app_online")
+    private Integer   appOnline;
+
+    @TableField(value = "cfphone")
+    private String   cfphone;
+
+    @TableField(value = "tekon")
+    private String   tekon;
+
+
+    public Uuser() {
+    }
+
+
+}

src/main/java/com/ydtech/modules/admin/model/vo/UserQueryVo.java

@@ -0,0 +1,35 @@
+package com.ydtech.modules.admin.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/9/6 11:51
+ *  @Description:
+ */
+@Data
+public class UserQueryVo implements Serializable {
+
+    private   String  userName;
+
+
+    private  String mobile;
+
+
+    private int pageSize;
+
+    private int pageNum;
+
+    public UserQueryVo() {
+    }
+
+    public UserQueryVo(String userName, String mobile, int pageSize, int pageNum) {
+        this.userName = userName;
+        this.mobile = mobile;
+        this.pageSize = pageSize;
+        this.pageNum = pageNum;
+    }
+}

src/main/java/com/ydtech/modules/admin/service/SysUserLinkDxUserIdService.java

@@ -0,0 +1,47 @@
+package com.ydtech.modules.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.admin.model.dto.SysUserLinkQueryUserDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkUserDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkZzbUserIdDto;
+import com.ydtech.modules.admin.model.po.SysUserLinkDxUserId;
+import com.ydtech.modules.admin.model.po.SysUserZzbOrZgd;
+import com.ydtech.modules.admin.model.po.Uuser;
+import com.ydtech.modules.admin.model.vo.SysUserLinkZzbUserIdVo;
+import com.ydtech.modules.order.entity.BasePageResult;
+
+/**
+* @author Administrator
+* @description 针对表【sys_user_link_zgb_user_id(掌柜用户关联客户管理掌中宝用户关联表)】的数据库操作Service
+* @createDate 2024-09-06 18:01:18
+*/
+public interface SysUserLinkDxUserIdService extends IService<SysUserLinkDxUserId> {
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/6 19:05
+     *  @Description: 添加或者修改系統用戶id
+     */
+    void addOrUpdate(SysUserLinkZzbUserIdVo sysUserLinkZzbUserIdVo);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/6 19:07
+     *  @Description: 清空
+     */
+    void deleteByUserId(SysUserLinkZzbUserIdVo sysUserLinkZzbUserIdVo);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/9 9:59
+     *  @Description: 通过用户数据相关数据查询用户集合
+     */
+    BasePageResult<SysUserLinkUserDto> queryUserPage(SysUserLinkQueryUserDto sysUserLinkQueryUserDto);
+     /**
+      *  @version
+      *  @author: hxl
+      *  @Date: 2024/9/10 14:35
+      *  @Description:  查询掌中保用户数据
+      */
+    BasePageResult<Uuser> queryUserDxPage(SysUserLinkQueryUserDto sysUserLinkQueryUserDto);
+}

src/main/java/com/ydtech/modules/admin/service/impl/SysUserLinkDxUserIdServiceImpl.java

@@ -0,0 +1,197 @@
+package com.ydtech.modules.admin.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.dao.SysUserLinkDxUserIdMapper;
+import com.ydtech.modules.admin.model.dto.*;
+import com.ydtech.modules.admin.model.po.SysUserLinkDxUserId;
+import com.ydtech.modules.admin.model.po.Uuser;
+import com.ydtech.modules.admin.model.vo.DxDataVo;
+import com.ydtech.modules.admin.model.vo.SysUserLinkZzbUserIdVo;
+import com.ydtech.modules.admin.model.vo.UserQueryVo;
+import com.ydtech.modules.admin.service.SysUserLinkDxUserIdService;
+import com.ydtech.modules.admin.utils.DxApiConfigurationProperties;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.order.entity.BasePageResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description 针对表【sys_user(用户信息表)】的数据库操作Service实现
+ * @createDate 2024-09-06 18:13:19
+ */
+@Service
+public class SysUserLinkDxUserIdServiceImpl extends ServiceImpl<SysUserLinkDxUserIdMapper, SysUserLinkDxUserId>
+        implements SysUserLinkDxUserIdService {
+
+    @Autowired
+    private SysUserLinkDxUserIdMapper sysUserLinkDxUserIdMapper;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private DxApiConfigurationProperties dxApiConfigurationProperties;
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/6 19:47
+     *  @Description:  添加掌柜鼎的绑定的用户id
+     */
+    @Override
+    public void addOrUpdate(SysUserLinkZzbUserIdVo sysUserLinkZzbUserIdVo) {
+        LambdaQueryWrapper<SysUserLinkDxUserId> lqw = new LambdaQueryWrapper<>();
+        lqw.eq( SysUserLinkDxUserId::getUserId, sysUserLinkZzbUserIdVo.getUserId());
+        SysUserLinkDxUserId one = this.getOne(lqw);
+        if(one!=null){
+            one.setDxUserId(sysUserLinkZzbUserIdVo.getLinkUserId());
+            one.setCreateTime(new Date());
+            one.setCreateUserId(new BaseController().getUserId());
+            this.updateById(one);
+        }else{
+            SysUserLinkDxUserId sysUserLinkDxUserId =new SysUserLinkDxUserId(null,sysUserLinkZzbUserIdVo.getUserId(), sysUserLinkZzbUserIdVo.getLinkUserId(), new Date(), new BaseController().getUserId());
+            this.save(sysUserLinkDxUserId);
+        }
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/6 19:46
+     *  @Description: 通过用户id删除数据
+     */
+    @Override
+    public void deleteByUserId(SysUserLinkZzbUserIdVo sysUserLinkZzbUserIdVo) {
+        LambdaQueryWrapper<SysUserLinkDxUserId> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SysUserLinkDxUserId::getUserId, sysUserLinkZzbUserIdVo.getUserId());
+        int rows = this.baseMapper.delete(lqw);
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/9 8:54
+     *  @Description:  通过用户关联数据查询返回用户集合
+     */
+    @Override
+    public BasePageResult<SysUserLinkUserDto> queryUserPage(SysUserLinkQueryUserDto sysUserLinkQueryUserDto) {
+        Page<SysUserLinkUserDto> page = new Page<>(sysUserLinkQueryUserDto.getPageNum(), sysUserLinkQueryUserDto.getPageSize());
+        Page<SysUserLinkUserDto> sysUserLinkUserDtoBasePageResult = sysUserLinkDxUserIdMapper.queryPage(page, sysUserLinkQueryUserDto);
+        List<SysUserLinkUserDto> records = sysUserLinkUserDtoBasePageResult.getRecords();
+        List<SysUserLinkUserDto> newRecords =  new ArrayList<>();
+        if(records!=null && records.size()>0){
+            for(SysUserLinkUserDto  sysUserLinkUserDto : records){
+                Uuser uuser = getDataByGet(sysUserLinkUserDto.getUserId(), dxApiConfigurationProperties.getFindUserById());
+                sysUserLinkUserDto.setLinkUserName(uuser ==null? "":uuser.getName());
+                newRecords.add(sysUserLinkUserDto);
+            }
+        }
+        sysUserLinkUserDtoBasePageResult.setRecords(newRecords);
+        return  new BasePageResult<>(sysUserLinkQueryUserDto.getPageNum(), page.getSize(), sysUserLinkUserDtoBasePageResult.getTotal(), page.getPages(),
+                sysUserLinkUserDtoBasePageResult.getRecords());
+    }
+    /**
+     * @version
+     * @author: hxl
+     * @Date: 2024/9/10 14:53
+     * @Description: 查询掌柜鼎数据
+     */
+    @Override
+    public BasePageResult<Uuser> queryUserDxPage(SysUserLinkQueryUserDto sysUserLinkQueryUserDto) {
+        Page<Uuser> page = new Page<>(sysUserLinkQueryUserDto.getPageNum(),
+                sysUserLinkQueryUserDto.getPageSize());
+        UserQueryVo  userQueryVo =new  UserQueryVo(sysUserLinkQueryUserDto.getUserName(),sysUserLinkQueryUserDto.getMobile(),sysUserLinkQueryUserDto.getPageSize(), sysUserLinkQueryUserDto.getPageNum());
+        BasePageResult<Uuser> result = getDataByPost(userQueryVo, dxApiConfigurationProperties.getFindUserListByPage());
+        if(result!=null ){
+            return result;
+        }
+        return  new BasePageResult<>(sysUserLinkQueryUserDto.getPageNum(), page.getSize(), 0, page.getPages(),
+                new ArrayList<Uuser>());
+    }
+
+
+
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/9 14:43
+     *  @Description:  分页查询电销用户数据
+     */
+    public  BasePageResult<Uuser> getDataByPost(UserQueryVo userQueryVo, String  url){
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<UserQueryVo> requestEntity = new HttpEntity<>(userQueryVo,httpHeaders);
+        ResponseEntity<HttpResult<BasePageResult<Uuser>>> response =null;
+        ParameterizedTypeReference<HttpResult<BasePageResult<Uuser>>> typeRef = new ParameterizedTypeReference<HttpResult<BasePageResult<Uuser>>>() {};
+        try{
+            response = restTemplate.exchange(url, HttpMethod.POST, requestEntity, typeRef);
+        }catch(Exception e){
+
+        }
+        if(response!=null) {
+            HttpResult<BasePageResult<Uuser>> body =  response.getBody();
+            if (body.getCode() == 200) {
+                BasePageResult<Uuser> data = body.getData();
+                return data;
+            }
+        }
+        return  null;
+    }
+
+    public DxDataDto getDataByPost(DxDataVo dxDataVo, String  url){
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<DxDataVo> requestEntity = new HttpEntity<>(dxDataVo,httpHeaders);
+        ResponseEntity<HttpResult<DxDataDto>> response =null;
+        ParameterizedTypeReference<HttpResult<DxDataDto>> typeRef = new ParameterizedTypeReference<HttpResult<DxDataDto>>() {};
+        try{
+            response = restTemplate.exchange(url, HttpMethod.POST, requestEntity, typeRef);
+        }catch(Exception e){
+
+        }
+        if(response!=null) {
+            HttpResult<DxDataDto> body =  response.getBody();
+            if (body.getCode() == 200) {
+                DxDataDto data = body.getData();
+                return new DxDataDto(dxDataVo.getDateTime(),data.getExhaleDuration(), data.getOutgoingCallsNumber(), data.getConnectionsNumber(), data.getCallSuccessRate());
+            }
+        }
+        return  new DxDataDto(dxDataVo.getDateTime(),"-", "-", "-", "-");
+    }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/9 14:43
+     *  @Description:  根据用户id查询用户数据
+     */
+    public Uuser getDataByGet(String userId, String  url){
+        HttpHeaders httpHeaders = new HttpHeaders();
+        HttpEntity<String> requestEntity = new HttpEntity<>(userId,httpHeaders);
+        ResponseEntity<HttpResult<Uuser>> response =null;
+        ParameterizedTypeReference<HttpResult<Uuser>> typeRef = new ParameterizedTypeReference<HttpResult<Uuser>>() {};
+        try{
+            response = restTemplate.exchange(url, HttpMethod.GET, requestEntity, typeRef);
+        }catch(Exception e){
+
+        }
+        if(response!=null) {
+            HttpResult<Uuser> body =  response.getBody();
+            if (body.getCode() == 200) {
+                Uuser data = body.getData();
+                return data;
+            }
+        }
+        return  new Uuser();
+    }
+}

src/main/java/com/ydtech/modules/admin/utils/DxApiConfigurationProperties.java

@@ -19,4 +19,10 @@ public class DxApiConfigurationProperties {
 
     //通过用户id和当天日期查询数据
     private String findDataUserIdAndDayUrl;
+
+    //通过用户id查询电销数据
+    private String findUserById;
+
+    //电销用户数据分页
+    private String findUserListByPage;
 }

src/main/resources/application-pre.yml

@@ -111,7 +111,9 @@ resp_json: '{"status":"Z00001","msg":"success","data":{"invoiceType":[],"payWayL
 dx:
   api:
     findDataUserIdUrl: http://172.24.144.220:8008/dxData/listByUserId
-    findDataUserIdAndDayUrl: http://172.24.144.220:8008/dxData/listByUserIdByDay
+    findDataUserIdAndDayUrl: http://172.24.144.220:8088/dxData/listByUserIdByDay
+    findUserById: http://172.24.144.220:8008/uuser/findByUserId
+    findUserListByPage: http://172.24.144.220:8008/uuser/queryUserPage
 
 spring:
   datasource:

src/main/resources/application-prod.yml

@@ -112,7 +112,8 @@ dx:
   api:
     findDataUserIdUrl: http://172.24.144.220:8008/dxData/listByUserId
     findDataUserIdAndDayUrl: http://172.24.144.220:8008/dxData/listByUserIdByDay
-
+    findUserById: http://172.24.144.220:8008/uuser/findByUserId
+    findUserListByPage: http://172.24.144.220:8008/uuser/queryUserPage
 spring:
   datasource:
     dynamic:

src/main/resources/application-test.yml

@@ -126,7 +126,8 @@ dx:
   api:
     findDataUserIdUrl: http://172.24.144.218:8008/dxData/listByUserId
     findDataUserIdAndDayUrl: http://172.24.144.218:8008/dxData/listByUserIdByDay
-
+    findUserById: http://172.24.144.218:8008/uuser/findByUserId
+    findUserListByPage: http://172.24.144.218:8008/uuser/queryUserPage
 spring:
   datasource:
     dynamic:

src/main/resources/mapper/modules/admin/SysUserLinkDxUserIdMapper.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.admin.dao.SysUserLinkDxUserIdMapper">
+
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.admin.model.po.SysUserLinkDxUserId">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="userId" column="user_id" jdbcType="VARCHAR"/>
+            <result property="dxUserId" column="dx_user_id" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,user_id,dx_user_id,
+        create_time,create_user_id
+    </sql>
+    <select id="queryPage" resultType="com.ydtech.modules.admin.model.dto.SysUserLinkUserDto">
+        SELECT
+            su.id as userId,
+            su.NAME as userName,
+            su.dept_id as  deptId,
+            dept.NAME AS deptName,
+            dx.dx_user_id AS linkUserId,
+            su.mobile  as  mobile
+        FROM
+            sys_user su
+                LEFT JOIN sys_dept dept ON su.dept_id = dept.id
+                LEFT JOIN sys_user_link_dx_user_id  dx ON dx.user_id = su.id
+        <where>
+            su.`status`=1
+            and  dept.management_source = 3
+            <if test="vo.userName != null and vo.userName != ''">
+                AND su.NAME like CONCAT('%', #{vo.userName}, '%')
+            </if>
+            <if test="vo.mobile != null and vo.mobile != ''">
+                AND su.mobile  = #{vo.mobile }
+            </if>
+            <if test="vo.userId != null and vo.userId != ''">
+                AND su.id = #{vo.userId}
+            </if>
+            <if test="vo.deptId != null and vo.deptId != ''">
+                AND su.dept_id like CONCAT('%', #{vo.deptId}, '%')
+            </if>
+        </where>
+          order by su.id
+    </select>
+</mapper>

src/main/resources/mapper/modules/admin/SysUserLinkZgdUserIdMapper.xml

@@ -30,6 +30,7 @@
                 LEFT JOIN sys_user_link_zgd_user_id  zgd ON zgd.user_id = su.id
         <where>
             su.`status`=1
+            and  dept.management_source = 3
             <if test="vo.userName != null and vo.userName != ''">
                 AND su.NAME like CONCAT('%', #{vo.userName}, '%')
             </if>

src/main/resources/mapper/modules/admin/SysUserLinkZzbUserIdMapper.xml

@@ -30,6 +30,7 @@
         LEFT JOIN sys_user_link_zzb_user_id  zzb ON zzb.user_id = su.id
         <where>
             su.`status`=1
+            and  dept.management_source = 3
             <if test="vo.userName != null and vo.userName != ''">
                 AND su.NAME like CONCAT('%', #{vo.userName}, '%')
             </if>