Browse Source

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

lidongze 3 years ago
parent
commit
604719d2a9
21 changed files with 698 additions and 220 deletions
  1. 25 0
      src/main/java/com/izouma/nineth/converter/MetaGameAwardConverter.java
  2. 7 0
      src/main/java/com/izouma/nineth/domain/DestroyRecord.java
  3. 3 0
      src/main/java/com/izouma/nineth/domain/MetaGameAward.java
  4. 13 0
      src/main/java/com/izouma/nineth/domain/MetaGameProcess.java
  5. 2 1
      src/main/java/com/izouma/nineth/domain/MetaShowRoomAsset.java
  6. 68 0
      src/main/java/com/izouma/nineth/dto/MetaAssetDTO.java
  7. 20 0
      src/main/java/com/izouma/nineth/service/MetaGameCopyService.java
  8. 13 12
      src/main/java/com/izouma/nineth/service/MetaShowRoomAssetService.java
  9. 72 0
      src/main/java/com/izouma/nineth/service/MetaUserGoldService.java
  10. 30 0
      src/main/java/com/izouma/nineth/utils/LotteryUtils.java
  11. 3 1
      src/main/java/com/izouma/nineth/utils/excel/ExcelUtils.java
  12. 1 1
      src/main/java/com/izouma/nineth/utils/excel/MetaGameAwardExcelConverter.java
  13. 43 0
      src/main/java/com/izouma/nineth/utils/excel/OperationSourceConverter.java
  14. 43 0
      src/main/java/com/izouma/nineth/utils/excel/RecordTypeConverter.java
  15. 2 2
      src/main/java/com/izouma/nineth/web/DestroyRecordController.java
  16. 3 2
      src/main/java/com/izouma/nineth/web/MetaShowRoomAssetController.java
  17. 10 55
      src/main/java/com/izouma/nineth/web/MetaUserGoldController.java
  18. 9 1
      src/main/vue/src/router.js
  19. 152 0
      src/main/vue/src/views/MetaDestroyRecordList.vue
  20. 13 0
      src/main/vue/src/views/MetaGameCopyEdit.vue
  21. 166 145
      src/main/vue/src/views/MetaGameProcessList.vue

+ 25 - 0
src/main/java/com/izouma/nineth/converter/MetaGameAwardConverter.java

@@ -0,0 +1,25 @@
+package com.izouma.nineth.converter;
+
+import com.alibaba.fastjson.JSON;
+import com.izouma.nineth.domain.MetaGameAward;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.persistence.AttributeConverter;
+
+public class MetaGameAwardConverter implements AttributeConverter<MetaGameAward, String> {
+
+    @Override
+    public String convertToDatabaseColumn(MetaGameAward fileObject) {
+        if (fileObject != null)
+            return JSON.toJSONString(fileObject);
+        return null;
+    }
+
+    @Override
+    public MetaGameAward convertToEntityAttribute(String s) {
+        if (StringUtils.isNotEmpty(s)) {
+            return JSON.parseObject(s, MetaGameAward.class);
+        }
+        return null;
+    }
+}

+ 7 - 0
src/main/java/com/izouma/nineth/domain/DestroyRecord.java

