diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairOrderInfoController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairOrderInfoController.java index ef7ea916..daf084f2 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairOrderInfoController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairOrderInfoController.java @@ -1,13 +1,14 @@ package cn.iocoder.yudao.module.project.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.project.entity.RepairOrderInfo; import cn.iocoder.yudao.module.project.service.RepairOrderInfoService; import cn.iocoder.yudao.module.project.vo.RepairOrderInfoPageReqVO; import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO; import cn.iocoder.yudao.module.project.vo.RepairOrderInfoSaveReqVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,29 +28,15 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; public class RepairOrderInfoController { @Resource - private RepairOrderInfoService orderInfoService; + private RepairOrderInfoService repairOrderInfoService; - @PostMapping("/create") - @Operation(summary = "创建维修模块 订单") - @PreAuthorize("@ss.hasPermission('repair:order-info:create')") - public CommonResult createOrderInfo(@Valid @RequestBody RepairOrderInfoSaveReqVO createReqVO) { - return success(orderInfoService.createOrderInfo(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新维修模块 订单") - @PreAuthorize("@ss.hasPermission('repair:order-info:update')") - public CommonResult updateOrderInfo(@Valid @RequestBody RepairOrderInfoSaveReqVO updateReqVO) { - orderInfoService.updateOrderInfo(updateReqVO); - return success(true); - } @DeleteMapping("/delete") @Operation(summary = "删除维修模块 订单") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('repair:order-info:delete')") public CommonResult deleteOrderInfo(@RequestParam("id") String id) { - orderInfoService.deleteOrderInfo(id); + repairOrderInfoService.deleteOrderInfo(id); return success(true); } @@ -58,16 +45,28 @@ public class RepairOrderInfoController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('repair:order-info:query')") public CommonResult getOrderInfo(@RequestParam("id") String id) { - RepairOrderInfo orderInfo = orderInfoService.getOrderInfo(id); + RepairOrderInfo orderInfo = repairOrderInfoService.getOrderInfo(id); return success(BeanUtils.toBean(orderInfo, RepairOrderInfoRespVO.class)); } + /** + * 分页查询订单内容 + * + * @param pageReqVO RepairOrderInfoPageReqVO实体 + * @param pageNo 分页参数 + * @param pageSize 分页参数 + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult> + * @author PQZ + * @date 14:30 2024/9/23 + **/ @GetMapping("/page") @Operation(summary = "获得维修模块 订单分页") @PreAuthorize("@ss.hasPermission('repair:order-info:query')") - public CommonResult> getOrderInfoPage(@Valid RepairOrderInfoPageReqVO pageReqVO) { - PageResult pageResult = orderInfoService.getOrderInfoPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, RepairOrderInfoRespVO.class)); + public CommonResult> getOrderInfoPage(@Valid RepairOrderInfoPageReqVO pageReqVO, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNo, pageSize); + return success(repairOrderInfoService.queryListPage(pageReqVO,page)); } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/mapper/RepairOrderInfoMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/mapper/RepairOrderInfoMapper.java index 2a26aa3a..51f5f77a 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/mapper/RepairOrderInfoMapper.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/mapper/RepairOrderInfoMapper.java @@ -1,8 +1,13 @@ package cn.iocoder.yudao.module.project.mapper; import cn.iocoder.yudao.module.project.entity.RepairOrderInfo; +import cn.iocoder.yudao.module.project.vo.RepairOrderInfoPageReqVO; +import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 维修模块 订单 Mapper @@ -12,4 +17,16 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface RepairOrderInfoMapper extends BaseMapper { + /** + * 分页查询订单信息 + * + * @param entity RepairOrderInfoPageReqVO实体 + * @param page 分页参数 + * @return com.baomidou.mybatisplus.core.metadata.IPage + * @author PQZ + * @date 14:37 2024/9/23 + **/ + IPage queryListPage(@Param("entity") RepairOrderInfoPageReqVO entity, Page page); + + } \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/RepairOrderInfoService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/RepairOrderInfoService.java index d1f72f8a..7f18e2d6 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/RepairOrderInfoService.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/RepairOrderInfoService.java @@ -3,31 +3,28 @@ package cn.iocoder.yudao.module.project.service; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.project.entity.RepairOrderInfo; import cn.iocoder.yudao.module.project.vo.RepairOrderInfoPageReqVO; +import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO; import cn.iocoder.yudao.module.project.vo.RepairOrderInfoSaveReqVO; - -import javax.validation.Valid; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; /** * 维修模块 订单 Service 接口 * * @author pqz */ -public interface RepairOrderInfoService { +public interface RepairOrderInfoService extends IService { + /** - * 创建维修模块 订单 + * 保存订单信息 * - * @param createReqVO 创建信息 - * @return 编号 - */ - String createOrderInfo(@Valid RepairOrderInfoSaveReqVO createReqVO); - - /** - * 更新维修模块 订单 - * - * @param updateReqVO 更新信息 - */ - void updateOrderInfo(@Valid RepairOrderInfoSaveReqVO updateReqVO); + * @param saveReqVO TODO + * @author PQZ + * @date 14:57 2024/9/23 + **/ + void saveOrderInfo(RepairOrderInfoSaveReqVO saveReqVO); /** * 删除维修模块 订单 @@ -52,4 +49,16 @@ public interface RepairOrderInfoService { */ PageResult getOrderInfoPage(RepairOrderInfoPageReqVO pageReqVO); + /** + * 分页查询订单信息 + * + * @param pageReqVO RepairOrderInfoPageReqVO实体 + * @param page 分页参数 + * @return com.baomidou.mybatisplus.core.metadata.IPage + * @author PQZ + * @date 14:36 2024/9/23 + **/ + IPage queryListPage(RepairOrderInfoPageReqVO pageReqVO, Page page); + + } \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairOrderInfoServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairOrderInfoServiceImpl.java index 6f0862dd..73501cb1 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairOrderInfoServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairOrderInfoServiceImpl.java @@ -6,7 +6,11 @@ import cn.iocoder.yudao.module.project.entity.RepairOrderInfo; import cn.iocoder.yudao.module.project.mapper.RepairOrderInfoMapper; import cn.iocoder.yudao.module.project.service.RepairOrderInfoService; import cn.iocoder.yudao.module.project.vo.RepairOrderInfoPageReqVO; +import cn.iocoder.yudao.module.project.vo.RepairOrderInfoRespVO; import cn.iocoder.yudao.module.project.vo.RepairOrderInfoSaveReqVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -19,38 +23,36 @@ import javax.annotation.Resource; */ @Service @Validated -public class RepairOrderInfoServiceImpl implements RepairOrderInfoService { +public class RepairOrderInfoServiceImpl extends ServiceImpl implements RepairOrderInfoService { @Resource - private RepairOrderInfoMapper orderInfoMapper; + private RepairOrderInfoMapper repairOrderInfoMapper; - @Override - public String createOrderInfo(RepairOrderInfoSaveReqVO createReqVO) { - // 插入 - RepairOrderInfo orderInfo = BeanUtils.toBean(createReqVO, RepairOrderInfo.class); - orderInfoMapper.insert(orderInfo); - // 返回 - return orderInfo.getId(); - } + /** + * 保存订单信息 + * + * @param saveReqVO RepairOrderInfoSaveReqVO实体 + * @author PQZ + * @date 14:57 2024/9/23 + **/ @Override - public void updateOrderInfo(RepairOrderInfoSaveReqVO updateReqVO) { - // 更新 - RepairOrderInfo updateObj = BeanUtils.toBean(updateReqVO, RepairOrderInfo.class); - orderInfoMapper.updateById(updateObj); + public void saveOrderInfo(RepairOrderInfoSaveReqVO saveReqVO) { + RepairOrderInfo save = BeanUtils.toBean(saveReqVO, RepairOrderInfo.class); + saveOrUpdate(save); + } @Override public void deleteOrderInfo(String id) { // 删除 - orderInfoMapper.deleteById(id); + repairOrderInfoMapper.deleteById(id); } - @Override public RepairOrderInfo getOrderInfo(String id) { - return orderInfoMapper.selectById(id); + return repairOrderInfoMapper.selectById(id); } @Override @@ -58,4 +60,18 @@ public class RepairOrderInfoServiceImpl implements RepairOrderInfoService { return null; } + /** + * 分页查询订单信息 + * + * @param pageReqVO RepairOrderInfoPageReqVO实体 + * @param page 分页参数 + * @return com.baomidou.mybatisplus.core.metadata.IPage + * @author PQZ + * @date 14:36 2024/9/23 + **/ + @Override + public IPage queryListPage(RepairOrderInfoPageReqVO pageReqVO, Page page) { + return repairOrderInfoMapper.queryListPage(pageReqVO, page); + } + } \ No newline at end of file diff --git a/dl-module-repair/src/main/resources/mapper/project/RepairOrderInfoMapper.xml b/dl-module-repair/src/main/resources/mapper/project/RepairOrderInfoMapper.xml new file mode 100644 index 00000000..7b4d0b80 --- /dev/null +++ b/dl-module-repair/src/main/resources/mapper/project/RepairOrderInfoMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + \ No newline at end of file