From d8e6a522964374f72fab85a3f53fc7a8ffa56e04 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 04 七月 2024 18:58:06 +0800
Subject: [PATCH] 030工位返回ocv测试结果删除方法根据电芯号批量删除
---
jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/mapper/DaTestDeviceInterfaceTempMapper.java | 3 +++
jcdm-main/src/main/resources/mapper/da/testDeviceInterfaceTemp/DaTestDeviceInterfaceTempMapper.xml | 8 ++++++++
jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/service/impl/DaTestDeviceInterfaceTempServiceImpl.java | 5 +++++
jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/service/IDaTestDeviceInterfaceTempService.java | 2 ++
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 5 +++--
5 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/mapper/DaTestDeviceInterfaceTempMapper.java b/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/mapper/DaTestDeviceInterfaceTempMapper.java
index b5c881d..b054265 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/mapper/DaTestDeviceInterfaceTempMapper.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/mapper/DaTestDeviceInterfaceTempMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jcdm.main.da.testDeviceInterfaceTemp.domain.DaTestDeviceInterfaceTemp;
+import org.apache.ibatis.annotations.Param;
/**
* 娴嬭瘯璁惧鎺ュ彛鏁版嵁澶囦唤Mapper鎺ュ彛
@@ -60,4 +61,6 @@
* @return 缁撴灉
*/
public int deleteDaTestDeviceInterfaceTempByIds(Long[] ids);
+
+ void deleteDaTestDeviceInterfaceTempByProductNum(@Param("cellCode") String cellCode);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/service/IDaTestDeviceInterfaceTempService.java b/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/service/IDaTestDeviceInterfaceTempService.java
index a27f1d5..86cac6b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/service/IDaTestDeviceInterfaceTempService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/service/IDaTestDeviceInterfaceTempService.java
@@ -60,4 +60,6 @@
* @return 缁撴灉
*/
public int deleteDaTestDeviceInterfaceTempById(Long id);
+
+ void deleteDaTestDeviceInterfaceTempByProductNum(String cellCode);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/service/impl/DaTestDeviceInterfaceTempServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/service/impl/DaTestDeviceInterfaceTempServiceImpl.java
index 3a4f590..4d77527 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/service/impl/DaTestDeviceInterfaceTempServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/service/impl/DaTestDeviceInterfaceTempServiceImpl.java
@@ -95,4 +95,9 @@
{
return daTestDeviceInterfaceTempMapper.deleteDaTestDeviceInterfaceTempById(id);
}
+
+ @Override
+ public void deleteDaTestDeviceInterfaceTempByProductNum(String cellCode) {
+ daTestDeviceInterfaceTempMapper.deleteDaTestDeviceInterfaceTempByProductNum(cellCode);
+ }
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index 7bc63c6..ee8ec87 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -770,14 +770,15 @@
.eq(DaTestDeviceInterfaceTemp::getStationCode, device)
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
if (CollUtil.isNotEmpty(list)){
- DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0);
+ DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(1).build());
}else {
flag = false;
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(2).build());
}
- daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempById(daTestDeviceInterfaceTemp.getId());
+ daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode);
+
}
return flag;
}
diff --git a/jcdm-main/src/main/resources/mapper/da/testDeviceInterfaceTemp/DaTestDeviceInterfaceTempMapper.xml b/jcdm-main/src/main/resources/mapper/da/testDeviceInterfaceTemp/DaTestDeviceInterfaceTempMapper.xml
index 22d9fcd..e2181bd 100644
--- a/jcdm-main/src/main/resources/mapper/da/testDeviceInterfaceTemp/DaTestDeviceInterfaceTempMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/testDeviceInterfaceTemp/DaTestDeviceInterfaceTempMapper.xml
@@ -141,4 +141,12 @@
#{id}
</foreach>
</delete>
+
+ <delete id="deleteDaTestDeviceInterfaceTempByProductNum" parameterType="String">
+ DELETE
+ FROM
+ da_test_device_interface_temp
+ WHERE
+ product_num = #{cellCode}
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3