fix: 扩展接口支持条件查询，调整代码

Author: CarefreeState

src/main/java/com/achobeta/common/annotation/Intercept.java

@@ -27,6 +27,4 @@
 
     boolean ignore() default false;
 
-    boolean log() default false;
-
 }

src/main/java/com/achobeta/common/annotation/handler/InterceptHelper.java

@@ -39,14 +39,6 @@ public static boolean isIgnore(Method targetMethod) {
         return isIgnore(getIntercept(targetMethod));
     }
 
-    public static boolean shouldPrintLog(Intercept intercept) {
-        return Objects.isNull(intercept) || intercept.log();
-    }
-
-    public static boolean shouldPrintLog(Method targetMethod) {
-        return shouldPrintLog(getIntercept(targetMethod));
-    }
-
     public static boolean isValid(Intercept intercept, UserTypeEnum role) {
         // permit 中没有 role 就会抛异常
         return Arrays.stream(intercept.permit())

src/main/java/com/achobeta/domain/evaluate/handler/ext/RemovePaperIQScoreHandler.java

@@ -34,18 +34,17 @@ public void handle(Long paperId) {
                 .stream()
                 .map(Interview::getId)
                 .toList();
-        if(CollectionUtils.isEmpty(interviewIds)) {
-            return;
+        if(!CollectionUtils.isEmpty(interviewIds)) {
+            // 将面试试卷设置为空
+            interviewService.lambdaUpdate()
+                    .in(Interview::getId, interviewIds)
+                    .set(Interview::getPaperId, null)
+                    .update();
+            // 删除对应的评分
+            interviewQuestionScoreService.lambdaUpdate()
+                    .in(InterviewQuestionScore::getInterviewId, interviewIds)
+                    .remove();
         }
-        // 将面试试卷设置为空
-        interviewService.lambdaUpdate()
-                .in(Interview::getId, interviewIds)
-                .set(Interview::getPaperId, null)
-                .update();
-        // 删除对应的评分
-        interviewQuestionScoreService.lambdaUpdate()
-                .in(InterviewQuestionScore::getInterviewId, interviewIds)
-                .remove();
         // 执行下一个
         super.doNextHandler(paperId);
     }

src/main/java/com/achobeta/domain/evaluate/handler/ext/RemoveQuestionFromPaperIQSHandler.java

@@ -7,6 +7,7 @@
 import com.achobeta.domain.paper.handler.RemoveQuestionFromPaperHandler;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 
@@ -34,10 +35,12 @@ public void handle(Long paperId, List<Long> questionIds) {
                 .map(Interview::getId)
                 .toList();
         // 删除对应的评分
-        interviewQuestionScoreService.lambdaUpdate()
-                .in(InterviewQuestionScore::getInterviewId, interviewIds)
-                .in(InterviewQuestionScore::getQuestionId, questionIds)
-                .remove();
+        if(!CollectionUtils.isEmpty(interviewIds) && !CollectionUtils.isEmpty(questionIds)) {
+            interviewQuestionScoreService.lambdaUpdate()
+                    .in(InterviewQuestionScore::getInterviewId, interviewIds)
+                    .in(InterviewQuestionScore::getQuestionId, questionIds)
+                    .remove();
+        }
         // 执行下一个
         super.doNextHandler(paperId, questionIds);
     }

src/main/java/com/achobeta/domain/evaluate/machine/events/internal/InterviewExperienceHelper.java

@@ -91,7 +91,6 @@ public Action<InterviewStatus, InterviewEvent, InterviewContext> getPerformActio
                         InterviewExperienceTemplateInner inner = InterviewExperienceTemplateInner.builder()
                                 .title(question.getTitle())
                                 .score(question.getScore())
-                                .average(question.getAverage())
                                 .standard(target)
                                 .build();
                         replaceResourceList.add(new ReplaceResource(target, question.getStandard()));

src/main/java/com/achobeta/domain/evaluate/model/vo/InterviewExperienceTemplateInner.java

@@ -22,8 +22,6 @@ public class InterviewExperienceTemplateInner {
 
     private Integer score;
 
-    private Double average;
-
     private String standard;
 
 }

src/main/java/com/achobeta/domain/evaluate/model/vo/InterviewRankVO.java

@@ -14,16 +14,16 @@
 @Data
 public class InterviewRankVO {
 
-    private Long summaryId;
-
-    private Integer average;
-
     private Long interviewId;
 
     private String title;
 
     private InterviewStatus status;
 
+    private Long summaryId;
+
+    private Integer sum;
+
     private SimpleStudentVO simpleStudentVO;
 
 }

src/main/java/com/achobeta/domain/feishu/service/impl/FeishuServiceImpl.java

@@ -7,7 +7,7 @@
 import com.achobeta.feishu.config.ResourceProperties;
 import com.achobeta.feishu.constants.ObjectType;
 import com.achobeta.feishu.request.FeishuRequestEngine;
-import com.achobeta.feishu.token.FeishuTenantAccessToken;
+import com.achobeta.feishu.token.FeishuTenantSession;
 import com.achobeta.util.GsonUtil;
 import com.achobeta.util.MediaUtil;
 import com.achobeta.util.TimeUtil;
@@ -57,7 +57,7 @@ public class FeishuServiceImpl implements FeishuService, InitializingBean {
 
     private final FeishuAppConfig feishuAppConfig;
 
-    private final FeishuTenantAccessToken feishuTenantAccessToken;
+    private final FeishuTenantSession feishuTenantSession;
 
     private final FeishuRequestEngine feishuRequestEngine;
 
@@ -86,7 +86,7 @@ public BatchGetIdUserRespBody batchGetUserId(BatchGetIdUserReqBody batchGetIdUse
 //        } catch (Exception e) {
 //            throw new GlobalServiceException(e.getMessage());
 //        }
-        String token = feishuTenantAccessToken.getToken();
+        String token = feishuTenantSession.getToken();
         return feishuRequestEngine.jsonRequest(
                 GET_USER_ID,
                 batchGetIdUserReqBody,
@@ -133,7 +133,7 @@ public ApplyReserveRespBody reserveApply(ApplyReserveReqBody applyReserveReqBody
 //        } catch (Exception e) {
 //            throw new GlobalServiceException(e.getMessage());
 //        }
-        String token = feishuTenantAccessToken.getToken();
+        String token = feishuTenantSession.getToken();
         return feishuRequestEngine.jsonRequest(
                 RESERVE_APPLY,
                 applyReserveReqBody,
@@ -228,7 +228,7 @@ public CreateImportTaskRespBody importTask(ImportTask importTask) {
 //        } catch (Exception e) {
 //            throw new GlobalServiceException(e.getMessage());
 //        }
-        String token = feishuTenantAccessToken.getToken();
+        String token = feishuTenantSession.getToken();
         return feishuRequestEngine.jsonRequest(
                 IMPORT_TASK,
                 importTask,
@@ -264,7 +264,7 @@ public GetImportTaskRespBody getImportTask(String ticket) {
 //        } catch (Exception e) {
 //            throw new GlobalServiceException(e.getMessage());
 //        }
-        String token = feishuTenantAccessToken.getToken();
+        String token = feishuTenantSession.getToken();
         return feishuRequestEngine.jsonRequest(
                 GET_IMPORT_TASK,
                 null,

src/main/java/com/achobeta/domain/interview/controller/InterviewController.java

@@ -124,15 +124,15 @@ public SystemJsonResponse setPaperForInterview(@Valid @RequestBody InterviewPape
             // 检查试卷是否存在
             questionPaperService.checkPaperExists(paperId);
             // 设置试卷
-            interviewService.setPaperForInterview(interviewId, paperId);
+            interviewService.setPaperForInterview(interview, paperId);
         }
         return SystemJsonResponse.SYSTEM_SUCCESS();
     }
 
     @PostMapping("/list/manager/all")
     public SystemJsonResponse managerGetAllInterviewList(@Valid @RequestBody(required = false) InterviewConditionDTO interviewConditionDTO) {
         // 查询
-        List<InterviewVO> interviewVOList = interviewService.managerGetInterviewList(null, InterviewConditionDTO.of(interviewConditionDTO));
+        List<InterviewDetailVO> interviewVOList = interviewService.managerGetInterviewList(null, InterviewConditionDTO.of(interviewConditionDTO));
         return SystemJsonResponse.SYSTEM_SUCCESS(interviewVOList);
     }
 
@@ -154,7 +154,7 @@ public SystemJsonResponse managerGetOwnInterviewList(@Valid @RequestBody(require
         // 获取当前管理员 id
         Long managerId = BaseContext.getCurrentUser().getUserId();
         // 查询
-        List<InterviewVO> interviewVOList = interviewService.managerGetInterviewList(managerId, InterviewConditionDTO.of(interviewConditionDTO));
+        List<InterviewDetailVO> interviewVOList = interviewService.managerGetInterviewList(managerId, InterviewConditionDTO.of(interviewConditionDTO));
         return SystemJsonResponse.SYSTEM_SUCCESS(interviewVOList);
     }
 

src/main/java/com/achobeta/domain/interview/model/converter/InterviewConverter.java

@@ -39,6 +39,6 @@ public interface InterviewConverter {
 
     InterviewReserveVO feishuReserveToInterviewReserveVO(Reserve reserve);
 
-    List<InterviewExcelTemplate> interviewVOListToInterviewExcelTemplateList(List<InterviewVO> interviewVOList);
+    List<InterviewExcelTemplate> interviewVOListToInterviewExcelTemplateList(List<InterviewDetailVO> interviewVOList);
 
 }