浏览代码

fix: 素材发布根据是否应急支持是否可以选择PPT类型文件

lihao16 2 月之前
父节点
当前提交
53fdfd216d

+ 6 - 1
smsb-modules/smsb-source/src/main/java/com/inspur/source/domain/bo/SmsbMinioDataBo.java

@@ -30,10 +30,15 @@ public class SmsbMinioDataBo extends BaseEntity {
     private Long id;
 
     /**
-     * 类型 1图片 ,2视频 3音频
+     * 类型 1图片 ,2视频, 3音频, 4 PPT
      */
     private Integer type;
 
+    /**
+     * 类型集合
+     */
+    private List<Integer> types;
+
     /**
      * 分类1:广告,2:公益,3:地方宣传,4.垫片
      */

+ 4 - 4
smsb-modules/smsb-source/src/main/java/com/inspur/source/service/impl/SmsbMinioDataServiceImpl.java

@@ -14,7 +14,6 @@ import com.inspur.source.mapper.*;
 import com.inspur.source.service.ISmsbMinioDataService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -50,8 +49,8 @@ import java.nio.file.Paths;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.time.Duration;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -313,9 +312,10 @@ public class SmsbMinioDataServiceImpl implements ISmsbMinioDataService {
                     SmsbMinioData::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
         lqw.orderByDesc(SmsbMinioData::getCreateTime);
         lqw.eq(SmsbMinioData::getDelFlag, 0);
+        lqw.in(bo.getTypes() != null && bo.getTypes().size() > 0, SmsbMinioData::getType, bo.getTypes());
         lqw.like(bo.getOriginalName() != null && !StringUtils.equals(bo.getOriginalName(), ""),
-                 SmsbMinioData::getOriginalName,
-                 bo.getOriginalName());
+            SmsbMinioData::getOriginalName,
+            bo.getOriginalName());
         return lqw;
     }
 

+ 2 - 0
smsb-plus-ui/src/api/smsb/source/item_type.ts

@@ -145,4 +145,6 @@ export interface ItemQuery extends PageQuery {
   params?: any;
 
   fileId?: string | number;
+
+  types? : number[];
 }

+ 20 - 3
smsb-plus-ui/src/views/smsb/itemPush/index.vue

@@ -174,9 +174,9 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="优先级" prop="level">
-                  <el-select v-model="form.level" placeholder="请选择优先级">
+                  <el-select v-model="form.level" @change="pushLevelChange" placeholder="请选择优先级">
                     <el-option v-for="dict in smsb_push_level" :key="dict.value" :label="dict.label"
-                      :value="parseInt(dict.value)"></el-option>
+                               :value="parseInt(dict.value)" ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -459,7 +459,8 @@ const itemData = reactive<TransPageData<ItemQuery>>({
   transQueryParams: {
     pageNum: 1,
     pageSize: 10000,
-    itemType: undefined
+    itemType: undefined,
+    types: undefined
   }
 });
 
@@ -504,10 +505,26 @@ const getItemList = async () => {
     itemTotal.value = res.total;
   }
   if (form.value.itemType === 4) {
+    if (form.value.level === 400) {
+      transQueryParams.value.types = [1, 2, 3, 4];
+    }else {
+      transQueryParams.value.types = [1, 2, 3];
+    }
     const res = await listMinioData(transQueryParams.value);
     minioDataList.value = res.rows;
   }
 };
+const pushLevelChange = async () => {
+  if (form.value.itemType === 4) {
+    if (form.value.level === 400) {
+      transQueryParams.value.types = [1, 2, 3, 4];
+    }else {
+      transQueryParams.value.types = [1, 2, 3];
+    }
+    const res = await listMinioData(transQueryParams.value);
+    minioDataList.value = res.rows;
+  }
+}
 // 播放视频
 const viewVideo = (url: string) => {
   videoUrl.value = url;