diff --git a/src/main/java/com/project/information/application/impl/KnowledgePointApplicationServiceImpl.java b/src/main/java/com/project/information/application/impl/KnowledgePointApplicationServiceImpl.java index 855cf34..643911f 100644 --- a/src/main/java/com/project/information/application/impl/KnowledgePointApplicationServiceImpl.java +++ b/src/main/java/com/project/information/application/impl/KnowledgePointApplicationServiceImpl.java @@ -6,8 +6,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.project.base.domain.result.Result; import com.project.information.application.KnowledgePointApplicationService; import com.project.information.domain.dto.KnowledgePointStatisticsDTO; +import com.project.information.domain.entity.InformationEntity; import com.project.information.domain.entity.KnowledgePointEntity; import com.project.information.domain.service.GetStatisticsKnowledgePointDomainService; +import com.project.information.domain.service.InformationBaseService; import com.project.information.domain.service.KnowledgePointBaseService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; @@ -35,6 +37,8 @@ public class KnowledgePointApplicationServiceImpl implements KnowledgePointAppli @Autowired private KnowledgePointBaseService knowledgePointBaseService; + @Autowired + private InformationBaseService informationBaseService; @Autowired private GetStatisticsKnowledgePointDomainService getStatisticsKnowledgePointDomainService; @@ -95,6 +99,12 @@ public class KnowledgePointApplicationServiceImpl implements KnowledgePointAppli List knowledgePointEntities = parseAnalysisResponse(response,id); if(!CollectionUtils.isEmpty(knowledgePointEntities)){ knowledgePointBaseService.saveBatch(knowledgePointEntities); + //向资料中冗余pareName字段值 + InformationEntity informationEntity = new InformationEntity(); + informationEntity.setId(id); + informationEntity.setParseName(knowledgePointEntities.get(0).getParseName()); + informationBaseService.updateById(informationEntity); + } } @@ -153,6 +163,7 @@ public class KnowledgePointApplicationServiceImpl implements KnowledgePointAppli KnowledgePointEntity entity = new KnowledgePointEntity(); entity.setContent((String) item.get("knowledge")); + entity.setParseName((String) item.get("products")); entity.setKnowledgeType(hasYellow ? 0 : 1); entity.setExamFocusList(focusList); entity.setInformationId(id); diff --git a/src/main/java/com/project/information/controller/KnowledgePointController.java b/src/main/java/com/project/information/controller/KnowledgePointController.java index 7cb911d..a7e8e05 100644 --- a/src/main/java/com/project/information/controller/KnowledgePointController.java +++ b/src/main/java/com/project/information/controller/KnowledgePointController.java @@ -18,4 +18,4 @@ public class KnowledgePointController { public Result getSum(Long subLineId) throws Exception { return knowledgePointApplicationService.getStatistics(subLineId); } -} +} \ No newline at end of file diff --git a/src/main/java/com/project/information/domain/dto/InformationDTO.java b/src/main/java/com/project/information/domain/dto/InformationDTO.java index 19fbe0f..aa82c0a 100644 --- a/src/main/java/com/project/information/domain/dto/InformationDTO.java +++ b/src/main/java/com/project/information/domain/dto/InformationDTO.java @@ -1,7 +1,10 @@ package com.project.information.domain.dto; +import com.baomidou.mybatisplus.annotation.TableField; import com.project.base.domain.dto.BaseDTO; +import jakarta.persistence.Column; import lombok.Data; +import org.hibernate.annotations.Comment; @Data public class InformationDTO extends BaseDTO { @@ -13,6 +16,7 @@ public class InformationDTO extends BaseDTO { private String filePath; private Integer parseStatus; private String fileSuffix; + private String parseName; diff --git a/src/main/java/com/project/information/domain/dto/KnowledgePointDTO.java b/src/main/java/com/project/information/domain/dto/KnowledgePointDTO.java index 267bb55..400e67c 100644 --- a/src/main/java/com/project/information/domain/dto/KnowledgePointDTO.java +++ b/src/main/java/com/project/information/domain/dto/KnowledgePointDTO.java @@ -1,9 +1,12 @@ package com.project.information.domain.dto; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.annotation.TableField; import com.project.base.domain.dto.BaseDTO; import com.project.information.domain.entity.KnowledgePointEntity; +import jakarta.persistence.Column; import lombok.Data; +import org.hibernate.annotations.Comment; import org.springframework.beans.BeanUtils; import java.util.List; @@ -17,6 +20,8 @@ public class KnowledgePointDTO extends BaseDTO { private Integer knowledgeType; + private String parseName; + private List examFocusDTOList; @Data diff --git a/src/main/java/com/project/information/domain/entity/InformationEntity.java b/src/main/java/com/project/information/domain/entity/InformationEntity.java index 0bf0771..0317a75 100644 --- a/src/main/java/com/project/information/domain/entity/InformationEntity.java +++ b/src/main/java/com/project/information/domain/entity/InformationEntity.java @@ -48,4 +48,9 @@ public class InformationEntity extends BaseEntity { @TableField("parse_status") @Comment("文件处理状态") private Integer parseStatus = InformationParseStatusEnum.NotStart.getValue(); + + @Column(name = "parse_name") + @TableField("parse_name") + @Comment("文件处理返回名称") + private String parseName; } diff --git a/src/main/java/com/project/information/domain/entity/KnowledgePointEntity.java b/src/main/java/com/project/information/domain/entity/KnowledgePointEntity.java index f5729a7..0a33bb7 100644 --- a/src/main/java/com/project/information/domain/entity/KnowledgePointEntity.java +++ b/src/main/java/com/project/information/domain/entity/KnowledgePointEntity.java @@ -46,6 +46,11 @@ public class KnowledgePointEntity extends BaseEntity { @TableField("information_id") private Long informationId; + @Column(name = "parse_name") + @TableField("parse_name") + @Comment("文件处理返回名称") + private String parseName; + @TableField(value = "exam_focus_list" , typeHandler = JacksonTypeHandler.class) @JdbcTypeCode(SqlTypes.JSON) @Column(name = "exam_focus_list", columnDefinition = "json comment '考点集合'")