@@ -1,5 +1,6 @@
 package com.izouma.nineth.domain;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.nineth.enums.OperationSource;
 import com.izouma.nineth.enums.RecordType;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,14 +20,18 @@ import javax.persistence.Enumerated;
 @Builder
 @Entity
 public class DestroyRecord extends BaseEntity {
+    @ExcelProperty("用户id")
     private Long userId;
 
+    @ExcelProperty("资产id")
     private Long assetId;
 
     private int record;
 
+    @ExcelProperty("nft名称")
     private String name;
 
+    @ExcelProperty("图片地址")
     private String pic;
 
     @Enumerated(EnumType.STRING)
@@ -36,9 +41,11 @@ public class DestroyRecord extends BaseEntity {
     private Long companyId;
 
     @ApiModelProperty("操作来源")
+    @ExcelProperty("操作来源")
     @Enumerated(EnumType.STRING)
     private OperationSource source;
 
     @ApiModelProperty("用途备注")
+    @ExcelProperty("用途备注")
     private String remark;
 }

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

@@ -11,6 +11,9 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class MetaGameAward {
 
+    @ApiModelProperty("奖励名称")
+    private String name;
+
     @ApiModelProperty("奖励类型")
     private EntryModeType awardType;
 

+ 13 - 0
src/main/java/com/izouma/nineth/domain/MetaGameProcess.java

@@ -2,6 +2,7 @@ package com.izouma.nineth.domain;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.nineth.converter.CoordinateConverter;
+import com.izouma.nineth.converter.MetaGameAwardConverter;
 import com.izouma.nineth.converter.MetaZombieDTOListConverter;
 import com.izouma.nineth.dto.CoordinateDTO;
 import com.izouma.nineth.dto.MetaZombieDTO;
@@ -31,6 +32,10 @@ public class MetaGameProcess extends BaseEntity {
     @ExcelProperty("是否完成")
     private boolean completed;
 
+    @ExcelProperty("是否强制退出")
+    @ApiModelProperty("是否强制退出")
+    private boolean forceQuit;
+
     @ApiModelProperty("玩家id")
     @ExcelProperty("玩家id")
     private Long userId;
@@ -74,4 +79,12 @@ public class MetaGameProcess extends BaseEntity {
     @ExcelProperty("僵尸信息")
     private List<MetaZombieDTO> metaZombieDTOS;
 
+    @ApiModelProperty("玩家获取的奖励")
+    @ExcelProperty("玩家获取的奖励")
+    @Convert(converter = MetaGameAwardConverter.class)
+    private MetaGameAward metaGameAward;
+
+    @ApiModelProperty("手机号")
+    @ExcelProperty("手机号")
+    private String phone;
 }

+ 2 - 1
src/main/java/com/izouma/nineth/domain/MetaShowRoomAsset.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.nineth.converter.CoordinateConverter;
 import com.izouma.nineth.dto.CoordinateDTO;
+import com.izouma.nineth.dto.MetaAssetDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -44,7 +45,7 @@ public class MetaShowRoomAsset extends BaseEntity {
 
     @Transient
     @ExcelIgnore
-    private Asset asset;
+    private MetaAssetDTO metaAssetDTO;
 
     @Transient
     @ExcelIgnore

+ 68 - 0
src/main/java/com/izouma/nineth/dto/MetaAssetDTO.java

@@ -0,0 +1,68 @@
+package com.izouma.nineth.dto;
+
+import com.izouma.nineth.converter.FileObjectListConverter;
+import com.izouma.nineth.domain.Asset;
+import com.izouma.nineth.domain.FileObject;
+import com.izouma.nineth.enums.AssetStatus;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Convert;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class MetaAssetDTO {
+
+    @ApiModelProperty("id")
+    private Long id;
+
+    @ApiModelProperty("状态")
+    @Enumerated(EnumType.STRING)
+    private AssetStatus status;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("持有者")
+    private String owner;
+
+    @ApiModelProperty("铸造者")
+    private String minter;
+
+    @ApiModelProperty("购买hash")
+    private String txHash;
+
+    @ApiModelProperty("转让价格")
+    private BigDecimal sellPrice;
+
+    @ApiModelProperty("元宇宙展厅是否上架")
+    private boolean metaPutOn;
+
+    @ApiModelProperty("图片")
+    @Convert(converter = FileObjectListConverter.class)
+    private List<FileObject> pic;
+
+    public static MetaAssetDTO create(Asset asset) {
+        return MetaAssetDTO.builder()
+                .id(asset.getId())
+                .status(asset.getStatus())
+                .name(asset.getName())
+                .owner(asset.getOwner())
+                .minter(asset.getMinter())
+                .txHash(asset.getTxHash())
+                .sellPrice(asset.getSellPrice())
+                .metaPutOn(asset.isMetaPutOn())
+                .pic(asset.getPic())
+                .build();
+    }
+
+}

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

@@ -9,9 +9,12 @@ import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.repo.MetaGameCopyRepo;
 import com.izouma.nineth.repo.MetaGameProcessRepo;
 import com.izouma.nineth.repo.MetaZombieRepo;
+import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.utils.JpaUtils;
+import com.izouma.nineth.utils.LotteryUtils;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
@@ -29,6 +32,8 @@ public class MetaGameCopyService {
 
     private MetaZombieRepo metaZombieRepo;
 
+    private UserRepo userRepo;
+
     public Page<MetaGameCopy> all(PageQuery pageQuery) {
         return metaGameCopyRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaGameCopy.class), JpaUtils.toPageRequest(pageQuery));
     }
@@ -54,9 +59,21 @@ public class MetaGameCopyService {
         if (Objects.isNull(metaGameProcess.getUserId())) {
             return MetaRestResult.returnError("Illegal parameter : userId can not be null");
         }
+        String phone = userRepo.findPhoneById(metaGameProcess.getUserId());
+        if (StringUtils.isBlank(phone)) {
+            return MetaRestResult.returnError("phone can not be null");
+        }
+        metaGameProcess.setPhone(phone);
         if (Objects.isNull(metaGameProcess.getMetaGameCopyId())) {
             return MetaRestResult.returnError("Illegal parameter : metaGameCopyId can not be null");
         }
+        MetaGameCopy metaGameCopy = metaGameCopyRepo.findByIdAndDelAndPublish(metaGameProcess.getMetaGameCopyId(), false, true);
+        if (Objects.isNull(metaGameCopy)) {
+            return MetaRestResult.returnError("Illegal parameter : metaGameCopy can not be null");
+        }
+        if (CollectionUtils.isEmpty(metaGameCopy.getMetaGameAwards())) {
+            return MetaRestResult.returnError("Illegal parameter : metaGameAwards can not be null");
+        }
         if (Objects.isNull(metaGameProcess.getPlayerPos())) {
             return MetaRestResult.returnError("Illegal parameter : playerPos can not be null");
         }
@@ -90,6 +107,9 @@ public class MetaGameCopyService {
             }
         }
         metaGameProcess.setPoint(point);
+        if (metaGameProcess.isCompleted()) {
+            metaGameProcess.setMetaGameAward(LotteryUtils.lottery(metaGameCopy.getMetaGameAwards()));
+        }
         return MetaRestResult.returnSuccess(metaGameProcessRepo.save(metaGameProcess));
     }
 }

+ 13 - 12
src/main/java/com/izouma/nineth/service/MetaShowRoomAssetService.java

@@ -5,9 +5,7 @@ import com.izouma.nineth.config.Constants;
 import com.izouma.nineth.domain.Asset;
 import com.izouma.nineth.domain.MetaItem;
 import com.izouma.nineth.domain.MetaShowRoomAsset;
-import com.izouma.nineth.dto.MetaRestResult;
-import com.izouma.nineth.dto.MetaServiceResult;
-import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.dto.*;
 import com.izouma.nineth.enums.MetaItemEnum;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.AssetRepo;
@@ -43,23 +41,24 @@ public class MetaShowRoomAssetService {
         return metaShowRoomAssetRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaShowRoomAsset.class), JpaUtils.toPageRequest(pageQuery));
     }
 
