fix: order by desc

smsb-modules/smsb-source/src/main/java/com/inspur/source/service/impl/SmsbItemPushServiceImpl.java

@@ -187,6 +187,7 @@ public class SmsbItemPushServiceImpl implements ISmsbItemPushService {
         lqw.eq(bo.getStatus() != null, SmsbItemPush::getStatus, bo.getStatus());
         lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
             SmsbItemPush::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
+        lqw.orderByDesc(SmsbItemPush::getCreateTime);
         return lqw;
     }
 
@@ -220,7 +221,7 @@ public class SmsbItemPushServiceImpl implements ISmsbItemPushService {
         if (bo.getItemType() == 1 || bo.getItemType() == 2) {
             addItemPushRel(bo.getId(), bo.getItemIds());
         }
-
+        submitReview(add.getId());
         return flag;
     }
 

smsb-modules/smsb-source/src/main/java/com/inspur/source/service/impl/SmsbMinioTransRecordServiceImpl.java

@@ -71,6 +71,7 @@ public class SmsbMinioTransRecordServiceImpl implements ISmsbMinioTransRecordSer
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SmsbMinioTransRecord> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getFileId() != null, SmsbMinioTransRecord::getFileId, bo.getFileId());
+        lqw.orderByDesc(SmsbMinioTransRecord::getCreateTime);
         return lqw;
     }
 

smsb-plus-ui/src/views/smsb/item/index.vue

@@ -110,7 +110,7 @@
           <!-- 界面名称输入框 -->
           <el-input v-model="itemName" placeholder="请输入轮播组名称" class="interface-input"></el-input>
 
-          <el-table :data="minioDataList" @selection-change="handleSelectionFile">
+          <el-table :data="minioDataList" reserve-selection row-key="id" @selection-change="handleSelectionFile">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="类型" align="center" prop="type" width="80">
               <template #default="scope">
@@ -407,10 +407,14 @@ const getList = async () => {
 /** 查询文件资源列表 */
 const getFileList = async () => {
   const res = await listMinioData(dialogQueryParams.value);
-  minioDataList.value = res.rows;
+  /*minioDataList.value = res.rows;
   minioDataList.value.forEach((data) => {
     data.size = parseFloat(data.size / 1024).toFixed(3) + 'MB';
-  });
+  });*/
+  minioDataList.value = res.rows.map((data) => ({
+    ...data,
+    size: parseFloat(data.size / 1024).toFixed(3) + 'MB'
+  }));
   fileTotal.value = res.total;
 };
 

smsb-plus-ui/src/views/smsb/itemPush/index.vue

@@ -106,9 +106,9 @@
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['source:itemPush:remove']"></el-button>
             </el-tooltip>
-            <el-tooltip content="提交审核" placement="top">
+<!--            <el-tooltip content="提交审核" placement="top">
               <el-button link type="primary" icon="Top" @click="handleReview(scope.row)" v-hasPermi="['source:minioData:add']"></el-button>
-            </el-tooltip>
+            </el-tooltip>-->
             <el-tooltip content="下发详情" placement="top">
               <el-button link type="primary" icon="List" @click="handleDevice(scope.row)" v-hasPermi="['source:itemPush:edit']"></el-button>
             </el-tooltip>
@@ -189,11 +189,19 @@
         <el-col :span="8" style="height: 100%; overflow: auto; padding-left: 10px">
           <!--轮播组-->
           <div v-if="form.itemType === 1 || form.itemType === 2">
-            <el-table v-loading="loading" :data="itemList" @selection-change="handleSelectItem">
-              <el-table-column type="selection" width="55" align="center" />
+            <!--<el-table v-loading="loading" :data="itemList" @selection-change="handleSelectItem">
+                            <el-table-column type="selection" width="55" align="center" />-->
+            <el-table v-loading="loading" :data="itemList">
+              <el-table-column label="ID" width="200" align="left" :show-overflow-tooltip="true">
+                <template #default="{ row }">
+                  <el-radio v-model="selectedRowId" :label="row.id" @change="handleRadioChange(row)" />
+                </template>
+              </el-table-column>
               <el-table-column label="名称" align="left" prop="itemName" :show-overflow-tooltip="true" />
               <el-table-column label="资源数量" align="center" prop="sourceNum" width="80" />
-              <el-table-column label="创建人" align="left" prop="createUser" width="100" :show-overflow-tooltip="true" />
+  <!--
+                <el-table-column label="创建人" align="left" prop="createUser" width="100" :show-overflow-tooltip="true" />
+  -->
             </el-table>
           </div>
         </el-col>
@@ -297,6 +305,8 @@ const scNum = ref(0);
 const dateRangeCreateTime = ref<[DateModelType, DateModelType]>(['', '']);
 const deviceList = ref<DeviceVO[]>([]);
 const pushDeviceList = ref<ItemPushDeviceVO[]>([]);
+// 存储选中行的唯一标识
+const selectedRowId = ref<number | null>(null);
 
 const queryFormRef = ref<ElFormInstance>();
 const itemPushFormRef = ref<ElFormInstance>();
@@ -466,6 +476,11 @@ const handleSelectItem = (selection: ItemVO[]) => {
   form.value.itemIds = itemIds.value;
 };
 
+const handleRadioChange = (row: ItemVO) => {
+  const itemIds = [row.id];
+  form.value.itemIds = itemIds;
+};
+
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();