From 44bc4aa00a14a49ce86bb909df4f40fee2e67a15 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Sun, 12 May 2024 09:14:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96-0512-=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/req/dev/DevicePlanDetailItemParam.java | 2 +- src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java | 2 +- src/main/java/com/glxp/api/req/dev/DevicePlanParam.java | 2 +- .../java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/req/dev/DevicePlanDetailItemParam.java b/src/main/java/com/glxp/api/req/dev/DevicePlanDetailItemParam.java index f143ae9d6..5f70da5c3 100644 --- a/src/main/java/com/glxp/api/req/dev/DevicePlanDetailItemParam.java +++ b/src/main/java/com/glxp/api/req/dev/DevicePlanDetailItemParam.java @@ -55,7 +55,7 @@ public class DevicePlanDetailItemParam { public List getEntity(DeviceCheckItemDictService deviceCheckItemDictService) { List list = deviceCheckItemDictService.listByIds(itemCodes); if (CollectionUtil.isEmpty(list)) { - throw new JsonException("所有项目编码都不存在,疑似非法操作"); + throw new JsonException("项目编码不存在,请确认"); } if (list.size() != itemCodes.size()) { Map> collect = list.stream().collect(Collectors.groupingBy(DeviceCheckItemDictEntity::getCode)); diff --git a/src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java b/src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java index 3f7e4e41f..5b341ecfc 100644 --- a/src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java +++ b/src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java @@ -41,7 +41,7 @@ public class DevicePlanDetailParam { public List getEntity(DeviceInfoService deviceInfoService) { List deviceList = deviceInfoService.listByIds(deviceCodes); if (CollectionUtil.isEmpty(deviceList)) { - throw new JsonException("未找到设备,疑似非法操作"); + throw new JsonException("设备编码不存在,请确认"); } List list = deviceList.stream().map(d -> { diff --git a/src/main/java/com/glxp/api/req/dev/DevicePlanParam.java b/src/main/java/com/glxp/api/req/dev/DevicePlanParam.java index ad5c042d2..3d936d116 100644 --- a/src/main/java/com/glxp/api/req/dev/DevicePlanParam.java +++ b/src/main/java/com/glxp/api/req/dev/DevicePlanParam.java @@ -67,7 +67,7 @@ public class DevicePlanParam { public void valid(DeptService deptService) { DeptEntity dept = deptService.selectByCode(chargeDeptCode); if (dept == null) { - throw new JsonException("负责部门不存在,疑似非法操作"); + throw new JsonException("负责部门不存在,请确认"); } if (startDate.isAfter(endDate)) { throw new JsonException("计划开始日期不能在计划结束日期之后"); diff --git a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java index f8eaf4d73..5084b7598 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java @@ -91,7 +91,7 @@ public class DeviceRepairApplyAddParam { public List getDetailEntityList(Long applyId, DeviceInfoService deviceInfoService, AuthAdmin user) { List list = deviceInfoService.listVoByCodes(details.stream().map(ApplyDetail::getDeviceCode).collect(Collectors.toList()), user.getLocDeptCode(), DeviceStatusEnum.NORMAL); if (list.size() != details.size()) { - throw new JsonException("设备信息不匹配,疑似非法操作"); + throw new JsonException("设备状态异常或信息不符,请确认"); } Map> deviceMap = list.stream().collect(Collectors.groupingBy(DeviceInfoEntity::getDeviceCode)); return details.stream().map(d -> {