From f1d1d3b67316c4dd7d36c15a82df5e66fde74a69 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 10 九月 2025 19:22:11 +0800
Subject: [PATCH] 增加agc点位
---
service/QC/OAJyService.cs | 123 ++++++++++++++++++++++++++++------------
1 files changed, 86 insertions(+), 37 deletions(-)
diff --git a/service/QC/OAJyService.cs b/service/QC/OAJyService.cs
index d04132e..c7fb134 100644
--- a/service/QC/OAJyService.cs
+++ b/service/QC/OAJyService.cs
@@ -11,6 +11,13 @@
using System.Security.Cryptography;
using System.Text;
using static Azure.Core.HttpHeader;
+using System.Security.Cryptography;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
+using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Security;
namespace NewPdaSqlServer.service.QC;
@@ -23,34 +30,39 @@
// private const string SPK = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApobID/gwmD9OofMG1gEcE94NCMeTYUq1cam/7ADZmxHCVpF143GaHWhqDdY0TTVbcUElsQ71DzAG2j3itWlIJBK5fVGwCo3sPpAvUDdKMh+Uivcp7yxdy/IDRA/PS4JARuEyM4cVJLhIOU2KnSlbIkheeoDkDgfaxu9kKrWnozJLiYraVTVDz9PdRX7fQdP+Zu/xB9txAGw4kvOm9HwgrzaSRdZEhisTJ5yyoNW/dLXtWKXA0cKhKOOIFu12TOrv/It6hl1ShTUuy79Pa51M9Oc2dEfVs1tluNXPWo1uFXQbBaJxdqZEJJlK7iW2uQFIao2O4XFHYThwy2+6116LtwIDAQAB";
private const string HOST = "http://192.168.1.149:8099";
- private const string SPK = @"-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApobID/gwmD9OofMG1gEc
-E94NCMeTYUq1cam/7ADZmxHCVpF143GaHWhqDdY0TTVbcUElsQ71DzAG2j3itWlI
-JBK5fVGwCo3sPpAvUDdKMh+Uivcp7yxdy/IDRA/PS4JARuEyM4cVJLhIOU2KnSlb
-IkheeoDkDgfaxu9kKrWnozJLiYraVTVDz9PdRX7fQdP+Zu/xB9txAGw4kvOm9Hwg
-rzaSRdZEhisTJ5yyoNW/dLXtWKXA0cKhKOOIFu12TOrv/It6hl1ShTUuy79Pa51M
-9Oc2dEfVs1tluNXPWo1uFXQbBaJxdqZEJJlK7iW2uQFIao2O4XFHYThwy2+6116L
-twIDAQAB
------END PUBLIC KEY-----";
+ private const string SPK = @"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApobID/gwmD9OofMG1gEcE94NCMeTYUq1cam/7ADZmxHCVpF143GaHWhqDdY0TTVbcUElsQ71DzAG2j3itWlIJBK5fVGwCo3sPpAvUDdKMh+Uivcp7yxdy/IDRA/PS4JARuEyM4cVJLhIOU2KnSlbIkheeoDkDgfaxu9kKrWnozJLiYraVTVDz9PdRX7fQdP+Zu/xB9txAGw4kvOm9HwgrzaSRdZEhisTJ5yyoNW/dLXtWKXA0cKhKOOIFu12TOrv/It6hl1ShTUuy79Pa51M9Oc2dEfVs1tluNXPWo1uFXQbBaJxdqZEJJlK7iW2uQFIao2O4XFHYThwy2+6116LtwIDAQAB";
public static class RsaHelper
{
public static string Encrypt(string plainText, string publicKeyPem)
{
- // 灏哖EM鏍煎紡鐨勫叕閽ヨ浆鎹负XML鏍煎紡
- var rsa = RSA.Create();
- rsa.ImportFromPem(publicKeyPem); // 浣跨敤.NET 5+ 鍐呯疆PEM瑙ｆ瀽鏂规硶
+ //// 灏哖EM鏍煎紡鐨勫叕閽ヨ浆鎹负XML鏍煎紡
+ //var rsa = RSA.Create();
+ //rsa.ImportFromPem(publicKeyPem); // 浣跨敤.NET 5+ 鍐呯疆PEM瑙ｆ瀽鏂规硶
- var parameters = rsa.ExportParameters(false);
- string publicKeyXml = $"<RSAKeyValue><Modulus>{Convert.ToBase64String(parameters.Modulus)}</Modulus><Exponent>{Convert.ToBase64String(parameters.Exponent)}</Exponent></RSAKeyValue>";
+ //var parameters = rsa.ExportParameters(false);
+ //string publicKeyXml = $"<RSAKeyValue><Modulus>{Convert.ToBase64String(parameters.Modulus)}</Modulus><Exponent>{Convert.ToBase64String(parameters.Exponent)}</Exponent></RSAKeyValue>";
- using var rsaProvider = new RSACryptoServiceProvider();
- rsaProvider.FromXmlString(publicKeyXml); // 浣跨敤杞崲鍚庣殑XML鏍煎紡鍏挜
+ //using var rsaProvider = new RSACryptoServiceProvider();
+ //rsaProvider.FromXmlString(publicKeyXml); // 浣跨敤杞崲鍚庣殑XML鏍煎紡鍏挜
- var data = Encoding.UTF8.GetBytes(plainText);
- var encrypted = rsaProvider.Encrypt(data, false);
- return Convert.ToBase64String(encrypted);
+ //var data = Encoding.UTF8.GetBytes(plainText);
+ //var encrypted = rsaProvider.Encrypt(data, false);
+ //return Convert.ToBase64String(encrypted);
+
+ RsaKeyParameters publicKeyParam = (RsaKeyParameters)PublicKeyFactory.CreateKey(Convert.FromBase64String(publicKeyPem));
+ string XML = string.Format("<RSAKeyValue><Modulus>{0}</Modulus><Exponent>{1}</Exponent></RSAKeyValue>",
+ Convert.ToBase64String(publicKeyParam.Modulus.ToByteArrayUnsigned()),
+ Convert.ToBase64String(publicKeyParam.Exponent.ToByteArrayUnsigned()));
+ string encryptedContent = string.Empty;
+ using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
+ {
+ rsa.FromXmlString(XML);
+ byte[] encryptedData = rsa.Encrypt(Encoding.Default.GetBytes(plainText), false);
+ encryptedContent = Convert.ToBase64String(encryptedData);
+ }
+ return encryptedContent;
}
}
@@ -78,12 +90,14 @@
public string GetToken()
{
-
-;
+ var userId = "1268";
+ var encryptedUserId = RsaHelper.Encrypt(userId, SPK);
+ ;
var headers = new Dictionary<string, string>
{
["appid"] = APPID,
- ["secret"] = RsaHelper.Encrypt(SECRET, SPK)
+ ["secret"] = RsaHelper.Encrypt(SECRET, SPK),
+ ["userId"] = encryptedUserId
};
try
@@ -196,16 +210,14 @@
//}
// 鍔犲瘑澶勭悊
- var userId = "FRadmin";
+ var userId = "1268";
var encryptedUserId = RsaHelper.Encrypt(userId, SPK);
string strToken = GetToken();
-
- // 鏋勫缓鏈夋晥娴嬭瘯鏁版嵁
- mainDataDict = new Dictionary<string, object>
- {
- ["KQSDATE"] = DateTime.Now.AddDays(-1).ToString("yyyy-MM-ddTHH:mm:sszzz"),
- ["KQEDATE"] = DateTime.Now.ToString("yyyy-MM-ddTHH:mm:sszzz")
- };
+
+
+ // 鏇挎崲鍘熸湁鐨勬祴mainDataDict璇曟暟鎹瀯寤�
+ mainDataDict = BuildMainDataFromQuery(query);
+
// 璋冪敤鏂规硶澧炲姞userid璇锋眰澶�
var result = SubmitWorkflowRequest(
@@ -251,13 +263,13 @@
var request = WebRequest.Create(url) as HttpWebRequest;
request.Method = "POST";
request.Timeout = 20000;
- request.ContentType = "application/json; charset=utf-8"; // 淇敼涓篔SON鏍煎紡
+ request.ContentType = "application/x-www-form-urlencoded"; // 淇敼涓篔SON鏍煎紡
// 鏋勫缓璇锋眰澶�
- request.Headers.Add("appid", APPID);
- request.Headers.Add("token", token);
- request.Headers.Add("Content-Type", APPID);
- request.Headers.Add("userId", encryptedUserId);
+ request.Headers.Set("appid", APPID);
+ request.Headers.Set("token", token);
+ request.Headers.Set("Content-Type", "application/x-www-form-urlencoded");
+ request.Headers.Set("userId", encryptedUserId);
// 鍋囪闇�瑕佸姞瀵嗙殑userid浠庡叾浠栧湴鏂硅幏鍙栵紝杩欓噷闇�瑕佽ˉ鍏呰幏鍙栭�昏緫
// 鏋勫缓璇锋眰浣�
@@ -265,8 +277,8 @@
{
//["userId"] = "1268",
["workflowId"] = workflowId,
- ["mainData"] = mainData,
- ["detailData"] = detailData ?? new Dictionary<string, object>(),
+ ["mainData"] = new List<Dictionary<string, object>> { mainData }, // 鍖呰鎴愭暟缁�
+ ["detailData"] = null,
["otherParams"] = otherParams ?? new Dictionary<string, object>(),
["remark"] = remark,
["requestLevel"] = requestLevel,
@@ -321,4 +333,41 @@
throw new Exception($"娴佺▼鎻愪氦寮傚父: {ex.Message}");
}
}
+
+
+ // 鏂板鐨勬瀯寤烘柟娉�
+ private Dictionary<string, object> BuildMainDataFromQuery(dynamic query)
+ {
+ var mainData = new Dictionary<string, object>
+ {
+ // 琛ㄧ粨鏋勫畾涔�
+ ["tableDBName"] = "formtable_main_33",
+ ["workflowRequestTableRecords"] = new List<Dictionary<string, object>>
+ {
+ new Dictionary<string, object>
+ {
+ ["recordOrder"] = 0,
+ ["workflowRequestTableFields"] = new List<Dictionary<string, object>>
+ {
+ new Dictionary<string, object> { ["fieldName"] = "wlbm", ["fieldValue"] = "1.01.01.001" },
+ new Dictionary<string, object> { ["fieldName"] = "khgys", ["fieldValue"] = "闄堥洩骞�" },
+ new Dictionary<string, object> { ["fieldName"] = "jzmcwlmc", ["fieldValue"] = "椤剁洊" },
+ new Dictionary<string, object> { ["fieldName"] = "bhgpqxms", ["fieldValue"] = "澶栬涓嶅悎鏍硷紝灏哄涓嶅悎鏍硷紝棰滆壊涓嶇鍚�" },
+ new Dictionary<string, object> { ["fieldName"] = "dhdhmes", ["fieldValue"] = "MES001" }
+ }
+ }
+ }
+ };
+
+ return mainData;
+ }
+
+ // 杈呭姪鏂规硶鐢ㄤ簬瀹夊叏娣诲姞灞炴��
+ private void TryAddProperty(Dictionary<string, object> dict, string key, object value)
+ {
+ if (value != null)
+ {
+ dict[key] = value;
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3