00

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

@@ -1,17 +1,24 @@
 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 static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "博物馆-标本库")
 @RestController
@@ -22,25 +29,45 @@ 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.;
+//        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){
+//         saveVO.setSampleType(1);
          museumInfoService.updateMuseumInfo(saveVO);
          return CommonResult.success(true);
     }
 
+    //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 = "查找标本")
@@ -50,4 +77,42 @@ public class MuseumInfoController {
       return CommonResult.success(result1);
     }
 
+    @GetMapping("/page")
+    @Operation(summary = "获取分页")
+//    @PreAuthorize("@ss.hasPermission('system:user:query')")
+    public CommonResult<MuseumInfoPageReqVO> pageMuseumInfo(@Valid MuseumInfoPageReqVO pageReqVO){
+        PageResult<MuseumInfoDO> pageResult = museumInfoService.getUserPage(pageReqVO);
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return success(new PageResult<>(pageResult.getTotal()));
+        }
+    }
+
+
+    //@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,62 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "博物馆-标本信息-分页 pageReq VO")
+@Data
+public class MuseumInfoPageReqVO {
+    private Integer id;
+
+    @Schema(description = "标本编号")
+    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 stratum;
+
+    private LocalDateTime findTime;
+
+    private String size;
+
+    private Long weight;
+
+    private String origin;
+
+    private String offerMan;
+
+    private String character;
+
+    private String 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/museuminfo/vo/MuseumInfoRespVO.java

@@ -9,6 +9,7 @@ import java.time.LocalDateTime;
 @Data
 public class MuseumInfoRespVO {
 
+    //    private Integer Ynumber;
     private Integer id;
 
     @Schema(description = "标本编号")
@@ -54,5 +55,9 @@ public class MuseumInfoRespVO {
 
     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/museuminfo/vo/MuseumInfoSaveVO.java

@@ -54,5 +54,9 @@ public class MuseumInfoSaveVO {
 
     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/museumtext/MuseumTextController.java

@@ -1,49 +0,0 @@
-package cn.iocoder.yudao.module.museum.controller.admin.museumtext;
-
-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.museumtext.vo.MuseumTextRespVO;
-import cn.iocoder.yudao.module.museum.controller.admin.museumtext.vo.MuseumTextSaveVO;
-import cn.iocoder.yudao.module.museum.dal.database.museumtext.MuseumTextDO;
-import cn.iocoder.yudao.module.museum.service.museumtext.MuseumTextService;
-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/text")
-@Validated
-public class MuseumTextController {
-
-    @Resource
-    private MuseumTextService museumTextService;
-
-    @PostMapping("/create")
-    @Operation(summary = "新增")
-    public Integer createMuseumText(@RequestBody MuseumTextSaveVO saveVO) {
-        return museumTextService.createMuseumText(saveVO);
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新")
-    public CommonResult<Boolean> updateMuseumText(@RequestBody MuseumTextSaveVO saveVO){
-        museumTextService.updateMuseumText(saveVO);
-        return CommonResult.success(true);
-    }
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除")
-    public CommonResult<Boolean> deleteMuseumText(@RequestParam("id") Integer id){
-        museumTextService.deleteMuseumText(id);
-        return CommonResult.success(true);
-    }
-    @GetMapping("/get")
-    @Operation(summary = "查询")
-    public CommonResult<MuseumTextRespVO> getMuseumText(@RequestParam("id") Integer id){
-
-    }
-}
-

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumtext/vo/MuseumTextRespVO.java

@@ -1,17 +0,0 @@
-package cn.iocoder.yudao.module.museum.controller.admin.museumtext.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class MuseumTextRespVO {
-
-    private Integer id;
-
-    private String name;
-
-    private String weight;
-
-}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumtext/vo/MuseumTextSaveVO.java

@@ -1,17 +0,0 @@
-package cn.iocoder.yudao.module.museum.controller.admin.museumtext.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class MuseumTextSaveVO {
-
-    private Integer id;
-
-    private String name;
-
-    private String weight;
-
-}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museuminfo/MuseumInfoDO.java

@@ -109,6 +109,14 @@ public class MuseumInfoDO extends BaseDO {
      * 资产号
      */
     private String moneyId;
+    /**
+     * 删除原因
+     */
+    private String deleteReason;
+    /**
+     * 标本图片
+     */
+    private String samplePicture;
     /**
      * 备注
      */

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museumtext/MuseumTextDO.java

@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.museum.dal.database.museumtext;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-/**
- * 练习1
- *
- * @author 芋道源码
- */
-@TableName(value = "museum_text", autoResultMap = true)
-@Data
-@Builder
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class MuseumTextDO extends BaseDO {
-
-    @TableId
-    private Integer id;
-
-    private String name;
-
-    private String weight;
-
-}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museuminfo/MuseumInfoMapper.java

@@ -7,6 +7,8 @@ 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> {
 
@@ -19,4 +21,10 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
     @Select("SELECT * FROM museum_info WHERE id =#{id} AND deleted =0 ")
     MuseumInfoDO selectMuseumInfoById(@Param("id") Integer id);
 
+//    @Select("SELECT * FROM museum_info WHERE sample_type  =#{sampleType} AND deleted =0 ")
+//    List<MuseumInfoDO> selectMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
+
+        @Select("SELECT COUNT(*)  FROM museum_info WHERE sample_type  =#{sampleType} ")
+        Integer selectMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
+
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museumtext/MuseumTextMapper.java

@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.museum.dal.mysql.museumtext;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.museum.dal.database.museumtext.MuseumTextDO;
-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 MuseumTextMapper extends BaseMapperX<MuseumTextDO>{
-
-    @Update("UPDATE museum_text SET name=#{name},weight=#{weight} WHERE id=#{id}")
-    void updateMuseumText(MuseumTextDO museumDO);
-
-    @Update("UPDATE museum_text SET deleted=1 WHERE id=#{id}")
-    void deleteMuseumText(Integer id);
-}

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

@@ -1,5 +1,7 @@
 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.springframework.stereotype.Service;
@@ -24,4 +26,11 @@ public interface MuseumInfoService {
     * 查询标本
     * */
    MuseumInfoDO selectMuseumInfo(Integer id);
+   /**
+    * 获得用户分页列表
+    *
+    * @param pageReqVO 分页条件
+    * @return 分页列表
+    */
+   PageResult<MuseumInfoDO> getUserPage(MuseumInfoPageReqVO pageReqVO);
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumtext/MuseumTextService.java

@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.museum.service.museumtext;
-
-import cn.iocoder.yudao.module.museum.controller.admin.museumtext.vo.MuseumTextSaveVO;
-import cn.iocoder.yudao.module.museum.dal.database.museumtext.MuseumTextDO;
-import org.springframework.stereotype.Service;
-
-@Service
-public interface MuseumTextService {
-    /**
-     * 创建标本
-     * */
-    Integer createMuseumText(MuseumTextSaveVO saveVO);
-
-    /**
-     * 更新标本
-     * */
-    void updateMuseumText(MuseumTextSaveVO saveVO);
-    /**
-     * 删除标本
-     * */
-    void deleteMuseumText(Integer id);
-}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumtext/MuseumTextServiceImpl.java

@@ -1,38 +0,0 @@
-package cn.iocoder.yudao.module.museum.service.museumtext;
-
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.museum.controller.admin.museumtext.vo.MuseumTextSaveVO;
-import cn.iocoder.yudao.module.museum.dal.database.museumtext.MuseumTextDO;
-import cn.iocoder.yudao.module.museum.dal.mysql.museumtext.MuseumTextMapper;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service
-public class MuseumTextServiceImpl implements MuseumTextService {
-
-    @Resource
-    private MuseumTextMapper museumTextMapper;
-    /**
-     *新增标本
-     */
-    @Override
-    public Integer createMuseumText(MuseumTextSaveVO saveVO){
-        return museumTextMapper.insert(BeanUtils.toBean(saveVO,MuseumTextDO.class));
-    }
-    /**
-     *更新标本
-     */
-    @Override
-    public void updateMuseumText(MuseumTextSaveVO saveVO){
-        museumTextMapper.updateMuseumText(BeanUtils.toBean(saveVO,MuseumTextDO.class));
-    }
-    /**
-     * 删除标本
-     * */
-    @Override
-    public void deleteMuseumText(Integer id){
-//        museumTextMapper.deleteMuseumText(id);
-        museumTextMapper.deleteById(id);
-    }
-}