新增分页

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museummodel/MuseummodelController.java

@@ -1,17 +1,26 @@
 package cn.iocoder.yudao.module.museum.controller.admin.museummodel;
 
+import cn.hutool.core.collection.CollUtil;
 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.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelRespVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelSaveVO;
 import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDO;
 import cn.iocoder.yudao.module.museum.service.museummodel.MuseummodelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 
 @Tag(name = "博物馆-模型库")
 @RestController
@@ -24,30 +33,52 @@ public class MuseummodelController {
 
     @PostMapping("/create")
     @Operation(summary = "新增模型")
-    public Integer createMuseumModel(@RequestBody MuseummodelSaveVO saveVO){
+    public Integer createMuseumModel(@RequestBody MuseummodelSaveVO saveVO) {
         return museumModelService.createMuseumModel(saveVO);
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模型")
-    public CommonResult<Boolean> updateMuseumModel(@RequestBody MuseummodelSaveVO saveVO){
-         museumModelService.updateMuseumModel(saveVO);
-         return CommonResult.success(true);
+    public CommonResult<Boolean> updateMuseumModel(@RequestBody MuseummodelSaveVO saveVO) {
+        museumModelService.updateMuseumModel(saveVO);
+        return CommonResult.success(true);
     }
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除模型")
-    public CommonResult<Boolean> deleteMuseumModel(@RequestParam("id") Integer id){
+    public CommonResult<Boolean> deleteMuseumModel(@RequestParam("id") Integer id) {
         museumModelService.deleteMuseumModel(id);
         return CommonResult.success(true);
     }
 
     @GetMapping("/get")
     @Operation(summary = "查找模型")
-    public CommonResult<MuseummodelRespVO> getMuseumModel(@RequestParam("id") Integer id){
+    public CommonResult<MuseummodelRespVO> getMuseumModel(@RequestParam("id") Integer id) {
         MuseummodelDO result = museumModelService.selectMuseumModel(id);
         MuseummodelRespVO result1 = BeanUtils.toBean(result, MuseummodelRespVO.class);
-      return CommonResult.success(result1);
+        return CommonResult.success(result1);
     }
 
+//    @GetMapping("/page")
+//    @Operation(summary = "获得用户分页列表")
+//    @PreAuthorize("@ss.hasPermission('system:user:query')")
+//    public CommonResult<PageResult<MuseummodelRespVO>> getUserPage(@Valid MuseummodelPageReqVO pageReqVO) {
+//        // 获得用户分页列表
+//        PageResult<MuseummodelDO> pageResult = MuseummodelService.getUserPage(pageReqVO);
+//        if (CollUtil.isEmpty(pageResult.getList())) {
+//            return success(new PageResult<>(pageResult.getTotal()));
+//        }
+//        return null;
+//    }
+
+@GetMapping("/page")
+@Operation(summary = "获得模型分页")
+@PreAuthorize("@ss.hasPermission('system:tenant:query')")
+public CommonResult<PageResult<MuseummodelRespVO>> getPage(@Valid MuseummodelPageReqVO pageVO) {
+    PageResult<MuseummodelDO> pageResult = museumModelService.getMuseummodelPage(pageVO);
+    return success(BeanUtils.toBean(pageResult,MuseummodelRespVO.class));
 }
+
+}
+
+

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museummodel/vo/MuseummodelPageReqVO.java

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.MuseumInfoController;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "博物馆-模型信息-分页 pageReq VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MuseummodelPageReqVO extends PageParam {
+    @Schema(description = "ID")
+    private Integer id;
+
+    @Schema(description = "模型名称")
+    private String specimenName;
+
+    @Schema(description = "模型编号")
+    private Integer specimenNumber;
+
+    @Schema(description = "模型图片")
+    private String modelPhoto;
+
+    @Schema(description = "模型路径")
+    private String modelWay;
+
+    @Schema(description = "备注")
+    private String remark;
+}
+

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museummodel/vo/MuseummodelRespVO.java

@@ -9,29 +9,24 @@ import java.time.LocalDateTime;
 @Data
 public class MuseummodelRespVO {
 
-    private Integer id;
     @Schema(description = "ID")
+    private Integer id;
 
+    @Schema(description = "模型名称")
     private String specimenName;
-  //  @Schema(description = "标本名称")
 
+     @Schema(description = "模型编号")
     private Integer specimenNumber;
-    //  @Schema(description = "标本编号")
-
-    private Integer specimenId;
-    //  @Schema(description = "标本id")
-
-    private String specimenType;
-    //  @Schema(description = "标本类型（矿物、岩石、矿石、化石、陨石）")
 
+    @Schema(description = "模型图片")
     private String modelPhoto;
-    //  @Schema(description = "模型图片")
 
+    @Schema(description = "模型路径")
     private String modelWay;
-    //  @Schema(description = "模型路径")
 
+    @Schema(description = "备注")
     private String remark;
-    //  @Schema(description = "备注")
+
 
 
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museummodel/vo/MuseummodelSaveVO.java

@@ -12,24 +12,19 @@ public class MuseummodelSaveVO {
     @Schema(description = "ID")
     private Integer id;
 
+    @Schema(description = "模型名称")
     private String specimenName;
-    //  @Schema(description = "标本名称")
-
+    //
+    @Schema(description = "模型编号")
     private String specimenNumber;
-    //  @Schema(description = "标本编号")
-
-    private Integer specimenId;
-    //  @Schema(description = "标本id")
-
-    private String specimenType;
-    //  @Schema(description = "标本类型（矿物、岩石、矿石、化石、陨石）")
-
+    //
+    @Schema(description = "模型图片")
     private String modelPhoto;
-    //  @Schema(description = "模型图片")
-
+    //
+    @Schema(description = "模型路径")
     private String modelWay;
-    //  @Schema(description = "模型路径")
-
+    //
+    @Schema(description = "备注")
     private String remark;
-    //  @Schema(description = "备注")
+    //
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museummodel/MuseummodelDO.java

@@ -25,24 +25,21 @@ public class MuseummodelDO extends BaseDO {
     @TableId
     private Integer id;
 
+    @Schema(description = "模型名称")
     private String specimenName;
-    //  @Schema(description = "标本名称")
 
+    @Schema(description = "模型编号")
     private String specimenNumber;
-    //  @Schema(description = "标本编号")
-
-    private Integer specimenId;
-    //  @Schema(description = "标本id")
-
+    
     private String specimenType;
-    //  @Schema(description = "标本类型（矿物、岩石、矿石、化石、陨石）")
 
+    @Schema(description = "模型图片")
     private String modelPhoto;
-    //  @Schema(description = "模型图片")
 
+    @Schema(description = "模型路径")
     private String modelWay;
-    //  @Schema(description = "模型路径")
 
+    @Schema(description = "备注")
     private String remark;
-    //  @Schema(description = "备注")
+
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museummodel/MuseummodelMapper.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.museum.dal.mysql.museummodel;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
 import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +21,5 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
     @Select("SELECT * FROM museum_model WHERE id = #{id} AND deleted =0 ")
     MuseummodelDO selectMuseumModelById(@Param("id") Integer id);
 
+    PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO pageReqVO);
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museummodel/MuseummodelService.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.museum.service.museummodel;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelSaveVO;
 import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDO;
+import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -26,4 +29,14 @@ public interface MuseummodelService {
     * 查询标本
     * */
    MuseummodelDO selectMuseumModel(Integer id);
+
+   /**
+    * 获得分页
+    *
+    * @param pageReqVO 分页查询
+    * @return 分页
+    */
+   PageResult<MuseummodelDO> getMuseummodelPage(MuseummodelPageReqVO pageReqVO);
+
+
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museummodel/MuseummodelServiceImpl.java

@@ -1,12 +1,17 @@
 package cn.iocoder.yudao.module.museum.service.museummodel;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelSaveVO;
 import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDO;
 import cn.iocoder.yudao.module.museum.dal.mysql.museummodel.MuseummodelMapper;
+import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Set;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.singleton;
 
 @Service
 public  class MuseummodelServiceImpl implements MuseummodelService {
@@ -14,6 +19,7 @@ public  class MuseummodelServiceImpl implements MuseummodelService {
    @Resource
    private MuseummodelMapper museumModelMapper;
 
+
    @Override
    public Integer createMuseumModel(MuseummodelSaveVO saveVO){
      return museumModelMapper.insert(BeanUtils.toBean(saveVO, MuseummodelDO.class));
@@ -35,4 +41,11 @@ public  class MuseummodelServiceImpl implements MuseummodelService {
       return museumModelMapper.selectMuseumModelById(id);
    }
 
+   @Override
+   public PageResult<MuseummodelDO> getMuseummodelPage(MuseummodelPageReqVO pageReqVO) {
+      return museumModelMapper.selectPage(pageReqVO);
+   }
+
+
+
 }