root/allLikeMall
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: root:e68b6ed57382b0fe52697a747151b9ffad1f23db
Branches Tags
root:master
root:sjy-three
root:Branch_chensl
root:sjy-two
root:khy-two
root:cxw
root:khy1
root:Branch_csl
root:lu
root:sjy-one
root:zzw-one
root:sjy
..
compare: root:eadb727812976d3db1dec703ebaea795d3a7c5f8
Branches Tags
root:master
root:sjy-three
root:Branch_chensl
root:sjy-two
root:khy-two
root:cxw
root:khy1
root:Branch_csl
root:lu
root:sjy-one
root:zzw-one
root:sjy

No commits in common. "e68b6ed57382b0fe52697a747151b9ffad1f23db" and "eadb727812976d3db1dec703ebaea795d3a7c5f8" have entirely different histories.
e68b6ed573 ... eadb727812

10 changed files with 128 additions and 236 deletions
Show Stats Expand all files Collapse all files

3
yudao-admin-vue3/src/api/infra/file/index.ts
View File

@ -6,7 +6,6 @@ export interface FilePageReqVO extends PageParam {
createTime?: Date[]
}
// 文件预签名地址 Response VO
export interface FilePresignedUrlRespVO {
// 文件配置编号
@ -44,5 +43,3 @@ export const createFile = (data: any) => {
export const updateFile = (data: any) => {
return request.upload({ url: '/infra/file/upload', data })
}

4
yudao-admin-vue3/src/api/mall/promotion/verbaltrick/index.ts
View File

@ -41,7 +41,7 @@ export const VerbalTrickApi = {
},
// 查询客服话术
getVerbalTrickList: async (id: string) => {
return await request.get({ url: `/promotion/verbal-trick/getVerbalTrickList?id=` +id })
getVerbalTrickList: async () => {
return await request.get({ url: `/promotion/verbal-trick/getVerbalTrickList` })
}
}

10
yudao-admin-vue3/src/api/system/dict/dict.data.ts
View File

@ -47,13 +47,3 @@ export const deleteDictData = (id: number) => {
export const exportDictData = (params) => {
return request.download({ url: '/system/dict-data/export', params })
}
// 图片素材管理分类
export const getTypeList = () => {
return request.get({ url: '/system/dict-data/getTypeList' })
}
// 客服话术分类
export const getHuaShuTypeList = () => {
return request.get({ url: '/system/dict-data/getHuaShuTypeList' })
}

94
yudao-admin-vue3/src/views/infra/file/index.vue
View File

@ -1,17 +1,6 @@
<template>
<doc-alert title="上传下载" url="https://doc.iocoder.cn/file/" />
<div class="flex-container">
<!-- 菜单区域 -->
<div class="menu-area">
<el-menu :default-active="targetMenuId">
<el-menu-item v-for="item in typeMenu" :index="item.value" :key="item.value" @click="clickMenu(item.value)">{{item.label}}</el-menu-item>
</el-menu>
</div>
<!-- 内容区域 -->
<div class="content-wrap">
<!-- 搜索 -->
<ContentWrap>
<el-form
class="-mb-15px"
@ -20,14 +9,14 @@
:inline="true"
label-width="68px"
>
<!-- <el-form-item label="文件路径" prop="path">
<el-form-item label="文件路径" prop="path">
<el-input
v-model="queryParams.path"
placeholder="请输入文件路径"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item> -->
</el-form-item>
<el-form-item label="文件类型" prop="type" width="80">
<el-input
v-model="queryParams.type"
@ -56,12 +45,19 @@
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list">
<el-table-column label="文件名" align="center" prop="name" :show-overflow-tooltip="true" />
<el-table-column label="文件路径" align="center" prop="path" :show-overflow-tooltip="true" />
<el-table-column label="URL" align="center" prop="url" :show-overflow-tooltip="true" />
<el-table-column label="文件大小" align="center" prop="size" width="120" :formatter="fileSizeFormatter" />
<el-table-column
label="文件大小"
align="center"
prop="size"
width="120"
:formatter="fileSizeFormatter"
/>
<el-table-column label="文件类型" align="center" prop="type" width="180px" />
<el-table-column label="文件内容" align="center" prop="url" width="110px">
<template #default="{ row }">
@ -80,12 +76,20 @@
:href="row.url"
:underline="false"
target="_blank"
>预览</el-link>
>预览</el-link
>
<el-link v-else type="primary" download :href="row.url" :underline="false" target="_blank"
>下载</el-link>
>下载</el-link
>
</template>
</el-table-column>
<el-table-column label="上传时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
<el-table-column
label="上传时间"
align="center"
prop="createTime"
width="180"
:formatter="dateFormatter"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
@ -99,7 +103,6 @@
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
@ -107,24 +110,17 @@
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</div>
</div>
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<FileForm ref="formRef" @success="getList" />
</template>
<script lang="ts" setup>
import { fileSizeFormatter } from '@/utils'
import { dateFormatter } from '@/utils/formatTime'
import * as FileApi from '@/api/infra/file'
import FileForm from './FileForm.vue'
import { string } from 'vue-types';
import { number } from 'echarts';
import * as DictDataApi from '@/api/system/dict/dict.data'
const typeMenu = ref<DictDataApi.DictDataVO[]>([]) //
const targetMenuId = ref('0')
defineOptions({ name: 'InfraFile' })
const message = useMessage() // 消息弹窗
@ -132,16 +128,14 @@ const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 列表的
const list = ref([]) // 列表的数据
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined,
type: undefined,
path: undefined,
createTime: [],
menuType: '0',
createTime: []
})
const queryFormRef = ref() // 搜索的表单
@ -157,21 +151,6 @@ const getList = async () => {
}
}
//图片素材管理分类菜单
const getTypeList = async () => {
const data = await DictDataApi.getTypeList()
typeMenu.value = data
console.log('1111111111',typeMenu)
}
/** */
const clickMenu = (id: string) => {
queryParams.menuType = id
queryParams.pageNo = 1
getList()
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
@ -205,25 +184,6 @@ const handleDelete = async (id: number) => {
/** 初始化 **/
onMounted(() => {
// queryParams.value.menuType = targetMenuId
getTypeList()
getList()
})
</script>
<style scoped>
.flex-container {
height: 100vh; /* 使容器填满视口高度 */
display: flex;
}
.menu-area {
width: 200px;
height: 100vh; /* 固定高度 */
overflow-y: hidden; /* 禁止滚动 */
border-right: 1px solid #e0e0e0; /* 可选：添加分隔线 */
}
.content-wrap {
flex-grow: 1; /* 使内容区域占据剩余空间 */
overflow-y: auto; /* 允许内容区域滚动 */
}
</style>

31
yudao-admin-vue3/src/views/mall/promotion/kefu/components/KeFuMessageList.vue
View File

@ -118,11 +118,8 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
<div style="display: flex; width: 100%; height: 400px;">
<!-- 左边占 30% -->
<div style="flex: 0 0 20%; padding: 10px;">
<el-menu :default-active="targetMenuId">
<el-menu-item v-for="item in huashuType" :index="item.value" :key="item.value" @click="clickMenu(item.value)">{{item.label}}</el-menu-item>
</el-menu>
<div style="flex: 0 0 20%; background-color: #f0f0f0; padding: 10px;">
左边的内容
</div>
<!-- 右边占 70% -->
<div style="flex: 1; padding: 5px; overflow-y: auto; max-height: 400px;">
@ -160,10 +157,6 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
import type { DropdownInstance } from 'element-plus'
import { ref } from 'vue'
import * as DictDataApi from '@/api/system/dict/dict.data'
const huashuType = ref<DictDataApi.DictDataVO[]>([]) //
const targetMenuId = ref('0')
dayjs.extend(relativeTime)
defineOptions({ name: 'KeFuMessageList' })
@ -182,7 +175,6 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
import { KeFuConversationApi} from '@/api/mall/promotion/kefu/conversation'
import { number } from 'vue-types'
const onlineStaffList = ref<SupportStaffVO[]>([]) // 在线客服列表的数据
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
@ -293,17 +285,10 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
/*点击话术库*/
const huashu = async () => {
dialogVisible.value = true;
getVerbalTrickList(targetMenuId.value)
}
//话术分类菜单
const getHuaShuTypeList = async () => {
const data = await DictDataApi.getHuaShuTypeList()
huashuType.value = data
}
//话术内容
const getVerbalTrickList = async (id: string) => {
const response = await VerbalTrickApi.getVerbalTrickList(id);
const getVerbalTrickList = async () => {
const response = await VerbalTrickApi.getVerbalTrickList();
verbalTrickList.value = response; // 将数据部分赋值给 verbalTrickList
}
@ -313,11 +298,6 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
message.value = content;
dialogVisible.value = false;
}
const clickMenu = (id: string) => {
console.log('1111111111',id)
getVerbalTrickList(id)
}
/** 发送文本消息 */
const handleSendMessage = async () => {
@ -436,8 +416,7 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
}
/** 初始化 **/
onMounted(() => {
getHuaShuTypeList()
getVerbalTrickList(targetMenuId.value)
getVerbalTrickList()
})
</script>

9
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
View File

@ -9,8 +9,6 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.*;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.infra.service.file.FileService;
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -27,9 +25,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.module.infra.framework.file.core.utils.FileTypeUtils.writeAttachment;
@ -43,7 +38,6 @@ public class FileController {
@Resource
private FileService fileService;
@PostMapping("/upload")
@Operation(summary = "上传文件", description = "模式一：后端上传文件")
public CommonResult<String> uploadFile(FileUploadReqVO uploadReqVO) throws Exception {
@ -106,7 +100,4 @@ public class FileController {
return success(BeanUtils.toBean(pageResult, FileRespVO.class));
}
}

5
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/verbaltrick/VerbalTrickController.java
View File

@ -101,8 +101,9 @@ public class VerbalTrickController {
@GetMapping("/getVerbalTrickList")
@Operation(summary = "获得客服话术数据")
public CommonResult<List<VerbalTrickDO>> getVerbalTrickList(String id) {
List<VerbalTrickDO> result = verbalTrickService.getVerbalTrickList(id);
@PreAuthorize("@ss.hasPermission('promotion:verbal-trick:query')")
public CommonResult<List<VerbalTrickDO>> getVerbalTrickList() {
List<VerbalTrickDO> result = verbalTrickService.getVerbalTrickList();
return success(result);
}

2
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/verbaltrick/VerbalTrickService.java
View File

@ -56,6 +56,6 @@ public interface VerbalTrickService {
* 获取话术数据
* @return
*/
List<VerbalTrickDO> getVerbalTrickList(String id);
List<VerbalTrickDO> getVerbalTrickList();
}

5
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/verbaltrick/VerbalTrickServiceImpl.java
View File

@ -72,9 +72,8 @@ public class VerbalTrickServiceImpl implements VerbalTrickService {
}
@Override
public List<VerbalTrickDO> getVerbalTrickList(String id) {
return verbalTrickMapper.selectList("type",id);
public List<VerbalTrickDO> getVerbalTrickList() {
return verbalTrickMapper.selectList();
}
}

25
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
View File

@ -7,8 +7,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataRespVO;
import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataSaveReqVO;
@ -40,10 +38,6 @@ public class DictDataController {
@Resource
private DictDataService dictDataService;
@Resource
public DictDataApi dictDataApi;
@PostMapping("/create")
@Operation(summary = "新增字典数据")
@PreAuthorize("@ss.hasPermission('system:dict:create')")
@ -107,23 +101,4 @@ public class DictDataController {
BeanUtils.toBean(list, DictDataRespVO.class));
}
/**
* 根据字典类型查询字典数据信息：图片素材管理分类
*/
@GetMapping(value = "/getTypeList")
public CommonResult<List<DictDataRespDTO>> getTypeList() {
List<DictDataRespDTO> dictDataList = dictDataApi.getDictDataList("infra_file_type");
return success(dictDataList);
}
/**
* 根据字典类型查询字典数据信息：客服素材分类
*/
@GetMapping(value = "/getHuaShuTypeList")
public CommonResult<List<DictDataRespDTO>> getHuaShuTypeList() {
List<DictDataRespDTO> dictDataList = dictDataApi.getDictDataList("kefu_verbal_trick_type");
return success(dictDataList);
}
}