From 2d08c578ae3c81736403135b50f2ed60a642ddb4 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Mon, 9 Jun 2025 14:56:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E4=BA=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/domain/vo/PointInfoVo.java | 18 ++++++++---------- .../service/impl/PointInfoServiceImpl.java | 4 ++-- .../impl/WorkOrderDelayServiceImpl.java | 9 ++++++++- .../service/impl/WorkOrderInfoServiceImpl.java | 5 ++++- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java index ce20c2e..9ef063c 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java @@ -64,7 +64,7 @@ public class PointInfoVo extends TenantEntity implements Serializable { /** * 维护单位 */ - @ExcelProperty(value = "维护单位") + @ExcelProperty(value = "设备维护单位") private String maintenanceUnit; @@ -75,15 +75,6 @@ public class PointInfoVo extends TenantEntity implements Serializable { private String linkUnit; - - - - /** - * 摄像机类型 - */ - @ExcelProperty(value = "摄像机类型") - private String cameraType; - /** * 经度 */ @@ -120,6 +111,13 @@ public class PointInfoVo extends TenantEntity implements Serializable { */ @ExcelProperty(value = "设备IP") private String ip; + + + /** + * 摄像机类型 + */ + @ExcelProperty(value = "摄像机类型") + private String cameraType; /** * 建设项目 */ diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java index 8bf1d4a..206e3ef 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java @@ -203,7 +203,6 @@ public class PointInfoServiceImpl implements IPointInfoService { CompletableFuture.runAsync(() -> { try { String organizationName = pointInfo.getOrganizationName(); - String projectName = pointInfo.getProjectName(); // 设置 projectId String projectId = projectMap.get(organizationName); @@ -212,10 +211,11 @@ public class PointInfoServiceImpl implements IPointInfoService { } // 调用远程服务获取单位信息（耗时操作） +/* String projectName = pointInfo.getProjectName(); String unit = projectInfoService.getContractPartyBNameByProjectName(projectName); if (unit != null) { pointInfo.setMaintenanceUnit(unit); - } + }*/ } catch (Exception e) { System.err.println("处理错误:Error processing PointInfo: " + e.getMessage()); } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderDelayServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderDelayServiceImpl.java index 40ed9a4..be46fb2 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderDelayServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderDelayServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.platform.service.impl; +import jakarta.annotation.Resource; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -10,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.platform.domain.Attachment; import org.dromara.platform.domain.AttachmentSerializer; +import org.dromara.platform.service.IContractInfoService; import org.springframework.stereotype.Service; import org.dromara.platform.domain.bo.WorkOrderDelayBo; import org.dromara.platform.domain.vo.WorkOrderDelayVo; @@ -33,6 +35,9 @@ public class WorkOrderDelayServiceImpl implements IWorkOrderDelayService { private final WorkOrderDelayMapper baseMapper; + @Resource + private IContractInfoService contractInfoService; + /** * 查询工单延期审核 * @@ -42,7 +47,9 @@ public class WorkOrderDelayServiceImpl implements IWorkOrderDelayService { @Override public WorkOrderDelayVo queryById(Long id){ WorkOrderDelayVo workOrderDelayVo = baseMapper.selectVoById(id); - workOrderDelayVo.setHandler("监理人员、业主人员"); + String contractName = workOrderDelayVo.getContractName(); + String ioCompany = contractInfoService.getIoCompany(contractName); + workOrderDelayVo.setHandler(ioCompany); String attachment = workOrderDelayVo.getAttachment(); if (StringUtils.isNotBlank(attachment)) { AttachmentSerializer serializer = new AttachmentSerializer(); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java index 9fffed8..d039769 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java @@ -79,6 +79,9 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { @Resource private WorkOrderDelayHistoryMapper workOrderDelayHistoryMapper; + @Resource + private IContractInfoService contractInfoService; + /** * 查询工单信息 * @@ -88,7 +91,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { @Override public WorkOrderInfoVo queryById(String id){ WorkOrderInfoVo workOrderInfoVo = baseMapper.selectVoById(id); - workOrderInfoVo.setHandler("监理人员、业主人员"); + workOrderInfoVo.setHandler(workOrderInfoVo.getMaintenanceUnit()); String attachment = workOrderInfoVo.getAttachment(); if (StringUtils.isNotBlank(attachment)) { AttachmentSerializer serializer = new AttachmentSerializer();