diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseManagementConvertor.java b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseManagementConvertor.java index 7aa189db..45abc8e0 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseManagementConvertor.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseManagementConvertor.java @@ -3,18 +3,18 @@ package org.qinan.cedu.convertor; import org.mapstruct.Mapper; import org.qinan.cedu.model.dto.CourseManagementDTO; import org.qinan.cedu.model.dto.CourseManagementVO; -import org.qinan.cedu.model.entity.CourseManagement; +import org.qinan.cedu.model.entity.CourseManagementDO; import java.util.List; @Mapper(componentModel = "spring") public interface CourseManagementConvertor { - CourseManagement convertDtoToE(CourseManagementDTO dto); + CourseManagementDO convertDtoToE(CourseManagementDTO dto); - CourseManagementVO convertEToVo(CourseManagement entity); + CourseManagementVO convertEToVo(CourseManagementDO entity); - List convertDtoListToEList(List list); + List convertDtoListToEList(List list); - List convertEListToVoList(List list); + List convertEListToVoList(List list); } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseRelCoursewareConvertor.java b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseRelCoursewareConvertor.java index 29c2512b..a55e3c07 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseRelCoursewareConvertor.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseRelCoursewareConvertor.java @@ -3,18 +3,18 @@ package org.qinan.cedu.convertor; import org.mapstruct.Mapper; import org.qinan.cedu.model.dto.CourseRelCoursewareDTO; import org.qinan.cedu.model.dto.CourseRelCoursewareVO; -import org.qinan.cedu.model.entity.CourseRelCourseware; +import org.qinan.cedu.model.entity.CourseRelCoursewareDO; import java.util.List; @Mapper(componentModel = "spring") public interface CourseRelCoursewareConvertor { - CourseRelCourseware convertDtoToE(CourseRelCoursewareDTO dto); + CourseRelCoursewareDO convertDtoToE(CourseRelCoursewareDTO dto); - CourseRelCoursewareVO convertEToVo(CourseRelCourseware entity); + CourseRelCoursewareVO convertEToVo(CourseRelCoursewareDO entity); - List convertDtoListToEList(List list); + List convertDtoListToEList(List list); - List convertEListToVoList(List list); + List convertEListToVoList(List list); } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CoursewareManagementConvertor.java b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CoursewareManagementConvertor.java index 167e8ceb..83258806 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CoursewareManagementConvertor.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CoursewareManagementConvertor.java @@ -3,18 +3,18 @@ package org.qinan.cedu.convertor; import org.mapstruct.Mapper; import org.qinan.cedu.model.dto.CoursewareManagementDTO; import org.qinan.cedu.model.dto.CoursewareManagementVO; -import org.qinan.cedu.model.entity.CoursewareManagement; +import org.qinan.cedu.model.entity.CoursewareManagementDO; import java.util.List; @Mapper(componentModel = "spring") public interface CoursewareManagementConvertor { - CoursewareManagement convertDtoToE(CoursewareManagementDTO dto); + CoursewareManagementDO convertDtoToE(CoursewareManagementDTO dto); - CoursewareManagementVO convertEToVo(CoursewareManagement entity); + CoursewareManagementVO convertEToVo(CoursewareManagementDO entity); - List convertDtoListToEList(List list); + List convertDtoListToEList(List list); - List convertEListToVoList(List list); + List convertEListToVoList(List list); } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/CourseManagementMapper.java b/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/CourseManagementMapper.java index e180a61f..917b051f 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/CourseManagementMapper.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/CourseManagementMapper.java @@ -1,7 +1,7 @@ package org.qinan.cedu.mapper; import org.apache.ibatis.annotations.Mapper; -import org.qinan.cedu.model.entity.CourseManagement; +import org.qinan.cedu.model.entity.CourseManagementDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Entity org.qinan.cedu.model.entity.CourseManagement */ @Mapper -public interface CourseManagementMapper extends BaseMapper { +public interface CourseManagementMapper extends BaseMapper { } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/CourseRelCoursewareMapper.java b/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/CourseRelCoursewareMapper.java index d4855b5b..96ad7400 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/CourseRelCoursewareMapper.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/CourseRelCoursewareMapper.java @@ -1,7 +1,7 @@ package org.qinan.cedu.mapper; import org.apache.ibatis.annotations.Mapper; -import org.qinan.cedu.model.entity.CourseRelCourseware; +import org.qinan.cedu.model.entity.CourseRelCoursewareDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Entity org.qinan.cedu.model.entity.CourseRelCourseware */ @Mapper -public interface CourseRelCoursewareMapper extends BaseMapper { +public interface CourseRelCoursewareMapper extends BaseMapper { } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/CoursewareManagementMapper.java b/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/CoursewareManagementMapper.java index e46ce7c8..d1e4d941 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/CoursewareManagementMapper.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/CoursewareManagementMapper.java @@ -1,7 +1,7 @@ package org.qinan.cedu.mapper; import org.apache.ibatis.annotations.Mapper; -import org.qinan.cedu.model.entity.CoursewareManagement; +import org.qinan.cedu.model.entity.CoursewareManagementDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Entity org.qinan.cedu.model.entity.CoursewareManagement */ @Mapper -public interface CoursewareManagementMapper extends BaseMapper { +public interface CoursewareManagementMapper extends BaseMapper { } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseManagement.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseManagementDO.java similarity index 96% rename from safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseManagement.java rename to safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseManagementDO.java index a5bf8b9c..fcf20410 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseManagement.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseManagementDO.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = true) @TableName(value ="course_management") @Data -public class CourseManagement extends BaseEntity { +public class CourseManagementDO extends BaseEntity { /** * 主键 */ diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseRelCourseware.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseRelCoursewareDO.java similarity index 96% rename from safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseRelCourseware.java rename to safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseRelCoursewareDO.java index 8c5d689f..17de5154 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseRelCourseware.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseRelCoursewareDO.java @@ -11,7 +11,7 @@ import lombok.Data; */ @TableName(value ="course_rel_courseware") @Data -public class CourseRelCourseware { +public class CourseRelCoursewareDO { /** * 主键 */ diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CoursewareManagement.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CoursewareManagementDO.java similarity index 96% rename from safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CoursewareManagement.java rename to safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CoursewareManagementDO.java index 7ab180b7..08b27f05 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CoursewareManagement.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CoursewareManagementDO.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; */ @TableName(value ="courseware_management") @Data -public class CoursewareManagement extends BaseEntity { +public class CoursewareManagementDO extends BaseEntity { /** * 主键 */ diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseManagementService.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseManagementService.java index e008150c..2a0ddd3d 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseManagementService.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseManagementService.java @@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.qinan.cedu.model.dto.CourseManagementDTO; import org.qinan.cedu.model.dto.CourseManagementPageQuery; import org.qinan.cedu.model.dto.CourseManagementVO; -import org.qinan.cedu.model.entity.CourseManagement; +import org.qinan.cedu.model.entity.CourseManagementDO; /** * 课程管理服务 */ -public interface CourseManagementService extends IService { +public interface CourseManagementService extends IService { IPage pageQuery(CourseManagementPageQuery query); diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseRelCoursewareService.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseRelCoursewareService.java index 3452f5c9..3c12d407 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseRelCoursewareService.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseRelCoursewareService.java @@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.qinan.cedu.model.dto.CourseRelCoursewareDTO; import org.qinan.cedu.model.dto.CourseRelCoursewareVO; -import org.qinan.cedu.model.entity.CourseRelCourseware; +import org.qinan.cedu.model.entity.CourseRelCoursewareDO; import java.util.List; /** * 课程关联课件服务 */ -public interface CourseRelCoursewareService extends IService { +public interface CourseRelCoursewareService extends IService { IPage pageQuery(long current, long size, Long courseId); diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/CoursewareManagementService.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/CoursewareManagementService.java index 02a72f86..f05f04be 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/CoursewareManagementService.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/CoursewareManagementService.java @@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.qinan.cedu.model.dto.CoursewareManagementDTO; import org.qinan.cedu.model.dto.CoursewareManagementPageQuery; import org.qinan.cedu.model.dto.CoursewareManagementVO; -import org.qinan.cedu.model.entity.CoursewareManagement; +import org.qinan.cedu.model.entity.CoursewareManagementDO; /** * 课件管理服务 */ -public interface CoursewareManagementService extends IService { +public interface CoursewareManagementService extends IService { IPage pageQuery(CoursewareManagementPageQuery query); diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java index 65a5b144..84f4a346 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java @@ -7,7 +7,7 @@ import org.qinan.cedu.convertor.CourseManagementConvertor; import org.qinan.cedu.model.dto.CourseManagementDTO; import org.qinan.cedu.model.dto.CourseManagementPageQuery; import org.qinan.cedu.model.dto.CourseManagementVO; -import org.qinan.cedu.model.entity.CourseManagement; +import org.qinan.cedu.model.entity.CourseManagementDO; import org.qinan.cedu.enums.DeleteEnum; import org.qinan.cedu.mapper.CourseManagementMapper; import org.qinan.cedu.service.CourseManagementService; @@ -21,7 +21,7 @@ import java.time.LocalDateTime; * 课程管理服务实现 */ @Service -public class CourseManagementServiceImpl extends ServiceImpl +public class CourseManagementServiceImpl extends ServiceImpl implements CourseManagementService { @Autowired @@ -31,27 +31,27 @@ public class CourseManagementServiceImpl extends ServiceImpl pageQuery(CourseManagementPageQuery query) { long current = query.getCurrent() == null ? 1L : query.getCurrent(); long size = query.getSize() == null ? 10L : query.getSize(); - IPage page = this.lambdaQuery() - .eq(CourseManagement::getDeleteEnum, DeleteEnum.FALSE.getCode()) - .like(StringUtils.hasText(query.getCourseName()), CourseManagement::getCourseName, query.getCourseName()) - .eq(query.getStatus() != null, CourseManagement::getStatus, query.getStatus()) - .orderByDesc(CourseManagement::getCreateTime) + IPage page = this.lambdaQuery() + .eq(CourseManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode()) + .like(StringUtils.hasText(query.getCourseName()), CourseManagementDO::getCourseName, query.getCourseName()) + .eq(query.getStatus() != null, CourseManagementDO::getStatus, query.getStatus()) + .orderByDesc(CourseManagementDO::getCreateTime) .page(new Page<>(current, size)); return page.convert(courseManagementConvertor::convertEToVo); } @Override public CourseManagementVO getDetail(Long id) { - CourseManagement entity = this.lambdaQuery() - .eq(CourseManagement::getId, id) - .eq(CourseManagement::getDeleteEnum, DeleteEnum.FALSE.getCode()) + CourseManagementDO entity = this.lambdaQuery() + .eq(CourseManagementDO::getId, id) + .eq(CourseManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode()) .one(); return courseManagementConvertor.convertEToVo(entity); } @Override public boolean saveCourse(CourseManagementDTO dto) { - CourseManagement entity = courseManagementConvertor.convertDtoToE(dto); + CourseManagementDO entity = courseManagementConvertor.convertDtoToE(dto); LocalDateTime now = LocalDateTime.now(); entity.setCreateTime(now); entity.setUpdateTime(now); @@ -64,7 +64,7 @@ public class CourseManagementServiceImpl extends ServiceImpl +public class CourseRelCoursewareServiceImpl extends ServiceImpl implements CourseRelCoursewareService { @Autowired @@ -26,9 +26,9 @@ public class CourseRelCoursewareServiceImpl extends ServiceImpl pageQuery(long current, long size, Long courseId) { - IPage page = this.lambdaQuery() - .eq(courseId != null, CourseRelCourseware::getCourseId, courseId) - .orderByAsc(CourseRelCourseware::getSort) + IPage page = this.lambdaQuery() + .eq(courseId != null, CourseRelCoursewareDO::getCourseId, courseId) + .orderByAsc(CourseRelCoursewareDO::getSort) .page(new Page<>(current, size)); return page.convert(courseRelCoursewareConvertor::convertEToVo); } @@ -40,22 +40,22 @@ public class CourseRelCoursewareServiceImpl extends ServiceImpl listByCourseId(Long courseId) { - List list = this.lambdaQuery() - .eq(CourseRelCourseware::getCourseId, courseId) - .orderByAsc(CourseRelCourseware::getSort) + List list = this.lambdaQuery() + .eq(CourseRelCoursewareDO::getCourseId, courseId) + .orderByAsc(CourseRelCoursewareDO::getSort) .list(); return courseRelCoursewareConvertor.convertEListToVoList(list); } @Override public boolean saveRel(CourseRelCoursewareDTO dto) { - CourseRelCourseware entity = courseRelCoursewareConvertor.convertDtoToE(dto); + CourseRelCoursewareDO entity = courseRelCoursewareConvertor.convertDtoToE(dto); return this.save(entity); } @Override public boolean updateRel(CourseRelCoursewareDTO dto) { - CourseRelCourseware entity = courseRelCoursewareConvertor.convertDtoToE(dto); + CourseRelCoursewareDO entity = courseRelCoursewareConvertor.convertDtoToE(dto); return this.updateById(entity); } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java index b50a37a2..6d8430be 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java @@ -7,7 +7,7 @@ import org.qinan.cedu.convertor.CoursewareManagementConvertor; import org.qinan.cedu.model.dto.CoursewareManagementDTO; import org.qinan.cedu.model.dto.CoursewareManagementPageQuery; import org.qinan.cedu.model.dto.CoursewareManagementVO; -import org.qinan.cedu.model.entity.CoursewareManagement; +import org.qinan.cedu.model.entity.CoursewareManagementDO; import org.qinan.cedu.enums.DeleteEnum; import org.qinan.cedu.mapper.CoursewareManagementMapper; import org.qinan.cedu.service.CoursewareManagementService; @@ -21,7 +21,7 @@ import java.time.LocalDateTime; * 课件管理服务实现 */ @Service -public class CoursewareManagementServiceImpl extends ServiceImpl +public class CoursewareManagementServiceImpl extends ServiceImpl implements CoursewareManagementService { @Autowired @@ -31,27 +31,27 @@ public class CoursewareManagementServiceImpl extends ServiceImpl pageQuery(CoursewareManagementPageQuery query) { long current = query.getCurrent() == null ? 1L : query.getCurrent(); long size = query.getSize() == null ? 10L : query.getSize(); - IPage page = this.lambdaQuery() - .eq(CoursewareManagement::getDeleteEnum, DeleteEnum.FALSE.getCode()) - .like(StringUtils.hasText(query.getCoursewareName()), CoursewareManagement::getCoursewareName, query.getCoursewareName()) - .eq(query.getStatus() != null, CoursewareManagement::getStatus, query.getStatus()) - .orderByDesc(CoursewareManagement::getCreateTime) + IPage page = this.lambdaQuery() + .eq(CoursewareManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode()) + .like(StringUtils.hasText(query.getCoursewareName()), CoursewareManagementDO::getCoursewareName, query.getCoursewareName()) + .eq(query.getStatus() != null, CoursewareManagementDO::getStatus, query.getStatus()) + .orderByDesc(CoursewareManagementDO::getCreateTime) .page(new Page<>(current, size)); return page.convert(coursewareManagementConvertor::convertEToVo); } @Override public CoursewareManagementVO getDetail(Long id) { - CoursewareManagement entity = this.lambdaQuery() - .eq(CoursewareManagement::getId, id) - .eq(CoursewareManagement::getDeleteEnum, DeleteEnum.FALSE.getCode()) + CoursewareManagementDO entity = this.lambdaQuery() + .eq(CoursewareManagementDO::getId, id) + .eq(CoursewareManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode()) .one(); return coursewareManagementConvertor.convertEToVo(entity); } @Override public boolean saveCourseware(CoursewareManagementDTO dto) { - CoursewareManagement entity = coursewareManagementConvertor.convertDtoToE(dto); + CoursewareManagementDO entity = coursewareManagementConvertor.convertDtoToE(dto); LocalDateTime now = LocalDateTime.now(); entity.setCreateTime(now); entity.setUpdateTime(now); @@ -61,7 +61,7 @@ public class CoursewareManagementServiceImpl extends ServiceImpl