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

src/main/java/com/izouma/nineth/converter/MetaPlayerRoleListConverter.java

@@ -0,0 +1,33 @@
+package com.izouma.nineth.converter;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.izouma.nineth.dto.MetaPlayerRole;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.persistence.AttributeConverter;
+import java.util.List;
+
+public class MetaPlayerRoleListConverter implements AttributeConverter<List<MetaPlayerRole>, String> {
+
+    @Override
+    public String convertToDatabaseColumn(List<MetaPlayerRole> metaGameAwards) {
+        if (metaGameAwards == null) {
+            return null;
+        }
+        return JSON.toJSONString(metaGameAwards);
+    }
+
+    @Override
+    public List<MetaPlayerRole> convertToEntityAttribute(String s) {
+        if (StringUtils.isEmpty(s)) {
+            return null;
+        }
+        try {
+            return JSONArray.parseArray(s, MetaPlayerRole.class);
+        } catch (Exception ignored) {
+        }
+        return null;
+    }
+}
+

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

@@ -0,0 +1,26 @@
+package com.izouma.nineth.domain;
+
+
+import com.izouma.nineth.converter.MetaPlayerRoleListConverter;
+import com.izouma.nineth.dto.MetaPlayerRole;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+public class MetaPlayerRoleClassify extends BaseEntity {
+
+    private String classify;
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = MetaPlayerRoleListConverter.class)
+    private List<MetaPlayerRole> metaPlayerRoleList;
+}

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

@@ -1,18 +0,0 @@
-package com.izouma.nineth.dto;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class MetaPlayerRoleClassify {
-
-    private String classify;
-
-    private List<MetaPlayerRole> metaPlayerRoleList;
-}

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

@@ -109,7 +109,7 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
 
     List<Asset> findAllByUserIdAndStatusIn(Long userId, List<AssetStatus> status);
 
-    @Query("select a from Asset a where a.status in ?2 and a.userId = ?1 and a.name like ?3")
+    @Query("select a from Asset a where a.status in ?2 and a.userId = ?1 and a.name like ?3 and a.type in (com.izouma.nineth.enums.CollectionType.DEFAULT,com.izouma.nineth.enums.CollectionType.BLIND_BOX)")
     List<Asset> findAllByUserIdAndStatusInAndNameLike(Long userId, List<AssetStatus> status, String name);
 
     List<Asset> findAllByIdNotInAndUserIdAndStatusInAndOpened(List<Long> ids, Long userId, List<AssetStatus> status, boolean opened);

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

@@ -0,0 +1,21 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaPlayerRoleClassify;
+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 MetaPlayerRoleClassifyRepo extends JpaRepository<MetaPlayerRoleClassify, Long>, JpaSpecificationExecutor<MetaPlayerRoleClassify> {
+    @Query("update MetaPlayerRoleClassify t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    MetaPlayerRoleClassify findByClassifyAndDel(String classify, boolean del);
+
+    List<MetaPlayerRoleClassify> findAllByDel(boolean del);
+}

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

@@ -14,7 +14,6 @@ public interface UserDetailRepo extends JpaRepository<UserDetail, Long>, JpaSpec
     @Transactional
     void softDelete(Long id);
 
-
     @Query("select count(a) from Asset a where a.userId = ?1 and a.status = 'NORMAL'")
     Long findNftCountById(Long id);
 

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

@@ -1173,47 +1173,4 @@ public class AssetService {
                 .duration(duration)
                 .build());
     }
