From 4127683023c8686b7570ab36a08977dc5718b9ec Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Tue, 17 Mar 2026 13:53:24 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8E=A8=E9=80=81=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E7=B1=BB=E5=9E=8B=EF=BC=8C=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=8E=A7=E4=BB=B6id=E4=B8=8D?= =?UTF-8?q?=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constants/LyricParamConstants.java | 32 +++++++++++++++++++ .../sdm/project/model/req/PushReportReq.java | 14 ++++++++ .../impl/LyricInternalServiceImpl.java | 23 +++++++++---- 3 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 common/src/main/java/com/sdm/common/constants/LyricParamConstants.java diff --git a/common/src/main/java/com/sdm/common/constants/LyricParamConstants.java b/common/src/main/java/com/sdm/common/constants/LyricParamConstants.java new file mode 100644 index 00000000..714cb100 --- /dev/null +++ b/common/src/main/java/com/sdm/common/constants/LyricParamConstants.java @@ -0,0 +1,32 @@ +package com.sdm.common.constants; + +/** + * 利元亨对接接口的部分参数常量 + */ +public class LyricParamConstants { + + /** + * 附件上传(推送报告) + */ + + // 系统标识 + public static final String SYSTEM_CODE = "spdm"; + // 表名称 + public static final String TABLE_NAME = "oa_three_d_review"; + // 字段名称 + public static final String COLUMN_NAME = "simulation_table"; + // 权限编码 + public static final String FILE_POWER = "2456236750149124114"; + // 系统id + public static final Long SYSTEM_ID = 1691399963692630016L; + // 表单id + public static final Long FORM_ID = 1847115435993071616L; + // 有限元控件id + public static final Long FINITE_ELEMENT_COMPONENT_INST_ID = 8000004142460000204L; + // 机器人控件id + public static final Long ROBOT_COMPONENT_INST_ID = 8000004142460000204L; + // 公差控件id + public static final Long TOLERANCE_COMPONENT_INST_ID = 8000004142460000204L; + + +} diff --git a/project/src/main/java/com/sdm/project/model/req/PushReportReq.java b/project/src/main/java/com/sdm/project/model/req/PushReportReq.java index b2764774..31538cf2 100644 --- a/project/src/main/java/com/sdm/project/model/req/PushReportReq.java +++ b/project/src/main/java/com/sdm/project/model/req/PushReportReq.java @@ -13,11 +13,25 @@ import java.util.List; @Data public class PushReportReq { + /** + * 文件id列表 + */ @NotEmpty(message = "文件id不能为空") private List fileIdList; + /** + * 项目编号 + */ private String projectCode; + /** + * 工位编号 + */ private String workspaceCode; + /** + * 推送类型 1:有限元 2:机器人 3:公差(产品工艺专项验收) + */ + private Integer pushType; + } diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index 29304f04..57b13526 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo; import com.sdm.common.common.ResultCode; import com.sdm.common.common.SdmResponse; import com.sdm.common.common.ThreadLocalContext; +import com.sdm.common.constants.LyricParamConstants; import com.sdm.common.entity.enums.AttachFileTypeEnum; import com.sdm.common.entity.enums.DirTypeEnum; import com.sdm.common.entity.enums.FilePermissionEnum; @@ -1615,14 +1616,22 @@ public class LyricInternalServiceImpl implements ILyricInternalService { jobNumber = cidUserRespSdmResponse.getData().getUsername(); } HkUploadFileReq uploadFileReq = new HkUploadFileReq(); - uploadFileReq.setFilePower("2456236750149124114"); + // 推送类型 1:有限元 2:机器人 3:公差(产品工艺专项验收) + Integer pushType = req.getPushType(); + if (pushType == 1) { + uploadFileReq.setComponentInstId(LyricParamConstants.FINITE_ELEMENT_COMPONENT_INST_ID); + }else if (pushType == 2) { + uploadFileReq.setComponentInstId(LyricParamConstants.ROBOT_COMPONENT_INST_ID); + }else { + uploadFileReq.setComponentInstId(LyricParamConstants.TOLERANCE_COMPONENT_INST_ID); + } uploadFileReq.setWaterMarkFlag(false); - uploadFileReq.setWaterMarkContent("spdm"); - uploadFileReq.setSysId(1691399963692630016L); - uploadFileReq.setFormId(1847115435993071616L); - uploadFileReq.setComponentInstId(8000004142460000204L); - uploadFileReq.setTableName("oa_three_d_review"); - uploadFileReq.setColumnName("simulation_table"); + uploadFileReq.setWaterMarkContent(LyricParamConstants.SYSTEM_CODE); + uploadFileReq.setFilePower(LyricParamConstants.FILE_POWER); + uploadFileReq.setSysId(LyricParamConstants.SYSTEM_ID); + uploadFileReq.setFormId(LyricParamConstants.FORM_ID); + uploadFileReq.setTableName(LyricParamConstants.TABLE_NAME); + uploadFileReq.setColumnName(LyricParamConstants.COLUMN_NAME); uploadFileReq.setXmh(req.getProjectCode()); uploadFileReq.setGwh(req.getWorkspaceCode()); uploadFileReq.setFiles(Collections.singletonList(zipFilePath));