From 06987b24b885e6a92118f59df45becb2ee4f8236 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Mon, 8 Jan 2024 08:48:25 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E6=9B=B4=E6=96=B0=E8=AE=BE=E5=A4=87=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RouteLineServiceImpl.java      | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java
index bd24aec..3c3b650 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java
@@ -108,7 +108,6 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
     }
 
     @Override
-
     public RouteLineDto findById(String id) {
         return ConvertUtil.convert(getById(id), RouteLineDto.class);
     }
@@ -351,20 +350,20 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
         if (entity == null) {
             throw new BadRequestException(LangProcess.msg("error_sysAuth"));
         }
-
+        DeviceDto startDevice = deviceService.findByCode(dto.getDevice_code());
+        DeviceDto nextDevice = deviceService.findByCode(dto.getNext_device_code());
+        if (startDevice != null) {
+            dto.setStart_device_type(startDevice.getDevice_type());
+        }
+        if (nextDevice != null) {
+            dto.setNext_device_type(nextDevice.getDevice_type());
+        }
         String currentUsername = SecurityUtils.getCurrentUsername();
         String now = DateUtil.now();
         dto.setUpdate_time(now);
         dto.setUpdate_by(currentUsername);
-
-//        WQLObject wo = WQLObject.getWQLObject("acs_route_line");
-//        JSONObject json = (JSONObject) JSONObject.toJSON(dto);
-//
-//        wo.update(json);
-
         RouteLine routeLine = ConvertUtil.convert(dto, RouteLine.class);
         routeLineMapper.updateById(routeLine);
-
         reload();
     }