1.知识库分类过滤 2.移动端对练记录排序 3.对练按起始时间过滤

src/main/java/cn/breeze/elleai/application/service/AiPlatformExtensionService.java

@@ -74,7 +74,6 @@ public class AiPlatformExtensionService {
         ResponseEntity<String> response = restTemplate.postForEntity(difyBase + "/chat-messages", postEntity, String.class);
 
         String body = response.getBody();
-        log.info("执行结果：{}", body);
         if(Objects.equals(response.getStatusCode(), HttpStatus.OK)) {
             JSONObject bodyObject = JSONObject.parseObject(body);
             String conversationId = bodyObject.getString("conversation_id");
@@ -117,7 +116,6 @@ public class AiPlatformExtensionService {
         ResponseEntity<String> response = restTemplate.postForEntity(difyBase + "/chat-messages", postEntity, String.class);
 
         String body = response.getBody();
-        log.info("执行结果：{}", body);
         if(Objects.equals(response.getStatusCode(), HttpStatus.OK)) {
             JSONObject bodyObject = JSONObject.parseObject(body);
             String conversationId = bodyObject.getString("conversation_id");

src/main/java/cn/breeze/elleai/application/service/AppExamineService.java

@@ -645,6 +645,8 @@ public class AppExamineService {
 
         ExamineRequestModel requestModel = BeanUtil.copyProperties(request, ExamineRequestModel.class);
         requestModel.setStatus(1);
+        requestModel.setStartTime(new Date());
+        requestModel.setEndTime(new Date());
 
         Page<ExamineResponseModel> page = examineService.examinePaginQuery(requestModel);
 
@@ -700,6 +702,8 @@ public class AppExamineService {
     public PageResult<ExamineRecordMobileDto> examineRecordMobilePaginQuery(ExamineRecordMobileRequestDto request) {
 
         ExamineRecordRequestModel requestModel = BeanUtil.copyProperties(request, ExamineRecordRequestModel.class);
+        requestModel.setSortColumn("create_time");
+        requestModel.setSortAsc(true);
 
         Page<ExamineRecordResponseModel> page = examineService.examineRecordPaginQuery(requestModel);
 
@@ -733,6 +737,10 @@ public class AppExamineService {
 
         ExamineRecordRequestModel requestModel = BeanUtil.copyProperties(request, ExamineRecordRequestModel.class);
 
+        ExamineRequestModel rm = new ExamineRequestModel();
+        rm.setName(request.getUserName());
+        examineService.examineList(rm);
+
         Page<ExamineRecordResponseModel> page = examineService.examineRecordPaginQuery(requestModel);
 
         PageResult<ExamineRecordDto> pageResult = PageResult.of(request.getPageNo(), request.getPageSize(), (int) page.getTotalRow(), null);
@@ -837,9 +845,9 @@ public class AppExamineService {
 
         WikiCategoryRequestModel requestModel = BeanUtil.copyProperties(request, WikiCategoryRequestModel.class);
         requestModel.setStatus(1);
-        if(Objects.isNull(requestModel.getParentId())) {
-            requestModel.setLevel(3);
-        }
+
+        List<Integer> categoryIdList = examineService.wikiCategoryUseableList();
+        requestModel.setIdList(categoryIdList);
 
         Page<WikiCategoryResponseModel> page = examineService.wikiCategoryPaginQuery(requestModel);
 

src/main/java/cn/breeze/elleai/domain/sparring/model/request/ExamineRecordRequestModel.java

 package cn.breeze.elleai.domain.sparring.model.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.mybatisflex.core.query.QueryColumn;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -34,5 +35,9 @@ public class ExamineRecordRequestModel implements Serializable {
     private Date startTime;
 
     private Date endTime;
+
+    private String sortColumn;
+
+    private boolean sortAsc;
     
 }

src/main/java/cn/breeze/elleai/domain/sparring/model/request/WikiCategoryRequestModel.java

@@ -3,6 +3,7 @@ package cn.breeze.elleai.domain.sparring.model.request;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class WikiCategoryRequestModel implements Serializable {
@@ -17,5 +18,7 @@ public class WikiCategoryRequestModel implements Serializable {
 
     private Integer parentId;
 
+    private List<Integer> idList;
+
     private Integer level;
 }

src/main/java/cn/breeze/elleai/domain/sparring/service/ExamineService.java

@@ -115,6 +115,9 @@ public interface ExamineService {
     /***************************************** 资料库分类 *****************************************/
     Page<WikiCategoryResponseModel> wikiCategoryPaginQuery(WikiCategoryRequestModel request);
 
+
+    List<Integer> wikiCategoryUseableList();
+
     List<WikiCategoryResponseModel> wikiCategoryList(WikiCategoryRequestModel request);
 
     WikiCategoryResponseModel wikiCategoryDetail(Integer id);

src/main/java/cn/breeze/elleai/domain/sparring/service/ExamineServiceImpl.java

@@ -5,6 +5,7 @@ import cn.breeze.elleai.domain.sparring.model.response.*;
 import cn.breeze.elleai.infra.entity.*;
 import cn.breeze.elleai.infra.mapper.*;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.mybatisflex.core.paginate.Page;
@@ -311,10 +312,10 @@ public class ExamineServiceImpl implements ExamineService {
             queryWrapper.where(EXAMINE_ENTITY.SCENE_ID.eq(request.getSceneId()));
         }
         if(Objects.nonNull(request.getStartTime())) {
-            queryWrapper.where(EXAMINE_ENTITY.START_TIME.ge(request.getStartTime()));
+            queryWrapper.where(EXAMINE_ENTITY.START_TIME.le(request.getStartTime()));
         }
         if(Objects.nonNull(request.getEndTime())) {
-            queryWrapper.where(EXAMINE_ENTITY.END_TIME.le(request.getEndTime()));
+            queryWrapper.where(EXAMINE_ENTITY.END_TIME.ge(request.getEndTime()));
         }
 
         Page<ExamineResponseModel> page = examineMapper.paginateAs(pageNo, pageSize, queryWrapper, ExamineResponseModel.class);
@@ -435,7 +436,12 @@ public class ExamineServiceImpl implements ExamineService {
         if(Objects.nonNull(request.getEndTime())) {
             queryWrapper.and(USER_EXAMINE_RECORD_ENTITY.CREATE_TIME.le(request.getEndTime()));
         }
-        queryWrapper.orderBy(USER_EXAMINE_RECORD_ENTITY.CREATE_TIME, false);
+        if(StringUtils.isNotEmpty(request.getSortColumn())) {
+            queryWrapper.orderBy(request.getSortColumn(), request.isSortAsc());
+        } else {
+            queryWrapper.orderBy(USER_EXAMINE_RECORD_ENTITY.CREATE_TIME, false);
+        }
+
 
         Page<ExamineRecordResponseModel> page = userExamineRecordMapper.paginateAs(pageNo, pageSize, queryWrapper, ExamineRecordResponseModel.class);
 
@@ -567,6 +573,9 @@ public class ExamineServiceImpl implements ExamineService {
         if(Objects.nonNull(request.getLevel())) {
             queryWrapper.and(WIKI_CATEGORY_ENTITY.LEVEL.eq(request.getLevel()));
         }
+        if(CollectionUtil.isNotEmpty(request.getIdList())) {
+            queryWrapper.and(WIKI_CATEGORY_ENTITY.ID.in(request.getIdList()));
+        }
         queryWrapper.orderBy(WIKI_CATEGORY_ENTITY.CREATE_TIME, false);
 
         Page<WikiCategoryResponseModel> page = wikiCategoryMapper.paginateAs(pageNo, pageSize, queryWrapper, WikiCategoryResponseModel.class);
@@ -574,6 +583,17 @@ public class ExamineServiceImpl implements ExamineService {
         return page;
     }
 
+    @Override
+    public List<Integer> wikiCategoryUseableList() {
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .select(WIKI_ENTITY.WIKI_CATEGORY_ID)
+                .where(WIKI_ENTITY.DELETED.eq(0))
+                .and(WIKI_ENTITY.WIKI_CATEGORY_ID.isNotNull());
+        queryWrapper.groupBy(WIKI_ENTITY.WIKI_CATEGORY_ID);
+
+        return wikiMapper.selectListByQueryAs(queryWrapper, Integer.class);
+    }
+
     @Override
     public List<WikiCategoryResponseModel> wikiCategoryList(WikiCategoryRequestModel request) {
         QueryWrapper queryWrapper = QueryWrapper.create()