Merge branch 'dev' of xiongzhu/raex_back into master

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

@@ -13,11 +13,10 @@ import javax.persistence.*;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class RecordRank{
+public class RecordRank extends BaseEntity{
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "hibernate_sequence")
-    private Long id;
+    @ApiModelProperty("用户ID")
+    private Long userId;
 
     @ApiModelProperty("用户名称")
     private String nickname;

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

@@ -3,11 +3,20 @@ package com.izouma.nineth.repo;
 import com.izouma.nineth.domain.RecordRank;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 public interface RecordRankRepo extends JpaRepository<RecordRank, Long>, JpaSpecificationExecutor<RecordRank> {
+    @Query("update RecordRank t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
 
     List<RecordRank> findAllByBlindBoxIdAndRare(Long blindBoxId, String rare);
 
+    RecordRank findByUserIdAndBlindBoxIdAndRare(Long userId, Long blindBoxId, String rare);
+
 }

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

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

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

@@ -0,0 +1,72 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.RecordRank;
+import com.izouma.nineth.domain.User;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.RecordRankRepo;
+import com.izouma.nineth.repo.UserRepo;
+import com.izouma.nineth.service.RecordRankService;
+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;
+import java.util.Objects;
+
+@RestController
+@RequestMapping("/recordRank")
+@AllArgsConstructor
+public class RecordRankController extends BaseController {
+    private RecordRankService recordRankService;
+    private RecordRankRepo recordRankRepo;
+
+    private UserRepo userRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public RecordRank save(@RequestBody RecordRank record) {
+        RecordRank recordRank = recordRankRepo.findByUserIdAndBlindBoxIdAndRare(record.getUserId(), record.getBlindBoxId(), record.getRare());
+        if (Objects.nonNull(recordRank) && !Objects.equals(recordRank.getId(), record.getId())) {
+            throw new BusinessException("该用户已经存在该盲盒id和稀有度的信息！");
+        }
+        User user = userRepo.findById(record.getUserId()).orElseThrow(new BusinessException("用户信息未空"));
+        record.setAvatar(user.getAvatar());
+        record.setNickname(user.getNickname());
+        if (record.getId() != null) {
+            RecordRank orig = recordRankRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return recordRankRepo.save(orig);
+        }
+        return recordRankRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<RecordRank> all(@RequestBody PageQuery pageQuery) {
+        return recordRankService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public RecordRank get(@PathVariable Long id) {
+        return recordRankRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        recordRankRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<RecordRank> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/RecordRank.json

@@ -0,0 +1 @@
+{"tableName":"RecordRank","className":"RecordRank","remark":"排行","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":"nickname","modelName":"nickname","remark":"用户名称","showInList":true,"showInForm":false,"formType":"singleLineText"},{"name":"avatar","modelName":"avatar","remark":"头像","showInList":true,"showInForm":false,"formType":"singleLineText"},{"name":"num","modelName":"num","remark":"数量","showInList":true,"showInForm":true,"formType":"number","required":true},{"name":"rare","modelName":"rare","remark":"稀有度","showInList":true,"showInForm":true,"formType":"select","required":true,"apiFlag":"1","optionsValue":"[{\"label\":\"SSR\",\"value\":\"SSR\"},{\"label\":\"SR\",\"value\":\"SR\"},{\"label\":\"U\",\"value\":\"U\"}]"},{"name":"blindBoxId","modelName":"blindBoxId","remark":"盲盒id","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.RecordRank"}

src/main/vue/src/router.js

@@ -907,6 +907,22 @@ const router = new Router({
                     meta: {
                        title: '锁仓',
                     },
+               },
+                {
+                    path: '/recordRankEdit',
+                    name: 'RecordRankEdit',
+                    component: () => import(/* webpackChunkName: "recordRankEdit" */ '@/views/RecordRankEdit.vue'),
+                    meta: {
+                       title: '排行编辑',
+                    },
+                },
+                {
+                    path: '/recordRankList',
+                    name: 'RecordRankList',
+                    component: () => import(/* webpackChunkName: "recordRankList" */ '@/views/RecordRankList.vue'),
+                    meta: {
+                       title: '排行',
+                    },
                }
                 /**INSERT_LOCATION**/
             ]
@@ -967,4 +983,4 @@ router.beforeEach((to, from, next) => {
     }
 });
 
-export default router;
+export default router;

src/main/vue/src/views/RecordRankEdit.vue

@@ -0,0 +1,145 @@
+<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="80px" label-position="right"
+                         size="small"
+                         style="max-width: 500px;">
+                        <el-form-item prop="userId" label="用户ID">
+                                    <el-input v-model="formData.userId"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="num" label="数量">
+                                    <el-input-number type="number" v-model="formData.num"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="rare" label="稀有度">
+                                    <el-select v-model="formData.rare" clearable filterable placeholder="请选择">
+                                        <el-option
+                                                v-for="item in rareOptions"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                        </el-form-item>
+                        <el-form-item prop="blindBoxId" label="盲盒id">
+                                    <el-input v-model="formData.blindBoxId"></el-input>
+                        </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: 'RecordRankEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('recordRank/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: {
+                    userId: [
+                        {
+                            required: true,
+                            message: '请输入用户ID',
+                            trigger: 'blur'
+                        },
+                    ],
+                    num: [
+                        {
+                            required: true,
+                            message: '请输入数量',
+                            trigger: 'blur'
+                        },
+                    ],
+                    rare: [
+                        {
+                            required: true,
+                            message: '请输入稀有度',
+                            trigger: 'blur'
+                        },
+                    ],
+                    blindBoxId: [
+                        {
+                            required: true,
+                            message: '请输入盲盒id',
+                            trigger: 'blur'
+                        },
+                    ],
+                },
+                rareOptions: [{"label":"SSR","value":"SSR"},{"label":"SR","value":"SR"},{"label":"U","value":"U"}],
+            }
+        },
+        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('/recordRank/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(`/recordRank/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/RecordRankList.vue

@@ -0,0 +1,187 @@
+<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="userId" label="用户ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="nickname" label="用户名称"
+>
+                    </el-table-column>
+                    <el-table-column prop="avatar" label="头像"
+>
+                    </el-table-column>
+                    <el-table-column prop="num" label="数量"
+>
+                    </el-table-column>
+                    <el-table-column prop="rare" label="稀有度"
+                            :formatter="rareFormatter"
+                        >
+                    </el-table-column>
+                    <el-table-column prop="blindBoxId" label="盲盒id"
+>
+                    </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>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'RecordRankList',
+        mixins: [pageableTable],
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/recordRank/all",
+                downloading: false,
+                        rareOptions:[{"label":"SSR","value":"SSR"},{"label":"SR","value":"SR"},{"label":"U","value":"U"}],
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+                    rareFormatter(row, column, cellValue, index) {
+                        let selectedOption = this.rareOptions.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: "/recordRankEdit",
+                    query: {
+                        ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/recordRankEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/recordRank/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(`/recordRank/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/test/java/com/izouma/nineth/service/DestroyRecordServiceTest.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.ApplicationTests;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+class DestroyRecordServiceTest extends ApplicationTests {
+
+    @Autowired
+    private  DestroyRecordService  destroyRecordService;
+
+    @Test
+    void destroyRecordRank() {
+        destroyRecordService.destroyRecordRank("U");
+    }
+}