Merge branch 'kitchenmanage' of http://10.2.1.24:10244/zhaoy/BPA.SAAS.Manage into kitchenmanage

BPA.SAAS.Manage.Application/Device/DeviceServices.cs

@@ -39,6 +39,11 @@ namespace BPA.SAAS.Manage.Application.Device
         {
             return await _deviceService.GetDeviceList();
         }
+        [HttpGet("/api/device/getdevicebystoplist")]
+        public async Task<List<ListSelectDeviceQuery>> GetDeviceByStopList(string stopId)
+        {
+            return await _deviceService.GetDeviceByStopList(stopId);
+        }
         /// <summary>
         /// 添加
         /// </summary>

BPA.SAAS.Manage.Application/Device/Dtos/Device/DeviceInfoBaseDto.cs

@@ -22,7 +22,7 @@ namespace BPA.SAAS.Manage.Application.Device.Dtos.Device
         /// <summary>
         ///归属场景（店铺）
         /// </summary>
-        public string OrgId { get; set; }
+        public string StopId { get; set; }
         /// <summary>
         /// 所属产品
         /// </summary>

BPA.SAAS.Manage.Application/Device/Dtos/Device/DeviceInfoQueryDto.cs

@@ -48,5 +48,7 @@ namespace BPA.SAAS.Manage.Application.Device.Dtos.Device
         public string OrgKey { get; set; }
         public string ProductVersionName { get; set; }
         public int TechnologyOrBom { get; set; }
+        public string StopId { get; set; }
+        public string StopName { get; set; }
     }
 }

BPA.SAAS.Manage.Application/Device/Dtos/Device/StoreDto.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.Manage.Application.Device.Dtos.Device
+{
+    public class StoreDto
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public string OrgId { get; set; }
+        public string OrgName { get; set; }
+        public string Phone { get; set; }
+        public int Sort { get; set; }
+        public string Description { get; set; }
+        public string GroupId { get; set; }
+        public DateTime CreateAt { get; set; }
+    }
+}

BPA.SAAS.Manage.Application/Device/Dtos/ProductFunction/ProductFunctionBaseDto.cs

@@ -20,7 +20,7 @@ namespace BPA.SAAS.Manage.Application.Device.Dtos.ProductFunction
         /// <summary>
         /// 功能类型 0属性1服务2事件
         /// </summary>
-        public int Type { get; set; }
+        public FunctionTypeEnum Type { get; set; }
         /// <summary>
         /// 数据类型
         /// </summary>

BPA.SAAS.Manage.Application/Device/Interface/IDeviceService.cs

