Merge branch 'dev-meta' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/enums/MetaTaskType.java

@@ -3,9 +3,9 @@ package com.izouma.nineth.enums;
 
 public enum MetaTaskType {
 
-    SIGN_IN_SINGLE_DAY("单日签到"),
-
-    SIGN_IN_CONTINUOUS("连续多日签到"),
+//    SIGN_IN_SINGLE_DAY("单日签到"),
+//
+//    SIGN_IN_CONTINUOUS("连续多日签到"),
 
     COLLECT_COLLECTION("收集藏品"),
 

src/main/java/com/izouma/nineth/repo/MetaUserTaskAwardReceivedRecordRepo.java

@@ -4,8 +4,12 @@ import com.izouma.nineth.domain.MetaUserTaskAwardReceivedRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.time.LocalDateTime;
+
 public interface MetaUserTaskAwardReceivedRecordRepo extends JpaRepository<MetaUserTaskAwardReceivedRecord, Long>, JpaSpecificationExecutor<MetaUserTaskAwardReceivedRecord> {
 
     MetaUserTaskAwardReceivedRecord findByUserIdAndMetaTaskIdAndDel(Long userId, Long metaTaskId, boolean del);
 
+    MetaUserTaskAwardReceivedRecord findByUserIdAndMetaTaskIdAndDelAndCreatedAtAfter(Long userId, Long metaTaskId, boolean del, LocalDateTime createdAt);
+
 }

src/main/java/com/izouma/nineth/service/MetaTaskToUserService.java

@@ -120,18 +120,18 @@ public class MetaTaskToUserService {
         }
         String value = metaTask.getValue();
         switch (metaTaskToUser.getTaskType()) {
-            case SIGN_IN_SINGLE_DAY:
-                List<MetaUserTaskProgress> signInSingleDay = metaUserTaskProgressRepo.findAllByMetaTaskToUserIdAndDel(metaTaskToUser.getId(), false);
-                if (CollectionUtils.isEmpty(signInSingleDay)) {
-                    metaTaskToUser.setProcess(PREFIX.concat("1"));
-                    break;
-                }
-                metaTaskToUser.setProcess(String.valueOf(signInSingleDay.size()).concat("/1"));
-                break;
-            case SIGN_IN_CONTINUOUS:
-                int num = countSignIn(value, metaTaskToUser.getId());
-                metaTaskToUser.setProcess(String.valueOf(num).concat("/7"));
-                break;
+//            case SIGN_IN_SINGLE_DAY:
+//                List<MetaUserTaskProgress> signInSingleDay = metaUserTaskProgressRepo.findAllByMetaTaskToUserIdAndDel(metaTaskToUser.getId(), false);
+//                if (CollectionUtils.isEmpty(signInSingleDay)) {
+//                    metaTaskToUser.setProcess(PREFIX.concat("1"));
+//                    break;
+//                }
+//                metaTaskToUser.setProcess(String.valueOf(signInSingleDay.size()).concat("/1"));
+//                break;
+//            case SIGN_IN_CONTINUOUS:
+//                int num = countSignIn(value, metaTaskToUser.getId());
+//                metaTaskToUser.setProcess(String.valueOf(num).concat("/7"));
+//                break;
             case COLLECT_COLLECTION:
                 if (StringUtils.isBlank(value)) {
                     String errMsg = "任务进度显示异常，缺少藏品id配置";

src/main/java/com/izouma/nineth/service/MetaUserTaskAwardReceivedRecordService.java

@@ -7,6 +7,7 @@ import com.izouma.nineth.dto.MetaAwardReceiveDTO;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.MetaServiceResult;
 import com.izouma.nineth.enums.MetaTaskStatus;
+import com.izouma.nineth.enums.MetaTaskType;
 import com.izouma.nineth.repo.MetaTaskRepo;
 import com.izouma.nineth.repo.MetaTaskToUserRepo;
 import com.izouma.nineth.repo.MetaUserTaskAwardReceivedRecordRepo;
@@ -15,6 +16,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
+import java.time.LocalDateTime;
 import java.util.Objects;
 
 @Service
@@ -43,9 +45,17 @@ public class MetaUserTaskAwardReceivedRecordService {
         if (MetaTaskStatus.PROGRESS.equals(metaTaskToUser.getStatus()) || MetaTaskStatus.FINISH.equals(metaTaskToUser.getStatus())) {
             return MetaRestResult.returnError(String.format("奖励领取失败：当前任务状态为[%S]", metaTaskToUser.getStatus().getDescription()));
         }
-        MetaUserTaskAwardReceivedRecord metaUserTaskAwardReceivedRecord = metaUserTaskAwardReceivedRecordRepo.findByUserIdAndMetaTaskIdAndDel(userId, metaTaskId, false);
-        if (Objects.nonNull(metaUserTaskAwardReceivedRecord)) {
-            return MetaRestResult.returnError("奖励领取失败：用户已经领取过该任务奖励，不可重复领取！");
+        if (MetaTaskType.ON_LINE_TIME_DAILY.equals(metaTask.getType())) {
+            MetaUserTaskAwardReceivedRecord metaUserTaskAwardReceivedRecord = metaUserTaskAwardReceivedRecordRepo.findByUserIdAndMetaTaskIdAndDelAndCreatedAtAfter(userId, metaTaskId, false, LocalDateTime.now().withHour(0).withMinute(0).withSecond(0));
+            if (Objects.nonNull(metaUserTaskAwardReceivedRecord)) {
+                return MetaRestResult.returnError("奖励领取失败：用户今天已经领取过该任务奖励，不可重复领取！");
+            }
+        }
+        if (!MetaTaskType.ON_LINE_TIME_DAILY.equals(metaTask.getType())) {
+            MetaUserTaskAwardReceivedRecord metaUserTaskAwardReceivedRecord = metaUserTaskAwardReceivedRecordRepo.findByUserIdAndMetaTaskIdAndDel(userId, metaTaskId, false);
+            if (Objects.nonNull(metaUserTaskAwardReceivedRecord)) {
+                return MetaRestResult.returnError("奖励领取失败：用户已经领取过该任务奖励，不可重复领取！");
+            }
         }
         MetaAwardReceiveDTO metaAwardReceiveDTO = new MetaAwardReceiveDTO();
         metaAwardReceiveDTO.setUserId(userId);

src/main/java/com/izouma/nineth/service/MetaUserTaskProgressService.java

@@ -13,15 +13,12 @@ import com.izouma.nineth.repo.MetaTaskToUserRepo;
 import com.izouma.nineth.repo.MetaUserTaskProgressRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -97,20 +94,20 @@ public class MetaUserTaskProgressService {
             }
         }
         // 单日签到任务
-        if (metaTaskToUser.getTaskType().equals(MetaTaskType.SIGN_IN_SINGLE_DAY)) {
-            if (StringUtils.isBlank(value)) {
-                return MetaRestResult.returnError("单日签到任务未配置签到日期");
-            }
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            LocalDateTime startTime = LocalDate.parse(value, formatter).atStartOfDay();
-            if (!startTime.format(formatter).equals(LocalDateTime.now().format(formatter))) {
-                return MetaRestResult.returnError("当前日期不允许签到");
-            }
-            List<MetaUserTaskProgress> metaUserTaskProgresses = metaUserTaskProgressRepo.findAllByMetaTaskToUserIdAndDel(metaTaskToUser.getId(), false);
-            if (CollectionUtils.isNotEmpty(metaUserTaskProgresses)) {
-                return MetaRestResult.returnError("该签到任务已经签到过，不允许重复签到");
-            }
-        }
+//        if (metaTaskToUser.getTaskType().equals(MetaTaskType.SIGN_IN_SINGLE_DAY)) {
+//            if (StringUtils.isBlank(value)) {
+//                return MetaRestResult.returnError("单日签到任务未配置签到日期");
+//            }
+//            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//            LocalDateTime startTime = LocalDate.parse(value, formatter).atStartOfDay();
+//            if (!startTime.format(formatter).equals(LocalDateTime.now().format(formatter))) {
+//                return MetaRestResult.returnError("当前日期不允许签到");
+//            }
+//            List<MetaUserTaskProgress> metaUserTaskProgresses = metaUserTaskProgressRepo.findAllByMetaTaskToUserIdAndDel(metaTaskToUser.getId(), false);
+//            if (CollectionUtils.isNotEmpty(metaUserTaskProgresses)) {
+//                return MetaRestResult.returnError("该签到任务已经签到过，不允许重复签到");
+//            }
+//        }
         // 在线时长任务 如记录存在则更新remark（每日在线时长） 如不存在则每日首次触发该任务
         if (metaTaskToUser.getTaskType().equals(MetaTaskType.ON_LINE_TIME_DAILY)) {
             MetaUserTaskProgress dbMetaUserTaskProgress = metaUserTaskProgressRepo.findByMetaTaskToUserIdAndDelAndCreatedAtAfter(metaTaskToUser.getId(), false, LocalDateTime.now().withHour(0).withMinute(0).withSecond(0));
@@ -125,20 +122,20 @@ public class MetaUserTaskProgressService {
             return MetaRestResult.returnSuccess(false);
         }
         // 连续签到任务 每天只允许签到一次。remark可为每天签到时间也可以为空，具体判定以记录创建时间为准
-        if (metaTaskToUser.getTaskType().equals(MetaTaskType.SIGN_IN_CONTINUOUS)) {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            LocalDateTime startTime = LocalDate.parse(value, formatter).atStartOfDay();
-            if (startTime.isAfter(LocalDateTime.now())) {
-                return MetaRestResult.returnError("未到开始日期");
-            }
-            MetaUserTaskProgress dbMetaUserTaskProgress = metaUserTaskProgressRepo.findByMetaTaskToUserIdAndDelAndCreatedAtAfter(metaTaskToUser.getId(), false, LocalDateTime.now().withHour(0).withMinute(0).withSecond(0));
-            if (Objects.nonNull(dbMetaUserTaskProgress)) {
-                return MetaRestResult.returnError("当日已经存在签到记录，不可重复签到");
-            }
-            save(metaUserTaskProgress, metaTaskToUser);
-            // 该类型任务不存在完成
-            return MetaRestResult.returnSuccess(false);
-        }
+//        if (metaTaskToUser.getTaskType().equals(MetaTaskType.SIGN_IN_CONTINUOUS)) {
+//            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//            LocalDateTime startTime = LocalDate.parse(value, formatter).atStartOfDay();
+//            if (startTime.isAfter(LocalDateTime.now())) {
+//                return MetaRestResult.returnError("未到开始日期");
+//            }
+//            MetaUserTaskProgress dbMetaUserTaskProgress = metaUserTaskProgressRepo.findByMetaTaskToUserIdAndDelAndCreatedAtAfter(metaTaskToUser.getId(), false, LocalDateTime.now().withHour(0).withMinute(0).withSecond(0));
+//            if (Objects.nonNull(dbMetaUserTaskProgress)) {
+//                return MetaRestResult.returnError("当日已经存在签到记录，不可重复签到");
+//            }
+//            save(metaUserTaskProgress, metaTaskToUser);
+//            // 该类型任务不存在完成
+//            return MetaRestResult.returnSuccess(false);
+//        }
         // 保存进度
         save(metaUserTaskProgress, metaTaskToUser);
         List<MetaUserTaskProgress> metaUserTaskProgresses = metaUserTaskProgressRepo.findAllByMetaTaskToUserIdAndDel(metaTaskToUser.getId(), false);
@@ -153,10 +150,10 @@ public class MetaUserTaskProgressService {
                     return MetaRestResult.returnSuccess(true);
                 }
                 return MetaRestResult.returnSuccess(false);
-            case SIGN_IN_SINGLE_DAY:
-                // 单日登陆任务签到成功后直接完成
-                completeTask(metaTaskToUser);
-                return MetaRestResult.returnSuccess(true);
+//            case SIGN_IN_SINGLE_DAY:
+//                // 单日登陆任务签到成功后直接完成
+//                completeTask(metaTaskToUser);
+//                return MetaRestResult.returnSuccess(true);
             case ACCUMULATE:
                 if (metaUserTaskProgresses.size() >= Integer.parseInt(value)) {
                     completeTask(metaTaskToUser);

src/main/java/com/izouma/nineth/web/MetaResourcesController.java

@@ -1,18 +1,15 @@
 package com.izouma.nineth.web;
 
-import com.izouma.nineth.config.MetaConstants;
-import com.izouma.nineth.domain.MetaResourceVersion;
 import com.izouma.nineth.domain.MetaResources;
 import com.izouma.nineth.dto.MetaRestResult;
-import com.izouma.nineth.service.MetaResourcesService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.MetaResourcesRepo;
+import com.izouma.nineth.service.MetaResourcesService;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

src/main/vue/src/views/MetaLuckyDrawAwardReceiveRecordList.vue

@@ -38,7 +38,7 @@
 			<el-table-column prop="userId" align="center" label="用户id"> </el-table-column>
 			<el-table-column prop="metaLuckyDrawId" align="center" label="抽奖活动id"> </el-table-column>
 			<el-table-column prop="metaLuckDrawAwardName" align="center" label="奖励名称"> </el-table-column>
-			<el-table-column prop="finishTime" align="center" label="奖励获得时间"> </el-table-column>
+			<el-table-column prop="receiveTime" align="center" label="奖励获得时间"> </el-table-column>
 		</el-table>
 		<div class="pagination-wrapper">
 			<el-pagination

src/main/vue/src/views/MetaResourcesEdit.vue

@@ -1,60 +1,60 @@
 <template>
-    <div class="edit-view">
-        <page-title>
-            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                删除
-            </el-button>
-            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
-        </page-title>
-        <div class="edit-view__content-wrapper">
-            <div class="edit-view__content-section">
-                <el-form :model="formData" :rules="rules" ref="form" label-width="52px" label-position="right" size="small"
-                    style="max-width: 500px;">
-                    <el-form-item prop="name" label="名称">
-                        <el-input v-model="formData.name"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="pic" label="文件">
-                        <object-upload v-model="formData.pic[0]" compress width="3000" height="3000"></object-upload>
-                        <div class="tip">支持JPG、PNG、GIF、MP4，推荐长宽比1:1</div>
-                    </el-form-item>
-                    <el-form-item class="form-submit">
-                        <el-button @click="onSave" :loading="saving" type="primary">
-                            保存
-                        </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
-                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-                    </el-form-item>
-                </el-form>
-            </div>
-        </div>
-</div>
+	<div class="edit-view">
+		<page-title>
+			<el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+				删除
+			</el-button>
+			<el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+		</page-title>
+		<div class="edit-view__content-wrapper">
+			<div class="edit-view__content-section">
+				<el-form :model="formData" :rules="rules" ref="form" label-width="82px" label-position="right" size="small"
+					style="max-width: 500px;">
+					<el-form-item prop="name" label="文件名称">
+						<el-input v-model="formData.name"></el-input>
+					</el-form-item>
+					<el-form-item prop="pic" label="文件">
+						<object-upload v-model="formData.pic[0]" compress width="3000" height="3000"></object-upload>
+						<div class="tip">支持JPG、PNG、GIF、MP4，推荐长宽比1:1</div>
+					</el-form-item>
+					<el-form-item class="form-submit">
+						<el-button @click="onSave" :loading="saving" type="primary">
+							保存
+						</el-button>
+						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+							删除
+						</el-button>
+						<el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</div>
+	</div>
 </template>
 <script>
 export default {
-	name: 'MetaResourcesEdit',
-	created() {
-		if (this.$route.query.id) {
-			this.$http
-				.get('metaResources/get/' + this.$route.query.id)
-				.then(res => {
-					this.formData = res;
-				})
-				.catch(e => {
-					console.log(e);
-					this.$message.error(e.error);
-				});
-		}
-	},
-	data() {
-		return {
-			saving: false,
-			formData: {
-				pic: []
-			},
-			rules: {
+    name: 'MetaResourcesEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('metaResources/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                pic: []
+            },
+            rules: {
                 name: [
                     {
                         required: true,
@@ -68,55 +68,54 @@ export default {
                         message: '请上传文件',
                         trigger: 'blur'
                     }
-                ],
+                ]
             }
-			
-		};
-	},
-	methods: {
-		onSave() {
-			this.$refs.form.validate(valid => {
-				if (valid) {
-					this.submit();
-				} else {
-					return false;
-				}
-			});
-		},
-		submit() {
-			let data = { ...this.formData };
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
 
-			this.saving = true;
-			this.$http
-				.post('/metaResources/save', data, { body: 'json' })
-				.then(res => {
-					this.saving = false;
-					this.$message.success('成功');
-					this.$router.go(-1);
-				})
-				.catch(e => {
-					console.log(e);
-					this.saving = false;
-					this.$message.error(e.error);
-				});
-		},
-		onDelete() {
-			this.$confirm('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
-				.then(() => {
-					return this.$http.post(`/metaResources/del/${this.formData.id}`);
-				})
-				.then(() => {
-					this.$message.success('删除成功');
-					this.$router.go(-1);
-				})
-				.catch(e => {
-					if (e !== 'cancel') {
-						console.log(e);
-						this.$message.error((e || {}).error || '删除失败');
-					}
-				});
-		}
-	}
+            this.saving = true;
+            this.$http
+                .post('/metaResources/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$confirm('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metaResources/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
 };
 </script>
 <style lang="less" scoped></style>

src/main/vue/src/views/MetaResourcesList.vue

@@ -1,166 +1,152 @@
 <template>
-    <div class="list-view">
-        <page-title>
-            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading"
-                class="filter-item">
-                新增
-            </el-button>
-            <el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData"
-                class="filter-item">
-                导出
-            </el-button>
-        </page-title>
-        <div class="filters-container">
-            <el-input placeholder="搜索..." v-model="search" clearable class="filter-item search"
-                @keyup.enter.native="getData">
-                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
-            </el-input>
-        </div>
-        <el-table :data="tableData" row-key="id" ref="table" header-row-class-name="table-header-row"
-            header-cell-class-name="table-header-cell" row-class-name="table-row" cell-class-name="table-cell"
-            :height="tableHeight" v-loading="fetchingData">
-            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
-            </el-table-column>
-            <el-table-column prop="id" label="ID" width="100">
-            </el-table-column>
-            <el-table-column prop="name" label="名称" width="150" align="center">
-            </el-table-column>
-            <el-table-column prop="pic" label="文件"  align="center">
-                <template slot-scope="{ row }">
-                    <el-image
-                        style="width: 30px; height: 30px"
-                        :src="row.pic[0].thumb || row.pic[0].url"
-                        fit="cover"
-                        :preview-src-list="row.pic.map(i => i.thumb || i.url)"
-                    ></el-image>
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="150">
-                <template slot-scope="{row}">
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination-wrapper">
-            <!-- <div class="multiple-mode-wrapper">
-                    <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
-                    <el-button-group v-else>
-                        <el-button @click="operation1">批量操作1</el-button>
-                        <el-button @click="operation2">批量操作2</el-button>
-                        <el-button @click="toggleMultipleMode(false)">取消</el-button>
-                    </el-button-group>
-                </div> -->
-            <el-pagination background @size-change="onSizeChange" @current-change="onCurrentChange" :current-page="page"
-                :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
-                :total="totalElements">
-            </el-pagination>
-        </div>
+	<div class="list-view">
+		<page-title>
+			<el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading"
+				class="filter-item">
+				新增
+			</el-button>
+			<el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData"
+				class="filter-item">
+				导出
+			</el-button>
+		</page-title>
+		<div class="filters-container">
+			<el-input placeholder="搜索..." v-model="search" clearable class="filter-item search"
+				@keyup.enter.native="getData">
+				<el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+			</el-input>
+		</div>
+		<el-table :data="tableData" row-key="id" ref="table" header-row-class-name="table-header-row"
+			header-cell-class-name="table-header-cell" row-class-name="table-row" cell-class-name="table-cell"
+			:height="tableHeight" v-loading="fetchingData">
+			<el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+			</el-table-column>
+			<el-table-column prop="name" label="文件名称" width="250" align="center">
+			</el-table-column>
+			<el-table-column prop="pic" label="文件" align="center">
+				<template slot-scope="{ row }">
+					<el-image style="width: 30px; height: 30px" :src="row.pic[0].thumb || row.pic[0].url" fit="cover"
+						:preview-src-list="row.pic.map(i => i.thumb || i.url)"></el-image>
+				</template>
+			</el-table-column>
+			<el-table-column label="操作" align="center" fixed="right" width="150">
+				<template slot-scope="{row}">
+					<el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+					<el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<div class="pagination-wrapper">
+			<el-pagination background @size-change="onSizeChange" @current-change="onCurrentChange" :current-page="page"
+				:page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+				:total="totalElements">
+			</el-pagination>
+		</div>
 
-</div>
+	</div>
 </template>
 <script>
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
 
 export default {
-	name: 'MetaResourcesList',
-	mixins: [pageableTable],
-	data() {
-		return {
-			multipleMode: false,
-			search: '',
-			url: '/metaResources/all',
-			downloading: false
-		};
-	},
-	computed: {
-		selection() {
-			return this.$refs.table.selection.map(i => i.id);
-		}
-	},
-	methods: {
-		typeFormatter(row, column, cellValue, index) {
-			let selectedOption = this.typeOptions.find(i => i.value === cellValue);
-			if (selectedOption) {
-				return selectedOption.label;
-			}
-			return '';
-		},
-		beforeGetData() {
-			return { search: this.search, query: { del: false } };
-		},
-		toggleMultipleMode(multipleMode) {
-			this.multipleMode = multipleMode;
-			if (!multipleMode) {
-				this.$refs.table.clearSelection();
-			}
-		},
-		addRow() {
-			this.$router.push({
-				path: '/metaResourcesEdit',
-				query: {
-					...this.$route.query
-				}
-			});
-		},
-		editRow(row) {
-			this.$router.push({
-				path: '/metaResourcesEdit',
-				query: {
-					id: row.id
-				}
-			});
-		},
-		download() {
-			this.downloading = true;
-			this.$axios
-				.get('/metaResources/excel', {
-					responseType: 'blob',
-					params: { size: 10000 }
-				})
-				.then(res => {
-					console.log(res);
-					this.downloading = false;
-					const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
-					const link = document.createElement('a');
-					link.href = downloadUrl;
-					link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
-					document.body.appendChild(link);
-					link.click();
-					link.remove();
-				})
-				.catch(e => {
-					console.log(e);
-					this.downloading = false;
-					this.$message.error(e.error);
-				});
-		},
-		operation1() {
-			this.$notify({
-				title: '提示',
-				message: this.selection
-			});
-		},
-		operation2() {
-			this.$message('操作2');
-		},
-		deleteRow(row) {
-			this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
-				.then(() => {
-					return this.$http.post(`/metaResources/del/${row.id}`);
-				})
-				.then(() => {
-					this.$message.success('删除成功');
-					this.getData();
-				})
-				.catch(e => {
-					if (e !== 'cancel') {
-						this.$message.error(e.error);
-					}
-				});
-		}
-	}
+    name: 'MetaResourcesList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/metaResources/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        typeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search, query: { del: false } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/metaResourcesEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/metaResourcesEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/metaResources/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metaResources/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
 };
 </script>
 <style lang="less" scoped></style>

src/main/vue/src/views/MetaTaskEdit.vue

@@ -83,7 +83,7 @@
                         </el-select>
                     </el-form-item>
                     <template v-if="formData.type">
-                        <el-form-item v-if="formData.type === 'SIGN_IN_SINGLE_DAY'" prop="value" label="签到日期">
+                        <!-- <el-form-item v-if="formData.type === 'SIGN_IN_SINGLE_DAY'" prop="value" label="签到日期">
                             <el-date-picker
                                 v-model="formData.value"
                                 type="date"
@@ -100,7 +100,7 @@
                                 placeholder="指定开始日期"
                             >
                             </el-date-picker>
-                        </el-form-item>
+                        </el-form-item> -->
                         <el-form-item prop="value" label="藏品id" v-if="formData.type === 'COLLECT_COLLECTION'">
                             <el-input v-model="formData.value" placeholder="请输入定藏品id"> </el-input>
                             <div class="tip">多个藏品id请用空格隔开 例如 111 222 333</div>
@@ -228,8 +228,8 @@ export default {
                 ]
             },
             typeOptions: [
-                { label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
-                { label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
+                // { label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
+                // { label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
                 { label: '收集藏品', value: 'COLLECT_COLLECTION' },
                 { label: '每日在线时长', value: 'ON_LINE_TIME_DAILY' },
                 { label: '累计', value: 'ACCUMULATE' }

src/main/vue/src/views/MetaTaskList.vue

@@ -124,8 +124,8 @@ export default {
             url: '/metaTask/all',
             downloading: false,
             typeOptions: [
-                { label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
-                { label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
+                // { label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
+                // { label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
                 { label: '收集藏品', value: 'COLLECT_COLLECTION' },
                 { label: '每日在线时长', value: 'ON_LINE_TIME_DAILY' },
                 { label: '累计', value: 'ACCUMULATE' }

src/main/vue/src/views/MetaTaskToUserList.vue

@@ -84,8 +84,8 @@ export default {
             url: '/metaTaskToUser/all',
             downloading: false,
             taskTypeOptions: [
-                { label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
-                { label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
+                // { label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
+                // { label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
                 { label: '收集藏品', value: 'COLLECT_COLLECTION' },
                 { label: '每日在线时长', value: 'ON_LINE_TIME_DAILY' },
                 { label: '累计', value: 'ACCUMULATE' }

src/main/vue/src/views/MetaUserTaskProgressList.vue

@@ -70,8 +70,8 @@ export default {
             url: '/metaUserTaskProgress/all',
             downloading: false,
             taskTypeOptions: [
-                { label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
-                { label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
+                // { label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
+                // { label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
                 { label: '收集藏品', value: 'COLLECT_COLLECTION' },
                 { label: '每日在线时长', value: 'ON_LINE_TIME_DAILY' },
                 { label: '累计', value: 'ACCUMULATE' }