更新

schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml

@@ -209,7 +209,7 @@
             id, resource_id, title, content, summary, cover_image, tag_id, author, source, is_audited, publish_time,
             status,source_url, creator,create_time
         ) VALUES (
-            #{id}, #{resourceID}, #{title}, #{content}, #{summary}, #{coverImage}, #{tagID}, #{author}, #{source}, #{isAudited}, #{publistTime}
+            #{id}, #{resourceID}, #{title}, #{content}, #{summary}, #{coverImage}, #{tagID}, #{author}, #{source}, #{isAudited}, #{publishTime}
             #{status}, #{sourceUrl}, #{creator}, #{createTime}
         )
     </insert>

schoolNewsWeb/src/views/admin/manage/content/BannerManagementView.vue

@@ -1,15 +1,13 @@
 <template>
-  <AdminLayout 
+  <AdminLayout title="内容管理" subtitle="管理网站横幅、栏目、标签等内容信息">
-    title="内容管理" 
+    <div class="banner-management">
-    subtitle="管理网站横幅、栏目、标签等内容信息"
-  >
-  <div class="banner-management">
       <!-- 操作栏 -->
       <div class="toolbar">
         <h3 class="section-title">轮播Banner</h3>
         <button class="btn-add" @click="handleCreate">
           <svg width="16" height="16" viewBox="0 0 16 16" fill="none">
-            <path d="M8 3.33333V12.6667M3.33333 8H12.6667" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+            <path d="M8 3.33333V12.6667M3.33333 8H12.6667" stroke="currentColor" stroke-width="1.33333"
+              stroke-linecap="round" stroke-linejoin="round" />
           </svg>
           添加Banner
         </button>
@@ -23,19 +21,10 @@
 
       <!-- Banner 卡片列表 -->
       <div v-else class="banner-list">
-        <div 
+        <div v-for="banner in banners" :key="banner.bannerID" class="banner-card">
-          v-for="banner in banners" 
-          :key="banner.bannerID" 
-          class="banner-card"
-        >
           <!-- Banner 图片容器 -->
           <div class="banner-image-wrapper">
-            <img 
+            <img :src="getBannerImageUrl(banner)" :alt="banner.title" class="banner-image" @error="handleImageError" />
-              :src="getBannerImageUrl(banner)" 
-              :alt="banner.title"
-              class="banner-image"
-              @error="handleImageError"
-            />
           </div>
 
           <!-- Banner 信息区域 -->
@@ -79,15 +68,10 @@
 
       <!-- 分页组件 -->
       <div v-if="!loading && pageParam.totalElements && pageParam.totalElements > 0" class="pagination-container">
-        <el-pagination
+        <el-pagination v-model:current-page="pageParam.pageNumber" v-model:page-size="pageParam.pageSize"
-          v-model:current-page="pageParam.pageNumber"
+          :page-sizes="[10, 20, 50, 100]" :total="pageParam.totalElements"
-          v-model:page-size="pageParam.pageSize"
+          layout="total, sizes, prev, pager, next, jumper" @size-change="handlePageSizeChange"
-          :page-sizes="[10, 20, 50, 100]"
+          @current-change="handlePageChange" />
-          :total="pageParam.totalElements"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handlePageSizeChange"
-          @current-change="handlePageChange"
-        />
       </div>
 
       <!-- 创建/编辑弹窗 -->
@@ -104,12 +88,7 @@
                 <span class="required">*</span>
                 横幅标题
               </label>
-              <input 
+              <input v-model="currentBanner.title" type="text" class="form-input" placeholder="请输入横幅标题" />
-                v-model="currentBanner.title" 
-                type="text" 
-                class="form-input"
-                placeholder="请输入横幅标题"
-              />
             </div>
 
             <div class="form-group">
@@ -117,15 +96,8 @@
                 <span class="required">*</span>
                 横幅图片
               </label>
-              <FileUpload
+              <FileUpload :as-dialog="false" list-type="cover" v-model:cover-url="currentBanner.imageUrl"
-                :as-dialog="false"
+                accept="image/*" :max-size="10" tip="支持 jpg、png、gif 格式，建议尺寸1920x600" module="banner" />
-                list-type="cover"
-                v-model:cover-url="currentBanner.imageUrl"
-                accept="image/*"
-                :max-size="10"
-                tip="支持 jpg、png、gif 格式，建议尺寸1920x600"
-                module="banner"
-              />
             </div>
 
             <div class="form-group">