-
-    public List<MetaPlayerRoleClassify> metaPlayerRole(Long userId) {
-        List<MetaPlayerRoleClassify> metaPlayerRoleClassifies = new ArrayList<>();
-        metaPlayerRoleClassifies.add(buildMetaPlayerRoleClassify(userId, "艾弗森", 1L));
-        metaPlayerRoleClassifies.add(buildMetaPlayerRoleClassify(userId, "开拓猿", 2L));
-        metaPlayerRoleClassifies.add(buildMetaPlayerRoleClassify(userId, "朋克", 3L));
-        metaPlayerRoleClassifies.add(buildMetaPlayerRoleClassify(userId, "MUGEN", 4L));
-        return metaPlayerRoleClassifies;
-
-    }
-
-    private MetaPlayerRoleClassify buildMetaPlayerRoleClassify(Long userId, String name, Long id) {
-        MetaPlayerRoleClassify metaPlayerRoleClassify = new MetaPlayerRoleClassify();
-        metaPlayerRoleClassify.setClassify(name);
-        List<MetaPlayerRole> metaPlayerRoleList;
-        if ("MUGEN".equals(name)) {
-            metaPlayerRoleList = Arrays.asList(new MetaPlayerRole(id, "无限集团"),
-                    new MetaPlayerRole(id + 1, "苍茫雷道"),
-                    new MetaPlayerRole(id + 2, "炼炉天族"),
-                    new MetaPlayerRole(id + 3, "未央宗"),
-                    new MetaPlayerRole(id + 4, "八极门"),
-                    new MetaPlayerRole(id + 5, "人族"),
-                    new MetaPlayerRole(id + 6, "凤鸣寺"),
-                    new MetaPlayerRole(id + 7, "九州岛"));
-        } else {
-            metaPlayerRoleList = Collections.singletonList(new MetaPlayerRole(id, name));
-        }
-        metaPlayerRoleClassify.setMetaPlayerRoleList(build(userId, metaPlayerRoleList));
-        return metaPlayerRoleClassify;
-    }
-
-    private List<MetaPlayerRole> build(Long userId, List<MetaPlayerRole> metaPlayerRoleList) {
-        metaPlayerRoleList.forEach(metaPlayerRole -> {
-            metaPlayerRole.setType(UserHoldTypeEnum.ASSET);
-            metaPlayerRole.setAddress("https://www.raex.vip/9th/productSearch?search=" + metaPlayerRole
-                    .getName() + "&source=TRANSFER");
-            List<Asset> assets = assetRepo
-                    .findAllByUserIdAndStatusInAndNameLike(userId, Constants.META_NORMAL_STATUS, "%" + metaPlayerRole
-                            .getName() + "%");
-            metaPlayerRole.setHold(CollectionUtils.isNotEmpty(assets));
-        });
-        return metaPlayerRoleList;
-    }
 }

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

