Merge remote-tracking branch 'origin/master'

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/MuseumFlowController.java

@@ -54,8 +54,14 @@ public class MuseumFlowController {
 //    @PostMapping("/outbound")
 //    @Operation(summary = "添加出库单")
 //    public CommonResult<Boolean>  createMuseumFlowOutbound(@RequestBody MuseumFlowSaveVO saveVO){
-//        List<String>sample_id=saveVO.getNumber();
-//        MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
+//        List<String>sample_ids=saveVO.getNumber();
+//        for (String sample_id :sample_ids){
+//            MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
+//            if (result==null){
+//                return CommonResult.error(200,sample_id+"标本不存在");
+//            }
+//            break;
+//        }
 //        if(result == null){
 //            return CommonResult.error(200,"样品不存在");
 //        }else if(result != null){
@@ -84,10 +90,12 @@ public class MuseumFlowController {
         String number = reviewVO.getNumber();
         MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
         MuseumFlowDO event = museumFlowService.selectMuseumFlowNumber(number);
+
         int Save = result.getSave();
         int State = event.getState();
 //             Save中 0现为未出库或已回库，1为已出库
 //             State中 0现为未出库或已回库，1为已出库，2为审批中，3为审批通过，4为审批驳回
+        //TODO 你这里上面获取了result和event的值再判断他为空，怎么可能为空 ，所以如果为空的话，上面两句就直接报错了
         if (result == null) {
             return CommonResult.error(200, "样品不存在");
         } else if (event == null) {

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowPageVO.java

@@ -31,7 +31,7 @@ public class MuseumFlowPageVO extends PageParam {
     private String outboundPerson;
 
     @Schema(description = "出库时间")
-    private LocalDateTime[] outboundTime;
+    private LocalDateTime []outboundTime;
 
     @Schema(description = "目的")
     private String purpose;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowSaveVO.java

@@ -74,4 +74,5 @@ public class MuseumFlowSaveVO {
 
     @Schema(description = "状态")
     private Integer state;
+
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museummodel/MuseummodelController.java

@@ -34,6 +34,7 @@ public class MuseummodelController {
     @PostMapping("/create")
     @Operation(summary = "新增模型")
     public Integer createMuseumModel(@RequestBody MuseummodelSaveVO saveVO) {
+
         if (saveVO == null) {
             return -1;
         }

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

@@ -53,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) {
 
@@ -67,7 +67,7 @@ public class MuseumPictureController {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "查找图片")
+    @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/dal/database/museummodel/MuseummodelDO.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.museum.dal.database.museummodel;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -28,7 +30,7 @@ public class MuseummodelDO extends BaseDO {
     @Schema(description = "模型名称")
     private String specimenName;
 
-    @Schema(description = "模型编号")
+    @Schema(description = "标本编号")
     private String specimenNumber;
 
     @Schema(description = "模型类型")
@@ -43,4 +45,8 @@ public class MuseummodelDO extends BaseDO {
     @Schema(description = "备注")
     private String remark;
 
+    @TableField(exist = false) //
+    @Schema(description = "标本信息")
+    private MuseumInfoDO  museumInfoDO;
+
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museummodel/MuseummodelMapper.java

@@ -5,6 +5,7 @@ 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.museummodel.vo.MuseummodelPageReqVO;
+import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDO;
 import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDetailDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -27,6 +28,12 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
 
     //分页查询
 //    default PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO reqVO) {
+////        MPJLambdaWrapper<MuseummodelDO> mpjLambdaWrapper =new MPJLambdaWrapper<>();
+////        mpjLambdaWrapper.leftJoin(MuseumInfoDO.class,MuseumInfoDO::getSampleId,MuseummodelDO::getSpecimenNumber)
+////                .selectAll(MuseummodelDO.class)
+////                .selectAssociation(MuseumInfoDO.class,MuseummodelDO::getMuseumInfoDO)
+////                .
+//
 //        return selectPage(reqVO, new LambdaQueryWrapperX<MuseummodelDO>()
 //                .likeIfPresent(MuseummodelDO::getSpecimenName, reqVO.getSpecimenName())// 如果 SpecimenName 不为空，则进行 like 查询
 //                .likeIfPresent(MuseummodelDO::getSpecimenType, reqVO.getSpecimenType())
@@ -35,7 +42,7 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
 //                .eqIfPresent(MuseummodelDO::getSpecimenNumber, reqVO.getSpecimenNumber()) // 如果 SpecimenNumber 不为空，则进行 = 查询
 //                .betweenIfPresent(MuseummodelDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) // 如果 create 不为空，则进行 between 查询
 //                .orderByDesc(MuseummodelDO::getId)); // 按照 id 倒序
-    }
+//    }
 
     //联表查询
 //    default list<MuseummodelDetailDO> selectListByStatusAndDeptName(Integer status, String deptName) {
@@ -53,6 +60,7 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
 
 //    }
 //}
+}
 
 
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museummodel/MuseummodelServiceImpl.java

@@ -46,6 +46,11 @@ public  class MuseummodelServiceImpl implements MuseummodelService {
 //      return museumModelMapper.selectPage(pageReqVO);
 //   }
 
+//     @Override
+//      public  PageResult<MuseummodelDO> getPage (MuseummodelPageReqVO pageReqVO){
+//
+//     }
+
 
 
 }

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

yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java

@@ -29,6 +29,7 @@ public class YudaoServerApplication {
         // 如果你碰到启动的问题，请认真阅读 https://doc.iocoder.cn/quick-start/ 文章
         // 如果你碰到启动的问题，请认真阅读 https://doc.iocoder.cn/quick-start/ 文章
         // 如果你碰到启动的问题，请认真阅读 https://doc.iocoder.cn/quick-start/ 文章
+
     }
 
 }