修复客服所在群功能BUG

src/main/java/com/mokamrp/privates/controller/WorkEmployeeController.java

@@ -144,6 +144,5 @@ public class WorkEmployeeController extends BaseController<WorkEmployee> {
 
         return AjaxResult.success("正在异步生成请稍后");
     }
-
 }
 

src/main/java/com/mokamrp/privates/mapper/WorkContactRoomMapper.java

@@ -8,6 +8,7 @@ import com.mokamrp.privates.mapper.pojo.WorkContactRoom;
 import com.mokamrp.privates.mapper.pojo.WorkRoom;
 import com.mokamrp.privates.mapper.vo.WorkContactRoomByRoomIdVo;
 import com.mokamrp.privates.mapper.vo.WorkContactRoomGroupDataVo;
+import com.mokamrp.privates.mapper.vo.WorkEmployeeRoom;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -27,5 +28,5 @@ public interface WorkContactRoomMapper extends BaseMapper<WorkContactRoom> {
 
     Integer getListByRoomIdTotal(@Param("ew") QueryWrapper<WorkContactRoomByRoomIdVo> queryWrapper);
 
-    List<WorkRoom> getRoomByEmployeeId(Page<WorkRoom> page, @Param("employeeId") Integer employeeId);
+    List<WorkEmployeeRoom> getRoomByEmployeeId(Page<WorkEmployeeRoom> page, @Param("employeeId") Integer employeeId);
 }

src/main/java/com/mokamrp/privates/mapper/WorkContactRoomMapper.xml

@@ -72,8 +72,12 @@
         WHERE
             ${ew.sqlSegment}
     </select>
-    <select id="getRoomByEmployeeId" resultType="com.mokamrp.privates.mapper.pojo.WorkRoom">
-        SELECT B.*,C.name as corp_name,D.name AS owner_name,E.member_cnt FROM mc_work_contact_room AS A
+    <select id="getRoomByEmployeeId" resultType="com.mokamrp.privates.mapper.vo.WorkEmployeeRoom">
+        SELECT B.*,
+               C.name as corp_name,
+               D.name AS owner_name,
+               E.member_cnt
+          FROM mc_work_contact_room AS A
           LEFT JOIN mc_work_room AS B ON A.room_id = B.id
           LEFT JOIN mc_corp AS C ON B.corp_id = C.id
           LEFT JOIN mc_work_employee AS D ON B.owner_id = D.id

src/main/java/com/mokamrp/privates/mapper/pojo/WorkRoom.java

