diff --git a/src/main/java/com/zhiyun/zhiyun03/Zhiyun03Application.java b/src/main/java/com/zhiyun/zhiyun03/Zhiyun03Application.java index 3b3da6b..aa812b3 100644 --- a/src/main/java/com/zhiyun/zhiyun03/Zhiyun03Application.java +++ b/src/main/java/com/zhiyun/zhiyun03/Zhiyun03Application.java @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; @SpringBootApplication -@MapperScan("com.zhiyun.**.dao") + public class Zhiyun03Application { public static void main(String[] args) { diff --git a/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java b/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java index 0ddb10e..7ec77fe 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java @@ -6,6 +6,7 @@ import com.zhiyun.zhiyun03.course.common.JsonResult; import com.zhiyun.zhiyun03.course.entity.Course; import com.zhiyun.zhiyun03.course.service.CourseService; +import com.zhiyun.zhiyun03.course.vo.CourseVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -24,49 +25,41 @@ public class CourseController { @ApiOperation("查询课程") @GetMapping("/selectAll") - public JsonResult selectAll(@RequestParam(value = "page", required = false,defaultValue = "1") Integer pageNum, - @RequestParam(value = "limit", required = false,defaultValue = "1") Integer pageSize){ + public List queryCourse(){ - PageHelper.startPage(pageNum,pageSize); - List courseList = courseService.selectAll(); - - PageInfo coursePageInfo = new PageInfo<>(); - - JsonResult jsonResult = JsonResult.ok(); - jsonResult.setData(coursePageInfo.getList()); - jsonResult.setCount(coursePageInfo.getTotal()); - return jsonResult; + List list = courseService.queryCourse(); + return list; } - @ApiOperation("课程添加") - @PostMapping("/add") - public JsonResult addCourse(Course course){ - courseService.addCourse(course); - return JsonResult.ok(); - } - -// @ApiOperation("查询目录") -// @PostMapping("/select") -// public JsonResult selectDir(Directory directory){ -// courseService.se(course); +// @ApiOperation("课程添加") +// @PostMapping("/add") +// public JsonResult addCourse(Course course){ +// courseService.addCourse(course); // return JsonResult.ok(); // } - - @ApiOperation("删除课程") - @DeleteMapping("delById") - public JsonResult delCourseById(Integer id){ - courseService.delCourseById(id); -return JsonResult.ok(); - } - - @ApiOperation("更新课程") - @DeleteMapping("updateById") - public JsonResult updateById(Course course){ - courseService.updateById(course); - return JsonResult.ok(); - } - +// +//// @ApiOperation("查询目录") +//// @PostMapping("/select") +//// public JsonResult selectDir(Directory directory){ +//// courseService.se(course); +//// return JsonResult.ok(); +//// } +// +// @ApiOperation("删除课程") +// @DeleteMapping("delById") +// public JsonResult delCourseById(Integer id){ +// courseService.delCourseById(id); +//return JsonResult.ok(); +// } +// +// @ApiOperation("更新课程") +// @DeleteMapping("updateById") +// public JsonResult updateById(Course course){ +// courseService.updateById(course); +// return JsonResult.ok(); +// } +// diff --git a/src/main/java/com/zhiyun/zhiyun03/course/mapper/CourseMapper.java b/src/main/java/com/zhiyun/zhiyun03/course/mapper/CourseMapper.java new file mode 100644 index 0000000..38c326f --- /dev/null +++ b/src/main/java/com/zhiyun/zhiyun03/course/mapper/CourseMapper.java @@ -0,0 +1,9 @@ +package com.zhiyun.zhiyun03.course.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhiyun.zhiyun03.course.entity.Course; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CourseMapper extends BaseMapper { +} diff --git a/src/main/java/com/zhiyun/zhiyun03/course/service/CourseService.java b/src/main/java/com/zhiyun/zhiyun03/course/service/CourseService.java index dc3b083..c68e712 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/service/CourseService.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/service/CourseService.java @@ -1,15 +1,17 @@ package com.zhiyun.zhiyun03.course.service; import com.zhiyun.zhiyun03.course.entity.Course; +import com.zhiyun.zhiyun03.course.vo.CourseVo; import java.util.List; public interface CourseService { - public void addCourse(Course course); +// public void addCourse(Course course); +// +// void delCourseById(Integer id); +// +// void updateById(Course course); - void delCourseById(Integer id); - void updateById(Course course); - - List selectAll(); + List queryCourse(); } diff --git a/src/main/java/com/zhiyun/zhiyun03/course/service/impl/CourseServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/course/service/impl/CourseServiceImpl.java index cbb3b52..ef36776 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/service/impl/CourseServiceImpl.java @@ -1,36 +1,76 @@ package com.zhiyun.zhiyun03.course.service.impl; -import com.zhiyun.zhiyun03.course.dao.CourseDAO; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhiyun.zhiyun03.application.entity.Directory; +import com.zhiyun.zhiyun03.application.mapper.DirectoryMapper; +import com.zhiyun.zhiyun03.application.util.ConvertUtil; import com.zhiyun.zhiyun03.course.entity.Course; import com.zhiyun.zhiyun03.course.service.CourseService; -import org.springframework.beans.factory.annotation.Autowired; +import com.zhiyun.zhiyun03.course.vo.CourseVo; +import com.zhiyun.zhiyun03.course.mapper.CourseMapper; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; @Service -public class CourseServiceImpl implements CourseService { +public class CourseServiceImpl extends ServiceImpl implements CourseService { - @Autowired - private CourseDAO courseDAO; + @Resource + private CourseMapper courseMapper; - @Override - public void addCourse(Course course) { - courseDAO.insert(course); - } + @Resource + DirectoryMapper directoryMapper; - @Override - public void delCourseById(Integer id) { - courseDAO.deleteByPrimaryKey(id); - } - @Override - public void updateById(Course course) { - courseDAO.updateByPrimaryKey(course); - } + /** + * 应用中心查询 + */ @Override - public List selectAll() { - return courseDAO.selectAll(); + public List queryCourse() { + QueryWrapper qwa=new QueryWrapper<>(); + List courses = courseMapper.selectList(qwa); + QueryWrapper qwd=new QueryWrapper<>(); + List directories = directoryMapper.selectList(qwd); + ConvertUtil convertUtil=new ConvertUtil(); + List applicationVos = convertUtil.entityToVoList(courses, CourseVo.class); + + for (int i = 0; i < courses.size(); i++) { + for (int j = 0; j queryCourse() { +// return null; +// } +// +// @Override +// public List selectAll() { +// return courseDAO.selectAll(); +// } } diff --git a/src/main/java/com/zhiyun/zhiyun03/course/vo/CourseVo.java b/src/main/java/com/zhiyun/zhiyun03/course/vo/CourseVo.java new file mode 100644 index 0000000..19c222a --- /dev/null +++ b/src/main/java/com/zhiyun/zhiyun03/course/vo/CourseVo.java @@ -0,0 +1,20 @@ +package com.zhiyun.zhiyun03.course.vo; + +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +@Data +public class CourseVo{ + @TableId + private int id; + + private String courseName; + + private String courseBrief; + + private String courseUrl; + + private String dirName; + + private String appIcon; +} diff --git a/src/main/java/com/zhiyun/zhiyun03/directory/controller/DirectoryController.java b/src/main/java/com/zhiyun/zhiyun03/directory/controller/DirectoryController.java deleted file mode 100644 index 83059a3..0000000 --- a/src/main/java/com/zhiyun/zhiyun03/directory/controller/DirectoryController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zhiyun.zhiyun03.directory.controller; - -import com.zhiyun.zhiyun03.course.common.JsonResult; -import com.zhiyun.zhiyun03.directory.entity.Directory; -import com.zhiyun.zhiyun03.directory.servcie.DirectoryService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api("目录") -@RestController -@RequestMapping("/api/directory") -public class DirectoryController { - @Autowired - private DirectoryService directoryService; - - @ApiOperation("添加目录") - @PostMapping("/add") - public JsonResult addDirectory(Directory directory){ - directoryService.addDirectory(directory); - return JsonResult.ok(); - } - - - - - - - -} diff --git a/src/main/java/com/zhiyun/zhiyun03/directory/servcie/DirectoryService.java b/src/main/java/com/zhiyun/zhiyun03/directory/servcie/DirectoryService.java deleted file mode 100644 index 5eb61ae..0000000 --- a/src/main/java/com/zhiyun/zhiyun03/directory/servcie/DirectoryService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zhiyun.zhiyun03.directory.servcie; - -import com.zhiyun.zhiyun03.directory.entity.Directory; - -public interface DirectoryService { - void addDirectory(Directory directory); -} diff --git a/src/main/java/com/zhiyun/zhiyun03/directory/servcie/impl/DirectoryServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/directory/servcie/impl/DirectoryServiceImpl.java deleted file mode 100644 index e10e1ff..0000000 --- a/src/main/java/com/zhiyun/zhiyun03/directory/servcie/impl/DirectoryServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.zhiyun.zhiyun03.directory.servcie.impl; - -import com.zhiyun.zhiyun03.course.dao.DirectoryDAO; -import com.zhiyun.zhiyun03.directory.entity.Directory; -import com.zhiyun.zhiyun03.directory.servcie.DirectoryService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class DirectoryServiceImpl implements DirectoryService { - - @Autowired - private DirectoryDAO directoryDAO; - - @Override - public void addDirectory(Directory directory) { - directoryDAO.insert(directory); - } -} diff --git a/src/main/resources/mapper/DirectoryMapper.xml b/src/main/resources/mapper/DirectoryMapper.xml new file mode 100644 index 0000000..8055e7d --- /dev/null +++ b/src/main/resources/mapper/DirectoryMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/directory/DirectoryDAO.xml b/src/main/resources/mapper/directory/DirectoryDAO.xml deleted file mode 100644 index 50e1e0e..0000000 --- a/src/main/resources/mapper/directory/DirectoryDAO.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - id, dir_name, dir_img - - - - delete from directory - where id = #{id,jdbcType=INTEGER} - - - insert into directory (id,dir_name, dir_img) - values (#{id},#{dirName,jdbcType=VARCHAR}, #{dirImg,jdbcType=VARCHAR}) - - - insert into directory - - - dir_name, - - - dir_img, - - - - - #{dirName,jdbcType=VARCHAR}, - - - #{dirImg,jdbcType=VARCHAR}, - - - - - update directory - - - dir_name = #{dirName,jdbcType=VARCHAR}, - - - dir_img = #{dirImg,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update directory - set dir_name = #{dirName,jdbcType=VARCHAR}, - dir_img = #{dirImg,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file