@@ -13,6 +13,7 @@ namespace BPA.SAAS.Manage.Application.Device.Interface
     {
         Task<PageUtil> GetDeviceInfoPage(DeviceQueryInputDto inputDto);
         Task<List<ListSelectDeviceQuery>> GetDeviceList();
+        Task<List<ListSelectDeviceQuery>> GetDeviceByStopList(string stopId);
         Task<bool> AddDevice(DeviceInfoBaseDto inputDto);
         Task<bool> UpdateDevice(DeviceInfoBaseDto inputDto);
         Task<bool> DelDeviceInfo(List<string> inputList);

BPA.SAAS.Manage.Application/Device/Services/DeviceService.cs

@@ -1,4 +1,5 @@
-using BPA.SAAS.Manage.Application.Device.Dtos.Device;
+using BPA.SAAS.Manage.Application.DataBase.Dtos.GoodsAttribute;
+using BPA.SAAS.Manage.Application.Device.Dtos.Device;
 using BPA.SAAS.Manage.Application.Device.Interface;
 using BPA.SAAS.Manage.Comm.Const;
 using BPA.SAAS.Manage.Comm.Enum;
@@ -10,6 +11,8 @@ using BPA.SAAS.Manage.Core.Org;
 using BPA.SAAS.Manage.Core.Product;
 using BPA.SAAS.Manage.Core.system;
 using Dm;
+using Furion.RemoteRequest.Extensions;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,6 +23,7 @@ namespace BPA.SAAS.Manage.Application.Device.Services
 {
     public class DeviceService: IDeviceService, ITransient
     {
+        StoreServers storeServer = new();
         ISqlSugarClient _db;
         public DeviceService(ISqlSugarClient db) 
         {
@@ -32,10 +36,11 @@ namespace BPA.SAAS.Manage.Application.Device.Services
         /// <returns></returns>
         public async Task<PageUtil> GetDeviceInfoPage(DeviceQueryInputDto inputDto)
         {
+            var dataStore =await storeServer.GetStop();
             RefAsync<int> total =0;
             var data = await _db.Queryable<BPA_DeviceInfo, BPA_Product>((a, b) => new JoinQueryInfos(JoinType.Left, a.ProductId == b.Id))
 
-                   .WhereIF(!string.IsNullOrWhiteSpace(inputDto.StoreId), (a, b) => a.OrgId == inputDto.StoreId)
+                   .WhereIF(!string.IsNullOrWhiteSpace(inputDto.StoreId), (a, b) => a.StopId == inputDto.StoreId)
                .WhereIF(!string.IsNullOrWhiteSpace(inputDto.DeviceName), (a, b) => a.DeviceName.Contains(inputDto.DeviceName))
                .WhereIF(!string.IsNullOrWhiteSpace(inputDto.DeviceTypeId), (a, b) => a.DeviceTypeId == inputDto.DeviceTypeId)
                .OrderBy((a, b) => a.CreateAt, OrderByType.Desc)
@@ -44,12 +49,14 @@ namespace BPA.SAAS.Manage.Application.Device.Services
                    Id = a.Id.SelectAll(),
                    ProductName=b.Name,
                    ProductCode=b.Code,
+                   StopId=a.StopId,
                    ProductVersionName = ""
                })
                .Mapper(x =>
                {
                    var Vesion = _db.Queryable<BPA_ProductVesion>().Where(c => c.Id == x.ProductVersionId).First();
                    x.ProductVersionName = Vesion?.Vesion;
+                   x.StopName= dataStore?.Where(f=>f.Id==x.StopId).FirstOrDefault()?.Name;
                })
                .ToPageListAsync(inputDto.Current, inputDto.PageSize, total);
             return new PageUtil()
@@ -83,6 +90,27 @@ namespace BPA.SAAS.Manage.Application.Device.Services
             });
             return data;
         }
+        public async Task<List<ListSelectDeviceQuery>> GetDeviceByStopList(string stopId)
+        {
+            RefAsync<int> total = 0;
+            var data = await _db.Queryable<BPA_DeviceInfo>().Where(x=>x.StopId== stopId)
+               .Select(a => new ListSelectDeviceQuery
+               {
+                   Id = a.Id,
+                   Name = a.DeviceName,
+                   AutoKey = a.AutoKey.ToString(),
+                   ProductVersionId = a.ProductVersionId,
+                   ProductId = a.ProductId,
+               }).ToListAsync();
+            data.ForEach(x =>
+            {
+                x.Vesion = _db.Queryable<BPA_ProductVesion>().Where(s => s.Id == x.ProductVersionId).First()?.Vesion;
+                x.ProductNumber = _db.Queryable<BPA_ProductVesion>().Where(s => s.Id == x.ProductVersionId).First()?.ProductNumber;
+                x.ProductName = _db.Queryable<BPA_Product>().Where(s => s.Id == x.ProductId).First()?.Name;
+                x.PrductKey = _db.Queryable<BPA_Product>().Where(s => s.Id == x.ProductId).First()?.Key;
+            });
+            return data;
+        }
         public async Task<BPA_DeviceInfo> GetDevice(string productId)
         {
             var data = await _db.Queryable<BPA_DeviceInfo>().Where(x => x.Id == productId).FirstAsync();
@@ -123,7 +151,7 @@ namespace BPA.SAAS.Manage.Application.Device.Services
                     {
                         x.DeviceName,
                         x.DeviceTypeId,
-                        x.OrgId,
+                        x.StopId,
                         x.ProductId,
                         x.ProductCode,
                         x.Status,

BPA.SAAS.Manage.Application/Device/Services/DeviceVesionService.cs

@@ -71,37 +71,74 @@ namespace BPA.SAAS.Manage.Application.Device.Services
                     Status = CommonStatus.ENABLE
                 }).CallEntityMethod(m => m.Create()).ExecuteReturnEntityAsync();
                 var Product = _db.Queryable<BPA_Product>().Where(x => x.Id == inputDto.ProductId).First();
