diff --git a/tz/common/common-core/src/main/java/com/tz/platform/common/core/api/ZhiYunApi.java b/tz/common/common-core/src/main/java/com/tz/platform/common/core/api/ZhiYunApi.java index 828363a..bf21ae1 100644 --- a/tz/common/common-core/src/main/java/com/tz/platform/common/core/api/ZhiYunApi.java +++ b/tz/common/common-core/src/main/java/com/tz/platform/common/core/api/ZhiYunApi.java @@ -43,13 +43,20 @@ public class ZhiYunApi { } + public String findCourceBySchool(Integer schoolId){ String content = HttpUtil.get(baseUrl+"/api/course/findAllBySchoolId?schoolId="+schoolId,headers); return content; } - public String findAllQuestion(){ - String content = HttpUtil.get(baseUrl+"/api/question/findAll",headers); + /** + * + * @param pageIndex 1 开始 + * @param pageSize 默认 10 + * @return + */ + public String findAllQuestion(int pageIndex,int pageSize){ + String content = HttpUtil.get(baseUrl+"/api/question/findAll?pageSize="+pageSize+"&pageIndex="+pageIndex,headers); return content; } diff --git a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/IFeignCourse.java b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/IFeignCourse.java new file mode 100644 index 0000000..8c15d7f --- /dev/null +++ b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/IFeignCourse.java @@ -0,0 +1,17 @@ +package com.tz.platform.feign.exam; + +import com.tz.platform.common.core.base.Result; +import com.tz.platform.feign.exam.vo.CourseVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +@FeignClient(value = "tz-exam-service") +public interface IFeignCourse { + @PostMapping(value = "/feign/exam/course/addAll") + Result addAll(@RequestBody List qo); + @PostMapping(value = "/feign/exam/course/getByOuterId") + CourseVO getByOuterId(@RequestBody Integer outerId); +} diff --git a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/IFeignExam.java b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/IFeignExam.java index 11c16ca..612f408 100644 --- a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/IFeignExam.java +++ b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/IFeignExam.java @@ -16,4 +16,6 @@ public interface IFeignExam { @PostMapping(value = "/feign/exam/question/list") List listQusetion(@RequestBody CacheQuestionQO qo); + + } diff --git a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/vo/CourseVO.java b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/vo/CourseVO.java new file mode 100644 index 0000000..bf7b8d6 --- /dev/null +++ b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/vo/CourseVO.java @@ -0,0 +1,21 @@ +package com.tz.platform.feign.exam.vo; + +import lombok.Data; + +import java.util.Date; +@Data +public class CourseVO { + private Long id; + private Long userNo; + private String name; + private String creator; + private Long createId; + private Date createTime; + private Integer learningCount; + private String thumbnail; + private String content; + private Integer tagId; + private Integer catId; + private Integer schoolId; + private Integer outerId; +} diff --git a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/vo/QuestionVo.java b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/vo/QuestionVo.java index 433ce99..db021c5 100644 --- a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/vo/QuestionVo.java +++ b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/vo/QuestionVo.java @@ -26,4 +26,5 @@ public class QuestionVo { private String analysis; private List answerId; private List children; + private Integer outerId; } diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Course.java b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Course.java index bdebd5d..8905e9f 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Course.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Course.java @@ -8,7 +8,7 @@ import java.util.Date; @Entity @Data -@Table(name = "course_sale",indexes = {@Index(columnList = "name")}) +@Table(name = "course_sale",indexes = {@Index(columnList = "name"),@Index(columnList = "outerId")}) public class Course implements Serializable { @Id @GeneratedValue(strategy= GenerationType.IDENTITY) @@ -23,4 +23,6 @@ public class Course implements Serializable { private String content; private Integer tagId; private Integer catId; + private Integer schoolId; + private Integer outerId; } diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/CourseSchoolMap.java b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/CourseSchoolMap.java new file mode 100644 index 0000000..a0e8e3b --- /dev/null +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/CourseSchoolMap.java @@ -0,0 +1,19 @@ +package com.tz.platform.entity; + +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Index; +import javax.persistence.Table; + +@Data +@Entity +@Table(indexes = {@Index(columnList = "schoolId")}) +public class CourseSchoolMap { + @Id + private String id; + private Integer courseId; + private Integer schoolId; + +} diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/QuestionSchoolMap.java b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/QuestionSchoolMap.java new file mode 100644 index 0000000..664c08a --- /dev/null +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/QuestionSchoolMap.java @@ -0,0 +1,18 @@ +package com.tz.platform.entity; + +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Index; +import javax.persistence.Table; + +@Data +@Entity +@Table(indexes = {@Index(columnList = "schoolId")}) +public class QuestionSchoolMap { + @Id + private String id; + private Integer schoolId; + private Integer questionId; +} diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/FeignCourseController.java b/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/FeignCourseController.java new file mode 100644 index 0000000..32de1a4 --- /dev/null +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/FeignCourseController.java @@ -0,0 +1,29 @@ +package com.tz.platform.exam.feign; + +import com.tz.platform.common.core.base.Result; +import com.tz.platform.common.core.tools.BeanUtils; +import com.tz.platform.feign.exam.IFeignCourse; +import com.tz.platform.feign.exam.vo.CourseVO; +import com.tz.platform.pc.biz.PCCourseBiz; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +public class FeignCourseController implements IFeignCourse { + + @Autowired + private PCCourseBiz courseBiz; + + @Override + public Result addAll(List qo) { + List voList = BeanUtils.copyProperties(qo,com.tz.platform.pc.vo.CourseVO.class); + return courseBiz.addForJob(voList); + } + + @Override + public CourseVO getByOuterId(Integer outerId) { + return courseBiz.getByOuterId(outerId); + } +} diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/FeignExamController.java b/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/FeignExamController.java index f291c1f..f1c1e0a 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/FeignExamController.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/FeignExamController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; @RestController -public class FeignExamController extends BaseController implements IFeignExam { +public class FeignExamController implements IFeignExam { @Autowired private FeignExamBiz feignExamBiz; @@ -26,4 +26,5 @@ public class FeignExamController extends BaseController implements IFeignExam { return feignExamBiz.list(qo.getIds()); } + } diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/biz/PCCourseBiz.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/biz/PCCourseBiz.java index 28cffc2..167d560 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/biz/PCCourseBiz.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/biz/PCCourseBiz.java @@ -1,6 +1,7 @@ package com.tz.platform.pc.biz; import com.tz.platform.common.core.base.Result; +import com.tz.platform.common.core.tools.BeanUtils; import com.tz.platform.entity.Course; import com.tz.platform.feign.user.IFeignUser; import com.tz.platform.feign.user.vo.UserVo; @@ -9,7 +10,6 @@ import com.tz.platform.pc.dto.PageCourseDTO; import com.tz.platform.pc.vo.CourseVO; import com.tz.platform.pc.vo.PageCourseVO; import com.tz.platform.repository.CourseDao; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -18,6 +18,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import java.util.Date; +import java.util.List; @Component public class PCCourseBiz { @@ -33,15 +34,31 @@ public class PCCourseBiz { return v; } UserVo userVo = feignUser.getByUserNo(courseVO.getUserNo()); - Course course = new Course(); - BeanUtils.copyProperties(courseVO,course); + Course course = BeanUtils.copyProperties(courseVO,Course.class); course.setCreateId(userVo.getId()); course.setCreator(userVo.getName()); course.setCreateTime(new Date()); + course.setSchoolId(userVo.getSchoolId()); courseDao.save(course); return Result.success("成功"); } + public com.tz.platform.feign.exam.vo.CourseVO getByOuterId(Integer outerId){ + Course course = courseDao.getByOuterId(outerId); + return BeanUtils.copyProperties(course,com.tz.platform.feign.exam.vo.CourseVO.class); + } + + public Result addForJob(List courseVOList){ + List courseList = BeanUtils.copyProperties(courseVOList,Course.class); + courseList.forEach(course -> { + course.setCreateId(1L); + course.setCreator("管理员"); + course.setCreateTime(new Date()); + }); + courseDao.saveAll(courseList); + return Result.success("成功"); + } + private Result valid(CourseVO courseVO){ if(StringUtils.isEmpty(courseVO.getName())){ return Result.error("课程名不能为空"); @@ -60,8 +77,8 @@ public class PCCourseBiz { if(v.getCode()!=200){ return v; } - Course course = new Course(); - BeanUtils.copyProperties(courseVO,course); + Course course = BeanUtils.copyProperties(courseVO,Course.class); + courseDao.save(course); return Result.success("success"); } @@ -87,8 +104,7 @@ public class PCCourseBiz { public Result get(Long id){ Course course = courseDao.getById(id); - CourseDTO courseDTO = new CourseDTO(); - BeanUtils.copyProperties(course,courseDTO); + CourseDTO courseDTO = BeanUtils.copyProperties(course,CourseDTO.class); return Result.success(courseDTO); } } diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/dto/CourseDTO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/dto/CourseDTO.java index df965c9..111a718 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/dto/CourseDTO.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/dto/CourseDTO.java @@ -17,4 +17,5 @@ public class CourseDTO implements Serializable { private String content; private Integer tagId; private Integer catId; + private Integer schoolId; } diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/CourseVO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/CourseVO.java index ab20435..c1dd9f0 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/CourseVO.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/CourseVO.java @@ -16,4 +16,6 @@ public class CourseVO { private String content; private Integer tagId; private Integer catId; + private Integer schoolId; + private Integer outerId; } diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/repository/CourseDao.java b/tz/exam/exam-service/src/main/java/com/tz/platform/repository/CourseDao.java index d5ab7eb..c1b29ab 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/repository/CourseDao.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/repository/CourseDao.java @@ -11,4 +11,5 @@ import org.springframework.stereotype.Repository; public interface CourseDao extends JpaRepository { Page findAll(Pageable pageable); Course getById(Long id); + Course getByOuterId(Integer outerId); } diff --git a/tz/user/user-service/pom.xml b/tz/user/user-service/pom.xml index 926ecb2..179075b 100644 --- a/tz/user/user-service/pom.xml +++ b/tz/user/user-service/pom.xml @@ -34,6 +34,10 @@ com.tz user-feign + + com.tz + exam-feign + com.monitorjbl xlsx-streamer