From 4a583f8a7f3603912d0eafa2020a4314a12faaf1 Mon Sep 17 00:00:00 2001 From: lqy <3431632001@qq,com> Date: Sun, 24 Nov 2024 10:04:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9D=83?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8F=82=E6=95=B0=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=BF=85=E5=A1=AB=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E5=9C=B0=E7=82=B9=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eve/controller/SchoolController.java | 13 +++++ .../java/com/skyeye/eve/entity/School.java | 20 ++++++++ .../controller/FloorInfoController.java | 11 ++++- .../controller/LocationRangeController.java | 3 -- .../controller/TeachBuildingController.java | 11 +++-- .../school/building/dao/FloorInfoDao.java | 8 +++ .../school/building/entity/Classroom.java | 4 -- .../school/building/entity/FloorInfo.java | 9 +++- .../school/building/entity/LocationRange.java | 1 - .../school/building/entity/TeachBuilding.java | 8 +-- .../building/floorenum/FloorInfoEnum.java | 11 ++++- .../building/service/FloorInfoService.java | 9 ++++ .../service/impl/ClassroomServiceImpl.java | 8 --- .../service/impl/FloorInfoServiceImpl.java | 41 ++++++++++++---- .../impl/TeachBuildingServiceImpl.java | 49 ++++++++----------- 15 files changed, 140 insertions(+), 66 deletions(-) diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/eve/controller/SchoolController.java b/skyeye-school/school-pro/src/main/java/com/skyeye/eve/controller/SchoolController.java index 296f9f10..fba3d68d 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/eve/controller/SchoolController.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/eve/controller/SchoolController.java @@ -84,4 +84,17 @@ public class SchoolController { schoolService.queryAllSchoolList(inputObject, outputObject); } + /** + * 位置覆盖 + * + * @param inputObject 入参以及用户信息等获取对象 + * @param outputObject 出参以及提示信息的返回值对象 + */ + @ApiOperation(id = "coverBackground", value = "学校背景图位置覆盖", method = "POST", allUse = "2") + @ApiImplicitParams(classBean = School.class) + @RequestMapping("/post/SchoolController/coverBackground") + public void coverBackground(InputObject inputObject, OutputObject outputObject) { + schoolService.updateEntity(inputObject, outputObject); + } + } diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/eve/entity/School.java b/skyeye-school/school-pro/src/main/java/com/skyeye/eve/entity/School.java index 33b6f7cc..28dfbe5a 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/eve/entity/School.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/eve/entity/School.java @@ -40,4 +40,24 @@ public class School extends AreaGeneralInfo { @ApiModelProperty(value = "数据权限 1.查看所有 2.查看本校", required = "required,num") private String power; + @TableField(value = "ne_longitude") + @ApiModelProperty(value = "东北经度") + private Float neLongitude; + + @TableField(value = "ne_latitude") + @ApiModelProperty(value = "东北纬度") + private Float neLatitude; + + @TableField(value = "sw_longitude") + @ApiModelProperty(value = "西南经度") + private Float swLongitude; + + @TableField(value = "sw_latitude") + @ApiModelProperty(value = "西南纬度") + private Float swLatitude; + + @TableField(value = "background") + @ApiModelProperty(value = "学校背景图") + private String background; + } diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/FloorInfoController.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/FloorInfoController.java index 908ee90d..b922b6a5 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/FloorInfoController.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/FloorInfoController.java @@ -13,6 +13,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * @ClassName: FloorInfoController + * @Description: 楼层教室服务管理控制层 + * @author: skyeye云系列--lqy + * @date: 2023/9/5 17:12 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ + @RestController @Api(value = "楼层教室服务管理", tags = "楼层教室服务管理", modelName = "楼层教室服务管理") public class FloorInfoController { @@ -39,7 +48,7 @@ public class FloorInfoController { @ApiOperation(id = "queryFloorInfosByLocationId", value = "根据地点id获取楼层所有信息", method = "POST", allUse = "2") @ApiImplicitParams({ - @ApiImplicitParam(id= "locationId",name = "locationId", value = "地点id", required = "required"), + @ApiImplicitParam(id= "locationId",name = "locationId", value = "地点id"), @ApiImplicitParam(id= "keyword",name = "keyword", value = "关键字查询") }) @RequestMapping("/post/FloorInfoController/queryFloorInfosByLocationId") diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/LocationRangeController.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/LocationRangeController.java index 8e19b9b7..7a5606c6 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/LocationRangeController.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/LocationRangeController.java @@ -8,10 +8,7 @@ import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.school.building.entity.LocationRange; -import com.skyeye.school.building.entity.TeachBuilding; import com.skyeye.school.building.service.LocationRangeService; -import com.skyeye.school.building.service.RangeVertexService; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/TeachBuildingController.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/TeachBuildingController.java index 40c6f4f1..d5ee749b 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/TeachBuildingController.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/TeachBuildingController.java @@ -67,7 +67,7 @@ public class TeachBuildingController { */ @ApiOperation(id = "queryTeachBuildingBySchoolId", value = "根据学校schoolId获取地点信息", method = "GET", allUse = "2") @ApiImplicitParams({ - @ApiImplicitParam(id = "schoolId", name = "schoolId", value = "学校id", required = "required") + @ApiImplicitParam(id = "schoolId", name = "schoolId", value = "学校id") }) @RequestMapping("/post/TeachBuildingController/queryTeachBuildingBySchoolId") public void queryTeachBuildingBySchoolId(InputObject inputObject, OutputObject outputObject) { @@ -75,13 +75,16 @@ public class TeachBuildingController { } /** - * 根据地点类型typeId获取分页获取地点列表 + * 根据schoolId和地点类型typeId获取取地点列表 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ - @ApiOperation(id = "queryTeachBuildingByHolderId", value = "根据holderId(typeId地点类型id)获取地点列表,默认分页，当isPaging=false不分页", method = "POST", allUse = "2") - @ApiImplicitParams(classBean = CommonPageInfo.class) + @ApiOperation(id = "queryTeachBuildingByHolderId", value = "根据schoolId和地点类型typeId获取取地点列表", method = "POST", allUse = "2") + @ApiImplicitParams({ + @ApiImplicitParam(id = "schoolId", name = "schoolId", value = "学校id", required = "required"), + @ApiImplicitParam(id = "typeId", name = "typeId", value = "地点类型id", required = "required") + }) @RequestMapping("/post/TeachBuildingController/queryTeachBuildingByHolderId") public void queryTeachBuildingByHolderId(InputObject inputObject, OutputObject outputObject) { teachBuildingService.queryTeachBuildingByHolderId(inputObject, outputObject); diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/FloorInfoDao.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/FloorInfoDao.java index 2bf73782..60b43816 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/FloorInfoDao.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/FloorInfoDao.java @@ -3,5 +3,13 @@ package com.skyeye.school.building.dao; import com.skyeye.eve.dao.SkyeyeBaseMapper; import com.skyeye.school.building.entity.FloorInfo; +/** + * @ClassName: FloorInfoDao + * @Description: 楼层教室服务数据层 + * @author: lqu + * @date: 2023/9/5 17:16 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ public interface FloorInfoDao extends SkyeyeBaseMapper { } diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/Classroom.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/Classroom.java index a5cdcb61..8b5884f8 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/Classroom.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/Classroom.java @@ -9,10 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.skyeye.annotation.api.ApiModel; import com.skyeye.annotation.api.ApiModelProperty; -import com.skyeye.annotation.api.Property; -import com.skyeye.annotation.cache.RedisCacheField; -import com.skyeye.annotation.unique.UniqueField; -import com.skyeye.common.entity.features.BaseGeneralInfo; import com.skyeye.common.entity.features.OperatorUserInfo; import lombok.Data; diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/FloorInfo.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/FloorInfo.java index b77c80f2..13686ef0 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/FloorInfo.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/FloorInfo.java @@ -8,7 +8,14 @@ import com.skyeye.annotation.api.ApiModelProperty; import com.skyeye.common.entity.features.OperatorUserInfo; import lombok.Data; - +/** + * @ClassName: FloorInfo + * @Description: 楼层教室服务管理实体层 + * @author: lqu + * @date: 2023/9/5 17:16 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ @Data @TableName("school_floor_info") diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/LocationRange.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/LocationRange.java index 5a586dfe..d08d43c8 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/LocationRange.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/LocationRange.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.skyeye.annotation.api.ApiModel; import com.skyeye.annotation.api.ApiModelProperty; -import com.skyeye.annotation.api.Property; import com.skyeye.common.entity.features.OperatorUserInfo; import lombok.Data; diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/TeachBuilding.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/TeachBuilding.java index c8fc46f7..dc21ac6f 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/TeachBuilding.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/TeachBuilding.java @@ -12,14 +12,10 @@ import com.skyeye.annotation.api.ApiModelProperty; import com.skyeye.annotation.api.Property; import com.skyeye.annotation.cache.RedisCacheField; import com.skyeye.annotation.unique.UniqueField; -import com.skyeye.common.entity.features.BaseGeneralInfo; -import com.skyeye.common.entity.features.OperatorUserInfo; +import com.skyeye.common.entity.features.AreaGeneralInfo; import com.skyeye.eve.entity.School; import lombok.Data; -import java.util.List; -import java.util.Map; - /** * @ClassName: TeachBuilding * @Description: 教学楼信息实体类 @@ -33,7 +29,7 @@ import java.util.Map; @RedisCacheField(name = "school:teachBuilding") @TableName(value = "school_teach_building") @ApiModel(value = "教学楼信息实体类") -public class TeachBuilding extends OperatorUserInfo { +public class TeachBuilding extends AreaGeneralInfo { @TableId("id") @ApiModelProperty(value = "主键id。为空时新增，不为空时编辑") diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/floorenum/FloorInfoEnum.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/floorenum/FloorInfoEnum.java index a1a690d2..b345ca84 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/floorenum/FloorInfoEnum.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/floorenum/FloorInfoEnum.java @@ -5,13 +5,22 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +/** + * @ClassName: FloorInfoEnum + * @Description: 楼层教室服务管理枚举类 + * @author: lqu + * @date: 2023/9/5 17:16 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ + @Getter @NoArgsConstructor @AllArgsConstructor public enum FloorInfoEnum implements SkyeyeEnumClass { FLOOR_INFO_ENUM(1, "楼层", true, true), - ClASS_INFO_ENUM(2, "教室", true, false), + ClASS_INFO_ENUM(2, "房间", true, false), SERVICE_INFO_ENUM(3, "服务", true, false),; private Integer key; diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/FloorInfoService.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/FloorInfoService.java index 01e8f754..df864ce1 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/FloorInfoService.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/FloorInfoService.java @@ -5,6 +5,15 @@ import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.school.building.entity.FloorInfo; +/** + * @ClassName: FloorInfoService + * @Description: 楼层教室服务管理接口层 + * @author: skyeye云系列--lqy + * @date: 2023/9/5 17:12 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ + public interface FloorInfoService extends SkyeyeBusinessService { void queryFloorInfosByLocationId(InputObject inputObject, OutputObject outputObject); } diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/ClassroomServiceImpl.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/ClassroomServiceImpl.java index 12b2220a..8b6f5cf3 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/ClassroomServiceImpl.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/ClassroomServiceImpl.java @@ -4,18 +4,10 @@ package com.skyeye.school.building.service.impl; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; import com.skyeye.annotation.service.SkyeyeService; import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; -import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; -import com.skyeye.common.object.OutputObject; -import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; import com.skyeye.eve.service.SchoolService; -import com.skyeye.exception.CustomException; import com.skyeye.school.building.dao.ClassroomDao; import com.skyeye.school.building.entity.Classroom; import com.skyeye.school.building.service.ClassroomService; diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/FloorInfoServiceImpl.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/FloorInfoServiceImpl.java index a9d2d314..93783437 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/FloorInfoServiceImpl.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/FloorInfoServiceImpl.java @@ -19,6 +19,14 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; +/** + * @ClassName: FloorInfoServiceImpl + * @Description: 楼层教室服务管理控制层 + * @author: skyeye云系列--lqy + * @date: 2023/8/8 14:55 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ @Service @SkyeyeService(name = "楼层教室服务管理", groupName = "楼层教室服务管理") public class FloorInfoServiceImpl extends SkyeyeBusinessServiceImpl implements FloorInfoService { @@ -46,17 +54,29 @@ public class FloorInfoServiceImpl extends SkyeyeBusinessServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getLocationId), floorInfo.getLocationId()); if(nodeType == CommonNumConstants.NUM_ONE){ - // 更新漏测 - queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getName), name);// 确定为哪一层 - if(count(queryWrapper) > 0){ - throw new CustomException("该楼层教室名已存在"); + // 新增、更新楼层 + queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getName), name); + if(StrUtil.isEmpty(floorInfo.getId())&& count(queryWrapper) > 0){ + throw new CustomException("楼层名称已存在"); + } + if(StrUtil.isNotEmpty(floorInfo.getId())){ + FloorInfo floor = selectById(floorInfo.getId()); + if(!name.equals(floor.getName()) && count(queryWrapper) > 0){ + throw new CustomException("楼层名称已存在1"); + } } }else if(nodeType == CommonNumConstants.NUM_TWO){ - // 更新教室 - queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getParentId), floorInfo.getParentId());// 确定那一层 - queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getName), name);// 确定教室名 - if(count(queryWrapper) > 0){ - throw new CustomException("该教室名已存在"); + // 新增、更新教室 + queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getParentId), floorInfo.getParentId()); + queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getName), name); + if(StrUtil.isEmpty(floorInfo.getId())&& count(queryWrapper) > 0){ + throw new CustomException("教室名已存在"); + } + if(StrUtil.isNotEmpty(floorInfo.getId())){ + FloorInfo floor = selectById(floorInfo.getId()); + if(!name.equals(floor.getName()) && count(queryWrapper) > 0){ + throw new CustomException("教室名已存在1"); + } } } } @@ -92,6 +112,9 @@ public class FloorInfoServiceImpl extends SkyeyeBusinessServiceImpl map = inputObject.getParams(); String locationId = map.get("locationId").toString(); + if(StrUtil.isEmpty(locationId)){ + return; + } String keyword = map.get("keyword").toString(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getLocationId), locationId); diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/TeachBuildingServiceImpl.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/TeachBuildingServiceImpl.java index 7cdaf736..6e8bd0eb 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/TeachBuildingServiceImpl.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/TeachBuildingServiceImpl.java @@ -4,10 +4,8 @@ package com.skyeye.school.building.service.impl; -import com.alibaba.cloud.commons.lang.StringUtils; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; import com.skyeye.annotation.service.SkyeyeService; import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; import com.skyeye.common.entity.search.CommonPageInfo; @@ -16,19 +14,15 @@ import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; import com.skyeye.eve.service.IAuthUserService; import com.skyeye.eve.service.SchoolService; -import com.skyeye.exception.CustomException; import com.skyeye.school.building.dao.TeachBuildingDao; -import com.skyeye.school.building.entity.Classroom; import com.skyeye.school.building.entity.FloorInfo; import com.skyeye.school.building.entity.TeachBuilding; -import com.skyeye.school.building.service.ClassroomService; import com.skyeye.school.building.service.FloorInfoService; import com.skyeye.school.building.service.TeachBuildingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -56,6 +50,17 @@ public class TeachBuildingServiceImpl extends SkyeyeBusinessServiceImpl> queryPageDataList(InputObject inputObject) { + CommonPageInfo commonPageInfo = inputObject.getParams(CommonPageInfo.class); + String keyword = commonPageInfo.getKeyword(); + if (StrUtil.isNotEmpty(keyword)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(MybatisPlusUtil.toColumns(TeachBuilding::getName), keyword); + List list = list(queryWrapper); + list.stream().map(item->{ + item.setSchoolMation(schoolService.selectById(item.getSchoolId())); + return item; + }); + } List> bean = super.queryPageDataList(inputObject); schoolService.setMationForMap(bean, "schoolId", "schoolMation"); return bean; @@ -73,6 +78,9 @@ public class TeachBuildingServiceImpl extends SkyeyeBusinessServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq(MybatisPlusUtil.toColumns(TeachBuilding::getSchoolId), schoolId); List teachBuildingList = list(queryWrapper); @@ -86,30 +94,15 @@ public class TeachBuildingServiceImpl extends SkyeyeBusinessServiceImpl teachBuildingList = getTeachBuildings(typeId); - outputObject.setBeans(teachBuildingList); - outputObject.settotal(page.getTotal()); - }else { - List teachBuildingList = getTeachBuildings(typeId); - outputObject.setBeans(teachBuildingList); - outputObject.settotal(teachBuildingList.size()); - } - - } - - private List getTeachBuildings(String typeId) { + Map params = inputObject.getParams(); + String schoolId = params.get("schoolId").toString(); + String typeId = params.get("typeId").toString(); QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.toColumns(TeachBuilding::getSchoolId), schoolId); queryWrapper.eq(MybatisPlusUtil.toColumns(TeachBuilding::getTypeId), typeId); List teachBuildingList = list(queryWrapper); - schoolService.setDataMation(teachBuildingList,TeachBuilding::getSchoolId); - return teachBuildingList; + outputObject.setBeans(teachBuildingList); + outputObject.settotal(teachBuildingList.size()); } @Transactional