新增客户名称

zxkf-api/src/main/java/api/controller/online/LinkController.java

@@ -1,5 +1,6 @@
 package api.controller.online;
 
+import api.entity.view.online.LinkView;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,19 +31,19 @@ public class LinkController extends BaseController {
     public AjaxResult getList(Link input, PageInput pageInput) {
         LambdaQueryWrapper<Link> qw = new LambdaQueryWrapper();
         qw.like(!StringHelper.isEmpty(input.getKhUser()), Link::getKhUser, input.getKhUser());
-        if(!StringHelper.isEmpty(input.getKfUser())) {
+        if (!StringHelper.isEmpty(input.getKfUser())) {
             qw.eq(Link::getKfUser, input.getKfUser());
-        }else {
+        } else {
             qw.eq(Link::getKfUser, CurrentUser().getUserName());
         }
-        qw.eq(input.getLastTime() != null , Link::getLastTime, input.getLastTime());
+        qw.eq(input.getLastTime() != null, Link::getLastTime, input.getLastTime());
         qw.orderByDesc(Link::getLastTime);
         Page<Link> page = GetPage(pageInput);
         if (page != null) {
-            IPage<Link> iPage = linkService.getListPage(page, qw);
+            IPage<LinkView> iPage = linkService.selectMultipleList(page, qw);
             return Success("成功", iPage.getRecords(), iPage.getTotal());
         } else {
-            return Success("成功", linkService.getList(qw));
+            return Success("成功", linkService.selectMultipleList(qw));
         }
     }
 

zxkf-entity/src/main/java/api/entity/view/online/LinkView.java

@@ -0,0 +1,12 @@
+package api.entity.view.online;
+
+import api.entity.database.online.Link;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LinkView extends Link {
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    private String khUserName;
+}

zxkf-mapper/src/main/java/api/mapper/online/LinkMapper.java

@@ -1,9 +1,19 @@
 package api.mapper.online;
 
+import api.entity.view.online.LinkView;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import api.entity.database.online.Link;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface LinkMapper extends BaseMapper<Link> {
+    //分页获取列表
+    public IPage<LinkView> selectMultipleList(IPage<Link> page, @Param(Constants.WRAPPER) Wrapper<Link> queryWrapper);
+
+    //获取列表
+    public LinkView[] selectMultipleList(@Param(Constants.WRAPPER) Wrapper<Link> queryWrapper);
 }

zxkf-mapper/src/main/resources/mapper/online/LinkMapper.xml

@@ -0,0 +1,16 @@
+<?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="api.mapper.online.LinkMapper">
+    <select id="selectMultipleList" resultType="api.entity.view.online.LinkView" >
+        select l.id,
+               l.kh_user,
+               l.kf_user,
+               l.last_time,
+               c.customer_name as kh_user_name
+        from online_link l
+        left join sys_customer c on l.kh_user = c.customer_no
+        ${ew.customSqlSegment}
+    </select>
+</mapper>

zxkf-service/src/main/java/api/service/online/ILinkService.java

@@ -1,7 +1,18 @@
 package api.service.online;
 
 import api.entity.database.online.Link;
+import api.entity.view.online.LinkView;
 import api.service.IBaseService;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
 
 public interface ILinkService extends IBaseService<Link> {
+
+    //分页获取列表
+    public IPage<LinkView> selectMultipleList(IPage<Link> page, @Param(Constants.WRAPPER) Wrapper<Link> queryWrapper);
+
+    //获取列表
+    public LinkView[] selectMultipleList(@Param(Constants.WRAPPER) Wrapper<Link> queryWrapper);
 }

zxkf-service/src/main/java/api/service/online/impl/LinkServiceImpl.java

@@ -1,9 +1,14 @@
 package api.service.online.impl;
 
 import api.entity.database.online.Link;
+import api.entity.view.online.LinkView;
 import api.mapper.online.LinkMapper;
 import api.service.online.ILinkService;
 import api.service.BaseServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -11,4 +16,17 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class LinkServiceImpl extends BaseServiceImpl<LinkMapper, Link> implements ILinkService{
     public LinkServiceImpl(){ super(false); }
+
+
+    //分页获取列表
+    @Override
+    public IPage<LinkView> selectMultipleList(IPage<Link> page, @Param(Constants.WRAPPER) Wrapper<Link> queryWrapper){
+        return baseMapper.selectMultipleList(page,queryWrapper);
+    }
+
+    //获取列表
+    @Override
+    public LinkView[] selectMultipleList(@Param(Constants.WRAPPER) Wrapper<Link> queryWrapper){
+        return baseMapper.selectMultipleList(queryWrapper);
+    }
 }

zxkf-service/src/main/java/api/service/websocket/WebSocket.java

@@ -16,7 +16,6 @@ import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.PostConstruct;
 import javax.websocket.*;