Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-java

# Conflicts:
#	yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/vo/MuseumInfoRespVO.java
#	yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/vo/MuseumInfoSaveVO.java
#	yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museuminfo/MuseumInfoDO.java
#	yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museuminfo/MuseumInfoMapper.java
#	yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museuminfo/MuseumInfoService.java
#	yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museuminfo/MuseumInfoServiceImpl.java

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/MuseumInfoController.java

@@ -1,53 +0,0 @@
-package cn.iocoder.yudao.module.museum.controller.admin.museuminfo;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-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.museuminfo.vo.MuseumInfoSaveVO;
-import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
-import cn.iocoder.yudao.module.museum.service.museuminfo.MuseumInfoService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-@Tag(name = "博物馆-标本库")
-@RestController
-@RequestMapping("/museum/info")
-@Validated
-public class MuseumInfoController {
-
-    @Resource
-    private MuseumInfoService museumInfoService;
-
-    @PostMapping("/create")
-    @Operation(summary = "新增标本")
-    public Integer createMuseumInfo(@RequestBody MuseumInfoSaveVO saveVO){
-        return museumInfoService.createMuseumInfo(saveVO);
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新标本")
-    public CommonResult<Boolean> updateMuseumInfo(@RequestBody MuseumInfoSaveVO saveVO){
-         museumInfoService.updateMuseumInfo(saveVO);
-         return CommonResult.success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除标本")
-    public CommonResult<Boolean> deleteMuseumInfo(@RequestParam("id") Integer id){
-        museumInfoService.deleteMuseumInfo(id);
-        return CommonResult.success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "查找标本")
-    public CommonResult<MuseumInfoRespVO> getMuseumInfo(@RequestParam("id") Integer id){
-        MuseumInfoDO result = museumInfoService.selectMuseumInfo(id);
-        MuseumInfoRespVO result1 = BeanUtils.toBean(result,MuseumInfoRespVO.class);
-      return CommonResult.success(result1);
-    }
-
-}

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

@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museummodel;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+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.museummodel.MuseummodelDO;
+import cn.iocoder.yudao.module.museum.service.museummodel.MuseummodelService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Tag(name = "博物馆-模型库")
+@RestController
+@RequestMapping("/museum/model")
+@Validated
+public class MuseummodelController {
+
+    @Resource
+    private MuseummodelService museumModelService;
+
+    @PostMapping("/create")
+    @Operation(summary = "新增模型")
+    public Integer createMuseumModel(@RequestBody MuseummodelSaveVO saveVO){
+        return museumModelService.createMuseumModel(saveVO);
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新模型")
+    public CommonResult<Boolean> updateMuseumModel(@RequestBody MuseummodelSaveVO saveVO){
+         museumModelService.updateMuseumModel(saveVO);
+         return CommonResult.success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除模型")
+    public CommonResult<Boolean> deleteMuseumModel(@RequestParam("id") Integer id){
+        museumModelService.deleteMuseumModel(id);
+        return CommonResult.success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "查找模型")
+    public CommonResult<MuseummodelRespVO> getMuseumModel(@RequestParam("id") Integer id){
+        MuseummodelDO result = museumModelService.selectMuseumModel(id);
+        MuseummodelRespVO result1 = BeanUtils.toBean(result, MuseummodelRespVO.class);
+      return CommonResult.success(result1);
+    }
+
+}

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

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "博物馆-模型信息 Resp VO")
+@Data
+public class MuseummodelRespVO {
+
+    private Integer id;
+    @Schema(description = "ID")
+
+    private String specimenName;
+  //  @Schema(description = "标本名称")
+
+    private Integer specimenNumber;
+    //  @Schema(description = "标本编号")
+
+    private Integer specimenId;
+    //  @Schema(description = "标本id")
+
+    private String specimenType;
+    //  @Schema(description = "标本类型（矿物、岩石、矿石、化石、陨石）")
+
+    private String modelPhoto;
+    //  @Schema(description = "模型图片")
+
+    private String modelWay;
+    //  @Schema(description = "模型路径")
+
+    private String remark;
+    //  @Schema(description = "备注")
+
+
+}

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

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "博物馆-模型信息 save VO")
+@Data
+public class MuseummodelSaveVO {
+
+    @Schema(description = "ID")
+    private Integer id;
+
+    private String specimenName;
+    //  @Schema(description = "标本名称")
+
+    private String specimenNumber;
+    //  @Schema(description = "标本编号")
+
+    private Integer specimenId;
+    //  @Schema(description = "标本id")
+
+    private String specimenType;
+    //  @Schema(description = "标本类型（矿物、岩石、矿石、化石、陨石）")
+
+    private String modelPhoto;
+    //  @Schema(description = "模型图片")
+
+    private String modelWay;
+    //  @Schema(description = "模型路径")
+
+    private String remark;
+    //  @Schema(description = "备注")
+}

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

@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.museum.dal.database.museummodel;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * 博物馆的标本库
+ *
+ * @author 芋道源码
+ */
+@TableName(value = "museum_specimen_model", autoResultMap = true)
+// 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class MuseummodelDO extends BaseDO {
+
+    @TableId
+    private Integer id;
+
+    private String specimenName;
+    //  @Schema(description = "标本名称")
+
+    private String specimenNumber;
+    //  @Schema(description = "标本编号")
+
+    private Integer specimenId;
+    //  @Schema(description = "标本id")
+
+    private String specimenType;
+    //  @Schema(description = "标本类型（矿物、岩石、矿石、化石、陨石）")
+
+    private String modelPhoto;
+    //  @Schema(description = "模型图片")
+
+    private String modelWay;
+    //  @Schema(description = "模型路径")
+
+    private String remark;
+    //  @Schema(description = "备注")
+}

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

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.museum.dal.mysql.museummodel;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+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}")
+    void updateMuseumModel(MuseummodelDO museumModelDO);
+
+    @Update("UPDATE museum_model SET deleted=1  WHERE id =#{id}")
+    void deleteMuseumModel(Integer id);
+
+    @Select("SELECT * FROM museum_model WHERE id = #{id} AND deleted =0 ")
+    MuseummodelDO selectMuseumModelById(@Param("id") Integer id);
+
+}

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

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.museum.service.museummodel;
+
+import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelSaveVO;
+import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDO;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface MuseummodelService {
+   /**
+    * 创建标本
+   * */
+   Integer createMuseumModel(MuseummodelSaveVO saveVO);
+
+   /**
+    * 更新标本
+    * */
+   void updateMuseumModel(MuseummodelSaveVO saveVO);
+
+   /**
+    * 删除标本
+    * */
+   void deleteMuseumModel(Integer id);
+
+
+   /**
+    * 查询标本
+    * */
+   MuseummodelDO selectMuseumModel(Integer id);
+}

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

@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.museum.service.museummodel;
+
+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.museummodel.MuseummodelDO;
+import cn.iocoder.yudao.module.museum.dal.mysql.museummodel.MuseummodelMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public  class MuseummodelServiceImpl implements MuseummodelService {
+
+   @Resource
+   private MuseummodelMapper museumModelMapper;
+
+   @Override
+   public Integer createMuseumModel(MuseummodelSaveVO saveVO){
+     return museumModelMapper.insert(BeanUtils.toBean(saveVO, MuseummodelDO.class));
+   }
+
+   @Override
+   public void updateMuseumModel(MuseummodelSaveVO saveVO){
+      museumModelMapper.updateMuseumModel(BeanUtils.toBean(saveVO, MuseummodelDO.class));
+   }
+
+   @Override
+   public void deleteMuseumModel(Integer id){
+//      museumModelMapper.deleteMuseumModel(id);
+      museumModelMapper.deleteById(id);
+   }
+
+   @Override
+   public MuseummodelDO selectMuseumModel(Integer id){
+      return museumModelMapper.selectMuseumModelById(id);
+   }
+
+}