From 8c6fd742db249ad4cc819cf041eb98d880a3ef73 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 02 一月 2025 15:09:07 +0800
Subject: [PATCH] 1
---
WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/RouterService.cs | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/RouterService.cs b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/RouterService.cs
index 1a64fe8..de20dd7 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/RouterService.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/RouterService.cs
@@ -7,16 +7,27 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
+using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO.BasicInfo;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Repository;
namespace WIDESEAWCS_QuartzJob.Service
{
+ /// <summary>
+ /// 璺敱閰嶇疆涓氬姟灞�
+ /// </summary>
public class RouterService : ServiceBase<Dt_Router, IRouterRepository>, IRouterService
{
private readonly IDeviceProtocolRepository _deviceProtocolRepository;
private readonly IDeviceInfoRepository _deviceInfoRepository;
+
+ /// <summary>
+ /// 璺敱閰嶇疆涓氬姟灞�
+ /// </summary>
+ /// <param name="BaseDal"></param>
+ /// <param name="deviceProtocolRepository"></param>
+ /// <param name="deviceInfoRepository"></param>
public RouterService(IRouterRepository BaseDal, IDeviceProtocolRepository deviceProtocolRepository, IDeviceInfoRepository deviceInfoRepository) : base(BaseDal)
{
_deviceProtocolRepository = deviceProtocolRepository;
@@ -88,10 +99,10 @@
try
{
// 鏌ヨ鎵�鏈夎繘鍏ヨ矾鐢卞櫒鐨勪綅缃�
- List<string> inRouterPositions = BaseDal.QueryData(x => x.ChildPosiDeviceCode == deviceCode && x.InOutType == RouterInOutType.In).GroupBy(x => x.StartPosi).Select(x => x.Key).ToList();
+ List<string> inRouterPositions = BaseDal.QueryData(x => x.ChildPosiDeviceCode == deviceCode && x.InOutType == RouterInOutType.In.ObjToInt()).GroupBy(x => x.StartPosi).Select(x => x.Key).ToList();
// 鏌ヨ鎵�鏈夌寮�璺敱鍣ㄧ殑浣嶇疆
- List<string> outRouterPositions = BaseDal.QueryData(x => x.ChildPosiDeviceCode == deviceCode && x.InOutType == RouterInOutType.Out).GroupBy(x => x.ChildPosi).Select(x => x.Key).ToList();
+ List<string> outRouterPositions = BaseDal.QueryData(x => x.ChildPosiDeviceCode == deviceCode && x.InOutType == RouterInOutType.Out.ObjToInt()).GroupBy(x => x.ChildPosi).Select(x => x.Key).ToList();
// 灏嗚繘鍏ュ拰绂诲紑璺敱鍣ㄧ殑浣嶇疆娣诲姞鍒板垪琛ㄤ腑
positions.AddRange(inRouterPositions);
@@ -135,7 +146,7 @@
routes += str;
}
// 濡傛灉褰撳墠璺敱鏄叆鍙�
- if (item.InOutType == RouterInOutType.In)
+ if (item.InOutType == RouterInOutType.In.ObjToInt())
{
// 灏嗗瓙璺敱鍙嶈浆骞舵坊鍔犲埌data涓�
List<string> itemRouters = routes.Split(",").Reverse().ToList();
@@ -156,7 +167,7 @@
return data;
}
- private string GetPreviousRoutes(string startPosi, List<Dt_Router> allRouters, RouterInOutType routerType)
+ private string GetPreviousRoutes(string startPosi, List<Dt_Router> allRouters, int routerType)
{
// 瀹氫箟涓�涓┖瀛楃涓瞨outers
string routers = string.Empty;
@@ -229,7 +240,7 @@
ChildPosi = routersAddDTOs[i + 1].PositionCode,
ChildPosiDeviceCode = obj.DeviceCode,
Depth = 1,
- InOutType = (RouterInOutType)routerType,
+ InOutType = routerType,
NextPosi = routersAddDTOs[i + 1].PositionCode,
SrmColumn = string.IsNullOrEmpty(routersAddDTOs[i].SCColumn) ? int.TryParse(routersAddDTOs[i + 1].SCColumn, out int col) ? col : null : int.TryParse(routersAddDTOs[i].SCColumn, out int col2) ? col2 : null,
SrmLayer = string.IsNullOrEmpty(routersAddDTOs[i].SCLayer) ? int.TryParse(routersAddDTOs[i + 1].SCLayer, out int lay) ? lay : null : int.TryParse(routersAddDTOs[i].SCLayer, out int lay2) ? lay2 : null,
@@ -257,7 +268,7 @@
return content = WebResponseContent.Instance.Error("杈撳叆鏁版嵁璧风偣浣嶇疆缂栧彿涓庣粓鐐逛綅缃紪鍙风浉鍚�");
}
// 鏌ヨ鏁版嵁搴撲腑宸叉湁鐨勮矾鐢变俊鎭�
- List<Dt_Router> dt_Routers = BaseDal.QueryData(x => x.InOutType == (RouterInOutType)routerType);
+ List<Dt_Router> dt_Routers = BaseDal.QueryData(x => x.InOutType == routerType);
// 绉婚櫎閲嶅鐨勮矾鐢变俊鎭�
dt_Routers.ForEach(x =>
--
Gitblit v1.9.3