-    public MetaRestResult<Boolean> putOn(MetaShowRoomAsset metaShowRoomAsset) {
+    public MetaRestResult<String> putOn(MetaShowRoomAsset metaShowRoomAsset) {
         MetaServiceResult result = checkParams(metaShowRoomAsset);
         if (!result.isSuccess()) {
-            return MetaRestResult.returnError(result.getMessage(), Boolean.FALSE);
+            return MetaRestResult.returnError(result.getMessage());
         }
         Asset asset = assetRepo.findById(metaShowRoomAsset.getAssetId()).orElse(null);
         if (Objects.isNull(asset)) {
-            return MetaRestResult.returnError("不存在该资产", Boolean.FALSE);
+            return MetaRestResult.returnError("不存在该资产");
         }
         if (!asset.getUserId().equals(metaShowRoomAsset.getUserId())) {
             return MetaRestResult.returnError("该资产不属于你");
         }
         if (Constants.META_INOPERABLE_STATUS.contains(asset.getStatus())) {
-            return MetaRestResult.returnError(String.format("该资产目前状态为[%S],不可上架。请刷新藏品室数据", asset.getStatus().getDescription()), Boolean.FALSE);
+            return MetaRestResult.returnError(String.format("该资产目前状态为[%S],不可上架。请刷新藏品室数据", asset.getStatus().getDescription()));
         }
         metaShowRoomAssetRepo.save(metaShowRoomAsset);
-        return MetaRestResult.returnSuccess("上架成功", Boolean.TRUE);
+        boolean whetherTest = sysConfigService.getBoolean(Constants.WHETHER_TEST);
+        return MetaRestResult.returnSuccess("上架成功", whetherTest ? URL_PREFIX_TEST.concat(String.valueOf(asset.getId())) : URL_PREFIX.concat(String.valueOf(asset.getId())));
     }
 
     public MetaRestResult<Boolean> putOff(Long assetId) {
@@ -82,7 +81,7 @@ public class MetaShowRoomAssetService {
                 metaShowRoomAssetRepo.deleteByAssetId(asset.getId());
             } else {
                 metaShowRoomAsset.setUrl(whetherTest ? URL_PREFIX_TEST.concat(String.valueOf(asset.getId())) : URL_PREFIX.concat(String.valueOf(asset.getId())));
-                metaShowRoomAsset.setAsset(asset);
+                metaShowRoomAsset.setMetaAssetDTO(MetaAssetDTO.create(asset));
                 newMetaShowRoomAsset.add(metaShowRoomAsset);
             }
         });
@@ -90,7 +89,7 @@ public class MetaShowRoomAssetService {
     }
 
 
-    public MetaRestResult<List<Asset>> noShowRoomAndBlindBox(Long userId) {
+    public MetaRestResult<List<MetaAssetDTO>> noShowRoomAndBlindBox(Long userId) {
         // 查询已上架藏品
         List<Long> assetIds = metaShowRoomAssetRepo.findAssetIdAllByUserId(userId);
         List<MetaItem> metaItems = metaItemRepo.findAllByTypeAndDel(MetaItemEnum.META_SHOW_ROOM, false);
@@ -105,19 +104,21 @@ public class MetaShowRoomAssetService {
             }
         });
         List<Asset> assets;
+        List<MetaAssetDTO> metaAssetDTOS = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(ids)) {
             assets = assetRepo.findAllByIdNotInAndUserIdAndStatusInAndOpened(ids, userId, Constants.META_NORMAL_STATUS, true);
         } else {
             assets = assetRepo.findAllByUserIdAndStatusInAndOpened(userId, Constants.META_NORMAL_STATUS, true);
         }
         if (CollectionUtils.isEmpty(assets) || CollectionUtils.isEmpty(assetIds)) {
-            return MetaRestResult.returnSuccess(assets);
+            return MetaRestResult.returnSuccess(metaAssetDTOS);
         }
         // 查询用户拥有的非展厅非未开启盲盒藏品
         assets.forEach(asset -> {
             asset.setMetaPutOn(assetIds.contains(asset.getId()));
+            metaAssetDTOS.add(MetaAssetDTO.create(asset));
         });
-        return MetaRestResult.returnSuccess(assets);
+        return MetaRestResult.returnSuccess(metaAssetDTOS);
     }
 
     public MetaRestResult<List<Asset>> noBlindBox(Long userId) {

+ 72 - 0
src/main/java/com/izouma/nineth/service/MetaUserGoldService.java

@@ -1,20 +1,92 @@
 package com.izouma.nineth.service;
 
 import com.izouma.nineth.domain.MetaUserGold;
+import com.izouma.nineth.domain.MetaUserGoldRecord;
+import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaUserGoldRecordRepo;
 import com.izouma.nineth.repo.MetaUserGoldRepo;
+import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
+import javax.transaction.Transactional;
+import java.util.*;
+
 @Service
 @AllArgsConstructor
+@Slf4j
 public class MetaUserGoldService {
 
     private MetaUserGoldRepo metaUserGoldRepo;
 
+    private MetaUserGoldRecordRepo metaUserGoldRecordRepo;
+
+    private UserRepo userRepo;
+
     public Page<MetaUserGold> all(PageQuery pageQuery) {
         return metaUserGoldRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaUserGold.class), JpaUtils.toPageRequest(pageQuery));
     }