+                #region 添加默认功能和topics
                 List<BPA_ProductTopics> list = new();
                 var goodspushtopics = new BPA_ProductTopics()
                 {
                     Topics = " /" + Product.Key + "/" + inputDto.Vesion + "/${deviceKey}/defaul/goodspush",
-                    TopicsType = 2,
+                    TopicsType = TopicsTypeEnum.SUBSCRIBE,
                     Description = "商品数据下发",
                     ProductId = inputDto.ProductId,
                     ProductVesionId = res.Id,
+                    Name = "商品数据下发",
+                    IsDefault = true
+                };
+                var goodspushtopics_reply = new BPA_ProductTopics()
+                {
+                    Topics = " /" + Product.Key + "/" + inputDto.Vesion + "/${deviceKey}/defaul/goodspush_reply",
+                    TopicsType = TopicsTypeEnum.PUBLISH,
+                    Description = "响应商品数据下发",
+                    ProductId = inputDto.ProductId,
+                    ProductVesionId = res.Id,
+                    Name = "商品数据下发",
                     IsDefault = true
                 };
                 var batchingpushtopics = new BPA_ProductTopics()
                 {
                     Topics = " /" + Product.Key + "/" + inputDto.Vesion + "/${deviceKey}/defaul/batvhingpush",
-                    TopicsType = 2,
+                    TopicsType = TopicsTypeEnum.PUBLISH,
                     Description = "物料数据下发",
                     ProductId = inputDto.ProductId,
                     ProductVesionId = res.Id,
+                    Name = "物料数据下发",
+                    IsDefault = true
+                };
+                var batchingpushtopics_reply = new BPA_ProductTopics()
+                {
+                    Topics = " /" + Product.Key + "/" + inputDto.Vesion + "/${deviceKey}/defaul/batvhingpush_reply",
+                    TopicsType = TopicsTypeEnum.SUBSCRIBE,
+                    Description = "响应物料数据下发",
+                    ProductId = inputDto.ProductId,
+                    ProductVesionId = res.Id,
+                    Name = "物料数据下发",
                     IsDefault = true
                 };
                 var chnologypushtopics = new BPA_ProductTopics()
                 {
                     Topics = " /" + Product.Key + "/" + inputDto.Vesion + "/${deviceKey}/defaul/chnologypush",
-                    TopicsType = 2,
+                    TopicsType = TopicsTypeEnum.PUBLISH,
                     Description = "工艺数据下发",
                     ProductId = inputDto.ProductId,
                     ProductVesionId = res.Id,
+                    Name = "工艺数据下发",
+                    IsDefault = true
+                };
+                var chnologypushtopics_reply = new BPA_ProductTopics()
+                {
+                    Topics = " /" + Product.Key + "/" + inputDto.Vesion + "/${deviceKey}/defaul/chnologypush_reply",
+                    TopicsType = TopicsTypeEnum.SUBSCRIBE,
+                    Description = "响应工艺数据下发",
+                    ProductId = inputDto.ProductId,
+                    Name = "工艺数据下发",
+                    ProductVesionId = res.Id,
                     IsDefault = true
                 };
                 list.Add(goodspushtopics);
+                list.Add(goodspushtopics_reply);
                 list.Add(batchingpushtopics);
+                list.Add(batchingpushtopics_reply);
                 list.Add(chnologypushtopics);
+                list.Add(chnologypushtopics_reply);
                 await _db.Insertable(list).CallEntityMethod(m => m.Create()).ExecuteCommandAsync();
                 List<BPA_ProductFunction> ProductFunctionlist = new();
                 var goodsProductFunction = new BPA_ProductFunction()
@@ -109,40 +146,79 @@ namespace BPA.SAAS.Manage.Application.Device.Services
                     Id=Guid.NewGuid().ToString(),
                     CreateAt= DateTime.Now,
                     DataType = "",
-                    Type = 1,
+                    Type = FunctionTypeEnum.SERVER,
                     Name = "商品数据下发",
                     Description = "商品数据下发",
                     ProductId = inputDto.ProductId,
                     DeviceVersionKey = res.Id,
                     IsDefault = true
                 };
+                var goodsProductFunction_reply = new BPA_ProductFunction()
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    CreateAt = DateTime.Now,
+                    DataType = "",
+                    Type = FunctionTypeEnum.SERVER,
+                    Name = "响应商品数据下发",
+                    Description = "响应商品数据下发",
+                    ProductId = inputDto.ProductId,
+                    DeviceVersionKey = res.Id,
+                    IsDefault = true
+                };
                 var batchingProductFunction = new BPA_ProductFunction()
                 {
                     Id = Guid.NewGuid().ToString(),
                     CreateAt = DateTime.Now,
                     DataType = "",
-                    Type = 1,
+                    Type = FunctionTypeEnum.SERVER,
                     Name = "物料数据下发",
                     Description = "物料数据下发",
                     ProductId = inputDto.ProductId,
                     DeviceVersionKey = res.Id,
                     IsDefault = true
                 };
