change - 配置文件修改

SlnMesnac.Config/AppConfig.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Options;
 using System;
+using System.Collections.Generic;
 
 namespace SlnMesnac.Config
 {
@@ -22,7 +23,12 @@ namespace SlnMesnac.Config
         /// MCS 数据库连接字符串
         /// </summary>
         public string mcsConnStr { get; set; }
-
+        
+        /// <summary>
+        /// PLC连接配置
+        /// </summary>
+        public List<PlcConfig> plcConfig { get; set; }
+        
         public AppConfig Value => this;
     }
 }

SlnMesnac.Config/PlcConfig.cs

@@ -0,0 +1,33 @@
+namespace SlnMesnac.Config
+{
+    /// <summary>
+    /// PLC配置，通过AppConfig进行获取
+    /// </summary>
+    public class PlcConfig
+    {
+        /// <summary>
+        /// PLC配置ID
+        /// </summary>
+        public int configId { get; set; }
+        
+        /// <summary>
+        /// PIC类型
+        /// </summary>
+        public string plcType { get; set; }
+        
+        /// <summary>
+        /// PLC IP
+        /// </summary>
+        public string plcIp { get; set; }
+        
+        /// <summary>
+        /// PLC Port
+        /// </summary>
+        public int plcPort { get; set; }
+        
+        /// <summary>
+        /// PLC Key
+        /// </summary>
+        public string plcKey { get; set; }
+    }
+}

SlnMesnac/Controllers/IngCheckController.cs

@@ -1,5 +1,6 @@
 using System.Text.Json;
 using Microsoft.AspNetCore.Mvc;
+using SlnMesnac.Config;
 using SlnMesnac.Model.dto;
 using SlnMesnac.Repository.service;
 
@@ -13,16 +14,18 @@ namespace SlnMesnac.Controllers;
 public class IngCheckController
 {
     private ILogger<IngCheckController> _logger;
+    private AppConfig _appConfig;
     private IMcsBinToMaterService _mcsBinToMaterService;
 
     /// <summary>
     /// 
     /// </summary>
     /// <param name="logger"></param>
-    public IngCheckController(ILogger<IngCheckController> logger,IMcsBinToMaterService mcsBinToMaterService)
+    public IngCheckController(ILogger<IngCheckController> logger,IMcsBinToMaterService mcsBinToMaterService,AppConfig appConfig)
     {
         _logger = logger;
         _mcsBinToMaterService = mcsBinToMaterService;
+        _appConfig = appConfig;
     }
 
     /// <summary>
@@ -31,17 +34,14 @@ public class IngCheckController
     /// <param name="ingredientInfo"></param>
     /// <returns></returns>
     [HttpPost("BigMaterial")]
-    public ApiResponse BigMaterialCheck(IngredientInfo ingredientInfo)
+    public ApiResponse BigMaterialCheck(IngredientInfo? ingredientInfo)
     {
         var result = new ApiResponse();
-
         try
         {
-            
             if (ingredientInfo != null)
             {
-                string json = JsonSerializer.Serialize(ingredientInfo);
+                _logger.LogInformation($"大料验证参数：{JsonSerializer.Serialize(ingredientInfo)}");
-                _logger.LogInformation($"大料验证参数：{json}");
                 var info = _mcsBinToMaterService.GetMcsBinToMaterByBinNo(ingredientInfo.EquipId, ingredientInfo.CanNumber);
                 if (info != null)
                 {
@@ -55,6 +55,10 @@ public class IngCheckController
                         result.SetFailure($"大料校验失败，物料不匹配，时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                     }
                 }
+                else
+                {
+                    result.SetFailure($"大料校验失败，根据料罐获取对应信息异常，时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                }
                 
             }
             else
@@ -66,7 +70,7 @@ public class IngCheckController
         catch (Exception e)
         {
             result.SetException(e,"大料投料校验异常");
-            _logger.LogError("大料投料校验异常",e);
+            _logger.LogError($"大料投料校验异常:{e.Message}");
         }
 
         return result;
@@ -78,7 +82,7 @@ public class IngCheckController
     /// <param name="ingredientInfo"></param>
     /// <returns></returns>
     [HttpPost("SmallMaterial")]
-    public ApiResponse SmallMaterialCheck(IngredientInfo ingredientInfo)
+    public ApiResponse SmallMaterialCheck(IngredientInfo? ingredientInfo)
     {
         
         var result = new ApiResponse();
@@ -87,20 +91,19 @@ public class IngCheckController
         {
             if (ingredientInfo != null)
             {
-                string json = JsonSerializer.Serialize(ingredientInfo);
+                _logger.LogInformation($"小料验证参数：{JsonSerializer.Serialize(ingredientInfo)}");
-                _logger.LogInformation($"小料验证参数：{json}");
+                result.SetSuccess($"小料校验成功，时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
-                result.SetSuccess($"校验成功，时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
             }
             else
             {
-                result.SetSuccess($"校验失败，缺少必要参数，时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                result.SetSuccess($"小料校验失败，缺少必要参数，时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
             }
             
         }
         catch (Exception e)
         {
-            Console.WriteLine(e);
             result.SetException(e,"小料投料校验异常");
+            _logger.LogError($"小料投料校验异常:{e.Message}");
         }
 
         return result;

SlnMesnac/appsettings.json

@@ -10,6 +10,22 @@
   "AppConfig": {
     "logPath": "/Users/wenxiansheng/Desktop/日常代码/杜肯新材料程序设计/Durk.SlnMesnac/SlnMesnac/bin/Debug/net6.0",
     "mcsConnStr": "server=58.63.214.27,23313;uid=dkmes;pwd=Duken123;database=mesnac_MCS_ShareDB",
-    "mesConnStr": "Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma"
+    "mesConnStr": "Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma",
+    "PlcConfig":[
+      {
+        "configId": 1,
+        "plcType": "MelsecBinaryPlc",
+        "plcIp": "127.0.0.1",
+        "plcPort": 102,
+        "plcKey": "mcs"
+      },
+      {
+        "configId": 2,
+        "plcType": "MelsecBinaryPlc",
+        "plcIp": "127.0.0.1",
+        "plcPort": 102,
+        "plcKey": "cwss"
+      }
+    ]
   }
 }