Merge remote-tracking branch 'origin/master'

# 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/pom.xml

@@ -46,6 +46,12 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-test</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel-core</artifactId>
+            <version>4.0.3</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -1,17 +1,25 @@
 package cn.iocoder.yudao.module.museum.controller.admin.museuminfo;
 
+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.MuseumInfoPageReqVO;
 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.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "博物馆-标本库")
 @RestController
@@ -22,32 +30,116 @@ public class MuseumInfoController {
     @Resource
     private MuseumInfoService museumInfoService;
 
+    //TODO 判断标本编号是否重复
     @PostMapping("/create")
     @Operation(summary = "新增标本")
-    public Integer createMuseumInfo(@RequestBody MuseumInfoSaveVO saveVO){
-        return museumInfoService.createMuseumInfo(saveVO);
+    public CommonResult<Integer> createMuseumInfo(@RequestBody MuseumInfoSaveVO saveVO) {
+        String sampleId = saveVO.getSampleId();
+        MuseumInfoDO result = museumInfoService.getMuseumInfoBySampleId(sampleId);
+        if (result != null) {
+            return CommonResult.error(1, "标本编号已存在");
+        } else {
+            return CommonResult.success(museumInfoService.createMuseumInfo(saveVO));
+        }
     }
 
-    @PutMapping("/update")
     @Operation(summary = "更新标本")
     public CommonResult<Boolean> updateMuseumInfo(@RequestBody MuseumInfoSaveVO saveVO){
-         museumInfoService.updateMuseumInfo(saveVO);
-         return CommonResult.success(true);
+        museumInfoService.updateMuseumInfo(saveVO);
+        return CommonResult.success(true);
+//         saveVO.setSampleType(1);
+
     }
 
+    //TODO 需要提供原因，调用更新方法
     @DeleteMapping("/delete")
     @Operation(summary = "删除标本")
     public CommonResult<Boolean> deleteMuseumInfo(@RequestParam("id") Integer id){
         museumInfoService.deleteMuseumInfo(id);
         return CommonResult.success(true);
     }
+    //    @DeleteMapping("/delete")
+//    @Operation(summary = "删除")
+//    public CommonResult<Boolean> deleteMuseumText(@RequestParam("id") Integer id ){
+//        MuseumTextSaveVO saveVO =new MuseumTextSaveVO();
+////        saveVO.setId();
+////        saveVO.set()
+////        museumTextService.updateMuseumText(saveVO);
+//
+//        museumTextService.deleteMuseumText(id);
+//        return CommonResult.success(true);
+
 
     @GetMapping("/get")
     @Operation(summary = "查找标本")
-    public CommonResult<MuseumInfoRespVO> getMuseumInfo(@RequestParam("id") Integer id){
+    public CommonResult<MuseumInfoRespVO> selectMuseumInfo(@RequestParam("id") Integer id){
         MuseumInfoDO result = museumInfoService.selectMuseumInfo(id);
         MuseumInfoRespVO result1 = BeanUtils.toBean(result,MuseumInfoRespVO.class);
       return CommonResult.success(result1);
     }
 
+    @GetMapping("/selectMuseumInfoList")
+    @Operation(summary = "查询SampleTypeList")
+    public CommonResult<List<MuseumInfoDO>> getMuseumInfoList(@RequestParam("sampleType") Integer sampleType){
+        List<MuseumInfoDO> result = museumInfoService.selectMuseumInfoListBySampleType(sampleType);
+        return CommonResult.success(result);
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获取分页")
+    @PreAuthorize("@ss.hasPermission('museum:museuminfo:query')")
+    public CommonResult<PageResult<MuseumInfoRespVO>> getMuseumInfoPage(@Valid MuseumInfoPageReqVO pageVO){
+        PageResult<MuseumInfoDO> pageResult = museumInfoService.getMuseumInfoPage(pageVO);
+        return success(BeanUtils.toBean(pageResult, MuseumInfoRespVO.class));
+    }
+
+
+
+
+
+
+//    @GetMapping("/get")
+//    @Operation(summary = "list数组")
+//   public CommonResult<MuseumInfoRespVO> getdo(@RequestParam("sampleType") Integer sampleType){
+//          MuseumInfoRespVO list =new MuseumInfoRespVO();
+//          Integer Ynmber =  selectMuseumInfoBySampleType(1)
+//          Integer  hs =  selectMuseumInfoBySampleType(2)
+
+//          DO.setYnmber(Ynmber);
+
+
+//    public CommonResult<MuseumInfoRespVO> getMuseumInfo(@RequestParam("sampleId") String sampleId){
+//
+//    }
+
+
+    //@GetMapping("/get")
+//    @Operation(summary = "查询")
+//    public CommonResult<List<MuseumTextRespVO>> getMuseumText(@RequestParam("id") Integer id){
+//
+//    }
+
+//    1.
+    //TODO LIST Map
+//    TODO     1.2.3.代表哪种标本类型
+//            返回某种标本类型的List数组
+//            Integer
+//    Map<> 键值对
+
+//    public CommonResult<Map<String,Integer>> getMap(@RequestParam("id") Integer id){
+//          Map<String,Integer> result =new HashMap<>();
+//          Integer Ynmber = null;
+//          result.put("陨石数量",Ynmber);
+//          return CommonResult.success(result);
+//    }
+
+//   public CommonResult<MuseumTextRespVO> getdo(@RequestParam("id") Integer id){
+//          MuseumTextRespVO DO =new MuseumTextRespVO();
+////          Integer Ynmber =  selectMuseumInfoBySampleType(1)
+////          Integer  hs =  selectMuseumInfoBySampleType(2)
+////          DO.setYnumber(Ynmber);
+//   }
+
+
+
 }

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

@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.MuseumInfoController;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "博物馆-标本信息-分页 pageReq VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MuseumInfoPageReqVO extends PageParam {
+    private Integer id;
+
+    @Schema(description = "标本编号")
+    private String sampleId;
+
+    private Integer sampleType;
+
+    private String place;
+    
+}
+

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

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -7,8 +8,10 @@ import java.time.LocalDateTime;
 
 @Schema(description = "博物馆-标本信息 Resp VO")
 @Data
+@ExcelIgnoreUnannotated
 public class MuseumInfoRespVO {
 
+    //    private Integer Ynumber;
     private Integer id;
 
     @Schema(description = "标本编号")
@@ -26,11 +29,13 @@ public class MuseumInfoRespVO {
 
     private Integer keepType;
 
+    private String element;
+
     private String  local;
 
     private LocalDateTime bronTime ;
 
-    private String bronPlace;
+    private String stratum;
 
     private LocalDateTime findTime;
 
@@ -42,13 +47,19 @@ public class MuseumInfoRespVO {
 
     private String offerMan;
 
-    private String charater;
+    private String character;
+
+//    private Integer condition;
 
-    private Integer condition;
+//    private String joinTime;
 
-    private String joinTime;
+//    private String useWay;
 
-    private String useWay;
+//    private String moneyId;
 
-    private String tip;
+//    private String deleteReason;
+//
+//    private String samplePicture;
+//
+//    private String tip;
 }

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

@@ -26,11 +26,13 @@ public class MuseumInfoSaveVO {
 
     private Integer keepType;
 
+    private String element;
+
     private String  local;
 
     private LocalDateTime bronTime ;
 
-    private String bronPlace;
+    private String stratum;
 
     private LocalDateTime findTime;
 
@@ -42,13 +44,19 @@ public class MuseumInfoSaveVO {
 
     private String offerMan;
 
-    private String charater;
-
-    private Integer condition;
-
-    private String joinTime;
-
-    private String useWay;
-
-    private String tip;
+    private String character;
+
+//    private Integer condition;
+//
+//    private String joinTime;
+//
+//    private String useWay;
+//
+//    private String moneyId;
+//
+//    private String deleteReason;
+//
+//    private String samplePicture;
+//
+//    private String tip;
 }

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/museuminfo/MuseumInfoDO.java

@@ -20,47 +20,106 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 public class MuseumInfoDO extends BaseDO {
 
+    /**
+     * 标本ID
+     */
     @TableId
-    private Integer id;
-
+    private Long id;
+    /**
+     * 标本编号
+     */
     private String sampleId;
-
+    /**
+     * 标本类型
+     */
     private Integer sampleType;
-
+    /**
+     * 存放位置
+     */
     private String place;
-
+    /**
+     * 中文名称
+     */
     private String chineseName;
-
+    /**
+     * 英文名称
+     */
     private String englishName;
-
+    /**
+     * 国际名称
+     */
     private String internationName;
-
+    /**
+     * 保存类型
+     */
     private Integer keepType;
-
+    /**
+     * 成份
+     */
+    private String element;
+    /**
+     * 产地
+     */
     private String  local;
-
+    /**
+     * 时代
+     */
     private LocalDateTime bronTime ;
-
-    private String bronPlace;
-
+    /**
+     * 保存地层
+     */
+    private String stratum;
+    /**
+     * 发现时间
+     */
     private LocalDateTime findTime;
-
+    /**
+     * 尺寸
+     */
     private String size;
-
+    /**
+     * 重量
+     */
     private Long weight;
-
+    /**
+     * 来源
+     */
     private String origin;
-
+    /**
+     * 标本提供者
+     */
     private String offerMan;
-
-    private String charater;
-
-    private Integer condition;
-
-    private String joinTime;
-
-    private String useWay;
-
-    private String tip;
+    /**
+     * 描述
+     */
+    private String character;
+    /**
+     * 馆藏状态
+     */
+//    private Integer condition;
+//    /**
+//     * 入藏时间
+//     */
+//    private String joinTime;
+//    /**
+//     * 用途
+//     */
+//    private String useWay;
+//    /**
+//     * 资产号
+//     */
+//    private String moneyId;
+//    /**
+//     * 删除原因
+//     */
+//    private String deleteReason;
+//    /**
+//     * 标本图片
+//     */
+//    private String samplePicture;
+//    /**
+//     * 备注
+//     */
+//    private String tip;
 
 }

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/museuminfo/MuseumInfoMapper.java

@@ -1,22 +1,61 @@
 package cn.iocoder.yudao.module.museum.dal.mysql.museuminfo;
 
+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.museuminfo.vo.MuseumInfoPageReqVO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import org.apache.ibatis.annotations.Mapper;
+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 MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
 
-    @Update("UPDATE museum_info SET sample_type=#{sampleType}, place=#{place} WHERE id =#{id}")
+    @Update("UPDATE museum_info SET sample_type=#{sampleType}, place=#{place},chinese_name=#{chineseName} WHERE id =#{id}")
     void updateMuseumInfo(MuseumInfoDO museumInfoDO);
 
     @Update("UPDATE museum_info SET deleted=1  WHERE id =#{id}")
     void deleteMuseumInfo(Integer id);
 
-    @Select("SELECT * FROM museum_info WHERE id = #{id} AND deleted =0 ")
+    @Select("SELECT * FROM museum_info WHERE id =#{id} AND deleted =0 ")
     MuseumInfoDO selectMuseumInfoById(@Param("id") Integer id);
 
-}
+    @Select("SELECT * FROM museum_info WHERE sample_id =#{sampleId} ")
+    MuseumInfoDO getMuseumInfoBySampleId(@Param("sampleId") String sampleId);
+
+    @Select("SELECT * FROM museum_info WHERE sample_type  =#{sampleType}")
+    List<MuseumInfoDO> selectMuseumInfoListBySampleType(@Param("sampleType") Integer sampleType);
+
+//    @Select("SELECT COUNT(*)  FROM museum_info WHERE sample_type  =#{sampleType} ")
+//    Integer countMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
+
+
+    default PageResult<MuseumInfoDO> selectPage(MuseumInfoPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<MuseumInfoDO>())
+//                .likeIfPresent(MuseumInfoDO::getSampleId,reqVO.getSampleId())
+//                .eqIfPresent(MuseumInfoDO::getSampleType,reqVO.getSampleType())
+//                .likeIfPresent(MuseumInfoDO::getPlace,reqVO.getPlace())
+//                .orderByDesc(reqVO.getId() != null,MuseumInfoDO::getId));
+                ;}
+
+//    default PageResult<MuseumInfoDO> selectPage1(MuseumInfoPageReqVO reqVO) {
+//        return selectPage(reqVO, new LambdaQueryWrapperX<MuseumInfoDO>()
+//                .likeIfPresent(MuseumInfoDO::getSampleId,reqVO.getSampleId())
+//                .eqIfPresent(MuseumInfoDO::getSampleType,reqVO.getSampleType())
+//                .likeIfPresent(MuseumInfoDO::getPlace,reqVO.getPlace())
+//                .orderByDesc(reqVO.getId() != null,MuseumInfoDO::getId)); // 按照 id 倒序
+//    }
+//
+//    default PageResult<MuseumInfoDO> selectPage2(MuseumInfoPageReqVO reqVO) {
+//        return selectPage(reqVO, new LambdaQueryWrapperX<MuseumInfoDO>()
+//                .likeIfPresent(MuseumInfoDO::getPlace, reqVO.getPlace())
+//        );
+//    }
+
+
+    }

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/museuminfo/MuseumInfoService.java

@@ -1,9 +1,14 @@
 package cn.iocoder.yudao.module.museum.service.museuminfo;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoPageReqVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoSaveVO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public interface MuseumInfoService {
    /**
@@ -20,10 +25,24 @@ public interface MuseumInfoService {
     * 删除标本
     * */
    void deleteMuseumInfo(Integer id);
-
-
    /**
     * 查询标本
     * */
-   MuseumInfoDO selectMuseumInfo(Integer id);
+   MuseumInfoDO selectMuseumInfo (Integer id);
+
+   /**
+    * 查询标本编号
+    * */
+   MuseumInfoDO getMuseumInfoBySampleId(String sampleId);
+   /**
+   * 查询标本类型List
+   * */
+   List<MuseumInfoDO> selectMuseumInfoListBySampleType(Integer sampleType);
+    /**
+    * 分页列表
+    *
+    * @param pageVO 分页条件
+    * @return 分页列表
+    */
+   PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageVO);
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museuminfo/MuseumInfoServiceImpl.java

@@ -1,12 +1,18 @@
 package cn.iocoder.yudao.module.museum.service.museuminfo;
 
+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.MuseumInfoPageReqVO;
 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.dal.mysql.museuminfo.MuseumInfoMapper;
 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;
 
 @Service
 public  class  MuseumInfoServiceImpl implements MuseumInfoService {
@@ -14,25 +20,64 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
    @Resource
    private MuseumInfoMapper museumInfoMapper;
 
+   /**
+    * 新增标本
+    */
    @Override
-   public Integer createMuseumInfo(MuseumInfoSaveVO saveVO){
-     return museumInfoMapper.insert(BeanUtils.toBean(saveVO, MuseumInfoDO.class));
+   public Integer createMuseumInfo(MuseumInfoSaveVO saveVO) {
+      return museumInfoMapper.insert(BeanUtils.toBean(saveVO, MuseumInfoDO.class));//insert(内置)
    }
 
+   /**
+    * 更新标本
+    */
    @Override
-   public void updateMuseumInfo(MuseumInfoSaveVO saveVO){
-      museumInfoMapper.updateMuseumInfo(BeanUtils.toBean(saveVO,MuseumInfoDO.class));
+   public void updateMuseumInfo(MuseumInfoSaveVO saveVO) {
+      museumInfoMapper.updateMuseumInfo(BeanUtils.toBean(saveVO, MuseumInfoDO.class));
    }
 
+   /**
+    * 删除标本
+    */
    @Override
-   public void deleteMuseumInfo(Integer id){
+   public void deleteMuseumInfo(Integer id) {
 //      museumInfoMapper.deleteMuseumInfo(id);
       museumInfoMapper.deleteById(id);
    }
 
+   /**
+    * 查询标本id
+    */
    @Override
-   public MuseumInfoDO selectMuseumInfo(Integer id){
+   public MuseumInfoDO selectMuseumInfo(Integer id) {
       return museumInfoMapper.selectMuseumInfoById(id);
    }
 
+   /**
+    * 查询标本SampleId
+    */
+   @Override
+   public MuseumInfoDO getMuseumInfoBySampleId (String sampleId) {
+      return museumInfoMapper.getMuseumInfoBySampleId(sampleId);
+   }
+   /**
+    * 查询SampleTypeList
+    */
+   @Override
+   public List<MuseumInfoDO> selectMuseumInfoListBySampleType(Integer sampleType){
+      return museumInfoMapper.selectMuseumInfoListBySampleType(sampleType);
+   }
+   /**
+   * 分页列表
+    */
+   @Override
+   public PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO reqVO){
+//      Set<Long> ids = reqVO.getId() != null ?
+//              permissionService.getUserRoleIdListByRoleId(singleton(reqVO.getRoleId())) : null;
+      return museumInfoMapper.selectPage(reqVO);
+   }
+
+
 }
+
+

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);
+   }
+
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -268,7 +268,7 @@ public class AdminUserServiceImpl implements AdminUserService {
     public AdminUserDO getUserByMobile(String mobile) {
         return userMapper.selectByMobile(mobile);
     }
-
+//1
     @Override
     public PageResult<AdminUserDO> getUserPage(UserPageReqVO reqVO) {
         // 如果有角色编号，查询角色对应的用户编号