知识库管理

src/main/java/cn/breeze/elleai/application/dto/request/WikiRequestDto.java

@@ -20,6 +20,10 @@ public class WikiRequestDto implements Serializable {
     @Schema(description = "资料名称")
     private String name;
 
+    @Schema(description = "知识库分类ID")
+    @JsonProperty("category_id")
+    private Integer categoryId;
+
     @Schema(description = "知识库分类ID")
     @JsonProperty("wiki_category_id")
     private Integer wikiCategoryId;

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

@@ -80,7 +80,7 @@ public class AppCommonService {
      * 保存专有名词
      * @param dto
      */
-    public void saveproperNoun(ProperNounSaveDto dto) {
+    public void saveProperNoun(ProperNounSaveDto dto) {
 
         ProperNounSaveModel model = BeanUtil.copyProperties(dto, ProperNounSaveModel.class);
         model.setSimilarWords(JSON.toJSONString(dto.getSimilarWordList()));

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

@@ -831,6 +831,7 @@ public class AppExamineService {
     public PageResult<WikiCategoryMobileDto> wikiCategoryMobilePaginQuery(WikiCategoryRequestDto request) {
 
         WikiCategoryRequestModel requestModel = BeanUtil.copyProperties(request, WikiCategoryRequestModel.class);
+        requestModel.setStatus(1);
 
         Page<WikiCategoryResponseModel> page = examineService.wikiCategoryPaginQuery(requestModel);
 
@@ -960,6 +961,7 @@ public class AppExamineService {
     public PageResult<WikiListMobileDto> wikiMobilePaginQuery(WikiRequestDto request) {
 
         WikiRequestModel requestModel = BeanUtil.copyProperties(request, WikiRequestModel.class);
+        requestModel.setStatus(1);
 
         Page<WikiResponseModel> page = examineService.wikiPaginQuery(requestModel);
 

src/main/java/cn/breeze/elleai/controller/admin/CommonController.java

@@ -52,7 +52,7 @@ public class CommonController {
     @Operation(summary = "保存专有名词")
     @PostMapping("/proper_noun/save")
     public ApiResponse<String> saveOrUpdate(@RequestBody ProperNounSaveDto dto) {
-        commonService.saveproperNoun(dto);
+        commonService.saveProperNoun(dto);
         return ApiResponse.ok("ok");
     }
 

src/main/java/cn/breeze/elleai/controller/front/ExamineMobileController.java

@@ -146,7 +146,7 @@ public class ExamineMobileController {
     @Operation(summary = "退出考试，清除考试记录")
     @PostMapping(value = "/exit_examine")
     public ApiResponse<String> exitExam(@Parameter(hidden = true) UserPrincipal userPrincipal,
-                                        @Schema(description = "对练ID") @RequestParam("examine_id") Integer examineId,
+                                        @Schema(description = "对练ID") @RequestParam("examaine_id") Integer examineId,
                                         @Schema(description = "考试流水号") @RequestParam("business_no") String businessNo) {
 
         examineService.exitExamine(userPrincipal, examineId, businessNo);

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

@@ -13,5 +13,6 @@ public class WikiCategoryRequestModel implements Serializable {
 
     private String name;
 
+    private Integer status;
     
 }

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

@@ -15,6 +15,8 @@ public class WikiRequestModel implements Serializable {
 
     private String name;
 
+    private Integer categoryId;
+
     private Integer wikiCategoryId;
 
     private Integer sceneCategoryId;

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

@@ -541,6 +541,10 @@ public class ExamineServiceImpl implements ExamineService {
         if(StrUtil.isNotEmpty(request.getName())) {
             queryWrapper.where(WIKI_CATEGORY_ENTITY.NAME.like("%"+request.getName()+"%"));
         }
+        if(Objects.nonNull(request.getStatus())) {
+            queryWrapper.where(WIKI_CATEGORY_ENTITY.STATUS.eq(request.getStatus()));
+        }
+        queryWrapper.orderBy(WIKI_CATEGORY_ENTITY.CREATE_TIME, false);
 
         Page<WikiCategoryResponseModel> page = wikiCategoryMapper.paginateAs(pageNo, pageSize, queryWrapper, WikiCategoryResponseModel.class);
 
@@ -554,6 +558,10 @@ public class ExamineServiceImpl implements ExamineService {
         if(StrUtil.isNotEmpty(request.getName())) {
             queryWrapper.where(WIKI_CATEGORY_ENTITY.NAME.like("%"+request.getName()+"%"));
         }
+        if(Objects.nonNull(request.getStatus())) {
+            queryWrapper.where(WIKI_CATEGORY_ENTITY.STATUS.eq(request.getStatus()));
+        }
+        queryWrapper.orderBy(WIKI_CATEGORY_ENTITY.CREATE_TIME, false);
 
         return wikiCategoryMapper.selectListByQueryAs(queryWrapper, WikiCategoryResponseModel.class);
     }
@@ -607,6 +615,9 @@ public class ExamineServiceImpl implements ExamineService {
         if(Objects.nonNull(request.getWikiCategoryId())) {
             queryWrapper.and(WIKI_ENTITY.WIKI_CATEGORY_ID.eq(request.getWikiCategoryId()));
         }
+        if(Objects.nonNull(request.getCategoryId())) {
+            queryWrapper.and(WIKI_ENTITY.WIKI_CATEGORY_ID.eq(request.getCategoryId()));
+        }
         if(Objects.nonNull(request.getSceneCategoryId())) {
             queryWrapper.and(WIKI_ENTITY.SCENE_CATEGORY_ID.eq(request.getSceneCategoryId()));
         }