1:新增批量获取商户用户信息和用户信息的接口

2:配置文件修改 3:已知bug修复

1:新增批量获取商户用户信息和用户信息的接口
2:配置文件修改 3:已知bug修复
a3d61e06 · zhangjw · b68830e4 · a3d61e06 · a3d61e06 · a3d61e06
Commit a3d61e06 authored Oct 30, 2020 by zhangjw
10 changed files
--- a/api-app/src/main/java/com/jumeirah/api/app/controller/AppUserController.java
+++ b/api-app/src/main/java/com/jumeirah/api/app/controller/AppUserController.java
@@ -18,10 +18,14 @@ import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import java.util.List;
+import java.util.Set;
 /**
 * APP用户 控制器
 *
@@ -161,5 +165,11 @@ public class AppUserController extends BaseController {
        return appUserApiService.getUserInfo(Long.valueOf(JwtUtil.getUsername(JwtTokenUtil.getToken())));
    }
+    @GetMapping("/userInfoList")
+    @ApiOperation(value = "批量获取用户信息")
+    public ApiResult<List<AppUser>> getUserInfoList(@RequestParam("uids") Set<Long> uids) {
+        return appUserApiService.getAppUserList(uids);
+    }
 }
--- a/api-app/src/main/java/com/jumeirah/api/app/service/AppUserApiService.java
+++ b/api-app/src/main/java/com/jumeirah/api/app/service/AppUserApiService.java
@@ -6,6 +6,9 @@ import com.jumeirah.common.param.app.AppUserInfoParam;
 import com.jumeirah.common.vo.app.LoginAppUserTokenVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
+import java.util.List;
+import java.util.Set;
 public interface AppUserApiService {
    /**
@@ -39,5 +42,13 @@ public interface AppUserApiService {
     */
    AppUser getUserInfo(Long userId);
+    /**
+     * 批量获取用户信息
+     *
+     * @param uids
+     * @return
+     */
+    ApiResult<List<AppUser>> getAppUserList(Set<Long> uids);
 }
