Browse Source

元宇宙僵尸新增接口

sunkean 3 years ago
parent
commit
a6aa78e775

+ 3 - 0
src/main/java/com/izouma/nineth/domain/MetaGameCopy.java

@@ -63,6 +63,9 @@ public class MetaGameCopy extends BaseEntity {
     @Column(columnDefinition = "TEXT")
     private List<Long> metaZombieIds;
 
+    @Transient
+    private List<MetaZombie> metaZombies;
+
     @Column(columnDefinition = "TEXT")
     @Convert(converter = MetaGameAwardListConverter.class)
     @ApiModelProperty("奖励配置")

+ 4 - 0
src/main/java/com/izouma/nineth/domain/PublicScreenChat.java

@@ -53,6 +53,10 @@ public class PublicScreenChat extends BaseEntity {
     @ExcelProperty("消息发送时间")
     private LocalDateTime time;
 
+    @ApiModelProperty("消息是否合法")
+    @ExcelProperty("消息是否合法")
+    private boolean illegal;
+
     @Transient
     private boolean myself;
 }

+ 2 - 0
src/main/java/com/izouma/nineth/repo/MetaGameCopyRepo.java

@@ -9,6 +9,7 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface MetaGameCopyRepo extends JpaRepository<MetaGameCopy, Long>, JpaSpecificationExecutor<MetaGameCopy> {
     @Query("update MetaGameCopy t set t.del = true where t.id = ?1")
@@ -18,4 +19,5 @@ public interface MetaGameCopyRepo extends JpaRepository<MetaGameCopy, Long>, Jpa
 
     MetaGameCopy findByGameNameAndGameCopyTypeAndPublishAndDel(MetaGame gameName, GameCopyType gameCopyType, boolean publish, boolean del);
 
+    List<MetaGameCopy> findAllByDel(boolean del);
 }

+ 2 - 0
src/main/java/com/izouma/nineth/repo/MetaZombieRepo.java

@@ -18,4 +18,6 @@ public interface MetaZombieRepo extends JpaRepository<MetaZombie, Long>, JpaSpec
     MetaZombie findByNameAndDel(String name, boolean del);
 
     List<MetaZombie> findAllByDel(boolean del);
+
+    List<MetaZombie> findAllByIdInAndDel(List<Long> ids, boolean del);
 }

+ 21 - 0
src/main/java/com/izouma/nineth/service/MetaGameCopyService.java

@@ -5,9 +5,13 @@ import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.repo.MetaGameCopyRepo;
 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 javax.transaction.Transactional;
+import java.util.List;
+
 @Service
 @AllArgsConstructor
 public class MetaGameCopyService {
@@ -17,4 +21,21 @@ public class MetaGameCopyService {
     public Page<MetaGameCopy> all(PageQuery pageQuery) {
         return metaGameCopyRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaGameCopy.class), JpaUtils.toPageRequest(pageQuery));
     }
+
+    @Transactional
+    public void delMetaZombieId(Long metaZombieId) {
+        List<MetaGameCopy> metaGameCopies = metaGameCopyRepo.findAllByDel(false);
+        if (CollectionUtils.isNotEmpty(metaGameCopies)) {
+            metaGameCopies.forEach(metaGameCopy -> {
+                List<Long> metaZombieIds = metaGameCopy.getMetaZombieIds();
+                if (CollectionUtils.isNotEmpty(metaZombieIds)) {
+                    if (metaZombieIds.contains(metaZombieId)) {
+                        metaZombieIds.remove(metaZombieId);
+                        metaGameCopy.setMetaZombieIds(metaZombieIds);
+                        metaGameCopyRepo.save(metaGameCopy);
+                    }
+                }
+            });
+        }
+    }
 }

+ 32 - 0
src/main/java/com/izouma/nineth/web/MetaGameCopyController.java

@@ -1,9 +1,14 @@
 package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.MetaGameCopy;
+import com.izouma.nineth.domain.MetaZombie;
+import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.GameCopyType;
+import com.izouma.nineth.enums.MetaGame;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.MetaGameCopyRepo;
+import com.izouma.nineth.repo.MetaZombieRepo;
 import com.izouma.nineth.service.MetaGameCopyService;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
