Merge branch 'NS100_WPF' of http://106.15.194.121:8083/zdl/NS100 into NS100_WPF

刘韬
Commit a8cbb4a6 由刘韬编写于 2025-12-31 09:50:07 +0800
BLL/Nexim/NeximApiUtil.cs
Model/Http.cs
SmartScan/ScanWork.cs
--- a/BLL/Nexim/NeximApiUtil.cs
查看文件 @a8cbb4a
+++ b/BLL/Nexim/NeximApiUtil.cs
查看文件 @a8cbb4a
@@ -24,16 +24,17 @@ namespace BLL
        }
        private string OK = "ok";
-        private string ERROE = "error";
+        private string ERROE = "error"; 
        /**
         * 获取登录的token
         * @return
         */
-        private string getAccessToken()
+        private string getAccessToken(out string errMsg)
        {
+            errMsg = ""; 
            Dictionary<string, object> paramMap = new Dictionary<string, object>();
-            paramMap.Add("userName", Config.Nexim_UserName);
+            paramMap.Add("userName", Config.Nexim_UserName.Val);
-            paramMap.Add("password", Config.Nexim_Password);
+            paramMap.Add("password", Config.Nexim_Password.Val);
            //string  paramStr = JsonConvert.ToString(paramMap);
            //LogNet.log.Info("获取Fuji的token参数为:" + paramStr);
            string apiUrl = Config.Nexim_AuthUrl;
@@ -41,16 +42,23 @@ namespace BLL
            string result = "";
            try
            {
-                result = Model.Http.PostWithHeader(apiUrl, paramMap, new Dictionary<string, string>());
+                string body=JsonConvert.SerializeObject (paramMap);
+                result = Model.Http.PostWithHeader(apiUrl, body, new Dictionary<string, string>());
                LogNet.log.Info("获取Fuji的token结果为:" + result);
                Dictionary<string, object> resultObj = JsonConvert.DeserializeObject<Dictionary<string, object>>(result);
                if (resultObj != null && resultObj.ContainsKey("accessToken"))
                {
                    accessToken = resultObj["accessToken"].ToString();
                }
+                else
+                {
+                    errMsg = accessToken;
+                    LogNet.log.Info("获取Fuji的token失败,原因:" + errMsg);
+                }
            }
            catch (Exception e)
            {
+                errMsg = e.ToString();
                LogNet.log.Info("获取Fuji的token异常:", e);
                accessToken = "";
            }
@@ -58,10 +66,11 @@ namespace BLL
            string status = "";
            if (String.IsNullOrEmpty(accessToken))
            {
+                errMsg = "accessToken is  null";
                status = ERROE;
-            }
+            } 
-            return accessToken;
+                return accessToken;
        }
        private string getReelInfo(Dictionary<string, string> reelData, string key)
@@ -113,16 +122,16 @@ namespace BLL
            {
                return true;
            }
-            Dictionary<string, string> headerMap = new Dictionary<string, string>();
+            Dictionary<string, string> headerMap = new Dictionary<string, string>(); 
-            string token = getAccessToken();
+            string token = getAccessToken(out string errmsg);
            if (String.IsNullOrEmpty(token))
            {
                //获取token为空
-                msg = "getAccessToken fail";
+                msg = "getAccessToken fail:" + errmsg;
                LogNet.log.Info("getAccessToken fail");
                return false;
            }
-            headerMap.Add("fujiAccessToken", getAccessToken());
+            headerMap.Add("fujiAccessToken", token);
            Dictionary<string, Object> paramsMap = new Dictionary<string, object>();
            paramsMap.Add("did", getReelInfo(reelData, RI));
@@ -148,13 +157,16 @@ namespace BLL
            paramsMap.Add("trayPickupPositionY", 1);
            paramsMap.Add("traySizeX", 0);
            paramsMap.Add("traySizeY", 0);
+            List<Dictionary<string, object>> paramList=new List<Dictionary<string, object>>();
+            paramList.Add(paramsMap);
            //string paramStr = JSON.toJSONstring(params);
            //LogNet.log.Info("注册Fuji的did参数为:" + paramStr);
            string result = "";
            string apiUrl = Config.Nexim_RegisterDidInfoUrl;
            try
            {
-                result = Http.PostWithHeader(apiUrl, paramsMap, headerMap);
+                string body=JsonConvert.SerializeObject (paramList);
+                result = Http.PostWithHeader(apiUrl, body, headerMap);
                LogNet.log.Info("注册Fuji的did结果为:" + result);
                Dictionary<string, object> resultObj = JsonConvert.DeserializeObject<Dictionary<string, object>>(result);

--- a/Model/Http.cs
查看文件 @a8cbb4a
+++ b/Model/Http.cs
查看文件 @a8cbb4a
@@ -114,12 +114,13 @@ namespace Model
            LogNet.log.Info($"[GET][URL:{url}][Return:{s}]");
            return FormatContent(s);
        }
-        public static string PostWithHeader(string url, Dictionary<string, object> param, Dictionary<string, string> headerMap)
+        public static string PostWithHeader(string url, string body, Dictionary<string, string> headerMap)
        {
-            List<string> body = new();
+            //List<string> body = new();
-            foreach (string key in param.Keys)
+            //foreach (string key in param.Keys)
-                body.Add(string.Format("{0}={1}", key, param[key]));
+            //    body.Add(string.Format("{0}={1}", key, param[key]));
-            LogNet.log.Info("[Post]URL:" + url + " Body:" + string.Join(",", body));
+            //string body = JsonConvert.SerializeObject(param);
+            LogNet.log.Info("[Post]URL:" + url + " Body=" +body);
            RestClient client = new(url) { Timeout = 10000 };
            RestRequest request = new(Method.POST);
@@ -132,8 +133,8 @@ namespace Model
                }
            }
            request.AddHeader("Content-Type", "application/json;charset=utf-8");
-            foreach (string key in param.Keys)
-                request.AddParameter(key, param[key]);
+            request.AddJsonBody(body);
            IRestResponse response = client.Execute(request);
            string s = response.Content;
            LogNet.log.Info("[Post]URL:" + url + "Return:" + s);

--- a/SmartScan/ScanWork.cs
查看文件 @a8cbb4a
+++ b/SmartScan/ScanWork.cs
查看文件 @a8cbb4a
@@ -250,19 +250,22 @@ namespace SmartScan
            }
            catch
            {
+                errmsg = "Api C2 parse error:\r\n" + json;
                LogUtil.info("Api C2 parse error:\r\n" + json);
                return MessageboxNeo.Show("BoxReelIDInfoMaintain", errmsg, "NEO SCAN", true);
            }
-            if (!dic.TryGetValue("CODE", out object value))
+            if (!dic.TryGetValue("ERRORCODE", out object value))
            {
                LogUtil.info("Api C2 return data error:\r\n" + json);
+                errmsg = "Api C2 return data error:\r\n" + json;
                return MessageboxNeo.Show("BoxReelIDInfoMaintain", errmsg, "NEO SCAN", true);
            }
            if (Convert.ToInt32(value) != 0)
            {
                LogUtil.info("Api C2 parse error:\r\n" + dic["MSG"].ToString());
+                errmsg = "Api C2 parse error:\r\n" + dic["MSG"].ToString();
                return MessageboxNeo.Show("BoxReelIDInfoMaintain", errmsg, "NEO SCAN", true);
            }