La123123.
/
im-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

套餐管理页面/参数修正

master
La123123 1 month ago
parent
b0554643d7
commit
d261f50043
4 changed files with 100 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      im-admin-ui/src/api/im/chatPackage/types.ts
  2. 139
      im-admin-ui/src/views/im/chatPackage/index.vue
  3. 17
      im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImChatPackageVo.java
  4. 18
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImChatPackageServiceImpl.java

6
im-admin-ui/src/api/im/chatPackage/types.ts
View File

@ -23,7 +23,6 @@ export interface ChatPackageVO {
* 创建时间
*/
createdTime: string;
}
export interface ChatPackageForm extends BaseEntity {
@ -66,11 +65,9 @@ export interface ChatPackageForm extends BaseEntity {
* 备注
*/
remark?: string;
}
export interface ChatPackageQuery extends PageQuery {
/**
* 套餐名称
*/
@ -91,6 +88,3 @@ export interface ChatPackageQuery extends PageQuery {
*/
params?: any;
}

139
im-admin-ui/src/views/im/chatPackage/index.vue
View File

@ -7,9 +7,9 @@
<el-form-item label="套餐名称" prop="packageName">
<el-input v-model="queryParams.packageName" placeholder="请输入套餐名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="状态：0-禁用 1-启用" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态：0-禁用 1-启用" clearable >
<el-option v-for="dict in commom_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option v-for="dict in commom_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
@ -25,30 +25,34 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['im:chatPackage:add']">新增</el-button>
<el-button v-hasPermi="['im:chatPackage:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['im:chatPackage:edit']">修改</el-button>
<el-button v-hasPermi="['im:chatPackage:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['im:chatPackage:remove']">删除</el-button>
<el-button v-hasPermi="['im:chatPackage:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['im:chatPackage:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
<!-- <el-col :span="1.5">
<el-button v-hasPermi="['im:chatPackage:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
</el-col> -->
<right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="chatPackageList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键ID" align="center" prop="id" v-if="false" />
<!-- <el-table-column label="主键ID" align="center" prop="id" v-if="true" /> -->
<el-table-column label="套餐名称" align="center" prop="packageName" />
<el-table-column label="客服数量" align="center" prop="customerServiceNumber" />
<el-table-column label="套餐持续时间" align="center" prop="durationDays" />
<el-table-column label="状态：0-禁用 1-启用" align="center" prop="status">
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="commom_status" :value="scope.row.status"/>
<dict-tag :options="commom_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180">
@ -59,25 +63,26 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['im:chatPackage:edit']"></el-button>
<el-button v-hasPermi="['im:chatPackage:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['im:chatPackage:remove']"></el-button>
<el-button v-hasPermi="['im:chatPackage:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
</el-card>
<!-- 添加或修改套餐对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="chatPackageFormRef" :model="form" :rules="rules" label-width="80px">
<el-dialog v-model="dialog.visible" :title="dialog.title" width="800px" append-to-body>
<el-form ref="chatPackageFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="套餐名称" prop="packageName">
<el-input v-model="form.packageName" placeholder="请输入套餐名称" />
</el-form-item>
<el-form-item label="套餐内容描述">
<editor v-model="form.packageContent" :min-height="192"/>
<!-- <editor v-model="form.packageContent" :min-height="192" /> -->
<el-input v-model="form.packageContent" type="textarea" placeholder="请输入套餐内容描述" />
</el-form-item>
<el-form-item label="客服数量" prop="customerServiceNumber">
<el-input v-model="form.customerServiceNumber" placeholder="请输入客服数量" />
@ -85,14 +90,9 @@
<el-form-item label="套餐持续时间" prop="durationDays">
<el-input v-model="form.durationDays" placeholder="请输入套餐持续时间" />
</el-form-item>
<el-form-item label="状态：0-禁用 1-启用" prop="status">
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态：0-禁用 1-启用">
<el-option
v-for="dict in commom_status"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
<el-option v-for="dict in commom_status" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="排序" prop="sortOrder">
@ -144,41 +144,26 @@ const initFormData: ChatPackageForm = {
durationDays: undefined,
status: undefined,
sortOrder: undefined,
remark: undefined,
}
remark: undefined
};
const data = reactive<PageData<ChatPackageForm, ChatPackageQuery>>({
form: {...initFormData},
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
packageName: undefined,
packageContent: undefined,
status: undefined,
params: {
}
params: {}
},
rules: {
id: [
{ required: true, message: "主键ID不能为空", trigger: "blur" }
],
packageName: [
{ required: true, message: "套餐名称不能为空", trigger: "blur" }
],
packageContent: [
{ required: true, message: "套餐内容描述不能为空", trigger: "blur" }
],
customerServiceNumber: [
{ required: true, message: "客服数量不能为空", trigger: "blur" }
],
durationDays: [
{ required: true, message: "套餐持续时间不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态：0-禁用 1-启用不能为空", trigger: "change" }
],
sortOrder: [
{ required: true, message: "排序不能为空", trigger: "blur" }
],
id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
packageName: [{ required: true, message: '套餐名称不能为空', trigger: 'blur' }],
packageContent: [{ required: true, message: '套餐内容描述不能为空', trigger: 'blur' }],
customerServiceNumber: [{ required: true, message: '客服数量不能为空', trigger: 'blur' }],
durationDays: [{ required: true, message: '套餐持续时间不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态：0-禁用 1-启用不能为空', trigger: 'change' }],
sortOrder: [{ required: true, message: '排序不能为空', trigger: 'blur' }]
}
});
@ -191,55 +176,55 @@ const getList = async () => {
chatPackageList.value = res.rows;
total.value = res.total;
loading.value = false;
}
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
};
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
form.value = { ...initFormData };
chatPackageFormRef.value?.resetFields();
}
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: ChatPackageVO[]) => {
ids.value = selection.map(item => item.id);
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加套餐";
}
dialog.title = '添加套餐';
};
/** 修改按钮操作 */
const handleUpdate = async (row?: ChatPackageVO) => {
reset();
const _id = row?.id || ids.value[0]
const _id = row?.id || ids.value[0];
const res = await getChatPackage(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改套餐";
}
dialog.title = '修改套餐';
};
/** 提交按钮 */
const submitForm = () => {
@ -247,32 +232,36 @@ const submitForm = () => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateChatPackage(form.value).finally(() => buttonLoading.value = false);
await updateChatPackage(form.value).finally(() => (buttonLoading.value = false));
} else {
await addChatPackage(form.value).finally(() => buttonLoading.value = false);
await addChatPackage(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess("操作成功");
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
}
};
/** 删除按钮操作 */
const handleDelete = async (row?: ChatPackageVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除套餐编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
await proxy?.$modal.confirm('是否确认删除套餐编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
await delChatPackage(_ids);
proxy?.$modal.msgSuccess("删除成功");
proxy?.$modal.msgSuccess('删除成功');
await getList();
}
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('im/chatPackage/export', {
proxy?.download(
'im/chatPackage/export',
{
...queryParams.value
}, `chatPackage_${new Date().getTime()}.xlsx`)
}
},
`chatPackage_${new Date().getTime()}.xlsx`
);
};
onMounted(() => {
getList();

17
im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImChatPackageVo.java
View File

@ -30,12 +30,29 @@ public class ImChatPackageVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
private Long id;
/**
* 套餐名称
*/
@ExcelProperty(value = "套餐名称")
private String packageName;
/**
* 套餐内容描述
*/
private String packageContent;
/**
* 排序
*/
private Long sortOrder;
/**
* 备注
*/
private String remark;
/**
* 客服数量
*/

18
im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImChatPackageServiceImpl.java
View File

@ -1,5 +1,6 @@
package org.dromara.im.service.impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.im.constant.ImConstant;
import org.springframework.stereotype.Service;
import org.dromara.im.domain.bo.ImChatPackageBo;
@ -90,11 +92,15 @@ public class ImChatPackageServiceImpl implements IImChatPackageService {
public Boolean insertByBo(ImChatPackageBo bo) {
ImChatPackage add = MapstructUtils.convert(bo, ImChatPackage.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
if (add != null) {
add.setCreatedTime(DateUtil.parse(DateUtil.now()));
add.setUpdatedTime(DateUtil.parse(DateUtil.now()));
add.setCreatorId(LoginHelper.getUserId());
add.setUpdaterId(LoginHelper.getUserId());
}
return flag;
return baseMapper.insert(add) > 0;
}
/**
@ -107,6 +113,10 @@ public class ImChatPackageServiceImpl implements IImChatPackageService {
public Boolean updateByBo(ImChatPackageBo bo) {
ImChatPackage update = MapstructUtils.convert(bo, ImChatPackage.class);
validEntityBeforeSave(update);
if (update != null) {
update.setUpdatedTime(DateUtil.parse(DateUtil.now()));
update.setUpdaterId(LoginHelper.getUserId());
}
return baseMapper.updateById(update) > 0;
}

Write Preview
Loading…
Cancel
Save