+
+    @Transactional
+    public void initMetaUserGold(String userIds) {
+        String[] split = userIds.split(" ");
+        List<MetaUserGold> metaUserGolds = new ArrayList<>();
+        List<MetaUserGoldRecord> metaUserGoldRecords = new ArrayList<>();
+        Arrays.stream(split).forEach(userId -> {
+            metaUserGolds.add(new MetaUserGold(Long.parseLong(userId), 0));
+            metaUserGoldRecords.add(new MetaUserGoldRecord(Long.parseLong(userId), 0, 0, 0));
+        });
+        metaUserGoldRepo.saveAll(metaUserGolds);
+        metaUserGoldRecordRepo.saveAll(metaUserGoldRecords);
+
+    }
+
+    public void checkUserId(String userIds) {
+        String[] split = userIds.split(" ");
+        Set<Long> set = new HashSet<>();
+        Arrays.stream(split).forEach(userId -> {
+            userRepo.findById(Long.parseLong(userId)).orElseThrow(new BusinessException(String.format("不存在id[%S]的用户", userId)));
+            set.add(Long.parseLong(userId));
+        });
+        if (set.size() != split.length) {
+            throw new BusinessException("存在重复用户id,请检查!");
+        }
+        List<MetaUserGold> metaUserGolds = metaUserGoldRepo.findAllByUserIdInAndDel(set, false);
+        if (CollectionUtils.isNotEmpty(metaUserGolds)) {
+            StringBuffer str = new StringBuffer();
+            metaUserGolds.forEach(metaUserGold -> {
+                str.append(metaUserGold.getUserId()).append(",");
+            });
+            throw new BusinessException(String.format("已经存在[%S]的数据", str.subSequence(0, str.length())));
+        }
+    }
+
+    @Transactional
+    public MetaRestResult<MetaUserGold> changeNum(Long userId, int num) {
+        MetaUserGold metaUserGold = metaUserGoldRepo.findByUserIdAndDel(userId, false);
+        if (Objects.isNull(metaUserGold)) {
+            log.info(String.format("不存在用户[%S]记录。默认初始化", userId));
+            initMetaUserGold(String.valueOf(userId));
+            metaUserGold = metaUserGoldRepo.findByUserIdAndDel(userId, false);
+        }
+        // 操作前金币数量
+        int nowNum = metaUserGold.getNum();
+        MetaUserGoldRecord metaUserGoldRecord = new MetaUserGoldRecord();
+        metaUserGoldRecord.setUserId(userId);
+        metaUserGoldRecord.setBeforeNum(nowNum);
+        metaUserGoldRecord.setAfterNum(nowNum + num);
+        metaUserGoldRecord.setOperationNum(num);
+        metaUserGold.setNum(nowNum + num);
+        if (metaUserGoldRecord.getAfterNum() < 0) {
+            return MetaRestResult.returnError(String.format("用户[%S] 当前金币剩余[%S] 本次操作需要金币数量为[%S]", userId, nowNum, -num));
+        }
+        metaUserGoldRecordRepo.save(metaUserGoldRecord);
+        return MetaRestResult.returnSuccess(metaUserGoldRepo.save(metaUserGold));
+    }
 }

+ 30 - 0
src/main/java/com/izouma/nineth/utils/LotteryUtils.java

@@ -0,0 +1,30 @@
+package com.izouma.nineth.utils;
+
+import com.google.common.util.concurrent.AtomicDouble;
+import com.izouma.nineth.domain.MetaGameAward;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class LotteryUtils {
+    public static MetaGameAward lottery(List<MetaGameAward> metaGameAwards) {
+        int size = metaGameAwards.size();
+        AtomicDouble sumProbability = new AtomicDouble();
+        metaGameAwards.forEach(metaGameAward -> {
+            sumProbability.addAndGet(metaGameAward.getProbability());
+        });
+
+        List<Double> sortAwardProbabilityList = new ArrayList<>(size);
+        AtomicDouble tempSumProbability = new AtomicDouble();
+        metaGameAwards.forEach(metaGameAward -> {
+            tempSumProbability.addAndGet(metaGameAward.getProbability());
+            sortAwardProbabilityList.add(tempSumProbability.get() / sumProbability.get());
+        });
+        double randomDouble = Math.random();
+        sortAwardProbabilityList.add(randomDouble);
+        Collections.sort(sortAwardProbabilityList);
+        int lotteryIndex = sortAwardProbabilityList.indexOf(randomDouble);
+        return metaGameAwards.get(lotteryIndex);
+    }
+}

+ 3 - 1
src/main/java/com/izouma/nineth/utils/excel/ExcelUtils.java

@@ -27,7 +27,7 @@ public class ExcelUtils<T> {
                 .registerConverter(new CoordinateDTOConverter())
                 .registerConverter(new EntryModelTypeConverter())
                 .registerConverter(new GameCopyTypeConverter())
-                .registerConverter(new MetaGameAwardConverter())
+                .registerConverter(new MetaGameAwardExcelConverter())
                 .registerConverter(new MetaGameConverter())
                 .registerConverter(new MetaItemEnumConverter())
                 .registerConverter(new MetaRegionEnumConverter())
@@ -35,6 +35,8 @@ public class ExcelUtils<T> {
                 .registerConverter(new MetaZombieDTOConverter())
                 .registerConverter(new MintActivityRuleConverter())
                 .registerConverter(new ListConverter())
+                .registerConverter(new OperationSourceConverter())
+                .registerConverter(new RecordTypeConverter())
                 .doWrite(data);
     }
 }

+ 1 - 1
src/main/java/com/izouma/nineth/utils/excel/MetaGameAwardConverter.java → src/main/java/com/izouma/nineth/utils/excel/MetaGameAwardExcelConverter.java

