diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index 6193b8a7..93bd3de4 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -124,6 +124,7 @@ security: - /other/ys7Device/webhook - /**/changxie/callback/** - /progress/progressPlanDetail/insert/numberAI + - /project/project/list/sub/matrix/** - /gps/equipment/dataAcceptance - /resource/oss/upload # todo 仅测试 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/controller/DroProjectDroneController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/controller/DroProjectDroneController.java index 9154fc1f..21156bbe 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/controller/DroProjectDroneController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/controller/DroProjectDroneController.java @@ -1,26 +1,27 @@ package org.dromara.drone.controller; -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.drone.domain.vo.DroProjectDroneVo; -import org.dromara.drone.domain.bo.DroProjectDroneBo; -import org.dromara.drone.service.IDroProjectDroneService; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.drone.domain.bo.DroProjectDroneBo; +import org.dromara.drone.domain.vo.DroProjectDroneVo; +import org.dromara.drone.service.IDroProjectDroneService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 项目无人机信息 @@ -36,6 +37,19 @@ public class DroProjectDroneController extends BaseController { private final IDroProjectDroneService droProjectDroneService; + /** + * 添加项目无人机信息 + * + * @param projectId 项目id + */ + @Log(title = "项目无人机信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/addSn2Drone/{projectId}") + public R addDroneMsgByProject(@NotNull(message = "项目不能为空") + @PathVariable Long projectId) { + return toAjax(droProjectDroneService.addDroneMsgByProject(projectId)); + } + /** * 查询项目无人机信息列表 */ @@ -64,7 +78,7 @@ public class DroProjectDroneController extends BaseController { @SaCheckPermission("drone:projectDrone:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable Long id) { return R.ok(droProjectDroneService.queryById(id)); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/IDroProjectDroneService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/IDroProjectDroneService.java index afe4e3af..e22d4858 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/IDroProjectDroneService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/IDroProjectDroneService.java @@ -67,4 +67,11 @@ public interface IDroProjectDroneService extends IService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 添加无人机信息 + * + * @param projectId 项目id + */ + Boolean addDroneMsgByProject(Long projectId); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/impl/DroProjectDroneServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/impl/DroProjectDroneServiceImpl.java index 49e3b688..24adbb8f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/impl/DroProjectDroneServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/impl/DroProjectDroneServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -14,6 +15,7 @@ import org.dromara.drone.domain.bo.DroProjectDroneBo; import org.dromara.drone.domain.vo.DroProjectDroneVo; import org.dromara.drone.mapper.DroProjectDroneMapper; import org.dromara.drone.service.IDroProjectDroneService; +import org.dromara.manager.dronemanager.DroneManager; import org.springframework.stereotype.Service; import java.util.Collection; @@ -30,6 +32,9 @@ import java.util.List; public class DroProjectDroneServiceImpl extends ServiceImpl implements IDroProjectDroneService { + @Resource + private DroneManager droneManager; + /** * 查询项目无人机信息 * @@ -126,4 +131,18 @@ public class DroProjectDroneServiceImpl extends ServiceImpl 0; } + + /** + * 添加无人机信息 + * + * @param projectId 项目id + */ + @Override + public Boolean addDroneMsgByProject(Long projectId) { + List list = this.lambdaQuery() + .eq(DroProjectDrone::getProjectId, projectId) + .list(); + droneManager.addAirportInfoByProject(list.stream().map(DroProjectDrone::getDroneSn).toList(), projectId); + return true; + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java index 17225809..5e31ac8f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java @@ -83,7 +83,7 @@ public class FacMatrixController extends BaseController { /** * 获取设施-方阵大屏位置详情 */ - @SaCheckPermission("facility:matrix:gisPosition") +// @SaCheckPermission("facility:matrix:gisPosition") @GetMapping("/gis/position") public R> getPositionGis(FacFacilityPositionGisReq req) { return R.ok(facMatrixService.getPositionGis(req)); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacRedLineController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacRedLineController.java new file mode 100644 index 00000000..28a43957 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacRedLineController.java @@ -0,0 +1,118 @@ +package org.dromara.facility.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.facility.domain.bo.FacRedLineBo; +import org.dromara.facility.domain.dto.redline.FacRedLineCreateByGeoJsonReq; +import org.dromara.facility.domain.vo.redline.FacRedLineVo; +import org.dromara.facility.service.IFacRedLineService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 设施-红线 + * + * @author lilemy + * @date 2025-09-20 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/facility/redLine") +public class FacRedLineController extends BaseController { + + private final IFacRedLineService facRedLineService; + + /** + * 查询设施-红线列表 + */ + @SaCheckPermission("facility:redLine:list") + @GetMapping("/list") + public TableDataInfo list(FacRedLineBo bo, PageQuery pageQuery) { + return facRedLineService.queryPageList(bo, pageQuery); + } + + /** + * 导出设施-红线列表 + */ + @SaCheckPermission("facility:redLine:export") + @Log(title = "设施-红线", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(FacRedLineBo bo, HttpServletResponse response) { + List list = facRedLineService.queryList(bo); + ExcelUtil.exportExcel(list, "设施-红线", FacRedLineVo.class, response); + } + + /** + * 获取设施-红线详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("facility:redLine:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(facRedLineService.queryById(id)); + } + + /** + * 通过GeoJson新增设施-红线 + */ + @SaCheckPermission("facility:redLine:geoJson") + @Log(title = "设施-红线", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/geoJson") + public R insertByGeoJson(@RequestBody FacRedLineCreateByGeoJsonReq req) { + return toAjax(facRedLineService.insertByGeoJson(req)); + } + + /** + * 新增设施-红线 + */ + @SaCheckPermission("facility:redLine:add") + @Log(title = "设施-红线", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody FacRedLineBo bo) { + return toAjax(facRedLineService.insertByBo(bo)); + } + + /** + * 修改设施-红线 + */ + @SaCheckPermission("facility:redLine:edit") + @Log(title = "设施-红线", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody FacRedLineBo bo) { + return toAjax(facRedLineService.updateByBo(bo)); + } + + /** + * 删除设施-红线 + * + * @param ids 主键串 + */ + @SaCheckPermission("facility:redLine:remove") + @Log(title = "设施-红线", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(facRedLineService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacRedLine.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacRedLine.java new file mode 100644 index 00000000..e1c59fda --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacRedLine.java @@ -0,0 +1,51 @@ +package org.dromara.facility.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 设施-红线对象 fac_red_line + * + * @author lilemy + * @date 2025-09-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fac_red_line") +public class FacRedLine extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id") + private Long id; + + /** + * 项目id + */ + private Long projectId; + + /** + * 红线名称 + */ + private String redLineName; + + /** + * 红线位置 + */ + private String positions; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/bo/FacRedLineBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/bo/FacRedLineBo.java new file mode 100644 index 00000000..5f5c42ea --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/bo/FacRedLineBo.java @@ -0,0 +1,52 @@ +package org.dromara.facility.domain.bo; + +import org.dromara.facility.domain.FacRedLine; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 设施-红线业务对象 fac_red_line + * + * @author lilemy + * @date 2025-09-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = FacRedLine.class, reverseConvertGenerate = false) +public class FacRedLineBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 项目id + */ + @NotNull(message = "项目id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long projectId; + + /** + * 红线名称 + */ + @NotBlank(message = "红线名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String redLineName; + + /** + * 红线位置 + */ + private String positions; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/redline/FacRedLineCreateByGeoJsonReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/redline/FacRedLineCreateByGeoJsonReq.java new file mode 100644 index 00000000..2fecb2de --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/redline/FacRedLineCreateByGeoJsonReq.java @@ -0,0 +1,28 @@ +package org.dromara.facility.domain.dto.redline; + +import lombok.Data; +import org.dromara.facility.domain.dto.geojson.FacGeoJson; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lilemy + * @date 2025-09-20 17:06 + */ +@Data +public class FacRedLineCreateByGeoJsonReq implements Serializable { + + @Serial + private static final long serialVersionUID = -2075058475382140028L; + + /** + * 项目id + */ + private Long projectId; + + /** + * 地理位置 + */ + private FacGeoJson locationGeoJson; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/redline/FacRedLineVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/redline/FacRedLineVo.java new file mode 100644 index 00000000..c750da9d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/redline/FacRedLineVo.java @@ -0,0 +1,58 @@ +package org.dromara.facility.domain.vo.redline; + +import org.dromara.facility.domain.FacRedLine; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 设施-红线视图对象 fac_red_line + * + * @author lilemy + * @date 2025-09-20 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = FacRedLine.class) +public class FacRedLineVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long id; + + /** + * 项目id + */ + @ExcelProperty(value = "项目id") + private Long projectId; + + /** + * 红线名称 + */ + @ExcelProperty(value = "红线名称") + private String redLineName; + + /** + * 红线位置 + */ + @ExcelProperty(value = "红线位置") + private String positions; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacRedLineMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacRedLineMapper.java new file mode 100644 index 00000000..fa92d9bf --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/mapper/FacRedLineMapper.java @@ -0,0 +1,15 @@ +package org.dromara.facility.mapper; + +import org.dromara.facility.domain.FacRedLine; +import org.dromara.facility.domain.vo.redline.FacRedLineVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设施-红线Mapper接口 + * + * @author lilemy + * @date 2025-09-20 + */ +public interface FacRedLineMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacRedLineService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacRedLineService.java new file mode 100644 index 00000000..9ffcd12b --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacRedLineService.java @@ -0,0 +1,79 @@ +package org.dromara.facility.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.facility.domain.FacRedLine; +import org.dromara.facility.domain.bo.FacRedLineBo; +import org.dromara.facility.domain.dto.redline.FacRedLineCreateByGeoJsonReq; +import org.dromara.facility.domain.vo.redline.FacRedLineVo; + +import java.util.Collection; +import java.util.List; + +/** + * 设施-红线Service接口 + * + * @author lilemy + * @date 2025-09-20 + */ +public interface IFacRedLineService extends IService { + + /** + * 查询设施-红线 + * + * @param id 主键 + * @return 设施-红线 + */ + FacRedLineVo queryById(Long id); + + /** + * 分页查询设施-红线列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设施-红线分页列表 + */ + TableDataInfo queryPageList(FacRedLineBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设施-红线列表 + * + * @param bo 查询条件 + * @return 设施-红线列表 + */ + List queryList(FacRedLineBo bo); + + /** + * 新增设施-红线 + * + * @param bo 设施-红线 + * @return 是否新增成功 + */ + Boolean insertByBo(FacRedLineBo bo); + + /** + * 修改设施-红线 + * + * @param bo 设施-红线 + * @return 是否修改成功 + */ + Boolean updateByBo(FacRedLineBo bo); + + /** + * 校验并批量删除设施-红线信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 根据 GeoJson 新增设施-红线信息 + * + * @param req 新增设施-红线信息 + * @return 是否新增成功 + */ + Boolean insertByGeoJson(FacRedLineCreateByGeoJsonReq req); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java index 72e8aa27..18d203ae 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java @@ -563,6 +563,7 @@ public class FacMatrixServiceImpl extends ServiceImpl getPositionGis(FacFacilityPositionGisReq req) { + List result = new ArrayList<>(); Long projectId = req.getProjectId(); List matrixIdList = req.getMatrixIdList(); List typeList = req.getTypeList(); @@ -570,9 +571,23 @@ public class FacMatrixServiceImpl extends ServiceImpl result = new ArrayList<>(); + List projectIds; + if (project.getPId().equals(0L)) { + // 如果是父项目，获取项目子项 + List projectList = projectService.lambdaQuery() + .select(BusProject::getId) + .eq(BusProject::getPId, projectId) + .list(); + if (CollUtil.isEmpty(projectList)) { + return result; + } + projectIds = projectList.stream().map(BusProject::getId).toList(); + } else { + // 如果是子项目，直接添加 + projectIds = List.of(projectId); + } List matrixList = this.lambdaQuery() - .eq(FacMatrix::getProjectId, projectId) + .in(FacMatrix::getProjectId, projectIds) .in(CollUtil.isNotEmpty(matrixIdList), FacMatrix::getId, matrixIdList) .list(); if (CollUtil.isEmpty(matrixList)) { @@ -599,7 +614,7 @@ public class FacMatrixServiceImpl extends ServiceImpl columnVoList = columnList.stream().map(obj -> @@ -622,7 +637,7 @@ public class FacMatrixServiceImpl extends ServiceImpl pointVoList = pointList.stream().map(obj -> @@ -645,7 +660,7 @@ public class FacMatrixServiceImpl extends ServiceImpl supporVotList = supportList.stream().map(obj -> @@ -668,8 +683,8 @@ public class FacMatrixServiceImpl extends ServiceImpl panelVoList = panelList.stream().map(obj -> @@ -692,8 +707,8 @@ public class FacMatrixServiceImpl extends ServiceImpl boxTransformerVoList = boxTransformerList.stream().map(obj -> @@ -716,8 +731,8 @@ public class FacMatrixServiceImpl extends ServiceImpl inverterVoList = inverterList.stream().map(obj -> diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java index 340be31a..2062e63b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java @@ -812,6 +812,8 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl + implements IFacRedLineService { + + @Resource + private IBusProjectService projectService; + + /** + * 查询设施-红线 + * + * @param id 主键 + * @return 设施-红线 + */ + @Override + public FacRedLineVo queryById(Long id) { + return baseMapper.selectVoById(id); + } + + /** + * 分页查询设施-红线列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设施-红线分页列表 + */ + @Override + public TableDataInfo queryPageList(FacRedLineBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设施-红线列表 + * + * @param bo 查询条件 + * @return 设施-红线列表 + */ + @Override + public List queryList(FacRedLineBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(FacRedLineBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(FacRedLine::getId); + lqw.eq(bo.getProjectId() != null, FacRedLine::getProjectId, bo.getProjectId()); + lqw.like(StringUtils.isNotBlank(bo.getRedLineName()), FacRedLine::getRedLineName, bo.getRedLineName()); + lqw.eq(StringUtils.isNotBlank(bo.getPositions()), FacRedLine::getPositions, bo.getPositions()); + return lqw; + } + + /** + * 新增设施-红线 + * + * @param bo 设施-红线 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(FacRedLineBo bo) { + FacRedLine add = MapstructUtils.convert(bo, FacRedLine.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改设施-红线 + * + * @param bo 设施-红线 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(FacRedLineBo bo) { + FacRedLine update = MapstructUtils.convert(bo, FacRedLine.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(FacRedLine entity) { + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除设施-红线信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 根据 GeoJson 新增设施-红线信息 + * + * @param req 新增设施-红线信息 + * @return 是否新增成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByGeoJson(FacRedLineCreateByGeoJsonReq req) { + Long projectId = req.getProjectId(); + BusProject project = projectService.getById(projectId); + if (project == null) { + throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND); + } + // 如果为子项目，获取他的父级项目 + if (project.getPId() != 0) { + project = projectService.lambdaQuery() + .eq(BusProject::getId, project.getPId()) + .one(); + } + // 获取项目下的设施-红线 + FacRedLine oldRedLine = this.lambdaQuery() + .eq(FacRedLine::getProjectId, project.getId()) + .one(); + FacRedLine redLine = new FacRedLine(); + redLine.setRedLineName(project.getProjectName() + "红线"); + redLine.setProjectId(project.getId()); + // 获取新建红线的位置信息 + FacGeoJson locationGeoJson = req.getLocationGeoJson(); + List features = locationGeoJson.getFeatures(); + FacGeometry geometry = features.getFirst().getGeometry(); + // 获取坐标信息 + List> coordinatesList = JSTUtil.getTwoDimensionalCoordinates(geometry); + // 将位置信息转换为 JSON 字符串 + String positionStr = JSONUtil.toJsonStr(coordinatesList); + redLine.setPositions(positionStr); + // 操作数据库 + boolean result = this.save(redLine); + if (!result) { + throw new ServiceException("新增红线失败，数据库异常", HttpStatus.ERROR); + } + if (oldRedLine != null) { + boolean remove = this.removeById(oldRedLine); + if (!remove) { + throw new ServiceException("删除老红线失败，数据库异常", HttpStatus.ERROR); + } + } + return true; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/dronemanager/DroneConstant.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/dronemanager/DroneConstant.java new file mode 100644 index 00000000..5f4ef216 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/dronemanager/DroneConstant.java @@ -0,0 +1,14 @@ +package org.dromara.manager.dronemanager; + +/** + * @author lilemy + * @date 2025-09-20 16:23 + */ +public interface DroneConstant { + + /** + * 添加无人机项目信息 + */ + String ADD_DRONE_INFO_BY_PROJECT = "/dj/project/addProjectAndGatewayInfo"; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/dronemanager/DroneManager.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/dronemanager/DroneManager.java new file mode 100644 index 00000000..401a366e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/dronemanager/DroneManager.java @@ -0,0 +1,30 @@ +package org.dromara.manager.dronemanager; + +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author lilemy + * @date 2025-09-20 15:23 + */ +@Slf4j +@Component +public class DroneManager { + + @Resource + private DroneProperties droneProperties; + + /** + * 添加机场信息 + * + * @param gateways 网关列表 + * @param projectId 项目id + */ + public void addAirportInfoByProject(List gateways, Long projectId) { + DroneRequestUtils.addAirportInfoByProject(droneProperties.getUrl(), gateways, projectId); + } + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/dronemanager/DroneRequestUtils.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/dronemanager/DroneRequestUtils.java new file mode 100644 index 00000000..0146a1d1 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/dronemanager/DroneRequestUtils.java @@ -0,0 +1,61 @@ +package org.dromara.manager.dronemanager; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.HttpStatus; +import org.dromara.common.core.exception.ServiceException; + +import java.util.List; + +/** + * @author lilemy + * @date 2025-09-20 15:00 + */ +@Slf4j +public class DroneRequestUtils { + + /** + * 添加项目机场信息 + * + * @param gateways 飞机编号 + * @param projectId 项目id + */ + public static void addAirportInfoByProject(String url, List gateways, Long projectId) { + if (CollUtil.isEmpty(gateways)) { + throw new ServiceException("请选择飞机", HttpStatus.BAD_REQUEST); + } + if (projectId == null) { + throw new ServiceException("请选择项目", HttpStatus.BAD_REQUEST); + } + // 拼接 query 参数 + StringBuilder queryBuilder = new StringBuilder(); + queryBuilder.append("projectId=").append(projectId); + for (String gateway : gateways) { + queryBuilder.append("&gateways=").append(gateway); + } + + // 完整 URL + String fullUrl = url + DroneConstant.ADD_DRONE_INFO_BY_PROJECT + "?" + queryBuilder; + String errorMsg = "添加项目机场信息请求失败"; + try (HttpResponse response = HttpRequest.post(fullUrl) + .body("{}") + .execute()) { + if (!response.isOk()) { + log.error("{}：{}", errorMsg, response.getStatus()); + throw new ServiceException(errorMsg + response.getStatus()); + } + String body = response.body(); + JSONObject obj = JSONUtil.parseObj(body); + if (!obj.get("code").equals("200")) { + log.error("{}，状态码：{}，{}", errorMsg, obj.get("code"), obj.get("msg")); + throw new ServiceException(errorMsg + obj.get("msg")); + } + log.info("添加项目机场信息请求成功"); + } + } + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/constructionscheduleplan/PgsConstructionSchedulePlanUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/constructionscheduleplan/PgsConstructionSchedulePlanUpdateReq.java index 8c3051a0..f8a30dfd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/constructionscheduleplan/PgsConstructionSchedulePlanUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/constructionscheduleplan/PgsConstructionSchedulePlanUpdateReq.java @@ -26,6 +26,11 @@ public class PgsConstructionSchedulePlanUpdateReq implements Serializable { */ private String nodeName; + /** + * 父ID + */ + private Long parentId; + /** * 对应项目结构 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java index f7140c00..0b03b326 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java @@ -73,7 +73,7 @@ public class BusProjectController extends BaseController { /** * 查询项目下的子项目方阵列表 */ - @SaCheckPermission("project:project:listSubMatrix") +// @SaCheckPermission("project:project:listSubMatrix") @GetMapping("/list/sub/matrix/{id}") public R> listSubProjectMatrix(@NotNull(message = "项目id不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/facility/FacRedLineMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/facility/FacRedLineMapper.xml new file mode 100644 index 00000000..0e5cb9af --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/facility/FacRedLineMapper.xml @@ -0,0 +1,7 @@ + + + + +