Merge branch 'feature/0812_opt' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/EmployeeController.java

@@ -1,15 +1,19 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.EmployeeDao;
 import com.yonge.cooleshow.biz.dal.dto.EmployeeDto;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
 import com.yonge.cooleshow.biz.dal.entity.Employee;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.biz.dal.service.EmployeeService;
+import com.yonge.cooleshow.biz.dal.service.im.ImGroupCoreService;
 import com.yonge.cooleshow.biz.dal.vo.EmployeeVo;
+import com.yonge.cooleshow.biz.dal.wrapper.im.ImGroupWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.UserLockFlag;
@@ -47,6 +51,9 @@ public class EmployeeController extends BaseController {
     @Autowired
     private EmployeeDao employeeDao;
 
+    @Autowired
+    private ImGroupCoreService imGroupCoreService;
+
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入student")
     @ApiImplicitParams({
@@ -128,6 +135,19 @@ public class EmployeeController extends BaseController {
             employeeVo.setRoleIds(employeeDao.queryUserRole(sysUser.getId()));
             employeeVo.setSysUser(sysUser);
 
+            try {
+                ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(
+                    employeeVo.getUserId().toString(),
+                    ClientEnum.SYSTEM.getCode(),
+                    employeeVo.getUsername(),
+                    employeeVo.getAvatar()
+                );
+
+                employeeVo.setImToken(register.getImToken());
+            } catch (Exception e) {
+                throw new BizException("获取IMToken失败");
+            }
+
             BeanUtils.copyProperties(sysUser, employeeVo, "gender");
             employeeVo.setGender(GenderEnum.valueOf(sysUser.getGender()));
             return succeed(employeeVo);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/EmployeeDto.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
@@ -38,6 +39,10 @@ public class EmployeeDto extends Employee{
     @ApiModelProperty(value = "角色id列表")
     private List<Long> roleIds;
 
+    @ApiModelProperty("是否是客服")
+    @TableField(value = "customer_service_")
+    private Boolean customerService;
+
     public String getUsername() {
         return username;
     }
@@ -86,4 +91,13 @@ public class EmployeeDto extends Employee{
         this.entryDate = entryDate;
     }
 
+    @Override
+    public Boolean getCustomerService() {
+        return customerService;
+    }
+
+    @Override
+    public void setCustomerService(Boolean customerService) {
+        this.customerService = customerService;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Employee.java

@@ -65,6 +65,10 @@ public class Employee implements Serializable {
 	@TableField(value = "lock_flag_")
 	private UserLockFlag lockFlag;
 
+	@ApiModelProperty("是否是客服")
+	@TableField(value = "customer_service_")
+	private Boolean customerService;
+
 	public Long getUserId() {
 		return userId;
 	}
@@ -168,4 +172,12 @@ public class Employee implements Serializable {
 	public void setLockFlag(UserLockFlag lockFlag) {
 		this.lockFlag = lockFlag;
 	}
+
+	public Boolean getCustomerService() {
+		return customerService;
+	}
+
+	public void setCustomerService(Boolean customerService) {
+		this.customerService = customerService;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Student.java

@@ -116,6 +116,10 @@ public class Student implements Serializable {
     @TableField(value = "customer_id_")
     private Long customerId;
 
+    @ApiModelProperty("专属IM客服ID")
+    @TableField(value = "im_customer_id_")
+    private String imCustomerId;
+
     public Long getTenantId() {
         return tenantId;
     }
@@ -243,4 +247,20 @@ public class Student implements Serializable {
     public void setAvatar(String avatar) {
         this.avatar = avatar;
     }
+
+    public Long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Long customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getImCustomerId() {
+        return imCustomerId;
+    }
+
+    public void setImCustomerId(String imCustomerId) {
+        this.imCustomerId = imCustomerId;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Teacher.java

@@ -259,6 +259,10 @@ public class Teacher implements Serializable {
     @TableField(value = "customer_id_")
     private Long customerId;
 
+    @ApiModelProperty("专属IM客服ID")
+    @TableField(value = "im_customer_id_")
+    private String imCustomerId;
+
     public ESettlementFrom getSettlementFrom() {
         return settlementFrom;
     }
@@ -579,4 +583,28 @@ public class Teacher implements Serializable {
     public void setEvaluateTime(Long evaluateTime) {
         this.evaluateTime = evaluateTime;
     }
+
+    public Boolean getCustomerService() {
+        return customerService;
+    }
+
+    public void setCustomerService(Boolean customerService) {
+        this.customerService = customerService;
+    }
+
+    public Long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Long customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getImCustomerId() {
+        return imCustomerId;
+    }
+
+    public void setImCustomerId(String imCustomerId) {
+        this.imCustomerId = imCustomerId;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CustomerServiceBatchSendingServiceImpl.java

@@ -303,12 +303,40 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
             info.setSendNumber(0);
             List<Integer> receiveNums = Lists.newCopyOnWriteArrayList();
             // 条件匹配的老师、学生数量
-            query.getClientTypes().parallelStream().forEach(item -> {
+            Arrays.stream(query.getTargetGroup().split(",")).parallel().forEach(item -> {
+
+                // TEACHER: '平台老师',
+                //      STUDENT: '平台学生',
+                //      TENANT_TEACHER: '机构老师',
+                //      TENANT_STUDENT: '机构学生',
+                boolean tenantFlag = false;
+                switch (item) {
+                    case "TEACHER":
+                        item = "TEACHER";
+                        break;
+                    case "STUDENT":
+                        item = "STUDENT";
+                        break;
+                    case "TENANT_TEACHER":
+                        item = "TEACHER";
+                        tenantFlag = true;
+                        break;
+                    case "TENANT_STUDENT":
+                        item = "STUDENT";
+                        tenantFlag = true;
+                        break;
+                }
 
                 CustomerService.NotifyMessage receiveQuery = CustomerService.NotifyMessage.builder()
-                        .clientType(ClientEnum.valueOf(item))
-                        .subjectIds(Arrays.stream(info.getSendSubject().split(",")).collect(Collectors.toList()))
-                        .build();
+                    .clientType(ClientEnum.valueOf(item))
+                    .tenantFlag(tenantFlag)
+                    .delFlag(0)
+                    .lockFlag(0)
+                    //.subjectIds(Arrays.stream(info.getSendSubject().split(",")).collect(Collectors.toList()))
+                    .build();
+                if (StringUtils.isNotEmpty(info.getSendSubject())) {
+                    receiveQuery.setSubjectIds(Arrays.stream(info.getSendSubject().split(",")).collect(Collectors.toList()));
+                }
 
                 Page<CustomerService.MessageReceives> page = PageUtil.getPage(1, 10);
                 // 统计当前匹配用户数量
@@ -470,11 +498,34 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
                         List<String> targetGroups = Arrays.stream(info.getTargetGroup().split(",")).collect(Collectors.toList());
 
                         targetGroups.forEach(clientType -> {
+                            boolean tenantFlag = false;
+                            switch (clientType) {
+                                case "TEACHER":
+                                    clientType = "TEACHER";
+                                    break;
+                                case "STUDENT":
+                                    clientType = "STUDENT";
+                                    break;
+                                case "TENANT_TEACHER":
+                                    clientType = "TEACHER";
+                                    tenantFlag = true;
+                                    break;
+                                case "TENANT_STUDENT":
+                                    clientType = "STUDENT";
+                                    tenantFlag = true;
+                                    break;
+                            }
 
                             CustomerService.NotifyMessage receiveQuery = CustomerService.NotifyMessage.builder()
-                                    .clientType(ClientEnum.valueOf(clientType))
-                                    .subjectIds(Arrays.stream(info.getSendSubject().split(",")).collect(Collectors.toList()))
-                                    .build();
+                                .clientType(ClientEnum.valueOf(clientType))
+                                .tenantFlag(tenantFlag)
+                                .lockFlag(0)
+                                .delFlag(0)
+                                //.subjectIds(Arrays.stream(info.getSendSubject().split(",")).collect(Collectors.toList()))
+                                .build();
+                            if (StringUtils.isNotBlank(info.getSendSubject())) {
+                                receiveQuery.setSubjectIds(Arrays.stream(info.getSendSubject().split(",")).collect(Collectors.toList()));
+                            }
 
                             Page<CustomerService.MessageReceives> page = PageUtil.getPage(1, 10);
                             // 统计当前匹配用户数量
@@ -493,8 +544,9 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
                                         .map(x -> String.valueOf(x.getUserId()))
                                         .collect(Collectors.toList());
 
+                                String finalClientType = clientType;
                                 receiveUserIds = receiveUserIds.stream()
-                                        .map(x -> imGroupService.getImUserId(x, clientType))
+                                        .map(x -> imGroupService.getImUserId(x, finalClientType))
                                         .collect(Collectors.toList());
 
                                 // 累加线程休眠计算器，若大于指定阀值时，线程休眠1分钟

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/EmployeeServiceImpl.java

@@ -1,18 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.auth.api.entity.SysRole;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.service.SysConfigService;
-import com.yonge.cooleshow.common.constant.SysConfigConstant;
-import com.yonge.cooleshow.common.enums.SysUserType;
+import com.yonge.cooleshow.biz.dal.dao.EmployeeDao;
 import com.yonge.cooleshow.biz.dal.dto.EmployeeDto;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
+import com.yonge.cooleshow.biz.dal.entity.Employee;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.service.EmployeeService;
+import com.yonge.cooleshow.biz.dal.service.SysConfigService;
+import com.yonge.cooleshow.biz.dal.service.im.ImGroupCoreService;
 import com.yonge.cooleshow.biz.dal.vo.EmployeeVo;
+import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-
+import com.yonge.cooleshow.common.enums.SysUserType;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -21,11 +24,9 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yonge.cooleshow.auth.api.entity.SysRole;
-import com.yonge.cooleshow.biz.dal.dao.EmployeeDao;
-import com.yonge.cooleshow.biz.dal.entity.Employee;
-import com.yonge.cooleshow.biz.dal.service.EmployeeService;
-import com.yonge.toolset.mybatis.dal.BaseDAO;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
 
 @Service
 public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> implements EmployeeService {
@@ -35,6 +36,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
     @Autowired
     private SysConfigService sysConfigService;
 
+    @Autowired
+    private ImGroupCoreService imGroupCoreService;
+
     @Override
     public BaseDAO<Long, Employee> getDAO() {
         return employeeDao;
@@ -92,6 +96,13 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
         //新增员工表
         param.setUserId(sysUser.getId());
         employeeDao.insert(param);
+
+        // 员工设置为客服时，同步IM账号到三方
+        if (Optional.ofNullable(param.getCustomerService()).orElse(false)) {
+            imGroupCoreService.register(String.valueOf(param.getUserId()), ClientEnum.SYSTEM.getCode(),
+                param.getUsername(), sysUser.getAvatar());
+        }
+
         return HttpResponseResult.succeed(param);
     }
 
@@ -115,6 +126,17 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
         employeeDao.batchAddEmployeeRole(employee.getUserId(), param.getRoleIds());
 
         employeeDao.update(param);
+
+        // 员工设置为客服时，同步IM账号到三方
+        if (Optional.ofNullable(param.getCustomerService()).orElse(false)) {
+            imGroupCoreService.register(String.valueOf(param.getUserId()), ClientEnum.SYSTEM.getCode(),
+                param.getUsername(), sysUser.getAvatar());
+        } else {
+            // 员工设置为非客服时，删除IM账号
+            if (Optional.ofNullable(employee.getCustomerService()).orElse(false)) {
+                // TODO: 由客服身份变为非客户时，需要删除之前关联的IM账号，同时交接为其他客服
+            }
+        }
         return HttpResponseResult.succeed(param);
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImUserFriendServiceImpl.java

@@ -315,6 +315,12 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
      */
     @Override
     public Integer registerUserBindCustomerService(Long userId, List<Long> friendIds, ClientEnum clientType) {
+
+        // 不在加客服好友
+        if (true) {
+            return 0;
+        }
+
         if(userId == null || CollectionUtils.isEmpty(friendIds)){
             return 0;
         }
@@ -441,6 +447,11 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
             return;
         }
 
+        // 客服不加好友
+        if (true) {
+            return;
+        }
+
         try {
             if (StringUtils.isEmpty(sendMessage)) {
                 sendMessage = MK.IM_SYS_FRIEND;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -27,7 +27,6 @@ import com.yonge.cooleshow.biz.dal.enums.ImGroupType;
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.TeacherTagEnum;
 import com.yonge.cooleshow.biz.dal.enums.TeacherTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.im.EImGroupMemberRoleType;
 import com.yonge.cooleshow.biz.dal.enums.im.EImUserFriendSourceForm;
 import com.yonge.cooleshow.biz.dal.mapper.TenantGroupMapper;
 import com.yonge.cooleshow.biz.dal.mapper.UserTenantBindRecordMapper;
@@ -70,6 +69,7 @@ import com.yonge.cooleshow.common.enums.ESettlementFrom;
 import com.yonge.cooleshow.common.enums.ETenantUnBindAuditStatus;
 import com.yonge.cooleshow.common.enums.UserFirstTimeTypeEnum;
 import com.yonge.cooleshow.common.enums.UserLockFlag;
+import com.yonge.cooleshow.common.enums.UserStatusEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.util.StringUtil;
@@ -240,6 +240,17 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         VipCardRecordWrapper.UserVipInfo vipType = curVipMap.getOrDefault(userId, new VipCardRecordWrapper.UserVipInfo());
         detail.setMembershipEndTime(vipType.getCurrentVipSvipEndTime());
         detail.setVipType(vipType.getCurrentVipType());
+
+        // 设置老师帐号状态
+        if(detail.getDelFlag() == YesOrNoEnum.YES){
+            detail.setUserStatus(UserStatusEnum.CLOSED);
+        }else{
+            if(detail.getLockFlag() == UserLockFlag.LOCKED){
+                detail.setUserStatus(UserStatusEnum.LOCKED);
+            }else{
+                detail.setUserStatus(UserStatusEnum.NORMAL);
+            }
+        }
         return detail;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/EmployeeVo.java

@@ -39,6 +39,9 @@ public class EmployeeVo extends Employee {
     @ApiModelProperty(value = "用户状态 NORMAL-正常   LOCKED-冻结  CLOSED-关闭")
     private UserStatusEnum userStatus;
 
+    @ApiModelProperty(value = "imToken")
+    private String imToken;
+
     public String getUsername() {
         return username;
     }
@@ -115,4 +118,12 @@ public class EmployeeVo extends Employee {
 	public void setUserStatus(UserStatusEnum userStatus) {
 		this.userStatus = userStatus;
 	}
+
+    public String getImToken() {
+        return imToken;
+    }
+
+    public void setImToken(String imToken) {
+        this.imToken = imToken;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/im/CustomerService.java

@@ -29,12 +29,15 @@ public class CustomerService {
         private List<String> receives;
         private ClientEnum clientType;
         private String subjectId;
+        private Integer lockFlag;
+        private Integer delFlag;
         private List<String> subjectIds;
 
         private String title;
         private String txtMessage;
         private String imgMessage;
         private String imgUrl;
+        boolean tenantFlag;
 
         public static NotifyMessage from(String recv) {
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/CustomerServiceBatchSendingMapper.xml

@@ -67,6 +67,15 @@
             <if test="param.subjectIds != null">
                 AND (<foreach collection="param.subjectIds" separator="OR" item="item"> FIND_IN_SET(#{item}, t2.subject_id_) </foreach>)
             </if>
+            <if test="param.tenantFlag != null">
+                <if test="param.tenantFlag == 1">
+                    AND t2.tenant_id_ &gt; 0
+                </if>
+                <if test="param.tenantFlag == 0">
+                    AND (t2.tenant_id_  is null or t2.tenant_id_ &lt; 0)
+                </if>
+
+            </if>
         </where>
     </select>
     <!--客服消息接收者-->

cooleshow-user/user-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -188,9 +188,9 @@
             keyProperty="id">
         INSERT INTO employee
         (user_id_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,
-        entry_date_,update_time_,create_time_,introduction_,demission_date_,contact_address_)
+        entry_date_,update_time_,create_time_,introduction_,demission_date_,contact_address_,customer_service_)
         VALUES(#{userId},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},
-        #{technicalTitles},#{entryDate},now(),now(),#{introduction},#{demissionDate},#{contactAddress})
+        #{technicalTitles},#{entryDate},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{customerService})
     </insert>
 
     <update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.Employee">
@@ -229,6 +229,9 @@
             <if test="lockFlag != null">
                 lock_flag_ = #{lockFlag},
             </if>
+            <if test="customerService != null">
+                customer_service_ = #{customerService},
+            </if>
         </set>
         WHERE user_id_ = #{userId}
     </update>

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetAuthRecordMapper.xml

@@ -67,12 +67,12 @@
             </if>
             <if test="param.authStatus != null">
                 and msar.audit_state_ = #{param.authStatus}
-                <if test="param.authStatus == 'PASS'">
-                    AND ms.state_ = 1
-                </if>
-                <if test="param.authStatus == 'OUT_SALE'">
-                    AND ms.state_ = 0
-                </if>
+<!--                <if test="param.authStatus == 'PASS'">-->
+<!--                    AND ms.state_ = 1-->
+<!--                </if>-->
+<!--                <if test="param.authStatus == 'OUT_SALE'">-->
+<!--                    AND ms.state_ = 0-->
+<!--                </if>-->
             </if>
             <if test="param.createBy != null">
                 and ms.create_by_ = #{param.createBy}