Explorar o código

数据库微改,日志文件微改

kingwang1995 %!s(int64=7) %!d(string=hai) anos
pai
achega
a47d0fbc59

+ 1 - 0
parkMonitor/DataBase/DBOperation.cs

@@ -244,6 +244,7 @@ namespace parkMonitor.DataBase
                 int garageID = reader.GetInt32("garageID");
                 int frontwheelbase = reader.GetInt32("frontwheelbase");
                 int rearwheelbase = reader.GetInt32("rearwheelbase");
+                v.parkingRecordsID = reader.GetInt32("parkingRecordsID");
                 v.parkingSpaceID = parkingSpaceID;
                 v.garageID = garageID;
                 v.frontwheelbase = frontwheelbase;

+ 1 - 0
parkMonitor/DataBase/Vehicle.cs

@@ -15,5 +15,6 @@ namespace parkMonitor.DataBase
         public int garageID { get; set; }
         public int frontwheelbase { get; set; }
         public int rearwheelbase { get; set; }
+        public int parkingRecordsID { get; set; }
     }
 }

+ 0 - 3
parkMonitor/entity/AbstractMessage.cs

@@ -302,8 +302,6 @@ namespace parkMonitor.entity
             userID = "";
             garageID = 0;
             parkingRecordsID = 0;
-            TimeRecord = "";
-            parkingRecordsID = 0;
             ip = "";
             returnedCount = 0;
             id = 0;
@@ -319,7 +317,6 @@ namespace parkMonitor.entity
             cmdClone.garageID = garageID;
             cmdClone.parkingRecordsID = parkingRecordsID;
             cmdClone.TimeRecord = TimeRecord;
-            cmdClone.parkingRecordsID = parkingRecordsID;
             cmdClone.ip = ip;
             cmdClone.id = id;
             cmdClone.returnedCount = returnedCount;

+ 1 - 0
parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -1069,6 +1069,7 @@ namespace parkMonitor.server.CoreThread
             garageID = vehiclelist.garageID;
             frontwheelbase = vehiclelist.frontwheelbase;
             rearwheelbase = vehiclelist.rearwheelbase;
+            queueCmd.parkingRecordsID = vehiclelist.parkingRecordsID;         
             //获取车位表中车辆具体的车位信息
             //if (queueCmd.manual)
             //{

+ 1 - 1
parkMonitor/view/style/ComStyle.xaml

@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:parkMonitor.view.style"
+                    
 					xmlns:supUI="clr-namespace:com.superscene.ui">
 
 	<!--树形列表-选中文字颜色-->

+ 1 - 1
parkMonitor/view/style/ListBoxItemWin7.xaml

@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:libManage.view.style">
+                    >
 	<Style x:Key="ListBoxItemWin7" TargetType="{x:Type ListBoxItem}">
 		<Setter Property="Background" Value="Transparent"/>
 		<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>

+ 1 - 1
parkMonitor/view/style/Test.xaml

@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:parkMonitor.view.style">
+                    >
 
 </ResourceDictionary>