diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index 6714999..c9b14f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,9 +8,11 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy,int bootFeature,int ageRate,String interval); + int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, + int bootFeature,int ageRate,String interval); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, int stability, + int accuracy, int bootFeature, int ageRate, String interval); List serach(int deviceId); diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index 6714999..c9b14f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,9 +8,11 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy,int bootFeature,int ageRate,String interval); + int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, + int bootFeature,int ageRate,String interval); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, int stability, + int accuracy, int bootFeature, int ageRate, String interval); List serach(int deviceId); diff --git a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs index 806deab..01c45a9 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs @@ -8,13 +8,18 @@ { interface DeviceService { - int add(string devName,string devCode,string devTypeId,string devModel, string custometDev,string customerName,string channel); + int add(string devName,string devCode,string devTypeId,string devModel, string custometDev, + string customerName,string channel); - int update(int id, string devName, string devCode, string devTypeId, string devModel, string custometDev, string customerName, string channel); + int update(int id, string devName, string devCode, string devTypeId, string devModel, + string custometDev, string customerName, string channel); int delete(int id); - List search(string devName,string devCode, string devModel, string suctomerDev,string customerName,string statusId); + List search(string devName,string devCode, string devModel, string suctomerDev, + string customerName,string statusId); + + List getAllCounter(string devTypeId); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index 6714999..c9b14f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,9 +8,11 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy,int bootFeature,int ageRate,String interval); + int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, + int bootFeature,int ageRate,String interval); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, int stability, + int accuracy, int bootFeature, int ageRate, String interval); List serach(int deviceId); diff --git a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs index 806deab..01c45a9 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs @@ -8,13 +8,18 @@ { interface DeviceService { - int add(string devName,string devCode,string devTypeId,string devModel, string custometDev,string customerName,string channel); + int add(string devName,string devCode,string devTypeId,string devModel, string custometDev, + string customerName,string channel); - int update(int id, string devName, string devCode, string devTypeId, string devModel, string custometDev, string customerName, string channel); + int update(int id, string devName, string devCode, string devTypeId, string devModel, + string custometDev, string customerName, string channel); int delete(int id); - List search(string devName,string devCode, string devModel, string suctomerDev,string customerName,string statusId); + List search(string devName,string devCode, string devModel, string suctomerDev, + string customerName,string statusId); + + List getAllCounter(string devTypeId); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs new file mode 100644 index 0000000..ae2fee4 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -0,0 +1,51 @@ +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterDataServiceImpl:CounterDataService + { + public int add(string model, string devCode, string channel, string nominalValue, string indexValue, DateTime createTime) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_data (MODEL,DEVCODE,CHANNEL,NOMINAL_VALUE,INDEX_VALUE,CREATE_TIME)" + + "values(@MODEL,@DEVCODE,@CHANNEL,@NOMINAL_VALUE,@INDEX_VALUE,@CREATE_TIME)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@MODEL", MySqlDbType.Int64, 20).Value = model; + cmd.Parameters.Add("@DEVCODE", MySqlDbType.String, 30).Value = devCode; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 30).Value = channel; + cmd.Parameters.Add("@NOMINAL_VALUE", MySqlDbType.String, 30).Value = nominalValue; + cmd.Parameters.Add("@INDEX_VALUE", MySqlDbType.String, 30).Value = indexValue; + cmd.Parameters.Add("@CREATE_TIME", MySqlDbType.Date, 0).Value = createTime; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index 6714999..c9b14f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,9 +8,11 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy,int bootFeature,int ageRate,String interval); + int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, + int bootFeature,int ageRate,String interval); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, int stability, + int accuracy, int bootFeature, int ageRate, String interval); List serach(int deviceId); diff --git a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs index 806deab..01c45a9 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs @@ -8,13 +8,18 @@ { interface DeviceService { - int add(string devName,string devCode,string devTypeId,string devModel, string custometDev,string customerName,string channel); + int add(string devName,string devCode,string devTypeId,string devModel, string custometDev, + string customerName,string channel); - int update(int id, string devName, string devCode, string devTypeId, string devModel, string custometDev, string customerName, string channel); + int update(int id, string devName, string devCode, string devTypeId, string devModel, + string custometDev, string customerName, string channel); int delete(int id); - List search(string devName,string devCode, string devModel, string suctomerDev,string customerName,string statusId); + List search(string devName,string devCode, string devModel, string suctomerDev, + string customerName,string statusId); + + List getAllCounter(string devTypeId); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs new file mode 100644 index 0000000..ae2fee4 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -0,0 +1,51 @@ +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterDataServiceImpl:CounterDataService + { + public int add(string model, string devCode, string channel, string nominalValue, string indexValue, DateTime createTime) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_data (MODEL,DEVCODE,CHANNEL,NOMINAL_VALUE,INDEX_VALUE,CREATE_TIME)" + + "values(@MODEL,@DEVCODE,@CHANNEL,@NOMINAL_VALUE,@INDEX_VALUE,@CREATE_TIME)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@MODEL", MySqlDbType.Int64, 20).Value = model; + cmd.Parameters.Add("@DEVCODE", MySqlDbType.String, 30).Value = devCode; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 30).Value = channel; + cmd.Parameters.Add("@NOMINAL_VALUE", MySqlDbType.String, 30).Value = nominalValue; + cmd.Parameters.Add("@INDEX_VALUE", MySqlDbType.String, 30).Value = indexValue; + cmd.Parameters.Add("@CREATE_TIME", MySqlDbType.Date, 0).Value = createTime; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs new file mode 100644 index 0000000..e49af7a --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs @@ -0,0 +1,93 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterParamServiceImpl:CounterParamService + { + public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + + "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; + cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; + cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + public CounterParam getCounterParamByDeviceId(int deviceId) + { + CounterParam counterParam = new CounterParam(); + + try + { + string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + if (aReader != null) + { + if (aReader.Read()) + { + //判断门的状态 + if (!aReader.IsDBNull(0)) + counterParam.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) + counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); + if (!aReader.IsDBNull(2)) + counterParam.BaudRate = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + counterParam.GeneratorIp = aReader.GetString(3); + if (!aReader.IsDBNull(4)) + counterParam.SignalSourceIp = aReader.GetString(4); + } + } + + cmd.Dispose(); + + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + counterParam = null; + } + + return counterParam; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index 6714999..c9b14f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,9 +8,11 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy,int bootFeature,int ageRate,String interval); + int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, + int bootFeature,int ageRate,String interval); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, int stability, + int accuracy, int bootFeature, int ageRate, String interval); List serach(int deviceId); diff --git a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs index 806deab..01c45a9 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs @@ -8,13 +8,18 @@ { interface DeviceService { - int add(string devName,string devCode,string devTypeId,string devModel, string custometDev,string customerName,string channel); + int add(string devName,string devCode,string devTypeId,string devModel, string custometDev, + string customerName,string channel); - int update(int id, string devName, string devCode, string devTypeId, string devModel, string custometDev, string customerName, string channel); + int update(int id, string devName, string devCode, string devTypeId, string devModel, + string custometDev, string customerName, string channel); int delete(int id); - List search(string devName,string devCode, string devModel, string suctomerDev,string customerName,string statusId); + List search(string devName,string devCode, string devModel, string suctomerDev, + string customerName,string statusId); + + List getAllCounter(string devTypeId); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs new file mode 100644 index 0000000..ae2fee4 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -0,0 +1,51 @@ +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterDataServiceImpl:CounterDataService + { + public int add(string model, string devCode, string channel, string nominalValue, string indexValue, DateTime createTime) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_data (MODEL,DEVCODE,CHANNEL,NOMINAL_VALUE,INDEX_VALUE,CREATE_TIME)" + + "values(@MODEL,@DEVCODE,@CHANNEL,@NOMINAL_VALUE,@INDEX_VALUE,@CREATE_TIME)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@MODEL", MySqlDbType.Int64, 20).Value = model; + cmd.Parameters.Add("@DEVCODE", MySqlDbType.String, 30).Value = devCode; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 30).Value = channel; + cmd.Parameters.Add("@NOMINAL_VALUE", MySqlDbType.String, 30).Value = nominalValue; + cmd.Parameters.Add("@INDEX_VALUE", MySqlDbType.String, 30).Value = indexValue; + cmd.Parameters.Add("@CREATE_TIME", MySqlDbType.Date, 0).Value = createTime; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs new file mode 100644 index 0000000..e49af7a --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs @@ -0,0 +1,93 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterParamServiceImpl:CounterParamService + { + public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + + "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; + cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; + cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + public CounterParam getCounterParamByDeviceId(int deviceId) + { + CounterParam counterParam = new CounterParam(); + + try + { + string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + if (aReader != null) + { + if (aReader.Read()) + { + //判断门的状态 + if (!aReader.IsDBNull(0)) + counterParam.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) + counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); + if (!aReader.IsDBNull(2)) + counterParam.BaudRate = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + counterParam.GeneratorIp = aReader.GetString(3); + if (!aReader.IsDBNull(4)) + counterParam.SignalSourceIp = aReader.GetString(4); + } + } + + cmd.Dispose(); + + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + counterParam = null; + } + + return counterParam; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 2685901..650f5c0 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -127,6 +127,5 @@ return detectionItemList; } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index 6714999..c9b14f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,9 +8,11 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy,int bootFeature,int ageRate,String interval); + int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, + int bootFeature,int ageRate,String interval); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, int stability, + int accuracy, int bootFeature, int ageRate, String interval); List serach(int deviceId); diff --git a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs index 806deab..01c45a9 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs @@ -8,13 +8,18 @@ { interface DeviceService { - int add(string devName,string devCode,string devTypeId,string devModel, string custometDev,string customerName,string channel); + int add(string devName,string devCode,string devTypeId,string devModel, string custometDev, + string customerName,string channel); - int update(int id, string devName, string devCode, string devTypeId, string devModel, string custometDev, string customerName, string channel); + int update(int id, string devName, string devCode, string devTypeId, string devModel, + string custometDev, string customerName, string channel); int delete(int id); - List search(string devName,string devCode, string devModel, string suctomerDev,string customerName,string statusId); + List search(string devName,string devCode, string devModel, string suctomerDev, + string customerName,string statusId); + + List getAllCounter(string devTypeId); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs new file mode 100644 index 0000000..ae2fee4 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -0,0 +1,51 @@ +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterDataServiceImpl:CounterDataService + { + public int add(string model, string devCode, string channel, string nominalValue, string indexValue, DateTime createTime) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_data (MODEL,DEVCODE,CHANNEL,NOMINAL_VALUE,INDEX_VALUE,CREATE_TIME)" + + "values(@MODEL,@DEVCODE,@CHANNEL,@NOMINAL_VALUE,@INDEX_VALUE,@CREATE_TIME)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@MODEL", MySqlDbType.Int64, 20).Value = model; + cmd.Parameters.Add("@DEVCODE", MySqlDbType.String, 30).Value = devCode; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 30).Value = channel; + cmd.Parameters.Add("@NOMINAL_VALUE", MySqlDbType.String, 30).Value = nominalValue; + cmd.Parameters.Add("@INDEX_VALUE", MySqlDbType.String, 30).Value = indexValue; + cmd.Parameters.Add("@CREATE_TIME", MySqlDbType.Date, 0).Value = createTime; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs new file mode 100644 index 0000000..e49af7a --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs @@ -0,0 +1,93 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterParamServiceImpl:CounterParamService + { + public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + + "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; + cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; + cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + public CounterParam getCounterParamByDeviceId(int deviceId) + { + CounterParam counterParam = new CounterParam(); + + try + { + string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + if (aReader != null) + { + if (aReader.Read()) + { + //判断门的状态 + if (!aReader.IsDBNull(0)) + counterParam.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) + counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); + if (!aReader.IsDBNull(2)) + counterParam.BaudRate = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + counterParam.GeneratorIp = aReader.GetString(3); + if (!aReader.IsDBNull(4)) + counterParam.SignalSourceIp = aReader.GetString(4); + } + } + + cmd.Dispose(); + + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + counterParam = null; + } + + return counterParam; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 2685901..650f5c0 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -127,6 +127,5 @@ return detectionItemList; } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index bc6c685..2630797 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -41,6 +41,7 @@ catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addDetection : " + ex.Message); + iRetval = -1; } return iRetval; } diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index 6714999..c9b14f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,9 +8,11 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy,int bootFeature,int ageRate,String interval); + int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, + int bootFeature,int ageRate,String interval); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, int stability, + int accuracy, int bootFeature, int ageRate, String interval); List serach(int deviceId); diff --git a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs index 806deab..01c45a9 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs @@ -8,13 +8,18 @@ { interface DeviceService { - int add(string devName,string devCode,string devTypeId,string devModel, string custometDev,string customerName,string channel); + int add(string devName,string devCode,string devTypeId,string devModel, string custometDev, + string customerName,string channel); - int update(int id, string devName, string devCode, string devTypeId, string devModel, string custometDev, string customerName, string channel); + int update(int id, string devName, string devCode, string devTypeId, string devModel, + string custometDev, string customerName, string channel); int delete(int id); - List search(string devName,string devCode, string devModel, string suctomerDev,string customerName,string statusId); + List search(string devName,string devCode, string devModel, string suctomerDev, + string customerName,string statusId); + + List getAllCounter(string devTypeId); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs new file mode 100644 index 0000000..ae2fee4 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -0,0 +1,51 @@ +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterDataServiceImpl:CounterDataService + { + public int add(string model, string devCode, string channel, string nominalValue, string indexValue, DateTime createTime) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_data (MODEL,DEVCODE,CHANNEL,NOMINAL_VALUE,INDEX_VALUE,CREATE_TIME)" + + "values(@MODEL,@DEVCODE,@CHANNEL,@NOMINAL_VALUE,@INDEX_VALUE,@CREATE_TIME)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@MODEL", MySqlDbType.Int64, 20).Value = model; + cmd.Parameters.Add("@DEVCODE", MySqlDbType.String, 30).Value = devCode; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 30).Value = channel; + cmd.Parameters.Add("@NOMINAL_VALUE", MySqlDbType.String, 30).Value = nominalValue; + cmd.Parameters.Add("@INDEX_VALUE", MySqlDbType.String, 30).Value = indexValue; + cmd.Parameters.Add("@CREATE_TIME", MySqlDbType.Date, 0).Value = createTime; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs new file mode 100644 index 0000000..e49af7a --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs @@ -0,0 +1,93 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterParamServiceImpl:CounterParamService + { + public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + + "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; + cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; + cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + public CounterParam getCounterParamByDeviceId(int deviceId) + { + CounterParam counterParam = new CounterParam(); + + try + { + string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + if (aReader != null) + { + if (aReader.Read()) + { + //判断门的状态 + if (!aReader.IsDBNull(0)) + counterParam.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) + counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); + if (!aReader.IsDBNull(2)) + counterParam.BaudRate = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + counterParam.GeneratorIp = aReader.GetString(3); + if (!aReader.IsDBNull(4)) + counterParam.SignalSourceIp = aReader.GetString(4); + } + } + + cmd.Dispose(); + + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + counterParam = null; + } + + return counterParam; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 2685901..650f5c0 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -127,6 +127,5 @@ return detectionItemList; } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index bc6c685..2630797 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -41,6 +41,7 @@ catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addDetection : " + ex.Message); + iRetval = -1; } return iRetval; } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 8d3fc42..d479b79 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -17,7 +17,6 @@ string custometDev, string customerName, string channel) { int iRetval = -1; - //DetectionItemService detectionItemService = new DetectionItemServiceImpl(); try { @@ -182,7 +181,6 @@ } aCommand.Dispose(); - } } catch (MySqlException ex) @@ -193,8 +191,53 @@ return deviceDtoList; } - + + public List getAllCounter(string devTypeId) + { + List deviceDtoList = new List(); + DictService dictService = new DictServiceImpl(); + try + { + string sql = "SELECT * FROM r_device where active = 0 and DEV_TYPEID = 2"; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + while (aReader.Read()) + { + DeviceDto deviceDto = new DeviceDto(); + + if (!aReader.IsDBNull(0)) deviceDto.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) deviceDto.DevName = aReader.GetString(1); + if (!aReader.IsDBNull(2)) deviceDto.DevCode = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + { + deviceDto.DevTypeId = aReader.GetString(3); + deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); + } + if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(7)) + { + deviceDto.StatusId = aReader.GetString(7); + deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(7)); + } + if (!aReader.IsDBNull(8)) deviceDto.Channel = aReader.GetString(8); + + deviceDtoList.Add(deviceDto); + } + + cmd.Dispose(); + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getAllCounter: " + ex.Message); + deviceDtoList = null; + } + return deviceDtoList; + } } - } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index 6714999..c9b14f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,9 +8,11 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy,int bootFeature,int ageRate,String interval); + int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, + int bootFeature,int ageRate,String interval); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, int stability, + int accuracy, int bootFeature, int ageRate, String interval); List serach(int deviceId); diff --git a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs index 806deab..01c45a9 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs @@ -8,13 +8,18 @@ { interface DeviceService { - int add(string devName,string devCode,string devTypeId,string devModel, string custometDev,string customerName,string channel); + int add(string devName,string devCode,string devTypeId,string devModel, string custometDev, + string customerName,string channel); - int update(int id, string devName, string devCode, string devTypeId, string devModel, string custometDev, string customerName, string channel); + int update(int id, string devName, string devCode, string devTypeId, string devModel, + string custometDev, string customerName, string channel); int delete(int id); - List search(string devName,string devCode, string devModel, string suctomerDev,string customerName,string statusId); + List search(string devName,string devCode, string devModel, string suctomerDev, + string customerName,string statusId); + + List getAllCounter(string devTypeId); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs new file mode 100644 index 0000000..ae2fee4 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -0,0 +1,51 @@ +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterDataServiceImpl:CounterDataService + { + public int add(string model, string devCode, string channel, string nominalValue, string indexValue, DateTime createTime) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_data (MODEL,DEVCODE,CHANNEL,NOMINAL_VALUE,INDEX_VALUE,CREATE_TIME)" + + "values(@MODEL,@DEVCODE,@CHANNEL,@NOMINAL_VALUE,@INDEX_VALUE,@CREATE_TIME)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@MODEL", MySqlDbType.Int64, 20).Value = model; + cmd.Parameters.Add("@DEVCODE", MySqlDbType.String, 30).Value = devCode; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 30).Value = channel; + cmd.Parameters.Add("@NOMINAL_VALUE", MySqlDbType.String, 30).Value = nominalValue; + cmd.Parameters.Add("@INDEX_VALUE", MySqlDbType.String, 30).Value = indexValue; + cmd.Parameters.Add("@CREATE_TIME", MySqlDbType.Date, 0).Value = createTime; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs new file mode 100644 index 0000000..e49af7a --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs @@ -0,0 +1,93 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterParamServiceImpl:CounterParamService + { + public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + + "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; + cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; + cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + public CounterParam getCounterParamByDeviceId(int deviceId) + { + CounterParam counterParam = new CounterParam(); + + try + { + string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + if (aReader != null) + { + if (aReader.Read()) + { + //判断门的状态 + if (!aReader.IsDBNull(0)) + counterParam.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) + counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); + if (!aReader.IsDBNull(2)) + counterParam.BaudRate = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + counterParam.GeneratorIp = aReader.GetString(3); + if (!aReader.IsDBNull(4)) + counterParam.SignalSourceIp = aReader.GetString(4); + } + } + + cmd.Dispose(); + + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + counterParam = null; + } + + return counterParam; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 2685901..650f5c0 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -127,6 +127,5 @@ return detectionItemList; } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index bc6c685..2630797 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -41,6 +41,7 @@ catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addDetection : " + ex.Message); + iRetval = -1; } return iRetval; } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 8d3fc42..d479b79 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -17,7 +17,6 @@ string custometDev, string customerName, string channel) { int iRetval = -1; - //DetectionItemService detectionItemService = new DetectionItemServiceImpl(); try { @@ -182,7 +181,6 @@ } aCommand.Dispose(); - } } catch (MySqlException ex) @@ -193,8 +191,53 @@ return deviceDtoList; } - + + public List getAllCounter(string devTypeId) + { + List deviceDtoList = new List(); + DictService dictService = new DictServiceImpl(); + try + { + string sql = "SELECT * FROM r_device where active = 0 and DEV_TYPEID = 2"; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + while (aReader.Read()) + { + DeviceDto deviceDto = new DeviceDto(); + + if (!aReader.IsDBNull(0)) deviceDto.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) deviceDto.DevName = aReader.GetString(1); + if (!aReader.IsDBNull(2)) deviceDto.DevCode = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + { + deviceDto.DevTypeId = aReader.GetString(3); + deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); + } + if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(7)) + { + deviceDto.StatusId = aReader.GetString(7); + deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(7)); + } + if (!aReader.IsDBNull(8)) deviceDto.Channel = aReader.GetString(8); + + deviceDtoList.Add(deviceDto); + } + + cmd.Dispose(); + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getAllCounter: " + ex.Message); + deviceDtoList = null; + } + return deviceDtoList; + } } - } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs b/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs index 4f1ec53..85fec5e 100644 --- a/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs +++ b/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs @@ -54,7 +54,6 @@ basePosition = value; } } - } /// /// 基本信息 @@ -146,7 +145,6 @@ } } } - /// /// 位置信息 /// diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index 6714999..c9b14f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,9 +8,11 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy,int bootFeature,int ageRate,String interval); + int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, + int bootFeature,int ageRate,String interval); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, int stability, + int accuracy, int bootFeature, int ageRate, String interval); List serach(int deviceId); diff --git a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs index 806deab..01c45a9 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs @@ -8,13 +8,18 @@ { interface DeviceService { - int add(string devName,string devCode,string devTypeId,string devModel, string custometDev,string customerName,string channel); + int add(string devName,string devCode,string devTypeId,string devModel, string custometDev, + string customerName,string channel); - int update(int id, string devName, string devCode, string devTypeId, string devModel, string custometDev, string customerName, string channel); + int update(int id, string devName, string devCode, string devTypeId, string devModel, + string custometDev, string customerName, string channel); int delete(int id); - List search(string devName,string devCode, string devModel, string suctomerDev,string customerName,string statusId); + List search(string devName,string devCode, string devModel, string suctomerDev, + string customerName,string statusId); + + List getAllCounter(string devTypeId); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs new file mode 100644 index 0000000..ae2fee4 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -0,0 +1,51 @@ +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterDataServiceImpl:CounterDataService + { + public int add(string model, string devCode, string channel, string nominalValue, string indexValue, DateTime createTime) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_data (MODEL,DEVCODE,CHANNEL,NOMINAL_VALUE,INDEX_VALUE,CREATE_TIME)" + + "values(@MODEL,@DEVCODE,@CHANNEL,@NOMINAL_VALUE,@INDEX_VALUE,@CREATE_TIME)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@MODEL", MySqlDbType.Int64, 20).Value = model; + cmd.Parameters.Add("@DEVCODE", MySqlDbType.String, 30).Value = devCode; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 30).Value = channel; + cmd.Parameters.Add("@NOMINAL_VALUE", MySqlDbType.String, 30).Value = nominalValue; + cmd.Parameters.Add("@INDEX_VALUE", MySqlDbType.String, 30).Value = indexValue; + cmd.Parameters.Add("@CREATE_TIME", MySqlDbType.Date, 0).Value = createTime; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs new file mode 100644 index 0000000..e49af7a --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs @@ -0,0 +1,93 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterParamServiceImpl:CounterParamService + { + public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + + "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; + cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; + cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + public CounterParam getCounterParamByDeviceId(int deviceId) + { + CounterParam counterParam = new CounterParam(); + + try + { + string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + if (aReader != null) + { + if (aReader.Read()) + { + //判断门的状态 + if (!aReader.IsDBNull(0)) + counterParam.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) + counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); + if (!aReader.IsDBNull(2)) + counterParam.BaudRate = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + counterParam.GeneratorIp = aReader.GetString(3); + if (!aReader.IsDBNull(4)) + counterParam.SignalSourceIp = aReader.GetString(4); + } + } + + cmd.Dispose(); + + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + counterParam = null; + } + + return counterParam; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 2685901..650f5c0 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -127,6 +127,5 @@ return detectionItemList; } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index bc6c685..2630797 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -41,6 +41,7 @@ catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addDetection : " + ex.Message); + iRetval = -1; } return iRetval; } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 8d3fc42..d479b79 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -17,7 +17,6 @@ string custometDev, string customerName, string channel) { int iRetval = -1; - //DetectionItemService detectionItemService = new DetectionItemServiceImpl(); try { @@ -182,7 +181,6 @@ } aCommand.Dispose(); - } } catch (MySqlException ex) @@ -193,8 +191,53 @@ return deviceDtoList; } - + + public List getAllCounter(string devTypeId) + { + List deviceDtoList = new List(); + DictService dictService = new DictServiceImpl(); + try + { + string sql = "SELECT * FROM r_device where active = 0 and DEV_TYPEID = 2"; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + while (aReader.Read()) + { + DeviceDto deviceDto = new DeviceDto(); + + if (!aReader.IsDBNull(0)) deviceDto.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) deviceDto.DevName = aReader.GetString(1); + if (!aReader.IsDBNull(2)) deviceDto.DevCode = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + { + deviceDto.DevTypeId = aReader.GetString(3); + deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); + } + if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(7)) + { + deviceDto.StatusId = aReader.GetString(7); + deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(7)); + } + if (!aReader.IsDBNull(8)) deviceDto.Channel = aReader.GetString(8); + + deviceDtoList.Add(deviceDto); + } + + cmd.Dispose(); + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getAllCounter: " + ex.Message); + deviceDtoList = null; + } + return deviceDtoList; + } } - } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs b/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs index 4f1ec53..85fec5e 100644 --- a/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs +++ b/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs @@ -54,7 +54,6 @@ basePosition = value; } } - } /// /// 基本信息 @@ -146,7 +145,6 @@ } } } - /// /// 位置信息 /// diff --git a/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs b/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs index 25e25d2..8cf9ef8 100644 --- a/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs +++ b/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs @@ -11,4 +11,4 @@ BaseStateDto getBaseStateDto(); } -} +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index 6714999..c9b14f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,9 +8,11 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy,int bootFeature,int ageRate,String interval); + int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, + int bootFeature,int ageRate,String interval); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, int stability, + int accuracy, int bootFeature, int ageRate, String interval); List serach(int deviceId); diff --git a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs index 806deab..01c45a9 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs @@ -8,13 +8,18 @@ { interface DeviceService { - int add(string devName,string devCode,string devTypeId,string devModel, string custometDev,string customerName,string channel); + int add(string devName,string devCode,string devTypeId,string devModel, string custometDev, + string customerName,string channel); - int update(int id, string devName, string devCode, string devTypeId, string devModel, string custometDev, string customerName, string channel); + int update(int id, string devName, string devCode, string devTypeId, string devModel, + string custometDev, string customerName, string channel); int delete(int id); - List search(string devName,string devCode, string devModel, string suctomerDev,string customerName,string statusId); + List search(string devName,string devCode, string devModel, string suctomerDev, + string customerName,string statusId); + + List getAllCounter(string devTypeId); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs new file mode 100644 index 0000000..ae2fee4 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -0,0 +1,51 @@ +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterDataServiceImpl:CounterDataService + { + public int add(string model, string devCode, string channel, string nominalValue, string indexValue, DateTime createTime) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_data (MODEL,DEVCODE,CHANNEL,NOMINAL_VALUE,INDEX_VALUE,CREATE_TIME)" + + "values(@MODEL,@DEVCODE,@CHANNEL,@NOMINAL_VALUE,@INDEX_VALUE,@CREATE_TIME)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@MODEL", MySqlDbType.Int64, 20).Value = model; + cmd.Parameters.Add("@DEVCODE", MySqlDbType.String, 30).Value = devCode; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 30).Value = channel; + cmd.Parameters.Add("@NOMINAL_VALUE", MySqlDbType.String, 30).Value = nominalValue; + cmd.Parameters.Add("@INDEX_VALUE", MySqlDbType.String, 30).Value = indexValue; + cmd.Parameters.Add("@CREATE_TIME", MySqlDbType.Date, 0).Value = createTime; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs new file mode 100644 index 0000000..e49af7a --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs @@ -0,0 +1,93 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterParamServiceImpl:CounterParamService + { + public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + + "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; + cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; + cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + public CounterParam getCounterParamByDeviceId(int deviceId) + { + CounterParam counterParam = new CounterParam(); + + try + { + string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + if (aReader != null) + { + if (aReader.Read()) + { + //判断门的状态 + if (!aReader.IsDBNull(0)) + counterParam.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) + counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); + if (!aReader.IsDBNull(2)) + counterParam.BaudRate = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + counterParam.GeneratorIp = aReader.GetString(3); + if (!aReader.IsDBNull(4)) + counterParam.SignalSourceIp = aReader.GetString(4); + } + } + + cmd.Dispose(); + + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + counterParam = null; + } + + return counterParam; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 2685901..650f5c0 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -127,6 +127,5 @@ return detectionItemList; } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index bc6c685..2630797 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -41,6 +41,7 @@ catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addDetection : " + ex.Message); + iRetval = -1; } return iRetval; } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 8d3fc42..d479b79 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -17,7 +17,6 @@ string custometDev, string customerName, string channel) { int iRetval = -1; - //DetectionItemService detectionItemService = new DetectionItemServiceImpl(); try { @@ -182,7 +181,6 @@ } aCommand.Dispose(); - } } catch (MySqlException ex) @@ -193,8 +191,53 @@ return deviceDtoList; } - + + public List getAllCounter(string devTypeId) + { + List deviceDtoList = new List(); + DictService dictService = new DictServiceImpl(); + try + { + string sql = "SELECT * FROM r_device where active = 0 and DEV_TYPEID = 2"; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + while (aReader.Read()) + { + DeviceDto deviceDto = new DeviceDto(); + + if (!aReader.IsDBNull(0)) deviceDto.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) deviceDto.DevName = aReader.GetString(1); + if (!aReader.IsDBNull(2)) deviceDto.DevCode = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + { + deviceDto.DevTypeId = aReader.GetString(3); + deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); + } + if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(7)) + { + deviceDto.StatusId = aReader.GetString(7); + deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(7)); + } + if (!aReader.IsDBNull(8)) deviceDto.Channel = aReader.GetString(8); + + deviceDtoList.Add(deviceDto); + } + + cmd.Dispose(); + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getAllCounter: " + ex.Message); + deviceDtoList = null; + } + return deviceDtoList; + } } - } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs b/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs index 4f1ec53..85fec5e 100644 --- a/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs +++ b/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs @@ -54,7 +54,6 @@ basePosition = value; } } - } /// /// 基本信息 @@ -146,7 +145,6 @@ } } } - /// /// 位置信息 /// diff --git a/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs b/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs index 25e25d2..8cf9ef8 100644 --- a/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs +++ b/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs @@ -11,4 +11,4 @@ BaseStateDto getBaseStateDto(); } -} +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs new file mode 100644 index 0000000..5da2518 --- /dev/null +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DevService.Service.Impl +{ + class SensitivityServiceImpl:SensitivityService + { + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index 6714999..c9b14f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,9 +8,11 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy,int bootFeature,int ageRate,String interval); + int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, + int bootFeature,int ageRate,String interval); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, int stability, + int accuracy, int bootFeature, int ageRate, String interval); List serach(int deviceId); diff --git a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs index 806deab..01c45a9 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs @@ -8,13 +8,18 @@ { interface DeviceService { - int add(string devName,string devCode,string devTypeId,string devModel, string custometDev,string customerName,string channel); + int add(string devName,string devCode,string devTypeId,string devModel, string custometDev, + string customerName,string channel); - int update(int id, string devName, string devCode, string devTypeId, string devModel, string custometDev, string customerName, string channel); + int update(int id, string devName, string devCode, string devTypeId, string devModel, + string custometDev, string customerName, string channel); int delete(int id); - List search(string devName,string devCode, string devModel, string suctomerDev,string customerName,string statusId); + List search(string devName,string devCode, string devModel, string suctomerDev, + string customerName,string statusId); + + List getAllCounter(string devTypeId); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs new file mode 100644 index 0000000..ae2fee4 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -0,0 +1,51 @@ +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterDataServiceImpl:CounterDataService + { + public int add(string model, string devCode, string channel, string nominalValue, string indexValue, DateTime createTime) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_data (MODEL,DEVCODE,CHANNEL,NOMINAL_VALUE,INDEX_VALUE,CREATE_TIME)" + + "values(@MODEL,@DEVCODE,@CHANNEL,@NOMINAL_VALUE,@INDEX_VALUE,@CREATE_TIME)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@MODEL", MySqlDbType.Int64, 20).Value = model; + cmd.Parameters.Add("@DEVCODE", MySqlDbType.String, 30).Value = devCode; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 30).Value = channel; + cmd.Parameters.Add("@NOMINAL_VALUE", MySqlDbType.String, 30).Value = nominalValue; + cmd.Parameters.Add("@INDEX_VALUE", MySqlDbType.String, 30).Value = indexValue; + cmd.Parameters.Add("@CREATE_TIME", MySqlDbType.Date, 0).Value = createTime; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs new file mode 100644 index 0000000..e49af7a --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs @@ -0,0 +1,93 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterParamServiceImpl:CounterParamService + { + public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + + "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; + cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; + cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + public CounterParam getCounterParamByDeviceId(int deviceId) + { + CounterParam counterParam = new CounterParam(); + + try + { + string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + if (aReader != null) + { + if (aReader.Read()) + { + //判断门的状态 + if (!aReader.IsDBNull(0)) + counterParam.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) + counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); + if (!aReader.IsDBNull(2)) + counterParam.BaudRate = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + counterParam.GeneratorIp = aReader.GetString(3); + if (!aReader.IsDBNull(4)) + counterParam.SignalSourceIp = aReader.GetString(4); + } + } + + cmd.Dispose(); + + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + counterParam = null; + } + + return counterParam; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 2685901..650f5c0 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -127,6 +127,5 @@ return detectionItemList; } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index bc6c685..2630797 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -41,6 +41,7 @@ catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addDetection : " + ex.Message); + iRetval = -1; } return iRetval; } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 8d3fc42..d479b79 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -17,7 +17,6 @@ string custometDev, string customerName, string channel) { int iRetval = -1; - //DetectionItemService detectionItemService = new DetectionItemServiceImpl(); try { @@ -182,7 +181,6 @@ } aCommand.Dispose(); - } } catch (MySqlException ex) @@ -193,8 +191,53 @@ return deviceDtoList; } - + + public List getAllCounter(string devTypeId) + { + List deviceDtoList = new List(); + DictService dictService = new DictServiceImpl(); + try + { + string sql = "SELECT * FROM r_device where active = 0 and DEV_TYPEID = 2"; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + while (aReader.Read()) + { + DeviceDto deviceDto = new DeviceDto(); + + if (!aReader.IsDBNull(0)) deviceDto.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) deviceDto.DevName = aReader.GetString(1); + if (!aReader.IsDBNull(2)) deviceDto.DevCode = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + { + deviceDto.DevTypeId = aReader.GetString(3); + deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); + } + if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(7)) + { + deviceDto.StatusId = aReader.GetString(7); + deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(7)); + } + if (!aReader.IsDBNull(8)) deviceDto.Channel = aReader.GetString(8); + + deviceDtoList.Add(deviceDto); + } + + cmd.Dispose(); + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getAllCounter: " + ex.Message); + deviceDtoList = null; + } + return deviceDtoList; + } } - } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs b/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs index 4f1ec53..85fec5e 100644 --- a/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs +++ b/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs @@ -54,7 +54,6 @@ basePosition = value; } } - } /// /// 基本信息 @@ -146,7 +145,6 @@ } } } - /// /// 位置信息 /// diff --git a/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs b/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs index 25e25d2..8cf9ef8 100644 --- a/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs +++ b/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs @@ -11,4 +11,4 @@ BaseStateDto getBaseStateDto(); } -} +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs new file mode 100644 index 0000000..5da2518 --- /dev/null +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DevService.Service.Impl +{ + class SensitivityServiceImpl:SensitivityService + { + + } +} diff --git a/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs b/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs new file mode 100644 index 0000000..3632dfa --- /dev/null +++ b/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DevService.Service +{ + interface SensitivityService + { + int setSensitivityParams(String signalSource,String measureModel,String frequency, + String electricFrequency,bool measureError); + + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs new file mode 100644 index 0000000..19942e1 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Dto/CounterDataDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto +{ + class CounterDataDto + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private string createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public string CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs new file mode 100644 index 0000000..de161fe --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + class CounterData + { + private int id; + + private string model; + + private string devCode; + + private string channel; + + private string nominalValue; + + private string indexValue; + + private DateTime createTime; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Model + { + get + { + return model; + } + + set + { + model = value; + } + } + + public string DevCode + { + get + { + return devCode; + } + + set + { + devCode = value; + } + } + + public string Channel + { + get + { + return channel; + } + + set + { + channel = value; + } + } + + public string NominalValue + { + get + { + return nominalValue; + } + + set + { + nominalValue = value; + } + } + + public string IndexValue + { + get + { + return indexValue; + } + + set + { + indexValue = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs new file mode 100644 index 0000000..d75f4c5 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterParam.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model +{ + /// + /// 频率计数器参数 + /// + public class CounterParam + { + private int id; + + //设备id + private int deviceId; + + //波特率 + private String baudRate; + + //频率发生器IP + private String generatorIp; + + //信号发生器IP + private String signalSourceIp; + + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string BaudRate + { + get + { + return baudRate; + } + + set + { + baudRate = value; + } + } + + public string GeneratorIp + { + get + { + return generatorIp; + } + + set + { + generatorIp = value; + } + } + + public string SignalSourceIp + { + get + { + return signalSourceIp; + } + + set + { + signalSourceIp = value; + } + } + + public int DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs b/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs deleted file mode 100644 index c8ae202..0000000 --- a/RbFreqStandMeasure/R_DataBase/Model/Sensitivity.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model -{ - public class Sensitivity - { - private int id; - - private String baudRate; - - private String generatorIp; - - private String signalSourceIp; - - public int Id - { - get - { - return id; - } - - set - { - id = value; - } - } - - public string BaudRate - { - get - { - return baudRate; - } - - set - { - baudRate = value; - } - } - - public string GeneratorIp - { - get - { - return generatorIp; - } - - set - { - generatorIp = value; - } - } - - public string SignalSourceIp - { - get - { - return signalSourceIp; - } - - set - { - signalSourceIp = value; - } - } - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs new file mode 100644 index 0000000..826c5bf --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -0,0 +1,14 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterDataService + { + int add(string model,string devCode,string channel,string nominalValue,string indexValue,DateTime createTime); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs new file mode 100644 index 0000000..b75f829 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterParamService.cs @@ -0,0 +1,16 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service +{ + interface CounterParamService + { + int add(int deviceId, String baudRate,String generatorIp,String signalSourceIp); + + CounterParam getCounterParamByDeviceId(int deviceId); + + } +} diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs index 6714999..c9b14f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionItemService.cs @@ -8,9 +8,11 @@ { interface DetectionItemService { - int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy,int bootFeature,int ageRate,String interval); + int add(int deviceId,DateTime startTime,DateTime endTime,int stability,int accuracy, + int bootFeature,int ageRate,String interval); - int update(int deviceId, DateTime startTime, DateTime endTime, int stability, int accuracy, int bootFeature, int ageRate, String interval); + int update(int deviceId, DateTime startTime, DateTime endTime, int stability, + int accuracy, int bootFeature, int ageRate, String interval); List serach(int deviceId); diff --git a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs index 806deab..01c45a9 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DeviceService.cs @@ -8,13 +8,18 @@ { interface DeviceService { - int add(string devName,string devCode,string devTypeId,string devModel, string custometDev,string customerName,string channel); + int add(string devName,string devCode,string devTypeId,string devModel, string custometDev, + string customerName,string channel); - int update(int id, string devName, string devCode, string devTypeId, string devModel, string custometDev, string customerName, string channel); + int update(int id, string devName, string devCode, string devTypeId, string devModel, + string custometDev, string customerName, string channel); int delete(int id); - List search(string devName,string devCode, string devModel, string suctomerDev,string customerName,string statusId); + List search(string devName,string devCode, string devModel, string suctomerDev, + string customerName,string statusId); + + List getAllCounter(string devTypeId); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs new file mode 100644 index 0000000..ae2fee4 --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -0,0 +1,51 @@ +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterDataServiceImpl:CounterDataService + { + public int add(string model, string devCode, string channel, string nominalValue, string indexValue, DateTime createTime) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_data (MODEL,DEVCODE,CHANNEL,NOMINAL_VALUE,INDEX_VALUE,CREATE_TIME)" + + "values(@MODEL,@DEVCODE,@CHANNEL,@NOMINAL_VALUE,@INDEX_VALUE,@CREATE_TIME)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@MODEL", MySqlDbType.Int64, 20).Value = model; + cmd.Parameters.Add("@DEVCODE", MySqlDbType.String, 30).Value = devCode; + cmd.Parameters.Add("@CHANNEL", MySqlDbType.String, 30).Value = channel; + cmd.Parameters.Add("@NOMINAL_VALUE", MySqlDbType.String, 30).Value = nominalValue; + cmd.Parameters.Add("@INDEX_VALUE", MySqlDbType.String, 30).Value = indexValue; + cmd.Parameters.Add("@CREATE_TIME", MySqlDbType.Date, 0).Value = createTime; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterData : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs new file mode 100644 index 0000000..e49af7a --- /dev/null +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs @@ -0,0 +1,93 @@ +using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; +using Casic.Birmm.RbFreqStandMeasure.Tools; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DataBase.Service.Impl +{ + class CounterParamServiceImpl:CounterParamService + { + public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + { + int iRetval = -1; + try + { + if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开"); + return iRetval; + } + + string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + + "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + + MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); + cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; + cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; + cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; + cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + + cmd.ExecuteNonQuery(); + + cmd.Dispose(); + + iRetval = 0; + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + iRetval = -1; + } + + return iRetval; + } + + public CounterParam getCounterParamByDeviceId(int deviceId) + { + CounterParam counterParam = new CounterParam(); + + try + { + string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + if (aReader != null) + { + if (aReader.Read()) + { + //判断门的状态 + if (!aReader.IsDBNull(0)) + counterParam.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) + counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); + if (!aReader.IsDBNull(2)) + counterParam.BaudRate = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + counterParam.GeneratorIp = aReader.GetString(3); + if (!aReader.IsDBNull(4)) + counterParam.SignalSourceIp = aReader.GetString(4); + } + } + + cmd.Dispose(); + + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); + counterParam = null; + } + + return counterParam; + } + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 2685901..650f5c0 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -127,6 +127,5 @@ return detectionItemList; } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index bc6c685..2630797 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -41,6 +41,7 @@ catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addDetection : " + ex.Message); + iRetval = -1; } return iRetval; } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 8d3fc42..d479b79 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -17,7 +17,6 @@ string custometDev, string customerName, string channel) { int iRetval = -1; - //DetectionItemService detectionItemService = new DetectionItemServiceImpl(); try { @@ -182,7 +181,6 @@ } aCommand.Dispose(); - } } catch (MySqlException ex) @@ -193,8 +191,53 @@ return deviceDtoList; } - + + public List getAllCounter(string devTypeId) + { + List deviceDtoList = new List(); + DictService dictService = new DictServiceImpl(); + try + { + string sql = "SELECT * FROM r_device where active = 0 and DEV_TYPEID = 2"; + + MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); + + MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); + + while (aReader.Read()) + { + DeviceDto deviceDto = new DeviceDto(); + + if (!aReader.IsDBNull(0)) deviceDto.Id = Convert.ToInt32(aReader.GetString(0)); + if (!aReader.IsDBNull(1)) deviceDto.DevName = aReader.GetString(1); + if (!aReader.IsDBNull(2)) deviceDto.DevCode = aReader.GetString(2); + if (!aReader.IsDBNull(3)) + { + deviceDto.DevTypeId = aReader.GetString(3); + deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3)); + } + if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); + if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(5); + if (!aReader.IsDBNull(6)) deviceDto.CustomerDev = aReader.GetString(6); + if (!aReader.IsDBNull(7)) + { + deviceDto.StatusId = aReader.GetString(7); + deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(7)); + } + if (!aReader.IsDBNull(8)) deviceDto.Channel = aReader.GetString(8); + + deviceDtoList.Add(deviceDto); + } + + cmd.Dispose(); + } + catch(MySqlException ex) + { + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getAllCounter: " + ex.Message); + deviceDtoList = null; + } + return deviceDtoList; + } } - } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs b/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs index 4f1ec53..85fec5e 100644 --- a/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs +++ b/RbFreqStandMeasure/R_DevService/Dto/BaseStateDto.cs @@ -54,7 +54,6 @@ basePosition = value; } } - } /// /// 基本信息 @@ -146,7 +145,6 @@ } } } - /// /// 位置信息 /// diff --git a/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs b/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs index 25e25d2..8cf9ef8 100644 --- a/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs +++ b/RbFreqStandMeasure/R_DevService/Service/BaseInfoService.cs @@ -11,4 +11,4 @@ BaseStateDto getBaseStateDto(); } -} +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs new file mode 100644 index 0000000..5da2518 --- /dev/null +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DevService.Service.Impl +{ + class SensitivityServiceImpl:SensitivityService + { + + } +} diff --git a/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs b/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs new file mode 100644 index 0000000..3632dfa --- /dev/null +++ b/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Casic.Birmm.RbFreqStandMeasure.R_DevService.Service +{ + interface SensitivityService + { + int setSensitivityParams(String signalSource,String measureModel,String frequency, + String electricFrequency,bool measureError); + + + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index e30a315..a9eaeed 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -50,14 +50,50 @@ 4 - - - - - - - - + + False + bin\Debug\DevComponents.Charts.Design.dll + + + False + bin\Debug\DevComponents.DotNetBar.Charts.dll + + + False + bin\Debug\DevComponents.DotNetBar.Design.dll + + + False + bin\Debug\DevComponents.DotNetBar.Keyboard.dll + + + False + bin\Debug\DevComponents.DotNetBar.Layout.dll + + + False + bin\Debug\DevComponents.DotNetBar.Layout.Design.dll + + + False + bin\Debug\DevComponents.DotNetBar.Schedule.dll + + + False + bin\Debug\DevComponents.DotNetBar.SuperGrid.dll + + + False + bin\Debug\DevComponents.DotNetBar2.dll + + + False + bin\Debug\DevComponents.Instrumentation.dll + + + False + bin\Debug\DevComponents.Instrumentation.Design.dll + @@ -92,15 +128,24 @@ + + + - + + + + + + + @@ -182,6 +227,11 @@ Component + + + + + UserControl @@ -271,9 +321,7 @@ false - - - +