更新了标本图片库

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

@@ -3,9 +3,10 @@ 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.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.PicturePageReqVO;
+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.service.museumpicture.MuseumPictureService;
 import cn.iocoder.yudao.module.museum.service.museumpicture.PictureGroupService;
@@ -34,7 +35,7 @@ public class MuseumPictureController {
     private MuseumPictureService museumPictureService;
     @Autowired
     private PictureGroupService pictureGroupService;
-    private PicturePageReqVO pageVO;
+    private PictureGroupPageReqVO pageVO;
 
     @PostMapping("/create")
     @Operation(summary = "新增图片组图片")
@@ -86,8 +87,7 @@ public class MuseumPictureController {
 
     @GetMapping("/page")
     @Operation(summary = "获得照片分页")
-    @PreAuthorize("@ss.hasPermission('system:tenant:query')")
-    public CommonResult<PageResult<MuseumPictureRespVO>> getPicturePage(@Validated PicturePageReqVO pageVO) {
+    public CommonResult<PageResult<MuseumPictureRespVO>> getPicturePage(@Validated MuseumPicturePageReqVO 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

@@ -25,7 +25,7 @@ public class PictureGroupController {
 
     @Autowired
     private PictureGroupService pictureGroupService;
-    private PicturePageReqVO pageVO;
+    private PictureGroupPageReqVO pageVO;
 
     @PostMapping("/create")
     @Operation(summary = "新增图片组")
@@ -63,7 +63,7 @@ public class PictureGroupController {
     @GetMapping("/page")
     @Operation(summary = "获得照片组分页")
     @PreAuthorize("@ss.hasPermission('system:tenant:query')")
-    public CommonResult<PageResult<PictureGroupRespVO>> getGroupPage(@Validated GroupPageReqVO pageVO) {
+    public CommonResult<PageResult<PictureGroupRespVO>> getGroupPage(@Validated PictureGroupPageReqVO 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

@@ -1,29 +0,0 @@
-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/MuseumPicturePageReqVO.java

@@ -0,0 +1,21 @@
+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.Data;
+
+import java.util.List;
+
+@Schema(description = "博物馆-图片信息 Page VO")
+@Data
+public class MuseumPicturePageReqVO extends PageParam {
+
+    @Schema(description = "图片编号")
+    private Integer id;
+
+    @Schema(description = "对应图片组序号")
+    private Integer groupId;
+
+    @Schema(description = "图片路径")
+    private List<String> picturePath;
+}

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

@@ -3,16 +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 = "博物馆-图片信息 Resp VO")
 @Data
 public class MuseumPictureRespVO {
 
-    private Integer pictureId;
-    @Schema(description = "图片编号")
-
+    @Schema(description = "对应图片组序号")
     private Integer groupId;
 
-    private String pictureUrl;
+    @Schema(description = "图片路径")
+    private List<String> picturePath;
 
 }

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

@@ -11,9 +11,12 @@ import java.util.List;
 public class MuseumPictureSaveVO {
 
     @Schema(description = "图片编号")
+    private Integer id;
 
+    @Schema(description = "对应图片组序号")
     private Integer groupId;
 
-    private List<String> pictureUrl;
+    @Schema(description = "图片路径")
+    private List<String> picturePath;
 
 }

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

@@ -17,14 +17,17 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class PicturePageReqVO extends PageParam {
+public class PictureGroupPageReqVO extends PageParam {
 
     @Schema(description = "图片组id,模糊搜索",example = "1")
     private Integer groupId;
 
+    @Schema(description = "照片组介绍")
+    private String pictureSetIntroduce;
+
     @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;
+    private LocalDateTime[] pictureSetTime;
 
 
 }

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

@@ -8,11 +8,11 @@ import java.time.LocalDateTime;
 @Schema(description = "博物馆-图片组信息 Resp VO")
 @Data
 public class PictureGroupRespVO {
-    private Integer id;
-    @Schema(description = "照片组编号")
 
+    @Schema(description = "照片组介绍")
     private String pictureSetIntroduce;
 
+    @Schema(description = "图片组创建时间")
     private LocalDateTime pictureSetTime;
 
 

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

@@ -8,11 +8,14 @@ import java.time.LocalDateTime;
 @Schema(description = "博物馆-图片组信息 Save VO")
 @Data
 public class PictureGroupSaveVO {
-    private Integer id;
+
     @Schema(description = "照片组编号")
+    private Integer id;
 
+    @Schema(description = "照片组介绍")
     private String pictureSetIntroduce;
 
+    @Schema(description = "图片组创建时间")
     private LocalDateTime pictureSetTime;
 
 

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

@@ -20,9 +20,9 @@ import lombok.*;
 public class MuseumPictureDO extends BaseDO {
 
     @TableId
-    private Integer pictureId;
+    private Integer Id;
 
     private Integer groupId;
 
-    private String pictureUrl;
+    private String picturePath;
 }

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

@@ -1,6 +1,11 @@
 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;
@@ -24,4 +29,14 @@ public interface MuseumPictureMapper extends BaseMapperX<MuseumPictureDO> {
     @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);
+                }
+        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,6 +1,10 @@
 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;
@@ -19,4 +23,12 @@ public interface PictureGroupMapper extends BaseMapperX<PictureGroupDO> {
     @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/MuseumPictureService.java

@@ -1,8 +1,8 @@
 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.MuseumPicturePageReqVO;
 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;
 import org.springframework.web.multipart.MultipartFile;
@@ -39,7 +39,7 @@ public interface MuseumPictureService {
 //    MuseumPictureDO selectMuseumPictureSet(Integer group_id);
 
 
-     PageResult<MuseumPictureDO> getPicturePage(PicturePageReqVO pageVO);
+     PageResult<MuseumPictureDO> getPicturePage(MuseumPicturePageReqVO pageVO);
 
 //     解压并添加图片
 //     void unzipAndAddToGroup(String groupId, String zipFilePath) throws Exception;

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

@@ -1,24 +1,19 @@
 package cn.iocoder.yudao.module.museum.service.museumpicture;
 
-import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.MuseumPicturePageReqVO;
 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 com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.*;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -41,12 +36,12 @@ public  class MuseumPictureServiceImpl implements MuseumPictureService {
     @Override
     public Integer createMuseumPicture(MuseumPictureSaveVO saveVO) {
         Integer photoGroupId = saveVO.getGroupId();
-        List<String> urls = saveVO.getPictureUrl();
+        List<String> urls = saveVO.getPicturePath();
 
         for (String url : urls) {
             MuseumPictureDO museumPicture = new MuseumPictureDO();
             museumPicture.setGroupId(photoGroupId);
-            museumPicture.setPictureUrl(url);
+            museumPicture.setPicturePath(url);
             museumPictureMapper.insert(museumPicture);
         }
 
@@ -70,8 +65,8 @@ public  class MuseumPictureServiceImpl implements MuseumPictureService {
     }
 
     @Override
-    public PageResult<MuseumPictureDO> getPicturePage(PicturePageReqVO pageVO) {
-        return null;
+    public PageResult<MuseumPictureDO> getPicturePage(MuseumPicturePageReqVO pageVO) {
+        return museumPictureMapper.selectMuseumPicturePage(pageVO);
     }
 
 
@@ -158,7 +153,7 @@ public  class MuseumPictureServiceImpl implements MuseumPictureService {
     private void savePhotoToDatabase(Long groupId, String url) {
         MuseumPictureDO photo = new MuseumPictureDO();
         photo.setGroupId(Math.toIntExact(groupId));
-        photo.setPictureUrl(url);
+        photo.setPicturePath(url);
         museumPictureMapper.insert(photo);
     }
 }

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

@@ -1,9 +1,9 @@
 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.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.controller.admin.museumpicture.vo.PicturePageReqVO;
 import cn.iocoder.yudao.module.museum.dal.database.museumpicture.PictureGroupDO;
 import org.springframework.stereotype.Service;
 
@@ -26,7 +26,7 @@ public interface PictureGroupService {
      * */
     PictureGroupDO selectPictureGroup(Integer id);
 
-    PageResult<PictureGroupDO> getGroupPage(GroupPageReqVO pageVO);
+    PageResult<PictureGroupDO> getGroupPage(PictureGroupPageReqVO 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

@@ -2,7 +2,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.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;
@@ -28,7 +29,7 @@ public  class PictureGroupServiceImpl implements PictureGroupService {
 
     @Override
     public void deletePictureGroup(Integer id){
-//      pictureGroupMapper.deletePictureGroup(id);
+
         pictureGroupMapper.deleteById(id);
     }
 
@@ -38,8 +39,8 @@ public  class PictureGroupServiceImpl implements PictureGroupService {
     }
 
     @Override
-    public PageResult<PictureGroupDO> getGroupPage(GroupPageReqVO pageVO) {
-        return null;
+    public PageResult<PictureGroupDO> getGroupPage(PictureGroupPageReqVO pageVO) {
+        return pictureGroupMapper.selectMuseumPicturePage(pageVO);
     }
 
 }