会员等级

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

@@ -0,0 +1,35 @@
+package com.izouma.nineth.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+public class PurchaseLevel extends BaseEntity {
+    @ApiModelProperty("开始级别")
+    private int startLevel;
+
+    @ApiModelProperty("结束级别")
+    private int endLevel;
+
+    @ApiModelProperty("境界")
+    private String realm;
+
+    @ApiModelProperty("头衔")
+    private String title;
+
+    @ApiModelProperty("图标")
+    private String icon;
+
+    @ApiModelProperty("颜色")
+    private String colour;
+
+}

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

@@ -128,4 +128,8 @@ public class User extends BaseEntity implements Serializable {
 
     @ApiModelProperty("藏品Id")
     private Long collectionId;
+
+    @ApiModelProperty("勋章等级")
+    private int level;
+
 }

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

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.PurchaseLevel;
+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;
+
+public interface PurchaseLevelRepo extends JpaRepository<PurchaseLevel, Long>, JpaSpecificationExecutor<PurchaseLevel> {
+    @Query("update PurchaseLevel t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

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

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

src/main/java/com/izouma/nineth/utils/JpaUtils.java

@@ -137,17 +137,18 @@ public class JpaUtils {
                     and.add(criteriaBuilder.greaterThanOrEqualTo(root.get(property), start));
                     LocalDate end = DateTimeUtils.toLocalDate(arr[1], "yyyy-MM-dd");
                     and.add(criteriaBuilder.lessThanOrEqualTo(root.get(property), end));
-                } else if (String.class == fieldType) {
-                    SearchableOne annotation = field.getAnnotation(SearchableOne.class);
-                    if (annotation != null && annotation.value()) {
-                        and.add(criteriaBuilder.like(root.get(field.getName()), "%" + value + "%"));
-                    } else {
-                        and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
-                    }
+
                 } else {
                     and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), DateTimeUtils
                             .toLocalDateTime((String) value, "yyyy-MM-dd"))));
                 }
+            } else if (String.class == fieldType) {
+                SearchableOne annotation = field.getAnnotation(SearchableOne.class);
+                if (annotation != null && annotation.value()) {
+                    and.add(criteriaBuilder.like(root.get(field.getName()), "%" + value + "%"));
+                } else {
+                    and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
+                }
             } else {
                 and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
             }

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

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

src/main/resources/genjson/PurchaseLevel.json

@@ -0,0 +1 @@
+{"tableName":"PurchaseLevel","className":"PurchaseLevel","remark":"会员等级","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/raex_back/src/main/java/com/izouma/nineth","viewPath":"/Users/qiufangchao/Desktop/project/raex_back/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/raex_back/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/raex_back/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"startLevel","modelName":"startLevel","remark":"开始级别","showInList":true,"showInForm":true,"formType":"number"},{"name":"endLevel","modelName":"endLevel","remark":"结束级别","showInList":true,"showInForm":true,"formType":"number"},{"name":"realm","modelName":"realm","remark":"境界","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"title","modelName":"title","remark":"头衔","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"icon","modelName":"icon","remark":"图标","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"colour","modelName":"colour","remark":"颜色","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.PurchaseLevel"}

src/main/vue/src/router.js

@@ -470,6 +470,22 @@ const router = new Router({
                     meta: {
                        title: '铸造订单',
                     },
+               },
+                {
+                    path: '/purchaseLevelEdit',
+                    name: 'PurchaseLevelEdit',
+                    component: () => import(/* webpackChunkName: "purchaseLevelEdit" */ '@/views/PurchaseLevelEdit.vue'),
+                    meta: {
+                       title: '会员等级编辑',
+                    },
+                },
+                {
+                    path: '/purchaseLevelList',
+                    name: 'PurchaseLevelList',
+                    component: () => import(/* webpackChunkName: "purchaseLevelList" */ '@/views/PurchaseLevelList.vue'),
+                    meta: {
+                       title: '会员等级',
+                    },
                }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/PurchaseLevelEdit.vue

@@ -0,0 +1,119 @@
+<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="startLevel" label="级别">
+                        <el-input-number type="number" v-model="formData.startLevel"></el-input-number>
+                        <span style="margin: 0 10px">至</span>
+                    <!-- </el-form-item>
+                    <el-form-item prop="endLevel" label="结束级别"> -->
+                        <el-input-number type="number" v-model="formData.endLevel"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="realm" label="境界">
+                        <el-input v-model="formData.realm"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="title" label="头衔">
+                        <el-input v-model="formData.title"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="icon" label="图标">
+                        <single-upload v-model="formData.icon"></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="colour" label="颜色">
+                        <el-input v-model="formData.colour"></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: 'PurchaseLevelEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('purchaseLevel/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('/purchaseLevel/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(`/purchaseLevel/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/PurchaseLevelList.vue

@@ -0,0 +1,185 @@
+<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="startLevel" label="级别">
+                <template slot-scope="{ row }">
+                    <span>Lv{{row.startLevel}}-{{row.endLevel}}级</span>
+                </template>
+            </el-table-column>
+            <!-- <el-table-column prop="endLevel" label="结束级别"> </el-table-column> -->
+            <el-table-column prop="realm" label="境界"> </el-table-column>
+            <el-table-column prop="title" label="头衔"> </el-table-column>
+            <el-table-column prop="icon" label="图标"> </el-table-column>
+            <el-table-column prop="colour" label="颜色"> </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: 'PurchaseLevelList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/purchaseLevel/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: '/purchaseLevelEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/purchaseLevelEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/purchaseLevel/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(`/purchaseLevel/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>