From fc9b64fc36ba95afc02ade4f277d8c538ab359eb Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Fri, 19 Sep 2025 20:28:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/org/dromara/test/DemoTest.java | 9 + .../dto/matrix/FacFacilityPositionGisReq.java | 5 + .../service/impl/FacMatrixServiceImpl.java | 287 ++++++++++-------- .../impl/FacPhotovoltaicPanelServiceImpl.java | 36 ++- .../weathermanager/WeatherConstant.java | 2 +- ...gsConstructionSchedulePlanServiceImpl.java | 8 +- .../service/impl/BusProjectServiceImpl.java | 24 +- .../QltQualityInspectionController.java | 14 +- .../QltQualityInspectionUpdateFileReq.java | 42 +++ .../HseSafetyInspectionController.java | 9 + .../HseSafetyInspectionUpdateFileReq.java | 32 ++ .../service/IHseSafetyInspectionService.java | 1 - .../impl/HseSafetyInspectionServiceImpl.java | 4 +- .../controller/system/SysOssController.java | 14 + 14 files changed, 325 insertions(+), 162 deletions(-) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionUpdateFileReq.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionUpdateFileReq.java diff --git a/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java b/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java index 835b270f..f132da5a 100644 --- a/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java +++ b/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java @@ -18,6 +18,7 @@ import org.dromara.facility.service.IFacMatrixService; import org.dromara.facility.service.IFacPhotovoltaicPanelPartsService; import org.dromara.progress.service.IPgsProgressCategoryService; import org.dromara.progress.service.IPgsProgressCategoryTemplateService; +import org.dromara.progress.service.IPgsProgressPlanDetailService; import org.dromara.project.service.IBusProjectService; import org.dromara.system.service.ISysDeptService; import org.dromara.tender.service.impl.TenderSupplierInputServiceImpl; @@ -46,6 +47,9 @@ public class DemoTest { @Resource private IPgsProgressCategoryTemplateService progressCategoryTemplateService; + @Resource + private IPgsProgressPlanDetailService progressPlanDetailService; + @Resource private IFacMatrixService matrixService; @@ -69,6 +73,11 @@ public class DemoTest { @Resource private IdCardEncryptorUtil idCardEncryptorUtil; + @Test + void testConstructionValue() { + progressPlanDetailService.syncPlanDetail2ConstructionValue(LocalDate.now().minusDays(1), null); + } + @Test void setIdCardEncryptorUtil() { List list = constructionUserService.list(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacFacilityPositionGisReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacFacilityPositionGisReq.java index b93158af..d7dda704 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacFacilityPositionGisReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacFacilityPositionGisReq.java @@ -27,4 +27,9 @@ public class FacFacilityPositionGisReq implements Serializable { * 方阵id列表 */ private List matrixIdList; + + /** + * 类型 + */ + private List typeList; } 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 45f36872..72e8aa27 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 @@ -12,7 +12,6 @@ import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.utils.JSTUtil; import org.dromara.facility.constant.FacRedisKeyConstant; import org.dromara.facility.domain.*; @@ -296,8 +295,11 @@ public class FacMatrixServiceImpl extends ServiceImpl> coordinatesList = JSTUtil.getTwoDimensionalCoordinates(geometry); // 获取方阵名称 String nameStr = JSTUtil.findNearestPointText(coordinatesList, nameFeatures); + if (StringUtils.isBlank(nameStr)) { + continue; + } String name = nameStr.split(" ")[0]; - if (name == null) { + if (StringUtils.isBlank(name)) { continue; } // 将位置信息转换为 JSON 字符串 @@ -563,6 +565,7 @@ public class FacMatrixServiceImpl extends ServiceImpl getPositionGis(FacFacilityPositionGisReq req) { Long projectId = req.getProjectId(); List matrixIdList = req.getMatrixIdList(); + List typeList = req.getTypeList(); BusProject project = projectService.getById(projectId); if (project == null) { throw new ServiceException("项目信息不存在", HttpStatus.NOT_FOUND); @@ -575,145 +578,159 @@ public class FacMatrixServiceImpl extends ServiceImpl matrixVoList = matrixList.stream().map(obj -> - FacFacilityPositionGisVo.obj2vo( - obj.getId(), - obj.getMatrixName(), - obj.getPositions(), - null, - FacCategoryEnum.MATRIX.getValue() - )) - .toList(); - result.addAll(matrixVoList); + if (CollUtil.isEmpty(typeList) || typeList.contains("1")) { + List matrixVoList = matrixList.stream().map(obj -> + FacFacilityPositionGisVo.obj2vo( + obj.getId(), + obj.getMatrixName(), + obj.getPositions(), + null, + FacCategoryEnum.MATRIX.getValue() + )) + .toList(); + result.addAll(matrixVoList); + } // 获取光伏板立柱信息 - List columnList = photovoltaicPanelColumnService.lambdaQuery() - .select( - FacPhotovoltaicPanelColumn::getId, - FacPhotovoltaicPanelColumn::getName, - FacPhotovoltaicPanelColumn::getPositions, - FacPhotovoltaicPanelColumn::getStatus - ) - .eq(FacPhotovoltaicPanelColumn::getProjectId, projectId) - .in(CollUtil.isNotEmpty(matrixIdList), FacPhotovoltaicPanelColumn::getMatrixId, matrixIdList) - .list(); - List columnVoList = columnList.stream().map(obj -> - FacFacilityPositionGisVo.obj2vo( - obj.getId(), - obj.getName(), - obj.getPositions(), - obj.getStatus(), - FacCategoryEnum.PHOTOVOLTAIC_PANEL_COLUMN.getValue() - )) - .toList(); - result.addAll(columnVoList); + if (CollUtil.isEmpty(typeList) || typeList.contains("2")) { + List columnList = photovoltaicPanelColumnService.lambdaQuery() + .select( + FacPhotovoltaicPanelColumn::getId, + FacPhotovoltaicPanelColumn::getName, + FacPhotovoltaicPanelColumn::getPositions, + FacPhotovoltaicPanelColumn::getStatus + ) + .eq(FacPhotovoltaicPanelColumn::getProjectId, projectId) + .in(CollUtil.isNotEmpty(matrixIdList), FacPhotovoltaicPanelColumn::getMatrixId, matrixIdList) + .list(); + List columnVoList = columnList.stream().map(obj -> + FacFacilityPositionGisVo.obj2vo( + obj.getId(), + obj.getName(), + obj.getPositions(), + obj.getStatus(), + FacCategoryEnum.PHOTOVOLTAIC_PANEL_COLUMN.getValue() + )) + .toList(); + result.addAll(columnVoList); + } // 获取光伏板点信息 - List pointList = photovoltaicPanelPointService.lambdaQuery() - .select( - FacPhotovoltaicPanelPoint::getId, - FacPhotovoltaicPanelPoint::getName, - FacPhotovoltaicPanelPoint::getPositions, - FacPhotovoltaicPanelPoint::getStatus - ) - .eq(FacPhotovoltaicPanelPoint::getProjectId, projectId) - .in(CollUtil.isNotEmpty(matrixIdList), FacPhotovoltaicPanelPoint::getMatrixId, matrixIdList) - .list(); - List pointVoList = pointList.stream().map(obj -> - FacFacilityPositionGisVo.obj2vo( - obj.getId(), - obj.getName(), - obj.getPositions(), - obj.getStatus(), - FacCategoryEnum.PHOTOVOLTAIC_PANEL_POINT.getValue() - )) - .toList(); - result.addAll(pointVoList); + if (CollUtil.isEmpty(typeList) || typeList.contains("3")) { + List pointList = photovoltaicPanelPointService.lambdaQuery() + .select( + FacPhotovoltaicPanelPoint::getId, + FacPhotovoltaicPanelPoint::getName, + FacPhotovoltaicPanelPoint::getPositions, + FacPhotovoltaicPanelPoint::getStatus + ) + .eq(FacPhotovoltaicPanelPoint::getProjectId, projectId) + .in(CollUtil.isNotEmpty(matrixIdList), FacPhotovoltaicPanelPoint::getMatrixId, matrixIdList) + .list(); + List pointVoList = pointList.stream().map(obj -> + FacFacilityPositionGisVo.obj2vo( + obj.getId(), + obj.getName(), + obj.getPositions(), + obj.getStatus(), + FacCategoryEnum.PHOTOVOLTAIC_PANEL_POINT.getValue() + )) + .toList(); + result.addAll(pointVoList); + } // 获取光伏板支架信息 - List supportList = photovoltaicPanelSupportService.lambdaQuery() - .select( - FacPhotovoltaicPanelSupport::getId, - FacPhotovoltaicPanelSupport::getName, - FacPhotovoltaicPanelSupport::getPositions, - FacPhotovoltaicPanelSupport::getStatus - ) - .eq(FacPhotovoltaicPanelSupport::getProjectId, projectId) - .in(CollUtil.isNotEmpty(matrixIdList), FacPhotovoltaicPanelSupport::getMatrixId, matrixIdList) - .list(); - List supporVotList = supportList.stream().map(obj -> - FacFacilityPositionGisVo.obj2vo( - obj.getId(), - obj.getName(), - obj.getPositions(), - obj.getStatus(), - FacCategoryEnum.PHOTOVOLTAIC_PANEL_SUPPORT.getValue() - )) - .toList(); - result.addAll(supporVotList); + if (CollUtil.isEmpty(typeList) || typeList.contains("4")) { + List supportList = photovoltaicPanelSupportService.lambdaQuery() + .select( + FacPhotovoltaicPanelSupport::getId, + FacPhotovoltaicPanelSupport::getName, + FacPhotovoltaicPanelSupport::getPositions, + FacPhotovoltaicPanelSupport::getStatus + ) + .eq(FacPhotovoltaicPanelSupport::getProjectId, projectId) + .in(CollUtil.isNotEmpty(matrixIdList), FacPhotovoltaicPanelSupport::getMatrixId, matrixIdList) + .list(); + List supporVotList = supportList.stream().map(obj -> + FacFacilityPositionGisVo.obj2vo( + obj.getId(), + obj.getName(), + obj.getPositions(), + obj.getStatus(), + FacCategoryEnum.PHOTOVOLTAIC_PANEL_SUPPORT.getValue() + )) + .toList(); + result.addAll(supporVotList); + } // 获取光伏板信息 - List panelList = photovoltaicPanelService.lambdaQuery() - .select( - FacPhotovoltaicPanel::getId, - FacPhotovoltaicPanel::getName, - FacPhotovoltaicPanel::getPositions, - FacPhotovoltaicPanel::getStatus - ) - .eq(FacPhotovoltaicPanel::getProjectId, projectId) - .eq(FacPhotovoltaicPanel::getProgressCategoryName, "组件安装") - .in(CollUtil.isNotEmpty(matrixIdList), FacPhotovoltaicPanel::getMatrixId, matrixIdList) - .list(); - List panelVoList = panelList.stream().map(obj -> - FacFacilityPositionGisVo.obj2vo( - obj.getId(), - obj.getName(), - obj.getPositions(), - obj.getStatus(), - FacCategoryEnum.PHOTOVOLTAIC_PANEL.getValue() - )) - .toList(); - result.addAll(panelVoList); + if (CollUtil.isEmpty(typeList) || typeList.contains("5")) { + List panelList = photovoltaicPanelService.lambdaQuery() + .select( + FacPhotovoltaicPanel::getId, + FacPhotovoltaicPanel::getName, + FacPhotovoltaicPanel::getPositions, + FacPhotovoltaicPanel::getStatus + ) + .eq(FacPhotovoltaicPanel::getProjectId, projectId) + .eq(FacPhotovoltaicPanel::getProgressCategoryName, "组件安装") + .in(CollUtil.isNotEmpty(matrixIdList), FacPhotovoltaicPanel::getMatrixId, matrixIdList) + .list(); + List panelVoList = panelList.stream().map(obj -> + FacFacilityPositionGisVo.obj2vo( + obj.getId(), + obj.getName(), + obj.getPositions(), + obj.getStatus(), + FacCategoryEnum.PHOTOVOLTAIC_PANEL.getValue() + )) + .toList(); + result.addAll(panelVoList); + } // 获取箱变信息 - List boxTransformerList = boxTransformerService.lambdaQuery() - .select( - FacBoxTransformer::getId, - FacBoxTransformer::getName, - FacBoxTransformer::getPositions, - FacBoxTransformer::getStatus - ) - .eq(FacBoxTransformer::getProjectId, projectId) - .eq(FacBoxTransformer::getProgressCategoryName, "箱变基础") - .in(CollUtil.isNotEmpty(matrixIdList), FacBoxTransformer::getMatrixId, matrixIdList) - .list(); - List boxTransformerVoList = boxTransformerList.stream().map(obj -> - FacFacilityPositionGisVo.obj2vo( - obj.getId(), - obj.getName(), - obj.getPositions(), - obj.getStatus(), - FacCategoryEnum.BOX_TRANSFORMER.getValue() - )) - .toList(); - result.addAll(boxTransformerVoList); + if (CollUtil.isEmpty(typeList) || typeList.contains("6")) { + List boxTransformerList = boxTransformerService.lambdaQuery() + .select( + FacBoxTransformer::getId, + FacBoxTransformer::getName, + FacBoxTransformer::getPositions, + FacBoxTransformer::getStatus + ) + .eq(FacBoxTransformer::getProjectId, projectId) + .eq(FacBoxTransformer::getProgressCategoryName, "箱变基础") + .in(CollUtil.isNotEmpty(matrixIdList), FacBoxTransformer::getMatrixId, matrixIdList) + .list(); + List boxTransformerVoList = boxTransformerList.stream().map(obj -> + FacFacilityPositionGisVo.obj2vo( + obj.getId(), + obj.getName(), + obj.getPositions(), + obj.getStatus(), + FacCategoryEnum.BOX_TRANSFORMER.getValue() + )) + .toList(); + result.addAll(boxTransformerVoList); + } // 获取逆变器信息 - List inverterList = inverterService.lambdaQuery() - .select( - FacInverter::getId, - FacInverter::getName, - FacInverter::getPositions, - FacInverter::getStatus - ) - .eq(FacInverter::getProjectId, projectId) - .eq(FacInverter::getProgressCategoryName, "逆变器安装") - .in(CollUtil.isNotEmpty(matrixIdList), FacInverter::getMatrixId, matrixIdList) - .list(); - List inverterVoList = inverterList.stream().map(obj -> - FacFacilityPositionGisVo.obj2vo( - obj.getId(), - obj.getName(), - obj.getPositions(), - obj.getStatus(), - FacCategoryEnum.INVERTER.getValue() - )) - .toList(); - result.addAll(inverterVoList); + if (CollUtil.isEmpty(typeList) || typeList.contains("7")) { + List inverterList = inverterService.lambdaQuery() + .select( + FacInverter::getId, + FacInverter::getName, + FacInverter::getPositions, + FacInverter::getStatus + ) + .eq(FacInverter::getProjectId, projectId) + .eq(FacInverter::getProgressCategoryName, "逆变器安装") + .in(CollUtil.isNotEmpty(matrixIdList), FacInverter::getMatrixId, matrixIdList) + .list(); + List inverterVoList = inverterList.stream().map(obj -> + FacFacilityPositionGisVo.obj2vo( + obj.getId(), + obj.getName(), + obj.getPositions(), + obj.getStatus(), + FacCategoryEnum.INVERTER.getValue() + )) + .toList(); + result.addAll(inverterVoList); + } return result; } 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 260f4651..340be31a 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 @@ -201,7 +201,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl matrixList = matrixService.lambdaQuery() - .select(FacMatrix::getId, FacMatrix::getPositions) + .select(FacMatrix::getId, FacMatrix::getPositions, FacMatrix::getMatrixName) .eq(FacMatrix::getProjectId, projectId).list(); if (CollUtil.isEmpty(matrixList)) { throw new ServiceException("项目下无方阵数据，请先创建方阵信息后再添加光伏板信息", HttpStatus.NOT_FOUND); @@ -292,7 +292,10 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl panelList = new ArrayList<>(); // ② 找到该点对应的 polygon（优先包含，否则最近） @@ -301,8 +304,33 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl> coordinates = matchedPolygon.getGeometry().getCoordinates().getFirst(); // ④ 判断所属方阵 - FacMatrix matrix = matrixService.getMatrixIdBy2Coordinates(matrixList, coordinates); - if (matrix == null) return Collections.emptyList(); +/* FacMatrix matrix = matrixService.getMatrixIdBy2Coordinates(matrixList, coordinates); + if (matrix == null) { + log.info("所属方阵为空，跳过"); + return Collections.emptyList(); + } + Long matrixId = matrix.getId();*/ + // 去掉首字母 (T/G) + String withoutPrefix = name.substring(1); + + // 如果包含"."，只取第一个"."前的数字 + int dotIndex = withoutPrefix.indexOf("."); + if (dotIndex != -1) { + withoutPrefix = withoutPrefix.substring(0, dotIndex); + } + FacMatrix matrix = null; + for (FacMatrix facMatrix : matrixList) { + String matrixName = facMatrix.getMatrixName(); + String matrixName1 = matrixName.substring(1); + if (withoutPrefix.equals(matrixName1)) { + matrix = facMatrix; + break; + } + } + if (matrix == null) { + log.info("所属方阵为空，跳过"); + return Collections.emptyList(); + } Long matrixId = matrix.getId(); // ⑤ 获取进度类别 List progressCategoryListByMatrix = progressCategoryMap.get(matrixId); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/weathermanager/WeatherConstant.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/weathermanager/WeatherConstant.java index f3a81ac4..6cf765f4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/weathermanager/WeatherConstant.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/weathermanager/WeatherConstant.java @@ -124,7 +124,7 @@ public interface WeatherConstant { */ static Map> getWeatherStatusMap() { Map> weatherStatusMap = new HashMap<>(); - weatherStatusMap.put("sunny", SUNNY); + weatherStatusMap.put("Sunny", SUNNY); weatherStatusMap.put("manyCloud", MANY_CLOUD); weatherStatusMap.put("cloudy", CLOUDY); weatherStatusMap.put("smallRain", SMALL_RAIN); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsConstructionSchedulePlanServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsConstructionSchedulePlanServiceImpl.java index f3f47b08..8d29af2f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsConstructionSchedulePlanServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsConstructionSchedulePlanServiceImpl.java @@ -255,7 +255,7 @@ public class PgsConstructionSchedulePlanServiceImpl extends ServiceImpl progressCategoryList = progressCategoryService.lambdaQuery() - .in(PgsProgressCategory::getMatrixId, matrixList.stream().map(FacMatrix::getId).toList()) - .list(); - if (CollUtil.isNotEmpty(progressCategoryList)) { - for (PgsProgressCategory progressCategory : progressCategoryList) { - String matrixName = progressCategory.getMatrixName(); - if (StringUtils.isNotBlank(matrixName)) { - map.put(progressCategory.getId(), "分项工程：" + matrixName + "-" + progressCategory.getName()); - } else { - map.put(progressCategory.getId(), "分项工程：" + progressCategory.getName()); + // 获取分项工程 + List progressCategoryList = progressCategoryService.lambdaQuery() + .in(PgsProgressCategory::getMatrixId, matrixList.stream().map(FacMatrix::getId).toList()) + .list(); + if (CollUtil.isNotEmpty(progressCategoryList)) { + for (PgsProgressCategory progressCategory : progressCategoryList) { + String matrixName = progressCategory.getMatrixName(); + if (StringUtils.isNotBlank(matrixName)) { + map.put(progressCategory.getId(), "分项工程：" + matrixName + "-" + progressCategory.getName()); + } else { + map.put(progressCategory.getId(), "分项工程：" + progressCategory.getName()); + } } } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java index d0686c58..53ce3fa6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java @@ -15,13 +15,12 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.project.domain.vo.projectteam.BusProjectTeamForemanVo; import org.dromara.project.service.IBusProjectTeamService; -import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionCreateReq; -import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionGisReq; -import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionQueryReq; -import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionUpdateReq; +import org.dromara.quality.domain.QltQualityInspection; +import org.dromara.quality.domain.dto.qualityinspection.*; import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionListGisVo; import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionVo; import org.dromara.quality.service.IQltQualityInspectionService; +import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -43,6 +42,13 @@ public class QltQualityInspectionController extends BaseController { private final IBusProjectTeamService busProjectTeamService; + @PutMapping("/test/add") + public R testAdd(QltQualityInspectionUpdateFileReq req) { + QltQualityInspection qualityInspection = new QltQualityInspection(); + BeanUtils.copyProperties(req, qualityInspection); + return R.ok(qualityInspectionService.updateById(qualityInspection)); + } + /** * 查询质量-检查工单列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionUpdateFileReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionUpdateFileReq.java new file mode 100644 index 00000000..ca84fcb6 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionUpdateFileReq.java @@ -0,0 +1,42 @@ +package org.dromara.quality.domain.dto.qualityinspection; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lilemy + * @date 2025-09-19 14:45 + */ +@Data +public class QltQualityInspectionUpdateFileReq implements Serializable { + + @Serial + private static final long serialVersionUID = 4892385858816127150L; + + /** + * 主键 + */ + private Long id; + + /** + * 巡检附件 + */ + private String inspectionFile; + + /** + * 巡检图片附件 + */ + private String inspectionImgFile; + + /** + * 整改附件 + */ + private String rectificationFile; + + /** + * 整改图片附件 + */ + private String rectificationImgFile; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java index 0292c9e0..811d98c5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java @@ -13,10 +13,12 @@ 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.safety.domain.HseSafetyInspection; import org.dromara.safety.domain.dto.safetyinspection.*; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionVo; import org.dromara.safety.service.IHseSafetyInspectionService; +import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -36,6 +38,13 @@ public class HseSafetyInspectionController extends BaseController { private final IHseSafetyInspectionService safetyInspectionService; + @PutMapping("/test/add") + public R testAdd(@Validated @RequestBody HseSafetyInspectionUpdateFileReq req) { + HseSafetyInspection inspection = new HseSafetyInspection(); + BeanUtils.copyProperties(req, inspection); + return R.ok(safetyInspectionService.updateById(inspection)); + } + /** * 查询安全巡检工单列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionUpdateFileReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionUpdateFileReq.java new file mode 100644 index 00000000..112ac7cc --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionUpdateFileReq.java @@ -0,0 +1,32 @@ +package org.dromara.safety.domain.dto.safetyinspection; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lilemy + * @date 2025-09-19 14:49 + */ +@Data +public class HseSafetyInspectionUpdateFileReq implements Serializable { + + @Serial + private static final long serialVersionUID = 3900623694038061296L; + + /** + * 主键ID + */ + private Long id; + + /** + * 检查附件 + */ + private String checkFile; + + /** + * 整改附件 + */ + private String rectificationFile; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java index 3568dfcf..e5348556 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionVo; import org.dromara.safety.domain.HseSafetyInspection; import org.dromara.safety.domain.dto.safetyinspection.*; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java index 3c806b6c..9a37ca10 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java @@ -312,7 +312,9 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl uploadFileUrl(String url, String fileName) { + SysOssVo oss = ossService.uploadFileUrl(url, fileName); + SysOssUploadVo uploadVo = new SysOssUploadVo(); + uploadVo.setUrl(oss.getUrl()); + uploadVo.setFileName(oss.getOriginalName()); + uploadVo.setOssId(oss.getOssId().toString()); + return R.ok(uploadVo); + } + /** * 上传OSS对象存储 *