博物馆照片库更新

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

@@ -15,12 +15,9 @@ 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 org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.Resource;
 
-import java.util.List;
-
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "博物馆-图片库")
@@ -37,7 +34,7 @@ public class MuseumPictureController {
     private PicturePageReqVO pageVO;
 
     @PostMapping("/create")
-    @Operation(summary = "新增照片组图片")
+    @Operation(summary = "新增图片") 
     public Integer createMuseumPicture(@RequestBody MuseumPictureSaveVO saveVO) {
         return museumPictureService.createMuseumPicture(saveVO);
     }
@@ -57,7 +54,7 @@ public class MuseumPictureController {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "查找图片(图片id)")
+    @Operation(summary = "查找图片")
     public CommonResult<MuseumPictureRespVO> getMuseumPicture(@RequestParam("pictureId") Integer pictureId) {
 
 //        if (pictureId==null) {
@@ -69,18 +66,6 @@ public class MuseumPictureController {
 //        }
     }
 
-    @GetMapping("/get")
-    @Operation(summary = "查找图片(图片组id)")
-    public CommonResult<MuseumPictureRespVO> getMuseumPictureGroup(@RequestParam("groupId") Integer groupId) {
-
-//        if (groupId==null) {
-//            return CommonResult.error(1,"该照片组不存在");
-//        }else {
-        MuseumPictureDO list = museumPictureService.selectMuseumPicture(groupId);
-        MuseumPictureRespVO list1 = BeanUtils.toBean(list, MuseumPictureRespVO.class);
-        return CommonResult.success(list1);
-//        }
-    }
 
     @GetMapping("/page")
     @Operation(summary = "获得照片分页")

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

@@ -28,8 +28,6 @@ public class PictureGroupController {
     @Resource
     private PictureGroupService PictureGroupService;
 
-
-
     @PostMapping("/create")
     @Operation(summary = "新增图片组")
     public Integer createPictureGroup(@RequestBody PictureGroupSaveVO saveVO){

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

@@ -3,8 +3,6 @@ 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
@@ -16,7 +14,6 @@ public class MuseumPictureSaveVO {
 
     private Integer groupId;
 
-    private List<String> pictureUrl;
-
+    private String picturePath;
 
 }

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

@@ -24,5 +24,5 @@ public class MuseumPictureDO extends BaseDO {
 
     private Integer groupId;
 
-    private String pictureUrl;
+    private String picturePath;
 }

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

@@ -4,9 +4,6 @@ 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.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 
 
@@ -14,7 +11,7 @@ import org.springframework.stereotype.Service;
 public interface MuseumPictureService {
 
     /**
-     * 创建图片组图片
+     * 创建图片
      */
     Integer createMuseumPicture(MuseumPictureSaveVO saveVO);
 
@@ -38,6 +35,7 @@ public interface MuseumPictureService {
      */
 //    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

@@ -6,10 +6,9 @@ import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.MuseumPi
 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.apache.poi.ss.usermodel.Picture;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
-import java.util.List;
 
 @Service
 public  class MuseumPictureServiceImpl implements MuseumPictureService {
@@ -17,28 +16,11 @@ 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 Integer createMuseumPicture(MuseumPictureSaveVO saveVO) {
-        Integer photoGroupId = saveVO.getGroupId();
-        List<String> urls = saveVO.getPictureUrl();
-
-        for (String url : urls) {
-            MuseumPictureDO museumPicture = new MuseumPictureDO();
-//            MuseumPictureDO.groupId(photoGroupId);
-            museumPicture.setPictureUrl(url);
-            return museumPictureMapper.insert(BeanUtils.toBean(saveVO, MuseumPictureDO.class));
-        }
-
-        return photoGroupId; // 返回照片组ID作为操作成功的标识
-
+    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));

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

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 @Service
 public interface PictureGroupService {
     /**
-     * 创建图片组
+     * 创建图片
      * */
     Integer createPictureGroup(PictureGroupSaveVO saveVO);
     /**