From 82560db163e936e1744c15a4f2f31f04a1a99a82 Mon Sep 17 00:00:00 2001 From: lqy <3431632001@qq,com> Date: Sun, 10 Nov 2024 15:33:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=9C=B0=E7=82=B9?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LocationRangeController.java | 90 +++++++++++++++++++ .../controller/TeachBuildingController.java | 20 ++--- .../school/building/dao/LocationRangeDao.java | 15 ++++ .../school/building/dao/RangeVertexDao.java | 15 ++++ .../school/building/dao/TeachBuildingDao.java | 2 +- .../school/building/entity/LocationRange.java | 52 +++++++++++ .../school/building/entity/RangeVertex.java | 45 ++++++++++ .../service/LocationRangeService.java | 18 ++++ .../building/service/RangeVertexService.java | 15 ++++ .../service/TeachBuildingService.java | 2 +- .../impl/LocationRangeServiceImpl.java | 88 ++++++++++++++++++ .../service/impl/RangeVertexServiceImpl.java | 21 +++++ .../impl/TeachBuildingServiceImpl.java | 39 +++++++- 13 files changed, 406 insertions(+), 16 deletions(-) create mode 100644 skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/LocationRangeController.java create mode 100644 skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/LocationRangeDao.java create mode 100644 skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/RangeVertexDao.java create mode 100644 skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/LocationRange.java create mode 100644 skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/RangeVertex.java create mode 100644 skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/LocationRangeService.java create mode 100644 skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/RangeVertexService.java create mode 100644 skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/LocationRangeServiceImpl.java create mode 100644 skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/RangeVertexServiceImpl.java 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 new file mode 100644 index 00000000..8e19b9b7 --- /dev/null +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/LocationRangeController.java @@ -0,0 +1,90 @@ +package com.skyeye.school.building.controller; + +import com.skyeye.annotation.api.Api; +import com.skyeye.annotation.api.ApiImplicitParam; +import com.skyeye.annotation.api.ApiImplicitParams; +import com.skyeye.annotation.api.ApiOperation; +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; + +/** + * @ClassName: LocationRangeController + * @Description: 地点范围控制层 + * @author: skyeye云系列--lqy + * @date: 2024/11/10 15:17 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ +@RestController +@Api(value = "地点范围管理", tags = "地点范围管理", modelName = "地点范围管理") +public class LocationRangeController { + + @Autowired + private LocationRangeService locationRangeService; + + /** + * 添加地点范围 + * + * @param inputObject 入参以及用户信息等获取对象 + * @param outputObject 出参以及提示信息的返回值对象 + */ + @ApiOperation(id = "writeLocationRange", value = "添加地点范围", method = "POST", allUse = "2") + @ApiImplicitParams(classBean = LocationRange.class) + @RequestMapping("/post/LocationRangeController/writeLocationRange") + public void writeLocationRange(InputObject inputObject, OutputObject outputObject) { + locationRangeService.createEntity(inputObject, outputObject); + } + + /** + * 删除地点范围信息 + * + * @param inputObject 入参以及用户信息等获取对象 + * @param outputObject 出参以及提示信息的返回值对象 + */ + @ApiOperation(id = "deleteLocationRangeById", value = "根据ID删除地点范围信息", method = "DELETE", allUse = "2") + @ApiImplicitParams({ + @ApiImplicitParam(id = "id", name = "id", value = "主键id", required = "required")}) + @RequestMapping("/post/LocationRangeController/deleteLocationRangeById") + public void deleteLocationRangeById(InputObject inputObject, OutputObject outputObject) { + locationRangeService.deleteById(inputObject, outputObject); + } + + /** + * 根据id获取获取地点范围信息 + * + * @param inputObject 入参以及用户信息等获取对象 + * @param outputObject 出参以及提示信息的返回值对象 + */ + @ApiOperation(id = "queryLocationRangeById", value = "根据id获取获取地点范围信息", method = "GET", allUse = "2") + @ApiImplicitParams({ + @ApiImplicitParam(id = "id",name = "id", value = "地点id", required = "required") + }) + @RequestMapping("/post/LocationRangeController/queryLocationRangeById") + public void queryLocationRangeById(InputObject inputObject, OutputObject outputObject) { + locationRangeService.selectById(inputObject, outputObject); + } + + /** + * 获取地点范围信息列表 + * + * @param inputObject 入参以及用户信息等获取对象 + * @param outputObject 出参以及提示信息的返回值对象 + */ + @ApiOperation(id = "queryLocationRangeList", value = "获取地点范围信息列表", method = "POST", allUse = "2") + @ApiImplicitParams(classBean = CommonPageInfo.class) + @RequestMapping("/post/LocationRangeController/queryLocationRangeList") + public void queryLocationRangeList(InputObject inputObject, OutputObject outputObject) { + locationRangeService.queryLocationRangeList(inputObject, outputObject); + } + + +} 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 0ee7c511..3f05dffe 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 @@ -19,26 +19,26 @@ import org.springframework.web.bind.annotation.RestController; /** * @ClassName: TeachBuildingController - * @Description: 教学楼管理控制层 + * @Description: 地点管理控制层 * @author: skyeye云系列--lqy * @date: 2023/8/8 14:55 * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ @RestController -@Api(value = "地点教学楼管理", tags = "地点教学楼管理", modelName = "地点教学楼管理") +@Api(value = "地点管理", tags = "地点管理", modelName = "地点管理") public class TeachBuildingController { @Autowired private TeachBuildingService teachBuildingService; /** - * 获取教学楼信息列表 + * 获取地点信息列表 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ - @ApiOperation(id = "queryTeachBuildingList", value = "获取教学楼信息", method = "POST", allUse = "2") + @ApiOperation(id = "queryTeachBuildingList", value = "获取地点信息", method = "POST", allUse = "2") @ApiImplicitParams(classBean = CommonPageInfo.class) @RequestMapping("/post/TeachBuildingController/queryTeachBuildingList") public void queryTeachBuildingList(InputObject inputObject, OutputObject outputObject) { @@ -46,12 +46,12 @@ public class TeachBuildingController { } /** - * 添加或修改地点教学楼 + * 添加或修改地点 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ - @ApiOperation(id = "writeTeachBuilding", value = "新增/编辑地点教学楼信息", method = "POST", allUse = "2") + @ApiOperation(id = "writeTeachBuilding", value = "新增/编辑地点信息", method = "POST", allUse = "2") @ApiImplicitParams(classBean = TeachBuilding.class) @RequestMapping("/post/TeachBuildingController/writeTeachBuilding") public void writeTeachBuilding(InputObject inputObject, OutputObject outputObject) { @@ -59,12 +59,12 @@ public class TeachBuildingController { } /** - * 删除地点教学楼信息 + * 删除地点信息 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ - @ApiOperation(id = "deleteTeachBuildingById", value = "根据ID删除地点教学楼信息", method = "DELETE", allUse = "2") + @ApiOperation(id = "deleteTeachBuildingById", value = "根据ID删除地点信息", method = "DELETE", allUse = "2") @ApiImplicitParams({ @ApiImplicitParam(id = "id", name = "id", value = "主键id", required = "required")}) @RequestMapping("/post/TeachBuildingController/deleteTeachBuildingById") @@ -73,12 +73,12 @@ public class TeachBuildingController { } /** - * 根据学校id获取教学楼信息 + * 根据学校id获取地点信息 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ - @ApiOperation(id = "queryTeachBuildingBySchoolId", value = "根据学校id获取教学楼信息", method = "GET", allUse = "2") + @ApiOperation(id = "queryTeachBuildingBySchoolId", value = "根据学校id获取地点信息", method = "GET", allUse = "2") @ApiImplicitParams({ @ApiImplicitParam(id = "schoolId", name = "schoolId", value = "学校id", required = "required")}) @RequestMapping("/post/TeachBuildingController/queryTeachBuildingBySchoolId") diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/LocationRangeDao.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/LocationRangeDao.java new file mode 100644 index 00000000..169da79f --- /dev/null +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/LocationRangeDao.java @@ -0,0 +1,15 @@ +package com.skyeye.school.building.dao; + +import com.skyeye.eve.dao.SkyeyeBaseMapper; +import com.skyeye.school.building.entity.LocationRange; + +/** + * @ClassName: LocationRangeDao + * @Description: 地带范围数据层 + * @author: skyeye云系列--lqy + * @date: 2024/11/6 11:40 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ +public interface LocationRangeDao extends SkyeyeBaseMapper { +} diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/RangeVertexDao.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/RangeVertexDao.java new file mode 100644 index 00000000..49c7ad20 --- /dev/null +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/RangeVertexDao.java @@ -0,0 +1,15 @@ +package com.skyeye.school.building.dao; + +import com.skyeye.eve.dao.SkyeyeBaseMapper; +import com.skyeye.school.building.entity.RangeVertex; + +/** + * @ClassName: RangeVertexDao + * @Description: 范围顶点数据层 + * @author: skyeye云系列--lqy + * @date: 2024/11/6 11:40 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ +public interface RangeVertexDao extends SkyeyeBaseMapper { +} diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/TeachBuildingDao.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/TeachBuildingDao.java index 7d31d4bb..8c2c9b42 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/TeachBuildingDao.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/TeachBuildingDao.java @@ -9,7 +9,7 @@ import com.skyeye.school.building.entity.TeachBuilding; /** * @ClassName: TeachBuildingDao - * @Description: 教学楼管理数据层 + * @Description: 地点管理数据层 * @author: skyeye云系列--卫志强 * @date: 2021/8/7 20:48 * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. 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 new file mode 100644 index 00000000..5a586dfe --- /dev/null +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/LocationRange.java @@ -0,0 +1,52 @@ +package com.skyeye.school.building.entity; + + +import com.baomidou.mybatisplus.annotation.TableField; +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; + +import java.util.List; + +/** + * @ClassName: LocationRange + * @Description: 地点范围实体层 + * @author: skyeye云系列--lqy + * @date: 2024/11/10 15:17 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ +@Data +@TableName("school_location_range") +@ApiModel(description = "地点范围") +public class LocationRange extends OperatorUserInfo { + + @TableId("id") + @ApiModelProperty(value = "主键id，为空时新增，不为空时编辑") + private String id; + + @TableField("name") + @ApiModelProperty(value = "地点范围名称", required = "required") + private String name; + + @TableField("logo") + @ApiModelProperty(value = "地点范围logo",required = "required") + private String logo; + + @TableField("description") + @ApiModelProperty(value = "地点范围描述") + private String description; + + @TableField("vertex_num") + @ApiModelProperty(value = "顶点数量",required = "required") + private Integer vertexNum; + + + @TableField(exist = false) + @ApiModelProperty(value = "顶点表信息" , required = "json") + private List rangeVertexMation; +} diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/RangeVertex.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/RangeVertex.java new file mode 100644 index 00000000..2828aa5f --- /dev/null +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/RangeVertex.java @@ -0,0 +1,45 @@ +package com.skyeye.school.building.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +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.common.entity.features.OperatorUserInfo; +import lombok.Data; + +/** + * @ClassName: RangeVertex + * @Description: 范围顶点管理实体类 + * @author: skyeye云系列--lqy + * @date: 2024/11/6 11:40 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ +@Data +@TableName("school_vertex") +@ApiModel(description = "范围顶点管理实体类") +public class RangeVertex extends OperatorUserInfo { + + @TableId("id") + @ApiModelProperty(value = "主键id，为空时新增，不为空时编辑") + private String id; + + @TableField("range_id") + @ApiModelProperty(value = "范围id") + private String rangeId; + + @TableField("order_num") + @ApiModelProperty(value = "顺序") + private Integer orderNum; + + + @TableField("longitude") + @ApiModelProperty(value = "经度",required = "required") + private Float longitude; + + @TableField("latitude") + @ApiModelProperty(value = "纬度",required = "required") + private Float latitude; + +} diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/LocationRangeService.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/LocationRangeService.java new file mode 100644 index 00000000..2bad2e9b --- /dev/null +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/LocationRangeService.java @@ -0,0 +1,18 @@ +package com.skyeye.school.building.service; + +import com.skyeye.base.business.service.SkyeyeBusinessService; +import com.skyeye.common.object.InputObject; +import com.skyeye.common.object.OutputObject; +import com.skyeye.school.building.entity.LocationRange; + +/** + * @ClassName: LocationRangeService + * @Description: 楼层教室管理服务接口层 + * @author: skyeye云系列--lqy + * @date: 2024/11/6 14:55 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ +public interface LocationRangeService extends SkyeyeBusinessService { + void queryLocationRangeList(InputObject inputObject, OutputObject outputObject); +} diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/RangeVertexService.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/RangeVertexService.java new file mode 100644 index 00000000..8e932bb2 --- /dev/null +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/RangeVertexService.java @@ -0,0 +1,15 @@ +package com.skyeye.school.building.service; + +import com.skyeye.base.business.service.SkyeyeBusinessService; +import com.skyeye.school.building.entity.RangeVertex; + +/** + * @ClassName: RangeVertexService + * @Description: 范围顶点服务接口层 + * @author: skyeye云系列--lqy + * @date: 2024/11/6 14:55 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ +public interface RangeVertexService extends SkyeyeBusinessService { +} diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/TeachBuildingService.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/TeachBuildingService.java index 0fb1ef69..4b84ca2d 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/TeachBuildingService.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/TeachBuildingService.java @@ -11,7 +11,7 @@ import com.skyeye.school.building.entity.TeachBuilding; /** * @ClassName: TeachBuildingService - * @Description: 教学楼管理服务接口层 + * @Description: 地点管理服务接口层 * @author: xqz * @date: 2023/8/9 9:52 * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/LocationRangeServiceImpl.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/LocationRangeServiceImpl.java new file mode 100644 index 00000000..bba362ad --- /dev/null +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/LocationRangeServiceImpl.java @@ -0,0 +1,88 @@ +package com.skyeye.school.building.service.impl; + + +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.school.building.dao.LocationRangeDao; +import com.skyeye.school.building.entity.LocationRange; +import com.skyeye.school.building.entity.RangeVertex; +import com.skyeye.school.building.service.LocationRangeService; +import com.skyeye.school.building.service.RangeVertexService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @ClassName: LocationRangeServiceImpl + * @Description: 地点范围实现类 + * @author: skyeye云系列--，lqy + * @date: 2023/9/5 17:15 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ +@Service +@SkyeyeService(name = "地点范围管理", groupName = "地点范围管理") +public class LocationRangeServiceImpl extends SkyeyeBusinessServiceImpl implements LocationRangeService { + + @Autowired + private RangeVertexService rangeVertexService; + + @Override + public void queryLocationRangeList(InputObject inputObject, OutputObject outputObject) { + CommonPageInfo commonPageInfo = inputObject.getParams(CommonPageInfo.class); + Page page = PageHelper.startPage(commonPageInfo.getPage(), commonPageInfo.getLimit()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + List bean = list(queryWrapper); + for(LocationRange locationRange : bean){ + String rangeId = locationRange.getId(); + QueryWrapper vertexQueryWrapper= new QueryWrapper<>(); + vertexQueryWrapper.eq(MybatisPlusUtil.toColumns(RangeVertex::getRangeId), rangeId); + vertexQueryWrapper.orderByAsc(MybatisPlusUtil.toColumns(RangeVertex::getOrderNum)); + List vertexList = rangeVertexService.list(vertexQueryWrapper); + locationRange.setRangeVertexMation(vertexList); + } + outputObject.setBeans(bean); + outputObject.settotal(page.getTotal()); + } + + @Override + public LocationRange selectById(String id) { + LocationRange locationRange = super.selectById(id); + String rangeId = locationRange.getId(); + QueryWrapper vertexQueryWrapper= new QueryWrapper<>(); + vertexQueryWrapper.eq(MybatisPlusUtil.toColumns(RangeVertex::getRangeId), rangeId); + vertexQueryWrapper.orderByAsc(MybatisPlusUtil.toColumns(RangeVertex::getOrderNum)); + List vertexList = rangeVertexService.list(vertexQueryWrapper); + locationRange.setRangeVertexMation(vertexList); + return locationRange; + } + + @Override + @Transactional + public void deleteById(String id) { + super.deleteById(id); + QueryWrapper vertexQueryWrapper= new QueryWrapper<>(); + vertexQueryWrapper.eq(MybatisPlusUtil.toColumns(RangeVertex::getRangeId), id); + rangeVertexService.remove(vertexQueryWrapper); + } + + @Override + public void createPostpose(LocationRange locationRange,String userId) { + String rangeId = locationRange.getId(); + List rangeVertexMation = locationRange.getRangeVertexMation(); + for (RangeVertex rangeVertex : rangeVertexMation) { + rangeVertex.setRangeId(rangeId); + } + rangeVertexService.createEntity(rangeVertexMation, userId); + } + +} diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/RangeVertexServiceImpl.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/RangeVertexServiceImpl.java new file mode 100644 index 00000000..7bf8260d --- /dev/null +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/RangeVertexServiceImpl.java @@ -0,0 +1,21 @@ +package com.skyeye.school.building.service.impl; + +import com.skyeye.annotation.service.SkyeyeService; +import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; +import com.skyeye.school.building.dao.RangeVertexDao; +import com.skyeye.school.building.entity.RangeVertex; +import com.skyeye.school.building.service.RangeVertexService; +import org.springframework.stereotype.Service; + +/** + * @ClassName: RangeVertexServiceImpl + * @Description: 范围顶点管理实现层 + * @author: skyeye云系列--卫志强 + * @date: 2023/9/5 17:15 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ +@Service +@SkyeyeService(name = "范围顶点管理", groupName = "范围顶点管理") +public class RangeVertexServiceImpl extends SkyeyeBusinessServiceImpl implements RangeVertexService { +} 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 24a8a351..5280ceba 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 @@ -18,29 +18,40 @@ import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; import com.skyeye.eve.service.SchoolService; import com.skyeye.exception.CustomException; import com.skyeye.school.building.dao.TeachBuildingDao; +import com.skyeye.school.building.entity.Floor; +import com.skyeye.school.building.entity.LocationServe; import com.skyeye.school.building.entity.TeachBuilding; +import com.skyeye.school.building.service.FloorService; +import com.skyeye.school.building.service.LocationServeService; 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.List; import java.util.Map; /** * @ClassName: TeachBuildingServiceImpl - * @Description: 地点教学楼管理服务层 + * @Description: 地点管理服务层 * @author: skyeye云系列--lqy - * @date: 2021/8/7 20:48 + * @date: 2024/8/7 20:48 * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ @Service -@SkyeyeService(name = "地点教学楼管理", groupName = "地点教学楼管理") +@SkyeyeService(name = "地点管理", groupName = "地点管理") public class TeachBuildingServiceImpl extends SkyeyeBusinessServiceImpl implements TeachBuildingService { @Autowired private SchoolService schoolService; + @Autowired + private FloorService floorService; + + @Autowired + private LocationServeService locationServeService; + @Override public List> queryPageDataList(InputObject inputObject) { List> beans = super.queryPageDataList(inputObject); @@ -63,7 +74,7 @@ public class TeachBuildingServiceImpl extends SkyeyeBusinessServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.toColumns(Floor::getLocationId), id); + List floorList = floorService.list(queryWrapper); + floorService.remove(queryWrapper); + + for(Floor floor : floorList){ + QueryWrapper serveQueryWrapper = new QueryWrapper<>(); + serveQueryWrapper.eq(MybatisPlusUtil.toColumns(LocationServe::getFloorId), floor.getId()); + locationServeService.remove(serveQueryWrapper); + } + } + }