From 067c69928ce6d3d3ed5710fd9652af7b3380dcd5 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 20 五月 2025 14:10:38 +0800
Subject: [PATCH] cjs
---
HH.WCS.Mobox3.NongFuLinZhi/util/Settings.cs | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/util/Settings.cs b/HH.WCS.Mobox3.NongFuLinZhi/util/Settings.cs
index d45f719..7ddc9dc 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/util/Settings.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/util/Settings.cs
@@ -2,6 +2,7 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
+using static HH.WCS.Mobox3.NFLZ.util.Settings;
namespace HH.WCS.Mobox3.NFLZ.util
{
@@ -9,6 +10,10 @@
{
public static string HostToAgvServerUrl { get; set; }
public static string HASeverUrl { get; set; }
+ public static string ProjectName { get; set; }
+ public static string FactoryCode { get; set; }
+ public static string FactoryName { get; set; }
+ public static string OneSign { get; set; }
public static string AppKey { get; set; }
public static string AppSecret { get; set; }
public static string MoboxSeverUrl { get; set; }
@@ -16,7 +21,9 @@
public static string SqlServer1 { get; set; }
public static List<deviceInfo> deviceInfos { get; set; } = new List<deviceInfo>();
public static List<areaInfo> areaInfos { get; set; } = new List<areaInfo>();
- public static List<Tasktype> Tasktypes { get; set; } = new List<Tasktype>();
+ public static List<pPZSJSite> pPZSJSites { get; set; } = new List<pPZSJSite>();
+ public static List<thirdPartyUrl> thirdPartyUrls { get; set; } = new List<thirdPartyUrl>();
+ public static List<httpApiVerify> httpApiVerifys { get; set; } = new List<httpApiVerify>();
public static int port { get; set; }
public static string WHCode { get; set; }
@@ -40,9 +47,9 @@
{
HostToAgvServerUrl = keyValue.Value.ToString();
}
- if (keyValue.Name == "Tasktype")
+ if (keyValue.Name == "PPZSJSite")
{
- Tasktypes = JsonConvert.DeserializeObject<List<Tasktype>>(keyValue.Value.ToString());
+ pPZSJSites = JsonConvert.DeserializeObject<List<pPZSJSite>>(keyValue.Value.ToString());
}
if (keyValue.Name == "HASeverUrl")
{
@@ -88,6 +95,14 @@
{
areaInfos = JsonConvert.DeserializeObject<List<areaInfo>>(keyValue.Value.ToString());
}
+ if (keyValue.Name == "ThirdPartyUrl")
+ {
+ thirdPartyUrls = JsonConvert.DeserializeObject<List<thirdPartyUrl>>(keyValue.Value.ToString());
+ }
+ if (keyValue.Name == "HttpApiVerify")
+ {
+ httpApiVerifys = JsonConvert.DeserializeObject<List<httpApiVerify>>(keyValue.Value.ToString());
+ }
}
}
}
@@ -100,15 +115,26 @@
}
- public class Tasktype
+ public class httpApiVerify
{
- public string StartArea { get; set; }
- public string EndArea { get; set; }
- public string TaskType { get; set; }
+ public string VerifyNo { get; set; }
+ public string Project { get; set; }
+ public string[] Extend { get; set; }
+ public int enable { get; set; }
+ }
+ public class thirdPartyUrl
+ {
+ public string UrlNo { get; set; }
+ public string UrlName { get; set; }
+ public string Url { get; set; }
+ public int enable { get; set; }
+ }
+ public class pPZSJSite
+ {
+ public string siteName { get; set; }
+ public string[] site { get; set; }
+ public int enable { get; set; }
}
-
-
-
public class deviceInfo
{
public string address { get; set; }
--
Gitblit v1.9.1