feat:[试验管理][饲养间]

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java

@@ -1,22 +1,20 @@
 package com.hxhq.business.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hxhq.business.domain.Study;
-import com.hxhq.business.domain.StudyFormPre;
-import com.hxhq.business.domain.Template;
+import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.study.StudyListDto;
 import com.hxhq.business.enums.study.StudyStatusEnum;
 import com.hxhq.business.form.study.StudyFormPreSearchForm;
 import com.hxhq.business.form.study.StudySearchForm;
-import com.hxhq.business.service.IStudyFormPreService;
-import com.hxhq.business.service.IStudyService;
-import com.hxhq.business.service.ITemplateService;
+import com.hxhq.business.service.*;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.web.controller.BaseController;
 import com.hxhq.common.core.web.domain.AjaxResult;
 import com.hxhq.common.core.web.page.TableDataInfo;
 import com.hxhq.common.security.annotation.RequiresPermissions;
+import org.apache.commons.lang3.StringUtils;
 import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -41,6 +39,39 @@ public class PublicController extends BaseController
     @Autowired
     private IStudyFormPreService studyFormPreService;
 
+    @Autowired
+    private IRoomService roomService;
+
+    @Autowired
+    private IAnimalSpeciesService animalSpeciesService;
+
+    /**
+     * 试验区域-饲养间列表
+     * @return
+     */
+    @GetMapping("/roomList")
+    public AjaxResult getRoomList(String syqy) {
+        if(StringUtils.isNotEmpty(syqy)) {
+            LambdaQueryWrapper<Room> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(Room::getSyqy, syqy);
+            List<Room> list = roomService.list(queryWrapper);
+            return success(list);
+        } else {
+            List<Room> list = roomService.list();
+            return success(list);
+        }
+    }
+
+    /**
+     * 动物种属-笼具列表
+     * @return
+     */
+    @GetMapping("/animalSpeciesList")
+    public AjaxResult getAnimalSpeciesList() {
+        List<AnimalSpecies> list = animalSpeciesService.list();
+        return success(list);
+    }
+
     /**
      * 查询模板列表
      */

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/AnimalSpecies.java

@@ -0,0 +1,39 @@
+package com.hxhq.business.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hxhq.common.core.domain.MpBaseEntity;
+
+
+/**
+ * 动物种属-笼具 t_animal_species
+ *
+ * @author hxhq
+ * @date 2025-12-29
+ */
+@TableName("t_animal_species")
+public class AnimalSpecies extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 动物种属 */
+    private String animalSpecies;
+
+    /** 笼具 */
+    private String cage;
+
+    public String getAnimalSpecies() {
+        return animalSpecies;
+    }
+
+    public void setAnimalSpecies(String animalSpecies) {
+        this.animalSpecies = animalSpecies;
+    }
+
+    public String getCage() {
+        return cage;
+    }
+
+    public void setCage(String cage) {
+        this.cage = cage;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/AnimalSpeciesMapper.java

@@ -0,0 +1,16 @@
+package com.hxhq.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hxhq.business.domain.AnimalSpecies;
+import com.hxhq.business.domain.Room;
+
+/**
+ * 动物种属-笼具Mapper接口
+ *
+ * @author hxhq
+ * @date 2025-12-29
+ */
+public interface AnimalSpeciesMapper extends BaseMapper<AnimalSpecies>
+{
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IAnimalSpeciesService.java

@@ -0,0 +1,25 @@
+package com.hxhq.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.domain.AnimalSpecies;
+import com.hxhq.business.domain.Room;
+
+import java.util.List;
+
+/**
+ * 动物种属-笼具Service接口
+ *
+ * @author hxhq
+ * @date 2025-12-29
+ */
+public interface IAnimalSpeciesService extends IService<AnimalSpecies>
+{
+    /**
+     * 查询动物种属-笼具列表
+     *
+     * @param animalSpecies 动物种属-笼具
+     * @return 动物种属-笼具集合
+     */
+    public List<AnimalSpecies> queryList(AnimalSpecies animalSpecies);
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/AnimalSpeciesServiceImpl.java

@@ -0,0 +1,36 @@
+package com.hxhq.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hxhq.business.domain.AnimalSpecies;
+import com.hxhq.business.domain.Room;
+import com.hxhq.business.mapper.AnimalSpeciesMapper;
+import com.hxhq.business.mapper.RoomMapper;
+import com.hxhq.business.service.IAnimalSpeciesService;
+import com.hxhq.business.service.IRoomService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 饲养间Service业务层处理
+ *
+ * @author hxhq
+ * @date 2025-12-29
+ */
+@Service
+public class AnimalSpeciesServiceImpl extends ServiceImpl<AnimalSpeciesMapper, AnimalSpecies> implements IAnimalSpeciesService
+{
+    /**
+     * 查询动物种属-笼具列表
+     *
+     * @param animalSpecies 动物种属-笼具
+     * @return 动物种属-笼具集合
+     */
+    @Override
+    public List<AnimalSpecies> queryList(AnimalSpecies animalSpecies) {
+        QueryWrapper<AnimalSpecies> queryWrapper = Wrappers.query();
+        return this.list(queryWrapper);
+    }
+}

hxhq-modules/hxhq-system/src/main/resources/mapper/business/AnimalSpeciesMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hxhq.business.mapper.AnimalSpeciesMapper">
+</mapper>