@@ -135,27 +107,15 @@
               </label>
               <div class="radio-group">
                 <label class="radio-item">
-                  <input 
+                  <input v-model="currentBanner.linkType" type="radio" :value="1" />
-                    v-model="currentBanner.linkType" 
-                    type="radio" 
-                    :value="1"
-                  />
                   <span class="radio-label">资源</span>
                 </label>
                 <label class="radio-item">
-                  <input 
+                  <input v-model="currentBanner.linkType" type="radio" :value="2" />
-                    v-model="currentBanner.linkType" 
-                    type="radio" 
-                    :value="2"
-                  />
                   <span class="radio-label">课程</span>
                 </label>
                 <label class="radio-item">
-                  <input 
+                  <input v-model="currentBanner.linkType" type="radio" :value="3" />
-                    v-model="currentBanner.linkType" 
-                    type="radio" 
-                    :value="3"
-                  />
                   <span class="radio-label">外部链接</span>
                 </label>
               </div>
@@ -163,63 +123,47 @@
 
             <div class="form-group" v-if="currentBanner.linkType === 1 || currentBanner.linkType === 2">
               <label class="form-label">
+                <span class="required">*</span>
                 {{ currentBanner.linkType === 1 ? '选择资源' : '选择课程' }}
               </label>
               <div class="select-container">
-                <div 
+                <div class="form-select" @click="toggleDropdown" :class="{ 'active': dropdownVisible }">
-                  class="form-select" 
-                  @click="toggleDropdown"
-                  :class="{ 'active': dropdownVisible }"
-                >
                   <span class="select-value">
                     {{ getSelectedItemLabel() || `请选择${currentBanner.linkType === 1 ? '资源' : '课程'}` }}
                   </span>
                   <svg class="select-arrow" width="12" height="12" viewBox="0 0 12 12" fill="none">
-                    <path d="M2.5 4.5L6 8L9.5 4.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                    <path d="M2.5 4.5L6 8L9.5 4.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                      stroke-linejoin="round" />
                   </svg>
                 </div>
-                
+
                 <!-- 下拉列表 -->
                 <div v-if="dropdownVisible" class="dropdown-list" @click.stop>
                   <!-- 搜索框 -->
                   <div class="dropdown-search">
-                    <input 
+                    <input type="text" v-model="searchKeyword" class="search-input"
-                      type="text" 
+                      :placeholder="`搜索${currentBanner.linkType === 1 ? '资源' : '课程'}名称`" @input="handleSearchChange" />
-                      v-model="searchKeyword"
-                      class="search-input"
-                      :placeholder="`搜索${currentBanner.linkType === 1 ? '资源' : '课程'}名称`"
-                      @input="handleSearchChange"
-                    />
                   </div>
-                  
+
                   <!-- 列表内容 -->
-                  <div 
+                  <div class="dropdown-content" @scroll="handleScroll" ref="dropdownContent">
-                    class="dropdown-content" 
+                    <div v-for="item in selectOptions" :key="item.id" class="dropdown-item"
-                    @scroll="handleScroll"
+                      :class="{ 'selected': currentBanner.linkID === item.id }" @click="handleSelectItem(item)">
-                    ref="dropdownContent"
-                  >
-                    <div 
-                      v-for="item in selectOptions" 
-                      :key="item.id"
-                      class="dropdown-item"
-                      :class="{ 'selected': currentBanner.linkID === item.id }"
-                      @click="handleSelectItem(item)"
-                    >
                       <span class="item-title">{{ item.title }}</span>
                       <span class="item-id">ID: {{ item.id }}</span>
                     </div>
-                    
+
                     <!-- 加载状态 -->
                     <div v-if="loadingMore" class="dropdown-loading">
                       <div class="loading-spinner-small"></div>
                       <span>加载中...</span>
                     </div>
