diff --git a/im-center-common/src/main/java/cn/axzo/im/center/common/enums/AppTypeEnum.java b/im-center-common/src/main/java/cn/axzo/im/center/common/enums/AppTypeEnum.java index 9b70191..25b5602 100644 --- a/im-center-common/src/main/java/cn/axzo/im/center/common/enums/AppTypeEnum.java +++ b/im-center-common/src/main/java/cn/axzo/im/center/common/enums/AppTypeEnum.java @@ -14,8 +14,8 @@ import org.apache.commons.lang3.StringUtils; @Getter public enum AppTypeEnum { - WORKER("worker", "工人端"), - ENTERPRISE("enterprise", "企业端"), + WORKER("cm", "工人端"), + ENTERPRISE("cmp", "企业管理端"), SYSTEM("system", "服务器"); diff --git a/im-center-server/src/main/java/cn/axzo/im/channel/netease/INotifyService.java b/im-center-server/src/main/java/cn/axzo/im/channel/netease/INotifyService.java index ea4356f..c2050d5 100644 --- a/im-center-server/src/main/java/cn/axzo/im/channel/netease/INotifyService.java +++ b/im-center-server/src/main/java/cn/axzo/im/channel/netease/INotifyService.java @@ -11,7 +11,16 @@ public interface INotifyService { /** * 机器人信息变更,通知到IM用户系统 - * @param robotId + * + * @param robotPrimaryId */ void notifyAccountChange(Long robotPrimaryId); + + /** + * 普通用户信息变更,通知到IM用户系统 + * + * @param userId + * @param nickName + */ + void notifyUserAccountChange(String userId, String nickName); } diff --git a/im-center-server/src/main/java/cn/axzo/im/dao/repository/RobotTagDao.java b/im-center-server/src/main/java/cn/axzo/im/dao/repository/RobotTagDao.java index 504a75e..a40e523 100644 --- a/im-center-server/src/main/java/cn/axzo/im/dao/repository/RobotTagDao.java +++ b/im-center-server/src/main/java/cn/axzo/im/dao/repository/RobotTagDao.java @@ -29,10 +29,12 @@ public class RobotTagDao extends ServiceImpl { */ public IPage queryRobotTagOfPage(RobotTagQuery robotTagQuery) { return lambdaQuery().eq(RobotTag::getIsDelete, 0) - .like(StringUtils.isNoneBlank(robotTagQuery.getTagName()), + .like(StringUtils.isNotBlank(robotTagQuery.getTagName()), RobotTag::getTagName, robotTagQuery.getTagName()) - .eq(RobotTag::getStatus, robotTagQuery.getStatus()) + .eq(robotTagQuery.getStatus() != null, + RobotTag::getStatus, + robotTagQuery.getStatus()) .orderByDesc(RobotTag::getWeight) .page(robotTagQuery.toPage()); } diff --git a/im-center-server/src/main/java/cn/axzo/im/service/NotifyChannelServiceImpl.java b/im-center-server/src/main/java/cn/axzo/im/service/NotifyChannelServiceImpl.java index 813c27f..4b2c7b3 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/NotifyChannelServiceImpl.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/NotifyChannelServiceImpl.java @@ -3,6 +3,7 @@ package cn.axzo.im.service; import cn.axzo.im.center.api.vo.resp.RobotInfoResp; import cn.axzo.im.center.api.vo.resp.RobotMsgTemplateResp; import cn.axzo.im.center.api.vo.resp.RobotTagResp; +import cn.axzo.im.center.common.enums.AccountTypeEnum; import cn.axzo.im.channel.IMChannelProvider; import cn.axzo.im.channel.netease.INotifyService; import cn.axzo.im.channel.netease.dto.RegisterUpdateRequest; @@ -52,6 +53,7 @@ public class NotifyChannelServiceImpl implements INotifyService { robotInfoResp.setMsgTemplateList(robotMsgTemplate.getMsgTemplateList()); } HashMap userProfileMap = Maps.newHashMap(); + userProfileMap.put("accountType", AccountTypeEnum.ROBOT.getCode()); List robotTags = robotInfoResp.getRobotTagList(); if (CollectionUtils.isNotEmpty(robotTags)) { robotTags.forEach(robotTagResp -> { @@ -71,4 +73,19 @@ public class NotifyChannelServiceImpl implements INotifyService { } + + @Override + public void notifyUserAccountChange(String userId, String nickName) { + HashMap userProfileMap = Maps.newHashMap(); + userProfileMap.put("accountType", AccountTypeEnum.USER.getCode()); + String extJson = JSONUtil.toJsonStr(userProfileMap); + RegisterUpdateRequest updateProfile = new RegisterUpdateRequest(); + updateProfile.setExtJson(extJson); + updateProfile.setAccid(userId); + updateProfile.setName(nickName); + log.info("更新普通用户:{},网易云信账户信息", JSONUtil.toJsonStr(updateProfile)); + channelProvider.updateAccountProfile(updateProfile); + + } + } diff --git a/im-center-server/src/main/java/cn/axzo/im/service/RobotInfoService.java b/im-center-server/src/main/java/cn/axzo/im/service/RobotInfoService.java index ebadcd9..319e0ab 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/RobotInfoService.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/RobotInfoService.java @@ -16,7 +16,6 @@ import cn.axzo.im.dao.repository.RobotTagDao; import cn.axzo.im.entity.RobotInfo; import cn.axzo.im.entity.RobotTag; import cn.axzo.im.utils.BeanConvertUtils; -import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -56,9 +55,6 @@ public class RobotInfoService { @Resource private RobotTagService robotTagService; - @Resource - private NotifyChannelService notifyChannelService; - @Transactional(rollbackFor = Exception.class) public RobotInfoResp saveRobotInfo(@Valid RobotInfoReq robotInfoRequest, INotifyService iNotifyService) { verifyRobotName(robotInfoRequest.getNickName(), null); diff --git a/im-center-server/src/main/java/cn/axzo/im/service/RobotMsgTemplateService.java b/im-center-server/src/main/java/cn/axzo/im/service/RobotMsgTemplateService.java index f604f4a..b408a78 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/RobotMsgTemplateService.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/RobotMsgTemplateService.java @@ -36,9 +36,6 @@ public class RobotMsgTemplateService { @Resource private RobotInfoDao robotInfoDao; - @Resource - private NotifyChannelService notifyChannelService; - public RobotMsgTemplateResp queryRobotMsgTemplateList(String robotId) { RobotMsgTemplate robotMsgTemplate = robotMsgTemplateDao.lambdaQuery().eq(RobotMsgTemplate::getIsDelete, 0) .eq(RobotMsgTemplate::getRobotId, robotId).one();