@@ -12,7 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.util.Objects;
 
 
-public class MetaGameAwardConverter implements Converter<MetaGameAward> {
+public class MetaGameAwardExcelConverter implements Converter<MetaGameAward> {
     @Override
     public Class supportJavaTypeKey() {
         return MetaGameAward.class;

+ 43 - 0
src/main/java/com/izouma/nineth/utils/excel/OperationSourceConverter.java

@@ -0,0 +1,43 @@
+package com.izouma.nineth.utils.excel;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.izouma.nineth.enums.OperationSource;
+
+public class OperationSourceConverter implements Converter<OperationSource> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return OperationSource.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return null;
+    }
+
+    @Override
+    public OperationSource convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        try {
+            for (OperationSource value : OperationSource.values()) {
+                if (value.getDescription().equals(cellData.getStringValue())) {
+                    return value;
+                }
+            }
+        } catch (Exception ignored) {
+        }
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(OperationSource value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (value != null) {
+            return new CellData(value.getDescription());
+        }
+        return null;
+    }
+}
+

+ 43 - 0
src/main/java/com/izouma/nineth/utils/excel/RecordTypeConverter.java

@@ -0,0 +1,43 @@
+package com.izouma.nineth.utils.excel;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.izouma.nineth.enums.RecordType;
+
+public class RecordTypeConverter implements Converter<RecordType> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return RecordType.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return null;
+    }
+
+    @Override
+    public RecordType convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        try {
+            for (RecordType value : RecordType.values()) {
+                if (value.toString().equals(cellData.getStringValue())) {
+                    return value;
+                }
+            }
+        } catch (Exception ignored) {
+        }
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(RecordType value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (value != null) {
+            return new CellData(value.toString());
+        }
+        return null;
+    }
+}
+

+ 2 - 2
src/main/java/com/izouma/nineth/web/DestroyRecordController.java

