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

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

@@ -26,15 +26,11 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaAccessoriesService {
 
-    private MetaAccessoriesRepo metaAccessoriesRepo;
-
+    private MetaAccessoriesRepo               metaAccessoriesRepo;
     private MetaAccessoriesPurchaseRecordRepo metaAccessoriesPurchaseRecordRepo;
-
-    private MetaUserGoldService metaUserGoldService;
-
-    private MetaUserGoldController metaUserGoldController;
-
-    private AssetRepo assetRepo;
+    private MetaUserGoldService               metaUserGoldService;
+    private MetaUserGoldController            metaUserGoldController;
+    private AssetRepo                         assetRepo;
 
     public Page<MetaAccessories> all(PageQuery pageQuery) {
         return metaAccessoriesRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaAccessories.class), JpaUtils.toPageRequest(pageQuery));

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

@@ -20,7 +20,6 @@ import java.util.Objects;
 public class MetaAwardReceiveService {
 
     private MetaUserGoldService metaUserGoldService;
-
     private MetaUserPropService metaUserPropService;
 
     @Transactional

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

@@ -23,9 +23,7 @@ import java.util.Objects;
 public class MetaBoatPositionService {
 
     private MetaBoatPositionRepo metaBoatPositionRepo;
-
-    private MetaSpatialInfoRepo metaSpatialInfoRepo;
-
+    private MetaSpatialInfoRepo  metaSpatialInfoRepo;
     private MetaSpatialWharfRepo metaSpatialWharfRepo;
 
     public Page<MetaBoatPosition> all(PageQuery pageQuery) {

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

@@ -18,8 +18,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaEmailService {
 
-    private MetaEmailRepo metaEmailRepo;
-
+    private MetaEmailRepo       metaEmailRepo;
     private MetaEmailRecordRepo metaEmailRecordRepo;
 
     public Page<MetaEmail> all(PageQuery pageQuery) {

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

@@ -24,15 +24,10 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaGameCopyService {
 
-    private MetaGameCopyRepo metaGameCopyRepo;
-
+    private MetaGameCopyRepo    metaGameCopyRepo;
     private MetaGameProcessRepo metaGameProcessRepo;
-
-    private MetaZombieRepo metaZombieRepo;
-
-    private UserRepo userRepo;
-
-    private MetaAwardReceiveService metaAwardReceiveService;
+    private MetaZombieRepo      metaZombieRepo;
+    private UserRepo            userRepo;
 
     public Page<MetaGameCopy> all(PageQuery pageQuery) {
         return metaGameCopyRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaGameCopy.class), JpaUtils.toPageRequest(pageQuery));

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

@@ -30,10 +30,8 @@ import java.util.Objects;
 public class MetaLuckyDrawAwardReceiveRecordService {
 
     private MetaLuckyDrawAwardReceiveRecordRepo metaLuckyDrawAwardReceiveRecordRepo;
-
-    private MetaLuckyDrawRepo metaLuckyDrawRepo;
-
-    private MetaAwardReceiveService metaAwardReceiveService;
+    private MetaLuckyDrawRepo                   metaLuckyDrawRepo;
+    private MetaAwardReceiveService             metaAwardReceiveService;
 
     public Page<MetaLuckyDrawAwardReceiveRecord> all(PageQuery pageQuery) {
         return metaLuckyDrawAwardReceiveRecordRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaLuckyDrawAwardReceiveRecord.class), JpaUtils.toPageRequest(pageQuery));

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

@@ -26,10 +26,8 @@ import java.util.stream.Collectors;
 public class MetaPlayerInfoService {
 
     private SpaceObjectsInfoRepo spaceObjectsInfoRepo;
-
-    private AssetRepo assetRepo;
-
-    private MetaItemRepo metaItemRepo;
+    private AssetRepo            assetRepo;
+    private MetaItemRepo         metaItemRepo;
 
     @Transactional
     public MetaRestResult<SpaceObjectsInfo> metaSpaceInfo(Long userId, Long spaceId) {

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

@@ -21,7 +21,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaPlayerRoleClassifyService {
 
-    private AssetRepo assetRepo;
+    private AssetRepo                  assetRepo;
     private MetaPlayerRoleClassifyRepo metaPlayerRoleClassifyRepo;
 
     public Page<MetaPlayerRoleClassify> all(PageQuery pageQuery) {
@@ -36,7 +36,7 @@ public class MetaPlayerRoleClassifyService {
         metaPlayerRoleClassifies.forEach(metaPlayerRoleClassify -> {
             metaPlayerRoleClassify.setMetaPlayerRoleList(build(userId, metaPlayerRoleClassify.getMetaPlayerRoleList()));
         });
-        return  metaPlayerRoleClassifies;
+        return metaPlayerRoleClassifies;
     }
 
     private List<MetaPlayerRole> build(Long userId, List<MetaPlayerRole> metaPlayerRoleList) {

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

@@ -23,8 +23,7 @@ import java.util.Map;
 @AllArgsConstructor
 public class MetaRankService {
 
-    private MetaRankRepo metaRankRepo;
-
+    private MetaRankRepo              metaRankRepo;
     private MetaUserGoldRecordService metaUserGoldRecordService;
 
     public Page<MetaRank> all(PageQuery pageQuery) {

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

@@ -25,17 +25,12 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaShowRoomAssetService {
 
-    private MetaShowRoomAssetRepo metaShowRoomAssetRepo;
-
-    private AssetRepo assetRepo;
-
-    private MetaItemRepo metaItemRepo;
-
-    private SysConfigService sysConfigService;
-
-    private final String URL_PREFIX_TEST = "https://test.raex.vip/9th/assetDetail?id=";
-
-    private final String URL_PREFIX = "https://www.raex.vip/9th/assetDetail?id=";
+    private       MetaShowRoomAssetRepo metaShowRoomAssetRepo;
+    private       AssetRepo             assetRepo;
+    private       MetaItemRepo          metaItemRepo;
+    private       SysConfigService      sysConfigService;
+    private final String                URL_PREFIX_TEST = "https://test.raex.vip/9th/assetDetail?id=";
+    private final String                URL_PREFIX      = "https://www.raex.vip/9th/assetDetail?id=";
 
     public Page<MetaShowRoomAsset> all(PageQuery pageQuery) {
         return metaShowRoomAssetRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaShowRoomAsset.class), JpaUtils.toPageRequest(pageQuery));

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

@@ -30,12 +30,9 @@ import java.util.Objects;
 public class MetaSignAwardDrawRecordService {
 
     private MetaSignAwardDrawRecordRepo metaSignAwardDrawRecordRepo;
-
-    private MetaSignAwardRepo metaSignAwardRepo;
-
-    private MetaSignRecordRepo metaSignRecordRepo;
-
-    private MetaAwardReceiveService metaAwardReceiveService;
+    private MetaSignAwardRepo           metaSignAwardRepo;
+    private MetaSignRecordRepo          metaSignRecordRepo;
+    private MetaAwardReceiveService     metaAwardReceiveService;
 
     public Page<MetaSignAwardDrawRecord> all(PageQuery pageQuery) {
         return metaSignAwardDrawRecordRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaSignAwardDrawRecord.class), JpaUtils.toPageRequest(pageQuery));

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

@@ -29,15 +29,11 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaSignRecordService {
 
-    private MetaSignRecordRepo metaSignRecordRepo;
-
-    private MetaSignAwardRepo metaSignAwardRepo;
-
+    private MetaSignRecordRepo          metaSignRecordRepo;
+    private MetaSignAwardRepo           metaSignAwardRepo;
     private MetaSignAwardDrawRecordRepo metaSignAwardDrawRecordRepo;
-
-    private MetaSignRepo metaSignRepo;
-
-    private MetaAwardReceiveService metaAwardReceiveService;
+    private MetaSignRepo                metaSignRepo;
+    private MetaAwardReceiveService     metaAwardReceiveService;
 
     public Page<MetaSignRecord> all(PageQuery pageQuery) {
         return metaSignRecordRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaSignRecord.class), JpaUtils.toPageRequest(pageQuery));

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

@@ -20,8 +20,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaSpatialInfoService {
 
-    private MetaSpatialInfoRepo metaSpatialInfoRepo;
-
+    private MetaSpatialInfoRepo  metaSpatialInfoRepo;
     private SpaceObjectsInfoRepo spaceObjectsInfoRepo;
 
     public Page<MetaSpatialInfo> all(PageQuery pageQuery) {

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

@@ -24,11 +24,9 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaSpatialWharfService {
 
-    private MetaSpatialWharfRepo metaSpatialWharfRepo;
-
-    private AssetRepo assetRepo;
-
-    private final String BOAT_NAME = "%僵尸%";
+    private       MetaSpatialWharfRepo metaSpatialWharfRepo;
+    private       AssetRepo            assetRepo;
+    private final String               BOAT_NAME = "%僵尸%";
 
     public Page<MetaSpatialWharf> all(PageQuery pageQuery) {
         return metaSpatialWharfRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaSpatialWharf.class), JpaUtils.toPageRequest(pageQuery));

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

@@ -31,18 +31,12 @@ import java.util.Objects;
 public class MetaStoreService {
 
     private RedisTemplate<String, String> redisTemplate;
-
-    private MetaStoreRepo metaStoreRepo;
-
-    private MetaPropRepo metaPropRepo;
-
-    private MetaUserPropRepo metaUserPropRepo;
-
-    private MetaUserGoldService metaUserGoldService;
-
-    private MetaUserPropRecordService metaUserPropRecordService;
-
-    private MetaStorePurchaseRecordRepo metaStorePurchaseRecordRepo;
+    private MetaStoreRepo                 metaStoreRepo;
+    private MetaPropRepo                  metaPropRepo;
+    private MetaUserPropRepo              metaUserPropRepo;
+    private MetaUserGoldService           metaUserGoldService;
+    private MetaUserPropRecordService     metaUserPropRecordService;
+    private MetaStorePurchaseRecordRepo   metaStorePurchaseRecordRepo;
 
     public Page<MetaStore> all(PageQuery pageQuery) {
         return metaStoreRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaStore.class), JpaUtils.toPageRequest(pageQuery));

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

@@ -21,8 +21,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaTaskNewService {
 
-    private MetaTaskNewRepo metaTaskNewRepo;
-
+    private MetaTaskNewRepo  metaTaskNewRepo;
     private MetaTaskBindRepo metaTaskBindRepo;
 
     public MetaTaskNew save(MetaTaskNew record) {

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

@@ -17,8 +17,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaTaskService {
 
-    private MetaTaskRepo metaTaskRepo;
-
+    private MetaTaskRepo       metaTaskRepo;
     private MetaTaskToUserRepo metaTaskToUserRepo;
 
     public Page<MetaTask> all(PageQuery pageQuery) {

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

@@ -30,20 +30,13 @@ import java.util.Objects;
 @Slf4j
 public class MetaTaskToUserNewService {
 
-    private MetaTaskToUserNewRepo metaTaskToUserNewRepo;
-
-    private MetaAtomTaskRepo metaAtomTaskRepo;
-
-    private MetaTaskNewRepo metaTaskNewRepo;
-
-    private MetaPropRepo metaPropRepo;
-
-    private MetaTaskBindRepo metaTaskBindRepo;
-
+    private MetaTaskToUserNewRepo       metaTaskToUserNewRepo;
+    private MetaAtomTaskRepo            metaAtomTaskRepo;
+    private MetaTaskNewRepo             metaTaskNewRepo;
+    private MetaPropRepo                metaPropRepo;
+    private MetaTaskBindRepo            metaTaskBindRepo;
     private MetaUserTaskProgressNewRepo metaUserTaskProgressNewRepo;
 
-    private final String PREFIX = "0/";
-
     public Page<MetaTaskToUserNew> all(PageQuery pageQuery) {
         return metaTaskToUserNewRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaTaskToUserNew.class), JpaUtils.toPageRequest(pageQuery));
     }
@@ -178,6 +171,7 @@ public class MetaTaskToUserNewService {
         List<MetaTaskToUserNew> completed = metaTaskToUserNewRepo.findAllByUserIdAndStatusAndDelAndAtomTaskIdIn(metaTaskToUserNew.getUserId(), MetaTaskStatus.COMPLETION, false, atomTaskIds);
         metaTaskToUserNew.setProcess(String.valueOf(completed.size()).concat("/").concat(String.valueOf(atomTaskIds.size())));
         String value = metaAtomTask.getTargetConfig();
+        String PREFIX = "0/";
         switch (metaAtomTask.getTargetType()) {
             case COLLECT_COLLECTION:
                 if (StringUtils.isBlank(value)) {

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

@@ -30,15 +30,10 @@ import java.util.Objects;
 @Slf4j
 public class MetaTaskToUserService {
 
-    private MetaTaskToUserRepo metaTaskToUserRepo;
-
-    private MetaTaskRepo metaTaskRepo;
-
+    private MetaTaskToUserRepo       metaTaskToUserRepo;
+    private MetaTaskRepo             metaTaskRepo;
     private MetaUserTaskProgressRepo metaUserTaskProgressRepo;
-
-    private final String PREFIX = "0/";
-
-    private MetaPropRepo metaPropRepo;
+    private MetaPropRepo             metaPropRepo;
 
     public Page<MetaTaskToUser> all(PageQuery pageQuery) {
         return metaTaskToUserRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaTaskToUser.class), JpaUtils.toPageRequest(pageQuery));
@@ -136,19 +131,8 @@ public class MetaTaskToUserService {
             log.error("任务信息为空");
         }
         String value = metaTask.getValue();
+        String PREFIX = "0/";
         switch (metaTaskToUser.getTaskType()) {
-//            case SIGN_IN_SINGLE_DAY:
-//                List<MetaUserTaskProgress> signInSingleDay = metaUserTaskProgressRepo.findAllByMetaTaskToUserIdAndDel(metaTaskToUser.getId(), false);
-//                if (CollectionUtils.isEmpty(signInSingleDay)) {
-//                    metaTaskToUser.setProcess(PREFIX.concat("1"));
-//                    break;
-//                }
-//                metaTaskToUser.setProcess(String.valueOf(signInSingleDay.size()).concat("/1"));
-//                break;
-//            case SIGN_IN_CONTINUOUS:
-//                int num = countSignIn(value, metaTaskToUser.getId());
-//                metaTaskToUser.setProcess(String.valueOf(num).concat("/7"));
-//                break;
             case COLLECT_COLLECTION:
                 if (StringUtils.isBlank(value)) {
                     String errMsg = "任务进度显示异常，缺少藏品id配置";
@@ -173,7 +157,7 @@ public class MetaTaskToUserService {
                 }
                 MetaUserTaskProgress onLineTimeDaily = metaUserTaskProgressRepo.findByMetaTaskToUserIdAndDelAndCreatedAtAfter(metaTaskToUser.getId(), false, LocalDateTime.now().withHour(0).withMinute(0).withSecond(0));
                 if (Objects.isNull(onLineTimeDaily)) {
-                    metaTaskToUser.setProcess("0");
+                    metaTaskToUser.setProcess(PREFIX.concat(value));
                     break;
                 }
                 metaTaskToUser.setProcess(onLineTimeDaily.getRemark().concat("/").concat(value));

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

@@ -21,8 +21,7 @@ import java.util.Map;
 @AllArgsConstructor
 public class MetaUserGoldRecordService {
 
-    private MetaUserGoldRecordRepo metaUserGoldRecordRepo;
-
+    private MetaUserGoldRecordRepo  metaUserGoldRecordRepo;
     private MetaParamsConfigService metaParamsConfigService;
 
     public Page<MetaUserGoldRecord> all(PageQuery pageQuery) {

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

@@ -25,11 +25,9 @@ import java.util.stream.Collectors;
 @Slf4j
 public class MetaUserGoldService {
 
-    private MetaUserGoldRepo metaUserGoldRepo;
-
+    private MetaUserGoldRepo       metaUserGoldRepo;
     private MetaUserGoldRecordRepo metaUserGoldRecordRepo;
-
-    private UserRepo userRepo;
+    private UserRepo               userRepo;
 
     public Page<MetaUserGold> all(PageQuery pageQuery) {
         return metaUserGoldRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaUserGold.class), JpaUtils.toPageRequest(pageQuery));

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

@@ -20,13 +20,10 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaUserPropService {
 
-    private MetaUserPropRepo metaUserPropRepo;
-
-    private MetaPropRepo metaPropRepo;
-
+    private MetaUserPropRepo          metaUserPropRepo;
+    private MetaPropRepo              metaPropRepo;
     private MetaUserPropRecordService metaUserPropRecordService;
-
-    private MetaUserGoldService metaUserGoldService;
+    private MetaUserGoldService       metaUserGoldService;
 
     public Page<MetaUserProp> all(PageQuery pageQuery) {
         return metaUserPropRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaUserProp.class), JpaUtils.toPageRequest(pageQuery));

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

@@ -27,12 +27,9 @@ import java.util.Objects;
 public class MetaUserTaskAwardReceivedRecordNewService {
 
     private MetaUserTaskAwardReceivedRecordNewRepo metaUserTaskAwardReceivedRecordNewRepo;
-
-    private MetaTaskToUserNewRepo metaTaskToUserNewRepo;
-
-    private MetaAtomTaskRepo metaAtomTaskRepo;
-
-    private MetaAwardReceiveService metaAwardReceiveService;
+    private MetaTaskToUserNewRepo                  metaTaskToUserNewRepo;
+    private MetaAtomTaskRepo                       metaAtomTaskRepo;
+    private MetaAwardReceiveService                metaAwardReceiveService;
 
     public Page<MetaUserTaskAwardReceivedRecordNew> all(PageQuery pageQuery) {
         return metaUserTaskAwardReceivedRecordNewRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaUserTaskAwardReceivedRecordNew.class), JpaUtils.toPageRequest(pageQuery));
@@ -49,9 +46,6 @@ public class MetaUserTaskAwardReceivedRecordNewService {
         if (Objects.isNull(metaTaskToUserNew)) {
             return MetaRestResult.returnError("奖励领取失败：用户未领取过该任务！");
         }
-        if (MetaTaskStatus.PROGRESS.equals(metaTaskToUserNew.getStatus()) || MetaTaskStatus.FINISH.equals(metaTaskToUserNew.getStatus())) {
-            return MetaRestResult.returnError(String.format("奖励领取失败：当前任务状态为[%S]", metaTaskToUserNew.getStatus().getDescription()));
-        }
         if (MetaTaskTarget.ON_LINE_TIME_DAILY.equals(metaAtomTask.getTargetType())) {
             MetaUserTaskAwardReceivedRecordNew metaUserTaskAwardReceivedRecordNew = metaUserTaskAwardReceivedRecordNewRepo.findByUserIdAndTaskIdAndAtomTaskIdAndDelAndReceivedTimeAfter(userId, taskId, atomTaskId, false, LocalDateTime.now().withHour(0).withMinute(0).withSecond(0));
             if (Objects.nonNull(metaUserTaskAwardReceivedRecordNew)) {
@@ -59,6 +53,9 @@ public class MetaUserTaskAwardReceivedRecordNewService {
             }
         }
         if (!MetaTaskTarget.ON_LINE_TIME_DAILY.equals(metaAtomTask.getTargetType())) {
+            if (MetaTaskStatus.PROGRESS.equals(metaTaskToUserNew.getStatus()) || MetaTaskStatus.FINISH.equals(metaTaskToUserNew.getStatus())) {
+                return MetaRestResult.returnError(String.format("奖励领取失败：当前任务状态为[%S]", metaTaskToUserNew.getStatus().getDescription()));
+            }
             MetaUserTaskAwardReceivedRecordNew metaUserTaskAwardReceivedRecordNew = metaUserTaskAwardReceivedRecordNewRepo.findByUserIdAndTaskIdAndAtomTaskIdAndDel(userId, taskId, atomTaskId, false);
             if (Objects.nonNull(metaUserTaskAwardReceivedRecordNew)) {
                 return MetaRestResult.returnError("奖励领取失败：用户已经领取过该任务奖励，不可重复领取！");

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

@@ -23,12 +23,9 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaUserTaskAwardReceivedRecordService {
 
-    private MetaTaskToUserRepo metaTaskToUserRepo;
-
-    private MetaTaskRepo metaTaskRepo;
-
-    private MetaAwardReceiveService metaAwardReceiveService;
-
+    private MetaTaskToUserRepo                  metaTaskToUserRepo;
+    private MetaTaskRepo                        metaTaskRepo;
+    private MetaAwardReceiveService             metaAwardReceiveService;
     private MetaUserTaskAwardReceivedRecordRepo metaUserTaskAwardReceivedRecordRepo;
 
     @Transactional
@@ -42,9 +39,6 @@ public class MetaUserTaskAwardReceivedRecordService {
         if (Objects.isNull(metaTaskToUser)) {
             return MetaRestResult.returnError("奖励领取失败：用户未领取过该任务！");
         }
-        if (MetaTaskStatus.PROGRESS.equals(metaTaskToUser.getStatus()) || MetaTaskStatus.FINISH.equals(metaTaskToUser.getStatus())) {
-            return MetaRestResult.returnError(String.format("奖励领取失败：当前任务状态为[%S]", metaTaskToUser.getStatus().getDescription()));
-        }
         if (MetaTaskTarget.ON_LINE_TIME_DAILY.equals(metaTask.getType())) {
             MetaUserTaskAwardReceivedRecord metaUserTaskAwardReceivedRecord = metaUserTaskAwardReceivedRecordRepo.findByUserIdAndMetaTaskIdAndDelAndCreatedAtAfter(userId, metaTaskId, false, LocalDateTime.now().withHour(0).withMinute(0).withSecond(0));
             if (Objects.nonNull(metaUserTaskAwardReceivedRecord)) {
@@ -52,6 +46,9 @@ public class MetaUserTaskAwardReceivedRecordService {
             }
         }
         if (!MetaTaskTarget.ON_LINE_TIME_DAILY.equals(metaTask.getType())) {
+            if (MetaTaskStatus.PROGRESS.equals(metaTaskToUser.getStatus()) || MetaTaskStatus.FINISH.equals(metaTaskToUser.getStatus())) {
+                return MetaRestResult.returnError(String.format("奖励领取失败：当前任务状态为[%S]", metaTaskToUser.getStatus().getDescription()));
+            }
             MetaUserTaskAwardReceivedRecord metaUserTaskAwardReceivedRecord = metaUserTaskAwardReceivedRecordRepo.findByUserIdAndMetaTaskIdAndDel(userId, metaTaskId, false);
             if (Objects.nonNull(metaUserTaskAwardReceivedRecord)) {
                 return MetaRestResult.returnError("奖励领取失败：用户已经领取过该任务奖励，不可重复领取！");

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

@@ -29,14 +29,10 @@ import java.util.stream.Collectors;
 public class MetaUserTaskProgressNewService {
 
     private MetaUserTaskProgressNewRepo metaUserTaskProgressNewRepo;
-
-    private MetaTaskToUserNewRepo metaTaskToUserNewRepo;
-
-    private MetaAtomTaskRepo metaAtomTaskRepo;
-
-    private MetaTaskToUserNewService metaTaskToUserNewService;
-
-    private MetaTaskBindRepo metaTaskBindRepo;
+    private MetaTaskToUserNewRepo       metaTaskToUserNewRepo;
+    private MetaAtomTaskRepo            metaAtomTaskRepo;
+    private MetaTaskToUserNewService    metaTaskToUserNewService;
+    private MetaTaskBindRepo            metaTaskBindRepo;
 
     public Page<MetaUserTaskProgressNew> all(PageQuery pageQuery) {
         return metaUserTaskProgressNewRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaUserTaskProgressNew.class), JpaUtils.toPageRequest(pageQuery));
@@ -63,7 +59,7 @@ public class MetaUserTaskProgressNewService {
             return MetaRestResult.returnError("基础任务信息为空");
         }
         // 收集藏品类型任务 remark为藏品id 不可为空
-        if (metaAtomTask.getTargetType().equals(MetaTaskTarget.COLLECT_COLLECTION)) {
+        if (metaAtomTask.getTargetType().equals(MetaTaskTarget.COLLECT_COLLECTION) || metaAtomTask.getTargetType().equals(MetaTaskTarget.ON_LINE_TIME_DAILY)) {
             if (StringUtils.isBlank(metaUserTaskProgressNew.getRemark())) {
                 return MetaRestResult.returnError(String.format("类型[%S]的任务 remark不可为空", metaAtomTask.getTargetType().getDescription()));
             }
@@ -89,17 +85,20 @@ public class MetaUserTaskProgressNewService {
         metaUserTaskProgressNew.setProgressTime(LocalDateTime.now());
         // 在线时长任务 如记录存在则更新remark（每日在线时长） 如不存在则每日首次触发该任务
         if (metaAtomTask.getTargetType().equals(MetaTaskTarget.ON_LINE_TIME_DAILY)) {
+            if (StringUtils.isBlank(value)) {
+                return MetaRestResult.returnError("在线时长任务未配置达标时间");
+            }
             MetaUserTaskProgressNew dbMetaUserTaskProgressNew = metaUserTaskProgressNewRepo.findByMetaTaskToUserNewIdAndDelAndCreatedAtAfter(metaUserTaskProgressNew.getMetaTaskToUserNewId(), false, LocalDateTime.now().withHour(0).withMinute(0).withSecond(0));
             if (Objects.isNull(dbMetaUserTaskProgressNew)) {
                 metaUserTaskProgressNewRepo.save(metaUserTaskProgressNew);
                 // 该类型任务不存在完成
-                return MetaRestResult.returnSuccess(false);
+                return MetaRestResult.returnSuccess(Integer.parseInt(metaUserTaskProgressNew.getRemark()) >= Integer.parseInt(value));
             }
             int remark = Integer.parseInt(metaUserTaskProgressNew.getRemark()) + Integer.parseInt(dbMetaUserTaskProgressNew.getRemark());
             dbMetaUserTaskProgressNew.setRemark(String.valueOf(remark));
             dbMetaUserTaskProgressNew.setProgressTime(LocalDateTime.now());
             metaUserTaskProgressNewRepo.save(dbMetaUserTaskProgressNew);
-            return MetaRestResult.returnSuccess(false);
+            return MetaRestResult.returnSuccess(Integer.parseInt(metaUserTaskProgressNew.getRemark()) >= Integer.parseInt(value));
         }
         // 保存进度
         metaUserTaskProgressNewRepo.save(metaUserTaskProgressNew);

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

@@ -32,10 +32,8 @@ import java.util.stream.Collectors;
 public class MetaUserTaskProgressService {
 
     private MetaUserTaskProgressRepo metaUserTaskProgressRepo;
-
-    private MetaTaskToUserRepo metaTaskToUserRepo;
-
-    private MetaTaskRepo metaTaskRepo;
+    private MetaTaskToUserRepo       metaTaskToUserRepo;
+    private MetaTaskRepo             metaTaskRepo;
 
     public Page<MetaUserTaskProgress> all(PageQuery pageQuery) {
         return metaUserTaskProgressRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaUserTaskProgress.class), JpaUtils.toPageRequest(pageQuery));
@@ -74,10 +72,10 @@ public class MetaUserTaskProgressService {
         if (!metaTaskToUser.getStatus().equals(MetaTaskStatus.PROGRESS)) {
             return MetaRestResult.returnError(String.format("状态错误：当前任务状态为[%S]", metaTaskToUser.getStatus().getDescription()));
         }
-        // 收集藏品类型任务 remark为藏品id 不可为空
-        if (metaTaskToUser.getTaskType().equals(MetaTaskTarget.COLLECT_COLLECTION)) {
+        // 收集藏品，每日在线时常 类型任务 remark为藏品id 不可为空
+        if (metaTaskToUser.getTaskType().equals(MetaTaskTarget.COLLECT_COLLECTION) || metaTaskToUser.getTaskType().equals(MetaTaskTarget.ON_LINE_TIME_DAILY)) {
             if (StringUtils.isBlank(metaUserTaskProgress.getRemark())) {
-                return MetaRestResult.returnError(String.format("类型[%S]的任务状态 remark不可为空", metaTaskToUser.getTaskType().getDescription()));
+                return MetaRestResult.returnError(String.format("类型[%S]的任务 remark不可为空", metaTaskToUser.getTaskType().getDescription()));
             }
         }
         MetaTask metaTask = metaTaskRepo.findByIdAndDel(metaTaskToUser.getTaskId(), false);
@@ -99,49 +97,21 @@ public class MetaUserTaskProgressService {
                 return MetaRestResult.returnError("该任务未配置达标次数");
             }
         }
-        // 单日签到任务
-//        if (metaTaskToUser.getTaskType().equals(MetaTaskType.SIGN_IN_SINGLE_DAY)) {
-//            if (StringUtils.isBlank(value)) {
-//                return MetaRestResult.returnError("单日签到任务未配置签到日期");
-//            }
-//            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-//            LocalDateTime startTime = LocalDate.parse(value, formatter).atStartOfDay();
-//            if (!startTime.format(formatter).equals(LocalDateTime.now().format(formatter))) {
-//                return MetaRestResult.returnError("当前日期不允许签到");
-//            }
-//            List<MetaUserTaskProgress> metaUserTaskProgresses = metaUserTaskProgressRepo.findAllByMetaTaskToUserIdAndDel(metaTaskToUser.getId(), false);
-//            if (CollectionUtils.isNotEmpty(metaUserTaskProgresses)) {
-//                return MetaRestResult.returnError("该签到任务已经签到过，不允许重复签到");
-//            }
-//        }
         // 在线时长任务 如记录存在则更新remark（每日在线时长） 如不存在则每日首次触发该任务
         if (metaTaskToUser.getTaskType().equals(MetaTaskTarget.ON_LINE_TIME_DAILY)) {
+            if (StringUtils.isBlank(value)) {
+                return MetaRestResult.returnError("在线时长任务未配置达标时间");
+            }
             MetaUserTaskProgress dbMetaUserTaskProgress = metaUserTaskProgressRepo.findByMetaTaskToUserIdAndDelAndCreatedAtAfter(metaTaskToUser.getId(), false, LocalDateTime.now().withHour(0).withMinute(0).withSecond(0));
             if (Objects.isNull(dbMetaUserTaskProgress)) {
                 save(metaUserTaskProgress, metaTaskToUser);
-                // 该类型任务不存在完成
-                return MetaRestResult.returnSuccess(false);
+                return MetaRestResult.returnSuccess(Integer.parseInt(metaUserTaskProgress.getRemark()) >= Integer.parseInt(value));
             }
             int remark = Integer.parseInt(metaUserTaskProgress.getRemark()) + Integer.parseInt(dbMetaUserTaskProgress.getRemark());
             dbMetaUserTaskProgress.setRemark(String.valueOf(remark));
             metaUserTaskProgressRepo.save(dbMetaUserTaskProgress);
-            return MetaRestResult.returnSuccess(false);
+            return MetaRestResult.returnSuccess(remark >= Integer.parseInt(value));
         }
-        // 连续签到任务 每天只允许签到一次。remark可为每天签到时间也可以为空，具体判定以记录创建时间为准
-//        if (metaTaskToUser.getTaskType().equals(MetaTaskType.SIGN_IN_CONTINUOUS)) {
-//            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-//            LocalDateTime startTime = LocalDate.parse(value, formatter).atStartOfDay();
-//            if (startTime.isAfter(LocalDateTime.now())) {
-//                return MetaRestResult.returnError("未到开始日期");
-//            }
-//            MetaUserTaskProgress dbMetaUserTaskProgress = metaUserTaskProgressRepo.findByMetaTaskToUserIdAndDelAndCreatedAtAfter(metaTaskToUser.getId(), false, LocalDateTime.now().withHour(0).withMinute(0).withSecond(0));
-//            if (Objects.nonNull(dbMetaUserTaskProgress)) {
-//                return MetaRestResult.returnError("当日已经存在签到记录，不可重复签到");
-//            }
-//            save(metaUserTaskProgress, metaTaskToUser);
-//            // 该类型任务不存在完成
-//            return MetaRestResult.returnSuccess(false);
-//        }
         // 保存进度
         save(metaUserTaskProgress, metaTaskToUser);
         List<MetaUserTaskProgress> metaUserTaskProgresses = metaUserTaskProgressRepo.findAllByMetaTaskToUserIdAndDel(metaTaskToUser.getId(), false);
@@ -156,10 +126,6 @@ public class MetaUserTaskProgressService {
                     return MetaRestResult.returnSuccess(true);
                 }
                 return MetaRestResult.returnSuccess(false);
-//            case SIGN_IN_SINGLE_DAY:
-//                // 单日登陆任务签到成功后直接完成
-//                completeTask(metaTaskToUser);
-//                return MetaRestResult.returnSuccess(true);
             case ACCUMULATE:
                 if (metaUserTaskProgresses.size() >= Integer.parseInt(value)) {
                     completeTask(metaTaskToUser);

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

@@ -23,7 +23,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaAccessoriesController extends BaseController {
     private MetaAccessoriesService metaAccessoriesService;
-    private MetaAccessoriesRepo metaAccessoriesRepo;
+    private MetaAccessoriesRepo    metaAccessoriesRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -21,7 +21,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaAdvertRecordController extends BaseController {
     private MetaAdvertRecordService metaAdvertRecordService;
-    private MetaAdvertRecordRepo metaAdvertRecordRepo;
+    private MetaAdvertRecordRepo    metaAdvertRecordRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -20,7 +20,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaAtomTaskController extends BaseController {
     private MetaAtomTaskService metaAtomTaskService;
-    private MetaAtomTaskRepo metaAtomTaskRepo;
+    private MetaAtomTaskRepo    metaAtomTaskRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -21,7 +21,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaBagAssetEffectConfigController extends BaseController {
     private MetaBagAssetEffectConfigService metaBagAssetEffectConfigService;
-    private MetaBagAssetEffectConfigRepo metaBagAssetEffectConfigRepo;
+    private MetaBagAssetEffectConfigRepo    metaBagAssetEffectConfigRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -21,7 +21,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaBoatPositionController extends BaseController {
     private MetaBoatPositionService metaBoatPositionService;
-    private MetaBoatPositionRepo metaBoatPositionRepo;
+    private MetaBoatPositionRepo    metaBoatPositionRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -23,8 +23,7 @@ import java.util.Objects;
 public class MetaBonusSceneController {
 
     private MetaBonusSceneService metaBonusSceneService;
-
-    private MetaBonusSceneRepo metaBonusSceneRepo;
+    private MetaBonusSceneRepo    metaBonusSceneRepo;
 
     @GetMapping("/{userId}/find")
     public MetaRestResult<List<MetaBonusScene>> find(@PathVariable Long userId) {

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

@@ -21,7 +21,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaChannelController extends BaseController {
     private MetaChannelService metaChannelService;
-    private MetaChannelRepo metaChannelRepo;
+    private MetaChannelRepo    metaChannelRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -28,8 +28,7 @@ import java.util.Objects;
 public class MetaDestroyActivityController extends BaseController {
     private MetaDestroyActivityService metaDestroyActivityService;
     private MetaDestroyActivityRepo    metaDestroyActivityRepo;
-
-    private AssetService assetService;
+    private AssetService               assetService;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -21,7 +21,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaEmailController extends BaseController {
     private MetaEmailService metaEmailService;
-    private MetaEmailRepo metaEmailRepo;
+    private MetaEmailRepo    metaEmailRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -22,7 +22,7 @@ import java.util.Objects;
 public class MetaEmailRecordController extends BaseController {
 
     private MetaEmailRecordService metaEmailRecordService;
-    private MetaEmailRecordRepo metaEmailRecordRepo;
+    private MetaEmailRecordRepo    metaEmailRecordRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")

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

@@ -1,4 +1,5 @@
 package com.izouma.nineth.web;
+
 import com.izouma.nineth.domain.MetaFeedBack;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
@@ -22,8 +23,7 @@ import java.util.Objects;
 public class MetaFeedBackController extends BaseController {
 
     private MetaFeedBackService metaFeedBackService;
-
-    private MetaFeedBackRepo metaFeedBackRepo;
+    private MetaFeedBackRepo    metaFeedBackRepo;
 
     @PostMapping("/save")
     public MetaRestResult<MetaFeedBack> save(@RequestBody MetaFeedBack metaFeedBack) {
@@ -33,7 +33,7 @@ public class MetaFeedBackController extends BaseController {
         if (Objects.isNull(metaFeedBack.getUserId())) {
             return MetaRestResult.returnError("Illegal parameter : userId can not be null");
         }
-        if(StringUtils.isBlank(metaFeedBack.getDetail())) {
+        if (StringUtils.isBlank(metaFeedBack.getDetail())) {
             return MetaRestResult.returnError("Illegal parameter : detail can not be null");
         }
         return MetaRestResult.returnSuccess(metaFeedBackRepo.save(metaFeedBack));

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

@@ -34,18 +34,12 @@ import java.util.concurrent.atomic.AtomicInteger;
 @AllArgsConstructor
 public class MetaGameCopyController extends BaseController {
 
-    private MetaGameCopyService metaGameCopyService;
-
-    private MetaGameCopyRepo metaGameCopyRepo;
-
-    private MetaZombieRepo metaZombieRepo;
-
-    private MetaGameProcessRepo metaGameProcessRepo;
-
-    private AssetService assetService;
-
-    private SysConfigService sysConfigService;
-
+    private MetaGameCopyService        metaGameCopyService;
+    private MetaGameCopyRepo           metaGameCopyRepo;
+    private MetaZombieRepo             metaZombieRepo;
+    private MetaGameProcessRepo        metaGameProcessRepo;
+    private AssetService               assetService;
+    private SysConfigService           sysConfigService;
     private MetaZombieFinishRecordRepo metaZombieFinishRecordRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")

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

@@ -23,7 +23,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaGameStageAwardController extends BaseController {
     private MetaGameStageAwardService metaGameStageAwardService;
-    private MetaGameStageAwardRepo metaGameStageAwardRepo;
+    private MetaGameStageAwardRepo    metaGameStageAwardRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -21,7 +21,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaItemController extends BaseController {
     private MetaItemService metaItemService;
-    private MetaItemRepo metaItemRepo;
+    private MetaItemRepo    metaItemRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -29,9 +29,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 @RequestMapping("/metaLuckyDraw")
 @AllArgsConstructor
 public class MetaLuckyDrawController extends BaseController {
-    private MetaLuckyDrawService metaLuckyDrawService;
-    private MetaLuckyDrawRepo metaLuckyDrawRepo;
-
+    private MetaLuckyDrawService    metaLuckyDrawService;
+    private MetaLuckyDrawRepo       metaLuckyDrawRepo;
     private MetaParamsConfigService metaParamsConfigService;
 
     //@PreAuthorize("hasRole('ADMIN')")

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

@@ -18,8 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class MetaParamsConfigController extends BaseController {
 
     private MetaParamsConfigService metaParamsConfigService;
-
-    private MetaParamsConfigRepo metaParamsConfigRepo;
+    private MetaParamsConfigRepo    metaParamsConfigRepo;
 
 
     @PreAuthorize("hasRole('ADMIN') || hasRole('META')")

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

@@ -21,17 +21,12 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaPlayerInfoController {
 
-    private UserRepo userRepo;
-
-    private MetaPlayerInfoService metaPlayerInfoService;
-
+    private UserRepo                  userRepo;
+    private MetaPlayerInfoService     metaPlayerInfoService;
     private MetaPlayerOfflineInfoRepo metaPlayerOfflineInfoRepo;
-
-    private MetaPlayerWearRepo metaPlayerWearRepo;
-
-    private MetaUserRepo metaUserRepo;
-
-    private PurchaseLevelService purchaseLevelService;
+    private MetaPlayerWearRepo        metaPlayerWearRepo;
+    private MetaUserRepo              metaUserRepo;
+    private PurchaseLevelService      purchaseLevelService;
 
     @GetMapping("/{userId}/detail")
     public MetaRestResult<MetaPlayerInfo> findMetaPlayerInfo(@PathVariable Long userId) {

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

@@ -22,7 +22,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaPlayerRoleClassifyController extends BaseController {
     private MetaPlayerRoleClassifyService metaPlayerRoleClassifyService;
-    private MetaPlayerRoleClassifyRepo metaPlayerRoleClassifyRepo;
+    private MetaPlayerRoleClassifyRepo    metaPlayerRoleClassifyRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -24,7 +24,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaPlayerWearController extends BaseController {
     private MetaPlayerWearService metaPlayerWearService;
-    private MetaPlayerWearRepo metaPlayerWearRepo;
+    private MetaPlayerWearRepo    metaPlayerWearRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -1,4 +1,5 @@
 package com.izouma.nineth.web;
+
 import com.izouma.nineth.domain.MetaProblem;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
@@ -21,7 +22,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaProblemController extends BaseController {
     private MetaProblemService metaProblemService;
-    private MetaProblemRepo metaProblemRepo;
+    private MetaProblemRepo    metaProblemRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -59,8 +60,8 @@ public class MetaProblemController extends BaseController {
     }
 
     @GetMapping("/findAll")
-    public MetaRestResult<List<MetaProblem>> findAll(){
-        return MetaRestResult.returnSuccess("查询成功",metaProblemRepo.findAllByDel(false));
+    public MetaRestResult<List<MetaProblem>> findAll() {
+        return MetaRestResult.returnSuccess("查询成功", metaProblemRepo.findAllByDel(false));
     }
 
     @GetMapping("/getAnswer/{id}")
@@ -69,7 +70,7 @@ public class MetaProblemController extends BaseController {
         if (Objects.isNull(metaProblem)) {
             return MetaRestResult.returnError("不存在该id的题目");
         }
-        return MetaRestResult.returnSuccess("查询成功",metaProblem);
+        return MetaRestResult.returnSuccess("查询成功", metaProblem);
     }
 }
 

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

@@ -20,7 +20,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaPropController extends BaseController {
     private MetaPropService metaPropService;
-    private MetaPropRepo metaPropRepo;
+    private MetaPropRepo    metaPropRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -22,7 +22,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaQuestionController extends BaseController {
     private MetaQuestionService metaQuestionService;
-    private MetaQuestionRepo metaQuestionRepo;
+    private MetaQuestionRepo    metaQuestionRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -24,7 +24,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaResourceVersionController extends BaseController {
     private MetaResourceVersionService metaResourceVersionService;
-    private MetaResourceVersionRepo metaResourceVersionRepo;
+    private MetaResourceVersionRepo    metaResourceVersionRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -21,7 +21,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaSignAwardController extends BaseController {
     private MetaSignAwardService metaSignAwardService;
-    private MetaSignAwardRepo metaSignAwardRepo;
+    private MetaSignAwardRepo    metaSignAwardRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -21,7 +21,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaSignController extends BaseController {
     private MetaSignService metaSignService;
-    private MetaSignRepo metaSignRepo;
+    private MetaSignRepo    metaSignRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -23,7 +23,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaSpatialInfoController extends BaseController {
     private MetaSpatialInfoService metaSpatialInfoService;
-    private MetaSpatialInfoRepo metaSpatialInfoRepo;
+    private MetaSpatialInfoRepo    metaSpatialInfoRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -81,7 +81,7 @@ public class MetaSpatialInfoController extends BaseController {
         if (CollectionUtils.isEmpty(metaSpatialInfos)) {
             return MetaRestResult.returnError("当前没有符合的空间");
         }
-        return MetaRestResult.returnSuccess(metaSpatialInfos.get(MathUtils.random(0, metaSpatialInfos.size()-1)));
+        return MetaRestResult.returnSuccess(metaSpatialInfos.get(MathUtils.random(0, metaSpatialInfos.size() - 1)));
     }
 }
 

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

@@ -22,8 +22,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaSpatialWharfController extends BaseController {
     private MetaSpatialWharfService metaSpatialWharfService;
-
-    private MetaSpatialWharfRepo metaSpatialWharfRepo;
+    private MetaSpatialWharfRepo    metaSpatialWharfRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")

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

@@ -29,12 +29,9 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaStoreController extends BaseController {
 
-    private MetaStoreService metaStoreService;
-
-    private MetaStoreRepo metaStoreRepo;
-
-    private MetaUserPropRepo metaUserPropRepo;
-
+    private MetaStoreService            metaStoreService;
+    private MetaStoreRepo               metaStoreRepo;
+    private MetaUserPropRepo            metaUserPropRepo;
     private MetaStorePurchaseRecordRepo metaStorePurchaseRecordRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")

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

@@ -22,7 +22,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaSwitchController extends BaseController {
     private MetaSwitchService metaSwitchService;
-    private MetaSwitchRepo metaSwitchRepo;
+    private MetaSwitchRepo    metaSwitchRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -21,7 +21,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaTaskActivityController extends BaseController {
     private MetaTaskActivityService metaTaskActivityService;
-    private MetaTaskActivityRepo metaTaskActivityRepo;
+    private MetaTaskActivityRepo    metaTaskActivityRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -29,15 +29,11 @@ import java.util.Objects;
 @RequestMapping("/metaTask")
 @AllArgsConstructor
 public class MetaTaskController extends BaseController {
-    private MetaTaskService metaTaskService;
-
-    private MetaTaskRepo metaTaskRepo;
-
+    private MetaTaskService    metaTaskService;
+    private MetaTaskRepo       metaTaskRepo;
     private MetaTaskToUserRepo metaTaskToUserRepo;
-
-    private CollectionRepo collectionRepo;
-
-    private MetaPropRepo metaPropRepo;
+    private CollectionRepo     collectionRepo;
+    private MetaPropRepo       metaPropRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -20,8 +20,7 @@ import java.util.List;
 public class MetaTaskNewController extends BaseController {
 
     private MetaTaskNewService metaTaskNewService;
-
-    private MetaTaskNewRepo metaTaskNewRepo;
+    private MetaTaskNewRepo    metaTaskNewRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -23,8 +23,7 @@ import java.util.Objects;
 public class MetaTaskToUserController {
 
     private MetaTaskToUserService metaTaskToUserService;
-
-    private MetaTaskToUserRepo metaTaskToUserRepo;
+    private MetaTaskToUserRepo    metaTaskToUserRepo;
 
     @PostMapping("/all")
     public Page<MetaTaskToUser> all(@RequestBody PageQuery pageQuery) {

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

@@ -22,8 +22,7 @@ import java.util.Objects;
 public class MetaTaskToUserNewController {
 
     private MetaTaskToUserNewService metaTaskToUserNewService;
-
-    private MetaTaskToUserNewRepo metaTaskToUserNewRepo;
+    private MetaTaskToUserNewRepo    metaTaskToUserNewRepo;
 
     @PostMapping("/all")
     public Page<MetaTaskToUserNew> all(@RequestBody PageQuery pageQuery) {

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

@@ -34,12 +34,9 @@ import static java.util.stream.Collectors.toCollection;
 @AllArgsConstructor
 public class MetaUserBagController {
 
-    private MetaUserPropRepo metaUserPropRepo;
-
-    private MetaParamsConfigService metaParamsConfigService;
-
-    private AssetRepo assetRepo;
-
+    private MetaUserPropRepo             metaUserPropRepo;
+    private MetaParamsConfigService      metaParamsConfigService;
+    private AssetRepo                    assetRepo;
     private MetaBagAssetEffectConfigRepo metaBagAssetEffectConfigRepo;
 
     @GetMapping("/query")

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

@@ -24,8 +24,7 @@ import java.util.Objects;
 @Slf4j
 public class MetaUserGoldController extends BaseController {
     private MetaUserGoldService metaUserGoldService;
-
-    private MetaUserGoldRepo metaUserGoldRepo;
+    private MetaUserGoldRepo    metaUserGoldRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -23,7 +23,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public class MetaUserPropController extends BaseController {
     private MetaUserPropService metaUserPropService;
-    private MetaUserPropRepo metaUserPropRepo;
+    private MetaUserPropRepo    metaUserPropRepo;
 
     @PostMapping("/receive")
     public MetaRestResult<MetaUserProp> receive(Long metaPropId, int num) {

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

@@ -19,7 +19,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaUserPropRecordController extends BaseController {
     private MetaUserPropRecordService metaUserPropRecordService;
-    private MetaUserPropRecordRepo metaUserPropRecordRepo;
+    private MetaUserPropRecordRepo    metaUserPropRecordRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")

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

@@ -21,8 +21,7 @@ import java.util.List;
 @AllArgsConstructor
 public class MetaUserTaskProgressController extends BaseController {
     private MetaUserTaskProgressService metaUserTaskProgressService;
-
-    private MetaUserTaskProgressRepo metaUserTaskProgressRepo;
+    private MetaUserTaskProgressRepo    metaUserTaskProgressRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")

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

@@ -21,8 +21,7 @@ import java.util.List;
 public class MetaUserTaskProgressNewController extends BaseController {
 
     private MetaUserTaskProgressNewService metaUserTaskProgressNewService;
-
-    private MetaUserTaskProgressNewRepo metaUserTaskProgressNewRepo;
+    private MetaUserTaskProgressNewRepo    metaUserTaskProgressNewRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")