|
@@ -3,15 +3,18 @@ package com.izouma.nineth.web;
|
|
|
import com.izouma.nineth.config.Constants;
|
|
import com.izouma.nineth.config.Constants;
|
|
|
import com.izouma.nineth.config.MetaConstants;
|
|
import com.izouma.nineth.config.MetaConstants;
|
|
|
import com.izouma.nineth.domain.Asset;
|
|
import com.izouma.nineth.domain.Asset;
|
|
|
|
|
+import com.izouma.nineth.domain.MetaBagAssetEffectConfig;
|
|
|
import com.izouma.nineth.domain.MetaUserProp;
|
|
import com.izouma.nineth.domain.MetaUserProp;
|
|
|
import com.izouma.nineth.dto.MetaBagAssetDTO;
|
|
import com.izouma.nineth.dto.MetaBagAssetDTO;
|
|
|
import com.izouma.nineth.dto.MetaRestResult;
|
|
import com.izouma.nineth.dto.MetaRestResult;
|
|
|
import com.izouma.nineth.dto.MetaUserBagDTO;
|
|
import com.izouma.nineth.dto.MetaUserBagDTO;
|
|
|
import com.izouma.nineth.repo.AssetRepo;
|
|
import com.izouma.nineth.repo.AssetRepo;
|
|
|
|
|
+import com.izouma.nineth.repo.MetaBagAssetEffectConfigRepo;
|
|
|
import com.izouma.nineth.repo.MetaUserPropRepo;
|
|
import com.izouma.nineth.repo.MetaUserPropRepo;
|
|
|
import com.izouma.nineth.service.MetaParamsConfigService;
|
|
import com.izouma.nineth.service.MetaParamsConfigService;
|
|
|
import com.izouma.nineth.utils.SecurityUtils;
|
|
import com.izouma.nineth.utils.SecurityUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
|
|
|
+import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
@@ -37,23 +40,24 @@ public class MetaUserBagController {
|
|
|
|
|
|
|
|
private AssetRepo assetRepo;
|
|
private AssetRepo assetRepo;
|
|
|
|
|
|
|
|
|
|
+ private MetaBagAssetEffectConfigRepo metaBagAssetEffectConfigRepo;
|
|
|
|
|
+
|
|
|
@GetMapping("/query")
|
|
@GetMapping("/query")
|
|
|
public MetaRestResult<MetaUserBagDTO> queryMetaBag() {
|
|
public MetaRestResult<MetaUserBagDTO> queryMetaBag() {
|
|
|
Long userId = SecurityUtils.getAuthenticatedUser().getId();
|
|
Long userId = SecurityUtils.getAuthenticatedUser().getId();
|
|
|
List<MetaUserProp> metaUserProps = metaUserPropRepo.findByUserIdAndDel(userId, false);
|
|
List<MetaUserProp> metaUserProps = metaUserPropRepo.findByUserIdAndDel(userId, false);
|
|
|
String names = metaParamsConfigService.getString(MetaConstants.META_BAG_COLLECTION_NAME);
|
|
String names = metaParamsConfigService.getString(MetaConstants.META_BAG_COLLECTION_NAME);
|
|
|
List<MetaBagAssetDTO> metaBagAssetDTOS = queryAsset(names, userId);
|
|
List<MetaBagAssetDTO> metaBagAssetDTOS = queryAsset(names, userId);
|
|
|
- String canUseName = metaParamsConfigService.getString(MetaConstants.META_CAN_USE_COLLECTION_NAME);
|
|
|
|
|
- if (StringUtils.isBlank(canUseName)) {
|
|
|
|
|
|
|
+ List<MetaBagAssetEffectConfig> configs = metaBagAssetEffectConfigRepo.findAllByDel(false);
|
|
|
|
|
+ if (CollectionUtils.isEmpty(configs)) {
|
|
|
return MetaRestResult.returnSuccess(new MetaUserBagDTO(metaBagAssetDTOS, metaUserProps));
|
|
return MetaRestResult.returnSuccess(new MetaUserBagDTO(metaBagAssetDTOS, metaUserProps));
|
|
|
}
|
|
}
|
|
|
- String[] canUseNameList = canUseName.split(MetaConstants.COMMA);
|
|
|
|
|
for (MetaBagAssetDTO metaBagAssetDTO :
|
|
for (MetaBagAssetDTO metaBagAssetDTO :
|
|
|
metaBagAssetDTOS) {
|
|
metaBagAssetDTOS) {
|
|
|
- for (String s :
|
|
|
|
|
- canUseNameList) {
|
|
|
|
|
- if (metaBagAssetDTO.getName().contains(s)) {
|
|
|
|
|
- metaBagAssetDTO.setCanUse(Boolean.TRUE);
|
|
|
|
|
|
|
+ for (MetaBagAssetEffectConfig config :
|
|
|
|
|
+ configs) {
|
|
|
|
|
+ if (metaBagAssetDTO.getName().contains(config.getName())) {
|
|
|
|
|
+ metaBagAssetDTO.setEffectId(config.getEffectId());
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|