Merge remote-tracking branch 'origin/master'

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,54 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+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.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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Tag(name = "博物馆-图片组")
+@RestController
+@RequestMapping("/museum/picture group")
+@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);
+    }
+
+}

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/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/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/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,26 @@
+package cn.iocoder.yudao.module.museum.service.museumpicture;
+
+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);
+
+}

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);
+    }
+}