yi eason преди 3 години
родител
ревизия
b73086f100
променени са 49 файла, в които са добавени 217 реда и са изтрити 204 реда
  1. 103 0
      RailLocalMeter/App.config
  2. 1 1
      RailLocalMeter/DbOption/DbHelper.cs
  3. 1 1
      RailLocalMeter/DbOption/ExtendCls.cs
  4. 1 1
      RailLocalMeter/DbOption/MeterBaseRfidInfoService.cs
  5. 1 1
      RailLocalMeter/DbOption/MeterWorkCarActualFirstService.cs
  6. 1 1
      RailLocalMeter/DbOption/MeterWorkCarActualService.cs
  7. 1 1
      RailLocalMeter/DbOption/MeterWorkImageService.cs
  8. 1 1
      RailLocalMeter/DbOption/PreTrackScaleService.cs
  9. 1 1
      RailLocalMeter/DbOption/ReflexCls.cs
  10. 1 1
      RailLocalMeter/ModelCls/ActualFirstModel.cs
  11. 1 1
      RailLocalMeter/ModelCls/DjPbModel.cs
  12. 1 1
      RailLocalMeter/ModelCls/MeterBaseRfidInfo.cs
  13. 1 1
      RailLocalMeter/ModelCls/MeterMonitorNote.cs
  14. 1 1
      RailLocalMeter/ModelCls/MeterWorkCarActual.cs
  15. 1 1
      RailLocalMeter/ModelCls/MeterWorkCarActualFirst.cs
  16. 1 1
      RailLocalMeter/ModelCls/MeterWorkImage.cs
  17. 1 1
      RailLocalMeter/ModelCls/MeterWorkPreLink.cs
  18. 1 1
      RailLocalMeter/ModelCls/PreTrackScale.cs
  19. 1 1
      RailLocalMeter/OptionCls/CarNoCls.cs
  20. 1 1
      RailLocalMeter/OptionCls/DbUpload.cs
  21. 1 1
      RailLocalMeter/OptionCls/Led/LED_Control.cs
  22. 1 1
      RailLocalMeter/OptionCls/Led/LedDll.cs
  23. 1 1
      RailLocalMeter/OptionCls/MoxaCls.cs
  24. 1 1
      RailLocalMeter/OptionCls/PingNetwork.cs
  25. 1 1
      RailLocalMeter/OptionCls/PlcCls.cs
  26. 0 109
      RailLocalMeter/OptionCls/RedisCls.cs
  27. 1 1
      RailLocalMeter/OptionCls/RfIdCarNo.cs
  28. 1 1
      RailLocalMeter/OptionCls/Voice/CHCNetSDK.cs
  29. 1 1
      RailLocalMeter/OptionCls/Voice/CamerEs.cs
  30. 1 1
      RailLocalMeter/OptionCls/Voice/CoreDevice.cs
  31. 1 1
      RailLocalMeter/OptionCls/Voice/HCNetSDK.cs
  32. 1 1
      RailLocalMeter/OptionCls/Voice/HkDvr.cs
  33. 1 1
      RailLocalMeter/OptionCls/Voice/IDevice.cs
  34. 1 1
      RailLocalMeter/OptionCls/Voice/IDvr.cs
  35. 1 1
      RailLocalMeter/OptionCls/Voice/VoiceMCI.cs
  36. 1 1
      RailLocalMeter/OptionCls/Voice/VoicePlay.cs
  37. 1 48
      RailLocalMeter/PbCls/AppConfigCache.cs
  38. 1 1
      RailLocalMeter/PbCls/CacleCls.cs
  39. 1 1
      RailLocalMeter/PbCls/ClsControlPack.cs
  40. 1 1
      RailLocalMeter/PbCls/CommonPage.cs
  41. 1 1
      RailLocalMeter/PbCls/EntityBase.cs
  42. 1 1
      RailLocalMeter/PbCls/FileOption.cs
  43. 1 2
      RailLocalMeter/PbCls/ImageOption.cs
  44. 1 1
      RailLocalMeter/PbCls/ImageZip.cs
  45. 1 1
      RailLocalMeter/PbCls/JsonAndT.cs
  46. 1 1
      RailLocalMeter/PbCls/Log.cs
  47. 1 1
      RailLocalMeter/PbCls/PageList.cs
  48. 1 1
      RailLocalMeter/PbCls/PbSomeModel.cs
  49. 68 1
      RailLocalMeter/RailLocalMeter.csproj