@@ -0,0 +1,53 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.config.Constants;
+import com.izouma.nineth.domain.Asset;
+import com.izouma.nineth.domain.MetaPlayerRoleClassify;
+import com.izouma.nineth.dto.MetaPlayerRole;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.UserHoldTypeEnum;
+import com.izouma.nineth.repo.AssetRepo;
+import com.izouma.nineth.repo.MetaPlayerRoleClassifyRepo;
+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.List;
+
+@Service
+@AllArgsConstructor
+public class MetaPlayerRoleClassifyService {
+
+    private AssetRepo assetRepo;
+    private MetaPlayerRoleClassifyRepo metaPlayerRoleClassifyRepo;
+
+    public Page<MetaPlayerRoleClassify> all(PageQuery pageQuery) {
+        return metaPlayerRoleClassifyRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaPlayerRoleClassify.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public List<MetaPlayerRoleClassify> metaPlayerRole(Long userId) {
+        List<MetaPlayerRoleClassify> metaPlayerRoleClassifies = metaPlayerRoleClassifyRepo.findAllByDel(false);
+        if (CollectionUtils.isEmpty(metaPlayerRoleClassifies)) {
+
+        }
+        metaPlayerRoleClassifies.forEach(metaPlayerRoleClassify -> {
+            metaPlayerRoleClassify.setMetaPlayerRoleList(build(userId, metaPlayerRoleClassify.getMetaPlayerRoleList()));
+        });
+        return  metaPlayerRoleClassifies;
+    }
+
+    private List<MetaPlayerRole> build(Long userId, List<MetaPlayerRole> metaPlayerRoleList) {
+        metaPlayerRoleList.forEach(metaPlayerRole -> {
+            metaPlayerRole.setType(UserHoldTypeEnum.ASSET);
+            metaPlayerRole.setAddress("https://www.raex.vip/9th/productSearch?search=" + metaPlayerRole
+                    .getName() + "&source=TRANSFER");
+            List<Asset> assets = assetRepo
+                    .findAllByUserIdAndStatusInAndNameLike(userId, Constants.META_NORMAL_STATUS, "%" + metaPlayerRole
+                            .getName() + "%");
+            metaPlayerRole.setHold(CollectionUtils.isNotEmpty(assets));
+        });
+        return metaPlayerRoleList;
+    }
+}

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

@@ -110,7 +110,7 @@ public class MetaShowRoomAssetService {
         } else {
             assets = assetRepo.findAllByUserIdAndStatusInAndOpened(userId, Constants.META_NORMAL_STATUS, true);
         }
-        if (CollectionUtils.isEmpty(assets) || CollectionUtils.isEmpty(assetIds)) {
+        if (CollectionUtils.isEmpty(assets)) {
             return MetaRestResult.returnSuccess(metaAssetDTOS);
         }
         // 查询用户拥有的非展厅非未开启盲盒藏品

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

@@ -2,21 +2,17 @@ package com.izouma.nineth.service;
 
 import com.izouma.nineth.domain.UserDetail;
 import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.UserDetailRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
-
 @Service
 @AllArgsConstructor
 public class UserDetailService {
 
     private UserDetailRepo userDetailRepo;
-    private AssetRepo assetRepo;
 
     public Page<UserDetail> all(PageQuery pageQuery) {
         return userDetailRepo.findAll(JpaUtils.toSpecification(pageQuery, UserDetail.class), JpaUtils.toPageRequest(pageQuery));

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

@@ -23,11 +23,11 @@ import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.cache.annotation.Cacheable;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -252,11 +252,6 @@ public class AssetController extends BaseController {
         assetService.lockAsset(SecurityUtils.getAuthenticatedUser().getId(), assetId, duration);
     }
 
-    @GetMapping("/{userId}/metaPlayerRole")
-    public List<MetaPlayerRoleClassify> MetaPlayerRoles(@PathVariable Long userId) {
-        return assetService.metaPlayerRole(userId);
-    }
-
     @GetMapping("/recal")
     public void recal(@RequestParam Long userId) {
         userAssetSummaryService.calculateNum(null, userId, 1L);

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

@@ -0,0 +1,75 @@
+package com.izouma.nineth.web;
+
+import com.alibaba.excel.util.CollectionUtils;
+import com.izouma.nineth.domain.MetaPlayerRoleClassify;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaPlayerRoleClassifyRepo;
+import com.izouma.nineth.service.MetaPlayerRoleClassifyService;
+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("/metaPlayerRoleClassify")
+@AllArgsConstructor
+public class MetaPlayerRoleClassifyController extends BaseController {
+    private MetaPlayerRoleClassifyService metaPlayerRoleClassifyService;
+    private MetaPlayerRoleClassifyRepo metaPlayerRoleClassifyRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MetaPlayerRoleClassify save(@RequestBody MetaPlayerRoleClassify record) {
+        if (CollectionUtils.isEmpty(record.getMetaPlayerRoleList())) {
+            throw new BusinessException("请最少添加一个角色");
+        }
+        MetaPlayerRoleClassify metaPlayerRoleClassify = metaPlayerRoleClassifyRepo.findByClassifyAndDel(record.getClassify(), false);
+        if (Objects.nonNull(metaPlayerRoleClassify) && !Objects.equals(metaPlayerRoleClassify.getId(), record.getId())) {
+            throw new BusinessException("当前角色分类已经存在");
+        }
+        if (record.getId() != null) {
+            MetaPlayerRoleClassify orig = metaPlayerRoleClassifyRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return metaPlayerRoleClassifyRepo.save(orig);
+        }
+        return metaPlayerRoleClassifyRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaPlayerRoleClassify> all(@RequestBody PageQuery pageQuery) {
+        return metaPlayerRoleClassifyService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public MetaPlayerRoleClassify get(@PathVariable Long id) {
+        return metaPlayerRoleClassifyRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        metaPlayerRoleClassifyRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaPlayerRoleClassify> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @GetMapping("/{userId}/metaPlayerRole")
+    public List<MetaPlayerRoleClassify> MetaPlayerRoles(@PathVariable Long userId) {
+        return metaPlayerRoleClassifyService.metaPlayerRole(userId);
+    }
+
+}
+

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

@@ -1,25 +1,24 @@
 package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.UserDetail;
-import com.izouma.nineth.service.ContentAuditService;
-import com.izouma.nineth.service.UserDetailService;
+import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.UserDetailRepo;
+import com.izouma.nineth.service.ContentAuditService;
+import com.izouma.nineth.service.UserDetailService;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.Authentication;
 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("/userDetail")
@@ -33,7 +32,7 @@ public class UserDetailController extends BaseController {
     @PostMapping("/save")
     public UserDetail save(@RequestBody UserDetail record) {
         Long currentUserId = SecurityUtils.getAuthenticatedUser().getId();
-        if (currentUserId != record.getUserId()) {
+        if (!Objects.equals(currentUserId, record.getUserId())) {
             throw new BusinessException("当前修改用户与登录用户不一致");
         }
         if (StringUtils.isNotBlank(record.getAutograph())) {
@@ -49,7 +48,6 @@ public class UserDetailController extends BaseController {
         return userDetailRepo.save(record);
     }
 
-
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
     public Page<UserDetail> all(@RequestBody PageQuery pageQuery) {
@@ -58,7 +56,7 @@ public class UserDetailController extends BaseController {
 
     @GetMapping("/get/{id}")
     public UserDetail get(@PathVariable Long id) {
-        UserDetail userDetail =  userDetailRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        UserDetail userDetail = userDetailRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         userDetail.setNftCount(userDetailRepo.findNftCountById(id));
         userDetail.setBuildCount(userDetailRepo.findBuildCountById(id));
         userDetail.setPlotCount(userDetailRepo.findPlotCountById(id));
@@ -66,9 +64,12 @@ public class UserDetailController extends BaseController {
         userDetail.setReikiCount(userDetailRepo.findReikiCountById(id));
         userDetail.setMedalCount(userDetailRepo.findMedalCountById(id));
         userDetail.setPersonalheatCount(userDetailRepo.findPersonalHeatCountById(id));
-
         return userDetail;
+    }
 
+    @GetMapping("/{userId}/metaQuery")
+    public MetaRestResult<UserDetail> metaQuery(@PathVariable Long userId) {
+        return MetaRestResult.returnSuccess(get(userId));
     }
 
     @PostMapping("/del/{id}")

src/main/resources/genjson/MetaPlayerRoleClassify.json

@@ -0,0 +1 @@
+{"tableName":"MetaPlayerRoleClassify","className":"MetaPlayerRoleClassify","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":"classify","modelName":"classify","remark":"角色分类","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"metaPlayerRoleList","modelName":"metaPlayerRoleList","remark":"角色列表","showInList":false,"showInForm":false,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.MetaPlayerRoleClassify"}

src/main/vue/src/router.js

@@ -1324,7 +1324,23 @@ const router = new Router({
                     meta: {
                        title: '元宇宙销毁记录',
                     },
-                }
+                },
+                {
+                    path: '/metaPlayerRoleClassifyEdit',
+                    name: 'MetaPlayerRoleClassifyEdit',
+                    component: () => import(/* webpackChunkName: "metaPlayerRoleClassifyEdit" */ '@/views/MetaPlayerRoleClassifyEdit.vue'),
+                    meta: {
+                       title: '元宇宙角色配置编辑',
+                    },
+                },
+                {
+                    path: '/metaPlayerRoleClassifyList',
+                    name: 'MetaPlayerRoleClassifyList',
+                    component: () => import(/* webpackChunkName: "metaPlayerRoleClassifyList" */ '@/views/MetaPlayerRoleClassifyList.vue'),
+                    meta: {
+                       title: '元宇宙角色配置',
+                    },
+               }
                 /**INSERT_LOCATION**/
             ]
         },

src/main/vue/src/views/MetaPlayerRoleClassifyEdit.vue

@@ -0,0 +1,186 @@
+<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="120px"
+					label-position="right"
+					size="small"
+					style="max-width: 500px"
+				>
+					<el-form-item prop="classify" label="角色分类名称">
+						<el-input v-model="formData.classify"> </el-input>
+					</el-form-item>
+					<el-form-item
+						prop="metaPlayerRoleList"
+						label="角色列表"
+						style="width: calc(100vw - 450px)"
+						size="mini"
+					>
+						<el-table :data="formData.metaPlayerRoleList">
+							<el-table-column prop="id" label="角色id">
+								<template v-slot="{ row }">
+									<el-input v-model="row.id" style="width: 250px" placeholder="请输入角色id">
+									</el-input>
+								</template>
+							</el-table-column>
+							<el-table-column prop="name" label="角色名称">
+								<template v-slot="{ row }">
+									<el-input v-model="row.name" style="width: 250px" placeholder="请输入角色名称">
+									</el-input>
+								</template>
+							</el-table-column>
+							<el-table-column width="80" align="center">
+								<template v-slot="{ row, $index }">
+									<el-button type="danger" plain size="mini" @click="delRole($index)">
+										删除
+									</el-button>
+								</template>
+							</el-table-column>
+						</el-table>
+					</el-form-item>
+					<el-form-item>
+						<el-button size="mini" @click="addRole"> 添加配置 </el-button>
+						<div class="tip">请最少输入一个角色</div>
+					</el-form-item>
+					<el-form-item class="form-submit">
+						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+							删除
+						</el-button>
+						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+	name: 'MetaPlayerRoleClassifyEdit',
+	created() {
+		if (this.$route.query.id) {
+			this.$http
+				.get('metaPlayerRoleClassify/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: { metaPlayerRoleList: [{ id: '', name: '' }] },
+			rules: {
+				classify: [
+					{
+						required: true,
+						message: '请输入角色分类',
+						trigger: 'blur'
+					}
+				],
+				metaPlayerRoleList: [
+					{
+						validator: (rule, value, callback) => {
+							if (value) {
+								if (!(value instanceof Array)) {
+									callback(new Error('metaPlayerRoleList must be array!'));
+									return;
+								} else {
+									for (let i = 0; i < value.length; i++) {
+										if (value[i].id === '' || value[i].id === undefined || value[i].id === null) {
+											callback(new Error('请输入角色id'));
+											return;
+										}
+										if (
+											value[i].name === '' ||
+											value[i].name === undefined ||
+											value[i].name === null
+										) {
+											callback(new Error('请输入角色名称'));
+											return;
+										}
+									}
+								}
+							}
+							callback();
+						},
+						trigger: 'blur'
+					}
+				]
+			}
+		};
+	},
+	methods: {
+		onSave() {
+			this.$refs.form.validate(valid => {
+				if (valid) {
+					this.submit();
+				} else {
+					return false;
+				}
+			});
+		},
+		submit() {
+			let data = { ...this.formData };
+			if (data.metaPlayerRoleList.length == 0 || data.metaPlayerRoleList === null || data.metaPlayerRoleList === undefined) {
+				this.$message.error('请最少输入一个角色');
+			} else {
+				this.saving = true;
+				this.$http
+					.post('/metaPlayerRoleClassify/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(`/metaPlayerRoleClassify/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 || '删除失败');
+					}
+				});
+		},
+		addRole() {
+			this.formData.metaPlayerRoleList.push({
+				id: '',
+				name: ''
+			});
+		},
+		delRole(i) {
+			this.formData.metaPlayerRoleList.splice(i, 1);
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaPlayerRoleClassifyList.vue

@@ -0,0 +1,186 @@
+<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="classify" label="角色分类"> </el-table-column>
+            <el-table-column prop="metaPlayerRoleList" label="角色列表">
+                <template v-slot="{ row }">
+					<template v-if="row.metaPlayerRoleList">
+						<div v-for="item in row.metaPlayerRoleList" :key="item.id">
+							{{ item.name }}
+						</div>
+					</template>
+				</template>
+            </el-table-column>
+			<el-table-column label="操作" align="center" fixed="right" width="150">
+				<template slot-scope="{ row }">
+					<el-button @click="editRow(row)" type="primary" size="mini" plain> 编辑 </el-button>
+					<el-button @click="deleteRow(row)" type="danger" size="mini" plain> 删除 </el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<div class="pagination-wrapper">
+			<!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)"> 批量编辑 </el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1"> 批量操作1 </el-button>
+                    <el-button @click="operation2"> 批量操作2 </el-button>
+                    <el-button @click="toggleMultipleMode(false)"> 取消 </el-button>
+                </el-button-group>
+            </div> -->
+			<el-pagination
+				background
+				@size-change="onSizeChange"
+				@current-change="onCurrentChange"
+				:current-page="page"
+				:page-sizes="[10, 20, 30, 40, 50]"
+				:page-size="pageSize"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="totalElements"
+			>
+			</el-pagination>
+		</div>
+	</div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+	name: 'MetaPlayerRoleClassifyList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/metaPlayerRoleClassify/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: '/metaPlayerRoleClassifyEdit',
+				query: {
+					...this.$route.query
+				}
+			});
+		},
+		editRow(row) {
+			this.$router.push({
+				path: '/metaPlayerRoleClassifyEdit',
+				query: {
+					id: row.id
+				}
+			});
+		},
+		download() {
+			this.downloading = true;
+			this.$axios
+				.get('/metaPlayerRoleClassify/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(`/metaPlayerRoleClassify/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>