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

src/main/java/com/izouma/nineth/aspect/AssetSaveAspect.java

@@ -43,7 +43,7 @@ public class AssetSaveAspect {
                             f.cancel(false);
                         });
                 futureMap.put(asset.getUserId(), executorService.schedule(() -> {
-                    userAssetSummaryService.calculateNum(asset.getUserId(), asset.getCompanyId());
+                    userAssetSummaryService.calculateNum(asset.getId(), asset.getUserId(), asset.getCompanyId());
                 }, 500, TimeUnit.MILLISECONDS));
             }
         } catch (Exception e) {

src/main/java/com/izouma/nineth/config/Constants.java

@@ -1,5 +1,9 @@
 package com.izouma.nineth.config;
 
+import com.izouma.nineth.enums.AssetStatus;
+
+import java.util.List;
+
 public interface Constants {
 
     interface Regex {
@@ -70,4 +74,8 @@ public interface Constants {
         int err = 400;
 
     }
+
+    List<AssetStatus> META_INOPERABLE_STATUS = List.of(AssetStatus.AUCTIONED, AssetStatus.DESTROYED, AssetStatus.GIFTED, AssetStatus.TRANSFERRED);
+
+    List<AssetStatus> META_NORMAL_STATUS = List.of(AssetStatus.NORMAL, AssetStatus.TRADING, AssetStatus.GIFTING, AssetStatus.MINTING, AssetStatus.AUCTIONING);
 }

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

@@ -240,6 +240,10 @@ public class Asset extends CollectionBaseEntity {
     @Column(columnDefinition = "int default 3 not null")
     private int chainFlag;
 
+    @Transient
+    @ApiModelProperty("元宇宙展厅是否上架")
+    private boolean metaPutOn;
+
     public static Asset create(Collection collection, User user) {
         return Asset.builder()
                 .userId(user.getId())

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

@@ -23,4 +23,8 @@ public class Company extends BaseEntity {
     private boolean disabled;
 
     private String theme;
+
+    private String bgImg;
+
+    private String bgColor;
 }

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

@@ -1,11 +1,15 @@
 package com.izouma.nineth.domain;
 
+import com.izouma.nineth.converter.MintRuleConverter;
+import com.izouma.nineth.dto.MintActivityRule;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
+import javax.persistence.Convert;
 import javax.persistence.Entity;
 
 @Data
@@ -15,15 +19,21 @@ import javax.persistence.Entity;
 @ApiModel("元宇宙销毁任务")
 public class MetaDestroyActivity extends BaseEntity{
 
-    @ApiModelProperty("藏品id")
-    private Long collectionId;
+    @ApiModelProperty("铸造活动规则")
+    @Convert(converter = MintRuleConverter.class)
+    @Column(columnDefinition = "TEXT")
+    private MintActivityRule rule;
 
-    @ApiModelProperty("图片")
-    private String pic;
-
-    @ApiModelProperty("销毁数量配置")
+    @ApiModelProperty("藏品数量")
     private int num;
 
+    @Column(columnDefinition = "tinyint unsigned default 0")
+    @ApiModelProperty("是否审核")
+    private boolean audit = false;
+
+    @ApiModelProperty("藏品名称")
+    private String collectionName;
+
     @ApiModelProperty("用途")
     private int application;
 

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

@@ -0,0 +1,38 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.converter.CoordinateConverter;
+import com.izouma.nineth.dto.CoordinateDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙展厅藏品")
+public class MetaShowRoomAsset extends BaseEntity {
+
+    @ApiModelProperty("所属用户")
+    private Long userId;
+
+    @ApiModelProperty("展厅id")
+    private Long showRoomId;
+
+    @ApiModelProperty("资产id")
+    private Long assetId;
+
+    @ApiModelProperty("展厅内坐标")
+    @Convert(converter = CoordinateConverter.class)
+    private CoordinateDTO coordinate;
+
+    @Transient
+    private Asset asset;
+
+}

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

@@ -26,5 +26,7 @@ public class Tag {
 
     private String remark;
 
+    @Column(columnDefinition = "bigint default 1 not null")
+    private Long companyId = 1L;
 
 }

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

@@ -0,0 +1,25 @@
+package com.izouma.nineth.dto;
+
+import com.izouma.nineth.converter.MintRuleConverter;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Convert;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CommonMatchDTO {
+
+    @ApiModelProperty("铸造活动规则")
+    @Convert(converter = MintRuleConverter.class)
+    private MintActivityRule rule;
+
+    @ApiModelProperty("是否审核")
+    private boolean audit = false;
+
+    @ApiModelProperty("藏品名称")
+    private String collectionName;
+}

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

@@ -109,6 +109,10 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
 
     List<Asset> findAllByUserIdAndStatusIn(Long userId, List<AssetStatus> status);
 
-    @Query("select a from Asset a where a.status in (com.izouma.nineth.enums.AssetStatus.NORMAL,com.izouma.nineth.enums.AssetStatus.TRADING,com.izouma.nineth.enums.AssetStatus.GIFTING,com.izouma.nineth.enums.AssetStatus.MINTING,com.izouma.nineth.enums.AssetStatus.AUCTIONING) and a.userId = ?1 and a.name like ?2")
-    List<Asset> findAllByUserIdAndNameLike(Long userId, String name);
+    @Query("select a from Asset a where a.status in ?2 and a.userId = ?1 and a.name like ?3")
+    List<Asset> findAllByUserIdAndStatusInAndNameLike(Long userId, List<AssetStatus> status, String name);
+
+    List<Asset> findAllByIdNotInAndUserIdAndStatusInAndOpened(List<Long> ids, Long userId, List<AssetStatus> status, boolean opened);
+
+    List<Asset> findAllByUserIdAndStatusInAndOpened(Long userId, List<AssetStatus> status, boolean opened);
 }

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

@@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
-import java.util.List;
 
 public interface MetaDestroyActivityRepo extends JpaRepository<MetaDestroyActivity, Long>, JpaSpecificationExecutor<MetaDestroyActivity> {
 
@@ -16,7 +15,6 @@ public interface MetaDestroyActivityRepo extends JpaRepository<MetaDestroyActivi
     @Transactional
     void softDelete(Long id);
 
-    List<MetaDestroyActivity> findAllByApplicationAndDelAndPublish(int appliation, boolean del, boolean publish);
+    MetaDestroyActivity findByApplicationAndDelAndPublish(int application, boolean del, boolean publish);
 
-    MetaDestroyActivity findByCollectionIdAndApplicationAndDel(Long collectionId, int application, boolean del);
 }

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

@@ -0,0 +1,31 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaShowRoomAsset;
+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 MetaShowRoomAssetRepo extends JpaRepository<MetaShowRoomAsset, Long>, JpaSpecificationExecutor<MetaShowRoomAsset> {
+
+    @Modifying
+    @Transactional
+    void deleteByShowRoomIdAndAssetId(Long showRoomId, Long assetId);
+
+    @Modifying
+    @Transactional
+    void deleteByShowRoomId(Long showRoomId);
+
+    List<MetaShowRoomAsset> findAllByShowRoomId(Long showRoomId);
+
+    @Query("select s.assetId from MetaShowRoomAsset s where s.del = false and s.userId = ?1")
+    List<Long> findAssetIdAllByUserId(Long userId);
+
+    @Modifying
+    @Transactional
+    void deleteByAssetId(Long assetId);
+
+}

src/main/java/com/izouma/nineth/security/WebSecurityConfig.java

@@ -164,6 +164,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/metaResourceVersion/**").permitAll()
                 .antMatchers("/asset/topTen").permitAll()
                 .antMatchers("/metaUser/internalTest").permitAll()
+                .antMatchers("/metaShowRoomAsset/**").permitAll()
 
                 // all other requests need to be authenticated
                 .anyRequest().authenticated().and()

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

@@ -98,11 +98,13 @@ public class AirDropService {
                     for (int i = 0; i < target.getNum(); i++) {
                         if (collection.getType() == CollectionType.BLIND_BOX) {
                             BlindBoxItem winItem = collectionService.draw(target.getUserId(), collection.getId());
+                            Collection winCollection = collectionRepo.findById(winItem.getCollectionId())
+                                    .orElseThrow(new BusinessException("藏品不存在"));
                             if (record.isSimulateOrder()) {
                                 assetService.createAsset(winItem, user, 0L, collection.getPrice(), "出售",
                                         winItem.getTotal() > 1 ?
                                                 collectionService.getNextNumber(winItem.getCollectionId()) : null,
-                                        collection.getHoldDays(), false);
+                                        winCollection.getHoldDays(), false);
                             } else {
                                 //查看有无vip权限
                                 CollectionPrivilege collectionPrivilege = collectionPrivilegeRepo
@@ -187,8 +189,10 @@ public class AirDropService {
                 Asset asset;
                 if (collection.getType() == CollectionType.BLIND_BOX) {
                     BlindBoxItem winItem = collectionService.draw(userId, collection.getId());
+                    Collection winCollection = collectionRepo.findById(winItem.getCollectionId())
+                            .orElseThrow(new BusinessException("藏品不存在"));
                     asset = assetService.createAsset(winItem, user, 0L, collection.getPrice(), "出售",
-                            collectionService.getNextNumber(winItem), collection.getHoldDays(), true);
+                            collectionService.getNextNumber(winItem), winCollection.getHoldDays(), true);
                 } else {
                     asset = assetService.createAsset(collection, user, 0L, collection.getPrice(), "出售",
                             collectionService.getNextNumber(collection), true);

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

@@ -910,9 +910,12 @@ public class AssetService {
     public Page<Asset> findMintActivityAssets(Long userId, Long mintActivityId, Pageable pageable) {
         MintActivity mintActivity = mintActivityRepo.findById(mintActivityId).orElse(null);
         if (mintActivity == null) return new PageImpl<>(Collections.emptyList());
+        return findMintActivityAssetsCommon(userId, new CommonMatchDTO(mintActivity.getRule(), mintActivity.isAudit(), mintActivity.getCollectionName()), pageable);
+    }
 
-        if (!mintActivity.isAudit()) {
-            Set<Tag> tags = mintActivity.getRule().getTags();
+    public Page<Asset> findMintActivityAssetsCommon(Long userId, CommonMatchDTO commonMatchDTO, Pageable pageable) {
+        if (!commonMatchDTO.isAudit()) {
+            Set<Tag> tags = commonMatchDTO.getRule().getTags();
             if (tags.isEmpty()) return new PageImpl<>(Collections.emptyList());
             return assetRepo.findAll((Specification<Asset>) (root, query, criteriaBuilder) ->
                     query.distinct(true).where(
@@ -929,7 +932,7 @@ public class AssetService {
                             .getRestriction(), pageable);
         } else {
             return assetRepo.findByUserIdAndStatusAndNameLike(userId, AssetStatus.NORMAL,
-                    "%" + mintActivity.getCollectionName() + "%", pageable);
+                    "%" + commonMatchDTO.getCollectionName() + "%", pageable);
         }
     }
 
@@ -1159,7 +1162,7 @@ public class AssetService {
             metaPlayerRole.setType(UserHoldTypeEnum.ASSET);
             metaPlayerRole.setAddress("https://www.raex.vip/9th/productSearch?search=" + metaPlayerRole
                     .getName() + "&source=TRANSFER");
-            List<Asset> assets = assetRepo.findAllByUserIdAndNameLike(userId, "%" + metaPlayerRole.getName() + "%");
+            List<Asset> assets = assetRepo.findAllByUserIdAndStatusInAndNameLike(userId, Constants.META_NORMAL_STATUS, "%" + metaPlayerRole.getName() + "%");
             metaPlayerRole.setHold(CollectionUtils.isNotEmpty(assets));
         });
         return metaPlayerRoleList;

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

@@ -1,6 +1,7 @@
 package com.izouma.nineth.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.izouma.nineth.config.Constants;
 import com.izouma.nineth.domain.Asset;
 import com.izouma.nineth.domain.MetaItem;
 import com.izouma.nineth.domain.SpaceObjectsInfo;
@@ -110,7 +111,7 @@ public class MetaPlayerInfoService {
         List<MetaItem> metaItems = metaItemRepo.findAllByType(MetaItemEnum.META_SHOW_ROOM);
         // 统计该用户所有物品信息
         metaItems.forEach(metaItem -> {
-            List<Asset> assets = assetRepo.findAllByUserIdAndNameLike(userId, "%" + metaItem.getName() + "%");
+            List<Asset> assets = assetRepo.findAllByUserIdAndStatusInAndNameLike(userId, Constants.META_NORMAL_STATUS, "%" + metaItem.getName() + "%");
             if (CollectionUtil.isNotEmpty(assets)) {
                 buildingList.add(new BuildingDTO(metaItem.getId(), metaItem.getName(), assets.size()));
             }

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

@@ -0,0 +1,146 @@
+package com.izouma.nineth.service;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.izouma.nineth.config.Constants;
+import com.izouma.nineth.domain.Asset;
+import com.izouma.nineth.domain.MetaItem;
+import com.izouma.nineth.domain.MetaShowRoomAsset;
+import com.izouma.nineth.dto.MetaRestResult;
+import com.izouma.nineth.dto.MetaServiceResult;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.MetaItemEnum;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.AssetRepo;
+import com.izouma.nineth.repo.MetaItemRepo;
+import com.izouma.nineth.repo.MetaShowRoomAssetRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@AllArgsConstructor
+public class MetaShowRoomAssetService {
+
+    private MetaShowRoomAssetRepo metaShowRoomAssetRepo;
+
+    private AssetRepo assetRepo;
+
+    private MetaItemRepo metaItemRepo;
+
+    public Page<MetaShowRoomAsset> all(PageQuery pageQuery) {
+        return metaShowRoomAssetRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaShowRoomAsset.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public MetaRestResult<Boolean> putOn(MetaShowRoomAsset metaShowRoomAsset) {
+        MetaServiceResult result = checkParams(metaShowRoomAsset);
+        if (!result.isSuccess()) {
+            return MetaRestResult.returnError(result.getMessage(), Boolean.FALSE);
+        }
+        Asset asset = assetRepo.findById(metaShowRoomAsset.getAssetId()).orElse(null);
+        if (Objects.isNull(asset)) {
+            return MetaRestResult.returnError("不存在该资产", Boolean.FALSE);
+        }
+        if (!asset.getUserId().equals(metaShowRoomAsset.getUserId())) {
+            return MetaRestResult.returnError("该资产不属于你");
+        }
+        if (Constants.META_INOPERABLE_STATUS.contains(asset.getStatus())) {
+            return MetaRestResult.returnError(String.format("该资产目前状态为[%S]，不可上架。请刷新藏品室数据", asset.getStatus().getDescription()), Boolean.FALSE);
+        }
+        metaShowRoomAssetRepo.save(metaShowRoomAsset);
+        return MetaRestResult.returnSuccess("上架成功", Boolean.TRUE);
+    }
+
+    public MetaRestResult<Boolean> putOff(Long assetId) {
+        metaShowRoomAssetRepo.deleteByAssetId(assetId);
+        return MetaRestResult.returnSuccess("下架成功", Boolean.TRUE);
+    }
+
+    public MetaRestResult<Boolean> putOffAll(Long showRoomId) {
+        metaShowRoomAssetRepo.deleteByShowRoomId(showRoomId);
+        return MetaRestResult.returnSuccess("一键下架成功", Boolean.TRUE);
+    }
+
+    public MetaRestResult<List<MetaShowRoomAsset>> findShowRoomAsset(Long showRoomId) {
+        List<MetaShowRoomAsset> metaShowRoomAssets = metaShowRoomAssetRepo.findAllByShowRoomId(showRoomId);
+        List<MetaShowRoomAsset> newMetaShowRoomAsset = new ArrayList<>();
+        metaShowRoomAssets.forEach(metaShowRoomAsset -> {
+            Asset asset = assetRepo.findById(metaShowRoomAsset.getAssetId()).orElseThrow(new BusinessException(String.format("assetId[%S]的资产不存在", metaShowRoomAsset.getAssetId())));
+            if (Constants.META_INOPERABLE_STATUS.contains(asset.getStatus())) {
+                metaShowRoomAssetRepo.deleteByAssetId(asset.getId());
+            } else {
+                metaShowRoomAsset.setAsset(asset);
+                newMetaShowRoomAsset.add(metaShowRoomAsset);
+            }
+        });
+        return MetaRestResult.returnSuccess(newMetaShowRoomAsset);
+    }
+
+
+    public MetaRestResult<List<Asset>> noShowRoomAndBlindBox(Long userId) {
+        // 查询已上架藏品
+        List<Long> assetIds = metaShowRoomAssetRepo.findAssetIdAllByUserId(userId);
+        List<MetaItem> metaItems = metaItemRepo.findAllByType(MetaItemEnum.META_SHOW_ROOM);
+        // 查询展厅数据
+        List<Long> ids = new ArrayList<>();
+        metaItems.forEach(metaItem -> {
+            List<Asset> metaItemAssets = assetRepo.findAllByUserIdAndStatusInAndNameLike(userId, Constants.META_NORMAL_STATUS, "%" + metaItem.getName() + "%");
+            if (CollectionUtil.isNotEmpty(metaItemAssets)) {
+                metaItemAssets.forEach(metaItemAsset -> {
+                    ids.add(metaItemAsset.getId());
+                });
+            }
+        });
+        List<Asset> assets;
+        if (CollectionUtils.isNotEmpty(ids)) {
+            assets = assetRepo.findAllByIdNotInAndUserIdAndStatusInAndOpened(ids, userId, Constants.META_NORMAL_STATUS, true);
+        } else {
+            assets = assetRepo.findAllByUserIdAndStatusInAndOpened(userId, Constants.META_NORMAL_STATUS, true);
+        }
+        if (CollectionUtils.isEmpty(assets) || CollectionUtils.isEmpty(assetIds)) {
+            return MetaRestResult.returnSuccess(assets);
+        }
+        // 查询用户拥有的非展厅非未开启盲盒藏品
+        assets.forEach(asset -> {
+            asset.setMetaPutOn(assetIds.contains(asset.getId()));
+        });
+        return MetaRestResult.returnSuccess(assets);
+    }
+
+    public MetaRestResult<List<Asset>> noBlindBox(Long userId) {
+        List<Long> assetIds = metaShowRoomAssetRepo.findAssetIdAllByUserId(userId);
+        // 查询玩家拥有的非未开启藏品
+        List<Asset> assets = assetRepo.findAllByUserIdAndStatusInAndOpened(userId, Constants.META_NORMAL_STATUS, true);
+        if (CollectionUtils.isEmpty(assets) || CollectionUtils.isEmpty(assetIds)) {
+            return MetaRestResult.returnSuccess(assets);
+        }
+        assets.forEach(asset -> {
+            asset.setMetaPutOn(assetIds.contains(asset.getId()));
+        });
+        return MetaRestResult.returnSuccess(assets);
+    }
+
+    private MetaServiceResult checkParams(MetaShowRoomAsset metaShowRoomAsset) {
+        if (Objects.isNull(metaShowRoomAsset)) {
+            return MetaServiceResult.returnError("Illegal parameter : parameter can not be null");
+        }
+        if (Objects.isNull(metaShowRoomAsset.getShowRoomId())) {
+            return MetaServiceResult.returnError("Illegal parameter : showRoomId can not be null");
+        }
+        if (Objects.isNull(metaShowRoomAsset.getUserId())) {
+            return MetaServiceResult.returnError("Illegal parameter : userId can not be null");
+        }
+        if (Objects.isNull(metaShowRoomAsset.getAssetId())) {
+            return MetaServiceResult.returnError("Illegal parameter : assetId can not be null");
+        }
+        if (Objects.isNull(metaShowRoomAsset.getCoordinate())) {
+            return MetaServiceResult.returnError("Illegal parameter : coordinate can not be null");
+        }
+        return MetaServiceResult.returnSuccess();
+    }
+}

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

@@ -675,10 +675,10 @@ public class OrderService {
                             userRepo.updateVipPurchase(order.getUserId(), 1);
                         }
                     }
-
+                    Collection winCollection = collectionRepo.findById(winItem.getCollectionId()).orElseThrow(new BusinessException("藏品不存在"));
                     assetService.createAsset(winItem, user, order.getId(), order.getPrice(), "出售",
                             winItem.getTotal() > 1 ? collectionService.getNextNumber(winItem.getCollectionId()) : null,
-                            collection.getHoldDays(), false);
+                            winCollection.getHoldDays(), false);
 
 
                 } else {

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

@@ -1,11 +1,13 @@
 package com.izouma.nineth.service;
 
 import com.izouma.nineth.annotations.RedisLock;
+import com.izouma.nineth.config.Constants;
 import com.izouma.nineth.domain.Asset;
 import com.izouma.nineth.domain.UserAssetSummary;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.CollectionType;
 import com.izouma.nineth.repo.AssetRepo;
+import com.izouma.nineth.repo.MetaShowRoomAssetRepo;
 import com.izouma.nineth.repo.UserAssetSummaryRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
@@ -18,6 +20,7 @@ import org.springframework.stereotype.Service;
 import javax.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @AllArgsConstructor
@@ -28,13 +31,15 @@ public class UserAssetSummaryService {
 
     private UserAssetSummaryRepo userAssetSummaryRepo;
 
+    private MetaShowRoomAssetRepo metaShowRoomAssetRepo;
+
     public Page<UserAssetSummary> all(PageQuery pageQuery) {
         return userAssetSummaryRepo.findAll(JpaUtils.toSpecification(pageQuery, UserAssetSummary.class), JpaUtils.toPageRequest(pageQuery));
     }
 
     @Transactional
     @RedisLock("#userId")
-    public void calculateNum(Long userId, Long companyId) {
+    public void calculateNum(Long assetId, Long userId, Long companyId) {
         log.info("开始重新计算用户：{},companyId：{}的资产数量", userId, companyId);
         List<UserAssetSummary> userAssetSummaries = new ArrayList<>();
         // 查询盲盒数量
@@ -55,6 +60,16 @@ public class UserAssetSummaryService {
             userAssetSummaryRepo.deleteByUserIdAndCompanyId(userId, companyId);
         }
         userAssetSummaryRepo.saveAll(userAssetSummaries);
+
+        // 如果资产状态为已转让，已销毁， 已转增， 已拍卖删除展厅中藏品
+        if (Objects.nonNull(assetId)) {
+            Asset asset = assetRepo.findById(assetId).orElse(null);
+            if (Objects.nonNull(asset)) {
+                if (Constants.META_INOPERABLE_STATUS.contains(asset.getStatus())) {
+                    metaShowRoomAssetRepo.deleteByAssetId(asset.getId());
+                }
+            }
+        }
     }
 
 }

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

@@ -5,7 +5,6 @@ import com.izouma.nineth.config.Constants;
 import com.izouma.nineth.domain.Asset;
 import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.dto.UserHoldDTO;
-import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.CollectionRepo;
 import lombok.AllArgsConstructor;
@@ -37,7 +36,7 @@ public class UserHoldCountCache {
         jsonArray.addAll(assets);
         List<UserHoldDTO> userHoldDTOS = jsonArray.toJavaList(UserHoldDTO.class);
         userHoldDTOS.forEach(userHoldDTO -> {
-            List<Asset> userAssets = assetRepo.findAllByUserIdAndStatusIn(userHoldDTO.getUserId(), new ArrayList<>(Arrays.asList(AssetStatus.NORMAL, AssetStatus.TRADING, AssetStatus.GIFTING, AssetStatus.MINTING, AssetStatus.AUCTIONING)));
+            List<Asset> userAssets = assetRepo.findAllByUserIdAndStatusIn(userHoldDTO.getUserId(), Constants.META_NORMAL_STATUS);
             // 分类计算各资产寄售最低价
             userAssets.forEach(asset -> {
                 if (StringUtils.isBlank(asset.getPrefixName())) {

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

@@ -246,7 +246,7 @@ public class AssetController extends BaseController {
 
     @GetMapping("/recal")
     public void recal(@RequestParam Long userId) {
-        userAssetSummaryService.calculateNum(userId, 1L);
+        userAssetSummaryService.calculateNum(null, userId, 1L);
     }
 
     @GetMapping("/topTen")

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

@@ -1,18 +1,20 @@
 package com.izouma.nineth.web;
 
-import com.izouma.nineth.domain.Collection;
+import com.izouma.nineth.domain.Asset;
 import com.izouma.nineth.domain.MetaDestroyActivity;
+import com.izouma.nineth.dto.CommonMatchDTO;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.CollectionRepo;
 import com.izouma.nineth.repo.MetaDestroyActivityRepo;
+import com.izouma.nineth.service.AssetService;
 import com.izouma.nineth.service.MetaDestroyActivityService;
 import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -27,23 +29,18 @@ public class MetaDestroyActivityController extends BaseController {
     private MetaDestroyActivityService metaDestroyActivityService;
     private MetaDestroyActivityRepo metaDestroyActivityRepo;
 
-    private CollectionRepo collectionRepo;
+    private AssetService assetService;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public MetaDestroyActivity save(@RequestBody MetaDestroyActivity record) {
-        Collection collection = collectionRepo.findById(record.getCollectionId()).orElseThrow(new BusinessException("不存在该藏品"));
-        MetaDestroyActivity metaDestroyActivity = metaDestroyActivityRepo.findByCollectionIdAndApplicationAndDel(record.getCollectionId(), record.getApplication(), false);
+        MetaDestroyActivity metaDestroyActivity = metaDestroyActivityRepo.findByApplicationAndDelAndPublish(record.getApplication(), false, true);
         if (Objects.nonNull(metaDestroyActivity) && !Objects.equals(metaDestroyActivity.getId(), record.getId())) {
-            throw new BusinessException("该用途已经存在此藏品的相关配置！");
-        }
-        if (CollectionUtils.isNotEmpty(collection.getPic())) {
-            record.setPic(collection.getPic().get(0).getUrl());
+            throw new BusinessException("该用途已经发布过相关配置！");
         }
         if (record.getId() != null) {
             MetaDestroyActivity orig = metaDestroyActivityRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
-            orig.setPic(collection.getPic().get(0).getUrl());
             return metaDestroyActivityRepo.save(orig);
         }
         return metaDestroyActivityRepo.save(record);
@@ -74,12 +71,28 @@ public class MetaDestroyActivityController extends BaseController {
     }
 
     @GetMapping("/{application}/metaQuery")
-    public MetaRestResult<List<MetaDestroyActivity>> metaQuery(@PathVariable int application) {
-        List<MetaDestroyActivity> metaDestroyActivities = metaDestroyActivityRepo.findAllByApplicationAndDelAndPublish(application, false, true);
-        if (CollectionUtils.isEmpty(metaDestroyActivities)) {
-            return MetaRestResult.returnError("查询不到销毁活动的配置");
+    public MetaRestResult<MetaDestroyActivity> metaQuery(@PathVariable int application) {
+        MetaDestroyActivity metaDestroyActivity = metaDestroyActivityRepo.findByApplicationAndDelAndPublish(application, false, true);
+        if (Objects.isNull(metaDestroyActivity)) {
+            return MetaRestResult.returnError("查询不到配置");
         }
-        return MetaRestResult.returnSuccess(metaDestroyActivities);
+        return MetaRestResult.returnSuccess(metaDestroyActivity);
     }
+
+    @GetMapping("/queryAsset")
+    public MetaRestResult<Page<Asset>> queryAsset(@RequestParam Long id, Pageable pageable) {
+        MetaDestroyActivity metaDestroyActivity = metaDestroyActivityRepo.findById(id).orElse(null);
+        if (Objects.isNull(metaDestroyActivity)) {
+            return MetaRestResult.returnError("查询不到配置");
+        }
+        if (metaDestroyActivity.isDel()) {
+            return MetaRestResult.returnError("该配置已被删除");
+        }
+        if (!metaDestroyActivity.isPublish()) {
+            return MetaRestResult.returnError("该配置还未发布");
+        }
+        return MetaRestResult.returnSuccess(assetService.findMintActivityAssetsCommon(SecurityUtils.getAuthenticatedUser().getId(), new CommonMatchDTO(metaDestroyActivity.getRule(), metaDestroyActivity.isAudit(), metaDestroyActivity.getCollectionName()), pageable));
+    }
+
 }
 

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

@@ -0,0 +1,69 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.Asset;
+import com.izouma.nineth.domain.MetaShowRoomAsset;
+import com.izouma.nineth.dto.MetaRestResult;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.MetaShowRoomAssetRepo;
+import com.izouma.nineth.service.MetaShowRoomAssetService;
+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("/metaShowRoomAsset")
+@AllArgsConstructor
+public class MetaShowRoomAssetController extends BaseController {
+    private MetaShowRoomAssetService metaShowRoomAssetService;
+    private MetaShowRoomAssetRepo metaShowRoomAssetRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaShowRoomAsset> all(@RequestBody PageQuery pageQuery) {
+        return metaShowRoomAssetService.all(pageQuery);
+    }
+
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaShowRoomAsset> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @GetMapping("/{userId}/noShowRoomAndBlindBox")
+    public MetaRestResult<List<Asset>> noShowRoomAndBlindBox(@PathVariable Long userId) {
+        return metaShowRoomAssetService.noShowRoomAndBlindBox(userId);
+    }
+
+    @GetMapping("/{userId}/noBlindBox")
+    public MetaRestResult<List<Asset>> noBlindBox(@PathVariable Long userId) {
+        return metaShowRoomAssetService.noBlindBox(userId);
+    }
+
+    @PostMapping("/putOn")
+    public MetaRestResult<Boolean> putOn(@RequestBody MetaShowRoomAsset metaShowRoomAsset) {
+        return metaShowRoomAssetService.putOn(metaShowRoomAsset);
+    }
+
+    @PostMapping("/putOff")
+    public MetaRestResult<Boolean> putOff(@RequestParam Long assetId) {
+        return metaShowRoomAssetService.putOff(assetId);
+    }
+
+    @PostMapping("/putOffAll")
+    public MetaRestResult<Boolean> putOffAll(@RequestParam Long showRoomId) {
+        return metaShowRoomAssetService.putOffAll(showRoomId);
+    }
+
+    @GetMapping("/{showRoomId}/findShowRoomAsset")
+    public MetaRestResult<List<MetaShowRoomAsset>> findShowRoomAsset(@PathVariable Long showRoomId) {
+        return metaShowRoomAssetService.findShowRoomAsset(showRoomId);
+    }
+}
+

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

@@ -20,7 +20,7 @@ public class UserAssetSummaryController extends BaseController {
     public Page<UserAssetSummary> all(@RequestBody PageQuery pageQuery) {
         pageQuery.getQuery().putIfAbsent("companyId", 1L);
         if (pageQuery.isRefresh()) {
-            userAssetSummaryService.calculateNum(SecurityUtils.getAuthenticatedUser().getId(), (Long) pageQuery.getQuery().get("companyId"));
+            userAssetSummaryService.calculateNum(null, SecurityUtils.getAuthenticatedUser().getId(), (Long) pageQuery.getQuery().get("companyId"));
         }
         return userAssetSummaryService.all(pageQuery);
     }

src/main/resources/application.yaml

@@ -12,6 +12,7 @@ server:
     accept-count: 10000
     threads:
       max: 3000
+    max-http-form-post-size: 100MB
 spring:
   profiles:
     active: dev

src/main/resources/genjson/MetaShowRoomAsset.json

@@ -0,0 +1 @@
+{"tableName":"MetaShowRoomAsset","className":"MetaShowRoomAsset","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":"所属用户","showInList":true,"showInForm":true,"formType":"number"},{"name":"showRoomId","modelName":"showRoomId","remark":"展厅id","showInList":true,"showInForm":true,"formType":"number"},{"name":"assetId","modelName":"assetId","remark":"资产id","showInList":true,"showInForm":true,"formType":"number"},{"name":"coordinate","modelName":"coordinate","remark":"展厅内坐标","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.MetaShowRoomAsset"}

src/main/vue/src/assets/svgs/login_icon_code.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>login_icon_mima</title>
+    <g id="H5" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="验证码登录—01" transform="translate(-61.000000, -262.000000)" stroke="#FFFFFF" stroke-width="1.4">
+            <g id="编组-9" transform="translate(45.000000, 195.000000)">
+                <g id="编组-7" transform="translate(16.000000, 67.000000)">
+                    <path d="M4.40886423,4.84667591 L12,2 L12,2 L19.5911358,4.84667591 C20.3717432,5.13940371 20.8888889,5.88564515 20.8888889,6.71933427 L20.8888889,12 C20.8888889,16.010046 18.4014174,19.5994685 14.6466944,21.0074896 L12,22 L12,22 L9.35330563,21.0074896 C5.59858258,19.5994685 3.11111111,16.010046 3.11111111,12 L3.11111111,6.71933427 C3.11111111,5.88564515 3.62825678,5.13940371 4.40886423,4.84667591 Z" id="矩形"></path>
+                    <polyline id="直线" points="8.9096665 10.8801592 10.5763332 13.3801592 15.5763332 10.0468259"></polyline>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/main/vue/src/assets/svgs/login_icon_mima.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>login_icon_mima</title>
+    <g id="H5" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="账号密码登录-01" transform="translate(-61.000000, -262.000000)" stroke="#FFFFFF" stroke-width="1.4">
+            <g id="编组-9" transform="translate(45.000000, 195.000000)">
+                <g id="编组-11备份-11" transform="translate(16.000000, 67.000000)">
+                    <g id="编组-4" transform="translate(3.500000, 2.000000)">
+                        <path d="M2,9.06666667 L15,9.06666667 C16.1045695,9.06666667 17,9.96209717 17,11.0666667 L17,18.4 C17,19.5045695 16.1045695,20.4 15,20.4 L2,20.4 C0.8954305,20.4 8.94280938e-16,19.5045695 0,18.4 L0,11.0666667 C-3.57315355e-16,9.96209717 0.8954305,9.06666667 2,9.06666667 Z" id="矩形"></path>
+                        <line x1="5.1" y1="13.0333333" x2="5.1" y2="16.4333333" id="直线"></line>
+                        <line x1="11.9" y1="13.0333333" x2="11.9" y2="16.4333333" id="直线备份"></line>
+                        <path d="M13.6,3.4 L13.6,3.96666667 C13.6,6.78331889 11.3166522,9.06666667 8.5,9.06666667 C5.68334778,9.06666667 3.4,6.78331889 3.4,3.96666667 C3.4,3.4 3.4,2.83333333 3.4,2.26666667 C3.4,2.26666667 3.4,1.88888889 3.4,1.13333333 L3.4,0" id="路径" transform="translate(8.500000, 4.533333) scale(1, -1) translate(-8.500000, -4.533333) "></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/main/vue/src/assets/svgs/login_icon_yao qingma.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>login_icon_yao qingma</title>
+    <g id="H5" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
+        <g id="用户注册-01" transform="translate(-61.000000, -407.000000)" stroke="#FFFFFF" stroke-width="1.4">
+            <g id="编组-9" transform="translate(45.000000, 195.000000)">
+                <g id="编组-11备份-16" transform="translate(16.000000, 212.000000)">
+                    <g id="编组" transform="translate(2.662666, 2.446072)">
+                        <polyline id="路径-2" stroke-linejoin="round" points="17.2744252 0.530988633 5.20346147 13.1846547 5.20346147 18"></polyline>
+                        <path d="M3.51424038,11.4803669 L0.622484307,10.0361728 C0.066732791,9.75862063 -0.158792364,9.08309455 0.118759773,8.52734304 C0.232049121,8.30050015 0.418660915,8.11859003 0.648320223,8.01112481 L16.2852366,0.106286721 C16.8478882,-0.156996634 17.5174408,0.0856892707 17.7807241,0.64834086 C17.860915,0.819713359 17.8965796,1.00854578 17.8844171,1.19736099 L16.2524624,16.0965247 C16.2125303,16.7164443 15.6776148,17.1866171 15.0576951,17.146685 C14.9079649,17.1370402 14.7616776,17.097536 14.627446,17.0304984 L9.20998317,14.3249216" id="路径"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/main/vue/src/assets/svgs/login_icon_zhanghao.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>login_icon_zhanghao</title>
+    <g id="H5" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="账号密码登录-01" transform="translate(-61.000000, -213.000000)" stroke="#FFFFFF" stroke-width="1.4">
+            <g id="编组-9" transform="translate(45.000000, 195.000000)">
+                <g id="编组-11备份-12" transform="translate(16.000000, 16.000000)">
+                    <g id="编组-6" transform="translate(0.000000, 2.000000)">
+                        <path d="M11.8494862,9.25096392 C12.489192,9.25096392 13.0683369,9.51025591 13.4875553,9.92947434 C13.9067737,10.3486928 14.1660657,10.9278377 14.1660657,11.5675434 C14.1660657,12.2072492 13.9067737,12.7863941 13.4875553,13.2056125 C13.0683369,13.6248309 12.489192,13.8841229 11.8494862,13.8841229 C11.2097805,13.8841229 10.6306356,13.6248309 10.2114171,13.2056125 C9.79219871,12.7863941 9.53290671,12.2072492 9.53290671,11.5675434 C9.53290671,10.9278377 9.79219871,10.3486928 10.2114171,9.92947434 C10.6306356,9.51025591 11.2097805,9.25096392 11.8494862,9.25096392 Z" id="椭圆形" transform="translate(11.849486, 11.567543) rotate(5.000000) translate(-11.849486, -11.567543) "></path>
+                        <path d="M19.9138547,15.6893633 C20.3368515,14.7696871 20.5727354,13.7461465 20.5727354,12.6675122 C20.5727354,10.475382 19.5984583,8.51080632 18.0592935,7.18317458" id="路径" stroke-linejoin="round" transform="translate(19.316014, 11.436269) rotate(5.000000) translate(-19.316014, -11.436269) "></path>
+                        <rect id="矩形" x="2.83159827" y="19.6906567" width="18.7795588" height="3.08434641" rx="1.5421732"></rect>
+                        <path d="M19.8571184,5.48257944 C18.0067606,3.33255748 15.2655942,1.97113125 12.2064497,1.97113125 C6.63401837,1.97113125 2.11667026,6.48847937 2.11667026,12.0609107 C2.11667026,15.0424029 3.85080359,18.266989 5.90687169,20.1140943 M19.7147375,18.8011694 C20.5185786,17.9063266 21.1647649,16.8669949 21.6095833,15.7268876" id="形状" stroke-linecap="round" stroke-linejoin="round" transform="translate(11.863127, 11.042613) rotate(5.000000) translate(-11.863127, -11.042613) "></path>
+                        <line x1="21.3506284" y1="16.7231563" x2="14.154184" y2="12.6887744" id="路径"></line>
+                        <line x1="13.7923423" y1="10.3706389" x2="20.3112877" y2="6.20045932" id="路径"></line>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/main/vue/src/components/phone/Home.vue

@@ -160,8 +160,7 @@ export default {
             riskShow: false,
             activeIndex: 0,
             isLoading: false,
-            mySwiper: null,
-            companyInfo: {}
+            mySwiper: null
         };
     },
     watch: {
@@ -256,7 +255,9 @@ export default {
                 .then(res => {
                     this.banners = res.content;
                     this.$nextTick(() => {
-                        this.mySwiper.update();
+                        if (this.mySwiper) {
+                            this.mySwiper.update();
+                        }
                     });
                     return Promise.resolve();
                 });
@@ -366,7 +367,7 @@ export default {
 }
 .theme3-bg {
     width: 100%;
-    position: fixed;
+    position: absolute;
     top: 0;
     left: 0;
     height: auto;

src/main/vue/src/components/phone/Login.vue

@@ -0,0 +1,278 @@
+<template>
+    <div
+        class="login"
+        :style="{
+            backgroundImage: `url(${bgImg})`
+        }"
+    >
+        <!-- <img class="logo" v-if="active === 'phone'" src="../../assets/lvzhopu-logo.png" alt="" />
+        <img class="logo" v-else src="../../assets/lvzhopu-logo2.png" alt="" /> -->
+        <div class="tabs">
+            <div class="tab" :class="{ active: active === 'phone' }">账号密码登陆</div>
+            <div class="tab" :class="{ active: active === 'code' }">验证码登陆</div>
+        </div>
+
+        <van-form ref="form" v-if="active === 'phone'">
+            <div class="field-box">
+                <van-field placeholder="Account" v-model="form.phone" readonly>
+                    <template #left-icon>
+                        <img :src="require('../../assets/svgs/login_icon_zhanghao.svg')" class="icon" />
+                    </template>
+                </van-field>
+                <van-field
+                    placeholder="Password"
+                    v-model="form.password"
+                    readonly
+                    :rules="[{ required: true, message: '请填写密码' }]"
+                >
+                    <template #left-icon>
+                        <img :src="require('../../assets/svgs/login_icon_mima.svg')" class="icon" />
+                    </template>
+                </van-field>
+            </div>
+
+            <div class="button">
+                <!-- <van-button plain class="forget" v-if="$store.state.review" @click="getSim"> 获取手机号码 </van-button> -->
+
+                <van-button block native-type="submit" type="primary" class="sure">现在出发！</van-button>
+                <van-button
+                    class="del"
+                    block
+                    plain
+                    @click="$router.replace('/' + $route.params.companyId + '/register')"
+                    >暂无登陆许可 立即申领</van-button
+                >
+            </div>
+        </van-form>
+
+        <van-form ref="code" v-else>
+            <div class="field-box">
+                <van-field type="tel" name="手机号码" placeholder="Account" v-model="form.phone">
+                    <template #left-icon>
+                        <img :src="require('../../assets/svgs/login_icon_zhanghao.svg')" class="icon" />
+                    </template>
+                </van-field>
+
+                <van-field
+                    type="code"
+                    name="验证码"
+                    placeholder="Verify"
+                    v-model="form.code"
+                    :rules="[{ required: true, message: '请输入验证码' }]"
+                >
+                    <template #left-icon>
+                        <img :src="require('../../assets/svgs/login_icon_code.svg')" class="icon" />
+                    </template>
+                    <template #button>
+                        <van-button class="sub-code" size="small" plain>
+                            {{ isSend ? `已发送(${sendNum})S` : '发送验证码' }}
+                        </van-button>
+                    </template>
+                </van-field>
+            </div>
+            <div class="button">
+                <!-- <van-button plain class="forget" @click="$router.replace('/forget')">
+          忘记密码？
+        </van-button> -->
+
+                <van-button block native-type="submit" type="primary" class="sure">现在出发！</van-button>
+                <van-button class="del" block plain>暂无登陆许可 立即申领</van-button>
+            </div>
+        </van-form>
+
+        <div class="xieyi">
+            <van-checkbox v-model="checked" disabled>
+                已阅读并同意
+                <span>
+                    《用户服务协议》
+                </span>
+                和
+                <span> 《平台隐私协议》 </span>
+            </van-checkbox>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name:'phone',
+    props: {
+        theme: {
+            type: String,
+            default: 'theme2'
+        },
+        companyInfo: {
+            type: Object,
+            default: () => {
+                return {};
+            }
+        }
+    },
+    data() {
+        return {
+            active: 'phone',
+            form: {
+                phone: '',
+                password: '',
+                code: ''
+            },
+            checked: localStorage.getItem('agreeTerm') === 'true'
+        };
+    },
+    computed: {
+        bgImg() {
+            return this.companyInfo.bgImg || 'https://cdn.raex.vip/image/2022-09-26-17-25-55tpfNbWbJ.png';
+        }
+    }
+};
+</script>
+
+<style lang="less" scoped>
+.login {
+    width: 100%;
+    padding: 40px 50px 100px;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center bottom;
+    box-sizing: border-box;
+    overflow-y: auto;
+    max-height: 720px;
+    height: 720px;
+}
+/deep/.van-cell {
+    background-color: transparent;
+}
+/deep/input:-webkit-autofill {
+    box-shadow: 0 0 0px 1000px #101010 inset;
+    -webkit-text-fill-color: #898989;
+}
+/deep/.van-field__control {
+    color: #fff;
+    font-size: 14px;
+}
+.logo {
+    width: 94px;
+    height: 16px;
+    display: block;
+    margin-bottom: 2px;
+}
+.tabs {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-right: 10px;
+    .tab {
+        font-size: 16px;
+        color: #c8c9cc;
+        line-height: 30px;
+
+        &.active {
+            font-size: 20px;
+            font-weight: bold;
+            color: var(--prim);
+            line-height: 30px;
+        }
+    }
+}
+
+/deep/.field-box {
+    background: #101010;
+    box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.5);
+    border-radius: 12px;
+    .van-cell:after {
+        left: 56px;
+        right: 16px;
+        border: none;
+        height: 1px;
+        background: rgba(137, 137, 137, 0.3);
+    }
+    .van-cell + .van-cell {
+        margin-top: 0 !important;
+    }
+}
+
+.icon {
+    display: block;
+    margin-top: 16px;
+}
+/deep/ .van-form {
+    margin-top: 28px;
+    .van-cell {
+        padding: 0px 16px;
+
+        .van-field__left-icon {
+            margin-right: 16px;
+        }
+    }
+
+    .van-cell + .van-cell {
+        margin-top: 20px;
+    }
+    .van-field__body {
+        height: 56px;
+        align-items: center;
+    }
+}
+.button {
+    margin-top: 60px;
+    position: relative;
+
+    .del {
+        margin-top: 20px;
+        border-color: #ffffff;
+        color: #ffffff;
+        background-color: #101010;
+    }
+
+    .sure {
+        color: #000000 !important;
+    }
+
+    .van-button {
+        font-weight: bold;
+        border-radius: 12px;
+    }
+}
+
+.sub-code {
+    padding-right: 0;
+    border-width: 0;
+    color: var(--prim);
+}
+
+.forget {
+    position: absolute;
+    font-weight: normal !important;
+    right: 0;
+    top: -65px;
+}
+.xieyi {
+    .flex();
+    justify-content: center;
+    margin-top: 50px;
+    font-size: 12px;
+
+    color: #fff;
+    span {
+        color: var(--prim);
+    }
+}
+.van-checkbox {
+    background-color: #101010;
+    padding: 5px 10px;
+    border-radius: 12px;
+}
+/deep/.van-checkbox__label {
+    color: #fff;
+}
+
+/deep/.van-checkbox__icon--checked .van-icon {
+    background: var(--prim);
+    border-width: 0;
+}
+
+.van-button--primary {
+    background-color: var(--prim);
+    border-color: var(--prim);
+}
+</style>

src/main/vue/src/components/phone/module.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="module">
         <div class="phone" :class="[theme]">
-            <phone-home :theme="theme" :companyInfo="companyInfo"></phone-home>
+            <phone-home v-if="page === 'home'" :theme="theme" :companyInfo="companyInfo"></phone-home>
+            <phone-login v-else-if="page === 'login'" :theme="theme" :companyInfo="companyInfo"></phone-login>
         </div>
         <div class="phone-bg">
             <div class="bg" :style="{ backgroundImage: `url(${require('../../assets/phone.png')})` }"></div>
@@ -11,6 +12,7 @@
 
 <script>
 import phoneHome from './Home.vue';
+import phoneLogin from './Login.vue';
 export default {
     props: {
         theme: {
@@ -22,9 +24,13 @@ export default {
             default: () => {
                 return {};
             }
+        },
+        page: {
+            type: String,
+            default: 'home'
         }
     },
-    components: { phoneHome }
+    components: { phoneHome, phoneLogin }
 };
 </script>
 

src/main/vue/src/router.js

@@ -1252,6 +1252,14 @@ const router = new Router({
                     meta: {
                        title: '元宇宙物品',
                     },
+               },
+                {
+                    path: '/metaShowRoomAssetList',
+                    name: 'MetaShowRoomAssetList',
+                    component: () => import(/* webpackChunkName: "metaShowRoomAssetList" */ '@/views/MetaShowRoomAssetList.vue'),
+                    meta: {
+                       title: '元宇宙展厅藏品',
+                    },
                }
                 /**INSERT_LOCATION**/
             ]
@@ -1312,4 +1320,4 @@ router.beforeEach((to, from, next) => {
     }
 });
 
