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

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

@@ -1,7 +1,7 @@
 package com.izouma.nineth.domain;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.izouma.nineth.enums.EntryModeType;
+import com.izouma.nineth.enums.MetaPurchaseMethodEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -27,7 +27,7 @@ public class MetaAccessories extends BaseEntity {
     @ApiModelProperty("购买方式")
     @ExcelProperty("购买方式")
     @Enumerated(EnumType.STRING)
-    private EntryModeType purchaseMethod;
+    private MetaPurchaseMethodEnum purchaseMethod;
 
     @ApiModelProperty("价格/金币数量")
     @ExcelProperty("价格/金币数量")

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

@@ -3,6 +3,7 @@ package com.izouma.nineth.domain;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.nineth.converter.CoordinateConverter;
+import com.izouma.nineth.converter.StringArrayConverter;
 import com.izouma.nineth.dto.CoordinateDTO;
 import com.izouma.nineth.enums.MetaIsLandTypeEnum;
 import io.swagger.annotations.ApiModel;
@@ -12,6 +13,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
@@ -35,6 +37,10 @@ public class MetaBoatPosition extends BaseEntity {
     @Convert(converter = CoordinateConverter.class)
     private CoordinateDTO boatRot;
 
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = StringArrayConverter.class)
+    private List<String> boatType;
+
     @Transient
     @ExcelIgnore
     private MetaSpatialWharf boatInfo;

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

@@ -0,0 +1,40 @@
+package com.izouma.nineth.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙邮件配置")
+public class MetaEmail extends BaseEntity {
+
+    @ApiModelProperty("邮件标题")
+    @ExcelProperty("邮件标题")
+    private String title;
+
+    @ApiModelProperty("邮件作者")
+    @ExcelProperty("邮件作者")
+    private String author;
+
+    @ApiModelProperty("邮件内容")
+    @ExcelProperty("邮件内容")
+    private String description;
+
+    @ApiModelProperty("是否发布")
+    @ExcelProperty("是否发布")
+    private boolean publish;
+
+    @ApiModelProperty("是否已读")
+    @Transient
+    private boolean read;
+}
+

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

@@ -0,0 +1,35 @@
+package com.izouma.nineth.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙题库记录")
+public class MetaEmailRecord extends BaseEntity {
+
+    @ApiModelProperty("用户ID")
+    @ExcelProperty("用户ID")
+    private Long userId;
+
+    @ApiModelProperty("邮件id")
+    @ExcelProperty("邮件id‘")
+    private Long emailId;
+
+    @ApiModelProperty("是否删除")
+    @ExcelProperty("是否删除")
+    private boolean emailDel;
+
+    @ApiModelProperty("是否已读")
+    @ExcelProperty("是否已读")
+    private boolean emailRead;
+
+}

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

@@ -1,6 +1,6 @@
 package com.izouma.nineth.domain;
 
-import com.izouma.nineth.enums.EntryModeType;
+import com.izouma.nineth.enums.MetaAwardTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -15,7 +15,7 @@ public class MetaGameAward {
     private String name;
 
     @ApiModelProperty("奖励类型")
-    private EntryModeType awardType;
+    private MetaAwardTypeEnum awardType;
 
     @ApiModelProperty("奖励配置(金币奖励为金币数量，NFT奖励为NFT奖励图片地址)")
     private String config;

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

@@ -3,6 +3,7 @@ package com.izouma.nineth.domain;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.nineth.annotations.Searchable;
+import com.izouma.nineth.enums.MoveType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -11,6 +12,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.time.LocalDateTime;
 import java.util.Objects;
@@ -96,6 +99,11 @@ public class MetaMMOLoginInfo extends BaseEntity {
     @ExcelProperty("emoji")
     private int emoji;
 
+    @ApiModelProperty("移动类型")
+    @ExcelProperty("移动类型")
+    @Enumerated(EnumType.STRING)
+    private MoveType moveType;
+
     /**
      * 根据玩家历史登陆信息初始化本次登陆信息
      *

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

@@ -0,0 +1,50 @@
+package com.izouma.nineth.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙题库配置")
+public class MetaQuestion extends BaseEntity{
+
+    @ApiModelProperty("题目标签")
+    @ExcelProperty("题目标签")
+    private String title;
+
+    @ApiModelProperty("题目描述")
+    @ExcelProperty("题目描述")
+    private String description;
+
+    @ApiModelProperty("选项A")
+    @ExcelProperty("选项A")
+    private String optionA;
+
+    @ApiModelProperty("选项B")
+    @ExcelProperty("选项B")
+    private String optionB;
+
+    @ApiModelProperty("选项C")
+    @ExcelProperty("选项C")
+    private String optionC;
+
+    @ApiModelProperty("选项D")
+    @ExcelProperty("选项D")
+    private String optionD;
+
+    @ApiModelProperty("正确选项")
+    @ExcelProperty("正确选项")
+    private int correct;
+
+    @ApiModelProperty("用途")
+    @ExcelProperty("用途")
+    private int application;
+}

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

@@ -0,0 +1,46 @@
+package com.izouma.nineth.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.nineth.enums.MetaAwardTypeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙签到管理")
+public class MetaSign extends BaseEntity {
+
+    @ApiModelProperty("年月 例如：2023-01")
+    @ExcelProperty("年月 例如：2023-01")
+    private String date;
+
+    @ApiModelProperty("签到规则")
+    @ExcelProperty("签到规则")
+    private String signRule;
+
+    @ApiModelProperty("奖励类型")
+    @ExcelProperty("奖励类型")
+    @Enumerated(EnumType.STRING)
+    private MetaAwardTypeEnum awardType;
+
+    @ApiModelProperty("配饰奖励配饰id")
+    @ExcelProperty("配饰奖励配饰id")
+    private Long metaAccessoriesId;
+
+    @ApiModelProperty("NFT奖励图片地址")
+    @ExcelProperty("NFT奖励图片地址")
+    private String awardPic;
+
+    @ApiModelProperty("金币奖励数量")
+    @ExcelProperty("金币奖励数量")
+    private int goldNum;
+}

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

@@ -0,0 +1,54 @@
+package com.izouma.nineth.domain;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.nineth.enums.MetaAwardTypeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Transient;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙累计签到奖励配置")
+public class MetaSignAward extends BaseEntity {
+
+    @ApiModelProperty("年月 例如：2023-01")
+    @ExcelProperty("年月 例如：2023-01")
+    private String date;
+
+    @ApiModelProperty("累计签到次数")
+    @ExcelProperty("累计签到次数")
+    private int signNum;
+
+    @ApiModelProperty("奖励类型")
+    @ExcelProperty("奖励类型")
+    @Enumerated(EnumType.STRING)
+    private MetaAwardTypeEnum awardType;
+
+    @ApiModelProperty("配饰奖励配饰id")
+    @ExcelProperty("配饰奖励配饰id")
+    private Long metaAccessoriesId;
+
+    @ApiModelProperty("NFT奖励图片地址")
+    @ExcelProperty("NFT奖励图片地址")
+    private String awardPic;
+
+    @ApiModelProperty("金币奖励数量")
+    @ExcelProperty("金币奖励数量")
+    private int goldNum;
+
+    @Transient
+    @ApiModelProperty("是否领取过")
+    @ExcelIgnore
+    private boolean draw;
+
+}

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

@@ -0,0 +1,31 @@
+package com.izouma.nineth.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙签到奖励领取记录")
+public class MetaSignAwardDrawRecord extends BaseEntity {
+
+    @ApiModelProperty("用户id")
+    @ExcelProperty("用户id")
+    private Long userId;
+
+    @ApiModelProperty("奖励id")
+    @ExcelProperty("奖励id")
+    private Long metaSignAwardId;
+
+    @ApiModelProperty("奖励所属时间")
+    @ExcelProperty("奖励所属时间")
+    private String date;
+
+}

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

@@ -0,0 +1,28 @@
+package com.izouma.nineth.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import java.time.LocalDate;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙签到记录")
+public class MetaSignRecord extends BaseEntity {
+
+    @ApiModelProperty("用户id")
+    @ExcelProperty("用户id这个")
+    private Long userId;
+
+    @ApiModelProperty("签到时间")
+    @ExcelProperty("签到时间")
+    private LocalDate signTime;
+
+}

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

@@ -0,0 +1,31 @@
+package com.izouma.nineth.domain;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙空间码头列表")
+public class MetaSwitch extends BaseEntity {
+
+    @ApiModelProperty("开关名称")
+    @ExcelProperty("开关名称")
+    private String name;
+
+    @ApiModelProperty("描述")
+    @ExcelProperty("描述")
+    private String description;
+
+    @ApiModelProperty("开关状态")
+    @ExcelProperty("开关状态")
+    private boolean status;
+}

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

@@ -3,7 +3,7 @@ package com.izouma.nineth.domain;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.nineth.annotations.Searchable;
-import com.izouma.nineth.enums.EntryModeType;
+import com.izouma.nineth.enums.MetaAwardTypeEnum;
 import com.izouma.nineth.enums.MetaTaskType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -61,9 +61,13 @@ public class MetaTask extends BaseEntity{
     @ApiModelProperty("奖励类型")
     @ExcelProperty("奖励类型")
     @Enumerated(EnumType.STRING)
-    private EntryModeType awardType;
+    private MetaAwardTypeEnum awardType;
 
     @ApiModelProperty("金币奖励数量")
     @ExcelProperty("金币奖励数量")
     private int goldNum;
+
+    @ApiModelProperty("是否自动领取")
+    @ExcelProperty("是否自动领取")
+    private boolean autoReceive;
 }

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

@@ -3,6 +3,7 @@ package com.izouma.nineth.domain;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.nineth.annotations.Searchable;
+import com.izouma.nineth.enums.MetaAwardTypeEnum;
 import com.izouma.nineth.enums.MetaTaskStatus;
 import com.izouma.nineth.enums.MetaTaskType;
 import io.swagger.annotations.ApiModel;
@@ -49,6 +50,11 @@ public class MetaTaskToUser extends BaseEntity{
     @ExcelProperty("任务类型")
     private MetaTaskType taskType;
 
+    @ApiModelProperty("奖励类型")
+    @ExcelProperty("奖励类型")
+    @Enumerated(EnumType.STRING)
+    private MetaAwardTypeEnum awardType;
+
     @ApiModelProperty("任务详情")
     @ExcelProperty("任务详情")
     @Column(columnDefinition = "TEXT")

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

@@ -0,0 +1,26 @@
+package com.izouma.nineth.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙走马灯配置")
+public class MetaZouMaLight extends BaseEntity {
+
+    @ApiModelProperty("是否发布")
+    @ExcelProperty("是否发布")
+    private boolean publish;
+
+    @ApiModelProperty("走马灯详情")
+    @ExcelProperty("走马灯详情")
+    private String description;
+}

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

@@ -0,0 +1,15 @@
+package com.izouma.nineth.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FuAssetDTO {
+
+    private String prefixName;
+
+    private Long num;
+}

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

@@ -0,0 +1,26 @@
+package com.izouma.nineth.dto;
+
+import com.izouma.nineth.domain.MetaSign;
+import com.izouma.nineth.domain.MetaSignAward;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class MetaSignProgressDTO {
+
+    private String isSignIn;
+
+    private List<SignInCalendar> signInCalendars;
+
+    private List<MetaSignAward> metaSignAwards;
+
+    private MetaSign metaSign;
+
+    private int signCount;
+
+}

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

@@ -0,0 +1,18 @@
+package com.izouma.nineth.dto;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SignInCalendar {
+
+    private LocalDate time;
+
+    private boolean isSign;
+}

src/main/java/com/izouma/nineth/enums/AuthorityName.java

@@ -11,7 +11,8 @@ public enum AuthorityName {
     ROLE_COMPANY("企业用户"),
     ROLE_MESSAGE("留言管理员"),
     ROLE_SAAS("SAAS管理员"),
-    ROLE_META("元宇宙管理员");
+    ROLE_META("元宇宙管理员"),
+    ROLE_GROUP("群组管理员");
     private final String description;
 
     AuthorityName(String description) {

src/main/java/com/izouma/nineth/enums/EntryModeType.java

@@ -1,6 +1,8 @@
 package com.izouma.nineth.enums;
 
+import io.swagger.annotations.ApiModel;
 
+@ApiModel("元宇宙游戏入场方式枚举")
 public enum EntryModeType {
 
     NFT("NFT"),

src/main/java/com/izouma/nineth/enums/MetaAwardTypeEnum.java

@@ -0,0 +1,25 @@
+package com.izouma.nineth.enums;
+
+import io.swagger.annotations.ApiModel;
+
+@ApiModel("元宇宙奖励类型枚举")
+public enum MetaAwardTypeEnum {
+
+    NULL("空"),
+
+    ACCESSORIES("配饰"),
+
+    NFT("NFT"),
+
+    GOLD("金币");
+
+    private final String description;
+
+    MetaAwardTypeEnum(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

src/main/java/com/izouma/nineth/enums/MetaIsLandTypeEnum.java

@@ -5,9 +5,9 @@ public enum MetaIsLandTypeEnum {
 
     TEN_THOUSAND("10000m²空间岛"),
 
-    SIX_THOUSAND("60000m²空间岛"),
+    SIXTY_THOUSAND("60000m²空间岛"),
 
-    NINE_THOUSAND("90000m²空间岛");
+    NINETY_THOUSAND("90000m²空间岛");
 
     private final String description;
 

src/main/java/com/izouma/nineth/enums/MetaPurchaseMethodEnum.java

@@ -0,0 +1,21 @@
+package com.izouma.nineth.enums;
+
+import io.swagger.annotations.ApiModel;
+
+@ApiModel("元宇宙游戏购买方式枚举")
+public enum MetaPurchaseMethodEnum {
+
+    NFT("NFT"),
+
+    GOLD("金币");
+
+    private final String description;
+
+    MetaPurchaseMethodEnum(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

src/main/java/com/izouma/nineth/enums/MoveType.java

@@ -0,0 +1,18 @@
+package com.izouma.nineth.enums;
+
+public enum MoveType {
+
+    WALK("步行"),
+
+    BOAT("乘船");
+
+    private final String description;
+
+    MoveType(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.izouma.nineth.repo;
 
 import com.izouma.nineth.domain.Asset;
+import com.izouma.nineth.dto.FuAssetDTO;
 import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.enums.CollectionType;
 import org.springframework.data.domain.Page;
@@ -137,9 +138,12 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
     @Query("select count(id) from Asset where name like ?1 and status = 'NORMAL' and ownerId <> 1435297")
     Long countNameLikeNotDestroyed(String name);
 
-    @Query(value = "select * from asset where name like ?1 and status in ?2 and id not in ?3 and del = false", nativeQuery = true)
-    List<Asset> findAllBoats(String name, List<AssetStatus> status, List<Long> boatIds);
-
     @Query(value = "SELECT count(a.id) from asset a where a.name LIKE ?1 and status = 'NORMAL' and owner_id = ?2", nativeQuery = true)
     Long countNameLikeNotDestroyedAndOwner(String name, Long ownerId);
+
+    @Query(value = "select a from Asset a where a.userId = ?6 and a.name like ?1 and a.name like ?4 and a.name not like ?5 and a.status in ?2 and a.id not in ?3 and a.del = false")
+    List<Asset> findAllBoats(String name, List<AssetStatus> status, List<Long> boatIds, String like, String unLike, Long userId);
+
+    @Query(value = "select new com.izouma.nineth.dto.FuAssetDTO(a.prefixName, count(a.id)) from Asset a where a.userId = ?1 and a.status in ?2 and a.prefixName in ?3 and a.del = false group by a.prefixName")
+    List<FuAssetDTO> queryFu(Long userId, List<AssetStatus> status, List<String> prefixNames);
 }

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

@@ -0,0 +1,19 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaEmailRecord;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface MetaEmailRecordRepo extends JpaRepository<MetaEmailRecord, Long>, JpaSpecificationExecutor<MetaEmailRecord> {
+
+    @Query("SELECT m.emailId FROM MetaEmailRecord m WHERE m.userId = ?1 AND m.emailDel = ?2")
+    List<Long> findEmailIdByDel(Long userId, boolean emailDel);
+
+    @Query("SELECT m.emailId FROM MetaEmailRecord m WHERE m.userId = ?1 AND m.emailRead = ?2")
+    List<Long> findEmailIdRead(Long userId, boolean emailRead);
+
+    MetaEmailRecord findByUserIdAndEmailId(Long userId, Long emailId);
+}

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

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

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

@@ -0,0 +1,19 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaQuestion;
+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 MetaQuestionRepo extends JpaRepository<MetaQuestion, Long>, JpaSpecificationExecutor<MetaQuestion> {
+    @Query("update MetaQuestion t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    List<MetaQuestion> findAllByApplicationAndDel(int application, boolean del);
+}

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

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaSignAwardDrawRecord;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface MetaSignAwardDrawRecordRepo extends JpaRepository<MetaSignAwardDrawRecord, Long>, JpaSpecificationExecutor<MetaSignAwardDrawRecord> {
+
+    @Query("SELECT m.metaSignAwardId FROM MetaSignAwardDrawRecord m WHERE m.userId = ?1 AND m.date = ?2 AND m.del = false")
+    List<Long> findMetaSignAwardIdsByUserIdAndDateAndDel(Long userId, String date);
+
+    MetaSignAwardDrawRecord findByUserIdAndMetaSignAwardIdAndDel(Long userId, Long metaSignAwardId, boolean del);
+}

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

@@ -0,0 +1,22 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaSignAward;
+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 MetaSignAwardRepo extends JpaRepository<MetaSignAward, Long>, JpaSpecificationExecutor<MetaSignAward> {
+
+    @Query("update MetaSignAward t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    MetaSignAward findByDateAndSignNumAndDel(String date, int signNum, boolean del);
+
+    List<MetaSignAward> findByDateAndDel(String date, boolean del);
+}

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

@@ -0,0 +1,24 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaSignRecord;
+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.time.LocalDate;
+import java.util.List;
+
+public interface MetaSignRecordRepo extends JpaRepository<MetaSignRecord, Long>, JpaSpecificationExecutor<MetaSignRecord> {
+
+    @Query("update MetaSignRecord t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    MetaSignRecord findByUserIdAndSignTimeAndDel(Long userId, LocalDate signTime, boolean del);
+
+    @Query("SELECT m.signTime FROM MetaSignRecord m WHERE m.signTime >= ?1 AND m.signTime <= ?2 AND m.userId = ?3 ORDER BY m.signTime")
+    List<LocalDate> findSigns(LocalDate firstDay, LocalDate lastDay, Long userId);
+}

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

@@ -0,0 +1,19 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaSign;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface MetaSignRepo extends JpaRepository<MetaSign, Long>, JpaSpecificationExecutor<MetaSign> {
+
+    @Query("update MetaSign t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    MetaSign findByDateAndDel(String date, boolean del);
+}

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

@@ -0,0 +1,23 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaSwitch;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface MetaSwitchRepo extends JpaRepository<MetaSwitch, Long>, JpaSpecificationExecutor<MetaSwitch> {
+    @Query("update MetaSwitch t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    MetaSwitch findByNameAndDel(String name, boolean del);
+
+    @Query("update MetaSwitch t set t.status = ?2 where t.id = ?1")
+    @Modifying
+    @Transactional
+    void updateStatus(Long id, boolean status);
+}

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

@@ -0,0 +1,21 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaZouMaLight;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface MetaZouMaLightRepo extends JpaRepository<MetaZouMaLight, Long>, JpaSpecificationExecutor<MetaZouMaLight> {
+    @Query("update MetaZouMaLight t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    MetaZouMaLight findByPublishAndDel(boolean publish, boolean del);
+
+    @Query("SELECT m.description FROM MetaZouMaLight m WHERE m.publish = ?1 AND m.del = ?2")
+    String findDescriptionByPublishAndDel(boolean publish, boolean del);
+}

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

@@ -1,5 +1,7 @@
 package com.izouma.nineth.service;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.google.common.collect.Lists;
 import com.google.common.hash.Hashing;
 import com.izouma.nineth.TokenHistory;
@@ -53,28 +55,28 @@ import java.util.stream.Collectors;
 @Slf4j
 public class AssetService {
 
-    private AssetRepo               assetRepo;
-    private UserRepo                userRepo;
-    private CollectionRepo          collectionRepo;
-    private OrderRepo               orderRepo;
-    private TokenHistoryRepo        tokenHistoryRepo;
-    private SysConfigService        sysConfigService;
-    private RocketMQTemplate        rocketMQTemplate;
-    private GeneralProperties       generalProperties;
-    private ShowroomRepo            showroomRepo;
-    private ShowCollectionRepo      showCollectionRepo;
+    private AssetRepo assetRepo;
+    private UserRepo userRepo;
+    private CollectionRepo collectionRepo;
+    private OrderRepo orderRepo;
+    private TokenHistoryRepo tokenHistoryRepo;
+    private SysConfigService sysConfigService;
+    private RocketMQTemplate rocketMQTemplate;
+    private GeneralProperties generalProperties;
+    private ShowroomRepo showroomRepo;
+    private ShowCollectionRepo showCollectionRepo;
     private CollectionPrivilegeRepo collectionPrivilegeRepo;
-    private PasswordEncoder         passwordEncoder;
-    private MintActivityRepo        mintActivityRepo;
-    private DestroyRecordRepo       destroyRecordRepo;
-    private AirDropService          airDropService;
-    private HCChainService          hcChainService;
-    private RockRecordService       rockRecordService;
-    private RockRecordRepo          rockRecordRepo;
-    private AssetLockRepo           assetLockRepo;
-    private UserBalanceService      userBalanceService;
-    private PhotoAssetRepo          photoAssetRepo;
-    private NumberSeqRepo           numberSeqRepo;
+    private PasswordEncoder passwordEncoder;
+    private MintActivityRepo mintActivityRepo;
+    private DestroyRecordRepo destroyRecordRepo;
+    private AirDropService airDropService;
+    private HCChainService hcChainService;
+    private RockRecordService rockRecordService;
+    private RockRecordRepo rockRecordRepo;
+    private AssetLockRepo assetLockRepo;
+    private UserBalanceService userBalanceService;
+    private PhotoAssetRepo photoAssetRepo;
+    private NumberSeqRepo numberSeqRepo;
 
     public Page<Asset> all(PageQuery pageQuery) {
 
@@ -1020,16 +1022,16 @@ public class AssetService {
             if (tags.isEmpty()) return new PageImpl<>(Collections.emptyList());
             return assetRepo.findAll((Specification<Asset>) (root, query, criteriaBuilder) ->
                     query.distinct(true).where(
-                            // where userId=some id
-                            criteriaBuilder.equal(root.get("userId"), userId),
-                            // and (lockTo is null or (lockTo is not null and lockTo < now))
-                            criteriaBuilder.or(criteriaBuilder.isNull(root.get("lockTo")),
-                                    criteriaBuilder.and(criteriaBuilder.isNotNull(root.get("lockTo")),
-                                            criteriaBuilder.lessThan(root.get("lockTo"), LocalDateTime.now()))),
-                            // and status = 'NORMAL'
-                            criteriaBuilder.equal(root.get("status"), AssetStatus.NORMAL),
-                            // and has some tagId
-                            root.join("tags").get("id").in(tags.stream().map(Tag::getId).toArray()))
+                                    // where userId=some id
+                                    criteriaBuilder.equal(root.get("userId"), userId),
+                                    // and (lockTo is null or (lockTo is not null and lockTo < now))
+                                    criteriaBuilder.or(criteriaBuilder.isNull(root.get("lockTo")),
+                                            criteriaBuilder.and(criteriaBuilder.isNotNull(root.get("lockTo")),
+                                                    criteriaBuilder.lessThan(root.get("lockTo"), LocalDateTime.now()))),
+                                    // and status = 'NORMAL'
+                                    criteriaBuilder.equal(root.get("status"), AssetStatus.NORMAL),
+                                    // and has some tagId
+                                    root.join("tags").get("id").in(tags.stream().map(Tag::getId).toArray()))
                             .getRestriction(), pageable);
         } else {
             return assetRepo.findByUserIdAndStatusAndCompanyIdAndNameLike(userId, AssetStatus.NORMAL, companyId,
@@ -1268,4 +1270,48 @@ public class AssetService {
                 .duration(duration)
                 .build());
     }
+
+    public List<TransactionTopTenDTO> transactionTopTen() {
+        LocalDateTime localDateTime = LocalDateTime.now().plusDays(-7);
+        List<Map<String, String>> map = orderRepo.transactionTopTen(localDateTime);
+        JSONArray jsonArray = new JSONArray();
+        if (CollectionUtil.isEmpty(map)) {
+            return null;
+        }
+        jsonArray.addAll(map);
+        List<TransactionTopTenDTO> transactionTopTenDTOS = jsonArray.toJavaList(TransactionTopTenDTO.class);
+        if (CollectionUtil.isEmpty(transactionTopTenDTOS)) {
+            return null;
+        }
+        transactionTopTenDTOS.forEach(transactionTopTenDTO -> {
+            if (Objects.nonNull(transactionTopTenDTO.getId())) {
+                if (transactionTopTenDTO.getSource().equals(CollectionSource.OFFICIAL)) {
+                    Collection collection = collectionRepo.findById(transactionTopTenDTO.getId()).orElse(null);
+                    if (Objects.nonNull(collection)) {
+                        transactionTopTenDTO.setPic(collection.getPic());
+                    }
+                }
+                if (transactionTopTenDTO.getSource().equals(CollectionSource.TRANSFER)) {
+                    Asset asset = assetRepo.findById(transactionTopTenDTO.getId()).orElse(null);
+                    if (Objects.nonNull(asset)) {
+                        transactionTopTenDTO.setPic(asset.getPic());
+                    }
+                }
+            }
+            transactionTopTenDTO.setId(null);
+            transactionTopTenDTO.setSource(null);
+        });
+        return transactionTopTenDTOS;
+    }
+
+    public List<FuAssetDTO> queryFu() {
+        Long userId = SecurityUtils.getAuthenticatedUser().getId();
+        String prefixName = sysConfigService.getString("fu_prefixName");
+        if (StringUtils.isBlank(prefixName)) {
+            throw new BusinessException("缺少福分类配置");
+        }
+        String[] split = prefixName.split(",");
+        List<String> prefixNames = Arrays.asList(split);
+        return assetRepo.queryFu(userId, Constants.META_NORMAL_STATUS, prefixNames);
+    }
 }

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

@@ -7,7 +7,7 @@ import com.izouma.nineth.domain.MetaAccessoriesPurchaseRecord;
 import com.izouma.nineth.domain.MetaUserGold;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.enums.EntryModeType;
+import com.izouma.nineth.enums.MetaPurchaseMethodEnum;
 import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.MetaAccessoriesPurchaseRecordRepo;
 import com.izouma.nineth.repo.MetaAccessoriesRepo;
@@ -52,7 +52,7 @@ public class MetaAccessoriesService {
             if (Objects.isNull(metaAccessories)) {
                 return MetaRestResult.returnError(String.format("id:[%S]的配饰信息不存在！", id));
             }
-            if (!EntryModeType.GOLD.equals(metaAccessories.getPurchaseMethod())) {
+            if (!MetaPurchaseMethodEnum.GOLD.equals(metaAccessories.getPurchaseMethod())) {
                 return MetaRestResult.returnError(String.format("当前配饰[%S]不允许金币购买！", id));
             }
             total = total + metaAccessories.getPrice();
@@ -80,13 +80,13 @@ public class MetaAccessoriesService {
             return MetaRestResult.returnError("当前未配置任何配饰!");
         }
         list.forEach(metaAccessories -> {
-            if (EntryModeType.GOLD.equals(metaAccessories.getPurchaseMethod())) {
+            if (MetaPurchaseMethodEnum.GOLD.equals(metaAccessories.getPurchaseMethod())) {
                 MetaAccessoriesPurchaseRecord metaAccessoriesPurchaseRecord = metaAccessoriesPurchaseRecordRepo.findByUserIdAndMetaAccessoriesId(userId, metaAccessories.getId());
                 if (Objects.nonNull(metaAccessoriesPurchaseRecord)) {
                     metaAccessories.setHold(true);
                 }
             }
-            if (EntryModeType.NFT.equals(metaAccessories.getPurchaseMethod())) {
+            if (MetaPurchaseMethodEnum.NFT.equals(metaAccessories.getPurchaseMethod())) {
                 List<Asset> assets = assetRepo
                         .findAllByUserIdAndStatusInAndNameLike(userId, Constants.META_NORMAL_STATUS, "%" + metaAccessories
                                 .getCollectionName() + "%");

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

@@ -64,9 +64,9 @@ public class MetaBoatPositionService {
             case 10000:
                 return MetaIsLandTypeEnum.TEN_THOUSAND;
             case 60000:
-                return MetaIsLandTypeEnum.SIX_THOUSAND;
+                return MetaIsLandTypeEnum.SIXTY_THOUSAND;
             case 90000:
-                return MetaIsLandTypeEnum.NINE_THOUSAND;
+                return MetaIsLandTypeEnum.NINETY_THOUSAND;
             default:
                 return null;
         }

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

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

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

@@ -0,0 +1,48 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.MetaEmail;
+import com.izouma.nineth.dto.MetaRestResult;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.MetaEmailRecordRepo;
+import com.izouma.nineth.repo.MetaEmailRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import com.izouma.nineth.utils.SecurityUtils;
+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 MetaEmailService {
+
+    private MetaEmailRepo metaEmailRepo;
+
+    private MetaEmailRecordRepo metaEmailRecordRepo;
+
+    public Page<MetaEmail> all(PageQuery pageQuery) {
+        return metaEmailRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaEmail.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public MetaRestResult<List<MetaEmail>> metaQuery() {
+        Long userId = SecurityUtils.getAuthenticatedUser().getId();
+        List<Long> delIds = metaEmailRecordRepo.findEmailIdByDel(userId, true);
+        List<MetaEmail> metaEmails;
+        metaEmails = CollectionUtils.isEmpty(delIds) ? metaEmailRepo.findAllByPublishAndDel(true, false) : metaEmailRepo.findAllByPublishAndDelAndIdNotIn(true, false, delIds);
+        if (CollectionUtils.isEmpty(metaEmails)) {
+            return MetaRestResult.returnSuccess(metaEmails);
+        }
+        List<Long> readIds = metaEmailRecordRepo.findEmailIdRead(userId, true);
+        if (CollectionUtils.isEmpty(readIds)) {
+            return MetaRestResult.returnSuccess(metaEmails);
+        }
+        metaEmails.forEach(metaEmail -> {
+            if (readIds.contains(metaEmail.getId())) {
+                metaEmail.setRead(true);
+            }
+        });
+        return MetaRestResult.returnSuccess(metaEmails);
+    }
+}

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

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

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

@@ -0,0 +1,114 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.MetaAccessories;
+import com.izouma.nineth.domain.MetaAccessoriesPurchaseRecord;
+import com.izouma.nineth.domain.MetaSignAward;
+import com.izouma.nineth.domain.MetaSignAwardDrawRecord;
+import com.izouma.nineth.dto.MetaRestResult;
+import com.izouma.nineth.dto.MetaServiceResult;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.MetaAwardTypeEnum;
+import com.izouma.nineth.repo.*;
+import com.izouma.nineth.utils.DateTimeUtils;
+import com.izouma.nineth.utils.JpaUtils;
+import com.izouma.nineth.utils.SecurityUtils;
+import com.izouma.nineth.web.MetaUserGoldController;
+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.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@AllArgsConstructor
+public class MetaSignAwardDrawRecordService {
+
+    private MetaSignAwardDrawRecordRepo metaSignAwardDrawRecordRepo;
+
+    private MetaSignAwardRepo metaSignAwardRepo;
+
+    private MetaUserGoldController metaUserGoldController;
+
+    private MetaAccessoriesPurchaseRecordRepo metaAccessoriesPurchaseRecordRepo;
+
+    private MetaAccessoriesRepo metaAccessoriesRepo;
+
+    private MetaSignRecordRepo metaSignRecordRepo;
+
+    public Page<MetaSignAwardDrawRecord> all(PageQuery pageQuery) {
+        return metaSignAwardDrawRecordRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaSignAwardDrawRecord.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    @Transactional
+    public MetaRestResult<MetaSignAward> save(Long metaSignAwardId) {
+        Long userId = SecurityUtils.getAuthenticatedUser().getId();
+        MetaSignAward metaSignAward = metaSignAwardRepo.findById(metaSignAwardId).orElse(null);
+        if (Objects.isNull(metaSignAward)) {
+            return MetaRestResult.returnError("该奖励配置不存在");
+        }
+        MetaSignAwardDrawRecord metaSignAwardDrawRecord = metaSignAwardDrawRecordRepo.findByUserIdAndMetaSignAwardIdAndDel(userId, metaSignAwardId, false);
+        if (Objects.nonNull(metaSignAwardDrawRecord)) {
+            return MetaRestResult.returnError("该奖励已经领取过不可重复领取");
+        }
+        MetaServiceResult result = check(userId, metaSignAward);
+        if (!result.isSuccess()) {
+            return MetaRestResult.returnError(result.getMessage());
+        }
+        if (MetaAwardTypeEnum.GOLD.equals(metaSignAward.getAwardType())) {
+            // 给用户增加金币
+            metaUserGoldController.changeNum(userId, metaSignAward.getGoldNum());
+            metaSignAwardDrawRecordRepo.save(new MetaSignAwardDrawRecord(userId, metaSignAwardId, metaSignAward.getDate()));
+            metaSignAward.setDraw(true);
+            return MetaRestResult.returnSuccess("金币奖励领取成功，已自动加入金币余额", metaSignAward);
+        }
+        if (MetaAwardTypeEnum.ACCESSORIES.equals(metaSignAward.getAwardType())) {
+            Long metaAccessoriesId = metaSignAward.getMetaAccessoriesId();
+            MetaAccessories metaAccessories = metaAccessoriesRepo.findByIdAndDel(metaAccessoriesId, false);
+            if (Objects.isNull(metaAccessories)) {
+                return MetaRestResult.returnError("该配饰不存在");
+            }
+            MetaAccessoriesPurchaseRecord metaAccessoriesPurchaseRecord = metaAccessoriesPurchaseRecordRepo.findByUserIdAndMetaAccessoriesId(userId, metaAccessoriesId);
+            if (Objects.isNull(metaAccessoriesPurchaseRecord)) {
+                metaAccessoriesPurchaseRecordRepo.save(new MetaAccessoriesPurchaseRecord(userId, metaAccessoriesId));
+                metaSignAwardDrawRecordRepo.save(new MetaSignAwardDrawRecord(userId, metaSignAwardId, metaSignAward.getDate()));
+                metaSignAward.setDraw(true);
+                return MetaRestResult.returnSuccess("配饰奖励领取成功", metaSignAward);
+            }
+            // 配饰已经存在，转化为对应金币
+            metaUserGoldController.changeNum(userId, metaAccessories.getPrice());
+            metaSignAwardDrawRecordRepo.save(new MetaSignAwardDrawRecord(userId, metaSignAwardId, metaSignAward.getDate()));
+            metaSignAward.setDraw(true);
+            return MetaRestResult.returnSuccess("玩家已经拥有该配饰，奖励自动转化为金币", metaSignAward);
+        }
+        metaSignAwardDrawRecordRepo.save(new MetaSignAwardDrawRecord(userId, metaSignAwardId, metaSignAward.getDate()));
+        metaSignAward.setDraw(true);
+        return MetaRestResult.returnSuccess("NFT奖励领取成功，将在指定时间统一发放给用户", metaSignAward);
+    }
+
+    private MetaServiceResult check(Long userId, MetaSignAward metaSignAward) {
+        DateTimeFormatter yyyyMM = DateTimeFormatter.ofPattern(DateTimeUtils.DATE_FORMAT_YYYY_MM);
+        String yyyyMMDate = LocalDate.now().format(yyyyMM);
+        if (!yyyyMMDate.equals(metaSignAward.getDate())) {
+            return MetaServiceResult.returnError(String.format("领取失败！当前任务奖励仅限在[%S]领取", metaSignAward.getDate()));
+        }
+        // 获取当前月的第一天
+        LocalDate firstDay = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
+        // 获取当前月的最后一天
+        LocalDate lastDay = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth());
+        List<LocalDate> metaSignRecords = metaSignRecordRepo.findSigns(firstDay, lastDay, userId);
+        int count = 0;
+        if (CollectionUtils.isNotEmpty(metaSignRecords)) {
+            count = metaSignRecords.size();
+        }
+        if (count < metaSignAward.getSignNum()) {
+            return MetaServiceResult.returnError(String.format("不满足领取条件：当前用户本月累计签到次数[%S], 该奖励最低签到天数为[%S]", count, metaSignAward.getSignNum()));
+        }
+        return MetaServiceResult.returnSuccess();
+    }
+}

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

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

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

@@ -0,0 +1,153 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.*;
+import com.izouma.nineth.dto.*;
+import com.izouma.nineth.enums.MetaAwardTypeEnum;
+import com.izouma.nineth.repo.*;
+import com.izouma.nineth.utils.DateTimeUtils;
+import com.izouma.nineth.utils.JpaUtils;
+import com.izouma.nineth.utils.SecurityUtils;
+import com.izouma.nineth.web.MetaUserGoldController;
+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.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@AllArgsConstructor
+public class MetaSignRecordService {
+
+    private MetaSignRecordRepo metaSignRecordRepo;
+
+    private MetaSignAwardRepo metaSignAwardRepo;
+
+    private MetaSignAwardDrawRecordRepo metaSignAwardDrawRecordRepo;
+
+    private MetaSignRepo metaSignRepo;
+
+    private MetaUserGoldController metaUserGoldController;
+
+    private MetaAccessoriesPurchaseRecordRepo metaAccessoriesPurchaseRecordRepo;
+
+    private MetaAccessoriesRepo metaAccessoriesRepo;
+
+    public Page<MetaSignRecord> all(PageQuery pageQuery) {
+        return metaSignRecordRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaSignRecord.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    @Transactional
+    public MetaRestResult<MetaSignRecord> save() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DateTimeUtils.DATE_FORMAT);
+        Long userId = SecurityUtils.getAuthenticatedUser().getId();
+        LocalDate signTime = LocalDate.parse(LocalDate.now().format(formatter), formatter);
+        MetaSignRecord dbMetaSignRecord = metaSignRecordRepo.findByUserIdAndSignTimeAndDel(userId, signTime, false);
+        if (Objects.nonNull(dbMetaSignRecord)) {
+            return MetaRestResult.returnError("今日已经签到，不可重复签到");
+        }
+        MetaSignRecord metaSignRecord = new MetaSignRecord();
+        metaSignRecord.setSignTime(signTime);
+        metaSignRecord.setUserId(userId);
+        MetaServiceResult result = drawAward(userId);
+        if (!result.isSuccess()) {
+            return MetaRestResult.returnError(result.getMessage());
+        }
+        return MetaRestResult.returnSuccess(result.getMessage(), metaSignRecordRepo.save(metaSignRecord));
+    }
+
+    @Transactional
+    public MetaServiceResult drawAward(Long userId) {
+        String yyyyMMDate = LocalDate.now().format(DateTimeFormatter.ofPattern(DateTimeUtils.DATE_FORMAT_YYYY_MM));
+        MetaSign metaSign = metaSignRepo.findByDateAndDel(yyyyMMDate, false);
+        if (Objects.isNull(metaSign)) {
+            return MetaServiceResult.returnError(String.format("当前月份[%S]未配置签到规则和每日签到奖励", yyyyMMDate));
+        }
+        if (MetaAwardTypeEnum.GOLD.equals(metaSign.getAwardType())) {
+            // 给用户增加金币
+            metaUserGoldController.changeNum(userId, metaSign.getGoldNum());
+            return MetaServiceResult.returnSuccess("签到成功，金币奖励已自动加入金币余额");
+        }
+        if (MetaAwardTypeEnum.ACCESSORIES.equals(metaSign.getAwardType())) {
+            Long metaAccessoriesId = metaSign.getMetaAccessoriesId();
+            MetaAccessories metaAccessories = metaAccessoriesRepo.findByIdAndDel(metaAccessoriesId, false);
+            if (Objects.isNull(metaAccessories)) {
+                return MetaServiceResult.returnError("签到失败，配饰奖励不存在");
+            }
+            MetaAccessoriesPurchaseRecord metaAccessoriesPurchaseRecord = metaAccessoriesPurchaseRecordRepo.findByUserIdAndMetaAccessoriesId(userId, metaAccessoriesId);
+            if (Objects.isNull(metaAccessoriesPurchaseRecord)) {
+                metaAccessoriesPurchaseRecordRepo.save(new MetaAccessoriesPurchaseRecord(userId, metaAccessoriesId));
+                return MetaServiceResult.returnSuccess("签到成功，配饰奖励领取成功");
+            }
+            // 配饰已经存在，转化为对应金币
+            metaUserGoldController.changeNum(userId, metaAccessories.getPrice());
+            return MetaServiceResult.returnSuccess("签到成功，玩家已经拥有该配饰，奖励自动转化为金币");
+        }
+        return MetaServiceResult.returnSuccess("签到成功，NFT奖励将在指定时间统一发放给用户");
+    }
+
+    public MetaRestResult<MetaSignProgressDTO> signProgress() {
+        Long userId = SecurityUtils.getAuthenticatedUser().getId();
+        DateTimeFormatter yyyyMM = DateTimeFormatter.ofPattern(DateTimeUtils.DATE_FORMAT_YYYY_MM);
+        DateTimeFormatter yyyyMMdd = DateTimeFormatter.ofPattern(DateTimeUtils.DATE_FORMAT);
+        String yyyyMMDate = LocalDate.now().format(yyyyMM);
+        List<MetaSignAward> metaSignAwards = metaSignAwardRepo.findByDateAndDel(yyyyMMDate, false);
+        if (CollectionUtils.isEmpty(metaSignAwards)) {
+            return MetaRestResult.returnError(String.format("当前月份[%S]未配置任何签到奖励", yyyyMMDate));
+        }
+        List<Long> metaSignAwardIds = metaSignAwardDrawRecordRepo.findMetaSignAwardIdsByUserIdAndDateAndDel(userId, yyyyMMDate);
+        if (CollectionUtils.isNotEmpty(metaSignAwardIds)) {
+            metaSignAwards.forEach(metaSignAward -> {
+                if (metaSignAwardIds.contains(metaSignAward.getId())) {
+                    metaSignAward.setDraw(true);
+                }
+            });
+        }
+        LocalDate yyyyMMddDate = LocalDate.parse(LocalDate.now().format(yyyyMMdd), yyyyMMdd);
+        MetaSignRecord metaSignRecord = metaSignRecordRepo.findByUserIdAndSignTimeAndDel(userId, yyyyMMddDate, false);
+        String isSignIn = null;
+        if (Objects.isNull(metaSignRecord)) {
+            isSignIn = LocalDate.now().format(yyyyMMdd);
+        }
+        // 获取当前月的第一天
+        LocalDate firstDay = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
+        // 获取当前月的最后一天
+        LocalDate lastDay = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth());
+        List<LocalDate> metaSignRecords = metaSignRecordRepo.findSigns(firstDay, lastDay, userId);
+        List<SignInCalendar> signInCalendars = queryAllDatesOfMonth();
+        if (CollectionUtils.isNotEmpty(metaSignRecords)) {
+            signInCalendars.forEach(signInCalendar -> {
+                if (metaSignRecords.contains(signInCalendar.getTime())) {
+                    signInCalendar.setSign(true);
+                }
+            });
+        }
+        MetaSign metaSign = metaSignRepo.findByDateAndDel(yyyyMMDate, false);
+        if (Objects.isNull(metaSign)) {
+            return MetaRestResult.returnError(String.format("当前月份[%S]未配置签到规则和每日签到奖励", yyyyMMDate));
+        }
+        MetaSignProgressDTO metaSignProgressDTO = new MetaSignProgressDTO();
+        metaSignProgressDTO.setIsSignIn(isSignIn);
+        metaSignProgressDTO.setSignInCalendars(signInCalendars);
+        metaSignProgressDTO.setMetaSignAwards(metaSignAwards);
+        metaSignProgressDTO.setMetaSign(metaSign);
+        metaSignProgressDTO.setSignCount(CollectionUtils.isEmpty(metaSignRecords) ? 0 : metaSignRecords.size());
+        return MetaRestResult.returnSuccess(metaSignProgressDTO);
+    }
+
+    public static List<SignInCalendar> queryAllDatesOfMonth() {
+        List<SignInCalendar> signInCalendars = new ArrayList<>();
+        LocalDate firstDay = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
+        int days = LocalDate.now().lengthOfMonth();
+        for (int i = 0; i < days; i++) {
+            signInCalendars.add(new SignInCalendar(firstDay.plusDays(i), false));
+        }
+        return signInCalendars;
+    }
+}

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

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

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

@@ -6,12 +6,12 @@ import com.izouma.nineth.domain.MetaSpatialWharf;
 import com.izouma.nineth.dto.MetaBoatDTO;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.MetaSpatialWharfRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import com.izouma.nineth.utils.SecurityUtils;
 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;
@@ -28,6 +28,8 @@ public class MetaSpatialWharfService {
 
     private AssetRepo assetRepo;
 
+    private final String BOAT_NAME = "%僵尸%";
+
     public Page<MetaSpatialWharf> all(PageQuery pageQuery) {
         return metaSpatialWharfRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaSpatialWharf.class), JpaUtils.toPageRequest(pageQuery));
     }
@@ -67,7 +69,9 @@ public class MetaSpatialWharfService {
             return MetaRestResult.returnError(String.format("藏品[%S]不存在", metaSpatialWharf.getBoatId()));
         }
         metaSpatialWharf.setBoatImg(asset.getPic().get(0).getUrl());
-        return MetaRestResult.returnSuccess("停靠成功", metaSpatialWharfRepo.save(metaSpatialWharf));
+        MetaSpatialWharf save = metaSpatialWharfRepo.save(metaSpatialWharf);
+        save.setMeUse(true);
+        return MetaRestResult.returnSuccess("停靠成功", save);
     }
 
     private String getRarityType(String name) {
@@ -92,21 +96,40 @@ public class MetaSpatialWharfService {
         return null;
     }
 
-    public MetaRestResult<List<MetaBoatDTO>> queryBoats() {
-        List<Long> parkingBoatIds = metaSpatialWharfRepo.findParkingBoatIds(SecurityUtils.getAuthenticatedUser().getId());
-        List<Asset> assets = assetRepo.findAllBoats("僵尸动物园", Constants.META_NORMAL_STATUS, parkingBoatIds);
-        List<MetaBoatDTO> metaBoatDTOS = new ArrayList<>();
-        try {
-            assets.forEach(asset -> {
-                String rarityType = getRarityType(asset.getName());
-                if (StringUtils.isBlank(rarityType)) {
-                    throw new BusinessException("船只类型查询失败!");
-                }
-                metaBoatDTOS.add(new MetaBoatDTO(asset.getId(), asset.getPic().get(0).getUrl(), rarityType));
-            });
-        } catch (Exception e) {
-            return MetaRestResult.returnError(e.getMessage());
+    public MetaRestResult<List<MetaBoatDTO>> queryBoats(List<String> boatTypes) {
+        if (CollectionUtils.isEmpty(boatTypes)) {
+            return MetaRestResult.returnError("船只类型为空");
         }
+        List<MetaBoatDTO> metaBoatDTOS = new ArrayList<>();
+        boatTypes.forEach(type -> {
+            List<Long> parkingBoatIds = metaSpatialWharfRepo.findParkingBoatIds(SecurityUtils.getAuthenticatedUser().getId());
+            if (CollectionUtils.isEmpty(parkingBoatIds)) {
+                parkingBoatIds = new ArrayList<>();
+                parkingBoatIds.add(0L);
+            }
+            List<Asset> assets = findAllBoatsByType(type, parkingBoatIds);
+            if (CollectionUtils.isNotEmpty(assets)) {
+                assets.forEach(asset -> {
+                    metaBoatDTOS.add(new MetaBoatDTO(asset.getId(), asset.getPic().get(0).getUrl(), type));
+                });
+            }
+        });
         return MetaRestResult.returnSuccess(metaBoatDTOS);
     }
+
+    private List<Asset> findAllBoatsByType(String type, List<Long> parkingBoatIds) {
+        Long id = SecurityUtils.getAuthenticatedUser().getId();
+        switch (type) {
+            case Constants.Rarity.U:
+                return assetRepo.findAllBoats(BOAT_NAME, Constants.META_NORMAL_STATUS, parkingBoatIds, Constants.Rarity.U_LIKE, Constants.Rarity.UR_LIKE, id);
+            case Constants.Rarity.SR:
+                return assetRepo.findAllBoats(BOAT_NAME, Constants.META_NORMAL_STATUS, parkingBoatIds, Constants.Rarity.SR_LIKE, Constants.Rarity.SSR_LIKE, id);
+            case Constants.Rarity.SSR:
+                return assetRepo.findAllBoats(BOAT_NAME, Constants.META_NORMAL_STATUS, parkingBoatIds, Constants.Rarity.SSR_LIKE, Constants.Rarity.U_LIKE, id);
+            case Constants.Rarity.UR:
+                return assetRepo.findAllBoats(BOAT_NAME, Constants.META_NORMAL_STATUS, parkingBoatIds, Constants.Rarity.UR_LIKE, Constants.Rarity.U_LIKE, id);
+            default:
+                return null;
+        }
+    }
 }

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

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

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

@@ -34,7 +34,7 @@ public class MetaTaskToUserService {
 
     private MetaUserTaskProgressRepo metaUserTaskProgressRepo;
 
-    private final String PREFIX = "0 / ";
+    private final String PREFIX = "0/";
 
     public Page<MetaTaskToUser> all(PageQuery pageQuery) {
         return metaTaskToUserRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaTaskToUser.class), JpaUtils.toPageRequest(pageQuery));
@@ -66,6 +66,9 @@ public class MetaTaskToUserService {
         if (Objects.isNull(metaTask.getType())) {
             return MetaRestResult.returnError(String.format("任务[%S]缺少任务类型", metaTaskToUser.getTaskId()));
         }
+        if (Objects.isNull(metaTask.getAwardType())) {
+            return MetaRestResult.returnError(String.format("任务[%S]缺少任务奖励类型", metaTaskToUser.getTaskId()));
+        }
         if (Objects.isNull(metaTask.getDetail())) {
             return MetaRestResult.returnError(String.format("任务[%S]缺少任务详情", metaTaskToUser.getTaskId()));
         }
@@ -81,8 +84,11 @@ public class MetaTaskToUserService {
         metaTaskToUser.setTaskType(metaTask.getType());
         metaTaskToUser.setDetail(metaTask.getDetail());
         metaTaskToUser.setGetTime(LocalDateTime.now());
+        metaTaskToUser.setAwardType(metaTask.getAwardType());
         metaTaskToUser.setStatus(MetaTaskStatus.PROGRESS);
-        return MetaRestResult.returnSuccess(metaTaskToUserRepo.save(metaTaskToUser));
+        MetaTaskToUser save = metaTaskToUserRepo.save(metaTaskToUser);
+        setProgress(save);
+        return MetaRestResult.returnSuccess(save);
     }
 
 
@@ -120,11 +126,11 @@ public class MetaTaskToUserService {
                     metaTaskToUser.setProcess(PREFIX.concat("1"));
                     break;
                 }
-                metaTaskToUser.setProcess(String.valueOf(signInSingleDay.size()).concat(" / 1"));
+                metaTaskToUser.setProcess(String.valueOf(signInSingleDay.size()).concat("/1"));
                 break;
             case SIGN_IN_CONTINUOUS:
                 int num = countSignIn(value, metaTaskToUser.getId());
-                metaTaskToUser.setProcess(String.valueOf(num).concat(" / 7"));
+                metaTaskToUser.setProcess(String.valueOf(num).concat("/7"));
                 break;
             case COLLECT_COLLECTION:
                 if (StringUtils.isBlank(value)) {
@@ -139,7 +145,7 @@ public class MetaTaskToUserService {
                     metaTaskToUser.setProcess(PREFIX.concat(String.valueOf(split.length)));
                     break;
                 }
-                metaTaskToUser.setProcess(String.valueOf(collectCollection.size()).concat(" / ").concat(String.valueOf(split.length)));
+                metaTaskToUser.setProcess(String.valueOf(collectCollection.size()).concat("/").concat(String.valueOf(split.length)));
                 break;
             case ON_LINE_TIME_DAILY:
                 if (StringUtils.isBlank(value)) {
@@ -153,7 +159,7 @@ public class MetaTaskToUserService {
                     metaTaskToUser.setProcess("0");
                     break;
                 }
-                metaTaskToUser.setProcess(onLineTimeDaily.getRemark().concat(" / ").concat(value));
+                metaTaskToUser.setProcess(onLineTimeDaily.getRemark().concat("/").concat(value));
                 break;
             case ACCUMULATE:
                 if (StringUtils.isBlank(value)) {
@@ -167,7 +173,7 @@ public class MetaTaskToUserService {
                     metaTaskToUser.setProcess(PREFIX.concat(value));
                     break;
                 }
-                metaTaskToUser.setProcess(String.valueOf(accumulate.size()).concat(" / ").concat(value));
+                metaTaskToUser.setProcess(String.valueOf(accumulate.size()).concat("/").concat(value));
                 break;
             default:
                 break;

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

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

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

@@ -3,7 +3,6 @@ package com.izouma.nineth.utils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.kevinsawicki.http.HttpRequest;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
 import java.time.Instant;
@@ -17,6 +16,8 @@ public class DateTimeUtils {
     public static final String T_DATE_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
     public static final String DATE_FORMAT        = "yyyy-MM-dd";
 
+    public static final String DATE_FORMAT_YYYY_MM        = "yyyy-MM";
+
     public static LocalDate toLocalDate(long ts) {
         if (String.valueOf(ts).length() > 10) {
             return LocalDate.from(Instant.ofEpochMilli(ts));

src/main/java/com/izouma/nineth/utils/excel/ExcelUtils.java

@@ -39,6 +39,9 @@ public class ExcelUtils<T> {
                 .registerConverter(new RecordTypeConverter())
                 .registerConverter(new MetaPointTypeEnumConverter())
                 .registerConverter(new MetaIsLandTypeEnumConverter())
+                .registerConverter(new MoveTypeConverter())
+                .registerConverter(new MetaAwardTypeEnumConverter())
+                .registerConverter(new MetaPurchaseMethodEnumConverter())
                 .doWrite(data);
     }
 }

src/main/java/com/izouma/nineth/utils/excel/MetaAwardTypeEnumConverter.java

@@ -0,0 +1,42 @@
+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.MetaAwardTypeEnum;
+
+public class MetaAwardTypeEnumConverter implements Converter<MetaAwardTypeEnum> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return MetaAwardTypeEnum.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return null;
+    }
+
+    @Override
+    public MetaAwardTypeEnum convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        try {
+            for (MetaAwardTypeEnum value : MetaAwardTypeEnum.values()) {
+                if (value.getDescription().equals(cellData.getStringValue())) {
+                    return value;
+                }
+            }
+        } catch (Exception ignored) {
+        }
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(MetaAwardTypeEnum value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (value != null) {
+            return new CellData(value.getDescription());
+        }
+        return null;
+    }
+}

src/main/java/com/izouma/nineth/utils/excel/MetaPurchaseMethodEnumConverter.java

@@ -0,0 +1,42 @@
+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.MetaPurchaseMethodEnum;
+
+public class MetaPurchaseMethodEnumConverter implements Converter<MetaPurchaseMethodEnum> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return MetaPurchaseMethodEnum.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return null;
+    }
+
+    @Override
+    public MetaPurchaseMethodEnum convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        try {
+            for (MetaPurchaseMethodEnum value : MetaPurchaseMethodEnum.values()) {
+                if (value.getDescription().equals(cellData.getStringValue())) {
+                    return value;
+                }
+            }
+        } catch (Exception ignored) {
+        }
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(MetaPurchaseMethodEnum value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (value != null) {
+            return new CellData(value.getDescription());
+        }
+        return null;
+    }
+}

src/main/java/com/izouma/nineth/utils/excel/MoveTypeConverter.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.MoveType;
+
+public class MoveTypeConverter implements Converter<MoveType> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return MoveType.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return null;
+    }
+
+    @Override
+    public MoveType convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        try {
+            for (MoveType value : MoveType.values()) {
+                if (value.getDescription().equals(cellData.getStringValue())) {
+                    return value;
+                }
+            }
+        } catch (Exception ignored) {
+        }
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(MoveType value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (value != null) {
+            return new CellData(value.getDescription());
+        }
+        return null;
+    }
+}
+

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

@@ -1,14 +1,10 @@
 package com.izouma.nineth.web;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.annotation.JsonView;
 import com.izouma.nineth.TokenHistory;
 import com.izouma.nineth.domain.Asset;
-import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.GiftOrder;
 import com.izouma.nineth.dto.*;
-import com.izouma.nineth.enums.CollectionSource;
 import com.izouma.nineth.enums.CollectionType;
 import com.izouma.nineth.enums.OperationSource;
 import com.izouma.nineth.exception.BusinessException;
@@ -43,13 +39,13 @@ import java.util.concurrent.ExecutionException;
 @RequestMapping("/asset")
 @AllArgsConstructor
 public class AssetController extends BaseController {
-    private AssetService            assetService;
-    private AssetRepo               assetRepo;
-    private GiftOrderService        giftOrderService;
-    private OrderRepo               orderRepo;
-    private CacheService            cacheService;
+    private AssetService assetService;
+    private AssetRepo assetRepo;
+    private GiftOrderService giftOrderService;
+    private OrderRepo orderRepo;
+    private CacheService cacheService;
     private UserAssetSummaryService userAssetSummaryService;
-    private CollectionRepo          collectionRepo;
+    private CollectionRepo collectionRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
 //    @PostMapping("/save")
@@ -260,36 +256,12 @@ public class AssetController extends BaseController {
     @GetMapping("/topTen")
     @Cacheable(value = "transactionTopTen")
     public List<TransactionTopTenDTO> transactionTopTen() {
-        LocalDateTime localDateTime = LocalDateTime.now().plusDays(-7);
-        List<Map<String, String>> map = orderRepo.transactionTopTen(localDateTime);
-        JSONArray jsonArray = new JSONArray();
-        if (CollectionUtil.isEmpty(map)) {
-            return null;
-        }
-        jsonArray.addAll(map);
-        List<TransactionTopTenDTO> transactionTopTenDTOS = jsonArray.toJavaList(TransactionTopTenDTO.class);
-        if (CollectionUtil.isEmpty(transactionTopTenDTOS)) {
-            return null;
-        }
-        transactionTopTenDTOS.forEach(transactionTopTenDTO -> {
-            if (Objects.nonNull(transactionTopTenDTO.getId())) {
-                if (transactionTopTenDTO.getSource().equals(CollectionSource.OFFICIAL)) {
-                    Collection collection = collectionRepo.findById(transactionTopTenDTO.getId()).orElse(null);
-                    if (Objects.nonNull(collection)) {
-                        transactionTopTenDTO.setPic(collection.getPic());
-                    }
-                }
-                if (transactionTopTenDTO.getSource().equals(CollectionSource.TRANSFER)) {
-                    Asset asset = assetRepo.findById(transactionTopTenDTO.getId()).orElse(null);
-                    if (Objects.nonNull(asset)) {
-                        transactionTopTenDTO.setPic(asset.getPic());
-                    }
-                }
-            }
-            transactionTopTenDTO.setId(null);
-            transactionTopTenDTO.setSource(null);
-        });
-        return transactionTopTenDTOS;
+        return assetService.transactionTopTen();
+    }
+
+    @GetMapping("/queryFu")
+    public List<FuAssetDTO> queryFu() {
+        return assetService.queryFu();
     }
 }
 

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

@@ -3,7 +3,7 @@ package com.izouma.nineth.web;
 import com.izouma.nineth.domain.MetaAccessories;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.enums.EntryModeType;
+import com.izouma.nineth.enums.MetaPurchaseMethodEnum;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.MetaAccessoriesRepo;
 import com.izouma.nineth.service.MetaAccessoriesService;
@@ -35,10 +35,10 @@ public class MetaAccessoriesController extends BaseController {
         if (record.getId() != null) {
             MetaAccessories orig = metaAccessoriesRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
-            if (EntryModeType.GOLD.equals(record.getPurchaseMethod())) {
+            if (MetaPurchaseMethodEnum.GOLD.equals(record.getPurchaseMethod())) {
                 orig.setCollectionName(null);
             }
-            if (EntryModeType.NFT.equals(record.getPurchaseMethod())) {
+            if (MetaPurchaseMethodEnum.NFT.equals(record.getPurchaseMethod())) {
                 orig.setPrice(0);
             }
             return metaAccessoriesRepo.save(orig);
@@ -79,5 +79,10 @@ public class MetaAccessoriesController extends BaseController {
     public MetaRestResult<List<MetaAccessories>> hold(@PathVariable Long userId) {
         return metaAccessoriesService.hold(userId);
     }
+
+    @GetMapping("/findAll")
+    public List<MetaAccessories> findAll() {
+        return metaAccessoriesRepo.findByDel(false);
+    }
 }
 

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

@@ -5,8 +5,6 @@ import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.MetaBoatPositionRepo;
-import com.izouma.nineth.repo.MetaSpatialInfoRepo;
-import com.izouma.nineth.repo.MetaSpatialWharfRepo;
 import com.izouma.nineth.service.MetaBoatPositionService;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
@@ -25,11 +23,6 @@ public class MetaBoatPositionController extends BaseController {
     private MetaBoatPositionService metaBoatPositionService;
     private MetaBoatPositionRepo metaBoatPositionRepo;
 
-    private MetaSpatialInfoRepo metaSpatialInfoRepo;
-
-    private MetaSpatialWharfRepo metaSpatialWharfRepo;
-
-
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public MetaBoatPosition save(@RequestBody MetaBoatPosition record) {

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

@@ -0,0 +1,73 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaEmail;
+import com.izouma.nineth.dto.MetaRestResult;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaEmailRepo;
+import com.izouma.nineth.service.MetaEmailService;
+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;
+
+@RestController
+@RequestMapping("/metaEmail")
+@AllArgsConstructor
+public class MetaEmailController extends BaseController {
+    private MetaEmailService metaEmailService;
+    private MetaEmailRepo metaEmailRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MetaEmail save(@RequestBody MetaEmail record) {
+        if (record.getId() != null) {
+            MetaEmail orig = metaEmailRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return metaEmailRepo.save(orig);
+        }
+        return metaEmailRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaEmail> all(@RequestBody PageQuery pageQuery) {
+        return metaEmailService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public MetaEmail get(@PathVariable Long id) {
+        return metaEmailRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        metaEmailRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaEmail> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @PostMapping("/{id}/publish")
+    public void publish(@PathVariable Long id) {
+        MetaEmail metaEmail = metaEmailRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        metaEmail.setPublish(true);
+        metaEmailRepo.save(metaEmail);
+    }
+
+    @GetMapping("/metaQuery")
+    public MetaRestResult<List<MetaEmail>> metaQuery() {
+        return metaEmailService.metaQuery();
+    }
+}
+

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

@@ -0,0 +1,60 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaEmailRecord;
+import com.izouma.nineth.dto.MetaRestResult;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.MetaEmailRecordRepo;
+import com.izouma.nineth.service.MetaEmailRecordService;
+import com.izouma.nineth.utils.SecurityUtils;
+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("/metaEmailRecord")
+@AllArgsConstructor
+public class MetaEmailRecordController extends BaseController {
+
+    private MetaEmailRecordService metaEmailRecordService;
+    private MetaEmailRecordRepo metaEmailRecordRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaEmailRecord> all(@RequestBody PageQuery pageQuery) {
+        return metaEmailRecordService.all(pageQuery);
+    }
+
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaEmailRecord> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @PostMapping("/{emailId}/readEmail")
+    public MetaRestResult<Void> readEmail(@PathVariable Long emailId) {
+        metaEmailRecordRepo.save(new MetaEmailRecord(SecurityUtils.getAuthenticatedUser().getId(), emailId, false, true));
+        return MetaRestResult.returnSuccess("邮件读取成功！");
+    }
+
+    @PostMapping("/{emailId}/delEmail")
+    public MetaRestResult<Void> delEmail(@PathVariable Long emailId) {
+        Long userId = SecurityUtils.getAuthenticatedUser().getId();
+        MetaEmailRecord metaEmailRecord = metaEmailRecordRepo.findByUserIdAndEmailId(userId, emailId);
+        if (Objects.isNull(metaEmailRecord)) {
+            metaEmailRecordRepo.save(new MetaEmailRecord(userId, emailId, true, true));
+            return MetaRestResult.returnSuccess("邮件删除成功！");
+        }
+        metaEmailRecord.setEmailDel(true);
+        metaEmailRecordRepo.save(metaEmailRecord);
+        return MetaRestResult.returnSuccess("邮件删除成功！");
+    }
+}
+

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

@@ -0,0 +1,70 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaQuestion;
+import com.izouma.nineth.dto.MetaRestResult;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaQuestionRepo;
+import com.izouma.nineth.service.MetaQuestionService;
+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.Collections;
+import java.util.List;
+
+@RestController
+@RequestMapping("/metaQuestion")
+@AllArgsConstructor
+public class MetaQuestionController extends BaseController {
+    private MetaQuestionService metaQuestionService;
+    private MetaQuestionRepo metaQuestionRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MetaQuestion save(@RequestBody MetaQuestion record) {
+        if (record.getId() != null) {
+            MetaQuestion orig = metaQuestionRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return metaQuestionRepo.save(orig);
+        }
+        return metaQuestionRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaQuestion> all(@RequestBody PageQuery pageQuery) {
+        return metaQuestionService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public MetaQuestion get(@PathVariable Long id) {
+        return metaQuestionRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        metaQuestionRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaQuestion> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @GetMapping("/queryByApplication/{application}/{num}")
+    public MetaRestResult<List<MetaQuestion>> queryByApplication(@PathVariable int application, @PathVariable int num) {
+        List<MetaQuestion> metaQuestions = metaQuestionRepo.findAllByApplicationAndDel(application, false);
+        // 乱序
+        Collections.shuffle(metaQuestions);
+        return MetaRestResult.returnSuccess(metaQuestions.subList(0, num));
+    }
+}
+

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

@@ -0,0 +1,78 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaSignAward;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.MetaAwardTypeEnum;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaSignAwardRepo;
+import com.izouma.nineth.service.MetaSignAwardService;
+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("/metaSignAward")
+@AllArgsConstructor
+public class MetaSignAwardController extends BaseController {
+    private MetaSignAwardService metaSignAwardService;
+    private MetaSignAwardRepo metaSignAwardRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MetaSignAward save(@RequestBody MetaSignAward record) {
+        MetaSignAward metaSignAward = metaSignAwardRepo.findByDateAndSignNumAndDel(record.getDate(), record.getSignNum(), false);
+        if (Objects.nonNull(metaSignAward) && !Objects.equals(metaSignAward.getId(), record.getId())) {
+            throw new BusinessException("该日期下累计签到天数的奖励配置已经存在！");
+        }
+        if (record.getId() != null) {
+            MetaSignAward orig = metaSignAwardRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            if (MetaAwardTypeEnum.GOLD.equals(record.getAwardType())) {
+                orig.setAwardPic(null);
+                orig.setMetaAccessoriesId(null);
+            }
+            if (MetaAwardTypeEnum.NFT.equals(record.getAwardType())) {
+                orig.setGoldNum(0);
+                orig.setMetaAccessoriesId(null);
+            }
+            if (MetaAwardTypeEnum.ACCESSORIES.equals(record.getAwardType())) {
+                orig.setGoldNum(0);
+                orig.setAwardPic(null);
+            }
+            return metaSignAwardRepo.save(orig);
+        }
+        return metaSignAwardRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaSignAward> all(@RequestBody PageQuery pageQuery) {
+        return metaSignAwardService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public MetaSignAward get(@PathVariable Long id) {
+        return metaSignAwardRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        metaSignAwardRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaSignAward> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -0,0 +1,41 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaSignAward;
+import com.izouma.nineth.domain.MetaSignAwardDrawRecord;
+import com.izouma.nineth.dto.MetaRestResult;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.service.MetaSignAwardDrawRecordService;
+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;
+
+@RestController
+@RequestMapping("/metaSignAwardDrawRecord")
+@AllArgsConstructor
+public class MetaSignAwardDrawRecordController extends BaseController {
+    private MetaSignAwardDrawRecordService metaSignAwardDrawRecordService;
+
+    @PostMapping("/save")
+    public MetaRestResult<MetaSignAward> save(Long metaSignAwardId) {
+        return metaSignAwardDrawRecordService.save(metaSignAwardId);
+    }
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaSignAwardDrawRecord> all(@RequestBody PageQuery pageQuery) {
+        return metaSignAwardDrawRecordService.all(pageQuery);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaSignAwardDrawRecord> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -0,0 +1,78 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaSign;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.MetaAwardTypeEnum;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaSignRepo;
+import com.izouma.nineth.service.MetaSignService;
+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("/metaSign")
+@AllArgsConstructor
+public class MetaSignController extends BaseController {
+    private MetaSignService metaSignService;
+    private MetaSignRepo metaSignRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MetaSign save(@RequestBody MetaSign record) {
+        MetaSign metaSign = metaSignRepo.findByDateAndDel(record.getDate(), false);
+        if (Objects.nonNull(metaSign) && !Objects.equals(metaSign.getId(), record.getId())) {
+            throw new BusinessException("该月签到规则和每日签到奖励已经配置完成 不可重复配置！");
+        }
+        if (record.getId() != null) {
+            MetaSign orig = metaSignRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            if (MetaAwardTypeEnum.GOLD.equals(record.getAwardType())) {
+                orig.setAwardPic(null);
+                orig.setMetaAccessoriesId(null);
+            }
+            if (MetaAwardTypeEnum.NFT.equals(record.getAwardType())) {
+                orig.setGoldNum(0);
+                orig.setMetaAccessoriesId(null);
+            }
+            if (MetaAwardTypeEnum.ACCESSORIES.equals(record.getAwardType())) {
+                orig.setGoldNum(0);
+                orig.setAwardPic(null);
+            }
+            return metaSignRepo.save(orig);
+        }
+        return metaSignRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaSign> all(@RequestBody PageQuery pageQuery) {
+        return metaSignService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public MetaSign get(@PathVariable Long id) {
+        return metaSignRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        metaSignRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaSign> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -0,0 +1,45 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaSignRecord;
+import com.izouma.nineth.dto.MetaRestResult;
+import com.izouma.nineth.dto.MetaSignProgressDTO;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.service.MetaSignRecordService;
+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;
+
+@RestController
+@RequestMapping("/metaSignRecord")
+@AllArgsConstructor
+public class MetaSignRecordController extends BaseController {
+    private MetaSignRecordService metaSignRecordService;
+
+    @PostMapping("/save")
+    public MetaRestResult<MetaSignRecord> save() {
+        return metaSignRecordService.save();
+    }
+
+    @PostMapping("/all")
+    public Page<MetaSignRecord> all(@RequestBody PageQuery pageQuery) {
+        return metaSignRecordService.all(pageQuery);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaSignRecord> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @GetMapping("/signProgress")
+    public MetaRestResult<MetaSignProgressDTO> signProgress() {
+        return metaSignRecordService.signProgress();
+    }
+}
+

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

@@ -75,8 +75,8 @@ public class MetaSpatialWharfController extends BaseController {
     }
 
     @GetMapping("/queryBoats")
-    public MetaRestResult<List<MetaBoatDTO>> queryBoatsNotParking() {
-        return metaSpatialWharfService.queryBoats();
+    public MetaRestResult<List<MetaBoatDTO>> queryBoatsNotParking(@RequestParam List<String> boatTypes) {
+        return metaSpatialWharfService.queryBoats(boatTypes);
     }
 }
 

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

@@ -0,0 +1,70 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaSwitch;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaSwitchRepo;
+import com.izouma.nineth.service.MetaSwitchService;
+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("/metaSwitch")
+@AllArgsConstructor
+public class MetaSwitchController extends BaseController {
+    private MetaSwitchService metaSwitchService;
+    private MetaSwitchRepo metaSwitchRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MetaSwitch save(@RequestBody MetaSwitch record) {
+        MetaSwitch metaSwitch = metaSwitchRepo.findByNameAndDel(record.getName(), false);
+        if (Objects.nonNull(metaSwitch) && !Objects.equals(metaSwitch.getId(), record.getId())) {
+            throw new BusinessException("该配置名称已经存在！");
+        }
+        if (record.getId() != null) {
+            MetaSwitch orig = metaSwitchRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return metaSwitchRepo.save(orig);
+        }
+        return metaSwitchRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaSwitch> all(@RequestBody PageQuery pageQuery) {
+        return metaSwitchService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public MetaSwitch get(@PathVariable Long id) {
+        return metaSwitchRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        metaSwitchRepo.softDelete(id);
+    }
+
+    @PostMapping("/updateStatus/{id}/{status}")
+    public void updateStatus(@PathVariable Long id, @PathVariable boolean status) {
+        metaSwitchRepo.updateStatus(id, status);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaSwitch> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -3,7 +3,7 @@ package com.izouma.nineth.web;
 import com.izouma.nineth.domain.MetaTask;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.enums.EntryModeType;
+import com.izouma.nineth.enums.MetaAwardTypeEnum;
 import com.izouma.nineth.enums.MetaTaskType;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.CollectionRepo;
@@ -44,10 +44,10 @@ public class MetaTaskController extends BaseController {
         if (record.getId() != null) {
             MetaTask orig = metaTaskRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
-            if (EntryModeType.GOLD.equals(record.getAwardType())) {
+            if (MetaAwardTypeEnum.GOLD.equals(record.getAwardType())) {
                 orig.setAwardPic(null);
             }
-            if (EntryModeType.NFT.equals(record.getAwardType())) {
+            if (MetaAwardTypeEnum.NFT.equals(record.getAwardType())) {
                 orig.setGoldNum(0);
             }
             return metaTaskRepo.save(orig);

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

@@ -0,0 +1,79 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaZouMaLight;
+import com.izouma.nineth.dto.MetaRestResult;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaZouMaLightRepo;
+import com.izouma.nineth.service.MetaZouMaLightService;
+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("/metaZouMaLight")
+@AllArgsConstructor
+public class MetaZouMaLightController extends BaseController {
+
+    private MetaZouMaLightService metaZouMaLightService;
+    private MetaZouMaLightRepo metaZouMaLightRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MetaZouMaLight save(@RequestBody MetaZouMaLight record) {
+        if (record.getId() != null) {
+            MetaZouMaLight orig = metaZouMaLightRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return metaZouMaLightRepo.save(orig);
+        }
+        return metaZouMaLightRepo.save(record);
+    }
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaZouMaLight> all(@RequestBody PageQuery pageQuery) {
+        return metaZouMaLightService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public MetaZouMaLight get(@PathVariable Long id) {
+        return metaZouMaLightRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        metaZouMaLightRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaZouMaLight> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @PostMapping("/{id}/publish")
+    public void publish(@PathVariable Long id) {
+        MetaZouMaLight dbMetaZouMaLight = metaZouMaLightRepo.findByPublishAndDel(true, false);
+        if (Objects.nonNull(dbMetaZouMaLight)) {
+            dbMetaZouMaLight.setPublish(false);
+            metaZouMaLightRepo.save(dbMetaZouMaLight);
+        }
+        MetaZouMaLight metaZouMaLight = metaZouMaLightRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        metaZouMaLight.setPublish(true);
+        metaZouMaLightRepo.save(metaZouMaLight);
+    }
+
+    @GetMapping("/metaQuery")
+    public MetaRestResult<String> metaQuery() {
+        return MetaRestResult.returnSuccess("查询成功！", metaZouMaLightRepo.findDescriptionByPublishAndDel(true, false));
+    }
+}
+

src/main/resources/genjson/MetaSign.json

@@ -0,0 +1 @@
+{"tableName":"MetaSign","className":"MetaSign","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":"yearMouth","modelName":"yearMouth","remark":"日期","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"signRule","modelName":"signRule","remark":"签到规则","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"awardType","modelName":"awardType","remark":"奖励类型","showInList":true,"showInForm":true,"formType":"select","required":true,"apiFlag":"1","optionsValue":"[{\"label\":\"配饰\",\"value\":\"ACCESSORIES\"},{\"label\":\"NFT\",\"value\":\"NFT\"},{\"label\":\"金币\",\"value\":\"GOLD\"}]"},{"name":"metaAccessoriesId","modelName":"metaAccessoriesId","remark":"配饰奖励配饰id","showInList":true,"showInForm":true,"formType":"number","required":true},{"name":"awardPic","modelName":"awardPic","remark":"NFT奖励图片地址","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"goldNum","modelName":"goldNum","remark":"金币奖励数量","showInList":true,"showInForm":true,"formType":"singleLineText","required":true}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.MetaSign"}

src/main/resources/genjson/MetaSignAward.json

@@ -0,0 +1 @@
+{"tableName":"MetaSignAward","className":"MetaSignAward","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":"yearMouth","modelName":"yearMouth","remark":"日期","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"signNum","modelName":"signNum","remark":"累计签到次数","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"awardType","modelName":"awardType","remark":"奖励类型","showInList":true,"showInForm":true,"formType":"select","required":true,"apiFlag":"1","optionsValue":"[{\"label\":\"配饰\",\"value\":\"ACCESSORIES\"},{\"label\":\"NFT\",\"value\":\"NFT\"},{\"label\":\"金币\",\"value\":\"GOLD\"}]"},{"name":"metaAccessoriesId","modelName":"metaAccessoriesId","remark":"配饰","showInList":true,"showInForm":true,"formType":"number","required":false},{"name":"awardPic","modelName":"awardPic","remark":"NFT图片","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"goldNum","modelName":"goldNum","remark":"金币数量","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.MetaSignAward"}

src/main/resources/genjson/MetaSignAwardDrawRecord.json

@@ -0,0 +1 @@
+{"tableName":"MetaSignAwardDrawRecord","className":"MetaSignAwardDrawRecord","remark":"累计签到奖励领取记录","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/xiaohuoban/IdeaProjects/raex_back/src/main/java/com/izouma/nineth","viewPath":"/Users/xiaohuoban/IdeaProjects/raex_back/src/main/vue/src/views","routerPath":"/Users/xiaohuoban/IdeaProjects/raex_back/src/main/vue/src","resourcesPath":"/Users/xiaohuoban/IdeaProjects/raex_back/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"userId","modelName":"userId","remark":"用户id","showInList":true,"showInForm":true,"formType":"number"},{"name":"metaSignAwardId","modelName":"metaSignAwardId","remark":"奖励id","showInList":true,"showInForm":true,"formType":"number"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.MetaSignAwardDrawRecord"}

src/main/resources/genjson/MetaSwitch.json

@@ -0,0 +1 @@
+{"tableName":"MetaSwitch","className":"MetaSwitch","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":"name","modelName":"name","remark":"名称","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"description","modelName":"description","remark":"描述","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"status","modelName":"status","remark":"状态","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.MetaSwitch"}

src/main/vue/src/router.js

@@ -1516,7 +1516,119 @@ const router = new Router({
                     meta: {
                        title: '信息',
                     },
-               }
+               },
+               {
+                    path: '/metaQuestionEdit',
+                    name: 'MetaQuestionEdit',
+                    component: () => import(/* webpackChunkName: "metaQuestionEdit" */ '@/views/MetaQuestionEdit.vue'),
+                    meta: {
+                        title: '元宇宙题库编辑',
+                    },
+                },
+                {
+                    path: '/metaQuestionList',
+                    name: 'MetaQuestionList',
+                    component: () => import(/* webpackChunkName: "metaQuestionList" */ '@/views/MetaQuestionList.vue'),
+                    meta: {
+                        title: '元宇宙题库',
+                    },
+                },
+                {
+                    path: '/metaEmailEdit',
+                    name: 'MetaEmailEdit',
+                    component: () => import(/* webpackChunkName: "metaEmailEdit" */ '@/views/MetaEmailEdit.vue'),
+                    meta: {
+                        title: '元宇宙邮件配置编辑',
+                    },
+                },
+                {
+                    path: '/metaEmailList',
+                    name: 'MetaEmailList',
+                    component: () => import(/* webpackChunkName: "metaEmailList" */ '@/views/MetaEmailList.vue'),
+                    meta: {
+                        title: '元宇宙邮件配置',
+                    },
+                },
+                {
+                    path: '/metaSignRecordList',
+                    name: 'MetaSignRecordList',
+                    component: () => import(/* webpackChunkName: "metaSignRecordList" */ '@/views/MetaSignRecordList.vue'),
+                    meta: {
+                        title: '签到记录',
+                    },
+                },
+                {
+                    path: '/metaSignAwardEdit',
+                    name: 'MetaSignAwardEdit',
+                    component: () => import(/* webpackChunkName: "metaSignAwardEdit" */ '@/views/MetaSignAwardEdit.vue'),
+                    meta: {
+                        title: '累计签到奖励配置编辑',
+                    },
+                },
+                {
+                    path: '/metaSignAwardList',
+                    name: 'MetaSignAwardList',
+                    component: () => import(/* webpackChunkName: "metaSignAwardList" */ '@/views/MetaSignAwardList.vue'),
+                    meta: {
+                        title: '累计签到奖励配置',
+                    },
+                },
+                {
+                    path: '/metaSignEdit',
+                    name: 'MetaSignEdit',
+                    component: () => import(/* webpackChunkName: "metaSignEdit" */ '@/views/MetaSignEdit.vue'),
+                    meta: {
+                        title: '签到管理编辑',
+                    },
+                },
+                {
+                    path: '/metaSignList',
+                    name: 'MetaSignList',
+                    component: () => import(/* webpackChunkName: "metaSignList" */ '@/views/MetaSignList.vue'),
+                    meta: {
+                        title: '签到管理',
+                    },
+                },
+                {
+                    path: '/metaSignAwardDrawRecordList',
+                    name: 'MetaSignAwardDrawRecordList',
+                    component: () => import(/* webpackChunkName: "metaSignAwardDrawRecordList" */ '@/views/MetaSignAwardDrawRecordList.vue'),
+                    meta: {
+                        title: '累计签到奖励领取记录',
+                    },
+                },
+                {
+                    path: '/metaZouMaLightEdit',
+                    name: 'MetaZouMaLightEdit',
+                    component: () => import(/* webpackChunkName: "metaZouMaLightEdit" */ '@/views/MetaZouMaLightEdit.vue'),
+                    meta: {
+                        title: '走马灯编辑',
+                    },
+                },
+                {
+                    path: '/metaZouMaLightList',
+                    name: 'MetaZouMaLightList',
+                    component: () => import(/* webpackChunkName: "metaZouMaLightList" */ '@/views/MetaZouMaLightList.vue'),
+                    meta: {
+                        title: '走马灯',
+                    },
+                },
+                {
+                    path: '/metaSwitchEdit',
+                    name: 'MetaSwitchEdit',
+                    component: () => import(/* webpackChunkName: "metaSwitchEdit" */ '@/views/MetaSwitchEdit.vue'),
+                    meta: {
+                        title: '元宇宙开关配置编辑',
+                    },
+                },
+                {
+                    path: '/metaSwitchList',
+                    name: 'MetaSwitchList',
+                    component: () => import(/* webpackChunkName: "metaSwitchList" */ '@/views/MetaSwitchList.vue'),
+                    meta: {
+                        title: '元宇宙开关配置',
+                    },
+                }
                 /**INSERT_LOCATION**/
             ]
         },

