diff --git a/src/main/java/com/teaching/backend/controller/Know/KnowController.java b/src/main/java/com/teaching/backend/controller/Know/KnowController.java index 2ec254d..ad5607d 100644 --- a/src/main/java/com/teaching/backend/controller/Know/KnowController.java +++ b/src/main/java/com/teaching/backend/controller/Know/KnowController.java @@ -8,11 +8,11 @@ package com.teaching.backend.controller.Know; import com.teaching.backend.common.BaseResponse; import com.teaching.backend.model.dto.Know.*; import com.teaching.backend.model.entity.know.*; -import com.teaching.backend.model.entity.knowtmp.Knowtmp; +import com.teaching.backend.model.vo.knowGraph.KnowPathVO; import com.teaching.backend.model.vo.knowGraph.KnowVO; +import com.teaching.backend.model.vo.knowGraph.RelsNodesVO; import com.teaching.backend.service.Know.KnowService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/teaching/backend/controller/Know/Edge.java b/src/main/java/com/teaching/backend/model/entity/know/Edge.java similarity index 89% rename from src/main/java/com/teaching/backend/controller/Know/Edge.java rename to src/main/java/com/teaching/backend/model/entity/know/Edge.java index 12d70cc..47a3295 100644 --- a/src/main/java/com/teaching/backend/controller/Know/Edge.java +++ b/src/main/java/com/teaching/backend/model/entity/know/Edge.java @@ -1,4 +1,4 @@ -package com.teaching.backend.controller.Know; +package com.teaching.backend.model.entity.know; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/teaching/backend/controller/Know/KnowJson.java b/src/main/java/com/teaching/backend/model/entity/know/KnowJson.java similarity index 90% rename from src/main/java/com/teaching/backend/controller/Know/KnowJson.java rename to src/main/java/com/teaching/backend/model/entity/know/KnowJson.java index 09e4911..1e4ff5c 100644 --- a/src/main/java/com/teaching/backend/controller/Know/KnowJson.java +++ b/src/main/java/com/teaching/backend/model/entity/know/KnowJson.java @@ -1,4 +1,4 @@ -package com.teaching.backend.controller.Know; +package com.teaching.backend.model.entity.know; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/teaching/backend/controller/Know/KnowChapterVO.java b/src/main/java/com/teaching/backend/model/vo/knowGraph/KnowChapterVO.java similarity index 88% rename from src/main/java/com/teaching/backend/controller/Know/KnowChapterVO.java rename to src/main/java/com/teaching/backend/model/vo/knowGraph/KnowChapterVO.java index 1c7c577..54e8977 100644 --- a/src/main/java/com/teaching/backend/controller/Know/KnowChapterVO.java +++ b/src/main/java/com/teaching/backend/model/vo/knowGraph/KnowChapterVO.java @@ -1,4 +1,4 @@ -package com.teaching.backend.controller.Know; +package com.teaching.backend.model.vo.knowGraph; import lombok.Data; diff --git a/src/main/java/com/teaching/backend/controller/Know/KnowCourseVO.java b/src/main/java/com/teaching/backend/model/vo/knowGraph/KnowCourseVO.java similarity index 87% rename from src/main/java/com/teaching/backend/controller/Know/KnowCourseVO.java rename to src/main/java/com/teaching/backend/model/vo/knowGraph/KnowCourseVO.java index eff546c..719ae74 100644 --- a/src/main/java/com/teaching/backend/controller/Know/KnowCourseVO.java +++ b/src/main/java/com/teaching/backend/model/vo/knowGraph/KnowCourseVO.java @@ -1,4 +1,4 @@ -package com.teaching.backend.controller.Know; +package com.teaching.backend.model.vo.knowGraph; import lombok.Data; diff --git a/src/main/java/com/teaching/backend/controller/Know/KnowJsonListVO.java b/src/main/java/com/teaching/backend/model/vo/knowGraph/KnowJsonListVO.java similarity index 76% rename from src/main/java/com/teaching/backend/controller/Know/KnowJsonListVO.java rename to src/main/java/com/teaching/backend/model/vo/knowGraph/KnowJsonListVO.java index 421fea8..46bea55 100644 --- a/src/main/java/com/teaching/backend/controller/Know/KnowJsonListVO.java +++ b/src/main/java/com/teaching/backend/model/vo/knowGraph/KnowJsonListVO.java @@ -1,8 +1,6 @@ -package com.teaching.backend.controller.Know; +package com.teaching.backend.model.vo.knowGraph; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; +import com.teaching.backend.model.entity.know.KnowJson; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/teaching/backend/controller/Know/KnowPathVO.java b/src/main/java/com/teaching/backend/model/vo/knowGraph/KnowPathVO.java similarity index 86% rename from src/main/java/com/teaching/backend/controller/Know/KnowPathVO.java rename to src/main/java/com/teaching/backend/model/vo/knowGraph/KnowPathVO.java index 9fec2bc..f2f7b0c 100644 --- a/src/main/java/com/teaching/backend/controller/Know/KnowPathVO.java +++ b/src/main/java/com/teaching/backend/model/vo/knowGraph/KnowPathVO.java @@ -1,4 +1,4 @@ -package com.teaching.backend.controller.Know; +package com.teaching.backend.model.vo.knowGraph; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/teaching/backend/model/vo/knowGraph/KnowVO1.java b/src/main/java/com/teaching/backend/model/vo/knowGraph/KnowVO1.java deleted file mode 100644 index 98f53cf..0000000 --- a/src/main/java/com/teaching/backend/model/vo/knowGraph/KnowVO1.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.teaching.backend.model.vo.knowGraph; - -import lombok.Data; - -import java.io.Serializable; - - -@Data -public class KnowVO1 implements Serializable { - - - /** - * id - */ - private Long id; - - - /** - * 知识点名称 - */ - private String label; - - -} - diff --git a/src/main/java/com/teaching/backend/controller/Know/RelsNodesVO.java b/src/main/java/com/teaching/backend/model/vo/knowGraph/RelsNodesVO.java similarity index 90% rename from src/main/java/com/teaching/backend/controller/Know/RelsNodesVO.java rename to src/main/java/com/teaching/backend/model/vo/knowGraph/RelsNodesVO.java index 3609edd..9dcf4a3 100644 --- a/src/main/java/com/teaching/backend/controller/Know/RelsNodesVO.java +++ b/src/main/java/com/teaching/backend/model/vo/knowGraph/RelsNodesVO.java @@ -1,4 +1,4 @@ -package com.teaching.backend.controller.Know; +package com.teaching.backend.model.vo.knowGraph; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/teaching/backend/service/Know/KnowService.java b/src/main/java/com/teaching/backend/service/Know/KnowService.java index d35271f..449317c 100644 --- a/src/main/java/com/teaching/backend/service/Know/KnowService.java +++ b/src/main/java/com/teaching/backend/service/Know/KnowService.java @@ -1,17 +1,12 @@ package com.teaching.backend.service.Know; import com.teaching.backend.common.BaseResponse; -import com.teaching.backend.controller.Know.KnowPathVO; +import com.teaching.backend.model.vo.knowGraph.KnowPathVO; import com.teaching.backend.model.dto.Know.*; import com.teaching.backend.model.entity.know.*; -import com.teaching.backend.model.entity.knowtmp.Knowtmp; -import com.teaching.backend.model.entity.resource.Resources; import com.teaching.backend.model.vo.knowGraph.KnowVO; -import com.teaching.backend.model.vo.knowGraph.KnowVO1; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; -import java.util.Set; /** * @Author:youhang diff --git a/src/main/java/com/teaching/backend/service/impl/know/knowServiceImpl.java b/src/main/java/com/teaching/backend/service/impl/know/knowServiceImpl.java index 2266643..ad23a89 100644 --- a/src/main/java/com/teaching/backend/service/impl/know/knowServiceImpl.java +++ b/src/main/java/com/teaching/backend/service/impl/know/knowServiceImpl.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.teaching.backend.common.BaseResponse; import com.teaching.backend.common.ErrorCode; import com.teaching.backend.common.ResultUtils; -import com.teaching.backend.controller.Know.KnowPathVO; +import com.teaching.backend.model.vo.knowGraph.KnowPathVO; import com.teaching.backend.mapper.Knowtemp.KnowstrMapper; import com.teaching.backend.mapper.Knowtemp.KnowtmpMapper; import com.teaching.backend.mapper.chapter.ChapterMapper;