Application/IStation.Application.Product/IStation.Application.Product.csproj
@@ -25,8 +25,4 @@ <ProjectReference Include="..\IStation.Application.Core\IStation.Application.Core.csproj" /> </ItemGroup> <ItemGroup> <Folder Include="tong_xin_she_bei\" /> </ItemGroup> </Project> Application/IStation.Application.Product/special/sim_card/SimCard_Controller.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,223 @@ using Microsoft.AspNetCore.Mvc; using System.Net; using System.Net.Http.Headers; using Microsoft.Extensions.Hosting.Internal; using Microsoft.AspNetCore.Http.Extensions; using IStation.Untity; using Furion.DynamicApiController; using System.ComponentModel.DataAnnotations; using Mapster; namespace IStation.Application { /// <summary> /// SimCard /// </summary> [Route("Product/SimCard")] [ApiDescriptionSettings("SimCard", Name = "SIMå¡", Order = 600)] public class SimCard_Controller : IDynamicApiController { private readonly Service.Product _service = new Service.Product(); #region Query /// <summary> /// éè¿ CorpID è·å /// </summary> [Route("GetByCorpID@V1.0")] [HttpGet] public List<SimCardDto> GetByCorpID([FromQuery][Required] CorpIDInput input) { var list = _service.GetByCatalog(input.CorpID, Product.Catalog_Sim); var vm_list = list?.Select(x => new SimCardDto(x)).ToList(); return vm_list; } /// <summary> /// éè¿ ID è·å /// </summary> [Route("GetByID@V1.0")] [HttpGet] public SimCardDto GetByID([FromQuery][Required] IDUnderCorpInput input) { var model = _service.GetByID(input.CorpID, input.ID); if (model == null) return null; if (model.Catalog != Product.Catalog_Sim) return null; return new SimCardDto(model); } /// <summary> /// éè¿ Ids è·å /// </summary> [Route("GetByIds@V1.0")] [HttpGet] public List<SimCardDto> GetByIds([FromQuery][Required] IdsUnderCorpInput input) { var ids = LongListHelper.ToList(input.Ids); var list = _service.GetByIds(input.CorpID, ids); list = list?.Where(x => x.Catalog == Product.Catalog_Sim).ToList(); var vm_list = list?.Select(x => new SimCardDto(x)).ToList(); return vm_list; } /// <summary> /// éè¿ BelongType and BelongIDè·å /// </summary> [Route("GetByBelongTypeAndBelongID@V1.0")] [HttpGet] public List<SimCardDto> GetByBelongTypeAndBelongID([FromQuery][Required] BelongUnderCorpInput input) { var list = _service.GetByBelongTypeAndBelongID(input.CorpID, input.BelongType, input.BelongID); list = list?.Where(x => x.Catalog == Product.Catalog_Sim).ToList(); var vm_list = list?.Select(x => new SimCardDto(x)).ToList(); return vm_list; ; } /// <summary> /// éè¿ BelongType and BelongIds è·å /// </summary> [Route("GetByBelongTypeAndBelongIds@V1.0")] [HttpGet] public List<SimCardDto> GetByBelongTypeAndBelongIds([FromQuery][Required] BelongIdsUnderCorpInput input) { var list = _service.GetByBelongTypeAndBelongIds(input.CorpID, input.BelongType, LongListHelper.ToList(input.BelongIds)); list = list?.Where(x => x.Catalog == Product.Catalog_Sim).ToList(); var vm_list = list?.Select(x => new SimCardDto(x)).ToList(); return vm_list; ; } #endregion #region Insert /// <summary> /// æå ¥ä¸æ¡ /// </summary> [Route("Insert@V1.0")] [HttpPost] public long Insert(AddSimCardInput input) { if (input == null) return default; var product = input.ToProduct(); var id = _service.Insert(product); return id; } /// <summary> /// æå ¥å¤æ¡ /// </summary> [Route("Inserts@V1.0")] [HttpPost] public bool Inserts(List<AddSimCardInput> inputList) { if (inputList == null || inputList.Count < 1) return false; var list = inputList.Select(x => x.ToProduct()).ToList(); var bol = _service.Inserts(list); return bol; } #endregion #region Update /// <summary> /// æ´æ°ä¸æ¡ /// </summary> [Route("Update@V1.0")] [HttpPut] public bool Update(UpdateSimCardInput input) { if (input == null) return false; var product = _service.GetByID(input.CorpID, input.ID); if (product == null) return false; input.UpdateProduct(product); var bol = _service.Update(product); return bol; } /// <summary> /// æ´æ°å¤æ¡ /// </summary> [Route("Updates@V1.0")] [HttpPut] public bool Updates(List<UpdateSimCardInput> inputList) { if (inputList == null || inputList.Count() < 1) { return false; } var corpIds = inputList.Select(x => x.CorpID).Distinct().ToList(); if (corpIds.Count > 1) return false; var productList = _service.GetByIds(corpIds[0], inputList.Select(x => x.ID).ToList()); if (productList == null || productList.Count < 1) return false; var rhsList = new List<Model.Product>(); productList.ForEach(x => { var input = inputList.Find(t => t.ID == x.ID); if (input != null) { var rhs = new Model.Product(x); input.UpdateProduct(rhs); rhsList.Add(rhs); } }); if (rhsList.Count < 1) return false; var bol = _service.Updates(rhsList); return bol; } #endregion #region Exist /// <summary> /// 夿TagNameæ¯å¦åå¨ /// </summary> [Route("IsExistTagName@V1.0")] [HttpGet] public bool IsExistTagName([FromQuery][Required] TagNameUnderCorpInput input) { var bol = _service.IsExistTagName(input.CorpID, input.TagName); return bol; } /// <summary> /// 夿TagNameæ¯å¦åå¨ ExceptID /// </summary> [Route("IsExistTagNameExceptID@V1.0")] [HttpGet] public bool IsExistTagNameExceptID([FromQuery][Required] TagNameExceptUnderCorpInput input) { var bol = _service.IsExistTagNameExceptID(input.CorpID, input.TagName, input.ExceptID); return bol; } #endregion #region Delete /// <summary> /// å é¤ /// </summary> [Route("DeleteByID@V1.0")] [HttpDelete] public DeleteReasonOutput DeleteByID([FromQuery][Required] IDUnderCorpInput input) { var bol = _service.DeleteByID(input.CorpID, input.ID, out string Msg); return new DeleteReasonOutput() { Success = bol, Reason = Msg }; } #endregion } } Application/IStation.Application.Product/special/sim_card/dto/AddSimCardInput.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,110 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using static IStation.Model.Product; using static IStation.Model.SimCard; namespace IStation.Application { /// <summary> /// æ·»å SIMå¡input /// </summary> public class AddSimCardInput { /// <summary> /// å®¢æ·æ è¯ /// </summary> public long CorpID { get; set; } /// <summary> /// æå±ç±»å /// </summary> public string BelongType { get; set; } /// <summary> /// æå±æ è¯ /// </summary> public long BelongID { get; set; } /// <summary> /// ç»æ è¯ /// </summary> public long GroupID { get; set; } /// <summary> /// 设å¤ç±»åæ è¯ /// </summary> public long ProductTypeID { get; set; } /// <summary> /// ç¶èç¹æ è¯å表 /// </summary> public List<long> ParentIds { get; set; } /// <summary> /// ç¼å· /// </summary> public string NO { get; set; } /// <summary> /// åå· /// </summary> public string Code { get; set; } /// <summary> /// åå /// </summary> public long ManufacturerID { get; set; } /// <summary> /// SMIå¡å· /// </summary> public string CardNO { get; set; } /// <summary> /// å 弿¹å¼ /// </summary> public eRechargeMode RechargeMode { get; set; } /// <summary> /// å å¼ä¿¡æ¯ /// </summary> public string RechargeInfo { get; set; } /// <summary> /// éå 屿§ /// </summary> public Dictionary<long, string> PropsParas { get; set; } /// <summary> /// å·¡æ£å¨æ /// </summary> public eInspectionSchedule InspectionSchedule { get; set; } /// <summary> /// ç»ç«¯æ è¯ /// </summary> public string TerminalId { get; set; } /// <summary> /// æ ç¾ /// </summary> public string TagName { get; set; } /// <summary> /// æåºç /// </summary> public int SortCode { get; set; } /// <summary> /// 说æ /// </summary> public string Description { get; set; } } } Application/IStation.Application.Product/special/sim_card/dto/SimCardDto.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,180 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using static IStation.Model.Product; using static IStation.Model.SimCard; namespace IStation.Application { /// <summary> /// SIMå¡dto /// </summary> public class SimCardDto { /// <summary> /// /// </summary> public SimCardDto() { } /// <summary> /// /// </summary> public SimCardDto(Model.Product pro) { var rhs = new Model.Product<Model.SimCard>(pro); this.ID = rhs.ID; this.CorpID = rhs.CorpID; this.BelongType = rhs.BelongType; this.BelongID = rhs.BelongID; this.GroupID = rhs.GroupID; this.ProductTypeID = rhs.ProductTypeID; this.ParentIds = rhs.ParentIds; this.NO = rhs.NO; this.Code = rhs.Code; this.ManufacturerID = rhs.ManufacturerID; this.CardNO = rhs.RatedParas.CardNO; this.RechargeMode = rhs.RatedParas.RechargeMode; this.RechargeInfo = rhs.RatedParas.RechargeInfo; this.PropsParas = rhs.PropsParas; this.InspectionSchedule = rhs.InspectionSchedule; this.TerminalId = rhs.TerminalId; this.TagName = rhs.TagName; this.SortCode = rhs.SortCode; this.UseStatus = rhs.UseStatus; this.Description = rhs.Description; } /// <summary> /// /// </summary> public SimCardDto(Model.Product<Model.SimCard> rhs) { this.ID = rhs.ID; this.CorpID = rhs.CorpID; this.BelongType = rhs.BelongType; this.BelongID = rhs.BelongID; this.GroupID = rhs.GroupID; this.ProductTypeID = rhs.ProductTypeID; this.ParentIds = rhs.ParentIds; this.NO = rhs.NO; this.Code = rhs.Code; this.ManufacturerID = rhs.ManufacturerID; this.CardNO = rhs.RatedParas.CardNO; this.RechargeMode = rhs.RatedParas.RechargeMode; this.RechargeInfo = rhs.RatedParas.RechargeInfo; this.PropsParas = rhs.PropsParas; this.InspectionSchedule = rhs.InspectionSchedule; this.TerminalId = rhs.TerminalId; this.TagName = rhs.TagName; this.SortCode = rhs.SortCode; this.UseStatus = rhs.UseStatus; this.Description = rhs.Description; } /// <summary> /// æ è¯ /// </summary> public long ID { get; set; } /// <summary> /// å®¢æ·æ è¯ /// </summary> public long CorpID { get; set; } /// <summary> /// æå±ç±»å /// </summary> public string BelongType { get; set; } /// <summary> /// æå±æ è¯ /// </summary> public long BelongID { get; set; } /// <summary> /// ç»æ è¯ /// </summary> public long GroupID { get; set; } /// <summary> /// 设å¤ç±»åæ è¯ /// </summary> public long ProductTypeID { get; set; } /// <summary> /// ç¶èç¹æ è¯å表 /// </summary> public List<long> ParentIds { get; set; } /// <summary> /// ç¼å· /// </summary> public string NO { get; set; } /// <summary> /// åå· /// </summary> public string Code { get; set; } /// <summary> /// åå /// </summary> public long ManufacturerID { get; set; } /// <summary> /// SMIå¡å· /// </summary> public string CardNO { get; set; } /// <summary> /// å 弿¹å¼ /// </summary> public eRechargeMode RechargeMode { get; set; } /// <summary> /// å å¼ä¿¡æ¯ /// </summary> public string RechargeInfo { get; set; } /// <summary> /// éå 屿§ /// </summary> public Dictionary<long, string> PropsParas { get; set; } /// <summary> /// å·¡æ£å¨æ /// </summary> public eInspectionSchedule InspectionSchedule { get; set; } /// <summary> /// ç»ç«¯æ è¯ /// </summary> public string TerminalId { get; set; } /// <summary> /// æ ç¾ /// </summary> public string TagName { get; set; } /// <summary> /// æåºç /// </summary> public int SortCode { get; set; } /// <summary> /// 使ç¨ç¶æ /// </summary> public eUseStatus UseStatus { get; set; } /// <summary> /// 说æ /// </summary> public string Description { get; set; } } } Application/IStation.Application.Product/special/sim_card/dto/UpdateSimCardInput.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,85 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using static IStation.Model.Product; using static IStation.Model.SimCard; namespace IStation.Application { /// <summary> /// æ·»å SIMå¡input /// </summary> public class UpdateSimCardInput { /// <summary> /// æ è¯ /// </summary> public long ID { get; set; } /// <summary> /// å®¢æ·æ è¯ /// </summary> public long CorpID { get; set; } /// <summary> /// ç¼å· /// </summary> public string NO { get; set; } /// <summary> /// åå· /// </summary> public string Code { get; set; } /// <summary> /// åå /// </summary> public long ManufacturerID { get; set; } /// <summary> /// SMIå¡å· /// </summary> public string CardNO { get; set; } /// <summary> /// å 弿¹å¼ /// </summary> public eRechargeMode RechargeMode { get; set; } /// <summary> /// å å¼ä¿¡æ¯ /// </summary> public string RechargeInfo { get; set; } /// <summary> /// éå 屿§ /// </summary> public Dictionary<long, string> PropsParas { get; set; } /// <summary> /// å·¡æ£å¨æ /// </summary> public eInspectionSchedule InspectionSchedule { get; set; } /// <summary> /// ç»ç«¯æ è¯ /// </summary> public string TerminalId { get; set; } /// <summary> /// æ ç¾ /// </summary> public string TagName { get; set; } /// <summary> /// 说æ /// </summary> public string Description { get; set; } } } Application/IStation.Application.Product/special/sim_card/helper/SimCardTransferHelper.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,82 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace IStation.Application { /// <summary> /// SIMå¡è½¬æ¢è¾ å©ç±» /// </summary> public static class SimCardTransferHelper { /// <summary> /// 转æ¢ä¸ºè®¾å¤ /// </summary> public static Model.Product ToProduct(this AddSimCardInput input) { var product = new Model.Product(); product.ID = 0; product.CorpID = input.CorpID; product.BelongType = input.BelongType; product.BelongID = input.BelongID; product.GroupID = input.GroupID; product.Catalog = Product.Catalog_Sim; product.ProductTypeID = input.ProductTypeID; product.ParentIds = input.ParentIds; product.NO = input.NO; product.Name = input.CardNO; product.Code = input.Code; product.ManufacturerID = input.ManufacturerID; var simCard = new Model.SimCard(); simCard.CardNO = input.CardNO; simCard.RechargeMode = input.RechargeMode; simCard.RechargeInfo = input.RechargeInfo; product.RatedParas = simCard.ToJson(); product.PropsParas=input.PropsParas; product.InspectionSchedule = input.InspectionSchedule; product.TerminalId = input.TerminalId; product.TagName = input.TagName; product.SortCode = input.SortCode; product.UseStatus = Model.Product.eUseStatus.Enable; product.Description = input.Description; return product; } /// <summary> /// æ´æ°è®¾å¤ /// </summary> public static Model.Product UpdateProduct(this UpdateSimCardInput input, Model.Product product) { product.NO = input.NO; product.Name = input.CardNO; product.Code = input.Code; product.ManufacturerID = input.ManufacturerID; var simCard = new Model.SimCard(); simCard.CardNO = input.CardNO; simCard.RechargeMode = input.RechargeMode; simCard.RechargeInfo = input.RechargeInfo; product.RatedParas = simCard.ToJson(); product.PropsParas = input.PropsParas; product.InspectionSchedule = input.InspectionSchedule; product.TerminalId = input.TerminalId; product.TagName = input.TagName; product.Description = input.Description; return product; } } } Application/IStation.Application.Product/special/tong_xin_she_bei/Communication_Controller.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,223 @@ using Microsoft.AspNetCore.Mvc; using System.Net; using System.Net.Http.Headers; using Microsoft.Extensions.Hosting.Internal; using Microsoft.AspNetCore.Http.Extensions; using IStation.Untity; using Furion.DynamicApiController; using System.ComponentModel.DataAnnotations; using Mapster; namespace IStation.Application { /// <summary> /// Communication /// </summary> [Route("Product/Communication")] [ApiDescriptionSettings("Communication", Name = "é信设å¤", Order = 600)] public class Communication_Controller : IDynamicApiController { private readonly Service.Product _service = new Service.Product(); #region Query /// <summary> /// éè¿ CorpID è·å /// </summary> [Route("GetByCorpID@V1.0")] [HttpGet] public List<CommunicationDto> GetByCorpID([FromQuery][Required] CorpIDInput input) { var list = _service.GetByCatalog(input.CorpID,Product.Catalog_TongXinSheBei); var vm_list=list?.Select(x=>new CommunicationDto(x)).ToList(); return vm_list; } /// <summary> /// éè¿ ID è·å /// </summary> [Route("GetByID@V1.0")] [HttpGet] public CommunicationDto GetByID([FromQuery][Required] IDUnderCorpInput input) { var model = _service.GetByID(input.CorpID, input.ID); if (model == null) return null; if (model.Catalog != Product.Catalog_TongXinSheBei) return null; return new CommunicationDto(model); } /// <summary> /// éè¿ Ids è·å /// </summary> [Route("GetByIds@V1.0")] [HttpGet] public List<CommunicationDto> GetByIds([FromQuery][Required] IdsUnderCorpInput input) { var ids = LongListHelper.ToList(input.Ids); var list = _service.GetByIds(input.CorpID, ids); list = list?.Where(x => x.Catalog == Product.Catalog_TongXinSheBei).ToList(); var vm_list = list?.Select(x => new CommunicationDto(x)).ToList(); return vm_list; } /// <summary> /// éè¿ BelongType and BelongIDè·å /// </summary> [Route("GetByBelongTypeAndBelongID@V1.0")] [HttpGet] public List<CommunicationDto> GetByBelongTypeAndBelongID([FromQuery][Required] BelongUnderCorpInput input) { var list = _service.GetByBelongTypeAndBelongID(input.CorpID, input.BelongType, input.BelongID); list = list?.Where(x => x.Catalog == Product.Catalog_TongXinSheBei).ToList(); var vm_list = list?.Select(x => new CommunicationDto(x)).ToList(); return vm_list; ; } /// <summary> /// éè¿ BelongType and BelongIds è·å /// </summary> [Route("GetByBelongTypeAndBelongIds@V1.0")] [HttpGet] public List<CommunicationDto> GetByBelongTypeAndBelongIds([FromQuery][Required] BelongIdsUnderCorpInput input) { var list = _service.GetByBelongTypeAndBelongIds(input.CorpID, input.BelongType, LongListHelper.ToList(input.BelongIds)); list = list?.Where(x => x.Catalog == Product.Catalog_TongXinSheBei).ToList(); var vm_list = list?.Select(x => new CommunicationDto(x)).ToList(); return vm_list; ; } #endregion #region Insert /// <summary> /// æå ¥ä¸æ¡ /// </summary> [Route("Insert@V1.0")] [HttpPost] public long Insert(AddCommunicationInput input) { if (input == null) return default; var product = input.ToProduct(); var id = _service.Insert(product); return id; } /// <summary> /// æå ¥å¤æ¡ /// </summary> [Route("Inserts@V1.0")] [HttpPost] public bool Inserts(List<AddCommunicationInput> inputList) { if (inputList == null || inputList.Count < 1) return false; var list = inputList.Select(x => x.ToProduct()).ToList(); var bol = _service.Inserts(list); return bol; } #endregion #region Update /// <summary> /// æ´æ°ä¸æ¡ /// </summary> [Route("Update@V1.0")] [HttpPut] public bool Update(UpdateCommunicationInput input) { if (input == null) return false; var product = _service.GetByID(input.CorpID, input.ID); if (product == null) return false; input.UpdateProduct(product); var bol = _service.Update(product); return bol; } /// <summary> /// æ´æ°å¤æ¡ /// </summary> [Route("Updates@V1.0")] [HttpPut] public bool Updates(List<UpdateCommunicationInput> inputList) { if (inputList == null || inputList.Count() < 1) { return false; } var corpIds = inputList.Select(x => x.CorpID).Distinct().ToList(); if (corpIds.Count > 1) return false; var productList = _service.GetByIds(corpIds[0], inputList.Select(x => x.ID).ToList()); if (productList == null || productList.Count < 1) return false; var rhsList = new List<Model.Product>(); productList.ForEach(x => { var input = inputList.Find(t => t.ID == x.ID); if (input != null) { var rhs = new Model.Product(x); input.UpdateProduct(rhs); rhsList.Add(rhs); } }); if (rhsList.Count < 1) return false; var bol = _service.Updates(rhsList); return bol; } #endregion #region Exist /// <summary> /// 夿TagNameæ¯å¦åå¨ /// </summary> [Route("IsExistTagName@V1.0")] [HttpGet] public bool IsExistTagName([FromQuery][Required] TagNameUnderCorpInput input) { var bol = _service.IsExistTagName(input.CorpID, input.TagName); return bol; } /// <summary> /// 夿TagNameæ¯å¦åå¨ ExceptID /// </summary> [Route("IsExistTagNameExceptID@V1.0")] [HttpGet] public bool IsExistTagNameExceptID([FromQuery][Required] TagNameExceptUnderCorpInput input) { var bol = _service.IsExistTagNameExceptID(input.CorpID, input.TagName, input.ExceptID); return bol; } #endregion #region Delete /// <summary> /// å é¤ /// </summary> [Route("DeleteByID@V1.0")] [HttpDelete] public DeleteReasonOutput DeleteByID([FromQuery][Required] IDUnderCorpInput input) { var bol = _service.DeleteByID(input.CorpID, input.ID, out string Msg); return new DeleteReasonOutput() { Success = bol, Reason = Msg }; } #endregion } } Application/IStation.Application.Product/special/tong_xin_she_bei/dto/AddCommunicationInput.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,129 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using static IStation.Model.Product; namespace IStation.Application { /// <summary> /// æ·»å é信设å¤input /// </summary> public class AddCommunicationInput { /// <summary> /// å®¢æ·æ è¯ /// </summary> public long CorpID { get; set; } /// <summary> /// æå±ç±»å /// </summary> public string BelongType { get; set; } /// <summary> /// æå±æ è¯ /// </summary> public long BelongID { get; set; } /// <summary> /// ç»æ è¯ /// </summary> public long GroupID { get; set; } /// <summary> /// 设å¤ç±»åæ è¯ /// </summary> public long ProductTypeID { get; set; } /// <summary> /// ç¼å· /// </summary> public string NO { get; set; } /// <summary> /// åå· /// </summary> public string Code { get; set; } /// <summary> /// åå /// </summary> public long ManufacturerID { get; set; } /// <summary> /// æå¡å¨IP /// </summary> public string ServerIP { get; set; } /// <summary> /// æå¡ç«¯å£ /// </summary> public int ServerPort { get; set; } /// <summary> /// 设å¤ç¼ç /// </summary> public string SpecialNO { get; set; } /// <summary> /// 注åç /// </summary> public string RegisterCode { get; set; } /// <summary> /// å¿è·³å /// </summary> public string Heartbeat { get; set; } /// <summary> /// å¿è·³é´é ï¼ç§ï¼ /// </summary> public int HeartInterval { get; set; } /// <summary> /// æ³¢ç¹ç /// </summary> public int BaudRate { get; set; } /// <summary> /// éä¿¡åé¦ /// </summary> public bool FeedBack { get; set; } /// <summary> /// éå 屿§ /// </summary> public Dictionary<long, string> PropsParas { get; set; } /// <summary> /// å·¡æ£å¨æ /// </summary> public eInspectionSchedule InspectionSchedule { get; set; } /// <summary> /// ç»ç«¯æ è¯ /// </summary> public string TerminalId { get; set; } /// <summary> /// æ ç¾ /// </summary> public string TagName { get; set; } /// <summary> /// æåºç /// </summary> public int SortCode { get; set; } /// <summary> /// 说æ /// </summary> public string Description { get; set; } } } Application/IStation.Application.Product/special/tong_xin_she_bei/dto/CommunicationDto.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,207 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using static IStation.Model.Product; namespace IStation.Application { /// <summary> /// é信设å¤dto /// </summary> public class CommunicationDto { /// <summary> /// /// </summary> public CommunicationDto() { } /// <summary> /// /// </summary> public CommunicationDto(Model.Product pro) { var rhs = new Model.Product<Model.Communication>(pro); this.ID = rhs.ID; this.CorpID = rhs.CorpID; this.BelongType = rhs.BelongType; this.BelongID = rhs.BelongID; this.GroupID = rhs.GroupID; this.ProductTypeID = rhs.ProductTypeID; this.NO = rhs.NO; this.Code = rhs.Code; this.ManufacturerID = rhs.ManufacturerID; this.ServerIP = rhs.RatedParas.ServerIP; this.ServerPort = rhs.RatedParas.ServerPort; this.SpecialNO = rhs.RatedParas.SpecialNO; this.RegisterCode = rhs.RatedParas.RegisterCode; this.Heartbeat = rhs.RatedParas.Heartbeat; this.HeartInterval = rhs.RatedParas.HeartInterval; this.BaudRate = rhs.RatedParas.BaudRate; this.FeedBack = rhs.RatedParas.FeedBack; this.PropsParas = rhs.PropsParas; this.InspectionSchedule = rhs.InspectionSchedule; this.TerminalId = rhs.TerminalId; this.TagName = rhs.TagName; this.SortCode = rhs.SortCode; this.UseStatus = rhs.UseStatus; this.Description = rhs.Description; } /// <summary> /// /// </summary> public CommunicationDto(Model.Product<Model.Communication> rhs) { this.ID = rhs.ID; this.CorpID = rhs.CorpID; this.BelongType = rhs.BelongType; this.BelongID = rhs.BelongID; this.GroupID = rhs.GroupID; this.ProductTypeID = rhs.ProductTypeID; this.NO = rhs.NO; this.Code = rhs.Code; this.ManufacturerID = rhs.ManufacturerID; this.ServerIP = rhs.RatedParas.ServerIP; this.ServerPort = rhs.RatedParas.ServerPort; this.SpecialNO = rhs.RatedParas.SpecialNO; this.RegisterCode = rhs.RatedParas.RegisterCode; this.Heartbeat = rhs.RatedParas.Heartbeat; this.HeartInterval= rhs.RatedParas.HeartInterval; this.BaudRate = rhs.RatedParas.BaudRate; this.FeedBack= rhs.RatedParas.FeedBack; this.PropsParas = rhs.PropsParas; this.InspectionSchedule = rhs.InspectionSchedule; this.TerminalId = rhs.TerminalId; this.TagName = rhs.TagName; this.SortCode = rhs.SortCode; this.UseStatus = rhs.UseStatus; this.Description = rhs.Description; } /// <summary> /// æ è¯ /// </summary> public long ID { get; set; } /// <summary> /// å®¢æ·æ è¯ /// </summary> public long CorpID { get; set; } /// <summary> /// æå±ç±»å /// </summary> public string BelongType { get; set; } /// <summary> /// æå±æ è¯ /// </summary> public long BelongID { get; set; } /// <summary> /// ç»æ è¯ /// </summary> public long GroupID { get; set; } /// <summary> /// 设å¤ç±»åæ è¯ /// </summary> public long ProductTypeID { get; set; } /// <summary> /// ç¼å· /// </summary> public string NO { get; set; } /// <summary> /// åå· /// </summary> public string Code { get; set; } /// <summary> /// åå /// </summary> public long ManufacturerID { get; set; } /// <summary> /// æå¡å¨IP /// </summary> public string ServerIP { get; set; } /// <summary> /// æå¡ç«¯å£ /// </summary> public int ServerPort { get; set; } /// <summary> /// 设å¤ç¼ç /// </summary> public string SpecialNO { get; set; } /// <summary> /// 注åç /// </summary> public string RegisterCode { get; set; } /// <summary> /// å¿è·³å /// </summary> public string Heartbeat { get; set; } /// <summary> /// å¿è·³é´é ï¼ç§ï¼ /// </summary> public int HeartInterval { get; set; } /// <summary> /// æ³¢ç¹ç /// </summary> public int BaudRate { get; set; } /// <summary> /// éä¿¡åé¦ /// </summary> public bool FeedBack { get; set; } /// <summary> /// éå 屿§ /// </summary> public Dictionary<long, string> PropsParas { get; set; } /// <summary> /// å·¡æ£å¨æ /// </summary> public eInspectionSchedule InspectionSchedule { get; set; } /// <summary> /// ç»ç«¯æ è¯ /// </summary> public string TerminalId { get; set; } /// <summary> /// æ ç¾ /// </summary> public string TagName { get; set; } /// <summary> /// æåºç /// </summary> public int SortCode { get; set; } /// <summary> /// 使ç¨ç¶æ /// </summary> public eUseStatus UseStatus { get; set; } /// <summary> /// 说æ /// </summary> public string Description { get; set; } } } Application/IStation.Application.Product/special/tong_xin_she_bei/dto/UpdateCommunicationInput.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,105 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using static IStation.Model.Product; namespace IStation.Application { /// <summary> /// æ´æ°é讯设å¤input /// </summary> public class UpdateCommunicationInput { /// <summary> /// æ è¯ /// </summary> public long ID { get; set; } /// <summary> /// å®¢æ·æ è¯ /// </summary> public long CorpID { get; set; } /// <summary> /// ç¼å· /// </summary> public string NO { get; set; } /// <summary> /// åå· /// </summary> public string Code { get; set; } /// <summary> /// åå /// </summary> public long ManufacturerID { get; set; } /// <summary> /// æå¡å¨IP /// </summary> public string ServerIP { get; set; } /// <summary> /// æå¡ç«¯å£ /// </summary> public int ServerPort { get; set; } /// <summary> /// 设å¤ç¼ç /// </summary> public string SpecialNO { get; set; } /// <summary> /// 注åç /// </summary> public string RegisterCode { get; set; } /// <summary> /// å¿è·³å /// </summary> public string Heartbeat { get; set; } /// <summary> /// å¿è·³é´é ï¼ç§ï¼ /// </summary> public int HeartInterval { get; set; } /// <summary> /// æ³¢ç¹ç /// </summary> public int BaudRate { get; set; } /// <summary> /// éä¿¡åé¦ /// </summary> public bool FeedBack { get; set; } /// <summary> /// éå 屿§ /// </summary> public Dictionary<long, string> PropsParas { get; set; } /// <summary> /// å·¡æ£å¨æ /// </summary> public eInspectionSchedule InspectionSchedule { get; set; } /// <summary> /// ç»ç«¯æ è¯ /// </summary> public string TerminalId { get; set; } /// <summary> /// æ ç¾ /// </summary> public string TagName { get; set; } /// <summary> /// 说æ /// </summary> public string Description { get; set; } } } Application/IStation.Application.Product/special/tong_xin_she_bei/helper/CommunicationTransferHelper.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,86 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace IStation.Application { /// <summary> /// é信转æ¢è¾ å©ç±» /// </summary> public static class CommunicationTransferHelper { /// <summary> /// 转æ¢ä¸ºè®¾å¤ /// </summary> public static Model.Product ToProduct(this AddCommunicationInput input) { var product=new Model.Product(); product.ID = 0; product.CorpID = input.CorpID; product.BelongType = input.BelongType; product.BelongID = input.BelongID; product.GroupID = input.GroupID; product.Catalog = Product.Catalog_TongXinSheBei; product.ProductTypeID=input.ProductTypeID; product.NO=input.NO; product.Name = input.SpecialNO; product.Code= input.Code; product.ManufacturerID=input.ManufacturerID; var communication = new Model.Communication(); communication.ServerIP = input.ServerIP; communication.ServerPort = input.ServerPort; communication.SpecialNO = input.SpecialNO; communication.RegisterCode=input.RegisterCode; communication.Heartbeat=input.Heartbeat; communication.HeartInterval= input.HeartInterval; communication.BaudRate= input.BaudRate; communication.FeedBack= input.FeedBack; product.RatedParas = communication.ToJson(); product.TerminalId = input.TerminalId; product.TagName = input.TagName; product.SortCode = input.SortCode; product.UseStatus = Model.Product.eUseStatus.Enable; product.Description = input.Description; return product; } /// <summary> /// æ´æ°è®¾å¤ /// </summary> public static Model.Product UpdateProduct(this UpdateCommunicationInput input,Model.Product product) { product.NO= input.NO; product.Code = input.Code; product.ManufacturerID = input.ManufacturerID; product.Name = input.SpecialNO; var communication = new Model.Communication(); communication.ServerIP = input.ServerIP; communication.ServerPort = input.ServerPort; communication.SpecialNO = input.SpecialNO; communication.RegisterCode = input.RegisterCode; communication.Heartbeat = input.Heartbeat; communication.HeartInterval = input.HeartInterval; communication.BaudRate = input.BaudRate; communication.FeedBack = input.FeedBack; product.RatedParas = communication.ToJson(); product.PropsParas = input.PropsParas; product.InspectionSchedule = input.InspectionSchedule; product.TerminalId= input.TerminalId; product.TagName = input.TagName; product.Description=input.Description; return product; } } } Core/IStation.WebApi.Core/Result/XnRestfulResultProvider.cs
@@ -11,7 +11,6 @@ using System.Collections.Generic; using System.Net; using System.Threading.Tasks; using IStation.Extensions; namespace IStation.WebApi { Model/IStation.Model.Core/IStation.Model.Core.csproj
@@ -17,6 +17,7 @@ <ItemGroup> <ProjectReference Include="..\..\Component\IStation.Newtonsoft\IStation.Newtonsoft.csproj" /> <ProjectReference Include="..\..\Core\IStation.Core\IStation.Core.csproj" /> <ProjectReference Include="..\..\Untity\IStation.Unit\IStation.Unit.csproj" /> <ProjectReference Include="..\..\Untity\IStation.Untity\IStation.Untity.csproj" /> </ItemGroup>