From 78923b5ee21edff9d5b2e35edc918e44c0cbbca7 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Fri, 23 Jan 2026 13:54:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E5=A4=96=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/open/controller/OpenController.java | 7 +++++++ .../java/com/op/open/mapper/OpenMapper.java | 6 ++++++ .../java/com/op/open/service/OpenService.java | 2 ++ .../op/open/service/impl/OpenServiceImpl.java | 20 +++++++++++++++++++ .../main/resources/mapper/open/OpenMapper.xml | 9 +++++++++ 5 files changed, 44 insertions(+) diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java index a3f7f287e..cdac6a16c 100644 --- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java +++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java @@ -313,4 +313,11 @@ public class OpenController extends BaseController { } + /** + * 对外缺陷类型查询 + * **/ + @GetMapping("/getClassInfoListByCheckType") + public AjaxResult getClassInfoListByCheckType(String checkType) { + return openService.getClassInfoListByCheckType(checkType); + } } diff --git a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java index d58853640..ac3fe37e7 100644 --- a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java +++ b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java @@ -11,11 +11,13 @@ import com.op.system.api.domain.device.EquEquipmentDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.mes.*; import com.op.system.api.domain.quality.*; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; +import java.util.Map; /** * 生产rfid流程Mapper接口 @@ -109,6 +111,10 @@ public interface OpenMapper { void updateEquipmentStatuss(EquEquipmentBo equEquipment); EquEquipmentBo selectEquEquipmentByEquEquipmentCode(String equipmentCode); + + + @MapKey("id") + List> getClassInfoListByCheckType(@Param(value = "checkType") String checkType); // // int updateEquBatchs(@Param("list") List updates); // diff --git a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java index df54f5c33..8a5de1aee 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java @@ -59,4 +59,6 @@ public interface OpenService { AjaxResult getFrozenElectricity(NhQuery paramMap); AjaxResult getAttRecord(HrQuery paramMap); + + AjaxResult getClassInfoListByCheckType(String checkType); } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index bde409b2d..cb931b235 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -1059,4 +1059,24 @@ public class OpenServiceImpl implements OpenService { public AjaxResult getAttRecord(HrQuery paramMap) { return AjaxResult.success(hrApi.getAttRecord(paramMap)); } + + @Override + public AjaxResult getClassInfoListByCheckType(String checkType) { + if (StringUtils.isBlank(checkType)){ + return error("缺陷类型不能为空"); + } + + DynamicDataSourceContextHolder.push("ds_1000" ); + try { + return success(openMapper.getClassInfoListByCheckType(checkType)) ; + }catch(Exception e){ + logger.info(e.getMessage()); + e.printStackTrace(); + return error(e.getMessage()); + } + finally { + DynamicDataSourceContextHolder.poll(); + } + + } } diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml index 6e7fcfd96..b9dce7d87 100644 --- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml +++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml @@ -626,4 +626,13 @@ and del_flag = '0' + +