新增客服添加套餐上限校验

im-admin-ui/src/views/im/chatPackage/component/allocatePackagesDialog.vue

@@ -0,0 +1,106 @@
+<template>
+  <el-dialog v-model="dialogVisible" title="套餐分配" width="500px" append-to-body>
+    <el-form ref="allocateFormRef" :model="formData" :rules="rules" label-width="100px">
+      <el-form-item label="选择代理" prop="agentId">
+        <el-select v-model="formData.agentId" placeholder="请选择代理" style="width: 100%">
+          <el-option v-for="item in agentOptions" :key="item.id" :label="item.agentName" :value="item.id" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">分配</el-button>
+        <el-button @click="cancel">取消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { getAllAgentNameList, allocatePackages } from '@/api/im/chatPackage';
+import { nextTick } from 'vue';
+
+interface Emits {
+  (e: 'success'): void;
+  (e: 'close'): void;
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const emit = defineEmits<Emits>();
+
+interface Props {
+  packageId?: number;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  packageId: undefined
+});
+
+const dialogVisible = ref(false);
+const allocateFormRef = ref();
+const agentOptions = ref([]);
+const formData = ref({
+  agentId: undefined,
+  packageId: undefined
+});
+const rules = {
+  agentId: [{ required: true, message: '请选择代理', trigger: 'change' }]
+};
+
+const openDialog = async () => {
+  dialogVisible.value = true;
+  // 等待组件渲染完成后再清空表单
+  await nextTick();
+  resetForm();
+  await loadAgentOptions();
+};
+
+const loadAgentOptions = async () => {
+  try {
+    const res = await getAllAgentNameList();
+    agentOptions.value = res.data || [];
+  } catch (error) {
+    console.error('加载代理列表失败:', error);
+    proxy?.$modal.msgError('加载代理列表失败');
+  }
+};
+
+const resetForm = () => {
+  allocateFormRef.value?.resetFields();
+  formData.value = {
+    agentId: undefined,
+    packageId: props.packageId
+  };
+};
+
+const submitForm = async () => {
+  allocateFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      try {
+        const params = {
+          agentId: formData.value.agentId,
+          packageId: props.packageId
+        };
+
+        await allocatePackages(params);
+        proxy?.$modal.msgSuccess('分配成功');
+        dialogVisible.value = false;
+        emit('success');
+      } catch (error) {
+        console.error('分配失败:', error);
+        proxy?.$modal.msgError('分配失败');
+      }
+    }
+  });
+};
+
+const cancel = () => {
+  dialogVisible.value = false;
+  emit('close');
+};
+
+defineExpose({
+  openDialog
+});
+</script>

im-admin-ui/src/views/im/customer/index.vue

@@ -156,13 +156,27 @@ const data = reactive<PageData<UserForm, UserQuery>>({
     nickName: undefined,
     params: {}
   },
-  rules: {}
+  rules: {
+    headImage: [{ required: true, message: '头像不能为空', trigger: 'change' }],
+    userName: [
+      { required: true, message: '账号不能为空', trigger: 'change' },
+      { min: 2, max: 20, message: '账号长度在2到20个字符之间', trigger: 'change' }
+    ],
+    password: [
+      { required: true, message: '密码不能为空', trigger: 'change' },
+      { min: 6, max: 20, message: '密码长度在6到20个字符之间', trigger: 'change' }
+    ],
+    sex: [{ required: true, message: '性别不能为空', trigger: 'change' }],
+    nickName: [
+      { required: true, message: '昵称不能为空', trigger: 'change' },
+      { min: 2, max: 20, message: '昵称长度在2到20个字符之间', trigger: 'change' }
+    ]
+  }
 });
 const { queryParams, form, rules } = toRefs(data);
 
 const { im_bool } = toRefs<any>(proxy?.useDict('im_bool'));
 const { sys_user_sex } = toRefs<any>(proxy?.useDict('sys_user_sex'));