@@ -23,7 +23,7 @@ import java.util.List;
 @AllArgsConstructor
 public class DestroyRecordController extends BaseController {
     private DestroyRecordService destroyRecordService;
-    private DestroyRecordRepo    destroyRecordRepo;
+    private DestroyRecordRepo destroyRecordRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -37,7 +37,7 @@ public class DestroyRecordController extends BaseController {
     }
 
 
-    @PreAuthorize("hasRole('ADMIN')")
+    @PreAuthorize("hasRole('ADMIN') || hasRole('META')")
     @PostMapping("/all")
     public Page<DestroyRecord> all(@RequestBody PageQuery pageQuery) {
         return destroyRecordService.all(pageQuery);

+ 3 - 2
src/main/java/com/izouma/nineth/web/MetaShowRoomAssetController.java

@@ -2,6 +2,7 @@ package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.Asset;
 import com.izouma.nineth.domain.MetaShowRoomAsset;
+import com.izouma.nineth.dto.MetaAssetDTO;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.repo.MetaShowRoomAssetRepo;
@@ -37,7 +38,7 @@ public class MetaShowRoomAssetController extends BaseController {
     }
 
     @GetMapping("/{userId}/noShowRoomAndBlindBox")
-    public MetaRestResult<List<Asset>> noShowRoomAndBlindBox(@PathVariable Long userId) {
+    public MetaRestResult<List<MetaAssetDTO>> noShowRoomAndBlindBox(@PathVariable Long userId) {
         return metaShowRoomAssetService.noShowRoomAndBlindBox(userId);
     }
 
@@ -47,7 +48,7 @@ public class MetaShowRoomAssetController extends BaseController {
     }
 
     @PostMapping("/putOn")
-    public MetaRestResult<Boolean> putOn(@RequestBody MetaShowRoomAsset metaShowRoomAsset) {
+    public MetaRestResult<String> putOn(@RequestBody MetaShowRoomAsset metaShowRoomAsset) {
         return metaShowRoomAssetService.putOn(metaShowRoomAsset);
     }
 

+ 10 - 55
src/main/java/com/izouma/nineth/web/MetaUserGoldController.java

@@ -1,37 +1,32 @@
 package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.MetaUserGold;
-import com.izouma.nineth.domain.MetaUserGoldRecord;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.MetaUserGoldRecordRepo;
 import com.izouma.nineth.repo.MetaUserGoldRepo;
-import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.service.MetaUserGoldService;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.*;
+import java.util.List;
+import java.util.Objects;
 
 @RestController
 @RequestMapping("/metaUserGold")
 @AllArgsConstructor
+@Slf4j
 public class MetaUserGoldController extends BaseController {
     private MetaUserGoldService metaUserGoldService;
 
     private MetaUserGoldRepo metaUserGoldRepo;
 
-    private MetaUserGoldRecordRepo metaUserGoldRecordRepo;
-
-    private UserRepo userRepo;
-
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public MetaUserGold save(@RequestBody MetaUserGold record) {
@@ -69,23 +64,7 @@ public class MetaUserGoldController extends BaseController {
 
     @PostMapping("/changeNum")
     public MetaRestResult<MetaUserGold> changeNum(Long userId, int num) {
-        MetaUserGold metaUserGold = metaUserGoldRepo.findByUserIdAndDel(userId, false);
-        if (Objects.isNull(metaUserGold)) {
-            return MetaRestResult.returnError(String.format("不存在用户[%S]记录", userId));
-        }
-        // 操作前金币数量
-        int nowNum = metaUserGold.getNum();
-        MetaUserGoldRecord metaUserGoldRecord = new MetaUserGoldRecord();
-        metaUserGoldRecord.setUserId(userId);
-        metaUserGoldRecord.setBeforeNum(nowNum);
-        metaUserGoldRecord.setAfterNum(nowNum + num);
-        metaUserGoldRecord.setOperationNum(num);
-        metaUserGold.setNum(nowNum + num);
-        if (metaUserGoldRecord.getAfterNum() < 0) {
-            return MetaRestResult.returnError(String.format("用户[%S] 当前金币剩余[%S] 本次操作需要金币数量为[%S]", userId, nowNum, -num));
-        }
-        metaUserGoldRecordRepo.save(metaUserGoldRecord);
-        return MetaRestResult.returnSuccess(metaUserGoldRepo.save(metaUserGold));
+        return metaUserGoldService.changeNum(userId, num);
     }
 
     @GetMapping("/{userId}/queryNum")
@@ -98,37 +77,13 @@ public class MetaUserGoldController extends BaseController {
     }
 
     @GetMapping("/{userIds}/check")
-    private void checkUserId(@PathVariable String userIds) {
-        String[] split = userIds.split(" ");
-        Set<Long> set = new HashSet<>();
-        Arrays.stream(split).forEach(userId -> {
-            userRepo.findById(Long.parseLong(userId)).orElseThrow(new BusinessException(String.format("不存在id[%S]的用户", userId)));
-            set.add(Long.parseLong(userId));
-        });
-        if(set.size() != split.length) {
-            throw new BusinessException("存在重复用户id,请检查!");
-        }
-        List<MetaUserGold> metaUserGolds = metaUserGoldRepo.findAllByUserIdInAndDel(set, false);
-        if (CollectionUtils.isNotEmpty(metaUserGolds)) {
-            StringBuffer str = new StringBuffer();
-            metaUserGolds.forEach(metaUserGold -> {
-                str.append(metaUserGold.getUserId()).append(",");
-            });
-            throw new BusinessException(String.format("已经存在[%S]的数据", str.subSequence(0, str.length())));
-        }
+    public void checkUserId(@PathVariable String userIds) {
+        metaUserGoldService.checkUserId(userIds);
     }
-    @PostMapping("/{userIds}/init")
-    private void initMetaUserGold(@PathVariable String userIds) {
-        String[] split = userIds.split(" ");
-        List<MetaUserGold> metaUserGolds = new ArrayList<>();
-        List<MetaUserGoldRecord> metaUserGoldRecords = new ArrayList<>();
-        Arrays.stream(split).forEach(userId -> {
-            metaUserGolds.add(new MetaUserGold(Long.parseLong(userId), 0));
-            metaUserGoldRecords.add(new MetaUserGoldRecord(Long.parseLong(userId), 0, 0, 0));
-        });
-        metaUserGoldRepo.saveAll(metaUserGolds);
-        metaUserGoldRecordRepo.saveAll(metaUserGoldRecords);
 
+    @PostMapping("/{userIds}/init")
+    public void initMetaUserGold(@PathVariable String userIds) {
+        metaUserGoldService.initMetaUserGold(userIds);
     }
 }
 

+ 9 - 1
src/main/vue/src/router.js

@@ -1316,7 +1316,15 @@ const router = new Router({
                     meta: {
                        title: '里程碑配置',
                     },
-               }
+                },
+                {
+                    path: '/metaDestroyRecordList',
+                    name: 'MetaDestroyRecordList',
+                    component: () => import(/* webpackChunkName: "metaDestroyRecordList" */ '@/views/MetaDestroyRecordList.vue'),
+                    meta: {
+                       title: '元宇宙销毁记录',
+                    },
+                }
                 /**INSERT_LOCATION**/
             ]
         },

+ 152 - 0
src/main/vue/src/views/MetaDestroyRecordList.vue

@@ -0,0 +1,152 @@
+<template>
+	<div class="list-view">
+		<page-title>
+			<el-button
+				@click="download"
+				icon="el-icon-upload2"
+				:loading="downloading"
+				:disabled="fetchingData"
+				class="filter-item"
+			>
+				导出
+			</el-button>
+		</page-title>
+		<div class="filters-container">
+			<el-input
+				placeholder="搜索..."
+				v-model="search"
+				clearable
+				class="filter-item search"
+				@keyup.enter.native="getData"
+			>
+				<el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+			</el-input>
+		</div>
+		<el-table
+			:data="tableData"
+			row-key="id"
+			ref="table"
+			header-row-class-name="table-header-row"
+			header-cell-class-name="table-header-cell"
+			row-class-name="table-row"
+			cell-class-name="table-cell"
+			:height="tableHeight"
+			v-loading="fetchingData"
+		>
+			<el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+			<el-table-column prop="id" align="center" label="ID" width="100"> </el-table-column>
+			<el-table-column prop="userId" align="center" label="userId"> </el-table-column>
+			<el-table-column prop="assetId" align="center" label="assetId"> </el-table-column>
+			<el-table-column prop="record" align="center" label="record"> </el-table-column>
+			<el-table-column prop="name" align="center" label="name" width="300"> </el-table-column>
+			<el-table-column prop="pic" align="center" label="pic">
+                <template slot-scope="{ row }">
+					<el-image
+						style="width: 30px; height: 30px"
+						:src="row.pic"
+						fit="cover"
+						:preview-src-list="[row.pic]"
+					>
+					</el-image>
+				</template> </el-table-column>
+			<el-table-column prop="type" align="center" label="type" :formatter="typeFormatter"> </el-table-column>
+            <el-table-column prop="source" align="center" label="source" :formatter="sourceFormatter"> </el-table-column>
+            <el-table-column prop="remark" align="center" label="remark" width="300"> </el-table-column>
+		</el-table>
+		<div class="pagination-wrapper">
+			<el-pagination
+				background
+				@size-change="onSizeChange"
+				@current-change="onCurrentChange"
+				:current-page="page"
+				:page-sizes="[10, 20, 30, 40, 50]"
+				:page-size="pageSize"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="totalElements"
+			>
+			</el-pagination>
+		</div>
+	</div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+	name: 'MetaDestroyRecordList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/destroyRecord/all',
+			downloading: false,
+			typeOptions: [
+				{ label: 'OBTAIN', value: 'OBTAIN' },
+				{ label: 'CONSUME', value: 'CONSUME' }
+			],
+            sourceOptions: [
+				{ label: '元宇宙', value: 'META' },
+				{ label: '绿洲', value: 'RAEX' }
+			]
+		};
+	},
+	computed: {
+		selection() {
+			return this.$refs.table.selection.map(i => i.id);
+		}
+	},
+	methods: {
+		typeFormatter(row, column, cellValue, index) {
+			let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+			if (selectedOption) {
+				return selectedOption.label;
+			}
+			return '';
+		},
+        sourceFormatter(row, column, cellValue, index) {
+			let selectedOption = this.sourceOptions.find(i => i.value === cellValue);
+			if (selectedOption) {
+				return selectedOption.label;
+			}
+			return '';
+		},
+		beforeGetData() {
+			return { search: this.search, query: { del: false, source: 'META' } };
+		},
+		toggleMultipleMode(multipleMode) {
+			this.multipleMode = multipleMode;
+			if (!multipleMode) {
+				this.$refs.table.clearSelection();
+			}
+		},
+		download() {
+			this.downloading = true;
+			this.$axios
+				.get('/destroyRecord/excel', {
+					responseType: 'blob',
+					params: { size: 10000, query: { del: false, source: 'META' } }
+				})
+				.then(res => {
+					console.log(res);
+					this.downloading = false;
+					const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+					const link = document.createElement('a');
+					link.href = downloadUrl;
+					link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+					document.body.appendChild(link);
+					link.click();
+					link.remove();
+				})
+				.catch(e => {
+					console.log(e);
+					this.downloading = false;
+					this.$message.error(e.error);
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

+ 13 - 0
src/main/vue/src/views/MetaGameCopyEdit.vue

@@ -113,6 +113,11 @@
                     </el-form-item>
                     <el-form-item prop="metaGameAwards" label="奖励配置" style="width: calc(100vw - 450px)" size="mini">
                         <el-table :data="formData.metaGameAwards">
+                            <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 prop="awardType" label="奖励类型">
                                 <template v-slot="{ row }">
                                     <el-select
@@ -296,6 +301,14 @@ export default {
                                     return;
                                 } else {
                                     for (let i = 0; i < value.length; i++) {
+                                        if (
+                                            value[i].name === '' ||
+                                            value[i].name === undefined ||
+                                            value[i].name === null
+                                        ) {
+                                            callback(new Error('请填写奖励名称'));
+                                            return;
+                                        }
                                         if (
                                             value[i].awardType === '' ||
                                             value[i].awardType === undefined ||

+ 166 - 145
src/main/vue/src/views/MetaGameProcessList.vue

@@ -1,179 +1,200 @@
 <template>
-	<div class="list-view">
-		<page-title>
-			<el-button
-				@click="download"
-				icon="el-icon-upload2"
-				:loading="downloading"
-				:disabled="fetchingData"
-				class="filter-item"
-			>
-				导出
-			</el-button>
-		</page-title>
-		<div class="filters-container">
-			<el-input
-				placeholder="搜索..."
-				v-model="search"
-				clearable
-				class="filter-item search"
-				@keyup.enter.native="getData"
-			>
-				<el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
-			</el-input>
-		</div>
-		<el-table
-			:data="tableData"
-			row-key="id"
-			ref="table"
-			header-row-class-name="table-header-row"
-			header-cell-class-name="table-header-cell"
-			row-class-name="table-row"
-			cell-class-name="table-cell"
-			:height="tableHeight"
-			v-loading="fetchingData"
-		>
-			<el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-			<el-table-column prop="id" align="center" label="ID" width="100"> </el-table-column>
+    <div class="list-view">
+        <page-title>
+            <el-button
+                @click="download"
+                icon="el-icon-upload2"
+                :loading="downloading"
+                :disabled="fetchingData"
+                class="filter-item"
+            >
+                导出
+            </el-button>
+        </page-title>
+        <div class="filters-container">
+            <el-input
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+			<el-table-column prop="createdAt" align="center" label="进度更新时间" width="200"></el-table-column>
             <el-table-column prop="userId" align="center" label="玩家id"> </el-table-column>
-			<el-table-column prop="metaGameCopyId" align="center" label="游戏副本id"> </el-table-column>
-            <el-table-column prop="model" align="center" label="关卡"> </el-table-column>
-            <el-table-column prop="playerPos" align="center" label="玩家坐标">
+			<el-table-column prop="phone" align="center" label="手机号" width="200"> </el-table-column>
+            <el-table-column prop="metaGameCopyId" align="center" label="游戏副本id"> </el-table-column>
+            <el-table-column prop="playerPos" align="center" label="玩家坐标" width="300">
                 <template slot-scope="{ row }">
-					{{ 'x=' + row.playerPos.x + ' , ' + 'y=' + row.playerPos.y + ' , ' + 'z=' + row.playerPos.z }} 
-				</template>
+                    {{ 'x=' + row.playerPos.x + ' , ' + 'y=' + row.playerPos.y + ' , ' + 'z=' + row.playerPos.z }}
+                </template>
             </el-table-column>
             <el-table-column prop="point" align="center" label="当前积分"> </el-table-column>
-			<el-table-column prop="bulletCount" align="center" label="剩余子弹数"> </el-table-column>
-			<el-table-column prop="timeLeft" align="center" label="剩余时间(秒)"> </el-table-column>
+            <el-table-column prop="bulletCount" align="center" label="剩余子弹数"> </el-table-column>
+            <el-table-column prop="timeLeft" align="center" label="剩余时间(秒)"> </el-table-column>
             <el-table-column prop="remainingHP" align="center" label="玩家剩余血量"> </el-table-column>
             <el-table-column prop="hurt" align="center" label="是否收到伤害">
-				<template slot-scope="{ row }">
-					<el-tag :type="row.hurt ? '' : 'info'"> {{ row.hurt }} </el-tag>
-				</template>
-			</el-table-column>
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.hurt ? '' : 'info'"> {{ row.hurt }} </el-tag>
+                </template>
+            </el-table-column>
             <el-table-column prop="disconnected" align="center" label="是否断线">
-				<template slot-scope="{ row }">
-					<el-tag :type="row.disconnected ? '' : 'info'"> {{ row.disconnected }} </el-tag>
-				</template>
-			</el-table-column>
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.disconnected ? '' : 'info'"> {{ row.disconnected }} </el-tag>
+                </template>
+            </el-table-column>
+			<el-table-column prop="forceQuit" align="center" label="是否强制退出">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.forceQuit ? '' : 'info'"> {{ row.forceQuit }} </el-tag>
+                </template>
+            </el-table-column>
             <el-table-column prop="completed" align="center" label="是否完成">
-				<template slot-scope="{ row }">
-					<el-tag :type="row.completed ? '' : 'info'"> {{ row.completed }} </el-tag>
-				</template>
-			</el-table-column>					
-			<el-table-column label="操作" align="center" fixed="right" width="150">
-				<template slot-scope="{ row }">
-					<el-button @click="zombie(row)" type="primary" size="mini" plain> 查看僵尸信息 </el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<div class="pagination-wrapper">
-			<el-pagination
-				background
-				@size-change="onSizeChange"
-				@current-change="onCurrentChange"
-				:current-page="page"
-				:page-sizes="[10, 20, 30, 40, 50]"
-				:page-size="pageSize"
-				layout="total, sizes, prev, pager, next, jumper"
-				:total="totalElements"
-			>
-			</el-pagination>
-		</div>
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.completed ? '' : 'info'"> {{ row.completed }} </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="metaGameAward" align="center" label="获得奖励">
+                <template slot-scope="{ row }">
+                    <template v-if="row.metaGameAward && row.metaGameAward.awardType === 'NFT'">
+                        <el-image
+                            style="width: 30px; height: 30px"
+                            :src="row.metaGameAward.config"
+                            fit="cover"
+                            :preview-src-list="[row.metaGameAward.config]"
+                        >
+                        </el-image>
+                    </template>
+                    <template v-if="row.metaGameAward && row.metaGameAward.awardType === 'GOLD'">
+                        {{ '金币:' + row.metaGameAward.config }}
+                    </template>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="zombie(row)" type="primary" size="mini" plain> 查看僵尸信息 </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
         <el-dialog :visible.sync="showZombieDialog" title="僵尸信息" width="1000px">
             <el-table :data="zombieList" height="calc(100vh - 500px)">
-                <el-table-column prop="id" align="center" label="id" width="100"></el-table-column>
-                <el-table-column prop="metaZombieId" align="center" label="僵尸配置id"></el-table-column>
-                <el-table-column prop="createIndex" align="center" label="生成点id"></el-table-column>
-                <el-table-column prop="type" align="center" label="类型" :formatter="typeFormatter"></el-table-column>
-                <el-table-column prop="hp" align="center" label="剩余血量"></el-table-column>
+                <el-table-column prop="id" align="center" label="id" width="100"> </el-table-column>
+                <el-table-column prop="metaZombieId" align="center" label="僵尸配置id"> </el-table-column>
+                <el-table-column prop="createIndex" align="center" label="生成点id"> </el-table-column>
+                <el-table-column prop="type" align="center" label="类型" :formatter="typeFormatter"> </el-table-column>
+                <el-table-column prop="hp" align="center" label="剩余血量"> </el-table-column>
                 <el-table-column prop="killed" align="center" label="是否击杀">
                     <template slot-scope="{ row }">
-					<el-tag :type="row.killed ? '' : 'info'"> {{ row.killed }} </el-tag>
-				</template>
+                        <el-tag :type="row.killed ? '' : 'info'"> {{ row.killed }} </el-tag>
+                    </template>
                 </el-table-column>
-                <el-table-column prop="pos" align="center" label="坐标">
+                <el-table-column prop="pos" align="center" label="坐标" width="350">
                     <template slot-scope="{ row }">
-					{{ 'x=' + row.pos.x + ' , ' + 'y=' + row.pos.y + ' , ' + 'z=' + row.pos.z }} 
-				</template>
+                        {{ 'x=' + row.pos.x + ' , ' + 'y=' + row.pos.y + ' , ' + 'z=' + row.pos.z }}
+                    </template>
                 </el-table-column>
             </el-table>
         </el-dialog>
-	</div>
+    </div>
 </template>
 <script>
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
 
 export default {
-	name: 'MetaGameProcessList',
-	mixins: [pageableTable],
-	data() {
-		return {
+    name: 'MetaGameProcessList',
+    mixins: [pageableTable],
+    data() {
+        return {
             typeOptions: [
-				{ label: '普通僵尸', value: 'COMMON' },
+                { label: '普通僵尸', value: 'COMMON' },
                 { label: '特殊僵尸', value: 'SPECIAL' }
-			],
+            ],
             zombieList: [],
             showZombieDialog: false,
-			multipleMode: false,
-			search: '',
-			url: '/metaGameProcess/all',
-			downloading: false
-		};
-	},
-	computed: {
-		selection() {
-			return this.$refs.table.selection.map(i => i.id);
-		}
-	},
-	methods: {
+            multipleMode: false,
+            search: '',
+            url: '/metaGameProcess/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
         typeFormatter(row, column, cellValue, index) {
-			let selectedOption = this.typeOptions.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();
-			}
-		},
-		zombie(row) {
+            let selectedOption = this.typeOptions.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();
+            }
+        },
+        zombie(row) {
             this.zombieList = row.metaZombieDTOS;
             this.showZombieDialog = true;
-		},
-		download() {
-			this.downloading = true;
-			this.$axios
-				.get('/metaGameProcess/excel', {
-					responseType: 'blob',
-					params: { size: 10000 ,query: { del: false }},
-				})
-				.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);
-				});
-		}
-	}
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/metaGameProcess/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000, query: { del: false } }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        }
+    }
 };
 </script>
 <style lang="less" scoped>