--- a/api-app/src/main/java/com/jumeirah/api/app/service/impl/AppUserApiServiceImpl.java
+++ b/api-app/src/main/java/com/jumeirah/api/app/service/impl/AppUserApiServiceImpl.java
@@ -18,6 +18,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Set;
 @Service
 public class AppUserApiServiceImpl implements AppUserApiService {
@@ -59,6 +62,11 @@ public class AppUserApiServiceImpl implements AppUserApiService {
    }
    @Override
+    public ApiResult<List<AppUser>> getAppUserList(Set<Long> uids) {
+        return ApiResult.ok(appUserService.list(new QueryWrapper<AppUser>().lambda().in(AppUser::getId, uids)));
+    }
+    @Override
    public ApiResult<LoginAppUserTokenVo> register(AppSmsRegisterParam loginParam, String language) throws Exception {
        // 校验验证码
        boolean equalsRegisterCode = appSmsService.equalsRegisterCode(loginParam.getPhoneArea(), loginParam.getPhone(), loginParam.getSmsCode());

--- a/api-merchant/src/main/java/com/jumeirah/api/merchant/controller/MerchantUserController.java
+++ b/api-merchant/src/main/java/com/jumeirah/api/merchant/controller/MerchantUserController.java
 package com.jumeirah.api.merchant.controller;
+import com.jumeirah.common.entity.MerchantUser;
 import com.jumeirah.common.param.MerchantLoginParam;
 import com.jumeirah.common.param.MerchantUpdatePwdParam;
+import com.jumeirah.common.param.MerchantUserInfoParam;
 import com.jumeirah.common.service.MerchantService;
 import com.jumeirah.common.service.MerchantUserService;
 import com.jumeirah.common.vo.LoginMerUserTokenVo;
@@ -14,12 +16,10 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 /**
 * 商家用户 控制器
@@ -109,6 +109,13 @@ public class MerchantUserController extends BaseController {
        return merchantUserService.updatePwd(merchantUpdatePwdParam);
    }
+    @GetMapping("/info")
+    @OperationLogIgnore
+    @ApiOperation(value = "批量获取商户用户信息")
+    public ApiResult<List<MerchantUser>> merchantUserListByMcIdAndIds(@Validated @ModelAttribute MerchantUserInfoParam merchantUpdatePwdParam) {
+        return merchantUserService.getMerchantUserListByMcIdAndIds(merchantUpdatePwdParam);
+    }
 //    @PostMapping("/register")
 //    @OperationLogIgnore
 //    @ApiOperation(value = "注册", notes = "商家注册")

--- a/common/src/main/java/com/jumeirah/common/entity/MerchantUser.java
+++ b/common/src/main/java/com/jumeirah/common/entity/MerchantUser.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
 import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import io.swagger.annotations.ApiModel;
@@ -47,6 +48,7 @@ public class MerchantUser extends BaseEntity {
    @ApiModelProperty("昵称")
    private String nickname;
+    @JsonIgnore
    @NotBlank(message = "密码不能为空")
    @ApiModelProperty("密码")
    private String password;

--- a/common/src/main/java/com/jumeirah/common/param/MerchantUserInfoParam.java
+++ b/common/src/main/java/com/jumeirah/common/param/MerchantUserInfoParam.java
+package com.jumeirah.common.param;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Set;
+/**
+ * @author: JJww
+ * @Date:2020/10/30
+ */
+@Data
+public class MerchantUserInfoParam implements Serializable {
+    private Long mcId;
+    private Set<Long> mcUserIds;
+}
--- a/common/src/main/java/com/jumeirah/common/service/MerchantUserService.java
+++ b/common/src/main/java/com/jumeirah/common/service/MerchantUserService.java
@@ -3,6 +3,7 @@ package com.jumeirah.common.service;
 import com.jumeirah.common.entity.MerchantUser;
 import com.jumeirah.common.param.MerchantLoginParam;
 import com.jumeirah.common.param.MerchantUpdatePwdParam;
+import com.jumeirah.common.param.MerchantUserInfoParam;
 import com.jumeirah.common.param.MerchantUserPageParam;
 import com.jumeirah.common.vo.LoginMerUserTokenVo;
 import com.jumeirah.common.vo.MerchantUserQueryVo;
@@ -20,68 +21,68 @@ import java.util.List;
 */
 public interface MerchantUserService extends BaseService<MerchantUser> {
-        /**
+    /**
-         * 保存
+     * 保存
-         *
+     *
-         * @param merchantUser
+     * @param merchantUser
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        boolean saveMerchantUser(MerchantUser merchantUser) throws Exception;
+    boolean saveMerchantUser(MerchantUser merchantUser) throws Exception;
-        /**
+    /**
-         * 登录
+     * 登录
-         *
+     *
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        ApiResult<LoginMerUserTokenVo> login(MerchantLoginParam merchantLoginParam) throws Exception;
+    ApiResult<LoginMerUserTokenVo> login(MerchantLoginParam merchantLoginParam) throws Exception;
-        ApiResult<Boolean> updatePwd(MerchantUpdatePwdParam merchantUpdatePwdParam) throws Exception;
+    ApiResult<Boolean> updatePwd(MerchantUpdatePwdParam merchantUpdatePwdParam) throws Exception;
 //        ApiResult<Boolean> register(MerchantRegisterParam merchantRegisterParam) throws Exception;
-        /**
+    /**
-         * 修改
+     * 修改
-         *
+     *
-         * @param merchantUser
+     * @param merchantUser
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        boolean updateMerchantUser(MerchantUser merchantUser) throws Exception;
+    boolean updateMerchantUser(MerchantUser merchantUser) throws Exception;
-        /**
+    /**
-         * 删除
+     * 删除
-         *
+     *
-         * @param id
+     * @param id
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        boolean deleteMerchantUser(Long id) throws Exception;
+    boolean deleteMerchantUser(Long id) throws Exception;
-        /**
+    /**
-         * 根据ID获取查询对象
+     * 根据ID获取查询对象
-         *
+     *
-         * @param id
+     * @param id
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        MerchantUserQueryVo getMerchantUserById(Long id) throws Exception;
+    MerchantUserQueryVo getMerchantUserById(Long id) throws Exception;
-        /**
+    /**
-         * 获取分页对象
+     * 获取分页对象
-         *
+     *
-         * @param merchantUserPageParam
+     * @param merchantUserPageParam
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        Paging<MerchantUserQueryVo> getMerchantUserPageList(MerchantUserPageParam merchantUserPageParam) throws Exception;
+    Paging<MerchantUserQueryVo> getMerchantUserPageList(MerchantUserPageParam merchantUserPageParam) throws Exception;
-        List<MerchantUserQueryVo> getMerchantUserListByMcId(Long mcId) throws Exception;
+    List<MerchantUserQueryVo> getMerchantUserListByMcId(Long mcId) throws Exception;
+    ApiResult<List<MerchantUser>> getMerchantUserListByMcIdAndIds(MerchantUserInfoParam merchantUserInfoParam);
 }
--- a/common/src/main/java/com/jumeirah/common/service/impl/MerchantUserServiceImpl.java
+++ b/common/src/main/java/com/jumeirah/common/service/impl/MerchantUserServiceImpl.java
@@ -12,6 +12,7 @@ import com.jumeirah.common.enums.StateEnum;
 import com.jumeirah.common.mapper.MerchantUserMapper;
 import com.jumeirah.common.param.MerchantLoginParam;
 import com.jumeirah.common.param.MerchantUpdatePwdParam;
+import com.jumeirah.common.param.MerchantUserInfoParam;
 import com.jumeirah.common.param.MerchantUserPageParam;
 import com.jumeirah.common.service.MerchantPermissionService;
 import com.jumeirah.common.service.MerchantService;
@@ -331,8 +332,13 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
    @Override
    public List<MerchantUserQueryVo> getMerchantUserListByMcId(Long mcId) throws Exception {
        return merchantUserMapper.getMerchantUserListByMcId(mcId);
    }
+    @Override
+    public ApiResult<List<MerchantUser>> getMerchantUserListByMcIdAndIds(MerchantUserInfoParam merchantUserInfoParam) {
+        return ApiResult.ok(baseMapper.selectList(new QueryWrapper<MerchantUser>().lambda()
+                .eq(MerchantUser::getMcId, merchantUserInfoParam.getMcId()).in(MerchantUser::getId, merchantUserInfoParam.getMcUserIds())));
+    }
 }
--- a/customer-service/src/main/java/com/ym/im/service/impl/StaffSingleChatServiceImpl.java
+++ b/customer-service/src/main/java/com/ym/im/service/impl/StaffSingleChatServiceImpl.java
@@ -27,6 +27,8 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 import static com.ym.im.entity.ChatRecord.RECEIVE;
@@ -104,7 +106,9 @@ public class StaffSingleChatServiceImpl implements ChatService {
        final UserSocketInfo userSocketInfo = channelGroup.USER_GROUP.get(userId);
        if (userSocketInfo == null) {
            //用户不在线,保存最后发送消息的客服ID
-            redisTemplate.opsForHash().put(NettyConstant.IM_USERS, userId, id);
+            Map<Long, Long> staff = new HashMap<>();
+            staff.put(merchantId, id);
+            redisTemplate.opsForHash().put(NettyConstant.IM_USERS, userId, staff);
            //推送通知
            pushNotifications(userId);
            return null;

--- a/customer-service/src/main/resources/application-test.yml
+++ b/customer-service/src/main/resources/application-test.yml
@@ -36,7 +36,7 @@ spring:
      simple:
        default-requeue-rejected: false
  redis:
-    database: 5
+    database: 0
    host: 127.0.0.1
    port: 6379
    password: temple123456