dev-tmp1
luotaiqian 2026-08-17 17:04:41 +08:00
parent 754b4d19dd
commit bfd35fceea
15 changed files with 72 additions and 72 deletions

View File

@ -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<CourseManagement> convertDtoListToEList(List<CourseManagementDTO> list);
List<CourseManagementDO> convertDtoListToEList(List<CourseManagementDTO> list);
List<CourseManagementVO> convertEListToVoList(List<CourseManagement> list);
List<CourseManagementVO> convertEListToVoList(List<CourseManagementDO> list);
}

View File

@ -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<CourseRelCourseware> convertDtoListToEList(List<CourseRelCoursewareDTO> list);
List<CourseRelCoursewareDO> convertDtoListToEList(List<CourseRelCoursewareDTO> list);
List<CourseRelCoursewareVO> convertEListToVoList(List<CourseRelCourseware> list);
List<CourseRelCoursewareVO> convertEListToVoList(List<CourseRelCoursewareDO> list);
}

View File

@ -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<CoursewareManagement> convertDtoListToEList(List<CoursewareManagementDTO> list);
List<CoursewareManagementDO> convertDtoListToEList(List<CoursewareManagementDTO> list);
List<CoursewareManagementVO> convertEListToVoList(List<CoursewareManagement> list);
List<CoursewareManagementVO> convertEListToVoList(List<CoursewareManagementDO> list);
}

View File

