任务和签到添加频道

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

@@ -14,6 +14,8 @@ public interface MetaConstants {
 
     String META_LUCKY_DRAW_ID = "META_LUCKY_DRAW_ID";
 
-    String SPLIT = ",";
+    String COMMA = ",";
+
+    String BLANK = " ";
 
 }

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

@@ -1,6 +1,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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -43,4 +44,9 @@ public class MetaSign extends BaseEntity {
     @ApiModelProperty("金币奖励数量")
     @ExcelProperty("金币奖励数量")
     private int goldNum;
+
+    @ApiModelProperty("频道id")
+    @ExcelProperty("频道id")
+    @Searchable
+    private Long channelId;
 }

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

@@ -2,6 +2,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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -46,6 +47,11 @@ public class MetaSignAward extends BaseEntity {
     @ExcelProperty("道具id")
     private Long metaPropId;
 
+    @ApiModelProperty("频道id")
+    @ExcelProperty("频道id")
+    @Searchable
+    private Long channelId;
+
     @Transient
     @ApiModelProperty("是否领取过")
     @ExcelIgnore

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

@@ -1,6 +1,7 @@
 package com.izouma.nineth.domain;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.nineth.annotations.Searchable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -25,4 +26,9 @@ public class MetaSignRecord extends BaseEntity {
     @ExcelProperty("签到时间")
     private LocalDate signTime;
 
+    @ApiModelProperty("频道id")
+    @ExcelProperty("频道id")
+    @Searchable
+    private Long channelId;
+
 }

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

@@ -21,7 +21,7 @@ import javax.persistence.Enumerated;
 @NoArgsConstructor
 @Entity
 @ApiModel("元宇宙任务")
-public class MetaTask extends BaseEntity{
+public class MetaTask extends BaseEntity {
 
     @ApiModelProperty("任务名称")
     @Searchable
@@ -71,7 +71,12 @@ public class MetaTask extends BaseEntity{
     @ExcelProperty("是否自动领取")
     private boolean autoReceive;
 
-    @ApiModelProperty("道具id")
-    @ExcelProperty("道具id")
+    @ApiModelProperty("频道id")
+    @ExcelProperty("频道id")
     private Long metaPropId;
+
+    @ApiModelProperty("通道id")
+    @ExcelProperty("通道id")
+    @Searchable
+    private Long channelId;
 }

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

@@ -69,6 +69,11 @@ public class MetaTaskToUser extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private MetaTaskStatus status;
 
+    @ApiModelProperty("频道id")
+    @ExcelProperty("频道id")
+    @Searchable
+    private Long channelId;
+
     @Transient
     @ApiModelProperty("进度")
     @ExcelIgnore

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

@@ -7,10 +7,13 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface MetaChannelRepo extends JpaRepository<MetaChannel, Long>, JpaSpecificationExecutor<MetaChannel> {
     @Query("update MetaChannel t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+    List<MetaChannel> findAllByDel(boolean del);
 }

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

@@ -16,7 +16,7 @@ public interface MetaSignAwardRepo extends JpaRepository<MetaSignAward, Long>, J
     @Transactional
     void softDelete(Long id);
 
-    MetaSignAward findByDateAndSignNumAndDel(String date, int signNum, boolean del);
+    MetaSignAward findByDateAndChannelIdAndSignNumAndDel(String date, Long channelId, int signNum, boolean del);
 
-    List<MetaSignAward> findByDateAndDel(String date, boolean del);
+    List<MetaSignAward> findByDateAndChannelIdAndDel(String date, Long channelId, boolean del);
 }

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

@@ -17,8 +17,8 @@ public interface MetaSignRecordRepo extends JpaRepository<MetaSignRecord, Long>,
     @Transactional
     void softDelete(Long id);
 
-    MetaSignRecord findByUserIdAndSignTimeAndDel(Long userId, LocalDate signTime, boolean del);
+    MetaSignRecord findByUserIdAndChannelIdAndSignTimeAndDel(Long userId, Long channelId, 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);
+    @Query("SELECT m.signTime FROM MetaSignRecord m WHERE m.signTime >= ?1 AND m.signTime <= ?2 AND m.userId = ?3 AND m.channelId = ?4 ORDER BY m.signTime")
+    List<LocalDate> findSigns(LocalDate firstDay, LocalDate lastDay, Long userId, Long channelId);
 }

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

@@ -15,5 +15,5 @@ public interface MetaSignRepo extends JpaRepository<MetaSign, Long>, JpaSpecific
     @Transactional
     void softDelete(Long id);
 
-    MetaSign findByDateAndDel(String date, boolean del);
+    MetaSign findByDateAndChannelIdAndDel(String date, Long channelId, boolean del);
 }

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

@@ -19,6 +19,6 @@ public interface MetaTaskRepo extends JpaRepository<MetaTask, Long>, JpaSpecific
 
     List<MetaTask> findAllByPublishAndDelAndFinish(boolean publish, boolean del, boolean finish);
 
-    @Query(value = "select * from meta_task where finish = false and del = false and publish = true and id not in (select task_id from meta_task_to_user where user_id = ?1)", nativeQuery = true)
-    List<MetaTask> canGet(Long userId);
+    @Query(value = "select * from meta_task where finish = false and del = false and publish = true and channel_id = ?2 and id not in (select task_id from meta_task_to_user where user_id = ?1)", nativeQuery = true)
+    List<MetaTask> canGet(Long userId, Long channelId);
 }

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

