From 3cb274dd9b18b211d1db763b9b4fdfbd90c76bd1 Mon Sep 17 00:00:00 2001 From: "nodyang@aliyun.com" Date: Thu, 19 Sep 2024 13:41:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SlnMesnac.Model/domain/BaseCode.cs | 33 +++++++- .../service/LogImpl/BaseLogServiceImpl.cs | 36 ++++++++ .../service/LogImpl/IBaseLogService.cs | 15 ++++ SlnMesnac.TouchSocket/ApiServer.cs | 84 +++++++++++++------ 4 files changed, 141 insertions(+), 27 deletions(-) create mode 100644 SlnMesnac.Repository/service/LogImpl/BaseLogServiceImpl.cs create mode 100644 SlnMesnac.Repository/service/LogImpl/IBaseLogService.cs diff --git a/SlnMesnac.Model/domain/BaseCode.cs b/SlnMesnac.Model/domain/BaseCode.cs index f7b6c64..d0aa1fa 100644 --- a/SlnMesnac.Model/domain/BaseCode.cs +++ b/SlnMesnac.Model/domain/BaseCode.cs @@ -1,4 +1,5 @@ -using System.Runtime.Serialization; +using System; +using System.Runtime.Serialization; using SqlSugar; namespace SlnMesnac.Model.domain @@ -34,4 +35,34 @@ namespace SlnMesnac.Model.domain public int Category { get; set; } } + + + [SugarTable("BaseLog"), TenantAttribute("mes")] + [DataContract(Name = "BaseLog 基础表")] + + public class BaseLog + { + + public BaseLog() + { + this.CreateTime = DateTime.Now; + } + + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + [SugarColumn(ColumnName = "createtime")] + public DateTime CreateTime { get; set; } + + [SugarColumn(ColumnName = "log_level")] + public string LogLevel { get; set; } + + [SugarColumn(ColumnName = "content")] + public string Content { get; set; } + + + [SugarColumn(ColumnName = "err_msg")] + public string ErrMsg { get; set; } + + } } \ No newline at end of file diff --git a/SlnMesnac.Repository/service/LogImpl/BaseLogServiceImpl.cs b/SlnMesnac.Repository/service/LogImpl/BaseLogServiceImpl.cs new file mode 100644 index 0000000..7cdfcb8 --- /dev/null +++ b/SlnMesnac.Repository/service/LogImpl/BaseLogServiceImpl.cs @@ -0,0 +1,36 @@ +using SlnMesnac.Model.domain; +using SlnMesnac.Repository.service.@base; +using SlnMesnac.Repository.service.ScanLog; + +using System; +using System.Collections.Generic; +using System.Text; + +namespace SlnMesnac.Repository.service.LogImpl +{ + public class BaseLogServiceImpl : BaseServiceImpl, IBaseLogService + { + public BaseLogServiceImpl(Repository rep) : base(rep) + { + } + + public void CreatTable() + { + _rep.Context.CodeFirst.InitTables(); + } + + public Page QueryPage(int pageIndex, int pageSize) + { + int totalCount = 0; + var list = _rep.Context.Queryable().OrderByDescending(x => x.CreateTime) + .ToPageList(pageIndex, pageSize, ref totalCount); + Page page = new Page(); + page.Data = list; + page.PageIndex = pageIndex; + page.PageSize = pageSize; + page.TotalCount = totalCount; + page.TotalPage = (int)Math.Ceiling(totalCount / (double)pageSize); + return page; + } + } +} diff --git a/SlnMesnac.Repository/service/LogImpl/IBaseLogService.cs b/SlnMesnac.Repository/service/LogImpl/IBaseLogService.cs new file mode 100644 index 0000000..dc777c1 --- /dev/null +++ b/SlnMesnac.Repository/service/LogImpl/IBaseLogService.cs @@ -0,0 +1,15 @@ +using SlnMesnac.Model.domain; +using SlnMesnac.Repository.service.@base; + +using System; +using System.Collections.Generic; +using System.Text; + +namespace SlnMesnac.Repository.service.LogImpl +{ + public interface IBaseLogService : IBaseService + { + void CreatTable(); + Page QueryPage(int pageIndex, int pageSize); + } +} diff --git a/SlnMesnac.TouchSocket/ApiServer.cs b/SlnMesnac.TouchSocket/ApiServer.cs index 6d0ab5b..5308c33 100644 --- a/SlnMesnac.TouchSocket/ApiServer.cs +++ b/SlnMesnac.TouchSocket/ApiServer.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using SlnMesnac.Model.domain; using SlnMesnac.Repository.service; +using SlnMesnac.Repository.service.LogImpl; using SlnMesnac.Repository.service.ScanLog; using TouchSocket.Core; using TouchSocket.Rpc; @@ -16,15 +17,18 @@ namespace SlnMesnac.TouchSocket private readonly IScanLogService _scanService; private readonly IBaseCodeService _baseCodeService; + + IBaseLogService _baseLogService; public Action? ScanLogSocketAction; public Action? ScanStatusSocketAction; - public ApiServer(IScanLogService scanService, IBaseCodeService baseCodeService) + public ApiServer(IScanLogService scanService, IBaseCodeService baseCodeService, IBaseLogService baseLogService) { _scanService = scanService; _baseCodeService = baseCodeService; + _baseLogService = baseLogService; } /// @@ -37,27 +41,40 @@ namespace SlnMesnac.TouchSocket [WebApi(HttpMethodType.POST)] public Back ScanStatus(ScanStatusSocket scanStatus) { - - if (scanStatus.is_alarm == 1 && scanStatus.device_status != null && scanStatus.device_status.Count > 0) + BaseLog log = new BaseLog(); + log.LogLevel = "Info"; + log.ErrMsg = ""; + log.Content = scanStatus.ToJsonString(); + try { - List ls = new List(); - var baseCodes = _baseCodeService.QuListCache(); - foreach (var baseCode in scanStatus.device_status) + if (scanStatus.is_alarm == 1 && scanStatus.device_status != null && scanStatus.device_status.Count > 0) { - var enBaseCode = baseCodes.FirstOrDefault(x=>x.Code==baseCode); - if (enBaseCode != null) + List ls = new List(); + var baseCodes = _baseCodeService.QuListCache(); + foreach (var baseCode in scanStatus.device_status) { - ls.Add(enBaseCode.State); + var enBaseCode = baseCodes.FirstOrDefault(x => x.Code == baseCode); + if (enBaseCode != null) + { + ls.Add(enBaseCode.State); + } } + scanStatus.status_txt = ls; } - scanStatus.status_txt = ls; + + ScanStatusSocketAction?.Invoke(scanStatus); + } - - ScanStatusSocketAction?.Invoke(scanStatus); - - - + catch (Exception e) + { + log.LogLevel = "Error"; + log.ErrMsg=e.Message; + } + + _baseLogService.Insert(log); + return new Back(); + } @@ -69,20 +86,35 @@ namespace SlnMesnac.TouchSocket /// [EnableCors("cors")] [WebApi(HttpMethodType.POST)] - public Back ScanBack(ScanLogSocket scanStatus) + public Back ScanBack(ScanLogSocket scanLogStatus) { - ScanLogSocketAction?.Invoke(scanStatus); - _scanService.Insert(new ScanLogModel() + BaseLog log = new BaseLog(); + log.LogLevel = "Info"; + log.ErrMsg = ""; + log.Content = scanLogStatus.ToJsonString(); + try { - CreateTime = scanStatus.CreateTime, - DataType = scanStatus.data_type, - Code = scanStatus.code, - Rfid = scanStatus.rfid, - Ocr = scanStatus.ocr, - Url = scanStatus.url - - }); + ScanLogSocketAction?.Invoke(scanLogStatus); + _scanService.Insert(new ScanLogModel() + { + CreateTime = scanLogStatus.CreateTime, + DataType = scanLogStatus.data_type, + Code = scanLogStatus.code, + Rfid = scanLogStatus.rfid, + Ocr = scanLogStatus.ocr, + Url = scanLogStatus.url + + }); + + } + catch (Exception e) + { + log.LogLevel = "Error"; + log.ErrMsg = e.Message; + } + _baseLogService.Insert(log); return new Back(); + } } } From f7a00451ec5d929528c6e605b6acb258a4874372 Mon Sep 17 00:00:00 2001 From: "nodyang@aliyun.com" Date: Thu, 19 Sep 2024 13:46:08 +0800 Subject: [PATCH 2/4] bug --- SlnMesnac.TouchSocket/ApiServer.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/SlnMesnac.TouchSocket/ApiServer.cs b/SlnMesnac.TouchSocket/ApiServer.cs index 5308c33..33a2a5f 100644 --- a/SlnMesnac.TouchSocket/ApiServer.cs +++ b/SlnMesnac.TouchSocket/ApiServer.cs @@ -20,7 +20,7 @@ namespace SlnMesnac.TouchSocket IBaseLogService _baseLogService; - public Action? ScanLogSocketAction; + public Action? ScanLogSocketAction; public Action? ScanStatusSocketAction; @@ -94,8 +94,7 @@ namespace SlnMesnac.TouchSocket log.Content = scanLogStatus.ToJsonString(); try { - ScanLogSocketAction?.Invoke(scanLogStatus); - _scanService.Insert(new ScanLogModel() + var model = new ScanLogModel() { CreateTime = scanLogStatus.CreateTime, DataType = scanLogStatus.data_type, @@ -104,7 +103,10 @@ namespace SlnMesnac.TouchSocket Ocr = scanLogStatus.ocr, Url = scanLogStatus.url - }); + }; + + ScanLogSocketAction?.Invoke(model); + _scanService.Insert(model); } catch (Exception e) From 1c3d9e4a15222e0774a3c17ffbf020a74af2dad3 Mon Sep 17 00:00:00 2001 From: "nodyang@aliyun.com" Date: Thu, 19 Sep 2024 14:02:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SlnMesnac.TouchSocket/ApiServer.cs | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/SlnMesnac.TouchSocket/ApiServer.cs b/SlnMesnac.TouchSocket/ApiServer.cs index 33a2a5f..a2268d4 100644 --- a/SlnMesnac.TouchSocket/ApiServer.cs +++ b/SlnMesnac.TouchSocket/ApiServer.cs @@ -34,17 +34,18 @@ namespace SlnMesnac.TouchSocket /// /// 扫描的状态回传 /// - /// - /// + /// /// [EnableCors("cors")] [WebApi(HttpMethodType.POST)] public Back ScanStatus(ScanStatusSocket scanStatus) { - BaseLog log = new BaseLog(); - log.LogLevel = "Info"; - log.ErrMsg = ""; - log.Content = scanStatus.ToJsonString(); + BaseLog log = new BaseLog + { + LogLevel = "Info", + ErrMsg = "", + Content = scanStatus.ToJsonString() + }; try { if (scanStatus.is_alarm == 1 && scanStatus.device_status != null && scanStatus.device_status.Count > 0) @@ -76,32 +77,31 @@ namespace SlnMesnac.TouchSocket return new Back(); } - - + + /// - /// 入库开始 + /// 扫描数据回传接口 /// - /// - /// + /// /// [EnableCors("cors")] [WebApi(HttpMethodType.POST)] - public Back ScanBack(ScanLogSocket scanLogStatus) + public Back ScanBack(ScanLogSocket scanLog) { BaseLog log = new BaseLog(); log.LogLevel = "Info"; log.ErrMsg = ""; - log.Content = scanLogStatus.ToJsonString(); + log.Content = scanLog.ToJsonString(); try { var model = new ScanLogModel() { - CreateTime = scanLogStatus.CreateTime, - DataType = scanLogStatus.data_type, - Code = scanLogStatus.code, - Rfid = scanLogStatus.rfid, - Ocr = scanLogStatus.ocr, - Url = scanLogStatus.url + CreateTime = scanLog.CreateTime, + DataType = scanLog.data_type, + Code = scanLog.code, + Rfid = scanLog.rfid, + Ocr = scanLog.ocr, + Url = scanLog.url }; From a2d9c41377ac31c7c8f5d988f3ece28bf38f2e15 Mon Sep 17 00:00:00 2001 From: "nodyang@aliyun.com" Date: Thu, 19 Sep 2024 14:33:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SlnMesnac.WPF/SlnMesnac.WPF.csproj | 7 ------- SlnMesnac.WPF/appsettings.json | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/SlnMesnac.WPF/SlnMesnac.WPF.csproj b/SlnMesnac.WPF/SlnMesnac.WPF.csproj index 7634670..bfcc595 100644 --- a/SlnMesnac.WPF/SlnMesnac.WPF.csproj +++ b/SlnMesnac.WPF/SlnMesnac.WPF.csproj @@ -8,18 +8,11 @@ - - - - PreserveNewest - - - diff --git a/SlnMesnac.WPF/appsettings.json b/SlnMesnac.WPF/appsettings.json index ee2a6a3..9b905e1 100644 --- a/SlnMesnac.WPF/appsettings.json +++ b/SlnMesnac.WPF/appsettings.json @@ -13,7 +13,7 @@ { "configId": "mes", "dbType": 4, - "connStr": "PORT=5433;DATABASE=daxing;HOST=127.0.0.1;PASSWORD=123456;USER ID=postgres" + "connStr": "PORT=5432;DATABASE=daxing;HOST=127.0.0.1;PASSWORD=123456;USER ID=postgres" } ], "PlcConfig": [