+ 103 - 0
RailLocalMeter/App.config

@@ -3,4 +3,107 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
+	<appSettings>
+		<!--ping服务器的地址-->
+		<add key="ServiceIp" value="jgwzjl.jiugang.com"/>
+
+		<add key="ServiceUrl" value="http://10.104.4.130:9004/v1" />
+		<!--<add key="ServiceUrl" value="http://10.99.81.20/icore.icp.web/pass/systemBase/v1"/>-->
+		<!--<add key="ServiceUrl" value="http://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1"/>-->
+
+		<add key="fpath" value="http://10.99.81.20/icore.icp.web/pass/file/upload/" />
+		<!--<add key="fpath" value="https://jgwzjl.jiugang.com/icore.icp.web/pass/file/upload/" />-->
+		<!--图片压缩比例,由于采用硬盘录像机截图,所以imgMass实际上只有100多kb,所以这里设置为100,imgMass2由于摄像头截图有600kb-->
+		<add key="imgMass" value="100" />
+		<add key="imgMass2" value="100" />
+
+		<!-- 一次计量数据过期时间(小时)-->
+		<add key="isEndHour" value="400"/>
+		<!--毛皮差值验证(单位kg)-->
+		<add key="differenceWgt" value="400" />
+		<!--计量间隔时间分钟-->
+		<add key="timeJg" value="10" />
+		<!--计量完成,语音播放次数-->
+		<add key="voiceNum" value="5" />
+
+		<!--计量点信息-->
+		<add key="pointNo" value="00001" />
+		<add key="pointName" value="策客1#汽车衡" />
+		<!--秤体量程(单位t)-->
+		<add key="maxRange" value="100" />
+
+		<!--硬盘录像机仪表抓拍设置的通道-->
+		<add key="channelOther" value="2,3,5" />
+		<add key="channelVis" value="4,1" />
+		<!--需显示视频的通道-->
+		<add key="channelVisHeight" value="300" />
+		<!--需显示高度-->
+		<add key="channelCarNo" value="4" />
+		<!--车号抓拍通道,用于生成图2-->
+		<add key="channel" value="1" />
+		<!--重量仪表抓拍通道-->
+		<!--10.130.0.72是1#北  10.130.0.46是8#西-->
+		<add key="voicePlayIp" value="10.130.0.46" />
+		<add key="voicePlayPort" value="8000" />
+		<add key="voicePlayUid" value="admin" />
+		<add key="voicePlayPwd" value="jlwj12345" />
+		<!--1#公路北车号抓拍摄像头枪机 10.130.0.76是1#北   10.130.2.49是8#西-->
+		<add key="voiceCarNoIp" value="10.130.2.49" />
+		<add key="voiceCarNoPort" value="8000" />
+		<add key="voiceCarNoUid" value="admin" />
+		<add key="voiceCarNoPwd" value="jlwj12345" />
+		<!--车号抓拍摄像头球机 10.130.0.85是1#北   10.130.0.33是8#西-->
+		<add key="voiceCarNoIp2" value="10.130.0.85" />
+		<add key="voiceCarNoPort2" value="8000" />
+		<add key="voiceCarNoUid2" value="admin" />
+		<add key="voiceCarNoPwd2" value="jlwj12345" />
+
+
+		<!--PLC配置,由于PLC自带了ModbusTcp协议,所以这里配置的是Moudbus的IP跟端口-->
+		<add key="plcIp" value="10.121.80.101" />
+		<add key="plcPort" value="502" />
+		<!--采集的点位,例如D0是0,D3则是3-->
+		<add key="plcLocation" value="0,66,26" />
+		<!--点位对应的属性 plc状态,按钮状态,激光车位检测-->
+		<add key="plcLocationName" value="plcState,btnState,locationHw" />
+		<!--0关闭plc,1打开plc-->
+		<add key="plcStart" value="0"/>
+
+		<!--*************MoXa配置 10.130.0.69是1#北  10.130.1.173是8#西*****************-->
+		<add key="sleepTime" value="100"/>
+		<add key="moxaIP" value="10.130.1.173" />
+		<add key="moxaPort" value="4004" />
+		<!--4001是1#北,4004是8#西-->
+		<!--报文长度 1#北17  8#西12-->
+		<add key="messageLength" value="12" />
+		<!--数据截止位符号  1#北13  8#西3-->
+		<add key="separate" value="3" />
+		<!--开始取值位置从1开始数   1#北5  8#西3-->
+		<add key="startPosition" value="4" />
+		<!--取多少位   1#北6  8#西6-->
+		<add key="dataLength" value="6" />
+		<!-- 是否反转 false不反转 true反转-->
+		<add key="isFz" value="false"/>
+		<!--波动次数及判稳值,仪表1秒7次,所以我们200ms取一次仪表数据-->
+		<add key="undulateCount" value="25" />
+		<add key="undulateValue" value="50" />
+		<!--零点判断绝对值在0到多少内为零点-->
+		<add key="minValue" value="50" />
+
+		<!--led地址-->
+		<add key="ledIp" value="10.130.0.134"/>
+
+		<!--RFID配置只考虑tcp_ip的,如果串口很简单,不过这里不考虑-->
+		<!--rfid的IP地址-->
+		<add key="rfidIP" value="10.130.0.70" />
+		<!--rfid的Port地址-->
+		<add key="rfidPort" value="7086" />
+		<!--rfid断开重连持续时长分钟,若该时间内还是连不上则不再连接-->
+		<add key="rfidConnTime" value="1"/>
+
+		<!--上传数据休眠时间毫秒,重量为0,且网络正常时我们每10秒检测一次计量数据是否未上传-->
+		<add key="sleepUploadTime" value="10000"/>
+		<!--图片多久未上传则移送到bak文件夹的时间,这里配置的是小时,正常来说网络异常应该处理几小时足够了-->
+		<add key="imgTimeOut" value="5"/>
+	</appSettings>
 </configuration>

