更新了标本图片库

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

@@ -6,10 +6,10 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.MuseumPicturePageReqVO;
 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.PictureGroupPageReqVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.MuseumPictureGroupPageReqVO;
 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 cn.iocoder.yudao.module.museum.service.museumpicture.MuseumPictureGroupService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,9 +33,8 @@ public class MuseumPictureController {
 
     @Resource
     private MuseumPictureService museumPictureService;
-    @Autowired
-    private PictureGroupService pictureGroupService;
-    private PictureGroupPageReqVO pageVO;
+    @Resource
+    private MuseumPictureGroupService museumPictureGroupService;
 
     @PostMapping("/create")
     @Operation(summary = "新增图片组图片")
@@ -60,31 +59,20 @@ public class MuseumPictureController {
     @GetMapping("/get picture")
     @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);
-//        }
     }
 
     //TODO 写清楚点这种，例如这个getPicturesByGroupId
     @GetMapping("/get")
     @Operation(summary = "查找相同照片组图片")
     public CommonResult<MuseumPictureRespVO> getMuseumPictureGroup(@RequestParam("groupId") Integer groupId) {
-
-//        if (groupId==null) {
-//            return CommonResult.error(1,"没有符合的照片组图片");
-//        }else {
         MuseumPictureDO result = museumPictureService.selectMuseumPicture(groupId);
         MuseumPictureRespVO list1 = BeanUtils.toBean(result, MuseumPictureRespVO.class);
         return CommonResult.success(list1);
-//        }
     }
 
