From 088382cacc16cb01003effd722d09249529bb1dd Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Wed, 7 Jan 2026 10:38:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E9=A5=B2=E5=85=BB=E9=97=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxhq/business/controller/PublicController.java | 43 +++++++++++++++++++--- .../com/hxhq/business/domain/AnimalSpecies.java | 39 ++++++++++++++++++++ .../hxhq/business/mapper/AnimalSpeciesMapper.java | 16 ++++++++ .../business/service/IAnimalSpeciesService.java | 25 +++++++++++++ .../service/impl/AnimalSpeciesServiceImpl.java | 36 ++++++++++++++++++ .../mapper/business/AnimalSpeciesMapper.xml | 6 +++ 6 files changed, 159 insertions(+), 6 deletions(-) create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/AnimalSpecies.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/AnimalSpeciesMapper.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IAnimalSpeciesService.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/AnimalSpeciesServiceImpl.java create mode 100644 hxhq-modules/hxhq-system/src/main/resources/mapper/business/AnimalSpeciesMapper.xml diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java index 58a3da9..b569dd5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java +++ b/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 queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(Room::getSyqy, syqy); + List list = roomService.list(queryWrapper); + return success(list); + } else { + List list = roomService.list(); + return success(list); + } + } + + /** + * 动物种属-笼具列表 + * @return + */ + @GetMapping("/animalSpeciesList") + public AjaxResult getAnimalSpeciesList() { + List list = animalSpeciesService.list(); + return success(list); + } + /** * 查询模板列表 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/AnimalSpecies.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/AnimalSpecies.java new file mode 100644 index 0000000..fcc0de9 --- /dev/null +++ b/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; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/AnimalSpeciesMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/AnimalSpeciesMapper.java new file mode 100644 index 0000000..aef4284 --- /dev/null +++ b/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 +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IAnimalSpeciesService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IAnimalSpeciesService.java new file mode 100644 index 0000000..ffd8c48 --- /dev/null +++ b/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 +{ + /** + * 查询动物种属-笼具列表 + * + * @param animalSpecies 动物种属-笼具 + * @return 动物种属-笼具集合 + */ + public List queryList(AnimalSpecies animalSpecies); + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/AnimalSpeciesServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/AnimalSpeciesServiceImpl.java new file mode 100644 index 0000000..2c8d5fe --- /dev/null +++ b/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 implements IAnimalSpeciesService +{ + /** + * 查询动物种属-笼具列表 + * + * @param animalSpecies 动物种属-笼具 + * @return 动物种属-笼具集合 + */ + @Override + public List queryList(AnimalSpecies animalSpecies) { + QueryWrapper queryWrapper = Wrappers.query(); + return this.list(queryWrapper); + } +} diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/AnimalSpeciesMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/AnimalSpeciesMapper.xml new file mode 100644 index 0000000..7fed23d --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/AnimalSpeciesMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file