更新了标本类型的计数，标本出入库状态的计数，标本来源计数

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

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -92,27 +94,80 @@ public class MuseumInfoController {
 //    Map<> 键值对
     @GetMapping("/sampleTypeCount")
     @Operation(summary = "标本类型计数")
-    public CommonResult<Map<MuseumInfoRespVO,Integer>> getMap(@RequestParam("sampleType") Integer sampleType){
-          Map<MuseumInfoRespVO,Integer> result =museumInfoService.MuseumInfoBySampleType(sampleType);
-//          标本类型：矿石-1 岩石-2 矿物-3 陨石-4
-//          Integer Type = sampleType;
-//          result.put(Type);
-//        "标本类型:"
-          return CommonResult.success(result);
+    public CommonResult<HashMap<Integer,Integer>> getMap(@RequestParam("sampleType") Integer sampleType) {
+        Integer result = museumInfoService.MuseumInfoBySampleType(sampleType);
+//          标本类型：矿石-1 岩石-2 矿物-3 陨石-4>
+        HashMap<Integer, Integer> Sites = new HashMap<Integer, Integer>();
+        Integer Type = sampleType;
+        Sites.put(Type, result);
+        return CommonResult.success(Sites);
+
     }
+//        1(初版)
+//    public CommonResult<Map<String,Integer>> getMap(@RequestParam("sampleType") Integer sampleType){
+//        Map<String,Integer> result =museumInfoService.MuseumInfoBySampleType(sampleType);
+//        Integer Type = sampleType;
+//         result.put("标本类型:",Type);
+//        return CommonResult.success(result);
+
+
+//    2
+//    @GetMapping("/sampleTypeCount")
+//    @Operation(summary = "标本类型计数")
+//    public CommonResult<HashMap<Integer,List<Integer>>> getMap(@RequestParam("sampleType") Integer sampleType){
+//    List<Integer> result =museumInfoService.MuseumInfoBySampleType(sampleType);
+//    HashMap<Integer,List<Integer>> Sites = new HashMap<Integer,List<Integer>>();
+//        Sites.put(1,result);
+//        Sites.put(2,result);
+//        Sites.put(3,result);
+//        Sites.put(4,result);
+//    return CommonResult.success(Sites);
+//
+//}
+//    3
+//@GetMapping("/sampleTypeCount")
+//@Operation(summary = "标本类型计数")
+//public CommonResult<HashMap<Integer,Integer>> getMap(@RequestParam("sampleType") Integer sampleType) {
+//    Integer result = museumInfoService.MuseumInfoBySampleType(sampleType);
+////          标本类型：矿石-1 岩石-2 矿物-3 陨石-4>
+//    HashMap<Integer, Integer> Sites = new HashMap<Integer, Integer>();
+//    Integer Type = sampleType;
+//    Sites.put(Type, result);
+//    return CommonResult.success(Sites);
+
+
+
 
     @GetMapping("/saveCount")
     @Operation(summary = "标本出入库状态计数")
-    public CommonResult<Map<String,Integer>> getSave(@RequestParam("save") Integer save){
-        Map<String,Integer> result =museumInfoService.MuseumInfoBySave(save);
+    public CommonResult<HashMap<Integer,Integer>> getSave(@RequestParam("save") Integer save){
+        Integer result1 =museumInfoService.MuseumInfoBySave(save);
 //        状态：在库-1 出库-0
+        HashMap<Integer, Integer> result2 = new HashMap<Integer, Integer>();
         Integer Condition = save;
-        result.put("状态",Condition);
-        return CommonResult.success(result);
+        result2.put(Condition,result1);
+        return CommonResult.success(result2);
+    }
+
+    @GetMapping("/originCount")
+    @Operation(summary = "标本来源计数")
+    public CommonResult<HashMap<Integer,Integer>> getOrigin(@RequestParam("origin") Integer origin){
+        Integer result1 =museumInfoService.MuseumInfoByOrigin(origin);
+//        来源：采购-1 捐赠-2 采集-3
+        HashMap<Integer, Integer> result2 = new HashMap<Integer, Integer>();
+        Integer Origin = origin;
+//        LocalDateTime SampleSaveTime = sampleSaveTime;
+        result2.put(Origin, result1);
+
+        return CommonResult.success(result2);
     }
 
 
 
+
+
+
+
 //   public CommonResult<MuseumTextRespVO> getdo(@RequestParam("id") Integer id){
 //          MuseumTextRespVO DO =new MuseumTextRespVO();
 ////          Integer Ynmber =  selectMuseumInfoBySampleType(1)

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

@@ -67,7 +67,7 @@ public class MuseumInfoRespVO {
     private Integer save;
 
     @Schema(description = "入馆时间")
-    private String saveTime;
+    private LocalDateTime sampleSaveTime;
 
     @Schema(description = "用途")
     private String Use;

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

@@ -64,7 +64,7 @@ public class MuseumInfoSaveVO {
     private Integer save;
 
     @Schema(description = "入馆时间")
-    private String saveTime;
+    private LocalDateTime sampleSaveTime;
 
     @Schema(description = "用途")
     private String Use;

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

@@ -75,13 +75,13 @@ public class MuseummodelController {
 //    }
 
 
-@GetMapping("/page")
-@Operation(summary = "获得模型分页")
-@PreAuthorize("@ss.hasPermission('system:tenant:query')")
-public CommonResult<PageResult<MuseummodelRespVO>> getPage(@Valid MuseummodelPageReqVO pageVO) {
-    PageResult<MuseummodelDO> pageResult = museumModelService.getMuseummodelPage(pageVO);
-    return success(BeanUtils.toBean(pageResult,MuseummodelRespVO.class));
-}
+//@GetMapping("/page")
+//@Operation(summary = "获得模型分页")
+//@PreAuthorize("@ss.hasPermission('system:tenant:query')")
+//public CommonResult<PageResult<MuseummodelRespVO>> getPage(@Valid MuseummodelPageReqVO pageVO) {
+//    PageResult<MuseummodelDO> pageResult = museumModelService.getMuseummodelPage(pageVO);
+//    return success(BeanUtils.toBean(pageResult,MuseummodelRespVO.class));
+//}
 
 }
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumpicture/PictureGroupController.java

@@ -1,66 +0,0 @@
-package cn.iocoder.yudao.module.museum.controller.admin.museumpicture;
-
-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.museumpicture.vo.PictureGroupRespVO;
-import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PictureGroupSaveVO;
-import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PicturePageReqVO;
-import cn.iocoder.yudao.module.museum.dal.database.museumpicture.PictureGroupDO;
-import cn.iocoder.yudao.module.museum.service.museumpicture.PictureGroupService;
-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 static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "博物馆-图片组")
-@RestController
-@RequestMapping("/museum/pictureGroup")
-@Validated
-
-public class PictureGroupController {
-
-    @Resource
-    private PictureGroupService PictureGroupService;
-
-    @PostMapping("/create")
-    @Operation(summary = "新增图片组")
-    public Integer createPictureGroup(@RequestBody PictureGroupSaveVO saveVO){
-        return PictureGroupService.createPictureGroup(saveVO);
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新图片组")
-    public CommonResult<Boolean> updatePictureGroup(@RequestBody PictureGroupSaveVO saveVO) {
-        PictureGroupService.updatePictureGroup(saveVO);
-        return CommonResult.success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除标本")
-    public CommonResult<Boolean> deletePictureGroup(@RequestParam("id") Integer id){
-        PictureGroupService.deletePictureGroup(id);
-        return CommonResult.success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "查找图片组")
-    public CommonResult<PictureGroupRespVO> getPictureGroup(@RequestParam("id") Integer id) {
-        PictureGroupDO result = PictureGroupService.selectPictureGroup(id);
-        PictureGroupRespVO result1 = BeanUtils.toBean(result, PictureGroupRespVO.class);
-        return CommonResult.success(result1);
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得照片组分页")
-    @PreAuthorize("@ss.hasPermission('system:tenant:query')")
-    public CommonResult<PageResult<PictureGroupRespVO>> getPictureGroupPage(@Validated PicturePageReqVO pageVO) {
-        PageResult<PictureGroupDO> pageResult = PictureGroupService.getPictureGroupPage(pageVO);
-        return success(BeanUtils.toBean(pageResult, PictureGroupRespVO.class));
-    }
-}

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

@@ -96,7 +96,7 @@ public class MuseumInfoDO extends BaseDO {
     /**
      * 入藏时间
      */
-    private String saveTime;
+    private LocalDateTime sampleSaveTime;
     /**
      * 用途
      */

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

@@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -44,15 +45,21 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
     @Select("SELECT * FROM museum_info WHERE sample_type  =#{sampleType} AND deleted =0")
     List<MuseumInfoDO> selectMuseumInfoListBySampleType(@Param("sampleType") Integer sampleType);
     /**
-     * 标本类型计数
+     * 标本类型计数1
      * */
     @Select("SELECT COUNT(*)  FROM museum_info WHERE sample_type =#{sampleType} AND deleted =0 AND save =1")
-    Map<MuseumInfoRespVO,Integer> countMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
+    Integer countMuseumInfoBySampleType1(@Param("sampleType") Integer sampleType);
     /**
      * 标本出入库状态计数
      * */
     @Select("SELECT COUNT(*)  FROM museum_info  WHERE save =#{save} AND deleted =0")
-    Map<String,Integer> countMuseumInfoBySave(@Param("save") Integer save);
+    Integer countMuseumInfoBySave(@Param("save") Integer save);
+    /**
+     * 标本来源计数（年）
+     * */
+    @Select("SELECT COUNT(*)  FROM museum_info  WHERE origin =#{origin} AND deleted =0 AND sample_save_time >=2024-02-09 22:07:31")
+    Integer countMuseumInfoByOrigin (@Param("origin") Integer origin);
+
 
     default PageResult<MuseumInfoDO> selectPage(MuseumInfoPageReqVO pageReqVO) {
         LambdaQueryWrapperX<MuseumInfoDO> queryWrapper = new LambdaQueryWrapperX<>();

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

@@ -26,33 +26,33 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
     MuseummodelDO selectMuseumModelById(@Param("id") Integer id);
 
     //分页查询
-    default PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<MuseummodelDO>()
-                .likeIfPresent(MuseummodelDO::getSpecimenName, reqVO.getSpecimenName())// 如果 SpecimenName 不为空，则进行 like 查询
-                .likeIfPresent(MuseummodelDO::getSpecimenType, reqVO.getSpecimenType())
-                .likeIfPresent(MuseummodelDO::getModelWay, reqVO.getModelWay())
-                .likeIfPresent(MuseummodelDO::getRemark, reqVO.getRemark())
-                .eqIfPresent(MuseummodelDO::getSpecimenNumber, reqVO.getSpecimenNumber()) // 如果 SpecimenNumber 不为空，则进行 = 查询
-                .betweenIfPresent(MuseummodelDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) // 如果 create 不为空，则进行 between 查询
-                .orderByDesc(MuseummodelDO::getId)); // 按照 id 倒序
+//    default PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO reqVO) {
+//        return selectPage(reqVO, new LambdaQueryWrapperX<MuseummodelDO>()
+//                .likeIfPresent(MuseummodelDO::getSpecimenName, reqVO.getSpecimenName())// 如果 SpecimenName 不为空，则进行 like 查询
+//                .likeIfPresent(MuseummodelDO::getSpecimenType, reqVO.getSpecimenType())
+//                .likeIfPresent(MuseummodelDO::getModelWay, reqVO.getModelWay())
+//                .likeIfPresent(MuseummodelDO::getRemark, reqVO.getRemark())
+//                .eqIfPresent(MuseummodelDO::getSpecimenNumber, reqVO.getSpecimenNumber()) // 如果 SpecimenNumber 不为空，则进行 = 查询
+//                .betweenIfPresent(MuseummodelDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) // 如果 create 不为空，则进行 between 查询
+//                .orderByDesc(MuseummodelDO::getId)); // 按照 id 倒序
     }
 
     //联表查询
-    default list<MuseummodelDetailDO> selectListByStatusAndDeptName(Integer status, String deptName) {
-        return SelectJoinList(MuseummodelDO.class, new MPJLambdaWrapper<MuseummodelDO>()
-                .selectAll(MuseummodelDO.class)// 查询 List
-                .selectAs(DeptDO::getName, MuseummodelDetailDO::getDeptName)// 查询 system 表的 all 所有字段
-                .eq(MuseummodelDO::getSpecimenNumber,Number)// 查询  表的 name 字段，使用  字段“部分”返回
-                .leftJoin(DeptDO.class, DeptDO::getId, MuseummodelDO::getId)// 联表 WHERE system_users.dept_id = system_dept.id
-                .eq(DeptDO.getName, deptName) // WHERE system_dept.name = ? 【用户状态为开启】
-        );
+//    default list<MuseummodelDetailDO> selectListByStatusAndDeptName(Integer status, String deptName) {
+//        return SelectJoinList(MuseummodelDO.class, new MPJLambdaWrapper<MuseummodelDO>()
+//                .selectAll(MuseummodelDO.class)// 查询 List
+//                .selectAs(DeptDO::getName, MuseummodelDetailDO::getDeptName)// 查询 system 表的 all 所有字段
+//                .eq(MuseummodelDO::getSpecimenNumber,Number)// 查询  表的 name 字段，使用  字段“部分”返回
+//                .leftJoin(DeptDO.class, DeptDO::getId, MuseummodelDO::getId)// 联表 WHERE system_users.dept_id = system_dept.id
+//                .eq(DeptDO.getName, deptName) // WHERE system_dept.name = ? 【用户状态为开启】
+//        );
 
       /*   PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO pageReqVO);
    }
    */
 
-    }
-}
+//    }
+//}
 
 
 

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

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -50,9 +51,13 @@ public interface MuseumInfoService {
    /**
     * 标本类型计数
     * */
-   Map<MuseumInfoRespVO,Integer> MuseumInfoBySampleType(Integer sampleType);
+   Integer MuseumInfoBySampleType(Integer sampleType);
    /**
     * 标本出入库状态计数
     * */
-   Map<String,Integer> MuseumInfoBySave(Integer save);
+   Integer MuseumInfoBySave(Integer save);
+   /**
+    * 标本来源计数（年）
+    * */
+   Integer MuseumInfoByOrigin(Integer origin);
 }

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

@@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.museum.dal.mysql.museuminfo.MuseumInfoMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -83,16 +84,23 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
     * 标本类型计数
     * */
    @Override
-   public Map<MuseumInfoRespVO,Integer> MuseumInfoBySampleType(Integer sampleType){
-      return museumInfoMapper.countMuseumInfoBySampleType(sampleType);
+   public Integer MuseumInfoBySampleType(Integer sampleType){
+      return museumInfoMapper.countMuseumInfoBySampleType1(sampleType);
    }
    /**
     * 标本出入库状态计数
     * */
    @Override
-   public Map<String,Integer> MuseumInfoBySave(Integer save) {
+   public Integer MuseumInfoBySave(Integer save) {
       return museumInfoMapper.countMuseumInfoBySave(save);
    }
+   /**
+    * 标本来源计数（年）
+    * */
+   @Override
+   public Integer MuseumInfoByOrigin(Integer origin) {
+      return museumInfoMapper.countMuseumInfoByOrigin(origin);
+   }
 }
 
 

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

@@ -36,7 +36,7 @@ public interface MuseummodelService {
     * @param pageReqVO 分页查询
     * @return 分页
     */
-   PageResult<MuseummodelDO> getMuseummodelPage(MuseummodelPageReqVO pageReqVO);
+//   PageResult<MuseummodelDO> getMuseummodelPage(MuseummodelPageReqVO pageReqVO);
 
 
 }

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

@@ -41,10 +41,10 @@ public  class MuseummodelServiceImpl implements MuseummodelService {
       return museumModelMapper.selectMuseumModelById(id);
    }
 
-   @Override
-   public PageResult<MuseummodelDO> getMuseummodelPage(MuseummodelPageReqVO pageReqVO) {
-      return museumModelMapper.selectPage(pageReqVO);
-   }
+//   @Override
+//   public PageResult<MuseummodelDO> getMuseummodelPage(MuseummodelPageReqVO pageReqVO) {
+//      return museumModelMapper.selectPage(pageReqVO);
+//   }
 
 
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumpicture/PictureGroupService.java

@@ -25,5 +25,5 @@ public interface PictureGroupService {
      * */
     PictureGroupDO selectPictureGroup(Integer id);
 
-    PageResult<PictureGroupDO> getPictureGroupPage(PicturePageReqVO pageVO);
+//    PageResult<PictureGroupDO> getPictureGroupPage(PicturePageReqVO pageVO);
 }