Merge remote-tracking branch 'origin/develop' into dev/dev

src/main/java/com/ai/da/controller/AccountController.java

@@ -137,4 +137,10 @@ public class AccountController {
         returnMap.put("code",200);
         return Response.success(returnMap);
     }
+
+    @ApiOperation(value = "查询账号到期时间")
+    @PostMapping("/getExpiredTime")
+    public Response<Long> getExpiredTime(){
+        return Response.success(accountService.getExpiredTime());
+    }
 }

src/main/java/com/ai/da/controller/ClassificationController.java

@@ -81,4 +81,28 @@ public class ClassificationController {
         return Response.success(classificationService.getRelClassificationIdList(classificationDTO));
     }
 
+    /**
+     * 多选 获取共有标签
+     * @param classificationDTO
+     * @return
+     */
+    @PostMapping("/getRelPublicClassificationIdList")
+    @ApiOperationSupport(order = 5)
+    @ApiModelProperty(value = "获取关联公共分类IDList", notes = "传入ClassificationDTO")
+    public Response<List<Long>> getRelPublicClassificationIdList(@Valid @RequestBody ClassificationDTO classificationDTO) {
+        return Response.success(classificationService.getRelPublicClassificationIdList(classificationDTO));
+    }
+
+    /**
+     * 多选 编辑共有标签
+     * @param classificationDTO
+     * @return
+     */
+    @PostMapping("/editRelPublicClassificationIdList")
+    @ApiOperationSupport(order = 5)
+    @ApiModelProperty(value = "编辑关联公共分类IDList", notes = "传入ClassificationDTO")
+    public Response<Boolean> editRelPublicClassificationIdList(@Valid @RequestBody ClassificationDTO classificationDTO) {
+        return Response.success(classificationService.editRelPublicClassificationIdList(classificationDTO));
+    }
+
 }

src/main/java/com/ai/da/service/AccountService.java

@@ -113,4 +113,6 @@ public interface AccountService extends IService<Account> {
     Boolean switchIsAutoApproval();
 
     Boolean trialOrderRefuse(List<Long> ids);
+
+    Long getExpiredTime();
 }

src/main/java/com/ai/da/service/ClassificationService.java

@@ -33,4 +33,8 @@ public interface ClassificationService {
     List<Long> getLibraryIdListByClassificationId(Long classificationId);
 
     List<Long> getRelClassificationIdList(ClassificationDTO classificationDTO);
+
+    List<Long> getRelPublicClassificationIdList(ClassificationDTO classificationDTO);
+
+    Boolean editRelPublicClassificationIdList(ClassificationDTO classificationDTO);
 }

src/main/java/com/ai/da/service/impl/AccountServiceImpl.java

@@ -560,4 +560,10 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
         }
         return Boolean.TRUE;
     }
+
+    @Override
+    public Long getExpiredTime() {
+        AuthPrincipalVo userInfo = UserContext.getUserHolder();
+        return accountMapper.selectById(userInfo.getId()).getValidEndTime();
+    }
 }

src/main/java/com/ai/da/service/impl/ClassificationServiceImpl.java

@@ -191,6 +191,69 @@ public class ClassificationServiceImpl implements ClassificationService {
         return new ArrayList<>();
     }
 
+    @Override
+    public List<Long> getRelPublicClassificationIdList(ClassificationDTO classificationDTO) {
+        List<Long> libraryIdList = classificationDTO.getLibraryIdList();
+        if (CollectionUtil.isEmpty(libraryIdList)) {
+            throw new BusinessException("libraryIdList.cannot.be.empty");
+        }
+        List<Long> classificationIdList = new ArrayList<>();
+        // 遍历获取library关联的公共标签，返回给前端
+        for (int i = 0; i < libraryIdList.size(); i++) {
+            QueryWrapper<ClassificationRelLibrary> qw = new QueryWrapper<>();
+            qw.lambda().eq(ClassificationRelLibrary::getLibraryId, libraryIdList.get(i));
+            List<Long> collect = classificationRelLibraryMapper.selectList(qw)
+                    .stream()
+                    .map(ClassificationRelLibrary::getClassificationId)
+                    .distinct()
+                    .collect(Collectors.toList());
+            if (i == 0) {
+                classificationIdList.addAll(collect);
+            }else {
+                classificationIdList.retainAll(collect);
+            }
+        }
+        return classificationIdList;
+    }
+
+    @Override
+    public Boolean editRelPublicClassificationIdList(ClassificationDTO classificationDTO) {
+        List<Long> relPublicClassificationIdList = getRelPublicClassificationIdList(classificationDTO);
+        List<Long> deleteIdList = relPublicClassificationIdList.stream()
+                .filter(item -> !classificationDTO.getClassificationIdList().contains(item))
+                .collect(Collectors.toList());
+        if (CollectionUtil.isNotEmpty(deleteIdList)) {
+            for (Long libraryId : classificationDTO.getLibraryIdList()) {
+                QueryWrapper<ClassificationRelLibrary> qw = new QueryWrapper<>();
+                qw.lambda().eq(ClassificationRelLibrary::getLibraryId, libraryId);
+                qw.lambda().in(ClassificationRelLibrary::getClassificationId, deleteIdList);
+                classificationRelLibraryMapper.delete(qw);
+            }
+        }
+        List<Long> addIdList = classificationDTO.getClassificationIdList().stream()
+                .filter(item -> !relPublicClassificationIdList.contains(item))
+                .collect(Collectors.toList());
+        if (CollectionUtil.isNotEmpty(addIdList)) {
+            for (Long libraryId : classificationDTO.getLibraryIdList()) {
+                for (Long classificationId : addIdList) {
+                    QueryWrapper<ClassificationRelLibrary> qw = new QueryWrapper<>();
+                    qw.lambda().eq(ClassificationRelLibrary::getLibraryId, libraryId);
+                    qw.lambda().eq(ClassificationRelLibrary::getClassificationId, classificationId);
+                    List<ClassificationRelLibrary> exist = classificationRelLibraryMapper.selectList(qw);
+                    if (CollectionUtil.isEmpty(exist)) {
+                        ClassificationRelLibrary classificationRelLibrary = new ClassificationRelLibrary();
+                        classificationRelLibrary.setClassificationId(classificationId);
+                        classificationRelLibrary.setLibraryId(libraryId);
+                        classificationRelLibrary.setCreateTime(LocalDateTime.now());
+                        classificationRelLibrary.setIsDeleted(0);
+                        classificationRelLibraryMapper.insert(classificationRelLibrary);
+                    }
+                }
+            }
+        }
+        return Boolean.TRUE;
+    }
+
     private List<Long> getTreeClassificationIdListByClassificationId(Long classificationId) {
         List<Long> classificationIdList = new ArrayList<>();
         classificationIdList.add(classificationId);

src/main/resources/messages_en.properties

@@ -130,7 +130,8 @@ the.workspace.lastIndex.not.found=The workspace lastIndex not found.
 gender.cannot.be.empty=gender cannot be empty.
 image.synthesis.failed=image synthesis failed.
 priority.cannot.be.repeated=priority cannot be repeated.
-model.not.found=model not found
+model.not.found=model not found.
+libraryIdList.cannot.be.empty=libraryIdList cannot be empty.
 
 # 可能会报异常
 # Informative: