1.修改注释错误

2.新增标本编号查寻

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/CommonResult.java

@@ -64,7 +64,7 @@ public class CommonResult<T> implements Serializable {
         CommonResult<T> result = new CommonResult<>();
         result.code = GlobalErrorCodeConstants.SUCCESS.getCode();
         result.data = data;
-        result.msg = "";
+        result.msg = "成功";
         return result;
     }
 

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

@@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
 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.museuminfo.vo.MuseumInfoRespVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelRespVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelSaveVO;
+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.service.museummodel.MuseummodelService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -26,7 +29,7 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
 @RestController
 @RequestMapping("/museum/model")
 @Validated
-public class MuseummodelController {
+public class MuseumModelController {
 
     @Resource
     private MuseummodelService museumModelService;
@@ -70,6 +73,29 @@ public class MuseummodelController {
         return CommonResult.success(result1);
     }
 
+    @GetMapping("/getSampleId")
+    @Operation(summary = "标本编号查寻")
+    public CommonResult<List<MuseummodelRespVO>> getMuseumModelList(@RequestParam("sampleId") String specimenNumber){
+        List<MuseummodelDO> result = museumModelService.getMuseumModelBySpecimenNumber(specimenNumber);
+        List<MuseummodelRespVO> result1 = BeanUtils.toBean(result,MuseummodelRespVO.class);
+        return CommonResult.success(result1);
+    }
+
+
+    @GetMapping("/page")
+    @Operation(summary = "获得模型分页")
+    @PreAuthorize("@ss.hasPermission('system:tenant:query')")
+    public CommonResult<PageResult<MuseummodelRespVO>> getPage(@Valid MuseummodelPageReqVO pageVO) {
+    PageResult<MuseummodelDO> pageResult = museumModelService.getMuseumModelPage(pageVO);
+    return success(BeanUtils.toBean(pageResult,MuseummodelRespVO.class));
+    }
+
+//1.通过标本编号放回所有的标本模型list
+//2.通过标本类型返回所有标本模型 返回map//
+//3.通过标本编号批量导入模型,前端传标本编号和zip压缩包,包含zip的验证(验证后缀)
+
+}
+
 //    @GetMapping("/page")
 //    @Operation(summary = "获得用户分页列表")
 //    @PreAuthorize("@ss.hasPermission('system:user:query')")
@@ -83,14 +109,3 @@ public class MuseummodelController {
 //    }
 
 
-@GetMapping("/page")
-@Operation(summary = "获得模型分页")
-@PreAuthorize("@ss.hasPermission('system:tenant:query')")
-public CommonResult<PageResult<MuseummodelRespVO>> getPage(@Valid MuseummodelPageReqVO pageVO) {
-    PageResult<MuseummodelDO> pageResult = museumModelService.getMuseumModelPage(pageVO);
-    return success(BeanUtils.toBean(pageResult,MuseummodelRespVO.class));
-}
-
-}
-
-

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

@@ -20,10 +20,10 @@ public class MuseummodelPageReqVO extends PageParam {
     @Schema(description = "模型名称")
     private String modelName;
 
-    @Schema(description = "模型编号")
+    @Schema(description = "标本编号")
     private Integer specimenNumber;
     //额外添加
-    @Schema(description = "模型类型")
+    @Schema(description = "标本类型")
     private String specimenType;
 
     @Schema(description = "模型图片")

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

@@ -17,10 +17,10 @@ public class MuseummodelRespVO {
     @Schema(description = "模型名称")
     private String specimenName;
 
-     @Schema(description = "模型编号")
+     @Schema(description = "标本编号")
     private Integer specimenNumber;
 
-    @Schema(description = "模型类型")
+    @Schema(description = "标本类型")
     private String specimenType;
 
     @Schema(description = "模型图片")

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

@@ -15,10 +15,10 @@ public class MuseummodelSaveVO {
     @Schema(description = "模型名称")
     private String modelName;
     //
-    @Schema(description = "模型编号")
+    @Schema(description = "标本编号")
     private String specimenNumber;
     //
-    @Schema(description = "模型类型")
+    @Schema(description = "标本类型")
     private String specimenType;
     //
     @Schema(description = "模型图片")

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museummodel/MuseummodelDO.java

@@ -30,10 +30,10 @@ public class MuseummodelDO extends BaseDO {
     @Schema(description = "模型名称")
     private String modelName;
 
-    @Schema(description = "模型编号")
+    @Schema(description = "标本编号")
     private String specimenNumber;
 
-    @Schema(description = "模型类型")
+    @Schema(description = "标本类型")
     private String specimenType;
 
     @Schema(description = "模型图片")

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museummodel/MuseummodelDetailDO.java

@@ -1,11 +0,0 @@
-package cn.iocoder.yudao.module.museum.dal.database.museummodel;
-
-import lombok.Data;
-
-
-    @Data
-    public class MuseummodelDetailDO extends MuseummodelDO{
-
-        private String deptName;
-
-}

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

@@ -1,19 +1,18 @@
 package cn.iocoder.yudao.module.museum.dal.mysql.museummodel;
 
-import ch.qos.logback.core.status.Status;
 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;
 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 MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
 
@@ -26,6 +25,12 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
     @Select("SELECT * FROM museum_specimen_model WHERE id = #{id} AND deleted =0 ")
     MuseummodelDO selectMuseumModelById(@Param("id") Integer id);
 
+    /**
+     * 查询标本编号
+     */
+    @Select("SELECT * FROM museum_specimen_model WHERE specimen_number =#{specimenNumber} AND deleted =0")
+    List<MuseummodelDO> getMuseumModelBySpecimenNumber(@Param("specimenNumber") String sampleId);
+
     //分页查询
     default PageResult<MuseummodelDO> getMuseumModelPage(MuseummodelPageReqVO reqVO) {
         MPJLambdaWrapper<MuseummodelDO> mpjLambdaWrapper = new MPJLambdaWrapper<>();

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

@@ -3,10 +3,13 @@ package cn.iocoder.yudao.module.museum.service.museummodel;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelSaveVO;
+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.controller.admin.museummodel.vo.MuseummodelPageReqVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public interface MuseummodelService {
    /**
@@ -30,6 +33,11 @@ public interface MuseummodelService {
     * */
    MuseummodelDO selectMuseumModel(Integer id);
 
+   /**
+    * 查询标本编号
+    * */
+   List<MuseummodelDO> getMuseumModelBySpecimenNumber(String specimenNumber);
+
    /**
     * 获得分页
     *

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

@@ -3,12 +3,14 @@ package cn.iocoder.yudao.module.museum.service.museummodel;
 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.museummodel.vo.MuseummodelSaveVO;
+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.mysql.museummodel.MuseummodelMapper;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Set;
 
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.singleton;
@@ -46,6 +48,14 @@ public  class MuseummodelServiceImpl implements MuseummodelService {
       return museumModelMapper.getMuseumModelPage(pageReqVO);
    }
 
+   /**
+    * 查询标本编号
+    */
+   @Override
+   public List<MuseummodelDO> getMuseumModelBySpecimenNumber (String specimenNumber) {
+      return museumModelMapper.getMuseumModelBySpecimenNumber(specimenNumber);
+   }
+
 //     @Override
 //      public  PageResult<MuseummodelDO> getPage (MuseummodelPageReqVO pageReqVO){
 //