@@ -27,6 +32,8 @@ public class MetaGameCopyController extends BaseController {
 
     private MetaGameCopyRepo metaGameCopyRepo;
 
+    private MetaZombieRepo metaZombieRepo;
+
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public MetaGameCopy save(@RequestBody MetaGameCopy record) {
@@ -76,11 +83,36 @@ public class MetaGameCopyController extends BaseController {
         metaGameCopyRepo.softDelete(id);
     }
 
+    @PostMapping("/{metaZombieId}/delMetaZombieId")
+    public void delMetaZombieId(@PathVariable Long metaZombieId) {
+        metaGameCopyService.delMetaZombieId(metaZombieId);
+    }
     @GetMapping("/excel")
     @ResponseBody
     public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
         List<MetaGameCopy> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
+
+    @GetMapping("/metaQuery")
+    public MetaRestResult<MetaGameCopy> findByGameNameAndGameCopyType(@RequestParam MetaGame gameName, @RequestParam GameCopyType gameCopyType) {
+        MetaGameCopy metaGameCopy = metaGameCopyRepo.findByGameNameAndGameCopyTypeAndPublishAndDel(gameName, gameCopyType, true, false);
+        if (Objects.isNull(metaGameCopy)) {
+            return MetaRestResult.returnError(String.format("查询不到游戏:[%S],副本:[%S]的相关配置,请联系管理员添加相关配置", gameName.getDescription(), gameCopyType.getDescription()));
+        }
+        if (CollectionUtils.isEmpty(metaGameCopy.getMetaZombieIds())) {
+            return MetaRestResult.returnError("缺少僵尸配置,请联系管理员添加相关配置");
+        }
+        if (CollectionUtils.isEmpty(metaGameCopy.getMetaGameAwards())) {
+            return MetaRestResult.returnError("缺少游戏奖励配置,请联系管理员添加相关配置");
+        }
+        List<MetaZombie> metaZombies = metaZombieRepo.findAllByIdInAndDel(metaGameCopy.getMetaZombieIds(), false);
+        if (CollectionUtils.isEmpty(metaZombies)) {
+            return MetaRestResult.returnError("根据id查询不到僵尸配置");
+        }
+        metaGameCopy.setMetaZombies(metaZombies);
+        return MetaRestResult.returnSuccess(metaGameCopy);
+    }
+
 }
 

+ 20 - 0
src/main/java/com/izouma/nineth/web/MetaZombieController.java

@@ -1,13 +1,16 @@
 package com.izouma.nineth.web;
 
+import com.izouma.nineth.domain.MetaGameCopy;
 import com.izouma.nineth.domain.MetaZombie;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaGameCopyRepo;
 import com.izouma.nineth.repo.MetaZombieRepo;
 import com.izouma.nineth.service.MetaZombieService;
 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.*;
 
@@ -23,6 +26,8 @@ public class MetaZombieController extends BaseController {
     private MetaZombieService metaZombieService;
     private MetaZombieRepo metaZombieRepo;
 
+    private MetaGameCopyRepo metaGameCopyRepo;
+
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public MetaZombie save(@RequestBody MetaZombie record) {
@@ -50,6 +55,21 @@ public class MetaZombieController extends BaseController {
         return metaZombieRepo.findById(id).orElseThrow(new BusinessException("无记录"));
     }
 
+    @GetMapping("/checkApplication/{id}")
+    public void checkApplication(@PathVariable Long id) {
+        List<MetaGameCopy> metaGameCopies = metaGameCopyRepo.findAllByDel(false);
+        if (CollectionUtils.isNotEmpty(metaGameCopies)) {
+            metaGameCopies.forEach(metaGameCopy -> {
+                List<Long> metaZombieIds = metaGameCopy.getMetaZombieIds();
+                if (CollectionUtils.isNotEmpty(metaZombieIds)) {
+                    if (metaZombieIds.contains(id)) {
+                        throw new BusinessException("当前配置已经被应用,请先删除所有应用配置");
+                    }
+                }
+            });
+        }
+    }
+
     @PostMapping("/del/{id}")
     public void del(@PathVariable Long id) {
         metaZombieRepo.softDelete(id);

+ 7 - 4
src/main/java/com/izouma/nineth/websocket/PublicScreenChatWebsocket.java

@@ -78,7 +78,7 @@ public class PublicScreenChatWebsocket extends WebsocketCommon {
         String format = String.format("玩家[%S][%S]进入大厅", userId, nickName);
         PublicScreenChat publicScreenChat;
         try {
-            publicScreenChat = savePublicScreenChat(userId, format);
+            publicScreenChat = savePublicScreenChat(userId, format, true);
         } catch (Exception e) {
             String errMsg = String.format("玩家进入大厅,保存信息发生异常[%S]", e);
             exceptionHandle(userId, errMsg);
@@ -100,7 +100,7 @@ public class PublicScreenChatWebsocket extends WebsocketCommon {
         String format = String.format("玩家[%S][%S]离开大厅", userId, nickName);
         PublicScreenChat publicScreenChat;
         try {
-            publicScreenChat = savePublicScreenChat(userId, format);
+            publicScreenChat = savePublicScreenChat(userId, format, true);
         } catch (Exception e) {
             String errMsg = String.format("玩家离开大厅,保存信息发生异常[%S]", e);
             exceptionHandle(userId, errMsg);
@@ -119,11 +119,13 @@ public class PublicScreenChatWebsocket extends WebsocketCommon {
             return;
         }
         if (!contentAuditService.auditText(message)) {
+            savePublicScreenChat(userId, message, false);
             exceptionHandle(userId, "消息包含非法内容");
+            return;
         }
         PublicScreenChat publicScreenChat;
         try {
-            publicScreenChat = savePublicScreenChat(userId, message);
+            publicScreenChat = savePublicScreenChat(userId, message, true);
         } catch (Exception e) {
             String errMsg = String.format("玩家发送消息,保存信息发生异常[%S]", e);
             exceptionHandle(userId, errMsg);
@@ -152,7 +154,7 @@ public class PublicScreenChatWebsocket extends WebsocketCommon {
         });
     }
 
-    private PublicScreenChat savePublicScreenChat(String userId, String messageInfo) {
+    private PublicScreenChat savePublicScreenChat(String userId, String messageInfo, boolean illegal) {
         User user = userRepo.findById(Long.parseLong(userId)).orElse(null);
         if (Objects.isNull(user)) {
             throw new BusinessException("用户信息不存在");
@@ -167,6 +169,7 @@ public class PublicScreenChatWebsocket extends WebsocketCommon {
         publicScreenChat.setTitle(purchaseLevel.getTitle());
         publicScreenChat.setMessageInfo(messageInfo);
         publicScreenChat.setTime(LocalDateTime.now());
+        publicScreenChat.setIllegal(illegal);
         return publicScreenChatRepo.save(publicScreenChat);
     }
 

+ 2 - 2
src/main/vue/src/views/MetaGameCopyEdit.vue

@@ -196,8 +196,8 @@ export default {
         this.$http.post('/tag/all', { size: 10000 }, { body: 'json' }).then(res => {
             this.tags = res.content;
         });
-        this.$http.post('/metaZombie/all', { size: 10000 }, { body: 'json' }).then(res => {
-            this.metaZombie = res.content;
+        this.$http.get('/metaZombie/findAll').then(res => {
+            this.metaZombie = res;
         });
     },
     data() {

+ 194 - 167
src/main/vue/src/views/MetaZombieList.vue

@@ -1,69 +1,75 @@
 <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"
-		>
+    <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" align="center" label="ID" width="100"> </el-table-column>
-			<el-table-column prop="name" align="center" label="配置名称" width="100"> </el-table-column>
-			<el-table-column prop="zombieIntegral" align="center" label="僵尸积分" width="100"> </el-table-column>
-			<el-table-column prop="zombieAttackDamage" align="center" label="僵尸攻击伤害" width="150"> </el-table-column>
-			<el-table-column prop="zombieBlood" align="center" label="僵尸血量" width="100"> </el-table-column>
-			<el-table-column prop="humanAttackDamage" align="center" label="人类攻击伤害/每发子弹" width="200"> </el-table-column>
-			<el-table-column prop="bulletNum" align="center" label="子弹数" width="100"> </el-table-column>
-			<el-table-column prop="humanBlood" align="center" label="人类血量" width="100"> </el-table-column>
-			<el-table-column prop="specialZombieAttackDamage" align="center" label="特殊僵尸攻击伤害" width="200"> </el-table-column>
-			<el-table-column prop="specialZombieBlood" align="center" label="特殊僵尸血量" width="150"> </el-table-column>
-			<el-table-column prop="specialZombieIntegral" align="center" label="特殊僵尸积分" width="150"> </el-table-column>
-			<el-table-column prop="singleGameDuration" align="center" label="单局时长(单位:分钟)" width="200"> </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-table-column prop="id" align="center" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="name" align="center" label="配置名称" width="100"> </el-table-column>
+            <el-table-column prop="zombieIntegral" align="center" label="僵尸积分" width="100"> </el-table-column>
+            <el-table-column prop="zombieAttackDamage" align="center" label="僵尸攻击伤害" width="150">
+            </el-table-column>
+            <el-table-column prop="zombieBlood" align="center" label="僵尸血量" width="100"> </el-table-column>
+            <el-table-column prop="humanAttackDamage" align="center" label="人类攻击伤害/每发子弹" width="200">
+            </el-table-column>
+            <el-table-column prop="bulletNum" align="center" label="子弹数" width="100"> </el-table-column>
+            <el-table-column prop="humanBlood" align="center" label="人类血量" width="100"> </el-table-column>
+            <el-table-column prop="specialZombieAttackDamage" align="center" label="特殊僵尸攻击伤害" width="200">
+            </el-table-column>
+            <el-table-column prop="specialZombieBlood" align="center" label="特殊僵尸血量" width="150">
+            </el-table-column>
+            <el-table-column prop="specialZombieIntegral" align="center" label="特殊僵尸积分" width="150">
+            </el-table-column>
+            <el-table-column prop="singleGameDuration" align="center" label="单局时长(单位:分钟)" width="200">
+            </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>
@@ -71,115 +77,136 @@
                     <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>
+            <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: 'MetaZombieList',
-	mixins: [pageableTable],
-	data() {
-		return {
-			multipleMode: false,
-			search: '',
-			url: '/metaZombie/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: '/metaZombieEdit',
-				query: {
-					...this.$route.query
-				}
-			});
-		},
-		editRow(row) {
-			this.$router.push({
-				path: '/metaZombieEdit',
-				query: {
-					id: row.id
-				}
-			});
-		},
-		download() {
-			this.downloading = true;
-			this.$axios
-				.get('/metaZombie/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(`/metaZombie/del/${row.id}`);
-				})
-				.then(() => {
-					this.$message.success('删除成功');
-					this.getData();
-				})
-				.catch(e => {
-					if (e !== 'cancel') {
-						this.$message.error(e.error);
-					}
-				});
-		}
-	}
+    name: 'MetaZombieList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/metaZombie/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: '/metaZombieEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/metaZombieEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/metaZombie/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.$http
+                .get(`/metaZombie/checkApplication/${row.id}`)
+                .then(() => {
+                    this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                        .then(() => {
+                            return this.$http.post(`/metaZombie/del/${row.id}`);
+                        })
+                        .then(() => {
+                            this.$message.success('删除成功');
+                            this.getData();
+                        })
+                        .catch(e => {
+                            if (e !== 'cancel') {
+                                this.$message.error(e.error);
+                            }
+                        });
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$alert(e.error, '提示', { type: 'info', confirmButtonText: '删除应用数据' })
+                            .then(() => {
+                                return this.$http.post(`/metaGameCopy/${row.id}/del`);
+                            })
+                            .then(() => {
+                                this.$message.success('删除应用数据成功,当前您可以删除该配置');
+                                
+                            })
+                            .catch(e => {
+                                if (e !== 'cancel') {
+                                    this.$message.error(e.error);
+                                }
+                            });
+                    }
+                });
+        }
+    }
 };
 </script>
 <style lang="less" scoped>

+ 13 - 8
src/main/vue/src/views/PublicScreenChatList.vue

@@ -34,9 +34,9 @@
 			v-loading="fetchingData"
 		>
 			<el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-			<el-table-column prop="nickname" label="用户昵称"> </el-table-column>
-			<el-table-column prop="userId" label="用户id"> </el-table-column>
-			<el-table-column prop="avatar" label="头像">
+			<el-table-column prop="nickname" align="center" label="用户昵称"> </el-table-column>
+			<el-table-column prop="userId" align="center" label="用户id"> </el-table-column>
+			<el-table-column prop="avatar" align="center" label="头像">
 				<template slot-scope="{ row }">
 					<el-image
 						style="width: 30px; height: 30px"
@@ -47,11 +47,16 @@
 					</el-image>
 				</template>
 			</el-table-column>
-			<el-table-column prop="level" 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="messageInfo" label="消息内容"> </el-table-column>
-			<el-table-column prop="time" label="消息发送时间"> </el-table-column>
+			<el-table-column prop="level" align="center" label="等级"> </el-table-column>
+			<el-table-column prop="realm" align="center" label="境界"> </el-table-column>
+			<el-table-column prop="title" align="center" label="头衔"> </el-table-column>
+			<el-table-column prop="messageInfo" align="center" width="800" label="消息内容"> </el-table-column>
+			<el-table-column prop="illegal" align="center" label="是否合法">
+				<template slot-scope="{ row }">
+					<el-tag :type="row.illegal ? '' : 'info'"> {{ row.illegal }} </el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column prop="time" align="center" width="200" label="消息发送时间"> </el-table-column>
 		</el-table>
 		<div class="pagination-wrapper">
 			<el-pagination