@ -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<CourseManagement> {
public interface CourseManagementMapper extends BaseMapper<CourseManagementDO> {
}

View File

@ -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<CourseRelCourseware> {
public interface CourseRelCoursewareMapper extends BaseMapper<CourseRelCoursewareDO> {
}

View File

@ -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<CoursewareManagement> {
public interface CoursewareManagementMapper extends BaseMapper<CoursewareManagementDO> {
}

View File

@ -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 {
/**
*
*/

View File

@ -11,7 +11,7 @@ import lombok.Data;
*/
@TableName(value ="course_rel_courseware")
@Data
public class CourseRelCourseware {
public class CourseRelCoursewareDO {
/**
*
*/

View File

@ -13,7 +13,7 @@ import java.math.BigDecimal;
*/
@TableName(value ="courseware_management")
@Data
public class CoursewareManagement extends BaseEntity {
public class CoursewareManagementDO extends BaseEntity {
/**
*
*/

View File

@ -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<CourseManagement> {
public interface CourseManagementService extends IService<CourseManagementDO> {
IPage<CourseManagementVO> pageQuery(CourseManagementPageQuery query);

View File

@ -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<CourseRelCourseware> {
public interface CourseRelCoursewareService extends IService<CourseRelCoursewareDO> {
IPage<CourseRelCoursewareVO> pageQuery(long current, long size, Long courseId);

View File

@ -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<CoursewareManagement> {
public interface CoursewareManagementService extends IService<CoursewareManagementDO> {
IPage<CoursewareManagementVO> pageQuery(CoursewareManagementPageQuery query);

View File

@ -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<CourseManagementMapper, CourseManagement>
public class CourseManagementServiceImpl extends ServiceImpl<CourseManagementMapper, CourseManagementDO>
implements CourseManagementService {
@Autowired
@ -31,27 +31,27 @@ public class CourseManagementServiceImpl extends ServiceImpl<CourseManagementMap
public IPage<CourseManagementVO> pageQuery(CourseManagementPageQuery query) {
long current = query.getCurrent() == null ? 1L : query.getCurrent();
long size = query.getSize() == null ? 10L : query.getSize();
IPage<CourseManagement> 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<CourseManagementDO> 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<CourseManagementMap
@Override
public boolean updateCourse(CourseManagementDTO dto) {
CourseManagement entity = courseManagementConvertor.convertDtoToE(dto);
CourseManagementDO entity = courseManagementConvertor.convertDtoToE(dto);
entity.setUpdateTime(LocalDateTime.now());
return this.updateById(entity);
}
@ -72,10 +72,10 @@ public class CourseManagementServiceImpl extends ServiceImpl<CourseManagementMap
@Override
public boolean deleteById(Long id) {
return this.lambdaUpdate()
.set(CourseManagement::getDeleteEnum, DeleteEnum.TRUE.getCode())
.set(CourseManagement::getUpdateTime, LocalDateTime.now())
.eq(CourseManagement::getId, id)
.eq(CourseManagement::getDeleteEnum, DeleteEnum.FALSE.getCode())
.set(CourseManagementDO::getDeleteEnum, DeleteEnum.TRUE.getCode())
.set(CourseManagementDO::getUpdateTime, LocalDateTime.now())
.eq(CourseManagementDO::getId, id)
.eq(CourseManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode())
.update();
}
}

View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.qinan.cedu.convertor.CourseRelCoursewareConvertor;
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 org.qinan.cedu.mapper.CourseRelCoursewareMapper;
import org.qinan.cedu.service.CourseRelCoursewareService;
import org.springframework.beans.factory.annotation.Autowired;
@ -18,7 +18,7 @@ import java.util.List;
*
*/
@Service
public class CourseRelCoursewareServiceImpl extends ServiceImpl<CourseRelCoursewareMapper, CourseRelCourseware>
public class CourseRelCoursewareServiceImpl extends ServiceImpl<CourseRelCoursewareMapper, CourseRelCoursewareDO>
implements CourseRelCoursewareService {
@Autowired
@ -26,9 +26,9 @@ public class CourseRelCoursewareServiceImpl extends ServiceImpl<CourseRelCoursew
@Override
public IPage<CourseRelCoursewareVO> pageQuery(long current, long size, Long courseId) {
IPage<CourseRelCourseware> page = this.lambdaQuery()
.eq(courseId != null, CourseRelCourseware::getCourseId, courseId)
.orderByAsc(CourseRelCourseware::getSort)
IPage<CourseRelCoursewareDO> 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<CourseRelCoursew
@Override
public List<CourseRelCoursewareVO> listByCourseId(Long courseId) {
List<CourseRelCourseware> list = this.lambdaQuery()
.eq(CourseRelCourseware::getCourseId, courseId)
.orderByAsc(CourseRelCourseware::getSort)
List<CourseRelCoursewareDO> 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);
}

View File

@ -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<CoursewareManagementMapper, CoursewareManagement>
public class CoursewareManagementServiceImpl extends ServiceImpl<CoursewareManagementMapper, CoursewareManagementDO>
implements CoursewareManagementService {
@Autowired
@ -31,27 +31,27 @@ public class CoursewareManagementServiceImpl extends ServiceImpl<CoursewareManag
public IPage<CoursewareManagementVO> pageQuery(CoursewareManagementPageQuery query) {
long current = query.getCurrent() == null ? 1L : query.getCurrent();
long size = query.getSize() == null ? 10L : query.getSize();
IPage<CoursewareManagement> 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<CoursewareManagementDO> 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<CoursewareManag
@Override
public boolean updateCourseware(CoursewareManagementDTO dto) {
CoursewareManagement entity = coursewareManagementConvertor.convertDtoToE(dto);
CoursewareManagementDO entity = coursewareManagementConvertor.convertDtoToE(dto);
entity.setUpdateTime(LocalDateTime.now());
return this.updateById(entity);
}
@ -69,10 +69,10 @@ public class CoursewareManagementServiceImpl extends ServiceImpl<CoursewareManag
@Override
public boolean deleteById(Long id) {
return this.lambdaUpdate()
.set(CoursewareManagement::getDeleteEnum, DeleteEnum.TRUE.getCode())
.set(CoursewareManagement::getUpdateTime, LocalDateTime.now())
.eq(CoursewareManagement::getId, id)
.eq(CoursewareManagement::getDeleteEnum, DeleteEnum.FALSE.getCode())
.set(CoursewareManagementDO::getDeleteEnum, DeleteEnum.TRUE.getCode())
.set(CoursewareManagementDO::getUpdateTime, LocalDateTime.now())
.eq(CoursewareManagementDO::getId, id)
.eq(CoursewareManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode())
.update();
}
}