Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-java

# Conflicts:
#	yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museuminfo/MuseumInfoDO.java

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/MuseumFlowController.java

@@ -60,7 +60,7 @@ public class MuseumFlowController {
         if(result == null){
             return CommonResult.error(200,"样品不存在");
         }
-        int condition=result.getCondition();
+        int condition=result.getSave();
         //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过
         if(condition == 0){
             return CommonResult.error(200,"样品不在库中");

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/MuseumInfoController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
@@ -47,31 +48,22 @@ public class MuseumInfoController {
     public CommonResult<Boolean> updateMuseumInfo(@RequestBody MuseumInfoSaveVO saveVO){
         museumInfoService.updateMuseumInfo(saveVO);
         return CommonResult.success(true);
-//         saveVO.setSampleType(1);
+
 
     }
 
     //TODO 需要提供原因，调用更新方法
     @DeleteMapping("/delete")
     @Operation(summary = "删除标本")
-    public CommonResult<Boolean> deleteMuseumInfo(@RequestParam("id") Integer id){
-        museumInfoService.deleteMuseumInfo(id);
+    public CommonResult<Boolean> deleteMuseumInfo(@RequestParam("id") Integer id,@RequestParam("reason") String reason){
+        museumInfoService.deleteMuseumInfo(id,reason);
+//        result.put("删除原因：",);
         return CommonResult.success(true);
     }
-    //    @DeleteMapping("/delete")
-//    @Operation(summary = "删除")
-//    public CommonResult<Boolean> deleteMuseumText(@RequestParam("id") Integer id ){
-//        MuseumTextSaveVO saveVO =new MuseumTextSaveVO();
-////        saveVO.setId();
-////        saveVO.set()
-////        museumTextService.updateMuseumText(saveVO);
-//
-//        museumTextService.deleteMuseumText(id);
-//        return CommonResult.success(true);
 
 
     @GetMapping("/get")
-    @Operation(summary = "查找标本")
+    @Operation(summary = "id查找")
     public CommonResult<MuseumInfoRespVO> selectMuseumInfo(@RequestParam("id") Integer id){
         MuseumInfoDO result = museumInfoService.selectMuseumInfo(id);
         MuseumInfoRespVO result1 = BeanUtils.toBean(result,MuseumInfoRespVO.class);
@@ -79,59 +71,46 @@ public class MuseumInfoController {
     }
 
     @GetMapping("/selectMuseumInfoList")
-    @Operation(summary = "查询SampleTypeList")
-    public CommonResult<List<MuseumInfoDO>> getMuseumInfoList(@RequestParam("sampleType") Integer sampleType){
+    @Operation(summary = "标本类型查找")
+    public CommonResult<List<MuseumInfoRespVO>> getMuseumInfoList(@RequestParam("sampleType") Integer sampleType){
         List<MuseumInfoDO> result = museumInfoService.selectMuseumInfoListBySampleType(sampleType);
-        return CommonResult.success(result);
+        List<MuseumInfoRespVO> result1 = BeanUtils.toBean(result,MuseumInfoRespVO.class);
+        return CommonResult.success(result1);
     }
 
     @GetMapping("/page")
     @Operation(summary = "获取分页")
-    @PreAuthorize("@ss.hasPermission('museum:museuminfo:query')")
-    public CommonResult<PageResult<MuseumInfoRespVO>> getMuseumInfoPage(@Valid MuseumInfoPageReqVO pageVO){
-        PageResult<MuseumInfoDO> pageResult = museumInfoService.getMuseumInfoPage(pageVO);
-        return success(BeanUtils.toBean(pageResult, MuseumInfoRespVO.class));
+    public PageResult<MuseumInfoDO> getMuseumInfoPage(@Valid MuseumInfoPageReqVO pageReqVO){
+        return  museumInfoService.getMuseumInfoPage(pageReqVO);
     }
 
 
-
-
-
-
-//    @GetMapping("/get")
-//    @Operation(summary = "list数组")
-//   public CommonResult<MuseumInfoRespVO> getdo(@RequestParam("sampleType") Integer sampleType){
-//          MuseumInfoRespVO list =new MuseumInfoRespVO();
-//          Integer Ynmber =  selectMuseumInfoBySampleType(1)
-//          Integer  hs =  selectMuseumInfoBySampleType(2)
-
-//          DO.setYnmber(Ynmber);
-
-
-//    public CommonResult<MuseumInfoRespVO> getMuseumInfo(@RequestParam("sampleId") String sampleId){
-//
-//    }
-
-
-    //@GetMapping("/get")
-//    @Operation(summary = "查询")
-//    public CommonResult<List<MuseumTextRespVO>> getMuseumText(@RequestParam("id") Integer id){
-//
-//    }
-
-//    1.
     //TODO LIST Map
 //    TODO     1.2.3.代表哪种标本类型
 //            返回某种标本类型的List数组
 //            Integer
 //    Map<> 键值对
+    @GetMapping("/sampleTypeCount")
+    @Operation(summary = "标本类型计数")
+    public CommonResult<Map<String,Integer>> getMap(@RequestParam("sampleType") Integer sampleType){
+          Map<String,Integer> result =museumInfoService.MuseumInfoBySampleType(sampleType);
+//          标本类型：矿石-1 岩石-2 矿物-3 陨石-4
+          Integer Type = sampleType;
+          result.put("标本类型:",Type);
+          return CommonResult.success(result);
+    }
+
+    @GetMapping("/saveCount")
+    @Operation(summary = "标本出入库状态计数")
+    public CommonResult<Map<String,Integer>> getSave(@RequestParam("save") Integer save){
+        Map<String,Integer> result =museumInfoService.MuseumInfoBySave(save);
+//        状态：在库-1 出库-0
+        Integer Condition = save;
+        result.put("状态",Condition);
+        return CommonResult.success(result);
+    }
+
 
-//    public CommonResult<Map<String,Integer>> getMap(@RequestParam("id") Integer id){
-//          Map<String,Integer> result =new HashMap<>();
-//          Integer Ynmber = null;
-//          result.put("陨石数量",Ynmber);
-//          return CommonResult.success(result);
-//    }
 
 //   public CommonResult<MuseumTextRespVO> getdo(@RequestParam("id") Integer id){
 //          MuseumTextRespVO DO =new MuseumTextRespVO();

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/vo/MuseumInfoPageReqVO.java

@@ -14,13 +14,17 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class MuseumInfoPageReqVO extends PageParam {
+
+    @Schema(description = "标本id")
     private Integer id;
 
     @Schema(description = "标本编号")
     private String sampleId;
 
+    @Schema(description = "标本类型")
     private Integer sampleType;
 
+    @Schema(description = "存放位置")
     private String place;
     
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/vo/MuseumInfoRespVO.java

@@ -10,56 +10,77 @@ import java.time.LocalDateTime;
 @Data
 @ExcelIgnoreUnannotated
 public class MuseumInfoRespVO {
+//private Integer Ynumber;
 
-    //    private Integer Ynumber;
+    @Schema(description = "标本id")
     private Integer id;
 
     @Schema(description = "标本编号")
     private String sampleId;
 
+    @Schema(description = "标本类型")
     private Integer sampleType;
 
+    @Schema(description = "存放位置")
     private String place;
 
+    @Schema(description = "中文名称")
     private String chineseName;
 
+    @Schema(description = "英文名称")
     private String englishName;
 
+    @Schema(description = "国际名称")
     private String internationName;
 
+    @Schema(description = "保存类型")
     private Integer keepType;
 
+    @Schema(description = "成份")
     private String element;
 
+    @Schema(description = "产地")
     private String  local;
 
+    @Schema(description = "时代")
     private LocalDateTime bronTime ;
 
+    @Schema(description = "保存地层")
     private String stratum;
 
+    @Schema(description = "发现时间")
     private LocalDateTime findTime;
 
+    @Schema(description = "尺寸")
     private String size;
 
+    @Schema(description = "重量")
     private Long weight;
 
+    @Schema(description = "来源")
     private String origin;
 
-    private String offerMan;
-
+    @Schema(description = "描述")
     private String character;
 
-//    private Integer condition;
+    @Schema(description = "馆藏状态")
+    private Integer save;
+
+    @Schema(description = "入馆时间")
+    private String saveTime;
+
+    @Schema(description = "用途")
+    private String Use;
 
-//    private String joinTime;
+    @Schema(description = "资产号")
+    private String fundId;
 
-//    private String useWay;
+    @Schema(description = "删除原因")
+    private String reason;
 
-//    private String moneyId;
+    @Schema(description = "标本图片")
+    private String picture;
 
-//    private String deleteReason;
-//
-//    private String samplePicture;
-//
-//    private String tip;
+    @Schema(description = "备注")
+    private String sampleTip;
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/vo/MuseumInfoSaveVO.java

@@ -9,54 +9,75 @@ import java.time.LocalDateTime;
 @Data
 public class MuseumInfoSaveVO {
 
+    @Schema(description = "标本id")
     private Integer id;
 
     @Schema(description = "标本编号")
     private String sampleId;
 
+    @Schema(description = "标本类型")
     private Integer sampleType;
 
+    @Schema(description = "存放位置")
     private String place;
 
+    @Schema(description = "中文名称")
     private String chineseName;
 
+    @Schema(description = "英文名称")
     private String englishName;
 
+    @Schema(description = "国际名称")
     private String internationName;
 
+    @Schema(description = "保存类型")
     private Integer keepType;
 
+    @Schema(description = "成份")
     private String element;
 
+    @Schema(description = "产地")
     private String  local;
 
+    @Schema(description = "时代")
     private LocalDateTime bronTime ;
 
+    @Schema(description = "保存地层")
     private String stratum;
 
+    @Schema(description = "发现时间")
     private LocalDateTime findTime;
 
+    @Schema(description = "尺寸")
     private String size;
 
+    @Schema(description = "重量")
     private Long weight;
 
+    @Schema(description = "来源")
     private String origin;
 
-    private String offerMan;
-
+    @Schema(description = "描述")
     private String character;
 
-//    private Integer condition;
-//
-//    private String joinTime;
-//
-//    private String useWay;
-//
-//    private String moneyId;
-//
-//    private String deleteReason;
-//
-//    private String samplePicture;
-//
-//    private String tip;
+    @Schema(description = "馆藏状态")
+    private Integer save;
+
+    @Schema(description = "入馆时间")
+    private String saveTime;
+
+    @Schema(description = "用途")
+    private String Use;
+
+    @Schema(description = "资产号")
+    private String fundId;
+
+    @Schema(description = "删除原因")
+    private String reason;
+
+    @Schema(description = "标本图片")
+    private String picture;
+
+    @Schema(description = "备注")
+    private String sampleTip;
 }

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,53 @@ 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,20 @@ 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/controller/admin/museumpicture/MuseumPictureController.java

@@ -0,0 +1,78 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture;
+
+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.museumpicture.vo.MuseumPictureRespVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.MuseumPictureSaveVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PicturePageReqVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureDO;
+import cn.iocoder.yudao.module.museum.service.museumpicture.MuseumPictureService;
+import cn.iocoder.yudao.module.museum.service.museumpicture.PictureGroupService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "博物馆-图片库")
+@RestController
+@RequestMapping("/museum/picture")
+@Validated
+
+public class MuseumPictureController {
+
+    @Resource
+    private MuseumPictureService museumPictureService;
+    @Autowired
+    private PictureGroupService pictureGroupService;
+    private PicturePageReqVO pageVO;
+
+    @PostMapping("/create")
+    @Operation(summary = "新增图片") 
+    public Integer createMuseumPicture(@RequestBody MuseumPictureSaveVO saveVO) {
+        return museumPictureService.createMuseumPicture(saveVO);
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新图片")
+    public CommonResult<Boolean> updateMuseumPicture(@RequestBody MuseumPictureSaveVO saveVO) {
+        museumPictureService.updateMuseumPicture(saveVO);
+        return CommonResult.success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除图片")
+    public CommonResult<Boolean> deleteMuseumPicture(@RequestParam("pictureId") Integer pictureId) {
+        museumPictureService.deleteMuseumPicture(pictureId);
+        return CommonResult.success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "查找图片")
+    public CommonResult<MuseumPictureRespVO> getMuseumPicture(@RequestParam("pictureId") Integer pictureId) {
+
+//        if (pictureId==null) {
+//            return CommonResult.error(1,"照片id不存在");
+//        }else {
+        MuseumPictureDO result = museumPictureService.selectMuseumPicture(pictureId);
+        MuseumPictureRespVO result1 = BeanUtils.toBean(result, MuseumPictureRespVO.class);
+        return CommonResult.success(result1);
+//        }
+    }
+
+
+    @GetMapping("/page")
+    @Operation(summary = "获得照片分页")
+    @PreAuthorize("@ss.hasPermission('system:tenant:query')")
+    public CommonResult<PageResult<MuseumPictureRespVO>> getPicturePage(@Validated PicturePageReqVO pageVO) {
+        PageResult<MuseumPictureDO> pageResult = museumPictureService.getPicturePage(pageVO);
+        return success(BeanUtils.toBean(pageResult, MuseumPictureRespVO.class));
+    }
+
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumpicture/PictureGroupController.java

@@ -0,0 +1,66 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture;
+
+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.museumpicture.vo.PictureGroupRespVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PictureGroupSaveVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PicturePageReqVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.PictureGroupDO;
+import cn.iocoder.yudao.module.museum.service.museumpicture.PictureGroupService;
+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 static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "博物馆-图片组")
+@RestController
+@RequestMapping("/museum/pictureGroup")
+@Validated
+
+public class PictureGroupController {
+
+    @Resource
+    private PictureGroupService PictureGroupService;
+
+    @PostMapping("/create")
+    @Operation(summary = "新增图片组")
+    public Integer createPictureGroup(@RequestBody PictureGroupSaveVO saveVO){
+        return PictureGroupService.createPictureGroup(saveVO);
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新图片组")
+    public CommonResult<Boolean> updatePictureGroup(@RequestBody PictureGroupSaveVO saveVO) {
+        PictureGroupService.updatePictureGroup(saveVO);
+        return CommonResult.success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除标本")
+    public CommonResult<Boolean> deletePictureGroup(@RequestParam("id") Integer id){
+        PictureGroupService.deletePictureGroup(id);
+        return CommonResult.success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "查找图片组")
+    public CommonResult<PictureGroupRespVO> getPictureGroup(@RequestParam("id") Integer id) {
+        PictureGroupDO result = PictureGroupService.selectPictureGroup(id);
+        PictureGroupRespVO result1 = BeanUtils.toBean(result, PictureGroupRespVO.class);
+        return CommonResult.success(result1);
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得照片组分页")
+    @PreAuthorize("@ss.hasPermission('system:tenant:query')")
+    public CommonResult<PageResult<PictureGroupRespVO>> getPictureGroupPage(@Validated PicturePageReqVO pageVO) {
+        PageResult<PictureGroupDO> pageResult = PictureGroupService.getPictureGroupPage(pageVO);
+        return success(BeanUtils.toBean(pageResult, PictureGroupRespVO.class));
+    }
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumpicture/vo/MuseumPictureRespVO.java

@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+@Schema(description = "博物馆-图片信息 Resp VO")
+@Data
+public class MuseumPictureRespVO {
+
+    private Integer pictureId;
+    @Schema(description = "图片编号")
+
+    private Integer groupId;
+
+    private String picturePath;
+
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumpicture/vo/MuseumPictureSaveVO.java

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+@Schema(description = "博物馆-图片信息 save VO")
+@Data
+public class MuseumPictureSaveVO {
+
+    private Integer pictureId;
+
+    @Schema(description = "图片编号")
+
+    private Integer groupId;
+
+    private String picturePath;
+
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumpicture/vo/PictureGroupRespVO.java

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "博物馆-图片组信息 Resp VO")
+@Data
+public class PictureGroupRespVO {
+    private Integer id;
+    @Schema(description = "照片组编号")
+
+    private String pictureSetIntroduce;
+
+    private LocalDateTime pictureSetTime;
+
+
+
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumpicture/vo/PictureGroupSaveVO.java

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "博物馆-图片组信息 Save VO")
+@Data
+public class PictureGroupSaveVO {
+    private Integer id;
+    @Schema(description = "照片组编号")
+
+    private String pictureSetIntroduce;
+
+    private LocalDateTime pictureSetTime;
+
+
+
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumpicture/vo/PicturePageReqVO.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 用户分页 Request VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class PicturePageReqVO extends PageParam {
+
+    @Schema(description = "图片组id,模糊搜索",example = "1")
+    private Integer groupId;
+
+    @Schema(description = "创建时间",example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museuminfo/MuseumInfoDO.java

@@ -96,30 +96,30 @@ public class MuseumInfoDO extends BaseDO {
     /**
      * 馆藏状态
      */
-    private Integer condition;
-    /**
-     * 入藏时间
-     */
-    private String joinTime;
-    /**
-     * 用途
-     */
-    private String useWay;
-    /**
-     * 资产号
-     */
-    private String moneyId;
-    /**
-     * 删除原因
-     */
-    private String deleteReason;
-    /**
-     * 标本图片
-     */
-    private String samplePicture;
-    /**
-     * 备注
-     */
-    private String tip;
+//    private Integer condition;
+//    /**
+//     * 入藏时间
+//     */
+//    private String joinTime;
+//    /**
+//     * 用途
+//     */
+//    private String useWay;
+//    /**
+//     * 资产号
+//     */
+//    private String moneyId;
+//    /**
+//     * 删除原因
+//     */
+//    private String deleteReason;
+//    /**
+//     * 标本图片
+//     */
+//    private String samplePicture;
+//    /**
+//     * 备注
+//     */
+//    private String tip;
 
 }

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/database/museumpicture/MuseumPictureDO.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.museum.dal.database.museumpicture;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+
+/**
+ * 博物馆的图片库
+ *
+ * @author yu
+ */
+@TableName(value = "museum_picture_dan", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class MuseumPictureDO extends BaseDO {
+
+    @TableId
+    private Integer pictureId;
+
+    private Integer groupId;
+
+    private String picturePath;
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museumpicture/PictureGroupDO.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.museum.dal.database.museumpicture;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * 博物馆的图片组
+ *
+ * @author yu
+ */
+@TableName(value = "museum_picture_table", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class PictureGroupDO extends BaseDO {
+
+    @TableId
+    private Integer id;
+
+    private LocalDateTime pictureSetTime;
+
+    private String pictureSetIntroduce;
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museuminfo/MuseumInfoMapper.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoPageReqVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumflow.MuseumFlowDO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -12,36 +13,54 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
-
+    /**
+     * 更新标本
+     * */
     @Update("UPDATE museum_info SET sample_type=#{sampleType}, place=#{place},chinese_name=#{chineseName} WHERE id =#{id}")
     void updateMuseumInfo(MuseumInfoDO museumInfoDO);
-
-    @Update("UPDATE museum_info SET deleted=1  WHERE id =#{id}")
-    void deleteMuseumInfo(Integer id);
-
+    /**
+     * 删除标本
+     * */
+    @Update("UPDATE museum_info SET deleted=1,reason=#{reason}  WHERE id =#{id}")
+    void deleteMuseumInfo(Integer id,String reason);
+    /**
+     * 查询标本
+     * */
     @Select("SELECT * FROM museum_info WHERE id =#{id} AND deleted =0 ")
     MuseumInfoDO selectMuseumInfoById(@Param("id") Integer id);
-
-    @Select("SELECT * FROM museum_info WHERE sample_id =#{sampleId} ")
+    /**
+     * 查询标本编号
+     * */
+    @Select("SELECT * FROM museum_info WHERE sample_id =#{sampleId} AND deleted =0")
     MuseumInfoDO getMuseumInfoBySampleId(@Param("sampleId") String sampleId);
-
-    @Select("SELECT * FROM museum_info WHERE sample_type  =#{sampleType}")
+    /**
+     * 查询标本类型
+     */
+    @Select("SELECT * FROM museum_info WHERE sample_type  =#{sampleType} AND deleted =0")
     List<MuseumInfoDO> selectMuseumInfoListBySampleType(@Param("sampleType") Integer sampleType);
+    /**
+     * 标本类型计数
+     * */
+    @Select("SELECT COUNT(*)  FROM museum_info WHERE sample_type =#{sampleType} AND deleted =0 AND save =1")
+    Map<String,Integer> countMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
+    /**
+     * 标本出入库状态计数
+     * */
+    @Select("SELECT COUNT(*)  FROM museum_info  WHERE save =#{save} AND deleted =0")
+    Map<String,Integer> countMuseumInfoBySave(@Param("save") Integer save);
 
-//    @Select("SELECT COUNT(*)  FROM museum_info WHERE sample_type  =#{sampleType} ")
-//    Integer countMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
-
-
-    default PageResult<MuseumInfoDO> selectPage(MuseumInfoPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<MuseumInfoDO>())
-//                .likeIfPresent(MuseumInfoDO::getSampleId,reqVO.getSampleId())
-//                .eqIfPresent(MuseumInfoDO::getSampleType,reqVO.getSampleType())
-//                .likeIfPresent(MuseumInfoDO::getPlace,reqVO.getPlace())
-//                .orderByDesc(reqVO.getId() != null,MuseumInfoDO::getId));
-                ;}
+    default PageResult<MuseumInfoDO> selectPage(MuseumInfoPageReqVO pageReqVO) {
+        LambdaQueryWrapperX<MuseumInfoDO> queryWrapper = new LambdaQueryWrapperX<>();
+        queryWrapper.likeIfPresent(MuseumInfoDO::getSampleId, pageReqVO.getSampleId())
+                .eqIfPresent(MuseumInfoDO::getSampleType, pageReqVO.getSampleType())
+                .likeIfPresent(MuseumInfoDO::getPlace, pageReqVO.getPlace())
+                .orderByDesc(MuseumInfoDO::getId);
+        return selectPage(pageReqVO, queryWrapper);
+    }
 
 //    default PageResult<MuseumInfoDO> selectPage1(MuseumInfoPageReqVO reqVO) {
 //        return selectPage(reqVO, new LambdaQueryWrapperX<MuseumInfoDO>()

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/dal/mysql/museumpicture/MuseumPictureMapper.java

@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.museum.dal.mysql.museumpicture;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+@Mapper
+public interface MuseumPictureMapper extends BaseMapperX<MuseumPictureDO> {
+
+    @Update("UPDATE museum_picture_dan SET picture_path=#{picture_path} WHERE picture_id =#{picture_id}")
+    void updateMuseumPicture(MuseumPictureDO museumPictureDO);
+
+    @Update("UPDATE museum_picture_dan SET deleted=1  WHERE picture_id =#{picture_id}")
+    void deleteMuseumPicture(Integer picture_id);
+
+    @Select("SELECT * FROM museum_picture_dan WHERE picture_id = #{picture_id} AND deleted =0 ")
+    MuseumPictureDO selectMuseumPictureById(@Param("picture_id") Integer picture_id);
+
+    @Select("SELECT * FROM museum_picture_dan WHERE group_id = #{group_id} AND deleted =0 ")
+    List<MuseumPictureDO> selectMuseumPictureSetByGroupId(@Param("group_id") Integer group_id);
+
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museumpicture/PictureGroupMapper.java

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.museum.dal.mysql.museumpicture;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.PictureGroupDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+@Mapper
+public interface PictureGroupMapper extends BaseMapperX<PictureGroupDO> {
+
+    @Update("UPDATE museum_picture_table SET picture_set_introduce=#{picture_set_introduce} WHERE id =#{id}")
+    void updatePictureGroup(PictureGroupDO pictureGroupDO);
+
+    @Update("UPDATE museum_picture_table SET deleted=1  WHERE id =#{id}")
+    void deletePictureGroup(Integer id);
+
+    @Select("SELECT * FROM museum_picture_table WHERE id = #{id} AND deleted =0 ")
+    PictureGroupDO selectPictureGroupById(@Param("id") Integer id);
+
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museuminfo/MuseumInfoService.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 public interface MuseumInfoService {
@@ -22,9 +23,9 @@ public interface MuseumInfoService {
    void updateMuseumInfo(MuseumInfoSaveVO saveVO);
 
    /**
-    * 删除标本
+    * 删除标本(原因）
     * */
-   void deleteMuseumInfo(Integer id);
+   void deleteMuseumInfo(Integer id,String reason);
    /**
     * 查询标本
     * */
@@ -35,14 +36,22 @@ public interface MuseumInfoService {
     * */
    MuseumInfoDO getMuseumInfoBySampleId(String sampleId);
    /**
-   * 查询标本类型List
+   * 查询标本类型
    * */
    List<MuseumInfoDO> selectMuseumInfoListBySampleType(Integer sampleType);
     /**
     * 分页列表
     *
-    * @param pageVO 分页条件
+    * @param pageReqVO 分页条件
     * @return 分页列表
     */
-   PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageVO);
+    PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageReqVO);
+   /**
+    * 标本类型计数
+    * */
+   Map<String,Integer> MuseumInfoBySampleType(Integer sampleType);
+   /**
+    * 标本出入库状态计数
+    * */
+   Map<String,Integer> MuseumInfoBySave(Integer save);
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museuminfo/MuseumInfoServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.singleton;
@@ -40,10 +41,13 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
     * 删除标本
     */
    @Override
-   public void deleteMuseumInfo(Integer id) {
-//      museumInfoMapper.deleteMuseumInfo(id);
-      museumInfoMapper.deleteById(id);
+   public void deleteMuseumInfo(Integer id,String reason) {
+      museumInfoMapper.deleteMuseumInfo(id,reason);
+//      museumInfoMapper.deleteById(id);
    }
+   /**
+    * 删除标本
+    */
 
    /**
     * 查询标本id
@@ -54,14 +58,14 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
    }
 
    /**
-    * 查询标本SampleId
+    * 查询标本编号
     */
    @Override
    public MuseumInfoDO getMuseumInfoBySampleId (String sampleId) {
       return museumInfoMapper.getMuseumInfoBySampleId(sampleId);
    }
    /**
-    * 查询SampleTypeList
+    * 查询标本类型
     */
    @Override
    public List<MuseumInfoDO> selectMuseumInfoListBySampleType(Integer sampleType){
@@ -71,13 +75,23 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
    * 分页列表
     */
    @Override
-   public PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO reqVO){
-//      Set<Long> ids = reqVO.getId() != null ?
-//              permissionService.getUserRoleIdListByRoleId(singleton(reqVO.getRoleId())) : null;
-      return museumInfoMapper.selectPage(reqVO);
+   public PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageReqVO){
+      return museumInfoMapper.selectPage(pageReqVO);
+   }
+   /**
+    * 标本类型计数
+    * */
+   @Override
+   public Map<String,Integer> MuseumInfoBySampleType(Integer sampleType){
+      return museumInfoMapper.countMuseumInfoBySampleType(sampleType);
+   }
+   /**
+    * 标本出入库状态计数
+    * */
+   @Override
+   public Map<String,Integer> MuseumInfoBySave(Integer save) {
+      return museumInfoMapper.countMuseumInfoBySave(save);
    }
-
-
 }
 
 

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
@@ -17,7 +20,7 @@ public interface MuseummodelService {
    void updateMuseumModel(MuseummodelSaveVO saveVO);
 
    /**
-    * 删除标本
+    * 删除标本1
     * */
    void deleteMuseumModel(Integer id);
 
@@ -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);
+   }
+
+
+
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumpicture/MuseumPictureService.java

@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.museum.service.museumpicture;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.MuseumPictureSaveVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PicturePageReqVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureDO;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public interface MuseumPictureService {
+
+    /**
+     * 创建图片
+     */
+    Integer createMuseumPicture(MuseumPictureSaveVO saveVO);
+
+    /**
+     * 更改图片
+     */
+    void updateMuseumPicture(MuseumPictureSaveVO saveVO);
+
+    /**
+     * 删除图片
+     */
+    void deleteMuseumPicture(Integer pictureId);
+
+    /**
+     * 单独查询图片
+     */
+    MuseumPictureDO selectMuseumPicture(Integer pictureId);
+
+    /**
+     * 相同组查询图片
+     */
+//    MuseumPictureDO selectMuseumPictureSet(Integer group_id);
+
+
+     PageResult<MuseumPictureDO> getPicturePage(PicturePageReqVO pageVO);
+
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumpicture/MuseumPictureServiceImpl.java

@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.museum.service.museumpicture;
+
+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.museumpicture.vo.MuseumPictureSaveVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PicturePageReqVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureDO;
+import cn.iocoder.yudao.module.museum.dal.mysql.museumpicture.MuseumPictureMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public  class MuseumPictureServiceImpl implements MuseumPictureService {
+
+    @Resource
+    private MuseumPictureMapper museumPictureMapper;
+
+    @Override
+    public Integer createMuseumPicture(MuseumPictureSaveVO saveVO){
+        return museumPictureMapper.insert(BeanUtils.toBean(saveVO, MuseumPictureDO.class));
+    }
+
+    @Override
+    public void updateMuseumPicture(MuseumPictureSaveVO saveVO){
+        museumPictureMapper.updateMuseumPicture(BeanUtils.toBean(saveVO,MuseumPictureDO.class));
+    }
+
+    @Override
+    public void deleteMuseumPicture(Integer picture_id){
+//      museumPictureMapper.deleteMuseumPicture(picture_id);
+        museumPictureMapper.deleteById(picture_id);
+    }
+
+    @Override
+        public MuseumPictureDO selectMuseumPicture(Integer picture_id){
+        return museumPictureMapper.selectMuseumPictureById(picture_id);
+    }
+
+    @Override
+    public PageResult<MuseumPictureDO> getPicturePage(PicturePageReqVO pageVO) {
+        return null;
+    }
+
+//    @Override
+//    public MuseumPictureDO selectMuseumPictureSet(Integer group_id){
+//        return museumPictureMapper.selectMuseumPictureSetById(group_id);
+//    }
+}
+

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumpicture/PictureGroupService.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.museum.service.museumpicture;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PictureGroupSaveVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PicturePageReqVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.PictureGroupDO;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface PictureGroupService {
+    /**
+     * 创建图片
+     * */
+    Integer createPictureGroup(PictureGroupSaveVO saveVO);
+    /**
+     * 更改图片
+     * */
+    void updatePictureGroup(PictureGroupSaveVO saveVO);
+    /**
+     * 删除图片
+     * */
+    void deletePictureGroup(Integer id);
+    /**
+     * 查询图片
+     * */
+    PictureGroupDO selectPictureGroup(Integer id);
+
+    PageResult<PictureGroupDO> getPictureGroupPage(PicturePageReqVO pageVO);
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumpicture/PictureGroupServiceImpl.java

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.museum.service.museumpicture;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PictureGroupSaveVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.PictureGroupDO;
+import cn.iocoder.yudao.module.museum.dal.mysql.museumpicture.PictureGroupMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public  class PictureGroupServiceImpl implements PictureGroupService {
+
+    @Resource
+    private PictureGroupMapper pictureGroupMapper;
+
+    @Override
+    public Integer createPictureGroup(PictureGroupSaveVO saveVO){
+        return pictureGroupMapper.insert(BeanUtils.toBean(saveVO, PictureGroupDO.class));
+    }
+
+    @Override
+    public void updatePictureGroup(PictureGroupSaveVO saveVO){
+        pictureGroupMapper.updatePictureGroup(BeanUtils.toBean(saveVO,PictureGroupDO.class));
+    }
+
+    @Override
+    public void deletePictureGroup(Integer id){
+//      pictureGroupMapper.deletePictureGroup(id);
+        pictureGroupMapper.deleteById(id);
+    }
+
+    @Override
+    public PictureGroupDO selectPictureGroup(Integer id){
+        return pictureGroupMapper.selectPictureGroupById(id);
+    }
+}