-
     @GetMapping("/page")
     @Operation(summary = "获得照片分页")
     public CommonResult<PageResult<MuseumPictureRespVO>> getPicturePage(@Validated MuseumPicturePageReqVO pageVO) {
@@ -92,40 +80,8 @@ public class MuseumPictureController {
         return success(BeanUtils.toBean(pageResult, MuseumPictureRespVO.class));
     }
 
-
-//    "图片解压"
-
-    //TODO 没看懂你想写什么
-//    public MuseumPictureController(MuseumPictureService museumPictureService) {
-//        this.museumPictureService = museumPictureService;
-//    }
-//
-//    public void handleUnzipRequest(String groupId, String zipFilePath) {
-//        try {
-//            museumPictureService.unzipAndAddToGroup(groupId, zipFilePath);
-//            System.out.println("照片已成功解压到 " + "photos/" + groupId);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
-//    }
-
-//    public static void main(String[] args) {
-//        MuseumPictureService museumPictureService = new MuseumPictureServicelmpl();
-//        MuseumPictureController controller = new MuseumPictureController(museumPictureService);
-//
-//        // 示例 groupId 和 zip 文件路径
-//        String groupId = "group1";
-//        String zipFilePath = "path/to/your/photo.zip";
-//
-//        controller.handleUnzipRequest(groupId, zipFilePath);
-//    }
-
-
     @PostMapping("/upload-zip")
     @Operation(summary = "照片上传")
-    @PreAuthorize("@ss.hasPermission('system:tenant:query')")
     public CommonResult<Boolean> uploadZip(@RequestParam("file") MultipartFile file,
                                                @RequestParam("groupId") Long groupId) throws IOException {
         museumPictureService.processZipUpload(file, groupId);

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

@@ -4,8 +4,8 @@ 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 cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureGroupDO;
+import cn.iocoder.yudao.module.museum.service.museumpicture.MuseumPictureGroupService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +13,8 @@ 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;
 
 
@@ -21,50 +23,45 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @RequestMapping("/museum/pictureGroup")
 @Validated
 
-public class PictureGroupController {
+public class MuseumPictureGroupController {
+
+    @Resource
+    private MuseumPictureGroupService museumPictureGroupService;
 
-    @Autowired
-    private PictureGroupService pictureGroupService;
-    private PictureGroupPageReqVO pageVO;
 
     @PostMapping("/create")
     @Operation(summary = "新增图片组")
-    public Integer createPictureGroup(@RequestBody PictureGroupSaveVO saveVO) {
-        return pictureGroupService.createPictureGroup(saveVO);
+    public Integer createPictureGroup(@RequestBody MuseumPictureGroupSaveVO saveVO) {
+        return museumPictureGroupService.createPictureGroup(saveVO);
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新图片组")
-    public CommonResult<Boolean> updatePictureGroup(@RequestBody PictureGroupSaveVO saveVO) {
-        pictureGroupService.updatePictureGroup(saveVO);
+    public CommonResult<Boolean> updatePictureGroup(@RequestBody MuseumPictureGroupSaveVO saveVO) {
+        museumPictureGroupService.updatePictureGroup(saveVO);
         return CommonResult.success(true);
     }
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除图片组")
     public CommonResult<Boolean> deletePictureGroup(@RequestParam("groupId") Integer groupId) {
-        pictureGroupService.deletePictureGroup(groupId);
+        museumPictureGroupService.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);
+    public CommonResult<MuseumPictureGroupRespVO> getMuseumPicture(@RequestParam("groupId") Integer groupId) {
+        MuseumPictureGroupDO result = museumPictureGroupService.selectPictureGroup(groupId);
+        MuseumPictureGroupRespVO result1 = BeanUtils.toBean(result, MuseumPictureGroupRespVO.class);
         return CommonResult.success(result1);
-//        }
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得照片组分页")
     @PreAuthorize("@ss.hasPermission('system:tenant:query')")
-    public CommonResult<PageResult<PictureGroupRespVO>> getGroupPage(@Validated PictureGroupPageReqVO pageVO) {
-        PageResult<PictureGroupDO> pageResult = pictureGroupService.getGroupPage(pageVO);
-        return success(BeanUtils.toBean(pageResult, PictureGroupRespVO.class));
+    public CommonResult<PageResult<MuseumPictureGroupRespVO>> getGroupPage(@Validated MuseumPictureGroupPageReqVO pageVO) {
+        PageResult<MuseumPictureGroupDO> pageResult = museumPictureGroupService.getGroupPage(pageVO);
+        return success(BeanUtils.toBean(pageResult, MuseumPictureGroupRespVO.class));
     }
 }

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

@@ -17,11 +17,14 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class PictureGroupPageReqVO extends PageParam {
+public class MuseumPictureGroupPageReqVO extends PageParam {
 
     @Schema(description = "图片组id,模糊搜索",example = "1")
     private Integer groupId;
 
+    @Schema(description = "照片名称")
+    private String pictureSetName;
+
     @Schema(description = "照片组介绍")
     private String pictureSetIntroduce;
 

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

@@ -7,7 +7,10 @@ import java.time.LocalDateTime;
 
 @Schema(description = "博物馆-图片组信息 Resp VO")
 @Data
-public class PictureGroupRespVO {
+public class MuseumPictureGroupRespVO {
+
+    @Schema(description = "照片名称")
+    private String pictureSetName;
 
     @Schema(description = "照片组介绍")
     private String pictureSetIntroduce;

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

@@ -7,11 +7,14 @@ import java.time.LocalDateTime;
 
 @Schema(description = "博物馆-图片组信息 Save VO")
 @Data
-public class PictureGroupSaveVO {
+public class MuseumPictureGroupSaveVO {
 
     @Schema(description = "照片组编号")
     private Integer id;
 
+    @Schema(description = "照片名称")
+    private String pictureSetName;
+
     @Schema(description = "照片组介绍")
     private String pictureSetIntroduce;
 

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

@@ -11,7 +11,7 @@ import lombok.*;
  *
  * @author yu
  */
-@TableName(value = "museum_picture_dan", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
+@TableName(value = "museum_picture", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
 @Data
 @Builder
 @EqualsAndHashCode(callSuper = true)

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

@@ -18,12 +18,16 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
-public class PictureGroupDO extends BaseDO {
+public class MuseumPictureGroupDO extends BaseDO {
 
     @TableId
     private Integer id;
 
-    private LocalDateTime pictureSetTime;
+    private String pictureSetName;
 
     private String pictureSetIntroduce;
+
+    private LocalDateTime pictureSetTime;
+
+
 }

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

@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.museum.dal.mysql.museumpicture;
+
+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.museumpicture.vo.MuseumPictureGroupPageReqVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureGroupDO;
+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 MuseumPictureGroupMapper extends BaseMapperX<MuseumPictureGroupDO> {
+
+    @Update("UPDATE museum_picture_table SET picture_set_introduce=#{picture_set_introduce} WHERE id =#{id}")
+    void updatePictureGroup(MuseumPictureGroupDO museumPictureGroupDO);
+
+    @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 ")
+    MuseumPictureGroupDO selectPictureGroupById(@Param("id") Integer id);
+
+    default PageResult<MuseumPictureGroupDO> selectMuseumPicturePage(MuseumPictureGroupPageReqVO pageReqVO) {
+        LambdaQueryWrapperX<MuseumPictureGroupDO> queryWrapper = new LambdaQueryWrapperX<MuseumPictureGroupDO>()
+                .eqIfPresent(MuseumPictureGroupDO::getId, pageReqVO.getGroupId())
+                .likeIfPresent(MuseumPictureGroupDO::getPictureSetIntroduce, pageReqVO.getPictureSetIntroduce())
+                .likeIfPresent(MuseumPictureGroupDO::getPictureSetName, pageReqVO.getPictureSetName())
+                .betweenIfPresent(MuseumPictureGroupDO::getPictureSetTime, pageReqVO.getPictureSetTime())
+                .orderByDesc(MuseumPictureGroupDO::getId);
+        return selectPage(pageReqVO, queryWrapper);
+    }
+}

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

@@ -3,9 +3,7 @@ package cn.iocoder.yudao.module.museum.dal.mysql.museumpicture;
 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.controller.admin.museumpicture.vo.MuseumPicturePageReqVO;
-import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDO;
 import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -17,25 +15,21 @@ import java.util.List;
 @Mapper
 public interface MuseumPictureMapper extends BaseMapperX<MuseumPictureDO> {
 
-    @Update("UPDATE museum_picture_dan SET picture_url=#{picture_url} WHERE picture_id =#{picture_id}")
+    @Update("UPDATE museum_picture SET picture_path=#{picturePath} WHERE id =#{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 ")
+    @Select("SELECT * FROM museum_picture WHERE id = #{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);
-
     default PageResult<MuseumPictureDO> selectMuseumPicturePage(MuseumPicturePageReqVO pageReqVO) {
         LambdaQueryWrapperX<MuseumPictureDO> queryWrapper = new LambdaQueryWrapperX<MuseumPictureDO>()
                 .eqIfPresent(MuseumPictureDO::getGroupId, pageReqVO.getGroupId())
                 .orderByDesc(MuseumPictureDO::getId);
                 if (pageReqVO.getPicturePath() != null && !pageReqVO.getPicturePath().isEmpty()) {
-                    String picture = String.valueOf(pageReqVO.getPicturePath());
-                    queryWrapper.apply("JSON_CONTAINS(secretary_ids, CAST({0} AS JSON))", picture);
+                    List<String> pictures = pageReqVO.getPicturePath();
+                    for (String picture : pictures) {
+                        queryWrapper.apply("JSON_CONTAINS(picture, CAST({0} AS JSON))", picture);
+                    }
                 }
         return selectPage(pageReqVO, queryWrapper);
     }

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

@@ -1,34 +0,0 @@
-package cn.iocoder.yudao.module.museum.dal.mysql.museumpicture;
-
-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.museumpicture.vo.PictureGroupPageReqVO;
-import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureDO;
-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);
-
-    default PageResult<PictureGroupDO> selectMuseumPicturePage(PictureGroupPageReqVO pageReqVO) {
-        LambdaQueryWrapperX<PictureGroupDO> queryWrapper = new LambdaQueryWrapperX<PictureGroupDO>()
-                .eqIfPresent(PictureGroupDO::getId, pageReqVO.getGroupId())
-                .likeIfPresent(PictureGroupDO::getPictureSetIntroduce, pageReqVO.getPictureSetIntroduce())
-                .betweenIfPresent(PictureGroupDO::getPictureSetTime, pageReqVO.getPictureSetTime())
-                .orderByDesc(PictureGroupDO::getId);
-        return selectPage(pageReqVO, queryWrapper);
-    }
-}

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

@@ -0,0 +1,33 @@
+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.MuseumPictureGroupPageReqVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.MuseumPictureGroupSaveVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureGroupDO;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface MuseumPictureGroupService {
+    /**
+     * 创建图片组
+     * */
+    Integer createPictureGroup(MuseumPictureGroupSaveVO saveVO);
+    /**
+     * 更改图片组
+     * */
+    void updatePictureGroup(MuseumPictureGroupSaveVO saveVO);
+    /**
+     * 删除图片组
+     * */
+    void deletePictureGroup(Integer id);
+    /**
+     * 查询图片组
+     * */
+    MuseumPictureGroupDO selectPictureGroup(Integer id);
+    /**
+     * 图片组分页查询
+     */
+    PageResult<MuseumPictureGroupDO> getGroupPage(MuseumPictureGroupPageReqVO pageVO);
+
+
+}

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

@@ -2,29 +2,28 @@ 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.PictureGroupPageReqVO;
-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.dal.database.museumpicture.PictureGroupDO;
-import cn.iocoder.yudao.module.museum.dal.mysql.museumpicture.PictureGroupMapper;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.MuseumPictureGroupPageReqVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.MuseumPictureGroupSaveVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureGroupDO;
+import cn.iocoder.yudao.module.museum.dal.mysql.museumpicture.MuseumPictureGroupMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
 @Service
-public  class PictureGroupServiceImpl implements PictureGroupService {
+public  class MuseumPictureGroupServiceImpl implements MuseumPictureGroupService {
 
     @Resource
-    private PictureGroupMapper pictureGroupMapper;
+    private MuseumPictureGroupMapper pictureGroupMapper;
 
     @Override
-    public Integer createPictureGroup(PictureGroupSaveVO saveVO){
-        return pictureGroupMapper.insert(BeanUtils.toBean(saveVO, PictureGroupDO.class));
+    public Integer createPictureGroup(MuseumPictureGroupSaveVO saveVO){
+        return pictureGroupMapper.insert(BeanUtils.toBean(saveVO, MuseumPictureGroupDO.class));
     }
 
     @Override
-    public void updatePictureGroup(PictureGroupSaveVO saveVO){
-        pictureGroupMapper.updatePictureGroup(BeanUtils.toBean(saveVO,PictureGroupDO.class));
+    public void updatePictureGroup(MuseumPictureGroupSaveVO saveVO){
+        pictureGroupMapper.updatePictureGroup(BeanUtils.toBean(saveVO, MuseumPictureGroupDO.class));
     }
 
     @Override
@@ -34,12 +33,12 @@ public  class PictureGroupServiceImpl implements PictureGroupService {
     }
 
     @Override
-    public PictureGroupDO selectPictureGroup(Integer id){
+    public MuseumPictureGroupDO selectPictureGroup(Integer id){
         return pictureGroupMapper.selectPictureGroupById(id);
     }
 
     @Override
-    public PageResult<PictureGroupDO> getGroupPage(PictureGroupPageReqVO pageVO) {
+    public PageResult<MuseumPictureGroupDO> getGroupPage(MuseumPictureGroupPageReqVO pageVO) {
         return pictureGroupMapper.selectMuseumPicturePage(pageVO);
     }
 

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

@@ -12,38 +12,28 @@ import java.io.IOException;
 
 @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(MuseumPicturePageReqVO pageVO);
-
-//     解压并添加图片
-//     void unzipAndAddToGroup(String groupId, String zipFilePath) throws Exception;
-
+    /**
+     * 解压并添加图片
+     */
     void processZipUpload(MultipartFile file, Long groupId) throws IOException;
-
 }

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

@@ -28,23 +28,16 @@ public  class MuseumPictureServiceImpl implements MuseumPictureService {
     @Resource
     private FileApi fileApi;
 
-//    @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.getPicturePath();
-
         for (String url : urls) {
             MuseumPictureDO museumPicture = new MuseumPictureDO();
             museumPicture.setGroupId(photoGroupId);
             museumPicture.setPicturePath(url);
             museumPictureMapper.insert(museumPicture);
         }
-
         return photoGroupId; // 返回照片组ID作为操作成功的标识
     }
 
@@ -55,12 +48,11 @@ public  class MuseumPictureServiceImpl implements MuseumPictureService {
 
     @Override
     public void deleteMuseumPicture(Integer picture_id){
-//      museumPictureMapper.deleteMuseumPicture(picture_id);
         museumPictureMapper.deleteById(picture_id);
     }
 
     @Override
-        public MuseumPictureDO selectMuseumPicture(Integer picture_id){
+    public MuseumPictureDO selectMuseumPicture(Integer picture_id){
         return museumPictureMapper.selectMuseumPictureById(picture_id);
     }
 
@@ -69,47 +61,6 @@ public  class MuseumPictureServiceImpl implements MuseumPictureService {
         return museumPictureMapper.selectMuseumPicturePage(pageVO);
     }
 
-
-//    private final Set<String> ALLOWED_EXTENSIONS = Set.of("jpg", "jpeg", "png", "gif");
-
-//    @Override
-//    public void processZipUpload(MultipartFile file, Long groupId) throws IOException {
-//        try (ZipInputStream zis = new ZipInputStream(file.getInputStream())) {
-//            ZipEntry entry;
-//            while ((entry = zis.getNextEntry()) != null) {
-//                processZipEntry(zis, entry, groupId);
-//            }
-//        }
-//    }
-//
-//    private void processZipEntry(ZipInputStream zis, ZipEntry entry, Long groupId) throws IOException {
-//        if (entry.isDirectory() || !isImageFile(entry.getName())) {
-//            return;
-//        }
-//
-//        // 读取文件内容并上传
-//        byte[] content = IoUtil.readBytes(zis);
-//        String url = fileApi.createFile(content);
-//
-//        // 构建并保存数据库记录
-//        MuseumPictureDO photo = new MuseumPictureDO();
-//        photo.setGroupId(Math.toIntExact(groupId));
-//        photo.setPictureUrl(url);
-//        museumPictureMapper.insert(photo);
-//    }
-//
-//    private boolean isImageFile(String filename) {
-//        String extension = FilenameUtil.getExtension(filename);
-//        return StringUtils.isNotEmpty(extension);
-////                ALLOWED_EXTENSIONS.contains(extension.toLowerCase());
-//    }
-
-//    @Override
-//    public MuseumPictureDO selectMuseumPictureSet(Integer group_id){
-//        return museumPictureMapper.selectMuseumPictureSetById(group_id);
-//    }
-
-
     @Override
     public void processZipUpload(MultipartFile file, Long groupId) {
         if (file == null || file.isEmpty()) {
@@ -157,46 +108,3 @@ public  class MuseumPictureServiceImpl implements MuseumPictureService {
         museumPictureMapper.insert(photo);
     }
 }
-
-//     @Override
-//     public void unzipAndAddToGroup(String groupId, String zipFilePath) throws IOException {
-//    String photoGroupDir = "photos/" + groupId;
-//    File groupDir = new File(photoGroupDir);
-//    if (!groupDir.exists()) {
-//        groupDir.mkdirs();
-//    }
-//
-//    unzip(zipFilePath, photoGroupDir);
-//        }
-
-//    private void unzip(String zipFilePath, String destDir) throws IOException {
-//    byte[] buffer = new byte[1024];
-//    try (
-//            FileInputStream fis = new FileInputStream(zipFilePath);
-//            ZipInputStream zis = new ZipInputStream(fis)
-//    ) {
-//        ZipEntry zipEntry = zis.getNextEntry();
-//        while (zipEntry != null) {
-//            String filePath = destDir + File.separator + zipEntry.getName();
-//            if (!zipEntry.isDirectory()) {
-//                extractFile(zis, buffer, filePath);
-//            } else {
-//                File dir = new File(filePath);
-//                dir.mkdir();
-//            }
-//            zis.closeEntry();
-//            zipEntry = zis.getNextEntry();
-//        }
-//        zis.closeEntry();
-//    }
-//}
-//
-//private void extractFile(ZipInputStream zis, byte[] buffer, String filePath) throws IOException {
-//    try (FileOutputStream fos = new FileOutputStream(filePath)) {
-//        int len;
-//        while ((len = zis.read(buffer)) > 0) {
-//            fos.write(buffer, 0, len);
-//        }
-//    }
-//}
-//}

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

@@ -1,32 +0,0 @@
-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.PictureGroupPageReqVO;
-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.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> getGroupPage(PictureGroupPageReqVO pageVO);
-
-
-}