|
@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.validation.Valid;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -87,11 +88,16 @@ public class MuseumModelController {
|
|
|
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));
|
|
|
+
|
|
|
+ Map<Integer, MuseummodelRespVO> map = new HashMap<>();
|
|
|
+ for (MuseummodelRespVO vo : respVOs) {
|
|
|
+ map.put(vo.getId(), vo);
|
|
|
+ }
|
|
|
+
|
|
|
return CommonResult.success(map);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
@GetMapping("/page")
|
|
|
@Operation(summary = "获得模型分页")
|
|
|
@PreAuthorize("@ss.hasPermission('system:tenant:query')")
|