Merge branch 'dev-meta' of xiongzhu/raex_back into master

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

@@ -10,7 +10,7 @@ public interface MetaConstants {
 
     String META_BAG_COLLECTION_NAME = "META_BAG_COLLECTION_NAME";
 
-    String META_CAN_USE_COLLECTION_ID = "META_CAN_USE_COLLECTION_ID";
+    String META_CAN_USE_COLLECTION_NAME = "META_CAN_USE_COLLECTION_NAME";
 
     String META_LUCKY_DRAW_ID = "META_LUCKY_DRAW_ID";
 

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

@@ -4,6 +4,7 @@ package com.izouma.nineth.domain;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.nineth.annotations.Searchable;
 import com.izouma.nineth.enums.MetaAwardTypeEnum;
+import com.izouma.nineth.enums.MetaTaskClassification;
 import com.izouma.nineth.enums.MetaTaskType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -38,6 +39,11 @@ public class MetaTask extends BaseEntity {
     @ExcelProperty("任务类型")
     private MetaTaskType type;
 
+    @ApiModelProperty("任务分类")
+    @Enumerated(EnumType.STRING)
+    @ExcelProperty("任务分类")
+    private MetaTaskClassification classification;
+
     @ApiModelProperty("参数配置")
     @ExcelProperty("参数")
     private String value;

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

@@ -0,0 +1,22 @@
+package com.izouma.nineth.enums;
+
+public enum MetaTaskClassification {
+
+    MAIN_LINE("主线任务"),
+
+    BRANCH_LINE("支线任务"),
+
+    NODE("节点任务"),
+
+    DAILY("日常任务");
+
+    private final String description;
+
+    MetaTaskClassification(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

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

@@ -43,12 +43,20 @@ public class MetaUserBagController {
         List<MetaUserProp> metaUserProps = metaUserPropRepo.findByUserIdAndDel(userId, false);
         String names = metaParamsConfigService.getString(MetaConstants.META_BAG_COLLECTION_NAME);
         List<MetaBagAssetDTO> metaBagAssetDTOS = queryAsset(names, userId);
-        String id = metaParamsConfigService.getString(MetaConstants.META_CAN_USE_COLLECTION_ID);
-        if (StringUtils.isNotBlank(id)) {
-            List<String> ids = Arrays.asList(id.split(MetaConstants.COMMA));
-            metaBagAssetDTOS.forEach(metaBagAssetDTO -> {
-                metaBagAssetDTO.setCanUse(ids.contains(String.valueOf(metaBagAssetDTO.getCollectionId())));
-            });
+        String canUseName = metaParamsConfigService.getString(MetaConstants.META_CAN_USE_COLLECTION_NAME);
+        if (StringUtils.isBlank(canUseName)) {
+            return MetaRestResult.returnSuccess(new MetaUserBagDTO(metaBagAssetDTOS, metaUserProps));
+        }
+        String[] canUseNameList = canUseName.split(MetaConstants.COMMA);
+        for (MetaBagAssetDTO metaBagAssetDTO :
+                metaBagAssetDTOS) {
+            for (String s :
+                    canUseNameList) {
+                if (metaBagAssetDTO.getName().contains(s)) {
+                    metaBagAssetDTO.setCanUse(Boolean.TRUE);
+                    break;
+                }
+            }
         }
         return MetaRestResult.returnSuccess(new MetaUserBagDTO(metaBagAssetDTOS, metaUserProps));
     }