From a46a65c769f676f9367f855812f19b02c2ddb67c Mon Sep 17 00:00:00 2001 From: zpl Date: Sun, 5 Sep 2021 18:50:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9=E6=96=B0=E5=A2=9E=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E4=BA=BA=E5=91=98=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java | 10 ++++++++++ .../src/main/resources/mapper/AbnormalBillMapper.xml | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java index 0bea61db..5800918b 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java @@ -48,6 +48,16 @@ public class AbnormalBillDto extends AbnormalBill { private String productionCategory; + private String checkUsr; + + public String getCheckUsr() { + return checkUsr; + } + + public void setCheckUsr(String checkUsr) { + this.checkUsr = checkUsr; + } + public String getSeq() { return seq; } diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index 07b8a1a3..cfbce631 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -957,11 +957,16 @@ LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER' LEFT JOIN Z_ABNORMAL_NC_CODE ZANC ON ZANC.ABNORMAL_BILL_BO = ZAB.HANDLE LEFT JOIN NC_CODE_T NCT ON NCT.NC_CODE_BO = 'NCCodeBO:'|| ZAB.SITE || ',' || ZANC.NC_CODE AND NCT.LOCALE = #{language} + LEFT JOIN RESRCE R ON R.RESRCE = ZAB.RESRCE AND R.SITE = ZAB.SITE + LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = R.HANDLE AND CFA."ATTRIBUTE" = 'CHECK_USR' zab.SITE = #{abnormalBill.site} + + AND CFA.VALUE = #{abnormalBill.checkUsr} + AND zab.RESRCE = #{abnormalBill.resrce} From 785b6919e06fe8997e01c9ad2f22cab1a1b861d7 Mon Sep 17 00:00:00 2001 From: zpl Date: Sun, 5 Sep 2021 19:21:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8F=AB=E6=96=99PC?= =?UTF-8?q?=E3=80=81pda=E7=95=8C=E9=9D=A2=EF=BC=9B=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E5=8F=91=E6=96=99pda=E7=95=8C=E9=9D=A2=E3=80=82=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E6=94=B9=E7=B2=BE?= =?UTF-8?q?=E7=A1=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dispatch/src/main/resources/mapper/CallItemMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dispatch/src/main/resources/mapper/CallItemMapper.xml b/dispatch/src/main/resources/mapper/CallItemMapper.xml index daf51181..3c9c11ed 100644 --- a/dispatch/src/main/resources/mapper/CallItemMapper.xml +++ b/dispatch/src/main/resources/mapper/CallItemMapper.xml @@ -703,7 +703,7 @@ AND C3.VALUE LIKE '%'||#{texture}||'%' - AND C4.VALUE LIKE '%'||#{matSpec}||'%' + AND C4.VALUE = #{matSpec} AND ZSD.PLANNED_START_DATE >= #{startFromDate} @@ -1053,7 +1053,7 @@ AND ZCI.REQUIRED_DATE_TIME <= #{requiredToDT} - AND CFA.VALUE LIKE '%' || #{spec} || '%' + AND CFA.VALUE = #{spec} AND CFB.VALUE LIKE '%' || #{texture} || '%' @@ -1095,7 +1095,7 @@ AND ZCI.REQUIRED_DATE_TIME <= #{requiredToDT} - AND CFA.VALUE LIKE '%' || #{spec} || '%' + AND CFA.VALUE = #{spec} AND CFB.VALUE LIKE '%' || #{texture} || '%' @@ -1152,7 +1152,7 @@ AND MML.STATUS = #{callItem.status} - AND MML.SPEC LIKE '%' || #{callItem.spec} || '%' + AND MML.SPEC = #{callItem.spec} AND MML.TEXTURE LIKE '%' || #{callItem.texture} || '%' From c7c42b3361b2058d5a76f12a62569beb3359aa70 Mon Sep 17 00:00:00 2001 From: zpl Date: Mon, 6 Sep 2021 09:14:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ResourceFaultReceiveServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java index 92e06289..6885f20b 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java @@ -8,6 +8,7 @@ import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.model.Resrce; import com.foreverwin.mesnac.meapi.service.ResrceService; import com.foreverwin.modular.core.exception.BusinessException; +import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -62,6 +63,7 @@ public class ResourceFaultReceiveServiceImpl extends ServiceImpl list = new ArrayList<>(); // 故障编码及故障时间 JSONArray jsonArray = JSON.parseArray(faultList); + if (jsonArray == null || jsonArray.size() < 1){ + logger.error("设备编号：" + resource + ",故障参数列表不能为空！"); + throw BusinessException.build("设备编号：" + resource + ",故障参数列表不能为空！"); + } for (int i = 0; i < jsonArray.size(); i++) { ResourceFaultReceive resourceFaultReceive = new ResourceFaultReceive(); // 设备编号、站点、创建时间-使用SEND_TIME、创建用户 resourceFaultReceive.setResrce(resource); resourceFaultReceive.setSite(site); resourceFaultReceive.setCreatedDateTime(sendDate); - resourceFaultReceive.setCreateUser("SITE_ADMIN"); + resourceFaultReceive.setCreateUser(user); JSONObject jsonObj = (JSONObject) jsonArray.get(i); String faultCode = jsonObj.getString("FAULT_CODE");