+ 1 - 1
RailLocalMeter/DbOption/DbHelper.cs

@@ -7,7 +7,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Windows.Forms;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class DbHelper
     {

+ 1 - 1
RailLocalMeter/DbOption/ExtendCls.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public static class ExtendCls
     {

+ 1 - 1
RailLocalMeter/DbOption/MeterBaseRfidInfoService.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class MeterBaseRfidInfoService
     {

+ 1 - 1
RailLocalMeter/DbOption/MeterWorkCarActualFirstService.cs

@@ -6,7 +6,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class MeterWorkCarActualFirstService
     {

+ 1 - 1
RailLocalMeter/DbOption/MeterWorkCarActualService.cs

@@ -4,7 +4,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class MeterWorkCarActualService
     {

+ 1 - 1
RailLocalMeter/DbOption/MeterWorkImageService.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class MeterWorkImageService
     {

+ 1 - 1
RailLocalMeter/DbOption/PreTrackScaleService.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using com.hnshituo.core.webapp.vo;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class PreTrackScaleService
     {

+ 1 - 1
RailLocalMeter/DbOption/ReflexCls.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class ReflexCls
     {

+ 1 - 1
RailLocalMeter/ModelCls/ActualFirstModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class ActualFirstModel
     {

+ 1 - 1
RailLocalMeter/ModelCls/DjPbModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class DjPbModel
     {

+ 1 - 1
RailLocalMeter/ModelCls/MeterBaseRfidInfo.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class MeterBaseRfidInfo
     {

+ 1 - 1
RailLocalMeter/ModelCls/MeterMonitorNote.cs

@@ -10,7 +10,7 @@
 ***********************************************************/
 using System;
 using System.Text;
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
 	public class MeterMonitorNote
 	{

+ 1 - 1
RailLocalMeter/ModelCls/MeterWorkCarActual.cs

@@ -10,7 +10,7 @@
 ***********************************************************/
 using System;
 using System.Text;
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
 	public class MeterWorkCarActual
 	{

+ 1 - 1
RailLocalMeter/ModelCls/MeterWorkCarActualFirst.cs

@@ -10,7 +10,7 @@
 ***********************************************************/
 using System;
 using System.Text;
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
 	public class MeterWorkCarActualFirst
 	{

+ 1 - 1
RailLocalMeter/ModelCls/MeterWorkImage.cs

@@ -10,7 +10,7 @@
 ***********************************************************/
 using System;
 using System.Text;
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
 	public class MeterWorkImage
 	{

+ 1 - 1
RailLocalMeter/ModelCls/MeterWorkPreLink.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
 	public class MeterWorkPreLink
 	{

+ 1 - 1
RailLocalMeter/ModelCls/PreTrackScale.cs

@@ -10,7 +10,7 @@
 ***********************************************************/
 using System;
 using System.Text;
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
 	public class PreTrackScale
 	{

+ 1 - 1
RailLocalMeter/OptionCls/CarNoCls.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     /// <summary>
     /// 摄像头车号获取

+ 1 - 1
RailLocalMeter/OptionCls/DbUpload.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class DbUpload
     {

+ 1 - 1
RailLocalMeter/OptionCls/Led/LED_Control.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class LED_Control
     {

+ 1 - 1
RailLocalMeter/OptionCls/Led/LedDll.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Runtime.InteropServices;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class LedDll
     {

+ 1 - 1
RailLocalMeter/OptionCls/MoxaCls.cs

@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     /// <summary>
     /// Moxa重量采集及判稳

+ 1 - 1
RailLocalMeter/OptionCls/PingNetwork.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class PingNetwork
     {

+ 1 - 1
RailLocalMeter/OptionCls/PlcCls.cs

@@ -9,7 +9,7 @@ using System.Threading;
 using System.Configuration;
 using System.Net.NetworkInformation;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class PlcCls
     {

+ 0 - 109
RailLocalMeter/OptionCls/RedisCls.cs

@@ -1,109 +0,0 @@
-using ServiceStack.Redis;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CarLocalMeter
-{
-    public class RedisCls
-    {
-        public static RedisClient client = new RedisClient(AppConfigCache.redisIp, AppConfigCache.redisPort);//如果有密码则带密码,如果数据存在在db0外的比如db1则第四位为1
-        Log lg = Log.GetInstance();
-
-
-        public static List<string> getValue(out bool flag)
-        {
-            try
-            {
-                flag = true;
-                return client.GetAllKeys();
-            }
-            catch
-            {
-                flag = false;
-                return new List<string>();
-            }
-        }
-
-
-        /// <summary>
-        /// 获取redis数据
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-
-        public static T getValue<T>(string key, out bool flag)
-        {
-            try
-            {
-                flag = true;
-                return client.Get<T>(key);
-            }
-            catch 
-            {
-                flag = false;
-                return default(T);
-            }
-        }
-
-        /// <summary>
-        /// 添加redis数据
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="value">可以是Json的字符串,也可以是List集合等</param>
-        public static void setVaule<T>(string key, T value, out bool flag, DateTime dt = default)
-        {
-            try
-            {
-                flag = true;
-                if (dt != null && dt > DateTime.Now)
-                {
-                    client.Set<T>(key, value, dt);
-                    //client.ExpireEntryAt(key, DateTime.Now.AddSeconds(60));
-                    //client.ExpireEntryIn(key, TimeSpan.FromSeconds(20));
-                }
-                else
-                    client.Set<T>(key, value);
-            }
-            catch 
-            {
-                flag = false;
-            }
-        }
-
-        public static void setItemVaule(string key, string value, out bool flag, DateTime dt = default)
-        {
-            try
-            {
-                flag = true;
-                if (dt != null && dt > DateTime.Now)
-                {
-                    client.AddItemToSet(key, value);
-                    client.ExpireEntryAt(key, dt);
-                    //client.ExpireEntryIn(key, TimeSpan.FromSeconds(20));
-                }
-                else
-                    client.AddItemToSet(key, value);
-            }
-            catch 
-            {
-                flag = false;
-            }
-        }
-
-        public static void remoeItemValue(string key, string item, out bool flag)
-        {
-            try
-            {
-                flag = true;
-                client.RemoveItemFromSet(key, item);
-            }
-            catch
-            {
-                flag = false;
-            }
-        }
-    }
-}

+ 1 - 1
RailLocalMeter/OptionCls/RfIdCarNo.cs

@@ -15,7 +15,7 @@ using System.Threading;
 using System.Windows.Forms;
 using System.Net.NetworkInformation;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class RfIdCarNo
     {

+ 1 - 1
RailLocalMeter/OptionCls/Voice/CHCNetSDK.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
 	/// <summary>
 	/// CHCNetSDK µÄժҪ˵Ã÷¡£

+ 1 - 1
RailLocalMeter/OptionCls/Voice/CamerEs.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     /// <summary>
     /// 海康视频流获取及截图操作

+ 1 - 1
RailLocalMeter/OptionCls/Voice/CoreDevice.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public enum DeviceStatus
     {

+ 1 - 1
RailLocalMeter/OptionCls/Voice/HCNetSDK.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     /// <summary>
     /// CHCNetSDK 的摘要说明。

+ 1 - 1
RailLocalMeter/OptionCls/Voice/HkDvr.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Threading;
 using System.Runtime.InteropServices;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
    #region <定义辅助类和方法>
    public delegate void VoiceDataEventHandler(int lVoiceComHandle, IntPtr pRecvDataBuffer, uint dwBufSize, byte byAudioFlag, uint dwUser);

+ 1 - 1
RailLocalMeter/OptionCls/Voice/IDevice.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     interface IDevice
     {

+ 1 - 1
RailLocalMeter/OptionCls/Voice/IDvr.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public enum PtzCommand
     {

+ 1 - 1
RailLocalMeter/OptionCls/Voice/VoiceMCI.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class VoiceMCI
     {

+ 1 - 1
RailLocalMeter/OptionCls/Voice/VoicePlay.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class VoicePlay
     {

+ 1 - 48
RailLocalMeter/PbCls/AppConfigCache.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class AppConfigCache
     {
@@ -52,11 +52,6 @@ namespace CarLocalMeter
         public static int voiceNum = Convert.ToInt32(ConfigurationManager.AppSettings["voiceNum"].ToString());
         
 
-        /// <summary>
-        /// 进入测试界面还是正式界面 0测试,1正式
-        /// </summary>
-        public static string productType = ConfigurationManager.AppSettings["productType"].ToString();
-
         /// <summary>
         /// 计量点编号
         /// </summary>
@@ -179,15 +174,6 @@ namespace CarLocalMeter
         /// </summary>
         public static string plcLocationName = ConfigurationManager.AppSettings["plcLocationName"].ToString();
 
-        /// <summary>
-        /// 采集的点位,写入
-        /// </summary>
-        public static string plcLocationHMI = ConfigurationManager.AppSettings["plcLocationHMI"].ToString();
-
-        /// <summary>
-        /// 采集的点位名称 写入
-        /// </summary>
-        public static string plcLocationNameHMI = ConfigurationManager.AppSettings["plcLocationNameHMI"].ToString();
 
         /// <summary>
         /// moxa、plc采集休眠时长
@@ -283,30 +269,6 @@ namespace CarLocalMeter
         /// </summary>
         public static int rfidPort = Convert.ToInt32(ConfigurationManager.AppSettings["rfidPort"].ToString());
 
-        /// <summary>
-        /// 走tcp的采集方式 数据截止位符号
-        /// </summary>
-        public static int rfidSeparate = Convert.ToInt32(ConfigurationManager.AppSettings["rfidSeparate"].ToString());
-
-        /// <summary>
-        /// 走tcp的采集方式  报文长度
-        /// </summary>
-        public static int rfidMessageLength = Convert.ToInt32(ConfigurationManager.AppSettings["rfidMessageLength"].ToString());
-
-        /// <summary>
-        /// 走tcp的采集方式  开始取值位置从0开始数
-        /// </summary>
-        public static int rfidStartPosition = Convert.ToInt32(ConfigurationManager.AppSettings["rfidStartPosition"].ToString());
-
-        /// <summary>
-        /// 走tcp的采集方式   取多少位
-        /// </summary>
-        public static int rfidDataLength = Convert.ToInt32(ConfigurationManager.AppSettings["rfidDataLength"].ToString());
-
-        /// <summary>
-        /// 走tcp的采集方式  是否反转 false不反转 true反转
-        /// </summary>
-        public static bool rfidIsFz = Convert.ToBoolean(ConfigurationManager.AppSettings["rfidIsFz"].ToString());
         #endregion
 
         /// <summary>
@@ -324,14 +286,5 @@ namespace CarLocalMeter
         /// </summary>
         public static string plcStart = ConfigurationManager.AppSettings["plcStart"].ToString();
 
-        /// <summary>
-        /// 道闸点位值
-        /// </summary>
-        public static ushort dz = Convert.ToUInt16(ConfigurationManager.AppSettings["dz"].ToString());
-
-        /// <summary>
-        /// 道闸的开  由于程序无法判断车子是否完全离开,所以程序不能关闭道闸,需要plc那边接个红外或者地感线圈进行判断
-        /// </summary>
-        public static ushort dzValue = Convert.ToUInt16(ConfigurationManager.AppSettings["dzValue"].ToString());
     }
 }

+ 1 - 1
RailLocalMeter/PbCls/CacleCls.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class CacleCls
     {

+ 1 - 1
RailLocalMeter/PbCls/ClsControlPack.cs

@@ -22,7 +22,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class ClsControlPack
     {

+ 1 - 1
RailLocalMeter/PbCls/CommonPage.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     /// <summary>
     /// 请求服务端使用

+ 1 - 1
RailLocalMeter/PbCls/EntityBase.cs

@@ -5,7 +5,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class EntityBase<T>
     {

+ 1 - 1
RailLocalMeter/PbCls/FileOption.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class FileOption
     {

+ 1 - 2
RailLocalMeter/PbCls/ImageOption.cs

@@ -1,5 +1,4 @@
 using com.hnshituo.core.webapp.vo;
-using ServiceStack.Redis;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -15,7 +14,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class ImageOption
     {

+ 1 - 1
RailLocalMeter/PbCls/ImageZip.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class ImageZip
     {

+ 1 - 1
RailLocalMeter/PbCls/JsonAndT.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class JsonAndT
     {

+ 1 - 1
RailLocalMeter/PbCls/Log.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class Log
     {

+ 1 - 1
RailLocalMeter/PbCls/PageList.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class PageList<T>
     {

+ 1 - 1
RailLocalMeter/PbCls/PbSomeModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CarLocalMeter
+namespace RailLocalMeter
 {
     public class PbSomeModel<A, B, C, D>
     {

+ 68 - 1
RailLocalMeter/RailLocalMeter.csproj

@@ -33,7 +33,75 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Communication">
+      <HintPath>..\CarLocalMeter\bin\Debug\Communication.dll</HintPath>
+    </Reference>
+    <Reference Include="CoreFS.CA06Lite">
+      <HintPath>..\CarLocalMeter\bin\Debug\CoreFS.CA06Lite.dll</HintPath>
+    </Reference>
+    <Reference Include="iCore.Rtdb">
+      <HintPath>..\output\iCore.Rtdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Infragistics2.Excel.v9.2, Version=9.2.20092.1003, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\CarLocalMeter\bin\Debug\Infragistics2.Excel.v9.2.dll</HintPath>
+    </Reference>
+    <Reference Include="Infragistics2.Shared.v9.2, Version=9.2.20092.1003, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\CarLocalMeter\bin\Debug\Infragistics2.Shared.v9.2.dll</HintPath>
+    </Reference>
+    <Reference Include="Infragistics2.Win.Misc.v9.2, Version=9.2.20092.1003, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\CarLocalMeter\bin\Debug\Infragistics2.Win.Misc.v9.2.dll</HintPath>
+    </Reference>
+    <Reference Include="Infragistics2.Win.UltraWinDataSource.v9.2, Version=9.2.20092.1003, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\CarLocalMeter\bin\Debug\Infragistics2.Win.UltraWinDataSource.v9.2.dll</HintPath>
+    </Reference>
+    <Reference Include="Infragistics2.Win.UltraWinEditors.v9.2, Version=9.2.20092.1003, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\CarLocalMeter\bin\Debug\Infragistics2.Win.UltraWinEditors.v9.2.dll</HintPath>
+    </Reference>
+    <Reference Include="Infragistics2.Win.UltraWinGrid.ExcelExport.v9.2, Version=9.2.20092.1003, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\CarLocalMeter\bin\Debug\Infragistics2.Win.UltraWinGrid.ExcelExport.v9.2.dll</HintPath>
+    </Reference>
+    <Reference Include="Infragistics2.Win.UltraWinGrid.v9.2, Version=9.2.20092.1003, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\CarLocalMeter\bin\Debug\Infragistics2.Win.UltraWinGrid.v9.2.dll</HintPath>
+    </Reference>
+    <Reference Include="Infragistics2.Win.UltraWinTabControl.v9.2, Version=9.2.20092.1003, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\CarLocalMeter\bin\Debug\Infragistics2.Win.UltraWinTabControl.v9.2.dll</HintPath>
+    </Reference>
+    <Reference Include="Infragistics2.Win.v9.2, Version=9.2.20092.1003, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\CarLocalMeter\bin\Debug\Infragistics2.Win.v9.2.dll</HintPath>
+    </Reference>
+    <Reference Include="IRP1">
+      <HintPath>..\CarLocalMeter\bin\Debug\IRP1.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\CarLocalMeter\bin\Debug\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NModbus">
+      <HintPath>..\CarLocalMeter\bin\Debug\NModbus.dll</HintPath>
+    </Reference>
+    <Reference Include="NModbus.Serial">
+      <HintPath>..\CarLocalMeter\bin\Debug\NModbus.Serial.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp">
+      <HintPath>..\CarLocalMeter\bin\Debug\RestSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp.Serializers.NewtonsoftJson">
+      <HintPath>..\CarLocalMeter\bin\Debug\RestSharp.Serializers.NewtonsoftJson.dll</HintPath>
+    </Reference>
+    <Reference Include="RFIDInterface">
+      <HintPath>..\CarLocalMeter\bin\Debug\RFIDInterface.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -76,7 +144,6 @@
     <Compile Include="OptionCls\MoxaCls.cs" />
     <Compile Include="OptionCls\PingNetwork.cs" />
     <Compile Include="OptionCls\PlcCls.cs" />
-    <Compile Include="OptionCls\RedisCls.cs" />
     <Compile Include="OptionCls\RfIdCarNo.cs" />
     <Compile Include="OptionCls\Voice\CamerEs.cs" />
     <Compile Include="OptionCls\Voice\CHCNetSDK.cs" />