src/main/vue/src/views/MetaBoatPositionEdit.vue

@@ -37,6 +37,19 @@
 						<el-input v-model="formData.boatRot.y" placeholder="请输入旋转值 -> x"> </el-input>
 						<el-input v-model="formData.boatRot.z" placeholder="请输入旋转值 -> x"> </el-input>
 					</el-form-item>
+					<el-form-item prop="boatType" label="可停靠船只类型">
+						<template>
+							<el-select v-model="formData.boatType" multiple clearable filterable placeholder="请选择">
+								<el-option
+									v-for="item in boatTypeOptions"
+									:key="item.value"
+									:label="item.name"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</template>
+					</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">
@@ -82,10 +95,18 @@ export default {
 			},
 			typeOptions: [
 				{ label: '10000m²空间岛', value: 'TEN_THOUSAND' },
-				{ label: '60000m²空间岛', value: 'SIX_THOUSAND' },
-				{ label: '90000m²空间岛', value: 'NINE_THOUSAND' }
+				{ label: '60000m²空间岛', value: 'SIXTY_THOUSAND' },
+				{ label: '90000m²空间岛', value: 'NINETY_THOUSAND' }
 			],
+			boatTypeOptions: [{"name":"UR","value":"UR"},{"name":"SSR","value":"SSR"},{"name":"SR","value":"SR"},{"name":"R","value":"R"},{"name":"U","value":"U"}],
 			rules: {
+				type: [
+					{
+						required: true,
+						message: '请选择岛屿类型',
+						trigger: 'blur'
+					}
+				],
 				isLandId: [
 					{
 						required: true,
@@ -93,6 +114,13 @@ export default {
 						trigger: 'blur'
 					}
 				],
+				boatType: [
+					{
+						required: true,
+						message: '请选择可停靠船只类型',
+						trigger: 'blur'
+					}
+				],
 				boatPos: [
 					{
 						required: true,
@@ -154,7 +182,6 @@ export default {
 		},
 		submit() {
 			let data = { ...this.formData };
-
 			this.saving = true;
 			this.$http
 				.post('/metaBoatPosition/save', data, { body: 'json' })

src/main/vue/src/views/MetaBoatPositionList.vue

@@ -55,6 +55,15 @@
 					{{ 'x=' + row.boatRot.x + ' , ' + 'y=' + row.boatRot.y + ' , ' + 'z=' + row.boatRot.z }}
 				</template>
 			</el-table-column>
+			<el-table-column align="center" prop="boatType" label="可停靠船只类型">
+                <template v-slot="{ row }">
+                    <template v-if="row.boatType">
+                        <div v-for="item in row.boatType">
+                            {{ item }}
+                        </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>
@@ -92,8 +101,8 @@ export default {
 			downloading: false,
 			typeOptions: [
 				{ label: '10000m²空间岛', value: 'TEN_THOUSAND' },
-				{ label: '60000m²空间岛', value: 'SIX_THOUSAND' },
-				{ label: '90000m²空间岛', value: 'NINE_THOUSAND' }
+				{ label: '60000m²空间岛', value: 'SIXTY_THOUSAND' },
+				{ label: '90000m²空间岛', value: 'NINETY_THOUSAND' }
 			]
 		};
 	},

src/main/vue/src/views/MetaEmailEdit.vue

@@ -0,0 +1,139 @@
+<template>
+	<div class="edit-view">
+		<page-title>
+			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
+			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+		</page-title>
+		<div class="edit-view__content-wrapper">
+			<div class="edit-view__content-section">
+				<el-form
+					:model="formData"
+					:rules="rules"
+					ref="form"
+					label-width="80px"
+					label-position="right"
+					size="small"
+					style="max-width: 500px"
+				>
+					<el-form-item prop="title" label="邮件标题">
+						<el-input v-model="formData.title"> </el-input>
+					</el-form-item>
+					<el-form-item prop="author" label="邮件作者">
+						<el-input v-model="formData.author"> </el-input>
+					</el-form-item>
+					<el-form-item prop="description" label="邮件内容" style="width: calc(100vw - 450px)">
+						<el-input
+							v-model="formData.description"
+							type="textarea"
+							:autosize="{ minRows: 3, maxRows: 20 }"
+							placeholder="请输入邮件内容"
+						>
+						</el-input>
+					</el-form-item>
+					<el-form-item class="form-submit">
+						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+							删除
+						</el-button>
+						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+	name: 'MetaEmailEdit',
+	created() {
+		if (this.$route.query.id) {
+			this.$http
+				.get('metaEmail/get/' + this.$route.query.id)
+				.then(res => {
+					this.formData = res;
+				})
+				.catch(e => {
+					console.log(e);
+					this.$message.error(e.error);
+				});
+		}
+	},
+	data() {
+		return {
+			saving: false,
+			formData: {},
+			rules: {
+				title: [
+					{
+						required: true,
+						message: '请输入邮件标题',
+						trigger: 'blur'
+					}
+				],
+				author: [
+					{
+						required: true,
+						message: '请输入邮件作者',
+						trigger: 'blur'
+					}
+				],
+				description: [
+					{
+						required: true,
+						message: '请输入邮件内容',
+						trigger: 'blur'
+					}
+				]
+			}
+		};
+	},
+	methods: {
+		onSave() {
+			this.$refs.form.validate(valid => {
+				if (valid) {
+					this.submit();
+				} else {
+					return false;
+				}
+			});
+		},
+		submit() {
+			let data = { ...this.formData };
+
+			this.saving = true;
+			this.$http
+				.post('/metaEmail/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(`/metaEmail/del/${this.formData.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						console.log(e);
+						this.$message.error((e || {}).error || '删除失败');
+					}
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaEmailList.vue

@@ -0,0 +1,187 @@
+<template>
+	<div class="list-view">
+		<page-title>
+			<el-button
+				@click="addRow"
+				type="primary"
+				icon="el-icon-plus"
+				:disabled="fetchingData || downloading"
+				class="filter-item"
+			>
+				新增
+			</el-button>
+			<el-button
+				@click="download"
+				icon="el-icon-upload2"
+				:loading="downloading"
+				:disabled="fetchingData"
+				class="filter-item"
+			>
+				导出
+			</el-button>
+		</page-title>
+		<div class="filters-container">
+			<el-input
+				placeholder="搜索..."
+				v-model="search"
+				clearable
+				class="filter-item search"
+				@keyup.enter.native="getData"
+			>
+				<el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+			</el-input>
+		</div>
+		<el-table
+			:data="tableData"
+			row-key="id"
+			ref="table"
+			header-row-class-name="table-header-row"
+			header-cell-class-name="table-header-cell"
+			row-class-name="table-row"
+			cell-class-name="table-cell"
+			:height="tableHeight"
+			v-loading="fetchingData"
+		>
+			<el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+			<el-table-column prop="id" align="center" label="ID" width="100"> </el-table-column>
+			<el-table-column prop="title" align="center" label="邮件标题" width="200"> </el-table-column>
+			<el-table-column prop="author" align="center" label="邮件作者" width="100"> </el-table-column>
+			<el-table-column prop="description" align="center" label="邮件内容"> </el-table-column>
+            <el-table-column prop="publish" align="center" label="是否发布" width="80">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>
+                </template>
+            </el-table-column>
+			<el-table-column label="操作" align="center" fixed="right" width="300">
+				<template slot-scope="{ row }">
+					<el-button @click="publish(row)" type="primary" size="mini" plain v-if="row && !row.publish"> 发布 </el-button>
+					<el-button @click="editRow(row)" type="primary" size="mini" plain v-if="row && !row.publish">
+						编辑
+					</el-button>					
+					<el-button @click="deleteRow(row)" type="danger" size="mini" plain v-if="row && !row.publish">
+						删除
+					</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>
+	</div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+	name: 'MetaEmailList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/metaEmail/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: '/metaEmailEdit',
+				query: {
+					...this.$route.query
+				}
+			});
+		},
+		editRow(row) {
+			this.$router.push({
+				path: '/metaEmailEdit',
+				query: {
+					id: row.id
+				}
+			});
+		},
+		download() {
+			this.downloading = true;
+			this.$axios
+				.get('/metaEmail/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);
+				});
+		},
+		deleteRow(row) {
+			this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+				.then(() => {
+					return this.$http.post(`/metaEmail/del/${row.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.getData();
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						this.$message.error(e.error);
+					}
+				});
+		},
+		publish(row) {
+			this.$alert('邮件发布之后不能编辑和删除，请确定是否发布邮件！', '提示', { type: 'info' })
+				.then(() => {
+					return this.$http.post(`/metaEmail/${row.id}/publish`);
+				})
+				.then(() => {
+					this.$message.success('发布成功');
+					this.getData();
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						this.$message.error(e.error);
+					}
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaQuestionEdit.vue

@@ -0,0 +1,209 @@
+<template>
+	<div class="edit-view">
+		<page-title>
+			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
+			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+		</page-title>
+		<div class="edit-view__content-wrapper">
+			<div class="edit-view__content-section">
+				<el-form
+					:model="formData"
+					:rules="rules"
+					ref="form"
+					label-width="80px"
+					label-position="right"
+					size="small"
+					style="max-width: 500px"
+				>
+                <el-form-item prop="title" label="题目标题" style="width: calc(100vw - 450px)">
+                        <el-input
+                            v-model="formData.title"
+                            type="textarea"
+                            :autosize="{ minRows: 3, maxRows: 20 }"
+                            placeholder="请输入题目标题"
+                        >
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item prop="description" label="题目描述" style="width: calc(100vw - 450px)">
+                        <el-input
+                            v-model="formData.description"
+                            type="textarea"
+                            :autosize="{ minRows: 3, maxRows: 20 }"
+                            placeholder="请输入题目描述"
+                        >
+                        </el-input>
+                    </el-form-item>
+					<el-form-item prop="optionA" label="选项A">
+						<el-input v-model="formData.optionA"> </el-input>
+					</el-form-item>
+					<el-form-item prop="optionB" label="选项B">
+						<el-input v-model="formData.optionB"> </el-input>
+					</el-form-item>
+					<el-form-item prop="optionC" label="选项C">
+						<el-input v-model="formData.optionC"> </el-input>
+					</el-form-item>
+					<el-form-item prop="optionD" label="选项D">
+						<el-input v-model="formData.optionD"> </el-input>
+					</el-form-item>
+					<el-form-item prop="correct" label="正确选项">
+						<el-select v-model="formData.correct" clearable filterable placeholder="请选择">
+							<el-option
+								v-for="item in correctOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+                    <el-form-item prop="application" label="用途">
+                        <el-input-number type="application" v-model="formData.application"> </el-input-number>
+                    </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: 'MetaQuestionEdit',
+	created() {
+		if (this.$route.query.id) {
+			this.$http
+				.get('metaQuestion/get/' + this.$route.query.id)
+				.then(res => {
+					this.formData = res;
+				})
+				.catch(e => {
+					console.log(e);
+					this.$message.error(e.error);
+				});
+		}
+	},
+	data() {
+		return {
+			saving: false,
+			formData: {},
+			rules: {
+                title: [
+                    {
+                        required: true,
+                        message: '请输入题目标题',
+                        trigger: 'blur'
+                    }
+                ],
+                description: [
+                    {
+                        required: true,
+                        message: '请输入题目描述',
+                        trigger: 'blur'
+                    }
+                ],
+                optionA: [
+                    {
+                        required: true,
+                        message: '请输入选项A',
+                        trigger: 'blur'
+                    }
+                ],
+                optionB: [
+                    {
+                        required: true,
+                        message: '请输入选项B',
+                        trigger: 'blur'
+                    }
+                ],
+                optionC: [
+                    {
+                        required: true,
+                        message: '请输入选项C',
+                        trigger: 'blur'
+                    }
+                ],
+                optionD: [
+                    {
+                        required: true,
+                        message: '请输入选项D',
+                        trigger: 'blur'
+                    }
+                ],
+                correct: [
+                    {
+                        required: true,
+                        message: '请输入正确选项',
+                        trigger: 'blur'
+                    }
+                ],
+                application: [
+                    {
+                        required: true,
+                        message: '请输入用途',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+			correctOptions: [
+				{ label: 'A', value: 0 },
+				{ label: 'B', value: 1 },
+				{ label: 'C', value: 2 },
+				{ label: 'D', value: 3 }
+			]
+		};
+	},
+	methods: {
+		onSave() {
+			this.$refs.form.validate(valid => {
+				if (valid) {
+					this.submit();
+				} else {
+					return false;
+				}
+			});
+		},
+		submit() {
+			let data = { ...this.formData };
+
+			this.saving = true;
+			this.$http
+				.post('/metaQuestion/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(`/metaQuestion/del/${this.formData.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						console.log(e);
+						this.$message.error((e || {}).error || '删除失败');
+					}
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaQuestionList.vue

@@ -0,0 +1,197 @@
+<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="title" label="题目标签"> </el-table-column>
+			<el-table-column prop="description" label="题目描述"> </el-table-column>
+			<el-table-column prop="optionA" label="选项A"> </el-table-column>
+			<el-table-column prop="optionB" label="选项B"> </el-table-column>
+			<el-table-column prop="optionC" label="选项C"> </el-table-column>
+			<el-table-column prop="optionD" label="选项D"> </el-table-column>
+			<el-table-column prop="correct" label="正确选项" :formatter="correctFormatter"> </el-table-column>
+			<el-table-column prop="application" label="用途"> </el-table-column>
+			<el-table-column label="操作" align="center" fixed="right" width="150">
+				<template slot-scope="{ row }">
+					<el-button @click="editRow(row)" type="primary" size="mini" plain> 编辑 </el-button>
+					<el-button @click="deleteRow(row)" type="danger" size="mini" plain> 删除 </el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<div class="pagination-wrapper">
+			<!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)"> 批量编辑 </el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1"> 批量操作1 </el-button>
+                    <el-button @click="operation2"> 批量操作2 </el-button>
+                    <el-button @click="toggleMultipleMode(false)"> 取消 </el-button>
+                </el-button-group>
+            </div> -->
+			<el-pagination
+				background
+				@size-change="onSizeChange"
+				@current-change="onCurrentChange"
+				:current-page="page"
+				:page-sizes="[10, 20, 30, 40, 50]"
+				:page-size="pageSize"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="totalElements"
+			>
+			</el-pagination>
+		</div>
+	</div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+	name: 'MetaQuestionList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/metaQuestion/all',
+			downloading: false,
+            correctOptions: [
+                { label: 'A', value: 0 },
+                { label: 'B', value: 1 },
+                { label: 'C', value: 2 },
+                { label: 'D', value: 3 }
+            ]
+		};
+	},
+	computed: {
+		selection() {
+			return this.$refs.table.selection.map(i => i.id);
+		}
+	},
+	methods: {
+        correctFormatter(row, column, cellValue, index) {
+			let selectedOption = this.correctOptions.find(i => i.value === cellValue);
+			if (selectedOption) {
+				return selectedOption.label;
+			}
+			return '';
+		},
+		beforeGetData() {
+			return { search: this.search, query: { del: false } };
+		},
+		toggleMultipleMode(multipleMode) {
+			this.multipleMode = multipleMode;
+			if (!multipleMode) {
+				this.$refs.table.clearSelection();
+			}
+		},
+		addRow() {
+			this.$router.push({
+				path: '/metaQuestionEdit',
+				query: {
+					...this.$route.query
+				}
+			});
+		},
+		editRow(row) {
+			this.$router.push({
+				path: '/metaQuestionEdit',
+				query: {
+					id: row.id
+				}
+			});
+		},
+		download() {
+			this.downloading = true;
+			this.$axios
+				.get('/metaQuestion/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(`/metaQuestion/del/${row.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.getData();
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						this.$message.error(e.error);
+					}
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaSignAwardDrawRecordList.vue

@@ -0,0 +1,115 @@
+<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="用户id"> </el-table-column>
+			<el-table-column prop="metaSignAwardId" align="center" label="奖励id"> </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: 'MetaSignAwardDrawRecordList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/metaSignAwardDrawRecord/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();
+			}
+		},
+		download() {
+			this.downloading = true;
+			this.$axios
+				.get('/metaSignAwardDrawRecord/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);
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaSignAwardEdit.vue

@@ -0,0 +1,239 @@
+<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="108px"
+					label-position="right"
+					size="small"
+					style="max-width: 500px"
+				>
+					<el-form-item prop="date" label="日期">
+						<el-date-picker v-model="formData.date" value-format="yyyy-MM" type="month" placeholder="选择月">
+						</el-date-picker>
+					</el-form-item>
+					<el-form-item prop="signNum" label="累计签到天数">
+						<el-input-number v-model="formData.signNum" :step="1" :min="1"> </el-input-number>
+						<div class="tip">输入规则：正整数，最小为1</div>
+					</el-form-item>
+					<el-form-item prop="awardType" label="奖励类型">
+						<el-select
+							v-model="formData.awardType"
+							clearable
+							filterable
+							placeholder="请选择"
+							@change="changeAwardType()"
+						>
+							<el-option
+								v-for="item in awardTypeOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item
+						prop="metaAccessoriesId"
+						label="配饰"
+						v-if="formData.awardType && formData.awardType === 'ACCESSORIES'"
+					>
+						<el-select
+							v-model="formData.metaAccessoriesId"
+							placeholder="请选择"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="item in metaAccessories"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item
+						prop="awardPic"
+						label="NFT图片"
+						v-if="formData.awardType && formData.awardType === 'NFT'"
+					>
+						<single-upload v-model="formData.awardPic"> </single-upload>
+					</el-form-item>
+					<el-form-item
+						prop="goldNum"
+						label="金币数量"
+						v-if="formData.awardType && formData.awardType === 'GOLD'"
+					>
+						<el-input-number v-model="formData.goldNum" :step="1" :min="1"> </el-input-number>
+						<div class="tip">输入规则：正整数，最小为1</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: 'MetaSignAwardEdit',
+	created() {
+		if (this.$route.query.id) {
+			this.$http
+				.get('metaSignAward/get/' + this.$route.query.id)
+				.then(res => {
+					this.formData = res;
+				})
+				.catch(e => {
+					console.log(e);
+					this.$message.error(e.error);
+				});
+		}
+		this.$http.get('/metaAccessories/findAll').then(res => {
+			this.metaAccessories = res;
+		});
+	},
+	data() {
+		return {
+			metaAccessories: [],
+			saving: false,
+			reg: /^[1-9]\d*$/,
+			formData: {},
+			rules: {
+				date: [
+					{
+						required: true,
+						message: '请输入日期',
+						trigger: 'blur'
+					}
+				],
+				signNum: [
+					{
+						required: true,
+						message: '请输入累计签到天数',
+						trigger: 'blur'
+					},
+					{
+						validator: (rule, value, callback) => {
+							if (!this.reg.test(value)) {
+								callback(new Error('累计签到天数必须为大于1的整数'));
+								return;
+							} else {
+								callback();
+							}
+						}
+					}
+				],
+				awardType: [
+					{
+						required: true,
+						message: '请输入奖励类型',
+						trigger: 'blur'
+					}
+				],
+				metaAccessoriesId: [
+					{
+						required: true,
+						message: '请选择配饰',
+						trigger: 'blur'
+					}
+				],
+				awardPic: [
+					{
+						required: true,
+						message: '请上传NFT图片',
+						trigger: 'blur'
+					}
+				],
+				goldNum: [
+					{
+						required: true,
+						message: '请输入金币数量',
+						trigger: 'blur'
+					},
+					{
+						validator: (rule, value, callback) => {
+							if (!this.reg.test(value)) {
+								callback(new Error('金币数量必须为大于1的整数'));
+								return;
+							} else {
+								callback();
+							}
+						}
+					}
+				]
+			},
+			awardTypeOptions: [
+				{ label: '配饰', value: 'ACCESSORIES' },
+				{ label: 'NFT', value: 'NFT' },
+				{ label: '金币', value: 'GOLD' }
+			]
+		};
+	},
+	methods: {
+		changeAwardType() {
+			this.$delete(this.formData, 'metaAccessoriesId');
+			this.$delete(this.formData, 'awardPic');
+			this.$delete(this.formData, 'goldNum');
+		},
+		onSave() {
+			this.$refs.form.validate(valid => {
+				if (valid) {
+					this.submit();
+				} else {
+					return false;
+				}
+			});
+		},
+		submit() {
+			let data = { ...this.formData };
+
+			this.saving = true;
+			this.$http
+				.post('/metaSignAward/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(`/metaSignAward/del/${this.formData.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						console.log(e);
+						this.$message.error((e || {}).error || '删除失败');
+					}
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaSignAwardList.vue

@@ -0,0 +1,198 @@
+<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" align="center" label="ID" width="100"> </el-table-column>
+			<el-table-column prop="date" align="center" label="日期"> </el-table-column>
+			<el-table-column prop="signNum" align="center" label="累计签到次数"> </el-table-column>
+			<el-table-column prop="awardType" align="center" label="奖励类型" :formatter="awardTypeFormatter">
+			</el-table-column>
+			<el-table-column prop="metaAccessoriesId" align="center" label="配饰"> </el-table-column>
+			<el-table-column prop="awardPic" align="center" label="NFT图片">
+				<template slot-scope="{ row }">
+					<template v-if="row.awardType && row.awardType === 'NFT'">
+						<el-image
+							style="width: 30px; height: 30px"
+							:src="row.awardPic"
+							fit="cover"
+							:preview-src-list="[row.awardPic]"
+						>
+						</el-image>
+					</template>
+					<template v-else> {{ }} </template>
+				</template>
+			</el-table-column>
+			<el-table-column prop="goldNum" align="center" label="金币数量">
+				<template v-slot="{ row }">
+					<template v-if="row.awardType && row.awardType === 'GOLD'">
+						{{ row.goldNum }}
+					</template>
+					<template v-else> {{ }} </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">
+			<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: 'MetaSignAwardList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/metaSignAward/all',
+			downloading: false,
+			awardTypeOptions: [
+				{ label: '配饰', value: 'ACCESSORIES' },
+				{ label: 'NFT', value: 'NFT' },
+				{ label: '金币', value: 'GOLD' }
+			]
+		};
+	},
+	computed: {
+		selection() {
+			return this.$refs.table.selection.map(i => i.id);
+		}
+	},
+	methods: {
+		awardTypeFormatter(row, column, cellValue, index) {
+			let selectedOption = this.awardTypeOptions.find(i => i.value === cellValue);
+			if (selectedOption) {
+				return selectedOption.label;
+			}
+			return '';
+		},
+		beforeGetData() {
+			return { search: this.search, query: { del: false } };
+		},
+		toggleMultipleMode(multipleMode) {
+			this.multipleMode = multipleMode;
+			if (!multipleMode) {
+				this.$refs.table.clearSelection();
+			}
+		},
+		addRow() {
+			this.$router.push({
+				path: '/metaSignAwardEdit',
+				query: {
+					...this.$route.query
+				}
+			});
+		},
+		editRow(row) {
+			this.$router.push({
+				path: '/metaSignAwardEdit',
+				query: {
+					id: row.id
+				}
+			});
+		},
+		download() {
+			this.downloading = true;
+			this.$axios
+				.get('/metaSignAward/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);
+				});
+		},
+		deleteRow(row) {
+			this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+				.then(() => {
+					return this.$http.post(`/metaSignAward/del/${row.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.getData();
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						this.$message.error(e.error);
+					}
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaSignEdit.vue

@@ -0,0 +1,235 @@
+<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="135px"
+					label-position="right"
+					size="small"
+					style="max-width: 500px"
+				>
+					<el-form-item prop="date" label="日期">
+						<el-date-picker
+							v-model="formData.date"
+							value-format="yyyy-MM"
+							type="month"
+							placeholder="选择月"
+						>
+						</el-date-picker>
+					</el-form-item>
+                    <el-form-item prop="signRule" label="规则详情" style="width: calc(100vw - 450px)">
+                        <el-input
+                            v-model="formData.signRule"
+                            type="textarea"
+                            :autosize="{ minRows: 3, maxRows: 20 }"
+                            placeholder="请输入规则详情"
+                        >
+                        </el-input>
+                    </el-form-item>
+					<el-form-item prop="awardType" label="每日签到奖励类型">
+						<el-select
+							v-model="formData.awardType"
+							clearable
+							filterable
+							placeholder="请选择"
+							@change="changeAwardType()"
+						>
+							<el-option
+								v-for="item in awardTypeOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item
+						prop="metaAccessoriesId"
+						label="配饰"
+						v-if="formData.awardType && formData.awardType === 'ACCESSORIES'"
+					>
+						<el-select v-model="formData.metaAccessoriesId" placeholder="请选择" style="width: 100%">
+							<el-option
+								v-for="item in metaAccessories"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item
+						prop="awardPic"
+						label="NFT图片"
+						v-if="formData.awardType && formData.awardType === 'NFT'"
+					>
+						<single-upload v-model="formData.awardPic"> </single-upload>
+					</el-form-item>
+					<el-form-item
+						prop="goldNum"
+						label="金币数量"
+						v-if="formData.awardType && formData.awardType === 'GOLD'"
+					>
+						<el-input-number v-model="formData.goldNum" :step="1" :min="1"> </el-input-number>
+						<div class="tip">输入规则：正整数，最小为1</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: 'MetaSignEdit',
+	created() {
+		if (this.$route.query.id) {
+			this.$http
+				.get('metaSign/get/' + this.$route.query.id)
+				.then(res => {
+					this.formData = res;
+				})
+				.catch(e => {
+					console.log(e);
+					this.$message.error(e.error);
+				});
+		}
+		this.$http.get('/metaAccessories/findAll').then(res => {
+			this.metaAccessories = res;
+		});
+	},
+	data() {
+		return {
+			metaAccessories: [],
+			saving: false,
+			reg: /^[1-9]\d*$/,
+			formData: {},
+			rules: {
+				date: [
+					{
+						required: true,
+						message: '请输入日期',
+						trigger: 'blur'
+					}
+				],
+				signRule: [
+					{
+						required: true,
+						message: '请输入日期',
+						trigger: 'blur'
+					}
+				],
+				awardType: [
+					{
+						required: true,
+						message: '请输入奖励类型',
+						trigger: 'blur'
+					}
+				],
+				metaAccessoriesId: [
+					{
+						required: true,
+						message: '请选择配饰',
+						trigger: 'blur'
+					}
+				],
+				awardPic: [
+					{
+						required: true,
+						message: '请上传NFT图片',
+						trigger: 'blur'
+					}
+				],
+				goldNum: [
+					{
+						required: true,
+						message: '请输入金币数量',
+						trigger: 'blur'
+					},
+					{
+						validator: (rule, value, callback) => {
+							if (!this.reg.test(value)) {
+								callback(new Error('金币数量必须为大于1的整数'));
+								return;
+							} else {
+								callback();
+							}
+						}
+					}
+				]
+			},
+			awardTypeOptions: [
+				{ label: '配饰', value: 'ACCESSORIES' },
+				{ label: 'NFT', value: 'NFT' },
+				{ label: '金币', value: 'GOLD' }
+			]
+		};
+	},
+	methods: {
+		changeAwardType() {
+			this.$delete(this.formData, 'metaAccessoriesId');
+			this.$delete(this.formData, 'awardPic');
+			this.$delete(this.formData, 'goldNum');
+		},
+		onSave() {
+			this.$refs.form.validate(valid => {
+				if (valid) {
+					this.submit();
+				} else {
+					return false;
+				}
+			});
+		},
+		submit() {
+			let data = { ...this.formData };
+
+			this.saving = true;
+			this.$http
+				.post('/metaSign/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(`/metaSign/del/${this.formData.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						console.log(e);
+						this.$message.error((e || {}).error || '删除失败');
+					}
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaSignList.vue

@@ -0,0 +1,198 @@
+<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" align="center" label="ID" width="100"> </el-table-column>
+			<el-table-column prop="date" align="center" label="日期"> </el-table-column>
+            <el-table-column prop="signRule" align="center" label="规则详情"> </el-table-column>
+			<el-table-column prop="awardType" align="center" label="每日签到奖励类型" :formatter="awardTypeFormatter">
+			</el-table-column>
+			<el-table-column prop="metaAccessoriesId" align="center" label="配饰"> </el-table-column>
+			<el-table-column prop="awardPic" align="center" label="NFT图片">
+				<template slot-scope="{ row }">
+					<template v-if="row.awardType && row.awardType === 'NFT'">
+						<el-image
+							style="width: 30px; height: 30px"
+							:src="row.awardPic"
+							fit="cover"
+							:preview-src-list="[row.awardPic]"
+						>
+						</el-image>
+					</template>
+					<template v-else> {{ }} </template>
+				</template>
+			</el-table-column>
+			<el-table-column prop="goldNum" align="center" label="金币数量">
+				<template v-slot="{ row }">
+					<template v-if="row.awardType && row.awardType === 'GOLD'">
+						{{ row.goldNum }}
+					</template>
+					<template v-else> {{ }} </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">
+			<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: 'MetaSignList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/metaSign/all',
+			downloading: false,
+			awardTypeOptions: [
+				{ label: '配饰', value: 'ACCESSORIES' },
+				{ label: 'NFT', value: 'NFT' },
+				{ label: '金币', value: 'GOLD' }
+			]
+		};
+	},
+	computed: {
+		selection() {
+			return this.$refs.table.selection.map(i => i.id);
+		}
+	},
+	methods: {
+		awardTypeFormatter(row, column, cellValue, index) {
+			let selectedOption = this.awardTypeOptions.find(i => i.value === cellValue);
+			if (selectedOption) {
+				return selectedOption.label;
+			}
+			return '';
+		},
+		beforeGetData() {
+			return { search: this.search, query: { del: false } };
+		},
+		toggleMultipleMode(multipleMode) {
+			this.multipleMode = multipleMode;
+			if (!multipleMode) {
+				this.$refs.table.clearSelection();
+			}
+		},
+		addRow() {
+			this.$router.push({
+				path: '/metaSignEdit',
+				query: {
+					...this.$route.query
+				}
+			});
+		},
+		editRow(row) {
+			this.$router.push({
+				path: '/metaSignEdit',
+				query: {
+					id: row.id
+				}
+			});
+		},
+		download() {
+			this.downloading = true;
+			this.$axios
+				.get('/metaSign/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);
+				});
+		},
+		deleteRow(row) {
+			this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+				.then(() => {
+					return this.$http.post(`/metaSign/del/${row.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.getData();
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						this.$message.error(e.error);
+					}
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaSignRecordList.vue

@@ -0,0 +1,115 @@
+<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="用户id"> </el-table-column>
+			<el-table-column prop="signTime" align="center" label="签到时间"> </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: 'MetaSignRecordList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/metaSignRecord/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();
+			}
+		},
+		download() {
+			this.downloading = true;
+			this.$axios
+				.get('/metaSignRecord/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>
+
+</style>

src/main/vue/src/views/MetaSpatialWharfList.vue

@@ -34,8 +34,8 @@
             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="isLandId" align="center" label="岛屿ID"> </el-table-column>
+            <el-table-column prop="metaBoatPositionId" align="center" label="船位ID"> </el-table-column>            
             <el-table-column prop="boatId" align="center" label="船只ID"> </el-table-column>
 			<el-table-column prop="userId" align="center" label="所属用户"> </el-table-column>
             <el-table-column prop="boatImg" align="center" label="船只图片">
@@ -51,16 +51,6 @@
             </el-table-column>
             <el-table-column prop="boatType" align="center" label="船只类型">
             </el-table-column>
-            <el-table-column prop="boatPos" align="center" label="位置信息">
-                <template slot-scope="{ row }">
-                    {{ 'x=' + row.boatPos.x + ' , ' + 'y=' + row.boatPos.y + ' , ' + 'z=' + row.boatPos.z }}
-                </template>
-            </el-table-column>
-            <el-table-column prop="boatRot" align="center" label="旋转值">
-                <template slot-scope="{ row }">
-                    {{ 'x=' + row.boatRot.x + ' , ' + 'y=' + row.boatRot.y + ' , ' + 'z=' + row.boatRot.z }}
-                </template>
-            </el-table-column>
         </el-table>
         <div class="pagination-wrapper">
             <el-pagination

src/main/vue/src/views/MetaSwitchEdit.vue

@@ -0,0 +1,128 @@
+<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="52px"
+					label-position="right"
+					size="small"
+					style="max-width: 500px"
+				>
+					<el-form-item prop="name" label="名称">
+						<el-input v-model="formData.name" :disabled="!canEdit"> </el-input>
+					</el-form-item>
+					<el-form-item prop="description" label="描述">
+						<el-input v-model="formData.description"> </el-input>
+					</el-form-item>
+					<el-form-item class="form-submit">
+						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+							删除
+						</el-button>
+						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+	name: 'MetaSwitchEdit',
+	created() {
+		if (this.$route.query.id) {
+			this.$http
+				.get('metaSwitch/get/' + this.$route.query.id)
+				.then(res => {
+					this.formData = res;
+				})
+				.catch(e => {
+					console.log(e);
+					this.$message.error(e.error);
+				});
+		}
+	},
+	computed: {
+		canEdit() {
+			return !!!this.$route.query.id;
+		}
+	},
+	data() {
+		return {
+			saving: false,
+			formData: {},
+			rules: {
+				name: [
+					{
+						required: true,
+						message: '请输入名称',
+						trigger: 'blur'
+					}
+				],
+				description: [
+					{
+						required: true,
+						message: '请输入描述',
+						trigger: 'blur'
+					}
+				]
+			}
+		};
+	},
+	methods: {
+		onSave() {
+			this.$refs.form.validate(valid => {
+				if (valid) {
+					this.submit();
+				} else {
+					return false;
+				}
+			});
+		},
+		submit() {
+			let data = { ...this.formData };
+
+			this.saving = true;
+			this.$http
+				.post('/metaSwitch/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(`/metaSwitch/del/${this.formData.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						console.log(e);
+						this.$message.error((e || {}).error || '删除失败');
+					}
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaSwitchList.vue

@@ -0,0 +1,255 @@
+<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" align="center" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="name" align="center" label="名称" width="250"> </el-table-column>
+            <el-table-column prop="description" align="center" label="描述"> </el-table-column>
+            <el-table-column prop="status" align="center" label="状态" width="100">
+                <template v-slot="{ row }">
+                    <template>
+                        {{ row.status ? '开' : '关' }}
+                    </template>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="300">
+                <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>
+                    <el-button
+                        @click="updateStatus(row, true)"
+                        type="primary"
+                        size="mini"
+                        plain
+                        v-if="row && !row.status"
+                    >
+                        开
+                    </el-button>
+                    <el-button
+                        @click="updateStatus(row, false)"
+                        type="danger"
+                        size="mini"
+                        plain
+                        v-if="row && row.status"
+                    >
+                        关
+                    </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>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'MetaSwitchList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            timer: null,
+            websock: null,
+            multipleMode: false,
+            search: '',
+            url: '/metaSwitch/all',
+            downloading: false
+        };
+    },
+    created() {
+        this.initWebSocket();
+    },
+    destroyed() {
+        window.clearInterval(this.timer);
+        this.websock.close(); //离开路由之后断开websocket连接
+    },
+    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: '/metaSwitchEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/metaSwitchEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/metaSwitch/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);
+                });
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metaSwitch/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        updateStatus(row, status) {
+            this.$alert(status ? '确定要打开此开关吗？' : '确定要关闭此开关吗？', status ? '提示' : '警告', {
+                type: status ? 'info' : 'error'
+            })
+                .then(() => {
+                    this.$http.post(`/metaSwitch/updateStatus/${row.id}/${status}`);
+                    this.websocketsend(
+                        status
+                            ? JSON.stringify({ type: row.name + '_OPEN' })
+                            : JSON.stringify({ type: row.name + '_CLOSE' })
+                    );
+                    return;
+                })
+                .then(() => {
+                    this.$message.success('操作成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        initWebSocket() {
+            let wsuri = 'ws://127.0.0.1:8088/websocket/1';
+            if (location.host === 'raex.vip') {
+                wsuri = 'wss://mmo.raex.vip/websocket/1';
+            }
+            if (location.host === 'test.raex.vip') {
+                wsuri = 'wss://test.mmo.raex.vip/websocket/1';
+            }
+            console.log('初始化websocket' + wsuri);
+            this.websock = new WebSocket(wsuri);
+            this.websock.onmessage = this.websocketonmessage;
+            this.websock.onopen = this.websocketonopen;
+            this.websock.onerror = this.websocketonerror;
+            this.websock.onclose = this.websocketclose;
+        },
+        websocketonopen() {
+            this.websocketsend('META_PING');
+            this.timer = window.setInterval(() => {
+                setTimeout(() => {
+                    this.websocketsend('META_PING');
+                }, 0);
+            }, 10000);
+        },
+        websocketonerror() {
+            console.log('连接建立失败重连');
+            this.initWebSocket();
+        },
+        websocketonmessage(e) {
+            console.log('数据接收' + e.data);
+        },
+        websocketsend(Data) {
+            console.log('数据发送' + Data);
+            this.websock.send(Data);
+        },
+        websocketclose(e) {
+            console.log('断开连接', e);
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaTaskEdit.vue

@@ -1,273 +1,277 @@
 <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="130px"
-                    label-position="right"
-                    size="small"
-                    style="max-width: 500px"
-                >
-                    <el-form-item prop="name" label="任务名称">
-                        <el-input v-model="formData.name"> </el-input>
-                    </el-form-item>
-                    <el-form-item prop="detail" label="详情" style="width: calc(100vw - 450px)">
-                        <el-input
-                            v-model="formData.detail"
-                            type="textarea"
-                            :autosize="{ minRows: 3, maxRows: 20 }"
-                            placeholder="请输入任务详情"
-                        >
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item prop="awardType" label="奖励类型">
-                        <el-select
-                            v-model="formData.awardType"
-                            clearable
-                            filterable
-                            placeholder="请选择"
-                            @change="changeAwardType"
-                        >
-                            <el-option
-                                v-for="item in awardTypeOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item
-                        prop="awardPic"
-                        label="奖励图片"
-                        v-if="formData.awardType && formData.awardType === 'NFT'"
-                    >
-                        <single-upload v-model="formData.awardPic"> </single-upload>
-                    </el-form-item>
-                    <el-form-item
-                        prop="goldNum"
-                        label="奖励金币数量"
-                        v-if="formData.awardType && formData.awardType === 'GOLD'"
-                    >
-                        <el-input-number type="goldNum" v-model="formData.goldNum" :step="1" :min="1">
-                        </el-input-number>
-                        <div class="tip">输入规则：正整数，最小为1</div>
-                    </el-form-item>
-                    <el-form-item prop="type" label="任务类型">
-                        <el-select v-model="formData.type" clearable filterable placeholder="请选择" @change="change">
-                            <el-option
-                                v-for="item in typeOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <template v-if="formData.type">
-                        <el-form-item v-if="formData.type === 'SIGN_IN_SINGLE_DAY'" prop="value" label="签到日期">
-                            <el-date-picker
-                                v-model="formData.value"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="指定签到日期"
-                            >
-                            </el-date-picker>
-                        </el-form-item>
-                        <el-form-item v-if="formData.type === 'SIGN_IN_CONTINUOUS'" prop="value" label="开始日期">
-                            <el-date-picker
-                                v-model="formData.value"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="指定开始日期"
-                            >
-                            </el-date-picker>
-                        </el-form-item>
-                        <el-form-item prop="value" label="藏品id" v-if="formData.type === 'COLLECT_COLLECTION'">
-                            <el-input v-model="formData.value" placeholder="请输入定藏品id"> </el-input>
-                            <div class="tip">多个藏品id请用空格隔开 例如 111 222 333</div>
-                        </el-form-item>
-                        <el-form-item prop="value" label="次数" v-if="formData.type === 'ACCUMULATE'">
-                            <el-input-number v-model="formData.value" :min="0"> </el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="value" label="在线时长(min)" v-if="formData.type === 'ON_LINE_TIME_DAILY'">
-                            <el-input-number v-model="formData.value" :min="0"> </el-input-number>
-                        </el-form-item>
-                    </template>
-                    <el-form-item prop="publish" label="是否发布">
-                        <el-switch v-model="formData.publish"> </el-switch>
-                    </el-form-item>
-                    <el-form-item prop="mark" label="是否展示角标">
-                        <el-switch v-model="formData.mark"> </el-switch>
-                    </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>
+	<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="130px"
+					label-position="right"
+					size="small"
+					style="max-width: 500px"
+				>
+					<el-form-item prop="name" label="任务名称">
+						<el-input v-model="formData.name"> </el-input>
+					</el-form-item>
+					<el-form-item prop="detail" label="详情" style="width: calc(100vw - 450px)">
+						<el-input
+							v-model="formData.detail"
+							type="textarea"
+							:autosize="{ minRows: 3, maxRows: 20 }"
+							placeholder="请输入任务详情"
+						>
+						</el-input>
+					</el-form-item>
+					<el-form-item prop="awardType" label="奖励类型">
+						<el-select
+							v-model="formData.awardType"
+							clearable
+							filterable
+							placeholder="请选择"
+							@change="changeAwardType"
+						>
+							<el-option
+								v-for="item in awardTypeOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item
+						prop="awardPic"
+						label="奖励图片"
+						v-if="formData.awardType && formData.awardType === 'NFT'"
+					>
+						<single-upload v-model="formData.awardPic"> </single-upload>
+					</el-form-item>
+					<el-form-item
+						prop="goldNum"
+						label="奖励金币数量"
+						v-if="formData.awardType && formData.awardType === 'GOLD'"
+					>
+						<el-input-number type="goldNum" v-model="formData.goldNum" :step="1" :min="1">
+						</el-input-number>
+						<div class="tip">输入规则：正整数，最小为1</div>
+					</el-form-item>
+					<el-form-item prop="type" label="任务类型">
+						<el-select v-model="formData.type" clearable filterable placeholder="请选择" @change="change">
+							<el-option
+								v-for="item in typeOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<template v-if="formData.type">
+						<el-form-item v-if="formData.type === 'SIGN_IN_SINGLE_DAY'" prop="value" label="签到日期">
+							<el-date-picker
+								v-model="formData.value"
+								type="date"
+								value-format="yyyy-MM-dd"
+								placeholder="指定签到日期"
+							>
+							</el-date-picker>
+						</el-form-item>
+						<el-form-item v-if="formData.type === 'SIGN_IN_CONTINUOUS'" prop="value" label="开始日期">
+							<el-date-picker
+								v-model="formData.value"
+								type="date"
+								value-format="yyyy-MM-dd"
+								placeholder="指定开始日期"
+							>
+							</el-date-picker>
+						</el-form-item>
+						<el-form-item prop="value" label="藏品id" v-if="formData.type === 'COLLECT_COLLECTION'">
+							<el-input v-model="formData.value" placeholder="请输入定藏品id"> </el-input>
+							<div class="tip">多个藏品id请用空格隔开 例如 111 222 333</div>
+						</el-form-item>
+						<el-form-item prop="value" label="次数" v-if="formData.type === 'ACCUMULATE'">
+							<el-input-number v-model="formData.value" :min="0"> </el-input-number>
+						</el-form-item>
+						<el-form-item prop="value" label="在线时长(min)" v-if="formData.type === 'ON_LINE_TIME_DAILY'">
+							<el-input-number v-model="formData.value" :min="0"> </el-input-number>
+						</el-form-item>
+					</template>
+                    <el-form-item prop="autoReceive" label="是否自动领取">
+						<el-switch v-model="formData.autoReceive"> </el-switch>
+					</el-form-item>
+					<el-form-item prop="publish" label="是否发布">
+						<el-switch v-model="formData.publish"> </el-switch>
+					</el-form-item>
+					<el-form-item prop="mark" label="是否展示角标">
+						<el-switch v-model="formData.mark"> </el-switch>
+					</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: 'MetaTaskEdit',
-    created() {
-        if (this.$route.query.id) {
-            this.$http
-                .get('metaTask/get/' + this.$route.query.id)
-                .then(res => {
-                    this.formData = res;
-                })
-                .catch(e => {
-                    console.log(e);
-                    this.$message.error(e.error);
-                });
-        }
-    },
-    data() {
-        return {
-            reg: /^[1-9]\d*$/,
-            saving: false,
-            formData: {},
-            rules: {
-                name: [
-                    {
-                        required: true,
-                        message: '请输入任务名称',
-                        trigger: 'blur'
-                    }
-                ],
-                detail: [
-                    {
-                        required: true,
-                        message: '请输入任务详情',
-                        trigger: 'blur'
-                    }
-                ],
-                type: [
-                    {
-                        required: true,
-                        message: '请输入任务类型',
-                        trigger: 'blur'
-                    }
-                ],
-                value: [
-                    {
-                        required: true,
-                        message: '请指定参数配置',
-                        trigger: 'blur'
-                    }
-                ],
-                goldNum: [
-                    {
-                        required: true,
-                        message: '请输入奖励金币数量',
-                        trigger: 'blur'
-                    },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!this.reg.test(value)) {
-                                callback(new Error('奖励金币数量必须为大于1的整数'));
-                                return;
-                            } else {
-                                callback();
-                            }
-                        }
-                    }
-                ],
-                awardType: [
-                    {
-                        required: true,
-                        message: '请选择奖励类型',
-                        trigger: 'blur'
-                    }
-                ],
-                awardPic: [
-                    {
-                        required: true,
-                        message: '请上传奖励图片',
-                        trigger: 'blur'
-                    }
-                ]
-            },
-            typeOptions: [
-                { label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
-                { label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
-                { label: '收集藏品', value: 'COLLECT_COLLECTION' },
-                { label: '每日在线时长', value: 'ON_LINE_TIME_DAILY' },
-                { label: '累计', value: 'ACCUMULATE' }
-            ],
-            awardTypeOptions: [
-                { label: 'NFT', value: 'NFT' },
-                { label: '金币', value: 'GOLD' }
-            ]
-        };
-    },
-    methods: {
-        changeAwardType(row) {
-            this.$delete(this.formData, 'awardPic');
-            this.$delete(this.formData, 'goldNum');
-        },
-        change() {
-            if (this.formData.value) {
-                this.$delete(this.formData, 'value');
-            }
-        },
-        onSave() {
-            this.$refs.form.validate(valid => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
-                }
-            });
-        },
-        submit() {
-            let data = { ...this.formData };
+	name: 'MetaTaskEdit',
+	created() {
+		if (this.$route.query.id) {
+			this.$http
+				.get('metaTask/get/' + this.$route.query.id)
+				.then(res => {
+					this.formData = res;
+				})
+				.catch(e => {
+					console.log(e);
+					this.$message.error(e.error);
+				});
+		}
+	},
+	data() {
+		return {
+			reg: /^[1-9]\d*$/,
+			saving: false,
+			formData: {},
+			rules: {
+				name: [
+					{
+						required: true,
+						message: '请输入任务名称',
+						trigger: 'blur'
+					}
+				],
+				detail: [
+					{
+						required: true,
+						message: '请输入任务详情',
+						trigger: 'blur'
+					}
+				],
+				type: [
+					{
+						required: true,
+						message: '请输入任务类型',
+						trigger: 'blur'
+					}
+				],
+				value: [
+					{
+						required: true,
+						message: '请指定参数配置',
+						trigger: 'blur'
+					}
+				],
+				goldNum: [
+					{
+						required: true,
+						message: '请输入奖励金币数量',
+						trigger: 'blur'
+					},
+					{
+						validator: (rule, value, callback) => {
+							if (!this.reg.test(value)) {
+								callback(new Error('奖励金币数量必须为大于1的整数'));
+								return;
+							} else {
+								callback();
+							}
+						}
+					}
+				],
+				awardType: [
+					{
+						required: true,
+						message: '请选择奖励类型',
+						trigger: 'blur'
+					}
+				],
+				awardPic: [
+					{
+						required: true,
+						message: '请上传奖励图片',
+						trigger: 'blur'
+					}
+				]
+			},
+			typeOptions: [
+				{ label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
+				{ label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
+				{ label: '收集藏品', value: 'COLLECT_COLLECTION' },
+				{ label: '每日在线时长', value: 'ON_LINE_TIME_DAILY' },
+				{ label: '累计', value: 'ACCUMULATE' }
+			],
+			awardTypeOptions: [
+				{ label: '空', value: 'NULL' },
+				{ label: 'NFT', value: 'NFT' },
+				{ label: '金币', value: 'GOLD' }
+			]
+		};
+	},
+	methods: {
+		changeAwardType(row) {
+			this.$delete(this.formData, 'awardPic');
+			this.$delete(this.formData, 'goldNum');
+		},
+		change() {
+			if (this.formData.value) {
+				this.$delete(this.formData, 'value');
+			}
+		},
+		onSave() {
+			this.$refs.form.validate(valid => {
+				if (valid) {
+					this.submit();
+				} else {
+					return false;
+				}
+			});
+		},
+		submit() {
+			let data = { ...this.formData };
 
-            this.saving = true;
-            this.$http
-                .post('/metaTask/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(`/metaTask/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 || '删除失败');
-                    }
-                });
-        }
-    }
+			this.saving = true;
+			this.$http
+				.post('/metaTask/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(`/metaTask/del/${this.formData.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						console.log(e);
+						this.$message.error((e || {}).error || '删除失败');
+					}
+				});
+		}
+	}
 };
 </script>
 <style lang="less" scoped>

src/main/vue/src/views/MetaTaskList.vue

@@ -1,248 +1,254 @@
 <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="createdAt" label="创建时间"> </el-table-column>
-			<el-table-column prop="name" label="任务名称"> </el-table-column>
-			<el-table-column prop="type" label="任务类型" :formatter="typeFormatter"> </el-table-column>
-			<el-table-column prop="value" label="配置值"> </el-table-column>
-			<el-table-column prop="detail" label="详情"> </el-table-column>
-			<el-table-column prop="awardType" label="奖励类型" :formatter="awardTypeFormatter"> </el-table-column>
-			<el-table-column prop="awardPic" label="奖励图片">
-				<template slot-scope="{ row }">
-					<el-image
-						style="width: 30px; height: 30px"
-						:src="row.awardPic"
-						fit="cover"
-						:preview-src-list="[row.awardPic]"
-					>
-					</el-image>
-				</template>
-			</el-table-column>
-			<el-table-column prop="goldNum" label="奖励金币数量"> </el-table-column>
-			<el-table-column prop="publish" label="是否发布">
-				<template slot-scope="{ row }">
-					<el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column prop="mark" label="是否展示角标">
-				<template slot-scope="{ row }">
-					<el-tag :type="row.mark ? '' : 'info'"> {{ row.mark }} </el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column prop="finish" label="是否结束">
-				<template slot-scope="{ row }">
-					<el-tag :type="row.finish ? '' : 'info'"> {{ row.finish }} </el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column label="操作" align="center" fixed="right" width="250">
-				<template slot-scope="{ row }">
-					<el-button @click="editRow(row)" type="primary" size="mini" plain v-if="!row.finish">
-						编辑
-					</el-button>
-					<el-button @click="deleteRow(row)" type="danger" size="mini" plain> 删除 </el-button>
-					<el-button @click="finish(row)" type="danger" size="mini" plain v-if="!row.finish">
-						结束任务
-					</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>
-	</div>
+    <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="createdAt" align="center" label="任务创建时间" width="100"> </el-table-column>
+            <el-table-column prop="name" align="center" label="任务名称" width="200"> </el-table-column>
+            <el-table-column prop="type" align="center" label="任务类型" :formatter="typeFormatter" width="100"> </el-table-column>
+            <el-table-column prop="value" align="center" label="配置值" width="80"> </el-table-column>
+            <el-table-column prop="detail" align="center" label="详情"> </el-table-column>
+            <el-table-column prop="awardType" align="center" label="奖励类型" :formatter="awardTypeFormatter" width="100"> </el-table-column>
+            <el-table-column prop="awardPic" align="center" label="奖励图片" width="100">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.awardPic"
+                        fit="cover"
+                        :preview-src-list="[row.awardPic]"
+                    >
+                    </el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="goldNum" align="center" label="奖励金币数量" width="100"> </el-table-column>
+			<el-table-column prop="autoReceive" align="center" label="自动领取" width="80">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.autoReceive ? '' : 'info'"> {{ row.autoReceive }} </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="publish" align="center" label="是否发布" width="80">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="mark" align="center" label="展示角标" width="80">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.mark ? '' : 'info'"> {{ row.mark }} </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="finish" align="center" label="是否结束" width="80">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.finish ? '' : 'info'"> {{ row.finish }} </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="250">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain v-if="!row.finish">
+                        编辑
+                    </el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain> 删除 </el-button>
+                    <el-button @click="finish(row)" type="danger" size="mini" plain v-if="!row.finish">
+                        结束任务
+                    </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>
+    </div>
 </template>
 <script>
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
 
 export default {
-	name: 'MetaTaskList',
-	mixins: [pageableTable],
-	data() {
-		return {
-			multipleMode: false,
-			search: '',
-			url: '/metaTask/all',
-			downloading: false,
-			typeOptions: [
-				{ label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
-				{ label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
-				{ label: '收集藏品', value: 'COLLECT_COLLECTION' },
-				{ label: '每日在线时长', value: 'ON_LINE_TIME_DAILY' },
-				{ label: '累计', value: 'ACCUMULATE' }
-			],
-			awardTypeOptions: [
-				{ label: 'NFT', value: 'NFT' },
-				{ label: '金币', value: 'GOLD' }
-			]
-		};
-	},
-	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 '';
-		},
-		awardTypeFormatter(row, column, cellValue, index) {
-			let selectedOption = this.awardTypeOptions.find(i => i.value === cellValue);
-			if (selectedOption) {
-				return selectedOption.label;
-			}
-			return '';
-		},
-		beforeGetData() {
-			return { search: this.search, query: { del: false } };
-		},
-		toggleMultipleMode(multipleMode) {
-			this.multipleMode = multipleMode;
-			if (!multipleMode) {
-				this.$refs.table.clearSelection();
-			}
-		},
-		addRow() {
-			this.$router.push({
-				path: '/metaTaskEdit',
-				query: {
-					...this.$route.query
-				}
-			});
-		},
-		editRow(row) {
-			this.$router.push({
-				path: '/metaTaskEdit',
-				query: {
-					id: row.id
-				}
-			});
-		},
-		download() {
-			this.downloading = true;
-			this.$axios
-				.get('/metaTask/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);
-				});
-		},
-		operation1() {
-			this.$notify({
-				title: '提示',
-				message: this.selection
-			});
-		},
-		operation2() {
-			this.$message('操作2');
-		},
-		deleteRow(row) {
-			if (!row.finish) {
-				this.$alert('请先结束任务!', '警告', { type: 'error' });
-				return;
-			}
-			this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
-				.then(() => {
-					return this.$http.post(`/metaTask/del/${row.id}`);
-				})
-				.then(() => {
-					this.$message.success('删除成功');
-					this.getData();
-				})
-				.catch(e => {
-					if (e !== 'cancel') {
-						this.$message.error(e.error);
-					}
-				});
-		},
-		finish(row) {
-			this.$alert('任务结束后在不能再被领取，确定要结束任务吗？', '警告', { type: 'error' })
-				.then(() => {
-					return this.$http.post(`/metaTask/${row.id}/finish`);
-				})
-				.then(() => {
-					this.$message.success('结束成功');
-					this.getData();
-				})
-				.catch(e => {
-					if (e !== 'cancel') {
-						this.$message.error(e.error);
-					}
-				});
-		}
-	}
+    name: 'MetaTaskList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/metaTask/all',
+            downloading: false,
+            typeOptions: [
+                { label: '单日签到', value: 'SIGN_IN_SINGLE_DAY' },
+                { label: '连续多日签到', value: 'SIGN_IN_CONTINUOUS' },
+                { label: '收集藏品', value: 'COLLECT_COLLECTION' },
+                { label: '每日在线时长', value: 'ON_LINE_TIME_DAILY' },
+                { label: '累计', value: 'ACCUMULATE' }
+            ],
+            awardTypeOptions: [
+                { label: '空', value: 'NULL' },
+                { label: 'NFT', value: 'NFT' },
+                { label: '金币', value: 'GOLD' }
+            ]
+        };
+    },
+    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 '';
+        },
+        awardTypeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.awardTypeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search, query: { del: false } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/metaTaskEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/metaTaskEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/metaTask/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);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            if (!row.finish) {
+                this.$alert('请先结束任务!', '警告', { type: 'error' });
+                return;
+            }
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metaTask/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        finish(row) {
+            this.$alert('任务结束后在不能再被领取，确定要结束任务吗？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metaTask/${row.id}/finish`);
+                })
+                .then(() => {
+                    this.$message.success('结束成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
 };
 </script>
 <style lang="less" scoped>

src/main/vue/src/views/MetaZouMaLightEdit.vue

@@ -0,0 +1,119 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="94px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px"
+                >
+                    <el-form-item prop="description" label="走马灯详情" style="width: calc(100vw - 450px)">
+                        <el-input
+                            v-model="formData.description"
+                            type="textarea"
+                            :autosize="{ minRows: 3, maxRows: 20 }"
+                            placeholder="请输入走马灯详情"
+                        >
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'MetaZouMaLightEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('metaZouMaLight/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                description: [
+                    {
+                        required: true,
+                        message: '请输入走马灯详情',
+                        trigger: 'blur'
+                    }
+                ]
+            }
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/metaZouMaLight/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(`/metaZouMaLight/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/MetaZouMaLightList.vue

@@ -0,0 +1,194 @@
+<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" align="center" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="description" align="center" label="走马灯详情"> </el-table-column>
+            <el-table-column prop="publish" align="center" label="是否发布" width="100">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="300">
+                <template slot-scope="{ row }">
+                    <el-button @click="publish(row)" type="primary" size="mini" plain v-if="row && !row.publish">
+                        发布
+                    </el-button>
+                    <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">
+            <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: 'MetaZouMaLightList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/metaZouMaLight/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: '/metaZouMaLightEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/metaZouMaLightEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/metaZouMaLight/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(`/metaZouMaLight/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        publish(row) {
+            this.$alert('请确定是否发布！如存在已发布走马灯信息，会将已发布走马灯状态改为未发布。', '提示', {
+                type: 'info'
+            })
+                .then(() => {
+                    return this.$http.post(`/metaZouMaLight/${row.id}/publish`);
+                })
+                .then(() => {
+                    this.$message.success('发布成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/views/RarityLabelEdit.vue

@@ -1,141 +1,153 @@
 <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="61px" label-position="right"
-                         size="small"
-                         style="max-width: 500px;">
-                        <el-form-item prop="name" label="name">
-                                    <el-input v-model="formData.name"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="label" label="label">
-                                    <template>
-                                        <el-select v-model="formData.label" multiple clearable filterable
-                                                   placeholder="请选择">
-                                            <el-option
-                                                    v-for="item in labelOptions"
-                                                    :key="item.value"
-                                                    :label="item.name"
-                                                    :value="item.value">
-                                            </el-option>
-                                        </el-select>
-                                    </template>
-                        </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>
+	<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="61px"
+					label-position="right"
+					size="small"
+					style="max-width: 500px"
+				>
+					<el-form-item prop="name" label="name">
+						<el-input v-model="formData.name"> </el-input>
+					</el-form-item>
+					<el-form-item prop="label" label="label">
+						<template>
+							<el-select v-model="formData.label" multiple clearable filterable placeholder="请选择">
+								<el-option
+									v-for="item in labelOptions"
+									:key="item.value"
+									:label="item.name"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</template>
+					</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: 'RarityLabelEdit',
-        created() {
-            if (this.$route.query.id) {
-                this.$http
-                    .get('rarityLabel/get/' + this.$route.query.id)
-                    .then(res => {
-                        var label = []
-                        if (res.label) {
-                            for(var i=0;i<res.label.length;i++){
-                                label.push(res.label[i].name)
-                            }
-                            res.label = label;
-                        } else {
-                            res.label = [];
-                        }
-                        this.formData = res;
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.$message.error(e.error);
-                    });
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {
-                },
-                rules: {
-                    name: [
-                        {
-                            required: true,
-                            message: '请输入name',
-                            trigger: 'blur'
-                        },
-                    ],
-                    label: [
-                        {
-                            required: true,
-                            message: '请输入label',
-                            trigger: 'blur'
-                        },
-                    ],
-                },
-                labelOptions: [{"name":"UR","value":"UR"},{"name":"SSR","value":"SSR"},{"name":"SR","value":"SR"},{"name":"R","value":"R"},{"name":"U","value":"U"}],
-            }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                let data = {...this.formData};
-                var labels = []
-                for(var i=0;i<data.label.length;i++){
-                    labels.push({name:data.label[i], value:data.label[i]})
-                }
-                data.label = labels;
-                this.saving = true;
-                this.$http
-                    .post('/rarityLabel/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(`/rarityLabel/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 || '删除失败');
-                    }
-                })
-            },
-        }
-    }
+export default {
+	name: 'RarityLabelEdit',
+	created() {
+		if (this.$route.query.id) {
+			this.$http
+				.get('rarityLabel/get/' + this.$route.query.id)
+				.then(res => {
+					var label = [];
+					if (res.label) {
+						for (var i = 0; i < res.label.length; i++) {
+							label.push(res.label[i].name);
+						}
+						res.label = label;
+					} else {
+						res.label = [];
+					}
+					this.formData = res;
+				})
+				.catch(e => {
+					console.log(e);
+					this.$message.error(e.error);
+				});
+		}
+	},
+	data() {
+		return {
+			saving: false,
+			formData: {},
+			rules: {
+				name: [
+					{
+						required: true,
+						message: '请输入name',
+						trigger: 'blur'
+					}
+				],
+				label: [
+					{
+						required: true,
+						message: '请输入label',
+						trigger: 'blur'
+					}
+				]
+			},
+			labelOptions: [
+				{ name: 'UR', value: 'UR' },
+				{ name: 'SSR', value: 'SSR' },
+				{ name: 'SR', value: 'SR' },
+				{ name: 'R', value: 'R' },
+				{ name: 'U', value: 'U' }
+			]
+		};
+	},
+	methods: {
+		onSave() {
+			this.$refs.form.validate(valid => {
+				if (valid) {
+					this.submit();
+				} else {
+					return false;
+				}
+			});
+		},
+		submit() {
+			let data = { ...this.formData };
+			var labels = [];
+			for (var i = 0; i < data.label.length; i++) {
+				labels.push({ name: data.label[i], value: data.label[i] });
+			}
+			data.label = labels;
+			this.saving = true;
+			this.$http
+				.post('/rarityLabel/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(`/rarityLabel/del/${this.formData.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						console.log(e);
+						this.$message.error((e || {}).error || '删除失败');
+					}
+				});
+		}
+	}
+};
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+
+</style>