Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_back into dev

src/main/java/com/izouma/nineth/domain/MetaGameBoxPoints.java

@@ -0,0 +1,38 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.annotations.Searchable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙GameBox积分")
+public class MetaGameBoxPoints extends BaseEntity {
+
+    @ApiModelProperty("用户ID")
+    @Searchable
+    private Long userId;
+
+    @ApiModelProperty("昵称")
+    @Transient
+    private String nickname;
+
+    @ApiModelProperty("头像")
+    @Transient
+    private String head;
+
+    @ApiModelProperty("当前最高积分")
+    private int score;
+
+    @ApiModelProperty("当前排名")
+    @Transient
+    private int scoreRank;
+}

src/main/java/com/izouma/nineth/dto/MetaGameBoxPointsDTO.java

@@ -0,0 +1,24 @@
+package com.izouma.nineth.dto;
+
+import com.izouma.nineth.domain.MetaGameBoxPoints;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class MetaGameBoxPointsDTO {
+
+    @ApiModelProperty("当前用户排名")
+    private int selfRank;
+
+    @ApiModelProperty("当前用户最高积分")
+    private int selfHiScore;
+
+    @ApiModelProperty("积分top50")
+    private List<MetaGameBoxPoints> data;
+}

src/main/java/com/izouma/nineth/dto/MetaRestResult.java

