1.新增通过标本类型返回所有标本模型

yudao-module-museum/yudao-module-museum-biz/pom.xml

@@ -13,8 +13,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>9</source>
+                    <target>9</target>
                     <compilerArgs>--enable-preview</compilerArgs>
                 </configuration>
             </plugin>
@@ -75,6 +75,18 @@
             <artifactId>commons-io</artifactId>
             <version>2.11.0</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-system-biz</artifactId>
+            <version>2.3.0-jdk8-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-museum-api</artifactId>
+            <version>2.3.0-jdk8-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

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

@@ -21,6 +21,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -73,14 +74,23 @@ public class MuseumModelController {
         return CommonResult.success(result1);
     }
 
-    @GetMapping("/getSampleId")
+    @GetMapping("/getSpecimenNumber")
     @Operation(summary = "标本编号查寻")
-    public CommonResult<List<MuseummodelRespVO>> getMuseumModelList(@RequestParam("sampleId") String specimenNumber){
+    public CommonResult<List<MuseummodelRespVO>> getMuseumModelList(@RequestParam("specimenNumber") String specimenNumber){
         List<MuseummodelDO> result = museumModelService.getMuseumModelBySpecimenNumber(specimenNumber);
         List<MuseummodelRespVO> result1 = BeanUtils.toBean(result,MuseummodelRespVO.class);
         return CommonResult.success(result1);
     }
 
+    @GetMapping("/getBySpecimenType")
+    @Operation(summary = "通过标本类型返回所有标本模型")
+    public CommonResult<Map<Integer, MuseummodelRespVO>> getMuseumModelBySpecimenType(@RequestParam("specimenType") String specimenType) {
+        List<MuseummodelDO> result = museumModelService.getMuseumModelBySpecimenType(specimenType);
+        List<MuseummodelRespVO> respVOs = BeanUtils.toBean(result, MuseummodelRespVO.class);
+        Map<Integer, MuseummodelRespVO> map = respVOs.stream()
+                .collect(Collectors.toMap(MuseummodelRespVO::getId, vo -> vo));
+        return CommonResult.success(map);
+    }
 
     @GetMapping("/page")
     @Operation(summary = "获得模型分页")
@@ -90,6 +100,8 @@ public class MuseumModelController {
     return success(BeanUtils.toBean(pageResult,MuseummodelRespVO.class));
     }
 
+
+
 //1.通过标本编号放回所有的标本模型list
 //2.通过标本类型返回所有标本模型 返回map//
 //3.通过标本编号批量导入模型,前端传标本编号和zip压缩包,包含zip的验证(验证后缀)

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

@@ -38,6 +38,11 @@ public interface MuseummodelService {
     * */
    List<MuseummodelDO> getMuseumModelBySpecimenNumber(String specimenNumber);
 
+   /**
+    * 通过标本类型返回所有标本模型
+    * */
+   List<MuseummodelDO> getMuseumModelBySpecimenType(String specimenType);
+
    /**
     * 获得分页
     *
@@ -47,4 +52,5 @@ public interface MuseummodelService {
    PageResult<MuseummodelDO> getMuseumModelPage(MuseummodelPageReqVO pageReqVO);
 
 
+
 }

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

@@ -56,6 +56,11 @@ public  class MuseummodelServiceImpl implements MuseummodelService {
       return museumModelMapper.getMuseumModelBySpecimenNumber(specimenNumber);
    }
 
+   @Override
+   public List<MuseummodelDO> getMuseumModelBySpecimenType(String specimenType) {
+      return List.of();
+   }
+
 //     @Override
 //      public  PageResult<MuseummodelDO> getPage (MuseummodelPageReqVO pageReqVO){
 //