Merge pull request '添加客服话术分类，图片素材分类' (#88) from sjy-two into master

Reviewed-on: #88

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

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

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

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

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

@@ -47,3 +47,13 @@ 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' })
+}

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

@@ -1,126 +1,130 @@
 <template>
   <doc-alert title="上传下载" url="https://doc.iocoder.cn/file/" />
-  <!-- 搜索 -->
+  
-  <ContentWrap>
+  <div class="flex-container">
-    <el-form
+    <!-- 菜单区域 -->
-      class="-mb-15px"
+    <div class="menu-area">
-      :model="queryParams"
+    <el-menu :default-active="targetMenuId">
-      ref="queryFormRef"
+      <el-menu-item  v-for="item in typeMenu" :index="item.value" :key="item.value"  @click="clickMenu(item.value)">{{item.label}}</el-menu-item>
-      :inline="true"
+      
-      label-width="68px"
+    </el-menu>
-    >
+    </div>
-      <el-form-item label="文件路径" prop="path">
+    
-        <el-input
+    <!-- 内容区域 -->
-          v-model="queryParams.path"
+    <div class="content-wrap">
-          placeholder="请输入文件路径"
+      <ContentWrap>
-          clearable
+        <el-form
-          @keyup.enter="handleQuery"
+              class="-mb-15px"
-        />
+              :model="queryParams"
-      </el-form-item>
+              ref="queryFormRef"
-      <el-form-item label="文件类型" prop="type" width="80">
+              :inline="true"
-        <el-input
+              label-width="68px"
-          v-model="queryParams.type"
+            >
-          placeholder="请输入文件类型"
+             <!-- <el-form-item label="文件路径" prop="path">
-          clearable
+                <el-input
-          @keyup.enter="handleQuery"
+                  v-model="queryParams.path"
-        />
+                  placeholder="请输入文件路径"
-      </el-form-item>
+                  clearable
-      <el-form-item label="创建时间" prop="createTime">
+                  @keyup.enter="handleQuery"
-        <el-date-picker
+                />
-          v-model="queryParams.createTime"
+              </el-form-item> -->
-          value-format="YYYY-MM-DD HH:mm:ss"
+              <el-form-item label="文件类型" prop="type" width="80">
-          type="daterange"
+                <el-input
-          start-placeholder="开始日期"
+                  v-model="queryParams.type"
-          end-placeholder="结束日期"
+                  placeholder="请输入文件类型"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+                  clearable
-        />
+                  @keyup.enter="handleQuery"
-      </el-form-item>
+                />
-      <el-form-item>
+              </el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+              <el-form-item label="创建时间" prop="createTime">
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+                <el-date-picker
-        <el-button type="primary" plain @click="openForm">
+                  v-model="queryParams.createTime"
-          <Icon icon="ep:upload" class="mr-5px" /> 上传文件
+                  value-format="YYYY-MM-DD HH:mm:ss"
-        </el-button>
+                  type="daterange"
-      </el-form-item>
+                  start-placeholder="开始日期"
-    </el-form>
+                  end-placeholder="结束日期"
-  </ContentWrap>
+                  :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+                <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+                <el-button type="primary" plain @click="openForm">
+                  <Icon icon="ep:upload" class="mr-5px" /> 上传文件
+                </el-button>
+              </el-form-item>
+            </el-form>
+      </ContentWrap>
 