+                var batchingProductFunction_reply = new BPA_ProductFunction()
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    CreateAt = DateTime.Now,
+                    DataType = "",
+                    Type = FunctionTypeEnum.SERVER,
+                    Name = "响应物料数据下发",
+                    Description = "响应物料数据下发",
+                    ProductId = inputDto.ProductId,
+                    DeviceVersionKey = res.Id,
+                    IsDefault = true
+                };
                 var chnologyProductFunction = new BPA_ProductFunction()
                 {
                     Id = Guid.NewGuid().ToString(),
                     CreateAt = DateTime.Now,
                     DataType = "",
-                    Type = 1,
+                    Type = FunctionTypeEnum.SERVER,
                     Name = "工艺数据下发",
                     Description = "工艺数据下发",
                     ProductId = inputDto.ProductId,
                     DeviceVersionKey = res.Id,
                     IsDefault = true
                 };
+                var chnologyProductFunction_reply = new BPA_ProductFunction()
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    CreateAt = DateTime.Now,
+                    DataType = "",
+                    Type = FunctionTypeEnum.SERVER,
+                    Name = "响应工艺数据下发",
+                    Description = "响应工艺数据下发",
+                    ProductId = inputDto.ProductId,
+                    DeviceVersionKey = res.Id,
+                    IsDefault = true
+                };
                 ProductFunctionlist.Add(goodsProductFunction);
+                ProductFunctionlist.Add(goodsProductFunction_reply);
                 ProductFunctionlist.Add(batchingProductFunction);
+                ProductFunctionlist.Add(batchingProductFunction_reply);
                 ProductFunctionlist.Add(chnologyProductFunction);
+                ProductFunctionlist.Add(chnologyProductFunction_reply);
                 await _db.Insertable(ProductFunctionlist).ExecuteCommandAsync();
                 List<BPA_ProductFunctionAction> ProductFunctionActionlist = new();
                 var goodsProductFunctionActionlist = new BPA_ProductFunctionAction()
@@ -169,10 +245,38 @@ namespace BPA.SAAS.Manage.Application.Device.Services
                     ActionValue = "",
                     IsDefault = true
                 };
+                var goodsProductFunctionActionlist_reply = new BPA_ProductFunctionAction()
+                {
+                    ActionType = "textareaary",
+                    ProductFunctionId = goodsProductFunction_reply.Id,
+                    ActionName = "DataSoure",
+                    ActionValue = "",
+                    IsDefault = true
+                };
+                var batchingProductFunctionActionlist_reply = new BPA_ProductFunctionAction()
+                {
+                    ActionType = "textareaary",
+                    ProductFunctionId = batchingProductFunction_reply.Id,
+                    ActionName = "DataSoure",
+                    ActionValue = "",
+                    IsDefault = true
+                };
+                var chnologyProductFunctionActionlist_reply = new BPA_ProductFunctionAction()
+                {
+                    ActionType = "textareaary",
+                    ProductFunctionId = chnologyProductFunction_reply.Id,
+                    ActionName = "DataSoure",
+                    ActionValue = "",
+                    IsDefault = true
+                };
                 ProductFunctionActionlist.Add(goodsProductFunctionActionlist);
                 ProductFunctionActionlist.Add(batchingProductFunctionActionlist);
                 ProductFunctionActionlist.Add(chnologyProductFunctionActionlist);
+                ProductFunctionActionlist.Add(goodsProductFunctionActionlist_reply);
+                ProductFunctionActionlist.Add(batchingProductFunctionActionlist_reply);
+                ProductFunctionActionlist.Add(chnologyProductFunctionActionlist_reply);
                 await _db.Insertable(ProductFunctionActionlist).CallEntityMethod(m => m.Create()).ExecuteCommandAsync();
+                #endregion
                 _db.Ado.CommitTran();
                 return res != null;
             }

BPA.SAAS.Manage.Application/Device/Services/ProductFunctionService.cs

@@ -37,11 +37,11 @@ namespace BPA.SAAS.Manage.Application.Device.Services
             var res = await _db.Queryable<BPA_ProductFunction, BPA_ProductVesion>((x, b) => new JoinQueryInfos(JoinType.Left, b.Id == x.DeviceVersionKey))
                 .Where((x,b)=>x.ProductId == inputDto.ProductId && x.DeviceVersionKey== inputDto.ProductVesionId)
                 .WhereIF(!string.IsNullOrWhiteSpace(inputDto.Name), (x, b) => x.Name.Contains(inputDto.Name))