@@ -22,6 +22,13 @@ public class MetaRestResult<T> {
     @ApiModelProperty("返回数据")
     private T data;
 
+    public static <T> MetaRestResult<T> returnSuccess(String successMessage) {
+        MetaRestResult<T> result = returnResult(null);
+        result.setMessage(successMessage);
+        result.setCode(Constants.MetaRestCode.success);
+        return result;
+    }
+
     public static <T> MetaRestResult<T> returnSuccess(T data) {
         String successMsg = "请求成功";
         return returnSuccess(successMsg, data);

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

@@ -0,0 +1,21 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaGameBoxPoints;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+import java.util.Map;
+
+public interface MetaGameBoxPointsRepo extends JpaRepository<MetaGameBoxPoints, Long>, JpaSpecificationExecutor<MetaGameBoxPoints> {
+
+    @Query(value = "SELECT m.user_id userId, m.score score, u.nickname nickname, u.avatar head, RANK() OVER(ORDER BY m.score DESC) scoreRank FROM meta_game_box_points m LEFT JOIN user u ON m.user_id = u.id LIMIT 50", nativeQuery = true)
+    List<Map<String, Object>> findTopFifty();
+
+    @Query(value = "SELECT m.score score, a.scoreRank scoreRank FROM meta_game_box_points m LEFT JOIN ( SELECT user_id userId, RANK() OVER ( ORDER BY score DESC ) scoreRank FROM meta_game_box_points ) a ON m.user_id = a.userId  WHERE m.user_id = ?1", nativeQuery = true)
+    Map<String, Object> findInfoByUserId(Long userId);
+
+    MetaGameBoxPoints findByUserId(Long userId);
+
+}

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

@@ -0,0 +1,73 @@
+package com.izouma.nineth.service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.izouma.nineth.domain.MetaGameBoxPoints;
+import com.izouma.nineth.dto.MetaGameBoxPointsDTO;
+import com.izouma.nineth.dto.MetaRestResult;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.MetaGameBoxPointsRepo;
+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;
+import java.util.Objects;
+
+@Service
+@AllArgsConstructor
+public class MetaGameBoxPointsService {
+
+    private MetaGameBoxPointsRepo metaGameBoxPointsRepo;
+
+    public Page<MetaGameBoxPoints> all(PageQuery pageQuery) {
+        return metaGameBoxPointsRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaGameBoxPoints.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public MetaRestResult<MetaGameBoxPointsDTO> get(Long userId) {
+        MetaGameBoxPointsDTO metaGameBoxPointsDTO = new MetaGameBoxPointsDTO();
+        MetaGameBoxPoints metaGameBoxPoints = metaGameBoxPointsRepo.findByUserId(userId);
+        if (Objects.isNull(metaGameBoxPoints)) {
+            metaGameBoxPoints = new MetaGameBoxPoints();
+            metaGameBoxPoints.setUserId(userId);
+            metaGameBoxPoints.setScore(0);
+            metaGameBoxPointsRepo.save(metaGameBoxPoints);
+        }
+        Map<String, Object> metaGameBoxPointsMap = metaGameBoxPointsRepo.findInfoByUserId(userId);
+        String jsonStr = JSONObject.toJSONString(metaGameBoxPointsMap);
+        metaGameBoxPoints = JSONObject.parseObject(jsonStr, MetaGameBoxPoints.class);
+        metaGameBoxPointsDTO.setSelfHiScore(metaGameBoxPoints.getScore());
+        metaGameBoxPointsDTO.setSelfRank(metaGameBoxPoints.getScoreRank());
+        List<Map<String, Object>> map = metaGameBoxPointsRepo.findTopFifty();
+        JSONArray jsonArray = new JSONArray();
+        jsonArray.addAll(map);
+        List<MetaGameBoxPoints> data = jsonArray.toJavaList(MetaGameBoxPoints.class);
+        metaGameBoxPointsDTO.setData(data);
+        return MetaRestResult.returnSuccess(metaGameBoxPointsDTO);
+    }
+
+    public MetaRestResult<MetaGameBoxPoints> update(MetaGameBoxPoints record) {
+        if (Objects.isNull(record)) {
+            return MetaRestResult.returnError("Illegal parameter : parameter can not be null");
+        }
+        if (Objects.isNull(record.getUserId())) {
+            return MetaRestResult.returnError("Illegal parameter : userId can not be null");
+        }
+        MetaGameBoxPoints metaGameBoxPoints = metaGameBoxPointsRepo.findByUserId(record.getUserId());
+        if (Objects.isNull(metaGameBoxPoints)) {
+            metaGameBoxPoints = new MetaGameBoxPoints();
+            metaGameBoxPoints.setUserId(record.getUserId());
+            metaGameBoxPoints.setScore(record.getScore());
+            metaGameBoxPointsRepo.save(metaGameBoxPoints);
+            return MetaRestResult.returnSuccess("初始化并更新成功");
+        }
+        if (record.getScore() > metaGameBoxPoints.getScore()) {
+            metaGameBoxPoints.setScore(record.getScore());
+            metaGameBoxPointsRepo.save(metaGameBoxPoints);
+            return MetaRestResult.returnSuccess("更新成功");
+        }
+        return MetaRestResult.returnSuccess("当前积分小于历史最高积分，无需更新");
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaGameBoxPoints;
+import com.izouma.nineth.dto.MetaGameBoxPointsDTO;
+import com.izouma.nineth.dto.MetaRestResult;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.service.MetaGameBoxPointsService;
+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("/metaGameBoxPoints")
+@AllArgsConstructor
+public class MetaGameBoxPointsController extends BaseController {
+    private MetaGameBoxPointsService metaGameBoxPointsService;
+
+    @PostMapping("/all")
+    public Page<MetaGameBoxPoints> all(@RequestBody PageQuery pageQuery) {
+        return metaGameBoxPointsService.all(pageQuery);
+    }
+
+    @GetMapping("/{userId}/get")
+    public MetaRestResult<MetaGameBoxPointsDTO> get(@PathVariable Long userId) {
+        return metaGameBoxPointsService.get(userId);
+    }
+
+    @PostMapping("/update")
+    public MetaRestResult<MetaGameBoxPoints> update(@RequestBody MetaGameBoxPoints record) {
+        return metaGameBoxPointsService.update(record);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaGameBoxPoints> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/MetaGameBoxPoints.json

@@ -0,0 +1 @@
+{"tableName":"MetaGameBoxPoints","className":"MetaGameBoxPoints","remark":"元宇宙GameBox积分","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/xiaohuoban/IdeaProjects/raex_back/src/main/java/com/izouma/nineth","viewPath":"/Users/xiaohuoban/IdeaProjects/raex_back/src/main/vue/src/views","routerPath":"/Users/xiaohuoban/IdeaProjects/raex_back/src/main/vue/src","resourcesPath":"/Users/xiaohuoban/IdeaProjects/raex_back/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"userId","modelName":"userId","remark":"用户ID","showInList":true,"showInForm":true,"formType":"number","required":true},{"name":"score","modelName":"score","remark":"当前最高积分","showInList":true,"showInForm":true,"formType":"singleLineText","required":true}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.MetaGameBoxPoints"}

src/main/vue/src/router.js

@@ -1340,6 +1340,14 @@ const router = new Router({
                     meta: {
                        title: '元宇宙角色配置',
                     },
+               },
+                {
+                    path: '/metaGameBoxPointsList',
+                    name: 'MetaGameBoxPointsList',
+                    component: () => import(/* webpackChunkName: "metaGameBoxPointsList" */ '@/views/MetaGameBoxPointsList.vue'),
+                    meta: {
+                       title: '元宇宙GameBox积分',
+                    },
                }
                 /**INSERT_LOCATION**/
             ]
@@ -1400,4 +1408,4 @@ router.beforeEach((to, from, next) => {
     }
 });
 
-export default router;
+export default router;

src/main/vue/src/views/MetaGameBoxPointsList.vue

@@ -0,0 +1,114 @@
+<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" align="center" label="用户ID"> </el-table-column>
+			<el-table-column prop="score" align="center" label="当前最高积分"> </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: 'MetaGameBoxPointsList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/metaGameBoxPoints/all',
+			downloading: false
+		};
+	},
+	computed: {
+		selection() {
+			return this.$refs.table.selection.map(i => i.id);
+		}
+	},
+	methods: {
+		beforeGetData() {
+			return { search: this.search, query: { del: false }, sort:'score,desc' };
+		},
+		toggleMultipleMode(multipleMode) {
+			this.multipleMode = multipleMode;
+			if (!multipleMode) {
+				this.$refs.table.clearSelection();
+			}
+		},
+		download() {
+			this.downloading = true;
+			this.$axios
+				.get('/metaGameBoxPoints/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);
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>