smj_7038 пре 3 година
родитељ
комит
cfc73eee2f

+ 28 - 28
Central.Control.WebApi/App_Data/Central.Control.WebApi.xml

@@ -128,142 +128,142 @@
             <typeparam name="T"></typeparam>
             <returns></returns>
         </member>
-        <member name="T:Central.Control.WebApi.Models.SYS_DEVICE">
+        <member name="T:Central.Control.WebApi.Models.SYS_Device">
             <summary>
             设备表
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.SYS_DEVICE.Id">
+        <member name="P:Central.Control.WebApi.Models.SYS_Device.Id">
             <summary>
             主键ID
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.SYS_DEVICE.Name">
+        <member name="P:Central.Control.WebApi.Models.SYS_Device.Name">
             <summary>
             设备名称
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.SYS_DEVICE.Code">
+        <member name="P:Central.Control.WebApi.Models.SYS_Device.Code">
             <summary>
             设备编号(唯一)
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.SYS_DEVICE.Address">
+        <member name="P:Central.Control.WebApi.Models.SYS_Device.Address">
             <summary>
             设备地址
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.SYS_DEVICE.Password">
+        <member name="P:Central.Control.WebApi.Models.SYS_Device.Password">
             <summary>
             设备密码
             </summary>
         </member>
-        <member name="T:Central.Control.WebApi.Models.YW_ORDER">
+        <member name="T:Central.Control.WebApi.Models.YW_Order">
             <summary>
             YW_ORDER订单表
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_ORDER.Id">
+        <member name="P:Central.Control.WebApi.Models.YW_Order.Id">
             <summary>
             主键id
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_ORDER.DeviceId">
+        <member name="P:Central.Control.WebApi.Models.YW_Order.DeviceId">
             <summary>
             购买设备id
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_ORDER.Price">
+        <member name="P:Central.Control.WebApi.Models.YW_Order.Price">
             <summary>
             订单金额
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_ORDER.PayStatus">
+        <member name="P:Central.Control.WebApi.Models.YW_Order.PayStatus">
             <summary>
             支付状态
             </summary>
         </member>
-        <member name="T:Central.Control.WebApi.Models.YW_ORDERDETAILS">
+        <member name="T:Central.Control.WebApi.Models.YW_OrderDetails">
             <summary>
             YW_ORDERDETAILS商品订单详细表
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_ORDERDETAILS.Id">
+        <member name="P:Central.Control.WebApi.Models.YW_OrderDetails.Id">
             <summary>
             主键ID
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_ORDERDETAILS.ProductId">
+        <member name="P:Central.Control.WebApi.Models.YW_OrderDetails.ProductId">
             <summary>
             商品id
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_ORDERDETAILS.Name">
+        <member name="P:Central.Control.WebApi.Models.YW_OrderDetails.Name">
             <summary>
             商品名称
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_ORDERDETAILS.Code">
+        <member name="P:Central.Control.WebApi.Models.YW_OrderDetails.Code">
             <summary>
             商品编号(唯一)
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_ORDERDETAILS.Img">
+        <member name="P:Central.Control.WebApi.Models.YW_OrderDetails.Img">
             <summary>
             商品图片
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_ORDERDETAILS.Info">
+        <member name="P:Central.Control.WebApi.Models.YW_OrderDetails.Info">
             <summary>
             商品简介
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_ORDERDETAILS.Price">
+        <member name="P:Central.Control.WebApi.Models.YW_OrderDetails.Price">
             <summary>
             售卖价
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_ORDERDETAILS.BuyingPrice">
+        <member name="P:Central.Control.WebApi.Models.YW_OrderDetails.BuyingPrice">
             <summary>
             进货价
             </summary>
         </member>
-        <member name="T:Central.Control.WebApi.Models.YW_PRODUCT">
+        <member name="T:Central.Control.WebApi.Models.YW_Product">
             <summary>
             YW_PRODUCT商品表
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_PRODUCT.Id">
+        <member name="P:Central.Control.WebApi.Models.YW_Product.Id">
             <summary>
             主键ID
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_PRODUCT.Name">
+        <member name="P:Central.Control.WebApi.Models.YW_Product.Name">
             <summary>
             商品名称
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_PRODUCT.Code">
+        <member name="P:Central.Control.WebApi.Models.YW_Product.Code">
             <summary>
             商品编号(唯一)
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_PRODUCT.Img">
+        <member name="P:Central.Control.WebApi.Models.YW_Product.Img">
             <summary>
             商品图片
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_PRODUCT.Info">
+        <member name="P:Central.Control.WebApi.Models.YW_Product.Info">
             <summary>
             商品简介
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_PRODUCT.Price">
+        <member name="P:Central.Control.WebApi.Models.YW_Product.Price">
             <summary>
             售卖价
             </summary>
         </member>