-                  .WhereIF(!string.IsNullOrWhiteSpace(inputDto.Type), (x, b) => x.Type==Convert.ToInt32(inputDto.Type))
+                  .WhereIF(!string.IsNullOrWhiteSpace(inputDto.Type), (x, b) => x.Type==(FunctionTypeEnum)(Enum.Parse(typeof(FunctionTypeEnum), inputDto.Type)))
                     .WhereIF(!string.IsNullOrWhiteSpace(inputDto.Vesion), (x, b) => x.DeviceVersionKey == inputDto.Vesion)
                     //.WhereIF(inputDto.IsDefault!=null, (x, b) => x.IsDefault == inputDto.IsDefault)
                  .WhereIF(inputDto.Status != null, (x, b) => x.Status == inputDto.Status)
-                  .OrderBy((x, b) => x.CreateAt, OrderByType.Desc)
+                  .OrderBy((x, b) => x.CreateAt, OrderByType.Desc).OrderBy((x, b) => x.Name, OrderByType.Desc)
                 .Select((x, b) => new
                 {
                     Name = x.Name,
@@ -250,7 +250,7 @@ namespace BPA.SAAS.Manage.Application.Device.Services
         public async Task<bool> AddProductFunctionAction(ProductFunctionActionBaseDto inputDto)
         {
             var check = _db.Queryable<BPA_ProductFunctionAction>()
-                .Any(a => a.ProductFunctionId == inputDto.ProductFunctionId && a.IsDeleted == 0 && a.ActionName == inputDto.ActionName && a.ActionType == inputDto.ActionType);
+                .Any(a => a.ProductFunctionId == inputDto.ProductFunctionId && a.ActionName == inputDto.ActionName );
             if (check)
             {
                 throw Oops.Oh("功能参数已存在");

BPA.SAAS.Manage.Application/Device/Services/ProductTopicsService.cs

@@ -30,9 +30,9 @@ namespace BPA.SAAS.Manage.Application.Device.Services
         {
             var total = new RefAsync<int>();
             var data = await _db.Queryable<BPA_ProductTopics>().Where(x=>x.ProductId== inputDto.ProductId && x.ProductVesionId== inputDto.ProductVesionId && x.IsDefault== inputDto.IsDefault)
-                .WhereIF(inputDto.TopicsType!=null, x => x.TopicsType==Convert.ToInt32(inputDto.TopicsType))
+                .WhereIF(inputDto.TopicsType!=null, x => x.TopicsType== (TopicsTypeEnum)(Enum.Parse(typeof(TopicsTypeEnum), inputDto.TopicsType.ToString())))
                 .WhereIF(!string.IsNullOrWhiteSpace(inputDto.Topics), x => x.Topics == inputDto.Topics)
-                .OrderBy(x => x.CreateAt, OrderByType.Desc)
+                .OrderBy(x => x.CreateAt, OrderByType.Desc).OrderBy(x => x.Name, OrderByType.Desc)
                 .ToPageListAsync(inputDto.Current, inputDto.PageSize, total);
 
             return new PageUtil()

BPA.SAAS.Manage.Application/StoreServers.cs

@@ -0,0 +1,36 @@
+using BPA.SAAS.Manage.Application.Device.Dtos.Device;
+using BPA.SAAS.Manage.Comm.Const;
+using BPA.SAAS.Manage.Core.Base;
+using Furion.RemoteRequest.Extensions;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.Manage.Application
+{
+    [ApiDescriptionSettings("Stop", Tag = "获取场景")]
+    public class StoreServers: IDynamicApiController
+    {
+        public StoreServers()
+        {
+
+        }
+        private  string BaseServerUrl = App.GetConfig<string>("baseurl");
+        [HttpGet("/api/stop/getstop")]
+        public  async  Task<List<StoreDto>> GetStop()
+        {
+            var getStoreurl = BaseServerUrl + "api/store/getstorelist_alm";//获取商品属性
+            var responseGoodsAttribute = await getStoreurl.SetHeaders(new
+            {
+                groupId = App.User?.FindFirst(ClaimConst.GroupId)?.Value
+            }).SetHttpMethod(HttpMethod.Get).GetAsStringAsync();
+            var resStore = JsonConvert.DeserializeObject<ResponDataBase>(responseGoodsAttribute);
+            if (resStore?.statusCode != "200") throw Oops.Oh("获取场景数据失败");
+            var dataStore = JsonConvert.DeserializeObject<List<StoreDto>>(resStore.data.ToString());
+            return dataStore;
+        }
+    }
+}

BPA.SAAS.Manage.Comm/Enum/FunctionTypeEnum.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.Manage.Comm.Enum
+{
+    public enum FunctionTypeEnum
+    {
+        /// <summary>
+        /// 属性 
+        /// </summary>
+        [Description("属性")]
+        ATTRIBUTE = 0,
+
+        /// <summary>
+        /// 服务
+        /// </summary>
+        [Description("服务")]
+        SERVER = 1,
+
+        /// <summary>
+        /// 事件
+        /// </summary>
+        [Description("事件")]
+        EVENT= 2
+    }
+}

BPA.SAAS.Manage.Comm/Enum/TopicsTypeEnum.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.Manage.Comm.Enum
+{
+    public enum TopicsTypeEnum
+    {
+        /// <summary>
+        /// 发布
+        /// </summary>
+        [Description("发布")]
+        PUBLISH = 0,
+
+        /// <summary>
+        /// 订阅
+        /// </summary>
+        [Description("订阅")]
+        SUBSCRIBE = 1,
+
+        /// <summary>
+        /// 发布和订阅
+        /// </summary>
+        [Description("发布和订阅")]
+        PUBLISHANDSUBSCRIBE = 2
+    }
+}

BPA.SAAS.Manage.Core/Base/ResponDataBase.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.Manage.Core.Base
+{
+    public class ResponDataBase
+    {
+        public string statusCode { get; set; }
+        public object data { get; set; }
+        public string succeeded { get; set; }
+        public string errors { get; set; }
+    }
+}

BPA.SAAS.Manage.Core/Device/BPA_DeviceInfo.cs

@@ -26,7 +26,7 @@ namespace BPA.SAAS.Manage.Core.Device
         /// <summary>
         ///归属场景（店铺）
         /// </summary>
-        public string OrgId { get; set; }
+        public string StopId { get; set; }
         /// <summary>
         /// 所属产品
         /// </summary>

BPA.SAAS.Manage.Core/Product/BPA_ProductFunction.cs

@@ -38,7 +38,7 @@ namespace BPA.SAAS.Manage.Core.Product
         /// <summary>
         /// 功能类型 0属性1服务2事件
         /// </summary>
-        public int Type { get; set; }
+        public FunctionTypeEnum Type { get; set; }
         /// <summary>
         /// 数据类型
         /// </summary>

BPA.SAAS.Manage.Core/Product/BPA_ProductTopics.cs

@@ -1,4 +1,5 @@
-using BPA.SAAS.Manage.Core.Base;
+using BPA.SAAS.Manage.Comm.Enum;
+using BPA.SAAS.Manage.Core.Base;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
@@ -18,7 +19,7 @@ namespace BPA.SAAS.Manage.Core.Product
         /// <summary>
         /// TopicsType类型 0发布 1订阅 2发布和订阅
         /// </summary>
-        public int TopicsType { get; set; }
+        public TopicsTypeEnum TopicsType { get; set; }
         /// <summary>
         /// 描述
         /// </summary>
@@ -29,5 +30,6 @@ namespace BPA.SAAS.Manage.Core.Product
         /// 是否默认Topics
         /// </summary>
         public bool IsDefault { get; set; }
+        public string Name { get; set; }
     }
 }

BPA.SAAS.Manage.Web.Core/Startup.cs

@@ -66,6 +66,7 @@ namespace BPA.SAAS.Manage.Web.Core
                 });
             });
             services.AddCorsAccessor();
+            services.AddRemoteRequest();
             services.AddSqlsugarSetup(App.Configuration);
             services.AddControllers()
                     .AddInjectWithUnifyResult<RESTfulResultProvider>();

BPA.SAAS.Manage.Web.Entry/appsettings.json

@@ -8,6 +8,7 @@
     }
   },
   "AllowedHosts": "*",
+  "baseurl": "http://192.168.1.19:5008/",
   "ConnectionConfigs": [
     {
       "ConnectionString": "server=10.2.1.21;Database=bpa_kitchen_kitchenbasemanage;Uid=root;Pwd=cygadmin;Allow Zero Datetime=True;Convert Zero Datetime=True;",