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

@@ -33,11 +33,6 @@ public class MuseumPictureController {
     private PictureGroupService pictureGroupService;
     private PicturePageReqVO pageVO;
 
-
-
-    //    TODO  1.创建新增照片组照片是需要用过照片组id 获取再新增的，也就是说需要一个通过照片组id和url进行插入的服务层方法
-    //          2.这里的新增是需要同时对照片组下新增多个的照片的，前端传的是个list的url，通过遍历调用上面的方法进行插入
-
     @PostMapping("/create")
     @Operation(summary = "新增图片组图片")
     public Integer createMuseumPicture(@RequestBody MuseumPictureSaveVO saveVO) {
@@ -58,7 +53,7 @@ public class MuseumPictureController {
         return CommonResult.success(true);
     }
 
-    @GetMapping("/getp")
+    @GetMapping("/get picture")
     @Operation(summary = "查找图片")
     public CommonResult<MuseumPictureRespVO> getMuseumPicture(@RequestParam("pictureId") Integer pictureId) {
 
@@ -71,8 +66,8 @@ public class MuseumPictureController {
 //        }
     }
 
-    @GetMapping("/getPictures")
-    @Operation(summary = "查找图片")
+    @GetMapping("/get")
+    @Operation(summary = "查找相同照片组图片")
     public CommonResult<MuseumPictureRespVO> getMuseumPictureGroup(@RequestParam("groupId") Integer groupId) {
 
 //        if (groupId==null) {

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

@@ -0,0 +1,70 @@
+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.*;
+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.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+
+@Tag(name = "博物馆-图片库")
+@RestController
+@RequestMapping("/museum/pictureGroup")
+@Validated
+
+public class PictureGroupController {
+
+    @Autowired
+    private PictureGroupService pictureGroupService;
+    private PicturePageReqVO pageVO;
+
+    @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("groupId") Integer groupId) {
+        pictureGroupService.deletePictureGroup(groupId);
+        return CommonResult.success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "查找图片组")
+    public CommonResult<PictureGroupRespVO> getMuseumPicture(@RequestParam("groupId") Integer groupId) {
+
+//        if (groupId==null) {
+//            return CommonResult.error(1,"照片组不存在");
+//        }else {
+        PictureGroupDO result = pictureGroupService.selectPictureGroup(groupId);
+        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>> getGroupPage(@Validated GroupPageReqVO pageVO) {
+        PageResult<PictureGroupDO> pageResult = pictureGroupService.getGroupPage(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/GroupPageReqVO.java

@@ -0,0 +1,29 @@
+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;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class GroupPageReqVO 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/controller/admin/museumpicture/vo/MuseumPictureSaveVO.java

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

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

@@ -26,13 +26,13 @@ public  class MuseumPictureServiceImpl implements MuseumPictureService {
     @Override
     public Integer createMuseumPicture(MuseumPictureSaveVO saveVO) {
         Integer photoGroupId = saveVO.getGroupId();
-        List<String> urls = Collections.singletonList(saveVO.getPictureUrl());
+        List<String> urls = saveVO.getPictureUrl();
 
         for (String url : urls) {
-            MuseumPictureSaveVO museumPicture = new MuseumPictureSaveVO();
+            MuseumPictureDO museumPicture = new MuseumPictureDO();
             museumPicture.setGroupId(photoGroupId);
             museumPicture.setPictureUrl(url);
-            return museumPictureMapper.insert(BeanUtils.toBean(saveVO, MuseumPictureDO.class));
+            return museumPictureMapper.insert(museumPicture);
         }
 
         return photoGroupId; // 返回照片组ID作为操作成功的标识

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

@@ -1,6 +1,7 @@
 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.GroupPageReqVO;
 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;
@@ -25,5 +26,7 @@ public interface PictureGroupService {
      * */
     PictureGroupDO selectPictureGroup(Integer id);
 
+    PageResult<PictureGroupDO> getGroupPage(GroupPageReqVO pageVO);
+
 //    PageResult<PictureGroupDO> getPictureGroupPage(PicturePageReqVO pageVO);
 }

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

@@ -1,6 +1,8 @@
 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.GroupPageReqVO;
 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;
@@ -34,4 +36,9 @@ public  class PictureGroupServiceImpl implements PictureGroupService {
     public PictureGroupDO selectPictureGroup(Integer id){
         return pictureGroupMapper.selectPictureGroupById(id);
     }
+
+    @Override
+    public PageResult<PictureGroupDO> getGroupPage(GroupPageReqVO pageVO) {
+        return null;
+    }
 }