-  <!-- 列表 -->
+      
-  <ContentWrap>
+        <el-table v-loading="loading" :data="list">
-    <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="name" :show-overflow-tooltip="true" />
+          <el-table-column label="文件路径" align="center" prop="path" :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="URL" align="center" prop="url" :show-overflow-tooltip="true" />
+          <el-table-column label="文件大小" align="center" prop="size" width="120" :formatter="fileSizeFormatter" />
-      <el-table-column
+          <el-table-column label="文件类型" align="center" prop="type" width="180px" />
-        label="文件大小"
+          <el-table-column label="文件内容" align="center" prop="url" width="110px">
-        align="center"
+            <template #default="{ row }">
-        prop="size"
+              <el-image
-        width="120"
+                v-if="row.type.includes('image')"
-        :formatter="fileSizeFormatter"
+                class="h-80px w-80px"
-      />
+                lazy
-      <el-table-column label="文件类型" align="center" prop="type" width="180px" />
+                :src="row.url"
-      <el-table-column label="文件内容" align="center" prop="url" width="110px">
+                :preview-src-list="[row.url]"
-        <template #default="{ row }">
+                preview-teleported
-          <el-image
+                fit="cover"
-            v-if="row.type.includes('image')"
+              />
-            class="h-80px w-80px"
+              <el-link
-            lazy
+                v-else-if="row.type.includes('pdf')"
-            :src="row.url"
+                type="primary"
-            :preview-src-list="[row.url]"
+                :href="row.url"
-            preview-teleported
+                :underline="false"
-            fit="cover"
+                target="_blank"
-          />
+              >预览</el-link>
-          <el-link
+              <el-link v-else type="primary" download :href="row.url" :underline="false" target="_blank"
-            v-else-if="row.type.includes('pdf')"
+              >下载</el-link>
-            type="primary"
+            </template>
-            :href="row.url"
+          </el-table-column>
-            :underline="false"
+          <el-table-column label="上传时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
-            target="_blank"
+          <el-table-column label="操作" align="center">
-            >预览</el-link
+            <template #default="scope">
-          >
+              <el-button
-          <el-link v-else type="primary" download :href="row.url" :underline="false" target="_blank"
+                link
-            >下载</el-link
+                type="danger"
-          >
+                @click="handleDelete(scope.row.id)"
-        </template>
+                v-hasPermi="['infra:file:delete']"
-      </el-table-column>
+              >
-      <el-table-column
+                删除
-        label="上传时间"
+              </el-button>
-        align="center"
+            </template>
-        prop="createTime"
+          </el-table-column>
-        width="180"
+        </el-table>
-        :formatter="dateFormatter"
+        
-      />
+        <!-- 分页 -->
-      <el-table-column label="操作" align="center">
+        <Pagination
-        <template #default="scope">
+          :total="total"
-          <el-button
+          v-model:page="queryParams.pageNo"
-            link
+          v-model:limit="queryParams.pageSize"
-            type="danger"
+          @pagination="getList"
-            @click="handleDelete(scope.row.id)"
+        />
-            v-hasPermi="['infra:file:delete']"
+      
-          >
+    </div>
-            删除
+  </div>
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </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() // 消息弹窗
@@ -128,14 +132,16 @@ 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: []
+  createTime: [],
+  menuType: '0',
 })
 const queryFormRef = ref() // 搜索的表单
 
@@ -151,6 +157,21 @@ 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
@@ -184,6 +205,25 @@ 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>

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

@@ -118,8 +118,11 @@ 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%; background-color: #f0f0f0; padding: 10px;">
+			<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>
 			<!-- 右边占 70% -->
 			<div style="flex: 1; padding: 5px; overflow-y: auto; max-height: 400px;">
@@ -156,7 +159,11 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
 	import { getStaffToken, setStaffToken} from '@/utils/auth'
 	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' })
@@ -175,6 +182,7 @@ 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,
@@ -285,10 +293,17 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
 	/*点击话术库*/
 	const huashu = async () => {
 		dialogVisible.value = true;
+		getVerbalTrickList(targetMenuId.value)
 	}
-	
+	//话术分类菜单
-	const getVerbalTrickList = async () => {
+	const getHuaShuTypeList = async () => {
-		const response = await VerbalTrickApi.getVerbalTrickList();
+		const data = await DictDataApi.getHuaShuTypeList()
+	    huashuType.value = data
+		
+	}
+	//话术内容
+	const getVerbalTrickList = async (id: string) => {
+		const response = await VerbalTrickApi.getVerbalTrickList(id);
 	    verbalTrickList.value = response; // 将数据部分赋值给 verbalTrickList
 	}	
 	
@@ -298,6 +313,11 @@ 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 () => {
@@ -416,7 +436,8 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
 	}
 	/** 初始化 **/
 	onMounted(() => {
-	  getVerbalTrickList()
+		getHuaShuTypeList()
+	  getVerbalTrickList(targetMenuId.value)
 	})
 </script>
 

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

@@ -9,6 +9,8 @@ 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;
@@ -25,6 +27,9 @@ 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;
 
@@ -38,6 +43,7 @@ public class FileController {
     @Resource
     private FileService fileService;
 
+
     @PostMapping("/upload")
     @Operation(summary = "上传文件", description = "模式一：后端上传文件")
     public CommonResult<String> uploadFile(FileUploadReqVO uploadReqVO) throws Exception {
@@ -100,4 +106,7 @@ public class FileController {
         return success(BeanUtils.toBean(pageResult, FileRespVO.class));
     }
 
+
+
+
 }

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

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

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

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

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

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

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

@@ -7,6 +7,8 @@ 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;
@@ -38,6 +40,10 @@ public class DictDataController {
     @Resource
     private DictDataService dictDataService;
 
+    @Resource
+    public DictDataApi dictDataApi;
+
+
     @PostMapping("/create")
     @Operation(summary = "新增字典数据")
     @PreAuthorize("@ss.hasPermission('system:dict:create')")
@@ -101,4 +107,23 @@ 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);
+    }
+
 }