@@ -1,6 +1,7 @@
 package com.mokamrp.privates.mapper.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -63,6 +64,7 @@ public class WorkRoom extends Model<WorkRoom> {
     private Integer roomGroupId;
     private String corpName;
     private String ownerName;
+
     private Integer memberCnt = 0;
     private Date createdAt;
     private Date updatedAt;

src/main/java/com/mokamrp/privates/mapper/vo/WorkEmployeeRoom.java

@@ -0,0 +1,193 @@
+package com.mokamrp.privates.mapper.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 客户群表
+ * </p>
+ *
+ * @author gy
+ * @since 2021-04-21
+ */
+@Data
+public class WorkEmployeeRoom {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    /**
+     * 企业表ID（mc_corp.id）
+     */
+    private Integer corpId;
+    /**
+     * 客户群ID
+     */
+    private String wxChatId;
+    /**
+     * 客户群名称
+     */
+    private String name;
+    /**
+     * 群主ID（work_employee.id）
+     */
+    private Integer ownerId;
+    /**
+     * 群公告
+     */
+    private String notice;
+    /**
+     * 客户群状态（0 - 正常 1 - 跟进人离职 2 - 离职继承中 3 - 离职继承完成）
+     */
+    private Integer status;
+    /**
+     * 群创建时间
+     */
+    private Date createTime;
+    /**
+     * 群成员上限
+     */
+    private Integer roomMax;
+    /**
+     * 分组id（work_room_group.id）
+     */
+    private Integer roomGroupId;
+    private String corpName;
+    private String ownerName;
+
+    private Integer memberCnt = 0;
+    private Date createdAt;
+    private Date updatedAt;
+    private Date deletedAt;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCorpId() {
+        return corpId;
+    }
+
+    public void setCorpId(Integer corpId) {
+        this.corpId = corpId;
+    }
+
+    public String getWxChatId() {
+        return wxChatId;
+    }
+
+    public void setWxChatId(String wxChatId) {
+        this.wxChatId = wxChatId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getOwnerId() {
+        return ownerId;
+    }
+
+    public void setOwnerId(Integer ownerId) {
+        this.ownerId = ownerId;
+    }
+
+    public String getNotice() {
+        return notice;
+    }
+
+    public void setNotice(String notice) {
+        this.notice = notice;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getRoomMax() {
+        return roomMax;
+    }
+
+    public void setRoomMax(Integer roomMax) {
+        this.roomMax = roomMax;
+    }
+
+    public Integer getRoomGroupId() {
+        return roomGroupId;
+    }
+
+    public void setRoomGroupId(Integer roomGroupId) {
+        this.roomGroupId = roomGroupId;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Date getDeletedAt() {
+        return deletedAt;
+    }
+
+    public void setDeletedAt(Date deletedAt) {
+        this.deletedAt = deletedAt;
+    }
+
+
+    @Override
+    public String toString() {
+        return "WorkRoom{" +
+                ", id=" + id +
+                ", corpId=" + corpId +
+                ", wxChatId=" + wxChatId +
+                ", name=" + name +
+                ", ownerId=" + ownerId +
+                ", notice=" + notice +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", roomMax=" + roomMax +
+                ", roomGroupId=" + roomGroupId +
+                ", createdAt=" + createdAt +
+                ", updatedAt=" + updatedAt +
+                ", deletedAt=" + deletedAt +
+                "}";
+    }
+}

src/main/java/com/mokamrp/privates/service/impl/WorkContactRoomServiceImpl.java

@@ -12,6 +12,7 @@ import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.pojo.WorkContactRoom;
 import com.mokamrp.privates.mapper.pojo.WorkRoom;
 import com.mokamrp.privates.mapper.vo.WorkContactRoomByRoomIdVo;
+import com.mokamrp.privates.mapper.vo.WorkEmployeeRoom;
 import com.mokamrp.privates.service.WorkContactRoomService;
 import com.mokamrp.privates.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,12 +85,12 @@ public class WorkContactRoomServiceImpl extends ServiceImpl<WorkContactRoomMappe
 
         return resMap;
     }
-
+    //.@leon 获取客户所在群信息
     public Map<String,Object> getRoomByEmployeeId(PostBasePageHandle pageHandle){
         Integer page = pageHandle.getPage();
         Integer pagesize = pageHandle.getPagesize();
-        Page<WorkRoom> pageObj = new Page<WorkRoom>(page, pagesize);
-        List<WorkRoom> list = mapperObj.getRoomByEmployeeId(pageObj,pageHandle.getId());
+        Page<WorkEmployeeRoom> pageObj = new Page<WorkEmployeeRoom>(page, pagesize);
+        List<WorkEmployeeRoom> list = mapperObj.getRoomByEmployeeId(pageObj,pageHandle.getId());
         Map<String,Object> res = new HashMap<>();
         res.put("list",list);
         res.put("total",pageObj.getTotal());

src/main/resources/application-local.properties

@@ -1,7 +1,7 @@
 server.port=8085
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://rm-uf618jc32u2o80g55oo.mysql.rds.aliyuncs.com:3306/mochat?serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://rm-uf618jc32u2o80g55oo.mysql.rds.aliyuncs.com:3306/mochat
 spring.datasource.username=typer
 spring.datasource.password=jch9sh_shl
 spring.datasource.max-idle=10
@@ -31,10 +31,12 @@ aliyun.bucketName=mini-short-video-test
 spring.servlet.multipart.max-request-size=10MB
 spring.servlet.multipart.max-file-size=10MB
 
-xxl.sso.server=http://test.sso.mokamrp.com/sso
+xxl.sso.server=https://sso.mokamrp.com/sso
 xxl.sso.logout.path=/logout
 xxl-sso.excluded.paths=/healthy
+#xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72pd.redis.rds.aliyuncs.com:23563/0
 
-menu.host=http://test.space-server.mokamrp.com/space/menu/getMenuInterface?sysCode=1006&userId=
+menu.host=http://space-server.mokamrp.com/space/menu/getMenuInterface?sysCode=1006&userId=
+
 

src/main/resources/application-test.properties

@@ -30,11 +30,13 @@ aliyun.accessKeySecret=irLfHOni7ffLU3yAf3LsKEXwQLfrNc
 aliyun.bucketName=mini-short-video-test
 spring.servlet.multipart.max-request-size=10MB
 spring.servlet.multipart.max-file-size=10MB
+
 xxl.sso.server=https://sso.mokamrp.com/sso
 xxl.sso.logout.path=/logout
 xxl-sso.excluded.paths=/healthy
 #xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72pd.redis.rds.aliyuncs.com:23563/0
+
 menu.host=http://space-server-in-svc/space/menu/getMenuInterface?sysCode=1006&userId=