-export default router;
+export default router;

src/main/vue/src/views/Admin.vue

@@ -207,6 +207,16 @@ export default {
                                 root: false,
                                 active: true
                             },
+                            {
+                                id: '3410329',
+                                name: '标签管理',
+                                path: '/tagList',
+                                icon: '',
+                                sort: 42,
+                                parent: '3410316',
+                                root: false,
+                                active: true
+                            },
                             // {
                             //     id: '3410339',
                             //     name: '空投',
@@ -270,6 +280,71 @@ export default {
                             }
                         ]
                     },
+                    {
+                        id: '2396143',
+                        del: false,
+                        name: '铸造管理',
+                        path: '',
+                        icon: 'fas fa-gavel',
+                        sort: 32,
+                        parent: null,
+                        root: true,
+                        enabled: null,
+                        active: true,
+                        category: null,
+                        children: [
+                            {
+                                id: '2396144',
+                                del: false,
+                                name: '铸造活动',
+                                path: '/mintActivityList',
+                                icon: '',
+                                sort: 28,
+                                parent: '2396143',
+                                root: false,
+                                enabled: null,
+                                active: true,
+                                category: null,
+                                children: null,
+                                authorities: null,
+                                createdAt: null
+                            },
+                            {
+                                id: '2396145',
+                                del: false,
+                                name: '铸造订单',
+                                path: '/mintOrderList',
+                                icon: '',
+                                sort: 29,
+                                parent: '2396143',
+                                root: false,
+                                enabled: null,
+                                active: true,
+                                category: null,
+                                children: null,
+                                authorities: null,
+                                createdAt: null
+                            },
+                            {
+                                id: '6552353',
+                                del: false,
+                                name: '铸造订单审核',
+                                path: '/mintOrderAuditList',
+                                icon: '',
+                                sort: 56,
+                                parent: '2396143',
+                                root: false,
+                                enabled: null,
+                                active: true,
+                                category: null,
+                                children: null,
+                                authorities: null,
+                                createdAt: null
+                            }
+                        ],
+                        authorities: null,
+                        createdAt: null
+                    },
                     {
                         id: '3252226',
                         name: '内容管理',

src/main/vue/src/views/MetaDestroyActivityEdit.vue

@@ -1,129 +1,227 @@
 <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="collectionId" label="藏品id">
-						<el-input v-model="formData.collectionId"> </el-input>
-					</el-form-item>
-					<el-form-item prop="num" label="数量配置">
-						<el-input-number type="number" v-model="formData.num"> </el-input-number>
-					</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 prop="publish" label="是否发布">
-						<el-switch v-model="formData.publish"> </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="120px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px"
+                >
+                    <el-form-item prop="audit" label="是否需要审核">
+                        <el-radio-group v-model="formData.audit">
+                            <el-radio :label="true"> 人工审核 </el-radio>
+                            <el-radio :label="false"> 自动匹配 </el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item prop="collectionName" label="藏品名称" v-if="formData.audit === true">
+                        <el-input v-model="formData.collectionName" :disabled="!canEdit" class="width"> </el-input>
+                    </el-form-item>
+                    <el-form-item prop="rule" label="匹配规则设置" v-if="formData.audit === false">
+                        <template v-if="formData.rule && formData.rule.and">
+                            <div v-for="(item, i) in formData.rule.and" class="rule-item">
+                                <el-select v-model="item.detail.tag" value-key="id" size="mini">
+                                    <el-option v-for="item in tags" :key="item.id" :value="item" :label="item.name">
+                                    </el-option>
+                                </el-select>
+                                <span style="padding: 0 10px; color: #606266; font-weight: bold"> ×&nbsp;1 </span>
+                                <i @click="delRule(i)" class="el-icon-delete icon-del"> </i>
+                            </div>
+                        </template>
+                        <el-button size="mini" @click="addRule"> 添加 </el-button>
+                    </el-form-item>
+                    <el-form-item prop="num" label="藏品数量">
+                        <el-input-number
+                            type="number"
+                            v-model="formData.num"
+                            :disabled="!canEdit"
+                            :step="1"
+                            :min="0"
+                            class="width1"
+                        >
+                        </el-input-number>
+                        <div class="tip">0表示不限</div>
+                    </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 prop="publish" label="是否发布">
+                        <el-switch v-model="formData.publish"> </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: 'MetaDestroyActivityEdit',
-	created() {
-		if (this.$route.query.id) {
-			this.$http
-				.get('metaDestroyActivity/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: {
-				collectionId: [
-					{
-						required: true,
-						message: '请输入藏品id',
-						trigger: 'blur'
-					}
-				],
-				num: [
-					{
-						required: true,
-						message: '请输入数量配置',
-						trigger: 'blur'
-					}
-				]
-			}
-		};
-	},
-	methods: {
-		onSave() {
-			this.$refs.form.validate(valid => {
-				if (valid) {
-					this.submit();
-				} else {
-					return false;
-				}
-			});
-		},
-		submit() {
-			let data = { ...this.formData };
+    name: 'MetaDestroyActivityEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('metaDestroyActivity/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http.post('/tag/all', { size: 10000 }, { body: 'json' }).then(res => {
+            this.tags = res.content;
+        });
+    },
+    data() {
+        return {
+            tags: [],
+            saving: false,
+            formData: {},
+            rules: {
+                collectionId: [
+                    {
+                        required: true,
+                        message: '请输入藏品id',
+                        trigger: 'blur'
+                    }
+                ],
+                num: [
+                    {
+                        required: true,
+                        message: '请输入数量配置',
+                        trigger: 'blur'
+                    }
+                ],
+                audit: [
+                    {
+                        required: true,
+                        message: '请选择是否需要审核',
+                        trigger: 'blur'
+                    }
+                ],
+                rule: [
+                    { required: true, message: '请选择规则', trigger: 'blur' },
+                    {
+                        validator: (rule, value, callback) => {
+                            if (!this.formData.audit) {
+                                if (!this.formData.rule) {
+                                    callback(new Error('请填写规则'));
+                                } else if (!this.formData.rule.and) {
+                                    callback(new Error('请填写规则'));
+                                } else if (!this.formData.rule.and.length) {
+                                    callback(new Error('请填写规则'));
+                                } else {
+                                    for (let i = 0; i < this.formData.rule.and.length; i++) {
+                                        if (
+                                            !(this.formData.rule.and[i].detail && this.formData.rule.and[i].detail.tag)
+                                        ) {
+                                            callback(new Error('请选择'));
+                                            callback = null;
+                                            break;
+                                        }
+                                    }
+                                    if (callback) {
+                                        callback();
+                                    }
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+        canEdit() {
+            return !!!this.$route.query.id;
+        }
+    },
+    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('/metaDestroyActivity/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(`/metaDestroyActivity/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('/metaDestroyActivity/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(`/metaDestroyActivity/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 || '删除失败');
+                    }
+                });
+        },
+        addRule() {
+            if (!(this.formData.rule && this.formData.rule.and)) {
+                this.$set(this.formData, 'rule', { and: [] });
+            }
+            this.formData.rule.and.push({ detail: { tag: null, num: 1 } });
+        },
+        delRule(i) {
+            this.formData.rule.and.splice(i, 1);
+        }
+    }
 };
 </script>
 <style lang="less" scoped>
+.width1 {
+	width: 150px;
+}
+
+.rule-item {
+	display: flex;
+	align-items: center;
+	margin-bottom: 10px;
 
+	.icon-del {
+		color: #f56c6c;
+		cursor: pointer;
+		font-size: 18px;
+	}
+}
 </style>

src/main/vue/src/views/MetaDestroyActivityList.vue

@@ -44,19 +44,14 @@
 		>
 			<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="collectionId" label="藏品id"> </el-table-column>
-            <el-table-column prop="pic" label="图片">
-				<template slot-scope="{ row }">
-					<el-image
-						style="width: 30px; height: 30px"
-						:src="row.pic"
-						fit="cover"
-						:preview-src-list="[row.pic]"
-					>
-					</el-image>
-				</template>
-			</el-table-column>
-			<el-table-column prop="num" label="数量配置"> </el-table-column>
+			<el-table-column prop="collectionName" label="藏品名称"> </el-table-column>
+			<el-table-column prop="num" label="藏品数量" width="80" align="center"> </el-table-column>
+			<el-table-column prop="audit" label="审核" width="80" align="center">
+                <template v-slot="{ row }">
+                    <el-tag type="warning" v-if="row.audit">人工</el-tag>
+                    <el-tag type="success" v-else>自动</el-tag>
+                </template>
+            </el-table-column>
             <el-table-column prop="application" label="用途"> </el-table-column>
 			<el-table-column prop="publish" label="是否发布">
 				<template slot-scope="{ row }">

src/main/vue/src/views/MetaShowRoomAssetList.vue

@@ -0,0 +1,120 @@
+<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="userId" label="所属用户Id"> </el-table-column>
+			<el-table-column prop="showRoomId" label="展厅id"> </el-table-column>
+			<el-table-column prop="assetId" label="资产id"> </el-table-column>
+            <el-table-column prop="coordinate" label="展厅内坐标">
+                <template slot-scope="{ row }">
+					{{ 'x=' + row.coordinate.x + ' , ' + 'y=' + row.coordinate.y + ' , ' + 'z=' + row.coordinate.z }} 
+				</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: 'MetaShowRoomAssetList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/metaShowRoomAsset/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('/metaShowRoomAsset/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/company/CompanyTheme.vue

@@ -7,37 +7,64 @@
         </page-title>
         <div class="edit-view__content-wrapper">
             <div class="edit-view__content-section">
-                <el-form
-                    :model="formData"
-                    :rules="rules"
-                    ref="form"
-                    label-width="125px"
-                    label-position="right"
-                    size="small"
-                    style="max-width: 750px"
-                >
-                    <el-form-item prop="logo" label="LOGO">
-                        <single-upload v-model="formData.logo"></single-upload>
-                    </el-form-item>
-                    <el-form-item label="选择主题">
-                        <el-radio-group v-model="formData.theme">
-                            <el-radio :label="item.value" v-for="(item, index) in themeOptions" :key="index">
-                                {{ item.label }}
-                            </el-radio>
-                        </el-radio-group>
-                    </el-form-item>
+                <el-tabs type="border-card" v-model="page">
+                    <el-tab-pane label="首页" name="home">
+                        <el-form
+                            :model="formData"
+                            :rules="rules"
+                            ref="form"
+                            label-width="125px"
+                            label-position="right"
+                            size="small"
+                            style="max-width: 750px"
+                        >
+                            <el-form-item prop="logo" label="LOGO">
+                                <single-upload v-model="formData.logo"></single-upload>
+                            </el-form-item>
+                            <el-form-item label="选择主题">
+                                <el-radio-group v-model="formData.theme">
+                                    <el-radio :label="item.value" v-for="(item, index) in themeOptions" :key="index">
+                                        {{ item.label }}
+                                    </el-radio>
+                                </el-radio-group>
+                            </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-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>
+                                <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                            </el-form-item>
+                        </el-form>
+                    </el-tab-pane>
+                    <el-tab-pane label="登录页" name="login">
+                        <el-form
+                            :model="formData"
+                            :rules="rules"
+                            ref="form"
+                            label-width="125px"
+                            label-position="right"
+                            size="small"
+                            style="max-width: 750px"
+                        >
+                            <el-form-item prop="bgImg" label="背景图">
+                                <single-upload v-model="formData.bgImg"></single-upload>
+                            </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>
+                    </el-tab-pane>
+                </el-tabs>
 
                 <div class="phone">
-                    <phone-module :theme="formData.theme" :companyInfo="formData"></phone-module>
+                    <phone-module :theme="formData.theme" :page="page" :companyInfo="formData"></phone-module>
                 </div>
             </div>
             <el-dialog title="添加藏品" :visible.sync="showCollectionDialog" width="500px">
@@ -88,6 +115,7 @@ export default {
             if (res.theme) {
                 this.formData.theme = res.theme;
                 this.formData.logo = res.logo;
+                this.formData.bgImg = res.bgImg;
             }
         });
     },
@@ -96,7 +124,8 @@ export default {
             saving: false,
             formData: {
                 theme: 'theme1',
-                logo: ''
+                logo: '',
+                bgImg: ''
             },
             rules: {},
             themeOptions: [
@@ -112,7 +141,8 @@ export default {
             collectionId: '',
             showBoxDialog: false,
             boxId: '',
-            collectionSize: 0
+            collectionSize: 0,
+            page: 'home'
         };
     },
     computed: {
@@ -123,7 +153,12 @@ export default {
             this.$http
                 .post(
                     '/company/save',
-                    { id: this.companyId, theme: this.formData.theme, logo: this.formData.logo },
+                    {
+                        id: this.companyId,
+                        theme: this.formData.theme,
+                        logo: this.formData.logo,
+                        bgImg: this.formData.bgImg
+                    },
                     { body: 'json' }
                 )
                 .then(res => {
@@ -279,7 +314,8 @@ export default {
         justify-content: center;
         // padding: 20px 0;
     }
-    .el-form {
+
+    .el-tabs {
         flex-grow: 1;
     }
 }

src/test/java/com/izouma/nineth/CommonTest.java

@@ -691,11 +691,6 @@ public class CommonTest {
 
     @Test
     public void testSet() {
-        Set<Tag> set = new HashSet<>();
-        set.add(new Tag(1L, "tag1", "tag1"));
-        set.add(new Tag(1L, "tag1", "tag1"));
-        set.add(new Tag(1L, "tag1", "tag1"));
-        System.out.println(set);
     }
 
     @Test