From 0738b44fe051878706298958e76a6e74babb2ab2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 19 九月 2024 15:11:18 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java
index f799b6f..639d150 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java
@@ -1,9 +1,9 @@
 package com.zy.acs.manager.manager.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.acs.manager.common.exception.BusinessException;
+import com.zy.acs.common.utils.GsonUtils;
+import com.zy.acs.framework.exception.CoolException;
 import com.zy.acs.manager.manager.entity.Code;
 import com.zy.acs.manager.manager.entity.Route;
 import com.zy.acs.manager.manager.mapper.RouteMapper;
@@ -12,9 +12,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 @Service("routeService")
 public class RouteServiceImpl extends ServiceImpl<RouteMapper, Route> implements RouteService {
@@ -24,16 +22,27 @@
 
     @Override
     public Route createRouteByCode(Code code0, Code code1) {
+        return createRouteByCode(code0, code1, 0, null);
+    }
+
+    @Override
+    public Route createRouteByCode(Code code0, Code code1, Integer direction, Long userId) {
         Route route = this.findByCodeOfBoth(code0.getId(), code1.getId());
+        direction = Optional.ofNullable(direction).orElse(0);
         if (null == route) {
+            Date now = new Date();
             route = new Route();
-            route.setUuid(code0.getData()+"-"+code1.getData());
+            route.setUuid(code0.getData() + "-" + code1.getData());
             route.setStartCode(code0.getId());
             route.setEndCode(code1.getId());
-            route.setDirection(0);
-            route.setCodeArr(JSON.toJSONString(Arrays.asList(code0.getId(), code1.getId())));
+            route.setDirection(direction);
+            route.setCodeArr(GsonUtils.toJson(Arrays.asList(code0.getId(), code1.getId())));
+            route.setCreateBy(userId);
+            route.setCreateTime(now);
+            route.setUpdateBy(userId);
+            route.setUpdateTime(now);
             if (!this.save(route)) {
-                throw new BusinessException(route.getCodeArr()+" save fail![Route]");
+                throw new CoolException(route.getCodeArr()+" save fail![Route]");
             }
         }
         return route;

--
Gitblit v1.9.1