diff --git a/refine-domain/src/main/java/com/achobeta/domain/keypoints_explanation/adapter/repository/KeyPointsMapper.java b/refine-domain/src/main/java/com/achobeta/domain/keypoints_explanation/adapter/repository/KeyPointsMapper.java index 2f3c2e0..f3a293f 100644 --- a/refine-domain/src/main/java/com/achobeta/domain/keypoints_explanation/adapter/repository/KeyPointsMapper.java +++ b/refine-domain/src/main/java/com/achobeta/domain/keypoints_explanation/adapter/repository/KeyPointsMapper.java @@ -3,6 +3,7 @@ import cn.hutool.core.date.DateTime; import com.achobeta.domain.keypoints_explanation.model.valobj.*; import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -70,6 +71,10 @@ public interface KeyPointsMapper { @Select("delete from knowledgePoint where status = -1") void deleteKnowledgeTure(); + + @Select("select knowledge_point_id as id, knowledge_point_name as keyPoints from knowledgePoint" + + " where user_id = #{userId} and parent_knowledge_point_id = #{knowledgeId} and status = -1") + List getPreDelSonKeyPoints(String knowledgeId, String userId); @Insert("insert into knowledgePoint(knowledge_point_id, knowledge_point_name, user_id)" + " values(#{knowledgePointId}, #{knowledgePointName}, #{userId})") void insertNewPoint4MistakeQuestion(String userId, String knowledgePointId, String knowledgePointName); diff --git a/refine-domain/src/main/java/com/achobeta/domain/keypoints_explanation/service/etendbiz/KeyPointsExplanationService.java b/refine-domain/src/main/java/com/achobeta/domain/keypoints_explanation/service/etendbiz/KeyPointsExplanationService.java index 253cbbc..021a947 100644 --- a/refine-domain/src/main/java/com/achobeta/domain/keypoints_explanation/service/etendbiz/KeyPointsExplanationService.java +++ b/refine-domain/src/main/java/com/achobeta/domain/keypoints_explanation/service/etendbiz/KeyPointsExplanationService.java @@ -181,7 +181,7 @@ public void deleteKnowledgePoint(String knowledgeId, String userId) { @Override public void undoDeleteKnowledgePoint(String knowledgeId, String userId) { if(knowledgeId != null){ - List knowledges = keyPointsMapper.getSonKeyPoints(knowledgeId, userId); + List knowledges = keyPointsMapper.getPreDelSonKeyPoints(knowledgeId, userId); keyPointsMapper.undoDeleteKnowledgePoint(knowledgeId, userId); for (KeyPointsVO knowledge : knowledges) { undoDeleteKnowledgePoint(knowledge.getId(), userId); diff --git a/refine-trigger/src/main/java/com/achobeta/trigger/http/KeyPointsExplanationController.java b/refine-trigger/src/main/java/com/achobeta/trigger/http/KeyPointsExplanationController.java index 099afc0..e038ca2 100644 --- a/refine-trigger/src/main/java/com/achobeta/trigger/http/KeyPointsExplanationController.java +++ b/refine-trigger/src/main/java/com/achobeta/trigger/http/KeyPointsExplanationController.java @@ -294,6 +294,7 @@ public Response addSonPoint(@PathVariable String knowledgeId, @RequestBo public Response deleteKnowledgePoint(@PathVariable String knowledgeId ) { String userId = UserContext.getUserId(); try { + log.info("删除知识点:{}", knowledgeId); deleteList.put(knowledgeId, LocalDateTime.now()); keyPointsExplanationService.deleteKnowledgePoint(knowledgeId, userId); } catch (Exception e) { @@ -310,6 +311,7 @@ public Response deleteKnowledgePoint(@PathVariable String knowledgeId ) public Response undoDeleteKnowledgePoint(@PathVariable String knowledgeId ) { String userId = UserContext.getUserId(); try { + log.info("撤销删除知识点:{}", knowledgeId); if(LocalDateTime.now().isAfter(deleteList.get(knowledgeId).minusMinutes(30))){ deleteList.remove(knowledgeId); keyPointsExplanationService.undoDeleteKnowledgePoint(knowledgeId, userId);