From a630792641dc3eeed9614ab3511074eac76b5a10 Mon Sep 17 00:00:00 2001
From: guofeihu <3347277866@qq.com>
Date: Fri, 12 Jul 2024 16:37:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E5=90=88=E5=89=8D=E7=AB=AF=E5=81=9A?=
 =?UTF-8?q?=E4=BA=9B=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/scheme/WlRecordController.java       | 13 -------------
 .../njcn/csdevice/mapper/mapping/WlRecordMapper.xml |  4 ++--
 .../csdevice/service/impl/WlRecordServiceImpl.java  |  4 +++-
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java
index ae75686..0efeb33 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java
@@ -138,19 +138,6 @@ public class WlRecordController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
-    /**
-     * 添加测试项中的设备基础数据
-     */
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
-    @PostMapping("/saveDataRecord")
-    @ApiOperation("添加测试项中的设备基础数据")
-    public HttpResult<Boolean> saveDataRecord(@RequestBody @Validated WlRecordParam.UpdateRecord record) {
-        String methodDescribe = getMethodDescribe("saveDataRecord");
-        LogUtil.njcnDebug(log, "{}，测试项及基础数据对象为：{}", methodDescribe, record);
-        wlRecordService.saveDataRecord(record);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-
     /**
      * 查询测试项时间段实时数据
      */
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 d8c409b..4b09230 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
@@ -40,7 +40,7 @@
     </select>
 
     <select id="getRecordAllLine" resultType="com.njcn.csdevice.pojo.vo.RecordAllDevTreeVo$RecordAllLineTreeVo">
-        select a.line_id as id,c.name as name, #{wlRecordPageParam.devId} as pid from  wl_record a
+        select concat(a.line_id,'-',#{wlRecordPageParam.devId}) as id,c.name as name, #{wlRecordPageParam.devId} as pid from  wl_record a
         left join cs_line c on a.line_id = c.line_id
         where a.type=1 and a.state =1 and a.dev_id=#{wlRecordPageParam.devId} and
         <if test="wlRecordPageParam.isTrueFlag == 0">
@@ -53,7 +53,7 @@
     </select>
 
     <select id="getRecordAllTime" resultType="com.njcn.csdevice.pojo.vo.RecordAllDevTreeVo$RecordAllTimeTreeVo">
-        select a.id as id,concat(a.start_time,'-',a.end_time) as name, #{wlRecordPageParam.lineId} as pid from  wl_record a
+        select a.id as id,concat(a.start_time,'-',a.end_time) as name, concat(#{wlRecordPageParam.lineId},'-',#{wlRecordPageParam.devId}) as pid from  wl_record a
         left join cs_line c on a.line_id = c.line_id
         where a.type=1 and a.state =1 and a.dev_id=#{wlRecordPageParam.devId} and a.line_id=#{wlRecordPageParam.lineId}
         and
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 9dde5cb..f61a914 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
@@ -102,10 +102,12 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateTestRecord(WlRecordParam.UpdateRecord record) {
         WlRecord wlRecord = new WlRecord();
         BeanUtils.copyProperties(record, wlRecord);
         this.updateById(wlRecord);
+        saveDataRecord(record);
     }
 
     @Override
@@ -176,7 +178,7 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
             wlRecordPageParam.setDevId(recordAllDevTreeVo.getId());
             List<RecordAllDevTreeVo.RecordAllLineTreeVo> recordAllLineTreeVos = this.baseMapper.getRecordAllLine(wlRecordPageParam);
             for(RecordAllDevTreeVo.RecordAllLineTreeVo recordAllLineTreeVo : recordAllLineTreeVos){
-                wlRecordPageParam.setLineId(recordAllLineTreeVo.getId());
+                wlRecordPageParam.setLineId(recordAllLineTreeVo.getId().split("-")[0]);
                 recordAllLineTreeVo.setChildren(this.baseMapper.getRecordAllTime(wlRecordPageParam));
             }
             recordAllDevTreeVo.setChildren(recordAllLineTreeVos);