@@ -19,7 +19,7 @@ public interface MetaTaskToUserRepo extends JpaRepository<MetaTaskToUser, Long>,
 
     MetaTaskToUser findByIdAndDel(Long id, boolean del);
 
-    List<MetaTaskToUser> findAllByUserIdAndStatusAndDel(Long userId, MetaTaskStatus status, boolean del);
+    List<MetaTaskToUser> findAllByUserIdAndChannelIdAndStatusAndDel(Long userId, Long channelId, MetaTaskStatus status, boolean del);
 
     @Modifying
     @Transactional

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

@@ -84,7 +84,7 @@ public class MetaSignAwardDrawRecordService {
         LocalDate firstDay = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
         // 获取当前月的最后一天
         LocalDate lastDay = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth());
-        List<LocalDate> metaSignRecords = metaSignRecordRepo.findSigns(firstDay, lastDay, userId);
+        List<LocalDate> metaSignRecords = metaSignRecordRepo.findSigns(firstDay, lastDay, userId, metaSignAward.getChannelId());
         int count = 0;
         if (CollectionUtils.isNotEmpty(metaSignRecords)) {
             count = metaSignRecords.size();

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

@@ -44,18 +44,19 @@ public class MetaSignRecordService {
     }
 
     @Transactional
-    public MetaRestResult<MetaSignRecord> save() {
+    public MetaRestResult<MetaSignRecord> save(Long channelId) {
         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);
+        MetaSignRecord dbMetaSignRecord = metaSignRecordRepo.findByUserIdAndChannelIdAndSignTimeAndDel(userId, channelId, signTime, false);
         if (Objects.nonNull(dbMetaSignRecord)) {
-            return MetaRestResult.returnError("今日已经签到，不可重复签到");
+            return MetaRestResult.returnError("该频道下今日已经签到，不可重复签到");
         }
         MetaSignRecord metaSignRecord = new MetaSignRecord();
         metaSignRecord.setSignTime(signTime);
         metaSignRecord.setUserId(userId);
-        MetaServiceResult result = drawAward(userId);
+        metaSignRecord.setChannelId(channelId);
+        MetaServiceResult result = drawAward(userId, channelId);
         if (!result.isSuccess()) {
             // 奖励领取失败，签到记录正常保存
             metaSignRecordRepo.save(metaSignRecord);
@@ -65,11 +66,11 @@ public class MetaSignRecordService {
     }
 
     @Transactional
-    public MetaServiceResult drawAward(Long userId) {
+    public MetaServiceResult drawAward(Long userId, Long channelId) {
         String yyyyMMDate = LocalDate.now().format(DateTimeFormatter.ofPattern(DateTimeUtils.DATE_FORMAT_YYYY_MM));
-        MetaSign metaSign = metaSignRepo.findByDateAndDel(yyyyMMDate, false);
+        MetaSign metaSign = metaSignRepo.findByDateAndChannelIdAndDel(yyyyMMDate, channelId, false);
         if (Objects.isNull(metaSign)) {
-            return MetaServiceResult.returnError(String.format("当前月份[%S]未配置签到规则和每日签到奖励", yyyyMMDate));
+            return MetaServiceResult.returnError(String.format("当前月份[%S]未配置该频道的签到规则和每日签到奖励", yyyyMMDate));
         }
         MetaAwardTypeEnum awardType = metaSign.getAwardType();
         MetaAwardReceiveDTO metaAwardReceiveDTO = new MetaAwardReceiveDTO();
@@ -83,14 +84,14 @@ public class MetaSignRecordService {
         return metaAwardReceiveService.receive(metaAwardReceiveDTO);
     }
 
-    public MetaRestResult<MetaSignProgressDTO> signProgress() {
+    public MetaRestResult<MetaSignProgressDTO> signProgress(Long channelId) {
         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);
+        List<MetaSignAward> metaSignAwards = metaSignAwardRepo.findByDateAndChannelIdAndDel(yyyyMMDate, channelId, false);
         if (CollectionUtils.isEmpty(metaSignAwards)) {
-            return MetaRestResult.returnError(String.format("当前月份[%S]未配置任何签到奖励", yyyyMMDate));
+            return MetaRestResult.returnError(String.format("当前月份[%S]未配置该频道任何签到奖励", yyyyMMDate));
         }
         List<Long> metaSignAwardIds = metaSignAwardDrawRecordRepo.findMetaSignAwardIdsByUserIdAndDateAndDel(userId, yyyyMMDate);
         if (CollectionUtils.isNotEmpty(metaSignAwardIds)) {
@@ -101,7 +102,7 @@ public class MetaSignRecordService {
             });
         }
         LocalDate yyyyMMddDate = LocalDate.parse(LocalDate.now().format(yyyyMMdd), yyyyMMdd);
-        MetaSignRecord metaSignRecord = metaSignRecordRepo.findByUserIdAndSignTimeAndDel(userId, yyyyMMddDate, false);
+        MetaSignRecord metaSignRecord = metaSignRecordRepo.findByUserIdAndChannelIdAndSignTimeAndDel(userId, channelId, yyyyMMddDate, false);
         String isSignIn = null;
         if (Objects.isNull(metaSignRecord)) {
             isSignIn = LocalDate.now().format(yyyyMMdd);
@@ -110,7 +111,7 @@ public class MetaSignRecordService {
         LocalDate firstDay = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
         // 获取当前月的最后一天
         LocalDate lastDay = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth());
-        List<LocalDate> metaSignRecords = metaSignRecordRepo.findSigns(firstDay, lastDay, userId);
+        List<LocalDate> metaSignRecords = metaSignRecordRepo.findSigns(firstDay, lastDay, userId, channelId);
         List<SignInCalendar> signInCalendars = queryAllDatesOfMonth();
         if (CollectionUtils.isNotEmpty(metaSignRecords)) {
             signInCalendars.forEach(signInCalendar -> {
@@ -119,9 +120,9 @@ public class MetaSignRecordService {
                 }
             });
         }
-        MetaSign metaSign = metaSignRepo.findByDateAndDel(yyyyMMDate, false);
+        MetaSign metaSign = metaSignRepo.findByDateAndChannelIdAndDel(yyyyMMDate, channelId, false);
         if (Objects.isNull(metaSign)) {
-            return MetaRestResult.returnError(String.format("当前月份[%S]未配置签到规则和每日签到奖励", yyyyMMDate));
+            return MetaRestResult.returnError(String.format("当前月份[%S]未配置该频道签到规则和每日签到奖励", yyyyMMDate));
         }
         MetaSignProgressDTO metaSignProgressDTO = new MetaSignProgressDTO();
         metaSignProgressDTO.setIsSignIn(isSignIn);

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

@@ -26,7 +26,7 @@ public class MetaTaskService {
     }
 
     @Transactional
-    public void finish( Long id) {
+    public void finish(Long id) {
         MetaTask metaTask = metaTaskRepo.findByIdAndDel(id, false);
         if (Objects.isNull(metaTask)) {
             throw new BusinessException("无记录");

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

@@ -86,25 +86,26 @@ public class MetaTaskToUserService {
         metaTaskToUser.setGetTime(LocalDateTime.now());
         metaTaskToUser.setAwardType(metaTask.getAwardType());
         metaTaskToUser.setStatus(MetaTaskStatus.PROGRESS);
+        metaTaskToUser.setChannelId(metaTask.getChannelId());
         MetaTaskToUser save = metaTaskToUserRepo.save(metaTaskToUser);
         setProgress(save);
         return MetaRestResult.returnSuccess(save);
     }
 
 
-    public MetaRestResult<List<MetaTaskToUser>> findByStatus(Long userId, MetaTaskStatus status) {
-        List<MetaTaskToUser> metaTaskToUsers = metaTaskToUserRepo.findAllByUserIdAndStatusAndDel(userId, status, false);
+    public MetaRestResult<List<MetaTaskToUser>> findByStatus(Long userId, Long channelId, MetaTaskStatus status) {
+        List<MetaTaskToUser> metaTaskToUsers = metaTaskToUserRepo.findAllByUserIdAndChannelIdAndStatusAndDel(userId, channelId, status, false);
         metaTaskToUsers.forEach(this::setProgress);
         return MetaRestResult.returnSuccess(metaTaskToUsers);
     }
 
     public MetaRestResult<MetaTaskToUser> findProgress(Long id) {
-        MetaTaskToUser metaTaskToUsers = metaTaskToUserRepo.findByIdAndDel(id, false);
-        if (Objects.isNull(metaTaskToUsers)) {
+        MetaTaskToUser metaTaskToUser = metaTaskToUserRepo.findByIdAndDel(id, false);
+        if (Objects.isNull(metaTaskToUser)) {
             return MetaRestResult.returnError(String.format("根据id[%S]查询不到用户领取记录", id));
         }
-        setProgress(metaTaskToUsers);
-        return MetaRestResult.returnSuccess(metaTaskToUsers);
+        setProgress(metaTaskToUser);
+        return MetaRestResult.returnSuccess(metaTaskToUser);
     }
 
 

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

@@ -1,14 +1,14 @@
 package com.izouma.nineth.web;
+
 import com.izouma.nineth.domain.MetaChannel;
-import com.izouma.nineth.service.MetaChannelService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.MetaChannelRepo;
+import com.izouma.nineth.service.MetaChannelService;
 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.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -56,5 +56,10 @@ public class MetaChannelController extends BaseController {
         List<MetaChannel> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
+
+    @GetMapping("/findAll")
+    public List<MetaChannel> findAll() {
+        return metaChannelRepo.findAllByDel(false);
+    }
 }
 

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

@@ -2,7 +2,6 @@ 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;
@@ -27,25 +26,13 @@ public class MetaSignAwardController extends BaseController {
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public MetaSignAward save(@RequestBody MetaSignAward record) {
-        MetaSignAward metaSignAward = metaSignAwardRepo.findByDateAndSignNumAndDel(record.getDate(), record.getSignNum(), false);
+        MetaSignAward metaSignAward = metaSignAwardRepo.findByDateAndChannelIdAndSignNumAndDel(record.getDate(), record.getChannelId(), record.getSignNum(), false);
         if (Objects.nonNull(metaSignAward) && !Objects.equals(metaSignAward.getId(), record.getId())) {
-            throw new BusinessException("该日期下累计签到天数的奖励配置已经存在！");
+            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.setMetaPropId(null);
-            }
-            if (MetaAwardTypeEnum.NFT.equals(record.getAwardType())) {
-                orig.setGoldNum(0);
-                orig.setMetaPropId(null);
-            }
-            if (MetaAwardTypeEnum.META_PROP.equals(record.getAwardType())) {
-                orig.setGoldNum(0);
-                orig.setAwardPic(null);
-            }
             return metaSignAwardRepo.save(orig);
         }
         return metaSignAwardRepo.save(record);

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

@@ -2,7 +2,6 @@ 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;
@@ -27,25 +26,13 @@ public class MetaSignController extends BaseController {
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public MetaSign save(@RequestBody MetaSign record) {
-        MetaSign metaSign = metaSignRepo.findByDateAndDel(record.getDate(), false);
+        MetaSign metaSign = metaSignRepo.findByDateAndChannelIdAndDel(record.getDate(), record.getChannelId(), false);
         if (Objects.nonNull(metaSign) && !Objects.equals(metaSign.getId(), record.getId())) {
-            throw new BusinessException("该月签到规则和每日签到奖励已经配置完成 不可重复配置！");
+            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.setMetaPropId(null);
-            }
-            if (MetaAwardTypeEnum.NFT.equals(record.getAwardType())) {
-                orig.setGoldNum(0);
-                orig.setMetaPropId(null);
-            }
-            if (MetaAwardTypeEnum.META_PROP.equals(record.getAwardType())) {
-                orig.setGoldNum(0);
-                orig.setAwardPic(null);
-            }
             return metaSignRepo.save(orig);
         }
         return metaSignRepo.save(record);

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

@@ -21,8 +21,8 @@ public class MetaSignRecordController extends BaseController {
     private MetaSignRecordService metaSignRecordService;
 
     @PostMapping("/save")
-    public MetaRestResult<MetaSignRecord> save() {
-        return metaSignRecordService.save();
+    public MetaRestResult<MetaSignRecord> save(Long channelId) {
+        return metaSignRecordService.save(channelId);
     }
 
     @PostMapping("/all")
@@ -37,9 +37,9 @@ public class MetaSignRecordController extends BaseController {
         ExcelUtils.export(response, data);
     }
 
-    @GetMapping("/signProgress")
-    public MetaRestResult<MetaSignProgressDTO> signProgress() {
-        return metaSignRecordService.signProgress();
+    @GetMapping("{channelId}/signProgress")
+    public MetaRestResult<MetaSignProgressDTO> signProgress(@PathVariable Long channelId) {
+        return metaSignRecordService.signProgress(channelId);
     }
 }
 

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

@@ -1,5 +1,6 @@
 package com.izouma.nineth.web;
 
+import com.izouma.nineth.config.MetaConstants;
 import com.izouma.nineth.domain.MetaTask;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
@@ -36,7 +37,7 @@ public class MetaTaskController extends BaseController {
     @PostMapping("/save")
     public MetaTask save(@RequestBody MetaTask record) {
         if (record.getType().equals(MetaTaskType.COLLECT_COLLECTION)) {
-            String[] split = record.getValue().split(" ");
+            String[] split = record.getValue().split(MetaConstants.BLANK);
             Arrays.stream(split).forEach(collectionId -> {
                 collectionRepo.findByIdAndDelFalse(Long.parseLong(collectionId)).orElseThrow(new BusinessException(String.format("不存在collectionId[%S]的藏品", collectionId)));
             });
@@ -91,9 +92,9 @@ public class MetaTaskController extends BaseController {
         return MetaRestResult.returnSuccess(metaTasks);
     }
 
-    @GetMapping("/{userId}/canGet")
-    public MetaRestResult<List<MetaTask>> canGet(@PathVariable Long userId) {
-        List<MetaTask> metaTasks = metaTaskRepo.canGet(userId);
+    @GetMapping("/{userId}/{channelId}/canGet")
+    public MetaRestResult<List<MetaTask>> canGet(@PathVariable Long userId, @PathVariable Long channelId) {
+        List<MetaTask> metaTasks = metaTaskRepo.canGet(userId, channelId);
         return MetaRestResult.returnSuccess(metaTasks);
     }
 

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

@@ -57,9 +57,9 @@ public class MetaTaskToUserController {
         return MetaRestResult.returnSuccess(metaTaskToUserRepo.save(metaTaskToUser));
     }
 
-    @GetMapping("/{userId}/{status}/findByStatus")
-    public MetaRestResult<List<MetaTaskToUser>> findByStatus(@PathVariable Long userId, @PathVariable MetaTaskStatus status) {
-        return metaTaskToUserService.findByStatus(userId, status);
+    @GetMapping("/{userId}/{channelId}/{status}/findByStatus")
+    public MetaRestResult<List<MetaTaskToUser>> findByStatus(@PathVariable Long userId, @PathVariable Long channelId, @PathVariable MetaTaskStatus status) {
+        return metaTaskToUserService.findByStatus(userId, channelId, status);
     }
 
     @GetMapping("/{id}/findProgress")

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

@@ -45,7 +45,7 @@ public class MetaUserBagController {
         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.SPLIT));
+            List<String> ids = Arrays.asList(id.split(MetaConstants.COMMA));
             metaBagAssetDTOS.forEach(metaBagAssetDTO -> {
                 metaBagAssetDTO.setCanUse(ids.contains(String.valueOf(metaBagAssetDTO.getCollectionId())));
             });
@@ -62,7 +62,7 @@ public class MetaUserBagController {
             });
             return metaBagAssetDTOS;
         }
-        List<String> nameList = Arrays.asList(names.split(MetaConstants.SPLIT));
+        List<String> nameList = Arrays.asList(names.split(MetaConstants.COMMA));
         nameList.forEach(
                 name -> {
                     List<Asset> assets = assetRepo.findAllByUserIdAndStatusInAndNameLike(userId, Constants.META_NORMAL_STATUS, MetaConstants.LIKE.concat(name).concat(MetaConstants.LIKE));

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

@@ -76,6 +76,12 @@
                         <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 label="所属频道" prop="channelId">
+                        <el-select v-model="formData.channelId" placeholder="请选择" style="width: 100%">
+                            <el-option v-for="item in channels" :key="item.id" :label="item.name" :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </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">
@@ -107,9 +113,13 @@ export default {
         this.$http.get('/metaProp/findAll').then(res => {
             this.metaProps = res;
         });
+        this.$http.get('/metaChannel/findAll').then(res => {
+			this.channels = res;
+		});
     },
     data() {
         return {
+            channels: [],
             metaProps: [],
             saving: false,
             reg,
@@ -176,7 +186,14 @@ export default {
                             }
                         }
                     }
-                ]
+                ],
+                channelId: [
+					{
+						required: true,
+						message: '请选择所属通道',
+						trigger: 'blur'
+					}
+				]
             },
             awardTypeOptions: [
 				{ label: '金币', value: 'GOLD' },

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

@@ -71,6 +71,7 @@
 					<template v-else> {{ }} </template>
 				</template>
 			</el-table-column>
+			<el-table-column prop="channelId" align="center" 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>

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

@@ -81,6 +81,12 @@
 						<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 label="所属频道" prop="channelId">
+                        <el-select v-model="formData.channelId" placeholder="请选择" style="width: 100%">
+                            <el-option v-for="item in channels" :key="item.id" :label="item.name" :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </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">
@@ -112,9 +118,13 @@ export default {
 		this.$http.get('/metaProp/findAll').then(res => {
             this.metaProps = res;
         });
+		this.$http.get('/metaChannel/findAll').then(res => {
+			this.channels = res;
+		});
 	},
 	data() {
 		return {
+			channels: [],
 			metaProps: [],
 			saving: false,
 			reg,
@@ -171,6 +181,13 @@ export default {
 							}
 						}
 					}
+				],
+				channelId: [
+					{
+						required: true,
+						message: '请选择所属通道',
+						trigger: 'blur'
+					}
 				]
 			},
 			awardTypeOptions: [

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

@@ -71,6 +71,7 @@
 					<template v-else> {{ }} </template>
 				</template>
 			</el-table-column>
+			<el-table-column prop="channelId" align="center" 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>

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

@@ -37,6 +37,7 @@
 			<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-column prop="channelId" align="center" label="所属频道"> </el-table-column>
 		</el-table>
 		<div class="pagination-wrapper">
 			<el-pagination

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

@@ -7,78 +7,43 @@
         </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 :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 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-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="metaPropId"
-                        label="道具"
-                        v-if="formData.awardType && formData.awardType === 'META_PROP'"
-                    >
+                    <el-form-item prop="metaPropId" label="道具"
+                        v-if="formData.awardType && formData.awardType === 'META_PROP'">
                         <el-select v-model="formData.metaPropId" placeholder="请选择" filterable>
                             <el-option v-for="item in metaProps" :key="item.id" :label="item.name" :value="item.id">
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item
-                        prop="awardPic"
-                        label="奖励图片"
-                        v-if="formData.awardType && formData.awardType === 'NFT'"
-                    >
+                    <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-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 v-for="item in typeOptions" :key="item.value" :label="item.label"
+                                :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -112,6 +77,12 @@
                             <el-input-number v-model="formData.value" :min="0"> </el-input-number>
                         </el-form-item>
                     </template>
+                    <el-form-item label="所属频道" prop="channelId">
+                        <el-select v-model="formData.channelId" placeholder="请选择" style="width: 100%">
+                            <el-option v-for="item in channels" :key="item.id" :label="item.name" :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item prop="autoReceive" label="是否自动领取">
                         <el-switch v-model="formData.autoReceive"> </el-switch>
                     </el-form-item>
@@ -136,168 +107,177 @@
 <script>
 import { reg } from '../util/regRules';
 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);
-                });
-        }
-        this.$http.get('/metaProp/findAll').then(res => {
-            this.metaProps = res;
-        });
-    },
-    data() {
-        return {
-            metaProps: [],
-            reg,
-            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'
-                    }
-                ],
-                metaPropId: [
-                    {
-                        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: '金币', value: 'GOLD' },
-                { label: 'NFT', value: 'NFT' },
-                { label: '元宇宙道具', value: 'META_PROP' }
-            ]
-        };
-    },
-    methods: {
-        changeAwardType(row) {
-            this.$delete(this.formData, 'metaPropId');
-            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);
+				});
+		}
+		this.$http.get('/metaProp/findAll').then(res => {
+			this.metaProps = res;
+		});
+		this.$http.get('/metaChannel/findAll').then(res => {
+			this.channels = res;
+		});
+	},
+	data() {
+		return {
+			channels: [],
+			metaProps: [],
+			reg,
+			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'
+					}
+				],
+				metaPropId: [
+					{
+						required: true,
+						message: '请选择道具',
+						trigger: 'blur'
+					}
+				],
+				channelId: [
+					{
+						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: '金币', value: 'GOLD' },
+				{ label: 'NFT', value: 'NFT' },
+				{ label: '元宇宙道具', value: 'META_PROP' }
+			]
+		};
+	},
+	methods: {
+		changeAwardType(row) {
+			this.$delete(this.formData, 'metaPropId');
+			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>
-
-</style>
+<style lang="less" scoped></style>

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

@@ -68,6 +68,7 @@
                     <el-tag :type="row.autoReceive ? '' : 'info'"> {{ row.autoReceive }} </el-tag>
                 </template>
             </el-table-column>
+            <el-table-column prop="channelId" 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>

src/main/vue/src/views/MetaTaskToUserList.vue

@@ -34,16 +34,17 @@
             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"> </el-table-column>
-            <el-table-column prop="userId" label="用户id"> </el-table-column>
-            <el-table-column prop="getTime" label="领取时间"> </el-table-column>
-            <el-table-column prop="finishTime" label="完成时间"> </el-table-column>
-            <el-table-column prop="taskId" label="任务id"> </el-table-column>
-            <el-table-column prop="taskName" label="任务名称"> </el-table-column>
-            <el-table-column prop="detail" label="详情"> </el-table-column>
-            <el-table-column prop="taskType" label="任务类型" :formatter="taskTypeFormatter"> </el-table-column>
-            <el-table-column prop="status" label="当前状态" :formatter="taskStatusFormatter"> </el-table-column>
-            <el-table-column prop="awardPic" label="奖励图片">
+            <el-table-column prop="id" align="center" label="ID"> </el-table-column>
+            <el-table-column prop="userId" align="center" label="用户id"> </el-table-column>
+            <el-table-column prop="getTime" align="center" label="领取时间"> </el-table-column>
+            <el-table-column prop="finishTime" align="center" label="完成时间"> </el-table-column>
+            <el-table-column prop="taskId" align="center" label="任务id"> </el-table-column>
+            <el-table-column prop="taskName" align="center" label="任务名称"> </el-table-column>
+            <el-table-column prop="channelId" align="center" label="所属频道"> </el-table-column>
+            <el-table-column prop="detail" align="center" label="详情"> </el-table-column>
+            <el-table-column prop="taskType" align="center" label="任务类型" :formatter="taskTypeFormatter"> </el-table-column>
+            <el-table-column prop="status" align="center" label="当前状态" :formatter="taskStatusFormatter"> </el-table-column>
+            <el-table-column prop="awardPic" align="center" label="奖励图片">
                 <template slot-scope="{ row }">
                     <el-image
                         style="width: 30px; height: 30px"