-                    
+
                     <!-- 没有更多数据 -->
                     <div v-if="!loadingMore && noMoreData && selectOptions.length > 0" class="dropdown-no-more">
                       没有更多数据
                     </div>
-                    
+
                     <!-- 空状态 -->
                     <div v-if="selectOptions.length === 0 && !loadingMore" class="dropdown-empty">
                       暂无数据
@@ -231,44 +175,27 @@
 
             <div class="form-group" v-if="currentBanner.linkType === 3">
               <label class="form-label">
+                <span class="required">*</span>
                 外部链接
               </label>
-              <input 
+              <input v-model="currentBanner.linkUrl" type="text" class="form-input" placeholder="请输入外部链接地址" />
-                v-model="currentBanner.linkUrl" 
-                type="text" 
-                class="form-input"
-                placeholder="请输入外部链接地址"
-              />
             </div>
 
             <div class="form-row">
               <div class="form-group">
                 <label class="form-label">排序号</label>
-                <input 
+                <input v-model.number="currentBanner.orderNum" type="number" class="form-input" placeholder="数字越小越靠前" />
-                  v-model.number="currentBanner.orderNum" 
+              </div>
-                  type="number" 
-                  class="form-input"
-                  placeholder="数字越小越靠前"
-                />
-    </div>
 
               <div class="form-group">
                 <label class="form-label">状态</label>
                 <div class="switch-group">
                   <label class="switch-item">
-                    <input 
+                    <input v-model="currentBanner.status" type="radio" :value="1" />
-                      v-model="currentBanner.status" 
-                      type="radio" 
-                      :value="1"
-                    />
                     <span class="switch-label">启用</span>
                   </label>
                   <label class="switch-item">
-                    <input 
+                    <input v-model="currentBanner.status" type="radio" :value="0" />
-                      v-model="currentBanner.status" 
-                      type="radio" 
-                      :value="0"
-                    />
                     <span class="switch-label">禁用</span>
                   </label>
                 </div>
@@ -280,17 +207,13 @@
             <button class="btn-secondary" @click="handleCloseDialog">
               取消
             </button>
-            <button 
+            <button class="btn-primary" @click="handleSubmit" :disabled="submitting">
-              class="btn-primary" 
-              @click="handleSubmit"
-              :disabled="submitting"
-            >
               {{ submitting ? '提交中...' : (isEdit ? '更新' : '创建') }}
             </button>
           </div>
         </div>
       </div>
-  </div>
+    </div>
   </AdminLayout>
 </template>
 
@@ -303,7 +226,7 @@ import { resourceApi } from '@/apis/resource/resource';
 import { courseApi } from '@/apis/study/course';
 import { FileUpload } from '@/components';
 import { FILE_DOWNLOAD_URL } from '@/config';
-import { AdminLayout } from '@/views/admin'; 
+import { AdminLayout } from '@/views/admin';
 
 // 数据状态
 const loading = ref(false);
