Merge remote-tracking branch 'origin/master'

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

@@ -33,8 +33,19 @@ public class MuseummodelController {
 
     @PostMapping("/create")
     @Operation(summary = "新增模型")
-    public Integer createMuseumModel(@RequestBody MuseummodelSaveVO saveVO) {
-        return museumModelService.createMuseumModel(saveVO);
+    public CommonResult<Boolean> createMuseumModel(@RequestBody MuseummodelSaveVO saveVO) {
+        String modelName =saveVO.getModelName();
+        String specimenNumber =saveVO.getSpecimenNumber();
+        String modelWay =saveVO.getModelWay();
+        if (modelName == null) {
+            return  CommonResult.error(200,"模型名称不能为空");
+        } else if (specimenNumber == null){
+            return  CommonResult.error(200,"标本编号不能为空");
+        }else if (modelWay == null){
+            return  CommonResult.error(200,"模型路径不能为空");
+        }else
+            museumModelService.createMuseumModel(saveVO);
+            return CommonResult.success(true);
     }
 
     @PutMapping("/update")

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

@@ -17,13 +17,13 @@ import org.apache.ibatis.annotations.Update;
 @Mapper
 public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
 
-    @Update("UPDATE museum_model SET sample_type=#{sampleType}, place=#{place} WHERE id =#{id}")
+    @Update("UPDATE museum_specimen_model SET model_name=#{modelName} WHERE id =#{id}")
     void updateMuseumModel(MuseummodelDO museumModelDO);
 
-    @Update("UPDATE museum_model SET deleted=1  WHERE id =#{id}")
+    @Update("UPDATE museum_specimen_model SET deleted=1  WHERE id =#{id}")
     void deleteMuseumModel(Integer id);
 
-    @Select("SELECT * FROM museum_model WHERE id = #{id} AND deleted =0 ")
+    @Select("SELECT * FROM museum_specimen_model WHERE id = #{id} AND deleted =0 ")
     MuseummodelDO selectMuseumModelById(@Param("id") Integer id);
 
     //分页查询