sunkean il y a 2 ans
Parent
commit
fd66cee1a6

+ 2 - 0
src/main/java/com/izouma/nineth/config/MetaConstants.java

@@ -21,4 +21,6 @@ public interface MetaConstants {
     String BLANK = " ";
 
     String REDIS_STOCK_PREFIX = "stock:";
+
+    Long META_GOLD_RECEIVED_RANK_ID = 1L;
 }

+ 3 - 3
src/main/java/com/izouma/nineth/domain/MetaTop.java → src/main/java/com/izouma/nineth/domain/MetaRank.java

@@ -14,12 +14,12 @@ import javax.persistence.Entity;
 @NoArgsConstructor
 @Entity
 @ApiModel("元宇宙排行榜管理")
-public class MetaTop extends BaseEntity{
+public class MetaRank extends BaseEntity {
 
-    @ApiModelProperty("排行榜名称")
+    @ApiModelProperty("名称")
     private String name;
 
-    @ApiModelProperty("排行榜用途")
+    @ApiModelProperty("详情")
     private String rule;
 
     @ApiModelProperty("配置图片")

+ 4 - 4
src/main/java/com/izouma/nineth/dto/MetaGoldTopDTO.java → src/main/java/com/izouma/nineth/dto/MetaRankDTO.java

@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
-public class MetaGoldTopDTO {
+public class MetaRankDTO {
 
     @ApiModelProperty("用户Id")
     @ExcelProperty("用户ID")
@@ -23,7 +23,7 @@ public class MetaGoldTopDTO {
     @ExcelProperty("昵称")
     private String nickName;
 
-    @ApiModelProperty("用户金币数量")
-    @ExcelProperty("金币数量")
-    private Long num;
+    @ApiModelProperty("备注")
+    @ExcelProperty("备注")
+    private String remark;
 }

+ 3 - 3
src/main/java/com/izouma/nineth/repo/MetaTopRepo.java → src/main/java/com/izouma/nineth/repo/MetaRankRepo.java

@@ -1,6 +1,6 @@
 package com.izouma.nineth.repo;
 
-import com.izouma.nineth.domain.MetaTop;
+import com.izouma.nineth.domain.MetaRank;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -8,8 +8,8 @@ import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
 
-public interface MetaTopRepo extends JpaRepository<MetaTop, Long>, JpaSpecificationExecutor<MetaTop> {
-    @Query("update MetaTop t set t.del = true where t.id = ?1")
+public interface MetaRankRepo extends JpaRepository<MetaRank, Long>, JpaSpecificationExecutor<MetaRank> {
+    @Query("update MetaRank t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);

+ 2 - 4
src/main/java/com/izouma/nineth/repo/MetaUserGoldRecordRepo.java

@@ -1,8 +1,6 @@
 package com.izouma.nineth.repo;
 
 import com.izouma.nineth.domain.MetaUserGoldRecord;
-import com.izouma.nineth.dto.MetaGoldTopDTO;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -18,6 +16,6 @@ public interface MetaUserGoldRecordRepo extends JpaRepository<MetaUserGoldRecord
     @Transactional
     void softDelete(Long id);
 
-    @Query(value = "select user_id userId,sum(operation_num) num,nickname nickName,avatar head from meta_user_gold_record inner join user u on meta_user_gold_record.user_id = u.id where meta_user_gold_record.created_at between ?1 and ?2 and operation_num > 0 group by user_id  order by sum(operation_num) desc",nativeQuery = true)
-    List<Map<String,String>> top(String beginTime, String endTime);
+    @Query(value = "select user_id userId, sum(operation_num) remark, nickname nickName, avatar head from meta_user_gold_record inner join user u on meta_user_gold_record.user_id = u.id where meta_user_gold_record.created_at between ?1 and ?2 and operation_num > 0 group by user_id  order by sum(operation_num) desc", nativeQuery = true)
+    List<Map<String, String>> rank(String beginTime, String endTime);
 }

+ 73 - 0
src/main/java/com/izouma/nineth/service/MetaRankService.java

@@ -0,0 +1,73 @@
+package com.izouma.nineth.service;
+
+import cn.hutool.core.convert.Convert;
+import com.alibaba.fastjson.JSONArray;
+import com.izouma.nineth.config.MetaConstants;
+import com.izouma.nineth.domain.MetaRank;
+import com.izouma.nineth.dto.MetaRankDTO;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.dto.PageWrapper;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaRankRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class MetaRankService {
+
+    private MetaRankRepo metaRankRepo;
+
+    private MetaUserGoldRecordService metaUserGoldRecordService;
+
+    public Page<MetaRank> all(PageQuery pageQuery) {
+        return metaRankRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaRank.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public Page<MetaRankDTO> rank(PageQuery pageQuery) {
+        Map<String, Object> query = pageQuery.getQuery();
+        if (!query.containsKey("id")) {
+            throw new BusinessException("排行榜id不存在!");
+        }
+        Long id = Convert.toLong(query.get("id"));
+        if (id.equals(MetaConstants.META_GOLD_RECEIVED_RANK_ID)) {
+            return buildPage(pageQuery, metaUserGoldRecordService.rank());
+        }
+        // ...
+        throw new BusinessException("非法排行榜id");
+    }
+
+    private Page<MetaRankDTO> buildPage(PageQuery pageQuery, List<Map<String, String>> rank) {
+        if (CollectionUtils.isEmpty(rank)) {
+            return null;
+        }
+        JSONArray jsonArray = new JSONArray();
+        jsonArray.addAll(rank);
+        List<MetaRankDTO> metaRankDTOS = jsonArray.toJavaList(MetaRankDTO.class);
+        int page = pageQuery.getPage();
+        int size = pageQuery.getSize();
+        int start = page * size;
+        int totalElements = 0;
+        if (CollectionUtils.isEmpty(metaRankDTOS)) {
+            return new PageWrapper<>(new ArrayList<MetaRankDTO>(), page,
+                    size, totalElements).toPage();
+        }
+        totalElements = metaRankDTOS.size();
+        List<MetaRankDTO> newMetaRankDTOS;
+        if (metaRankDTOS.size() < start + size) {
+            newMetaRankDTOS = metaRankDTOS.subList(start, metaRankDTOS.size());
+            return new PageWrapper<>(newMetaRankDTOS, page,
+                    size, totalElements).toPage();
+        }
+        newMetaRankDTOS = metaRankDTOS.subList(start, start + size);
+        return new PageWrapper<>(newMetaRankDTOS, page,
+                size, totalElements).toPage();
+    }
+}

+ 0 - 20
src/main/java/com/izouma/nineth/service/MetaTopService.java

@@ -1,20 +0,0 @@
-package com.izouma.nineth.service;
-
-import com.izouma.nineth.domain.MetaTop;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.repo.MetaTopRepo;
-import com.izouma.nineth.utils.JpaUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-@Service
-@AllArgsConstructor
-public class MetaTopService {
-
-    private MetaTopRepo metaTopRepo;
-
-    public Page<MetaTop> all(PageQuery pageQuery) {
-        return metaTopRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaTop.class), JpaUtils.toPageRequest(pageQuery));
-    }
-}

+ 12 - 2
src/main/java/com/izouma/nineth/service/MetaUserGoldRecordService.java

@@ -1,22 +1,32 @@
 package com.izouma.nineth.service;
 
+import com.izouma.nineth.config.MetaConstants;
 import com.izouma.nineth.domain.MetaUserGoldRecord;
 import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.dto.PageWrapper;
-import com.izouma.nineth.dto.UserHoldDTO;
 import com.izouma.nineth.repo.MetaUserGoldRecordRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 @Service
 @AllArgsConstructor
 public class MetaUserGoldRecordService {
 
     private MetaUserGoldRecordRepo metaUserGoldRecordRepo;
 
+    private MetaParamsConfigService metaParamsConfigService;
+
     public Page<MetaUserGoldRecord> all(PageQuery pageQuery) {
         return metaUserGoldRecordRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaUserGoldRecord.class), JpaUtils.toPageRequest(pageQuery));
     }
+
+    public List<Map<String, String>> rank() {
+        String beginTime = metaParamsConfigService.getString(MetaConstants.META_GOLD_TOP_BEGIN_TIME);
+        String endTime = metaParamsConfigService.getString(MetaConstants.META_GOLD_TOP_END_TIME);
+        return metaUserGoldRecordRepo.rank(beginTime, endTime);
+    }
 }

+ 53 - 0
src/main/java/com/izouma/nineth/web/MetaRankController.java

@@ -0,0 +1,53 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaRank;
+import com.izouma.nineth.dto.MetaRankDTO;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaRankRepo;
+import com.izouma.nineth.service.MetaRankService;
+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.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/metaRank")
+@AllArgsConstructor
+public class MetaRankController extends BaseController {
+    private MetaRankService metaRankService;
+    private MetaRankRepo    metaRankRepo;
+
+    @PostMapping("/all")
+    public Page<MetaRank> all(@RequestBody PageQuery pageQuery) {
+        return metaRankService.all(pageQuery);
+    }
+
+    @PostMapping("/save")
+    public MetaRank save(@RequestBody MetaRank record) {
+        if (record.getId() != null) {
+            MetaRank orig = metaRankRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return metaRankRepo.save(orig);
+        }
+        return metaRankRepo.save(record);
+    }
+
+    @PostMapping("/rank")
+    public Page<MetaRankDTO> rank(@RequestBody PageQuery pageQuery) {
+        return metaRankService.rank(pageQuery);
+    }
+
+    @GetMapping("/excel/rank")
+    @ResponseBody
+    public void excelTop(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaRankDTO> data = rank(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

+ 0 - 60
src/main/java/com/izouma/nineth/web/MetaTopController.java

@@ -1,60 +0,0 @@
-package com.izouma.nineth.web;
-import com.izouma.nineth.domain.MetaTop;
-import com.izouma.nineth.service.MetaTopService;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.MetaTopRepo;
-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;
-import java.io.IOException;
-import java.util.List;
-
-@RestController
-@RequestMapping("/metaTop")
-@AllArgsConstructor
-public class MetaTopController extends BaseController {
-    private MetaTopService metaTopService;
-    private MetaTopRepo metaTopRepo;
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/save")
-    public MetaTop save(@RequestBody MetaTop record) {
-        if (record.getId() != null) {
-            MetaTop orig = metaTopRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, record);
-            return metaTopRepo.save(orig);
-        }
-        return metaTopRepo.save(record);
-    }
-
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/all")
-    public Page<MetaTop> all(@RequestBody PageQuery pageQuery) {
-        return metaTopService.all(pageQuery);
-    }
-
-    @GetMapping("/get/{id}")
-    public MetaTop get(@PathVariable Long id) {
-        return metaTopRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-    }
-
-    @PostMapping("/del/{id}")
-    public void del(@PathVariable Long id) {
-        metaTopRepo.softDelete(id);
-    }
-
-    @GetMapping("/excel")
-    @ResponseBody
-    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<MetaTop> data = all(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
-}
-

+ 2 - 53
src/main/java/com/izouma/nineth/web/MetaUserGoldRecordController.java

@@ -1,37 +1,26 @@
 package com.izouma.nineth.web;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.izouma.nineth.config.MetaConstants;
-import com.izouma.nineth.domain.MetaGameBoxPoints;
-import com.izouma.nineth.domain.MetaParamsConfig;
 import com.izouma.nineth.domain.MetaUserGoldRecord;
-import com.izouma.nineth.dto.*;
+import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.MetaParamsConfigRepo;
 import com.izouma.nineth.repo.MetaUserGoldRecordRepo;
-import com.izouma.nineth.service.MetaParamsConfigService;
 import com.izouma.nineth.service.MetaUserGoldRecordService;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/metaUserGoldRecord")
 @AllArgsConstructor
 public class MetaUserGoldRecordController extends BaseController {
     private MetaUserGoldRecordService metaUserGoldRecordService;
-    private MetaUserGoldRecordRepo metaUserGoldRecordRepo;
-    private MetaParamsConfigService metaParamsConfigService;
+    private MetaUserGoldRecordRepo    metaUserGoldRecordRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -67,45 +56,5 @@ public class MetaUserGoldRecordController extends BaseController {
         List<MetaUserGoldRecord> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
-
-    @GetMapping("/excel/top")
-    @ResponseBody
-    public void excelTop(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<MetaGoldTopDTO> data = top(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
-
-    @PostMapping("/goldTop")
-    public Page<MetaGoldTopDTO> top(@RequestBody PageQuery pageQuery) {
-        String beginTime = metaParamsConfigService.getString(MetaConstants.META_GOLD_TOP_BEGIN_TIME);
-        String endTime = metaParamsConfigService.getString(MetaConstants.META_GOLD_TOP_END_TIME);
-        List<Map<String, String>> map = metaUserGoldRecordRepo.top(beginTime, endTime);
-        JSONArray jsonArray = new JSONArray();
-        jsonArray.addAll(map);
-        List<MetaGoldTopDTO> metaGoldTopDTOS = jsonArray.toJavaList(MetaGoldTopDTO.class);
-        // 当前页
-        int page = pageQuery.getPage();
-        // pageSize 每页查询多少条数据
-        int size = pageQuery.getSize();
-        // limit 开始偏移量
-        int start = page * size;
-        int totalElements = 0;
-        if (CollectionUtils.isEmpty(metaGoldTopDTOS)) {
-            totalElements = 0;
-            return new PageWrapper<>(new ArrayList<MetaGoldTopDTO>(), page,
-                    size, totalElements).toPage();
-        }
-        totalElements = metaGoldTopDTOS.size();
-        List<MetaGoldTopDTO> newMetaGoldTopDTOS;
-        if (metaGoldTopDTOS.size() < start + size) {
-            newMetaGoldTopDTOS = metaGoldTopDTOS.subList(start, metaGoldTopDTOS.size());
-            return new PageWrapper<>(newMetaGoldTopDTOS, page,
-                    size, totalElements).toPage();
-        }
-        newMetaGoldTopDTOS = metaGoldTopDTOS.subList(start, start + size);
-        return new PageWrapper<>(newMetaGoldTopDTOS, page,
-                size, totalElements).toPage();
-
-    }
 }
 

+ 10 - 10
src/main/vue/src/router.js

@@ -2015,25 +2015,25 @@ const router = new Router({
                     },
                 },
                 {
-                    path: '/metaTopEdit',
-                    name: 'MetaTopEdit',
-                    component: () => import(/* webpackChunkName: "metaTopEdit" */ '@/views/MetaTopEdit.vue'),
+                    path: '/metaRankEdit',
+                    name: 'MetaRankEdit',
+                    component: () => import(/* webpackChunkName: "metaRankEdit" */ '@/views/MetaRankEdit.vue'),
                     meta: {
-                       title: '元宇宙排行榜管理编辑',
+                       title: '元宇宙排行榜管理新增',
                     },
                 },
                 {
-                    path: '/metaTopList',
-                    name: 'MetaTopList',
-                    component: () => import(/* webpackChunkName: "metaTopList" */ '@/views/MetaTopList.vue'),
+                    path: '/metaRankList',
+                    name: 'MetaRankList',
+                    component: () => import(/* webpackChunkName: "metaRankList" */ '@/views/MetaRankList.vue'),
                     meta: {
                        title: '元宇宙排行榜管理',
                     },
                 },
                 {
-                    path: '/MetaTopDetailList',
-                    name: 'MetaTopDetailList',
-                    component: () => import(/* webpackChunkName: "metaTopList" */ '@/views/MetaTopDetailList.vue'),
+                    path: '/MetaRankDetailList',
+                    name: 'MetaRankDetailList',
+                    component: () => import(/* webpackChunkName: "metaRankList" */ '@/views/MetaRankDetailList.vue'),
                     meta: {
                        title: '元宇宙排行榜',
                     },

+ 87 - 0
src/main/vue/src/views/MetaRankDetailList.vue

@@ -0,0 +1,87 @@
+<template>
+    <div class="list-view">
+        <page-title>
+            <el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData"
+                class="filter-item">
+                导出
+            </el-button>
+        </page-title>
+        <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="userId" label="用户Id" width="100"> </el-table-column>
+            <el-table-column prop="head" align="center" label="图片">
+                <template slot-scope="{ row }">
+                    <el-image style="width: 30px; height: 30px" :src="row.head" fit="cover" :preview-src-list="[row.head]">
+                    </el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="nickName" label="用户昵称"> </el-table-column>
+            <el-table-column prop="remark" label="金币数量" v-if ="this.$route.query.id == 1"> </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>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+	name: 'MetaRankDetailList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			url: '/metaRank/rank',
+			downloading: false
+		};
+	},
+	computed: {
+		selection() {
+			return this.$refs.table.selection.map(i => i.id);
+		}
+	},
+	methods: {
+		beforeGetData() {
+			return { query: { id: this.$route.query.id } };
+		},
+		toggleMultipleMode(multipleMode) {
+			this.multipleMode = multipleMode;
+			if (!multipleMode) {
+				this.$refs.table.clearSelection();
+			}
+		},
+		download() {
+			this.downloading = true;
+			this.$axios
+				.get('/metaRank/excel/rank', {
+					responseType: 'blob',
+					params: { size: 10000, query: { id: this.$route.query.id } }
+				})
+				.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);
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped></style>

+ 71 - 0
src/main/vue/src/views/MetaRankEdit.vue

@@ -0,0 +1,71 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</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="94px" 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="rule" label="排行榜用途">
+                        <el-input v-model="formData.rule"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pic" label="配置图片">
+                        <single-upload v-model="formData.pic"></single-upload>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary">
+                            保存
+                        </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: 'MetaRankEdit',
+	data() {
+		return {
+			saving: false,
+			formData: {},
+			rules: {}
+		};
+	},
+	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('/metaRank/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);
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped></style>

+ 85 - 0
src/main/vue/src/views/MetaRankList.vue

@@ -0,0 +1,85 @@
+<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>
+        </page-title>
+        <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" align="center"> </el-table-column>
+            <el-table-column prop="name" label="名称" align="center"> </el-table-column>
+            <el-table-column prop="rule" label="用途" 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" fit="cover"
+                        :preview-src-list="[row.pic]"></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="rankDetail(row.id)" type="primary" 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>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+	name: 'MetaRankList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/metaRank/all',
+			downloading: false
+		};
+	},
+	computed: {
+		selection() {
+			return this.$refs.table.selection.map(i => i.id);
+		}
+	},
+	methods: {
+		beforeGetData() {
+			return { search: this.search, query: { del: false } };
+		},
+		toggleMultipleMode(multipleMode) {
+			this.multipleMode = multipleMode;
+			if (!multipleMode) {
+				this.$refs.table.clearSelection();
+			}
+		},
+		addRow() {
+			this.$router.push({
+				path: '/metaRankEdit',
+				query: {
+					...this.$route.query
+				}
+			});
+		},
+		rankDetail(id) {
+			this.$router.push({
+				path: '/MetaRankDetailList',
+				query: {
+					id: id
+				}
+			});
+		}
+	}
+};
+</script>
+<style lang="less" scoped></style>

+ 0 - 142
src/main/vue/src/views/MetaTopDetailList.vue

@@ -1,142 +0,0 @@
-<template>
-    <div class="list-view">
-        <page-title>
-            <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="userId" label="用户Id" width="100"> </el-table-column>
-            <el-table-column prop="head" align="center" label="图片">
-				<template slot-scope="{ row }">
-					<el-image
-						style="width: 30px; height: 30px"
-						:src="row.head"
-						fit="cover"
-						:preview-src-list="[row.head]"
-					>
-					</el-image>
-				</template>
-			</el-table-column>
-            <el-table-column prop="nickName" label="用户昵称"> </el-table-column>
-            <el-table-column prop="num" label="金币数量"> </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>
-</template>
-<script>
-import { mapState } from 'vuex';
-import pageableTable from '@/mixins/pageableTable';
-
-export default {
-    name: 'MetaTopDetailList',
-    mixins: [pageableTable],
-    data() {
-        return {
-            multipleMode: false,
-            search: '',
-            url: '/metaUserGoldRecord/goldTop',
-            downloading: false
-        };
-    },
-    computed: {
-        selection() {
-            return this.$refs.table.selection.map(i => i.id);
-        }
-    },
-    methods: {
-        beforeGetData() {
-            return { search: this.search, query: { del: false } };
-        },
-        toggleMultipleMode(multipleMode) {
-            this.multipleMode = multipleMode;
-            if (!multipleMode) {
-                this.$refs.table.clearSelection();
-            }
-        },
-        download() {
-            this.downloading = true;
-            this.$axios
-                .get('/metaUserGoldRecord/excel/top', {
-                    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');
-        }
-    }
-};
-</script>
-<style lang="less" scoped>
-</style>

+ 0 - 106
src/main/vue/src/views/MetaTopEdit.vue

@@ -1,106 +0,0 @@
-<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="94px" 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="rule" label="排行榜用途">
-                                    <el-input v-model="formData.rule"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="pic" label="配置图片">
-                                    <single-upload v-model="formData.pic"></single-upload>
-                        </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: 'MetaTopEdit',
-        created() {
-            if (this.$route.query.id) {
-                this.$http
-                    .get('metaTop/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: {
-                },
-                rules: {
-                },
-            }
-        },
-        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('/metaTop/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(`/metaTop/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>

+ 0 - 185
src/main/vue/src/views/MetaTopList.vue

@@ -1,185 +0,0 @@
-<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>
-        </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" align="center"> </el-table-column>
-            <el-table-column prop="name" label="排行榜名称" align="center"> </el-table-column>
-            <el-table-column prop="rule" label="排行榜用途" 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"
-                        fit="cover"
-                        :preview-src-list="[row.pic]"
-                    ></el-image>
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="150">
-                <template slot-scope="{ row }">
-                    <el-button @click="MetaTopDetailList(row)" type="primary" 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>
-</template>
-<script>
-import { mapState } from 'vuex';
-import pageableTable from '@/mixins/pageableTable';
-
-export default {
-    name: 'MetaTopList',
-    mixins: [pageableTable],
-    data() {
-        return {
-            multipleMode: false,
-            search: '',
-            url: '/metaTop/all',
-            downloading: false
-        };
-    },
-    computed: {
-        selection() {
-            return this.$refs.table.selection.map(i => i.id);
-        }
-    },
-    methods: {
-        beforeGetData() {
-            return { search: this.search, query: { del: false } };
-        },
-        toggleMultipleMode(multipleMode) {
-            this.multipleMode = multipleMode;
-            if (!multipleMode) {
-                this.$refs.table.clearSelection();
-            }
-        },
-        addRow() {
-            this.$router.push({
-                path: '/metaTopEdit',
-                query: {
-                    ...this.$route.query
-                }
-            });
-        },
-        MetaTopDetailList() {
-            this.$router.push({
-                path: '/MetaTopDetailList',
-                query: {
-                    
-                }
-            });
-        },
-        editRow(row) {
-            this.$router.push({
-                path: '/metaTopEdit',
-                query: {
-                    id: row.id
-                }
-            });
-        },
-        download() {
-            this.downloading = true;
-            this.$axios
-                .get('/metaTop/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(`/metaTop/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>