From aeebb4e306322ce37b3975a7eedcca3d10fac856 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Thu, 17 Jul 2025 13:43:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E9=AA=8C=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/api/RemotePdaQmsApiService.java | 6 ++-- ...kBo.java => RemoteQcInspectionTaskBo.java} | 16 +++++----- .../api/controller/PdaApiController.java | 13 +++------ .../dromara/api/service/IPdaApiService.java | 4 +-- .../api/service/impl/IPdaApiServiceImpl.java | 7 +++-- .../qms/dubbo/RemoteQmsApiServiceImpl.java | 29 ++++++++++++++----- 6 files changed, 43 insertions(+), 32 deletions(-) rename ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/{QcInspectionTaskBo.java => RemoteQcInspectionTaskBo.java} (81%) diff --git a/ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/RemotePdaQmsApiService.java b/ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/RemotePdaQmsApiService.java index 1b3c740..cbc722b 100644 --- a/ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/RemotePdaQmsApiService.java +++ b/ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/RemotePdaQmsApiService.java @@ -2,9 +2,9 @@ package org.dromara.pda.api; import org.dromara.common.core.domain.R; import org.dromara.common.core.exception.user.UserException; -import org.dromara.pda.api.model.QcInspectionTaskBo; +import org.dromara.pda.api.model.RemoteQcInspectionTaskBo; import org.dromara.pda.api.model.vo.RemoteDefectVo; -import org.dromara.pda.api.model.vo.RemoteQcInspectionTaskVo; + import java.util.List; @@ -20,5 +20,5 @@ public interface RemotePdaQmsApiService { List remoteQueryDefectList(String operationCode) throws UserException; - R remoteSavePdaInspectionTask(QcInspectionTaskBo bo); + R remoteSavePdaInspectionTask(RemoteQcInspectionTaskBo bo); } diff --git a/ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/QcInspectionTaskBo.java b/ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/RemoteQcInspectionTaskBo.java similarity index 81% rename from ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/QcInspectionTaskBo.java rename to ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/RemoteQcInspectionTaskBo.java index e530f19..00e2224 100644 --- a/ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/QcInspectionTaskBo.java +++ b/ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/RemoteQcInspectionTaskBo.java @@ -1,13 +1,10 @@ package org.dromara.pda.api.model; -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import lombok.NoArgsConstructor; +import java.io.Serial; +import java.io.Serializable; import java.util.List; @@ -18,9 +15,11 @@ import java.util.List; * @date 2025-05-27 */ @Data +@NoArgsConstructor +public class RemoteQcInspectionTaskBo implements Serializable { -public class QcInspectionTaskBo { - + @Serial + private static final long serialVersionUID = 1L; /** * 主键标识 */ @@ -110,6 +109,7 @@ public class QcInspectionTaskBo { */ private String attr4; + private List qcInspectionTaskDefectBoList; } diff --git a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java index ddd1948..2f076fe 100644 --- a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java +++ b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java @@ -1,23 +1,18 @@ package org.dromara.api.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.api.domain.QcTaskInfo; + import org.dromara.api.service.IPdaApiService; 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.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; import org.dromara.pda.api.model.BaseMaterial; -import org.dromara.pda.api.model.QcInspectionTaskBo; + +import org.dromara.pda.api.model.RemoteQcInspectionTaskBo; import org.dromara.pda.api.model.vo.RemoteDefectVo; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -69,7 +64,7 @@ public class PdaApiController extends BaseController { * PDA提交保存检验任务 */ @PostMapping("/savePdaInspectionTask") - public R savePdaInspectionTask(@Validated(EditGroup.class) @RequestBody QcInspectionTaskBo bo) { + public R savePdaInspectionTask(@RequestBody RemoteQcInspectionTaskBo bo) { return iPdaApiService.savePdaInspectionTask(bo); } } diff --git a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/IPdaApiService.java b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/IPdaApiService.java index 38c6899..c6b90db 100644 --- a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/IPdaApiService.java +++ b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/IPdaApiService.java @@ -3,7 +3,7 @@ package org.dromara.api.service; import org.dromara.api.domain.QcTaskInfo; import org.dromara.common.core.domain.R; import org.dromara.pda.api.model.BaseMaterial; -import org.dromara.pda.api.model.QcInspectionTaskBo; +import org.dromara.pda.api.model.RemoteQcInspectionTaskBo; import org.dromara.pda.api.model.vo.RemoteDefectVo; import java.util.List; @@ -22,5 +22,5 @@ public interface IPdaApiService { QcTaskInfo getCheckMaterialInfo(String code); - R savePdaInspectionTask(QcInspectionTaskBo bo); + R savePdaInspectionTask(RemoteQcInspectionTaskBo bo); } diff --git a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/IPdaApiServiceImpl.java b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/IPdaApiServiceImpl.java index bf360a6..1011136 100644 --- a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/IPdaApiServiceImpl.java +++ b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/IPdaApiServiceImpl.java @@ -9,7 +9,7 @@ import org.dromara.common.core.domain.R; import org.dromara.pda.api.RemotePdaMesApiService; import org.dromara.pda.api.RemotePdaQmsApiService; import org.dromara.pda.api.model.BaseMaterial; -import org.dromara.pda.api.model.QcInspectionTaskBo; +import org.dromara.pda.api.model.RemoteQcInspectionTaskBo; import org.dromara.pda.api.model.vo.RemoteDefectVo; import org.springframework.stereotype.Service; @@ -41,7 +41,8 @@ public class IPdaApiServiceImpl implements IPdaApiService { } @Override - public R savePdaInspectionTask(QcInspectionTaskBo bo) { - return remotePdaQmsApiService.remoteSavePdaInspectionTask(bo); + public R savePdaInspectionTask(RemoteQcInspectionTaskBo remoteQcInspectionTaskBo) { + System.out.println(remoteQcInspectionTaskBo); + return remotePdaQmsApiService.remoteSavePdaInspectionTask(remoteQcInspectionTaskBo); } } diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/dubbo/RemoteQmsApiServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/dubbo/RemoteQmsApiServiceImpl.java index 2219980..da77005 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/dubbo/RemoteQmsApiServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/dubbo/RemoteQmsApiServiceImpl.java @@ -8,7 +8,7 @@ import org.dromara.common.core.exception.user.UserException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.pda.api.RemotePdaQmsApiService; -import org.dromara.pda.api.model.QcInspectionTaskBo; +import org.dromara.pda.api.model.RemoteQcInspectionTaskBo; import org.dromara.pda.api.model.vo.RemoteDefectVo; import org.dromara.qms.domain.QcInspectionTask; import org.dromara.qms.domain.QcInspectionTaskDefect; @@ -22,7 +22,6 @@ import org.dromara.qms.service.IQcDefectDetailService; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Collection; import java.util.List; @RequiredArgsConstructor @@ -62,14 +61,13 @@ public class RemoteQmsApiServiceImpl implements RemotePdaQmsApiService { }); } - @Override - public R remoteSavePdaInspectionTask(QcInspectionTaskBo bo) { - QcInspectionTask qcInspectionTask = new QcInspectionTask(); - qcInspectionTask = MapstructUtils.convert(bo, QcInspectionTask.class); + public R remoteSavePdaInspectionTask(RemoteQcInspectionTaskBo bo) { + QcInspectionTask qcInspectionTask = BeanUtil.toBean(bo, QcInspectionTask.class); + int i = qcInspectionTaskMapper.updateById(qcInspectionTask); if (bo.getResult().equals("N")){ - List qcInspectionTaskDefectList=BeanUtil.copyToList(bo.getQcInspectionTaskDefectBoList(),QcInspectionTaskDefect.class); + List qcInspectionTaskDefectList= BeanUtil.copyToList(bo.getQcInspectionTaskDefectBoList(),QcInspectionTaskDefect.class); qcInspectionTaskDefectMapper.insertBatch(qcInspectionTaskDefectList); } if (i > 0) { @@ -77,4 +75,21 @@ public class RemoteQmsApiServiceImpl implements RemotePdaQmsApiService { } return R.fail(); } + + +// @Override +// public R remoteSavePdaInspectionTask(Long TaskId) { +// System.out.println(TaskId); +// return R.ok(); +//// QcInspectionTask qcInspectionTask = MapstructUtils.convert(bo, QcInspectionTask.class); +//// int i = qcInspectionTaskMapper.updateById(qcInspectionTask); +//// if (bo.getResult().equals("N")){ +//// List qcInspectionTaskDefectList=BeanUtil.copyToList(bo.getQcInspectionTaskDefectBoList(),QcInspectionTaskDefect.class); +//// qcInspectionTaskDefectMapper.insertBatch(qcInspectionTaskDefectList); +//// } +//// if (i > 0) { +//// return R.ok(); +//// } +// // return R.fail(); +// } }