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

@@ -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 })
 }
-
-

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

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

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

@@ -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' })
-}

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

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

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

@@ -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;">
+			<div style="flex: 0 0 20%; background-color: #f0f0f0; 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;">
@@ -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 () => {
-	//话术内容
+		const response = await VerbalTrickApi.getVerbalTrickList();
-	const getVerbalTrickList = async (id: string) => {
-		const response = await VerbalTrickApi.getVerbalTrickList(id);
 	    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()
-	  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,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));
     }
 
-
-
-
 }

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

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

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

@@ -72,9 +72,8 @@ public class VerbalTrickServiceImpl implements VerbalTrickService {
     }
 
     @Override
-    public List<VerbalTrickDO> getVerbalTrickList(String id) {
+    public List<VerbalTrickDO> getVerbalTrickList() {
-
+        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,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);
-    }
-
 }