-        <member name="P:Central.Control.WebApi.Models.YW_PRODUCT.BuyingPrice">
+        <member name="P:Central.Control.WebApi.Models.YW_Product.BuyingPrice">
             <summary>
             进货价
             </summary>

+ 4 - 4
Central.Control.WebApi/Central.Control.WebApi.csproj

@@ -179,10 +179,10 @@
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
     <Compile Include="IOC\IOCService.cs" />
-    <Compile Include="Models\SYS_DEVICE.cs" />
-    <Compile Include="Models\YW_ORDER.cs" />
-    <Compile Include="Models\YW_ORDERDETAILS.cs" />
-    <Compile Include="Models\YW_PRODUCT.cs" />
+    <Compile Include="Models\SYS_Device.cs" />
+    <Compile Include="Models\YW_Order.cs" />
+    <Compile Include="Models\YW_OrderDetails.cs" />
+    <Compile Include="Models\YW_Product.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Service\Interface\IProductService.cs" />
     <Compile Include="Service\ProductService.cs" />

+ 4 - 4
Central.Control.WebApi/EFDbContext/CentralControlContext.cs

@@ -23,22 +23,22 @@ namespace Central.Control.WebApi.EFDbContext
         /// <summary>
         /// 设备表
         /// </summary>
-        public DbSet<SYS_DEVICE> SYS_DEVICE { get; set; }
+        public DbSet<SYS_Device> SYS_DEVICE { get; set; }
 
         /// <summary>
         /// YW_PRODUCT商品表
         /// </summary>
-        public DbSet<YW_PRODUCT> YW_PRODUCT { get; set; }
+        public DbSet<YW_Product> YW_PRODUCT { get; set; }
 
         /// <summary>
         /// YW_ORDER订单表
         /// </summary>
-        public DbSet<YW_ORDER> YW_ORDER { get; set; }
+        public DbSet<YW_Order> YW_ORDER { get; set; }
 
         /// <summary>
         /// YW_ORDERDETAILS商品订单详细表
         /// </summary>
-        public DbSet<YW_ORDERDETAILS> YW_ORDERDETAILS { get; set; }
+        public DbSet<YW_OrderDetails> YW_ORDERDETAILS { get; set; }
 
 
     }

+ 1 - 1
Central.Control.WebApi/Models/SYS_DEVICE.cs

@@ -10,7 +10,7 @@ namespace Central.Control.WebApi.Models
     /// <summary>
     /// 设备表
     /// </summary>
-    public class SYS_DEVICE: SoftBaseEntity
+    public class SYS_Device: SoftBaseEntity
     {
         /// <summary>
         /// 主键ID

+ 1 - 1
Central.Control.WebApi/Models/YW_ORDER.cs

@@ -11,7 +11,7 @@ namespace Central.Control.WebApi.Models
 	/// <summary>
 	/// YW_ORDER订单表
 	/// </summary>
-	public class YW_ORDER : SoftBaseEntity
+	public class YW_Order : SoftBaseEntity
 	{
 		/// <summary>
 		/// 主键id

+ 1 - 1
Central.Control.WebApi/Models/YW_ORDERDETAILS.cs

@@ -10,7 +10,7 @@ namespace Central.Control.WebApi.Models
     /// <summary>
     /// YW_ORDERDETAILS商品订单详细表
     /// </summary>
-    public class YW_ORDERDETAILS : SoftBaseEntity
+    public class YW_OrderDetails : SoftBaseEntity
     {
         /// <summary>
         /// 主键ID

+ 1 - 1
Central.Control.WebApi/Models/YW_PRODUCT.cs

@@ -11,7 +11,7 @@ namespace Central.Control.WebApi.Models
     /// <summary>
     /// YW_PRODUCT商品表
     /// </summary>
-    public class YW_PRODUCT : SoftBaseEntity
+    public class YW_Product : SoftBaseEntity
     {
         /// <summary>
         /// 主键ID

+ 1 - 1
Central.Control.WebApi/Service/ProductService.cs

@@ -42,7 +42,7 @@ namespace Central.Control.WebApi.Service
             // var qq = _dbContent1.SYS_DEVICE.SqlQuery("");
 
 
-            var ww = _dbContent.Set<SYS_DEVICE>().FirstOrDefault(p => p.Id == "cb8b354c-b713-4dd7-9752-a6f3217004a0");
+            var ww = _dbContent.Set<SYS_Device>().FirstOrDefault(p => p.Id == "cb8b354c-b713-4dd7-9752-a6f3217004a0");
             if (ww != null)
             {
                 ww.Name = ww.Name + "1";