From 8055d08bda5c6cee67f551f1c96c4b97cf56ed82 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Tue, 10 Dec 2024 08:42:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95=E9=A1=B9?=
 =?UTF-8?q?=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

---
 .../com/njcn/csdevice/pojo/po/WlRecord.java     |  6 ++++++
 .../njcn/csdevice/mapper/WlRecordMapper.java    |  2 +-
 .../csdevice/mapper/mapping/WlRecordMapper.xml  | 17 ++++++++++++++++-
 .../service/impl/WlRecordServiceImpl.java       |  3 ++-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/WlRecord.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/WlRecord.java
index b6ce504..0798d7e 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/WlRecord.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/WlRecord.java
@@ -150,4 +150,10 @@ public class WlRecord extends BaseEntity {
      */
     private String gcDataPath;
 
+    /**
+     * 数据类型(Primary:一次值  Secondary:二次值)
+     */
+    @TableField(exist = false)
+    private String dataLevel;
+
 }
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/WlRecordMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/WlRecordMapper.java
index 59402b3..3fcf338 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/WlRecordMapper.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/WlRecordMapper.java
@@ -49,5 +49,5 @@ public interface WlRecordMapper extends BaseMapper<WlRecord> {
 
     List<CsLedgerVO> getAllLine(@Param("devId") String devId);
 
-    List<WlRecord> getWlAssByWlId(String wlId);
+    List<WlRecord> getWlAssByWlId(@Param("wlId") String wlId);
 }
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml
index 140b8a3..098f90d 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml
@@ -95,6 +95,21 @@
     </select>
 
     <select id="getWlAssByWlId" resultType="com.njcn.csdevice.pojo.po.WlRecord">
-
+        SELECT
+            a.*,c.data_level as dataLevel
+        FROM
+            wl_record a
+            inner join cs_line b on a.line_id = b.line_id
+            inner join cs_data_set c on b.data_set_id = c.id
+        WHERE
+            a.type = 1 and
+            a.id IN (SELECT data_id FROM wl_record_test_data WHERE test_item_id = #{wlId} )
+        UNION
+        SELECT
+            a.*,null as dataLevel
+        FROM
+            wl_record a
+        WHERE
+            a.id = #{wlId}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java
index aa4e478..d1135c7 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java
@@ -61,6 +61,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -642,7 +643,7 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
 
     @Override
     public List<WlRecord> getWlAssByWlId(String wlId) {
-        return this.baseMapper.getDataRecordByTestId(wlId,0);
+        return this.baseMapper.getWlAssByWlId(wlId);
     }
 
     @Override