-console.log(sys_user_sex);
 /** 提交按钮 */
 const submitForm = () => {
   userFormRef.value?.validate(async (valid: boolean) => {

im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserController.java

@@ -151,8 +151,6 @@ public class ImUserController extends BaseController {
     @SaCheckPermission("im:user:listCustomer")
     @GetMapping("/listCustomer")
     public TableDataInfo<ImUserVo> listCustomer(ImUserBo bo, PageQuery pageQuery) {
-        System.out.println("ImUserBo" + bo);
-        System.out.println("PageQuery" + pageQuery);
         return userService.queryPageListCustomer(bo, pageQuery);
     }
 
@@ -174,6 +172,9 @@ public class ImUserController extends BaseController {
         }
 
         //检查是否已达当前角色使用的套餐客服上限
+        if(userService.isCustomerLimited()) {
+            return R.fail("客服已达上限");
+        }
 
         // 设置默认值
         String username = user.getUserName();

im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImAgentService.java

@@ -1,5 +1,6 @@
 package org.dromara.im.service;
 
+import org.dromara.im.domain.ImAgent;
 import org.dromara.im.domain.vo.ImAgentVo;
 import org.dromara.im.domain.bo.ImAgentBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -79,4 +80,12 @@ public interface IImAgentService {
      * @return 代理ID和名称的Map列表
      */
     List<Map<String, Object>> getAllAgentNameList();
+
+
+   /**
+    * 根据令牌获取代理对象
+    * @param token 用于标识代理的唯一令牌字符串
+    * @return 返回与令牌匹配的ImAgent对象，如果没有找到匹配的代理则可能返回null
+    */
+    ImAgent getAgentByToken(String token);
 }

im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserService.java

@@ -144,4 +144,10 @@ public interface IImUserService {
      */
     void updateBatchUser(List<BatchUpdateUserDto> list);
 
+    /**
+     * 判断当前角色客服数量是否达到上限
+     *
+     */
+    boolean isCustomerLimited();
+
 }

im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImAgentServiceImpl.java

@@ -190,4 +190,11 @@ public class ImAgentServiceImpl implements IImAgentService {
             return map;
         }).collect(Collectors.toList());
     }
+
+    @Override
+    public ImAgent getAgentByToken(String token) {
+        LambdaQueryWrapper<ImAgent> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(ImAgent::getUniqueToken, token);
+        return baseMapper.selectOne(lqw);
+    }
 }

im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java

@@ -15,6 +15,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.im.constant.ImConstant;
 import org.dromara.im.constant.ImRedisKey;
+import org.dromara.im.domain.ImAgent;
 import org.dromara.im.domain.ImUser;
 import org.dromara.im.domain.bo.ImUserBo;
 import org.dromara.im.domain.dto.BatchUpdateUserDto;
@@ -382,4 +383,31 @@ public class ImUserServiceImpl implements IImUserService {
         
         baseMapper.updateBatchById(temp);
     }
+
+    @Override
+    public boolean isCustomerLimited() {
+        // 获取当前用户的唯一标识token
+        String uniqueToken = imAgentService.getTokenByUserId();
+
+        //获取当前用户数
+        LambdaQueryWrapper<ImUser> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(ImUser::getUniqueToken, uniqueToken);
+        List<ImUser> list = baseMapper.selectList(wrapper);
+        int nowCustomerCount = 0;
+        if (list != null && !list.isEmpty()) {
+            nowCustomerCount = list.size();
+        }
+
+        //获取用户上限
+        ImAgent agent = imAgentService.getAgentByToken(uniqueToken);
+        int limit = 0;
+        if (agent != null && agent.getMaxCustomer() != null) {
+            limit = Math.toIntExact(agent.getMaxCustomer());
+        }
+
+        System.out.println("当前用户数：" + nowCustomerCount + "，上限：" + limit);
+
+        //返回结果 达到极限返回true
+        return nowCustomerCount >= limit;
+    }
 }