Skip to content

feat:完善撤销删除功能 #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jinyu918 merged 1 commit into from
Nov 30, 2025
Merged

feat:完善撤销删除功能 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...in/java/com/achobeta/domain/keypoints_explanation/adapter/repository/KeyPointsMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<KeyPointsVO> 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);
Expand Down
2 changes: 1 addition & 1 deletion ...m/achobeta/domain/keypoints_explanation/service/etendbiz/KeyPointsExplanationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public void deleteKnowledgePoint(String knowledgeId, String userId) {
@Override
public void undoDeleteKnowledgePoint(String knowledgeId, String userId) {
if(knowledgeId != null){
List<KeyPointsVO> knowledges = keyPointsMapper.getSonKeyPoints(knowledgeId, userId);
List<KeyPointsVO> knowledges = keyPointsMapper.getPreDelSonKeyPoints(knowledgeId, userId);
keyPointsMapper.undoDeleteKnowledgePoint(knowledgeId, userId);
for (KeyPointsVO knowledge : knowledges) {
undoDeleteKnowledgePoint(knowledge.getId(), userId);
Expand Down
2 changes: 2 additions & 0 deletions refine-trigger/src/main/java/com/achobeta/trigger/http/KeyPointsExplanationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ public Response<String> addSonPoint(@PathVariable String knowledgeId, @RequestBo
public Response<String> deleteKnowledgePoint(@PathVariable String knowledgeId ) {
String userId = UserContext.getUserId();
try {
log.info("删除知识点:{}", knowledgeId);
deleteList.put(knowledgeId, LocalDateTime.now());
keyPointsExplanationService.deleteKnowledgePoint(knowledgeId, userId);
} catch (Exception e) {
Expand All @@ -310,6 +311,7 @@ public Response<String> deleteKnowledgePoint(@PathVariable String knowledgeId )
public Response<String> 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);
Expand Down
Loading