@@ -352,7 +275,7 @@ async function loadBanners() {
     loading.value = true;
     const result = await bannerApi.getBannerPage(pageParam.value);
     banners.value = result.pageDomain?.dataList || [];
-    
+
     // 更新分页信息
     if (result.pageParam) {
       pageParam.value = {
@@ -397,7 +320,7 @@ async function handleEdit(banner: Banner) {
   isEdit.value = true;
   currentBanner.value = { ...banner };
   dialogVisible.value = true;
-  
+
   // 如果有linkID，预加载该项的信息以便显示标题
   if (banner.linkID && (banner.linkType === 1 || banner.linkType === 2)) {
     await loadSelectedItem(banner.linkID, banner.linkType);
@@ -464,9 +387,24 @@ async function handleSubmit() {
     return;
   }
 
+  // 校验链接内容：资源、课程或外部链接必须有一个有值
+  if (currentBanner.value.linkType === 1 || currentBanner.value.linkType === 2) {
+    // 选择资源或课程时，必须选择具体的资源/课程
+    if (!currentBanner.value.linkID) {
+      ElMessage.warning(`请选择${currentBanner.value.linkType === 1 ? '资源' : '课程'}`);
+      return;
+    }
+  } else if (currentBanner.value.linkType === 3) {
+    // 选择外部链接时，必须输入链接地址
+    if (!currentBanner.value.linkUrl || currentBanner.value.linkUrl.trim() === '') {
+      ElMessage.warning('请输入外部链接地址');
+      return;
+    }
+  }
+
   try {
     submitting.value = true;
-    
+
     if (isEdit.value) {
       await bannerApi.updateBanner(currentBanner.value);
       ElMessage.success('更新成功');
@@ -474,7 +412,7 @@ async function handleSubmit() {
       await bannerApi.createBanner(currentBanner.value);
       ElMessage.success('创建成功');
     }
-    
+
     handleCloseDialog();
     await loadBanners();
   } catch (error) {
@@ -510,7 +448,7 @@ async function handleDelete(banner: Banner) {
         type: 'warning'
       }
     );
-    
+
     await bannerApi.deleteBannerById(banner.id!);
     ElMessage.success('删除成功');
     await loadBanners();
@@ -550,12 +488,12 @@ function getBannerImageUrl(banner: Banner): string {
   if (!banner.imageUrl) {
     return '/img/article-default.png';
   }
-  
+
   // 如果已经是完整URL（http或https开头），直接返回
   if (banner.imageUrl.startsWith('http://') || banner.imageUrl.startsWith('https://')) {
     return banner.imageUrl;
   }
-  
+
   // 否则拼接文件下载URL
   return FILE_DOWNLOAD_URL + banner.imageUrl;
 }
@@ -572,16 +510,16 @@ function handleImageError(event: Event) {
 async function loadSelectOptions(reset = false) {
   if (loadingMore.value) return;
   if (noMoreData.value && !reset) return;
-  
+
   if (reset) {
     selectPageParam.value.pageNumber = 1;
     selectOptions.value = [];
     noMoreData.value = false;
   }
-  
+
   try {
     loadingMore.value = true;
-    
+
     let result;
     if (currentBanner.value.linkType === 1) {
       // 加载资源列表
@@ -596,34 +534,34 @@ async function loadSelectOptions(reset = false) {
         searchKeyword.value ? { title: searchKeyword.value } as any : undefined
       );
     }
-    
+
     if (result && result.pageDomain?.dataList) {
       const newOptions = result.pageDomain.dataList.map((item: any) => {
         // 根据linkType选择正确的ID字段
         let itemId = '';
         let itemTitle = '';
-        
+
         if (currentBanner.value.linkType === 1) {
           // 资源使用resourceID
-          itemId = item.resourceID ;
+          itemId = item.resourceID;
-          itemTitle = item.title ;
+          itemTitle = item.title;
         } else if (currentBanner.value.linkType === 2) {
           // 课程使用courseID
-          itemId = item.courseID ;
+          itemId = item.courseID;
-          itemTitle = item.name ;
+          itemTitle = item.name;
         }
-        
+
         return {
           id: itemId,
           title: itemTitle
         };
       });
-      
+
       // 去重合并数据
       const existingIds = new Set(selectOptions.value.map(opt => opt.id));
       const uniqueNewOptions = newOptions.filter((opt: any) => !existingIds.has(opt.id));
       selectOptions.value = [...selectOptions.value, ...uniqueNewOptions];
-      
+
       // 更新分页信息
       if (result.pageParam) {
         selectPageParam.value = {
@@ -631,7 +569,7 @@ async function loadSelectOptions(reset = false) {
           ...result.pageParam
         };
       }
-      
+
       // 检查是否还有更多数据
       noMoreData.value = selectPageParam.value.pageNumber >= selectPageParam.value.totalPages;
     }
@@ -646,15 +584,15 @@ async function loadSelectOptions(reset = false) {
 // 切换下拉框显示
 function toggleDropdown() {
   dropdownVisible.value = !dropdownVisible.value;
-  
+
   if (dropdownVisible.value) {
     // 打开时加载数据（不重置已选项）
     searchKeyword.value = '';
-    
+
     // 总是加载第一页数据（保留已选项）
-    const hasPreloadedItem = selectOptions.value.length === 1 && 
+    const hasPreloadedItem = selectOptions.value.length === 1 &&
-                             selectOptions.value[0].id === currentBanner.value.linkID;
+      selectOptions.value[0].id === currentBanner.value.linkID;
-    
+
     if (hasPreloadedItem) {
       // 如果只有预加载的一项，重置并加载完整列表（会保留预加载项因为去重逻辑）
       selectPageParam.value.pageNumber = 1;
@@ -664,7 +602,7 @@ function toggleDropdown() {
       // 列表为空时，重置并加载
       loadSelectOptions(true);
     }
-    
+
     // 点击外部关闭下拉框
     nextTick(() => {
       document.addEventListener('click', closeDropdown);
@@ -685,7 +623,7 @@ function handleSearchChange() {
   if (searchTimer) {
     clearTimeout(searchTimer);
   }
-  
+
   searchTimer = setTimeout(() => {
     loadSelectOptions(true);
   }, 500); // 500ms防抖
@@ -697,7 +635,7 @@ function handleScroll(event: Event) {
   const scrollTop = target.scrollTop;
   const scrollHeight = target.scrollHeight;
   const clientHeight = target.clientHeight;
-  
+
   // 滚动到距离底部50px时加载更多
   if (scrollHeight - scrollTop - clientHeight < 50) {
     if (!loadingMore.value && !noMoreData.value) {
@@ -718,10 +656,10 @@ function handleSelectItem(item: any) {
 // 获取已选择项的标签
 function getSelectedItemLabel(): string {
   if (!currentBanner.value.linkID) return '';
-  
+
   const selected = selectOptions.value.find(opt => opt.id === currentBanner.value.linkID);
   const label = selected ? selected.title : '';
-  
+
   return label;
 }
 
@@ -732,7 +670,7 @@ watch(() => currentBanner.value.linkType, (newType, oldType) => {
     selectOptions.value = [];
     noMoreData.value = false;
     selectPageParam.value.pageNumber = 1;
-    
+
     // 如果下拉框是打开的，重新加载数据
     if (dropdownVisible.value) {
       loadSelectOptions(true);
@@ -885,7 +823,9 @@ onMounted(() => {
 }
 
 @keyframes spin {
-  to { transform: rotate(360deg); }
+  to {
+    transform: rotate(360deg);
+  }
 }
 
 // Banner 列表
@@ -896,21 +836,21 @@ onMounted(() => {
   gap: 16px;
   overflow-y: auto;
   min-height: 0;
-  
+
   // 美化滚动条
   &::-webkit-scrollbar {
     width: 8px;
   }
-  
+
   &::-webkit-scrollbar-track {
     background: #f1f1f1;
     border-radius: 4px;
   }
-  
+
   &::-webkit-scrollbar-thumb {
     background: #c1c1c1;
     border-radius: 4px;
-    
+
     &:hover {
       background: #a8a8a8;
     }
@@ -1077,7 +1017,7 @@ onMounted(() => {
 
   &.btn-delete {
     color: #E7000B;
-    
+
     &:hover {
       background: rgba(231, 0, 11, 0.1);
     }
@@ -1124,8 +1064,13 @@ onMounted(() => {
 }
 
 @keyframes fadeIn {
-  from { opacity: 0; }
+  from {
-  to { opacity: 1; }
+    opacity: 0;
+  }
+
+  to {
+    opacity: 1;
+  }
 }
 
 .dialog-container {
@@ -1145,6 +1090,7 @@ onMounted(() => {
     opacity: 0;
     transform: translateY(20px);
   }
+
   to {
     opacity: 1;
     transform: translateY(0);
@@ -1253,10 +1199,10 @@ onMounted(() => {
   border: 1px solid #e4e7ed;
 
   img {
-  width: 100%;
+    width: 100%;
     height: auto;
     max-height: 200px;
-  object-fit: cover;
+    object-fit: cover;
   }
 }
 
@@ -1286,12 +1232,12 @@ onMounted(() => {
 }
 
 // 分页组件
-.pagination-container {
+// .pagination-container {
-  margin-top: 24px;
+//   margin-top: 24px;
-  display: flex;
+//   display: flex;
-  justify-content: center;
+//   justify-content: center;
-  padding: 20px 0;
+//   padding: 20px 0;
-}
+// }
 
 // ==================== 下拉选择器样式 ====================
 .select-container {