From cf5d71d528b00e7bfa519c0c13ee9fcd609f4adc Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Fri, 22 Aug 2025 09:11:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=90=E6=96=99=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E9=83=A8=E4=BD=8D=EF=BC=8C=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 + .../controller/MoneyBigScreenController.java | 21 +++ .../ProjectBigScreenController.java | 42 ++++++ .../service/MoneyBigScreenService.java | 12 ++ .../service/ProjectBigScreenService.java | 30 +++++ .../impl/MoneyBigScreenServiceImpl.java | 18 +++ .../impl/ProjectBigScreenServiceImpl.java | 65 ++++++++++ .../cory/controller/OtherDateSource.java | 40 ------ .../org/dromara/cory/domain/SysProject.java | 115 ----------------- .../cory/domain/SysProjectTeamSquad.java | 62 --------- .../cory/domain/bo/SysProjectListReq.java | 27 ---- .../cory/domain/vo/SysProjectTeamSquadVo.java | 121 ----------------- .../dromara/cory/domain/vo/SysProjectVo.java | 122 ------------------ .../cory/mapper/OtherDateSourceMapper.java | 16 --- .../cory/mapper/ShiftMeetingMapper.java | 15 --- .../cory/service/IOtherDateSourceService.java | 18 --- .../cory/service/IShiftMeetingService.java | 11 -- .../impl/OtherDateSourceServiceImpl.java | 42 ------ .../service/impl/ShiftMeetingServiceImpl.java | 35 ----- .../impl/DesVolumeFileServiceImpl.java | 47 +++---- .../domain/MatMaterialsInventory.java | 5 + .../MatMaterialsInventoryCreateReq.java | 5 + .../MatMaterialsInventoryQueryReq.java | 19 +-- .../MatMaterialsInventoryUpdateReq.java | 5 + .../MatMaterialsInventoryVo.java | 6 + .../impl/MatMaterialReceiveServiceImpl.java | 9 +- .../MatMaterialsInventoryServiceImpl.java | 20 ++- .../domain/vo/project/BusProjectGisVo.java | 47 +++++++ .../service/IBusProjectNewsService.java | 16 +++ .../project/service/IBusProjectService.java | 7 + .../impl/BusProjectNewsServiceImpl.java | 25 ++++ .../service/impl/BusProjectServiceImpl.java | 19 +++ 32 files changed, 356 insertions(+), 688 deletions(-) delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/controller/OtherDateSource.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/SysProject.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/SysProjectTeamSquad.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/SysProjectListReq.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/SysProjectTeamSquadVo.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/SysProjectVo.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/OtherDateSourceMapper.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/ShiftMeetingMapper.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IOtherDateSourceService.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IShiftMeetingService.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/OtherDateSourceServiceImpl.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/ShiftMeetingServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectGisVo.java diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index 319fef97..18c5e706 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -265,6 +265,8 @@ springdoc: packages-to-scan: org.dromara.ctr - group: 21.招标模块 packages-to-scan: org.dromara.tender + - group: 22.大屏模块 + packages-to-scan: org.dromara.bigscreen # knife4j的增强配置，不需要增强可以不配 knife4j: enable: true diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/MoneyBigScreenController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/MoneyBigScreenController.java index d2c6e86e..2b16eeca 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/MoneyBigScreenController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/MoneyBigScreenController.java @@ -1,10 +1,19 @@ package org.dromara.bigscreen.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.annotation.Resource; +import org.dromara.bigscreen.service.MoneyBigScreenService; +import org.dromara.common.core.domain.R; +import org.dromara.project.domain.vo.project.BusProjectGisVo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** + * 资金大屏 + * * @author lilemy * @date 2025-08-21 14:28 */ @@ -12,4 +21,16 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/money/big/screen") public class MoneyBigScreenController { + + @Resource + private MoneyBigScreenService moneyBigScreenService; + + /** + * 查询项目位置列表 + */ + @SaCheckPermission("money:bigScreen:projectGis") + @RequestMapping("/project/gis") + public R> getProjectGis() { + return R.ok(moneyBigScreenService.getProjectGis()); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java index f16b4a5e..668b5a32 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java @@ -1,12 +1,24 @@ package org.dromara.bigscreen.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.annotation.Resource; +import jakarta.validation.constraints.NotNull; import org.dromara.bigscreen.service.ProjectBigScreenService; +import org.dromara.common.core.domain.R; +import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo; +import org.dromara.project.domain.vo.project.BusProjectWeatherVo; +import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** + * 项目级大屏 + * * @author lilemy * @date 2025-08-21 14:27 */ @@ -24,4 +36,34 @@ public class ProjectBigScreenController { // @PathVariable Long id) { // return R.ok(busBiddingPlanAnnexService.queryById(id)); // } + + /** + * 查询项目天气 + */ + @SaCheckPermission("project:bigScreen:weather") + @GetMapping("/weather/{projectId}") + public R> getProjectWeather(@NotNull(message = "主键不能为空") + @PathVariable Long projectId) { + return R.ok(projectBigScreenService.getProjectWeather(projectId)); + } + + /** + * 查询项目安全天数 + */ + @SaCheckPermission("project:bigScreen:safetyDay") + @GetMapping("/safetyDay/{projectId}") + public R getProjectSafetyDay(@NotNull(message = "主键不能为空") + @PathVariable Long projectId) { + return R.ok(projectBigScreenService.getProjectSafetyDay(projectId)); + } + + /** + * 查询项目公告 + */ + @SaCheckPermission("project:bigScreen:news") + @GetMapping("/news/{projectId}") + public R> getProjectNews(@NotNull(message = "主键不能为空") + @PathVariable Long projectId) { + return R.ok(projectBigScreenService.getProjectNews(projectId)); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/MoneyBigScreenService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/MoneyBigScreenService.java index c2b472c0..dbf23996 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/MoneyBigScreenService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/MoneyBigScreenService.java @@ -1,8 +1,20 @@ package org.dromara.bigscreen.service; +import org.dromara.project.domain.vo.project.BusProjectGisVo; + +import java.util.List; + /** * @author lilemy * @date 2025-08-21 14:29 */ public interface MoneyBigScreenService { + + /** + * 获取项目位置信息 + * + * @return 项目位置信息 + */ + List getProjectGis(); + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ProjectBigScreenService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ProjectBigScreenService.java index 686f8b7e..20820a68 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ProjectBigScreenService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ProjectBigScreenService.java @@ -1,8 +1,38 @@ package org.dromara.bigscreen.service; +import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo; +import org.dromara.project.domain.vo.project.BusProjectWeatherVo; +import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo; + +import java.util.List; + /** * @author lilemy * @date 2025-08-21 14:28 */ public interface ProjectBigScreenService { + + /** + * 获取项目天气 + * + * @param projectId 项目id + * @return 项目天气 + */ + List getProjectWeather(Long projectId); + + /** + * 获取项目安全天数 + * + * @param projectId 项目id + * @return 项目安全天数 + */ + BusProjectSafetyDayVo getProjectSafetyDay(Long projectId); + + /** + * 获取项目新闻 + * + * @param projectId 项目id + * @return 项目新闻 + */ + List getProjectNews(Long projectId); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/MoneyBigScreenServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/MoneyBigScreenServiceImpl.java index a9aed898..bd2b28a1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/MoneyBigScreenServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/MoneyBigScreenServiceImpl.java @@ -1,12 +1,30 @@ package org.dromara.bigscreen.service.impl; +import jakarta.annotation.Resource; import org.dromara.bigscreen.service.MoneyBigScreenService; +import org.dromara.project.domain.vo.project.BusProjectGisVo; +import org.dromara.project.service.IBusProjectService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author lilemy * @date 2025-08-21 14:29 */ @Service public class MoneyBigScreenServiceImpl implements MoneyBigScreenService { + + @Resource + private IBusProjectService projectService; + + /** + * 获取项目位置信息 + * + * @return 项目位置信息 + */ + @Override + public List getProjectGis() { + return projectService.getGisList(); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java index d21b79ee..ecf3640d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java @@ -1,12 +1,77 @@ package org.dromara.bigscreen.service.impl; +import jakarta.annotation.Resource; import org.dromara.bigscreen.service.ProjectBigScreenService; +import org.dromara.common.core.constant.HttpStatus; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.project.domain.BusProject; +import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo; +import org.dromara.project.domain.vo.project.BusProjectWeatherVo; +import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo; +import org.dromara.project.service.IBusProjectNewsService; +import org.dromara.project.service.IBusProjectService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author lilemy * @date 2025-08-21 14:29 */ @Service public class ProjectBigScreenServiceImpl implements ProjectBigScreenService { + + @Resource + private IBusProjectService projectService; + + @Resource + private IBusProjectNewsService projectNewsService; + + /** + * 获取项目天气 + * + * @param projectId 项目id + * @return 项目天气 + */ + @Override + public List getProjectWeather(Long projectId) { + checkProject(projectId); + return projectService.getWeather(projectId); + } + + /** + * 获取项目安全天数 + * + * @param projectId 项目id + * @return 项目安全天数 + */ + @Override + public BusProjectSafetyDayVo getProjectSafetyDay(Long projectId) { + checkProject(projectId); + return projectService.getSafetyDay(projectId); + } + + /** + * 获取项目新闻 + * + * @param projectId 项目id + * @return 项目新闻 + */ + @Override + public List getProjectNews(Long projectId) { + checkProject(projectId); + return projectNewsService.queryListByProject(projectId); + } + + /** + * 检查项目是否存在 + * + * @param projectId 项目id + */ + private void checkProject(Long projectId) { + BusProject project = projectService.getById(projectId); + if (project == null) { + throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND); + } + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/controller/OtherDateSource.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/controller/OtherDateSource.java deleted file mode 100644 index 96a3e80a..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/controller/OtherDateSource.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.dromara.cory.controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import com.baomidou.dynamic.datasource.annotation.DS; -import lombok.RequiredArgsConstructor; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.cory.domain.bo.BusContactnoticeBo; -import org.dromara.cory.domain.bo.SysProjectListReq; -import org.dromara.cory.domain.vo.BusContactnoticeVo; -import org.dromara.cory.domain.vo.SysProjectVo; -import org.dromara.cory.service.IOtherDateSourceService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Author 铁憨憨 - * @Date 2025/7/29 9:21 - * @Version 1.0 - */ - - -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/cory/otherDateSource") -@DS("slave") -public class OtherDateSource { - private final IOtherDateSourceService otherDateSourceService; - - /** - * 获取项目列表 - */ - @GetMapping("/list") - public TableDataInfo list(SysProjectListReq bo, PageQuery pageQuery) { - return otherDateSourceService.list(bo, pageQuery); - } -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/SysProject.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/SysProject.java deleted file mode 100644 index a5bcfcb3..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/SysProject.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.dromara.cory.domain; - -import com.baomidou.mybatisplus.annotation.*; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.Pattern; -import lombok.Data; -import com.baomidou.mybatisplus.annotation.*; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.hibernate.validator.constraints.Length; -import java.util.Date; - -import java.io.Serializable; - -/** - * @Author 铁憨憨 - * @Date 2025/7/29 9:27 - * @Version 1.0 - */ -@Data -@TableName("sys_project") // 替换为实际表名 -public class SysProject implements Serializable { - - @TableId(type = IdType.AUTO) - private Long id; - - @Length(max = 64, message = "项目名称长度不能超过64个字符") - private String projectName; - - @Length(max = 64, message = "项目简称长度不能超过64个字符") - private String shortName; - - private Long pId; - - @Pattern(regexp = "[01]", message = "状态值必须为0或1") - private String status; - - @Length(max = 255, message = "项目图片URL长度不能超过255个字符") - private String picUrl; - - @Length(max = 20, message = "经度长度不能超过20个字符") - private String lng; - - @Length(max = 20, message = "纬度长度不能超过20个字符") - private String lat; - - @Length(max = 500, message = "备注长度不能超过500个字符") - private String remark; - - @Length(max = 20, message = "项目类型长度不能超过20个字符") - private String type; - - @Pattern(regexp = "[12]", message = "项目类型值必须为1或2") - private String isType; - - @Length(max = 20, message = "展示颜色长度不能超过20个字符") - private String colourRgb; - - @Length(max = 64, message = "创建者长度不能超过64个字符") - private String createBy; - - @Length(max = 64, message = "更新者长度不能超过64个字符") - private String updateBy; - - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - - private Date deletedAt; - - @Deprecated - @Length(max = 255, message = "项目ID长度不能超过255个字符") - private String projectId; - - @Length(max = 8192, message = "视角参数长度不能超过8192个字符") - private String view; - - @Length(max = 255, message = "项目地址长度不能超过255个字符") - private String projectSite; - - @Length(max = 50, message = "负责人长度不能超过50个字符") - private String principal; - - @Pattern(regexp = "^1[3-9]\\d{9}$", message = "负责人电话格式不正确") - private String principalPhone; - - @Length(max = 64, message = "小程序薪资负责人长度不能超过64个字符") - private String principalXz; - - @Length(max = 64, message = "实际容量长度不能超过64个字符") - private String actual; - - @Length(max = 64, message = "计划容量长度不能超过64个字符") - private String plan; - - @Length(max = 64, message = "开工时间长度不能超过64个字符") - private String onStreamTime; - - @Pattern(regexp = "^\\d{2}:\\d{2},\\d{2}:\\d{2}$", message = "打卡范围格式不正确，应为HH:MM,HH:MM") - private String punchRange; - - @Min(value = 0, message = "设计总量不能小于0") - private Integer designTotal; - - @Length(max = 255, message = "安全协议书长度不能超过255个字符") - private String securityAgreement; - - @Min(value = 0, message = "排序字段不能小于0") - private Long sort; - - @Pattern(regexp = "[12]", message = "显示隐藏值必须为1或2") - private String showHidden; -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/SysProjectTeamSquad.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/SysProjectTeamSquad.java deleted file mode 100644 index 6b55436c..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/SysProjectTeamSquad.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.dromara.cory.domain; - -import com.baomidou.mybatisplus.annotation.*; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; -import lombok.Data; -import org.hibernate.validator.constraints.Length; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Author 铁憨憨 - * @Date 2025/7/29 9:27 - * @Version 1.0 - */ -@Data -@TableName("sys_project_team_squad") -public class SysProjectTeamSquad implements Serializable { - - @TableId(type = IdType.AUTO) - private Long id; - - @NotNull(message = "班组ID不能为空") - private Long teamId; - - private Date meetingDate; - - @Length(max = 255, message = "宣讲人ID长度不能超过255个字符") - private String compereId; - - private String participantId; - - @Length(max = 65535, message = "班会内容长度不能超过65535个字符") - private String content; - - @Length(max = 65535, message = "班会图片长度不能超过65535个字符") - private String picture; - - @Length(max = 50, message = "创建人长度不能超过50个字符") - private String createBy; - - @Length(max = 50, message = "更新人长度不能超过50个字符") - private String updateBy; - - @TableField(fill = FieldFill.INSERT) - private Date createdAt; - - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updatedAt; - - private Date deletedAt; - - @Length(max = 255, message = "班组名称长度不能超过255个字符") - private String teamName; - - @Length(max = 255, message = "劳务公司名称长度不能超过255个字符") - private String labourserviceName; - - private Long projectId; -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/SysProjectListReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/SysProjectListReq.java deleted file mode 100644 index a033658d..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/bo/SysProjectListReq.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.dromara.cory.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.cory.domain.BusContactnotice; -import org.dromara.cory.domain.SysProject; -import org.hibernate.validator.constraints.Length; - -import java.io.Serializable; - -/** - * @Author 铁憨憨 - * @Date 2025/7/29 9:42 - * @Version 1.0 - */ - -@Data -public class SysProjectListReq implements Serializable { - @Length(max = 64, message = "项目名称长度不能超过64个字符") - private String projectName; - - @Length(max = 64, message = "项目简称长度不能超过64个字符") - private String shortName; - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/SysProjectTeamSquadVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/SysProjectTeamSquadVo.java deleted file mode 100644 index 6a7aef9b..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/SysProjectTeamSquadVo.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.dromara.cory.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.Pattern; -import lombok.Data; -import org.dromara.cory.domain.SysProject; -import org.hibernate.validator.constraints.Length; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Author 铁憨憨 - * @Date 2025/7/29 9:35 - * @Version 1.0 - */ - -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysProject.class) -public class SysProjectTeamSquadVo implements Serializable { - - @TableId(type = IdType.AUTO) - private Long id; - - @Length(max = 64, message = "项目名称长度不能超过64个字符") - private String projectName; - - @Length(max = 64, message = "项目简称长度不能超过64个字符") - private String shortName; - - private Long pId; - - @Pattern(regexp = "[01]", message = "状态值必须为0或1") - private String status; - - @Length(max = 255, message = "项目图片URL长度不能超过255个字符") - private String picUrl; - - @Length(max = 20, message = "经度长度不能超过20个字符") - private String lng; - - @Length(max = 20, message = "纬度长度不能超过20个字符") - private String lat; - - @Length(max = 500, message = "备注长度不能超过500个字符") - private String remark; - - @Length(max = 20, message = "项目类型长度不能超过20个字符") - private String type; - - @Pattern(regexp = "[12]", message = "项目类型值必须为1或2") - private String isType; - - @Length(max = 20, message = "展示颜色长度不能超过20个字符") - private String colourRgb; - - @Length(max = 64, message = "创建者长度不能超过64个字符") - private String createBy; - - @Length(max = 64, message = "更新者长度不能超过64个字符") - private String updateBy; - - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - - private Date deletedAt; - - @Deprecated - @Length(max = 255, message = "项目ID长度不能超过255个字符") - private String projectId; - - @Length(max = 8192, message = "视角参数长度不能超过8192个字符") - private String view; - - @Length(max = 255, message = "项目地址长度不能超过255个字符") - private String projectSite; - - @Length(max = 50, message = "负责人长度不能超过50个字符") - private String principal; - - @Pattern(regexp = "^1[3-9]\\d{9}$", message = "负责人电话格式不正确") - private String principalPhone; - - @Length(max = 64, message = "小程序薪资负责人长度不能超过64个字符") - private String principalXz; - - @Length(max = 64, message = "实际容量长度不能超过64个字符") - private String actual; - - @Length(max = 64, message = "计划容量长度不能超过64个字符") - private String plan; - - @Length(max = 64, message = "开工时间长度不能超过64个字符") - private String onStreamTime; - - @Pattern(regexp = "^\\d{2}:\\d{2},\\d{2}:\\d{2}$", message = "打卡范围格式不正确，应为HH:MM,HH:MM") - private String punchRange; - - @Min(value = 0, message = "设计总量不能小于0") - private Integer designTotal; - - @Length(max = 255, message = "安全协议书长度不能超过255个字符") - private String securityAgreement; - - @Min(value = 0, message = "排序字段不能小于0") - private Long sort; - - @Pattern(regexp = "[12]", message = "显示隐藏值必须为1或2") - private String showHidden; - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/SysProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/SysProjectVo.java deleted file mode 100644 index ea19b2df..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/SysProjectVo.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.dromara.cory.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.Pattern; -import lombok.Data; -import org.dromara.cory.domain.BusContactnotice; -import org.dromara.cory.domain.SysProject; -import org.hibernate.validator.constraints.Length; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Author 铁憨憨 - * @Date 2025/7/29 9:35 - * @Version 1.0 - */ - -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysProject.class) -public class SysProjectVo implements Serializable { - - @TableId(type = IdType.AUTO) - private Long id; - - @Length(max = 64, message = "项目名称长度不能超过64个字符") - private String projectName; - - @Length(max = 64, message = "项目简称长度不能超过64个字符") - private String shortName; - - private Long pId; - - @Pattern(regexp = "[01]", message = "状态值必须为0或1") - private String status; - - @Length(max = 255, message = "项目图片URL长度不能超过255个字符") - private String picUrl; - - @Length(max = 20, message = "经度长度不能超过20个字符") - private String lng; - - @Length(max = 20, message = "纬度长度不能超过20个字符") - private String lat; - - @Length(max = 500, message = "备注长度不能超过500个字符") - private String remark; - - @Length(max = 20, message = "项目类型长度不能超过20个字符") - private String type; - - @Pattern(regexp = "[12]", message = "项目类型值必须为1或2") - private String isType; - - @Length(max = 20, message = "展示颜色长度不能超过20个字符") - private String colourRgb; - - @Length(max = 64, message = "创建者长度不能超过64个字符") - private String createBy; - - @Length(max = 64, message = "更新者长度不能超过64个字符") - private String updateBy; - - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - - private Date deletedAt; - - @Deprecated - @Length(max = 255, message = "项目ID长度不能超过255个字符") - private String projectId; - - @Length(max = 8192, message = "视角参数长度不能超过8192个字符") - private String view; - - @Length(max = 255, message = "项目地址长度不能超过255个字符") - private String projectSite; - - @Length(max = 50, message = "负责人长度不能超过50个字符") - private String principal; - - @Pattern(regexp = "^1[3-9]\\d{9}$", message = "负责人电话格式不正确") - private String principalPhone; - - @Length(max = 64, message = "小程序薪资负责人长度不能超过64个字符") - private String principalXz; - - @Length(max = 64, message = "实际容量长度不能超过64个字符") - private String actual; - - @Length(max = 64, message = "计划容量长度不能超过64个字符") - private String plan; - - @Length(max = 64, message = "开工时间长度不能超过64个字符") - private String onStreamTime; - - @Pattern(regexp = "^\\d{2}:\\d{2},\\d{2}:\\d{2}$", message = "打卡范围格式不正确，应为HH:MM,HH:MM") - private String punchRange; - - @Min(value = 0, message = "设计总量不能小于0") - private Integer designTotal; - - @Length(max = 255, message = "安全协议书长度不能超过255个字符") - private String securityAgreement; - - @Min(value = 0, message = "排序字段不能小于0") - private Long sort; - - @Pattern(regexp = "[12]", message = "显示隐藏值必须为1或2") - private String showHidden; - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/OtherDateSourceMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/OtherDateSourceMapper.java deleted file mode 100644 index 70c86a22..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/OtherDateSourceMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.cory.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.cory.domain.BusContactnotice; -import org.dromara.cory.domain.SysProject; -import org.dromara.cory.domain.vo.BusContactnoticeVo; -import org.dromara.cory.domain.vo.SysProjectVo; - -/** - * @Author 铁憨憨 - * @Date 2025/7/29 9:25 - * @Version 1.0 - */ -public interface OtherDateSourceMapper extends BaseMapperPlus { - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/ShiftMeetingMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/ShiftMeetingMapper.java deleted file mode 100644 index 8e41f834..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/ShiftMeetingMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.cory.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.cory.domain.SysProject; -import org.dromara.cory.domain.SysProjectTeamSquad; -import org.dromara.cory.domain.vo.SysProjectVo; - -/** - * @Author 铁憨憨 - * @Date 2025/7/29 9:25 - * @Version 1.0 - */ -public interface ShiftMeetingMapper extends BaseMapperPlus { - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IOtherDateSourceService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IOtherDateSourceService.java deleted file mode 100644 index 5a92694d..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IOtherDateSourceService.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.cory.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.cory.domain.SysProject; -import org.dromara.cory.domain.bo.SysProjectListReq; -import org.dromara.cory.domain.vo.SysProjectVo; - -import java.util.List; - -/** - * @Author 铁憨憨 - * @Date 2025/7/29 9:26 - * @Version 1.0 - */public interface IOtherDateSourceService extends IService { - TableDataInfo list(SysProjectListReq bo, PageQuery pageQuery); -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IShiftMeetingService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IShiftMeetingService.java deleted file mode 100644 index 1c683f87..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IShiftMeetingService.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.dromara.cory.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import org.dromara.cory.domain.SysProjectTeamSquad; - -/** - * @Author 铁憨憨 - * @Date 2025/7/29 9:26 - * @Version 1.0 - */public interface IShiftMeetingService extends IService { -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/OtherDateSourceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/OtherDateSourceServiceImpl.java deleted file mode 100644 index b192dacb..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/OtherDateSourceServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.dromara.cory.service.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.cory.domain.BusContactnotice; -import org.dromara.cory.domain.SysProject; -import org.dromara.cory.domain.bo.SysProjectListReq; -import org.dromara.cory.domain.vo.BusContactnoticeVo; -import org.dromara.cory.domain.vo.SysProjectVo; -import org.dromara.cory.mapper.OtherDateSourceMapper; -import org.dromara.cory.service.IBusContactnoticeService; -import org.dromara.cory.service.IOtherDateSourceService; -import org.mapstruct.Mapper; -import org.springframework.stereotype.Service; - -/** - * @Author 铁憨憨 - * @Date 2025/7/29 9:25 - * @Version 1.0 - */ - -@Slf4j -@RequiredArgsConstructor -@Service -@DS("slave") -public class OtherDateSourceServiceImpl extends ServiceImpl implements IOtherDateSourceService { - @Override - public TableDataInfo list(SysProjectListReq req, PageQuery pageQuery) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.like(SysProject::getProjectName,req.getProjectName()); - lqw.like(SysProject::getShortName,req.getShortName()); - IPage sysProjectVoIPage = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(sysProjectVoIPage); - } -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/ShiftMeetingServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/ShiftMeetingServiceImpl.java deleted file mode 100644 index 3773a122..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/ShiftMeetingServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.dromara.cory.service.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.cory.domain.SysProject; -import org.dromara.cory.domain.SysProjectTeamSquad; -import org.dromara.cory.domain.bo.SysProjectListReq; -import org.dromara.cory.domain.vo.SysProjectVo; -import org.dromara.cory.mapper.OtherDateSourceMapper; -import org.dromara.cory.mapper.ShiftMeetingMapper; -import org.dromara.cory.service.IOtherDateSourceService; -import org.dromara.cory.service.IShiftMeetingService; -import org.springframework.stereotype.Service; - -import java.util.Collection; - -/** - * @Author 铁憨憨 - * @Date 2025/7/29 9:25 - * @Version 1.0 - */ - -@Slf4j -@RequiredArgsConstructor -@Service -@DS("slave") -public class ShiftMeetingServiceImpl extends ServiceImpl implements IShiftMeetingService { - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java index 7f29dea3..3a78175e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java @@ -7,7 +7,6 @@ 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 com.esotericsoftware.kryo.serializers.DefaultSerializers; import io.micrometer.common.util.StringUtils; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -19,10 +18,8 @@ import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.design.domain.DesDrawing; import org.dromara.design.domain.DesVolumeCatalog; import org.dromara.design.domain.DesVolumeFile; -import org.dromara.design.domain.DesVolumeFileViewer; import org.dromara.design.domain.bo.DesVolumeFileBo; import org.dromara.design.domain.dto.volumefile.DesVolumeFileCreateReq; import org.dromara.design.domain.vo.volumefile.DesVolumeFileCodeVo; @@ -32,7 +29,6 @@ import org.dromara.design.mapper.DesVolumeFileMapper; import org.dromara.design.service.IDesDrawingService; import org.dromara.design.service.IDesVolumeCatalogService; import org.dromara.design.service.IDesVolumeFileService; -import org.dromara.design.service.IDesVolumeFileViewerService; import org.dromara.project.domain.BusProject; import org.dromara.project.service.IBusProjectService; import org.dromara.system.domain.vo.SysOssVo; @@ -65,11 +61,12 @@ public class DesVolumeFileServiceImpl extends ServiceImpl existingFiles = baseMapper.selectList(new LambdaQueryWrapper() @@ -225,7 +222,7 @@ public class DesVolumeFileServiceImpl extends ServiceImpl fileIds, String type, List desVolumeFiles) { // 用于记录同一批次中已处理的文件名及对应的版本号 @@ -350,9 +347,6 @@ public class DesVolumeFileServiceImpl extends ServiceImpl log.info("图纸[{}-{} ]添加二维码成功", desVolumeFile.getFileName(), desVolumeFile.getId())) .exceptionally(ex -> { log.error("图纸[{}-{}]添加二维码失败", desVolumeFile.getFileName(), desVolumeFile.getId(), ex); @@ -417,7 +411,6 @@ public class DesVolumeFileServiceImpl extends ServiceImpl log.info("图纸[{}-{} ]添加二维码成功", desVolumeFile.getFileName(), desVolumeFile.getId())) .exceptionally(ex -> { log.error("图纸[{}-{}]添加二维码失败", desVolumeFile.getFileName(), desVolumeFile.getId(), ex); @@ -475,10 +468,4 @@ public class DesVolumeFileServiceImpl extends ServiceImpl 0){ - map.put(item.getPlanId(),item.getShortageQuantity()); + if (item.getShortageQuantity().compareTo(BigDecimal.ZERO) > 0) { + map.put(item.getPlanId(), item.getShortageQuantity()); } materialReceiveItemList.add(materialReceiveItem); } @@ -275,8 +274,6 @@ public class MatMaterialReceiveServiceImpl extends ServiceImpl materialsQueryWrapper = Wrappers.lambdaQuery(MatMaterials.class) @@ -269,17 +270,14 @@ public class MatMaterialsInventoryServiceImpl extends ServiceImpl { */ List queryGisList(BusProjectNewsGisReq req); + /** + * 根据项目id查询项目新闻列表 + * + * @param projectId 项目id + * @return 项目新闻列表 + */ + List queryListByProject(Long projectId); + /** * 新增项目新闻 * @@ -106,4 +114,12 @@ public interface IBusProjectNewsService extends IService { */ Page getVoPage(Page projectNewsPage); + /** + * 获取项目新闻存储列表视图对象 + * + * @param projectNewsList 项目新闻存储列表对象 + * @return 项目新闻存储列表视图对象 + */ + List getVoList(List projectNewsList); + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java index 5d7380b7..50f3fd4d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java @@ -180,4 +180,11 @@ public interface IBusProjectService extends IService { * @return 安全天数 */ BusProjectSafetyDayVo getSafetyDay(Long id); + + /** + * 获取项目地址信息 + * + * @return 项目地址信息列表 + */ + List getGisList(); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectNewsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectNewsServiceImpl.java index 9d23716c..d53e0063 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectNewsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectNewsServiceImpl.java @@ -105,6 +105,20 @@ public class BusProjectNewsServiceImpl extends ServiceImpl queryListByProject(Long projectId) { + List list = this.lambdaQuery() + .eq(BusProjectNews::getProjectId, projectId) + .list(); + return this.getVoList(list); + } + /** * 新增项目新闻 * @@ -240,4 +254,15 @@ public class BusProjectNewsServiceImpl extends ServiceImpl getVoList(List projectNewsList) { + return projectNewsList.stream().map(this::getVo).toList(); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java index 95f07661..31c6b1f1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java @@ -886,6 +886,25 @@ public class BusProjectServiceImpl extends ServiceImpl getGisList() { + // 查询所有的顶级项目 + List projects = this.lambdaQuery() + .eq(BusProject::getPId, BusProjectConstant.PARENT_ID) + .eq(BusProject::getStatus, "0") + .list(); + return projects.stream().map(project -> { + BusProjectGisVo vo = new BusProjectGisVo(); + BeanUtils.copyProperties(project, vo); + return vo; + }).toList(); + } + /** * 根据天气图标获取天气类别 *