diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/a6850d96-013b-498e-97cf-ba8e3665fe43.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/a6850d96-013b-498e-97cf-ba8e3665fe43.vsidx deleted file mode 100644 index b8671cf..0000000 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/a6850d96-013b-498e-97cf-ba8e3665fe43.vsidx and /dev/null differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/8c1a08a0-1f72-4606-98bc-e65f3c800c39.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/c5a66c6d-3a54-4f2d-8624-fd8365cd19c5.vsidx similarity index 100% rename from ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/8c1a08a0-1f72-4606-98bc-e65f3c800c39.vsidx rename to ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/c5a66c6d-3a54-4f2d-8624-fd8365cd19c5.vsidx diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/e8aa85d1-751e-4c6a-ab49-d983942de4be.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/e8aa85d1-751e-4c6a-ab49-d983942de4be.vsidx new file mode 100644 index 0000000..187b5df Binary files /dev/null and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/e8aa85d1-751e-4c6a-ab49-d983942de4be.vsidx differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo index 7dfcbc9..ab1d049 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/Limit.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/Limit.cs index e7af5dd..801327e 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/Limit.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/Limit.cs @@ -9,115 +9,115 @@ namespace ZTTMS_Manage_yibayiyi_20230320 class Limit { //电子腔 - public static float DZInputVoltageMax = 0.00f; - public static float DZInputCurrentMax = 0.00f; - public static float DZOutputVoltage48Max = 0.00f; - public static float DZOutputCurrent48Max = 0.00f; - public static float DZOutputVoltage24Max = 0.00f; - public static float DZOutputCurrent24Max = 0.00f; - public static float DZOutputVoltage12Max = 0.00f; - public static float DZOutputCurrent12Max = 0.00f; - public static float DZTemperatureMax = 0.00f; - public static float DZGestureXMax = 0.00f; - public static float DZGestureYMax = 0.00f; - public static float DZGestureZMax = 0.00f; - public static float DZHumidityMax = 0.00f; - public static float DZLeakMax = 0.00f; - public static float DZPressureMax = 0.00f; + //public static float DZInputVoltageMax = 0.00f; + public static float DZInputCurrentMax = 6.00f; + public static float DZOutputVoltage48Max = 49.00f; + public static float DZOutputCurrent48Max = 6.00f; + public static float DZOutputVoltage24Max = 25.00f; + public static float DZOutputCurrent24Max = 6.00f; + public static float DZOutputVoltage12Max = 13.00f; + public static float DZOutputCurrent12Max = 6.00f; + public static float DZTemperatureMax = 70.00f; + public static float DZGestureXMax = 180.00f; + public static float DZGestureYMax = 90.00f; + public static float DZGestureZMax = 180.00f; + public static float DZHumidityMax = 95.00f; + //public static float DZLeakMax = 0.00f; + public static float DZPressureMax = 110000.00f; - public static float DZReportOutputVoltage48Max = 0.00f; - public static float DZReportOutputCurrent48Max = 0.00f; - public static float DZReportOutputVoltage24Max = 0.00f; - public static float DZReportOutputCurrent24Max = 0.00f; - public static float DZReportOutputVoltage12Max = 0.00f; - public static float DZReportOutputCurrent12Max = 0.00f; - public static float DZPortOutputVoltageEXO2Max = 0.00f; - public static float DZPortOutputCurrentEXO2Max = 0.00f; - public static float DZPortOutputVoltageCTDMax = 0.00f; - public static float DZPortOutputCurrentCTDMax = 0.00f; - public static float DZPortOutputVoltageADCPMax = 0.00f; - public static float DZPortOutputCurrentADCPMax = 0.00f; - public static float DZPortOutputVoltageUV1Max = 0.00f; - public static float DZPortOutputCurrentUV1Max = 0.00f; - public static float DZPortOutputVoltageUV2Max = 0.00f; - public static float DZPortOutputCurrentUV2Max = 0.00f; - public static float DZPortOutputVoltageUV3Max = 0.00f; - public static float DZPortOutputCurrentUV3Max = 0.00f; - public static float DZPortOutputVoltageUV4Max = 0.00f; - public static float DZPortOutputCurrentUV4Max = 0.00f; - public static float DZPortOutputVoltageCO2Max = 0.00f; - public static float DZPortOutputCurrentCO2Max = 0.00f; - public static float DZPortOutputVoltageImaMax = 0.00f; - public static float DZPortOutputCurrentImaMax = 0.00f; + //public static float DZReportOutputVoltage48Max = 0.00f; + public static float DZReportOutputCurrent48Max = 6.00f; + //public static float DZReportOutputVoltage24Max = 0.00f; + public static float DZReportOutputCurrent24Max = 6.00f; + //public static float DZReportOutputVoltage12Max = 0.00f; + public static float DZReportOutputCurrent12Max = 6.00f; + //public static float DZPortOutputVoltageEXO2Max = 0.00f; + public static float DZPortOutputCurrentEXO2Max = 6.00f; + //public static float DZPortOutputVoltageCTDMax = 0.00f; + public static float DZPortOutputCurrentCTDMax = 6.00f; + //public static float DZPortOutputVoltageADCPMax = 0.00f; + public static float DZPortOutputCurrentADCPMax = 6.00f; + //public static float DZPortOutputVoltageUV1Max = 0.00f; + public static float DZPortOutputCurrentUV1Max = 6.00f; + //public static float DZPortOutputVoltageUV2Max = 0.00f; + public static float DZPortOutputCurrentUV2Max = 6.00f; + //public static float DZPortOutputVoltageUV3Max = 0.00f; + public static float DZPortOutputCurrentUV3Max = 6.00f; + //public static float DZPortOutputVoltageUV4Max = 0.00f; + public static float DZPortOutputCurrentUV4Max = 6.00f; + //public static float DZPortOutputVoltageCO2Max = 0.00f; + public static float DZPortOutputCurrentCO2Max = 6.00f; + public static float DZPortOutputVoltageImaMax = 25.00f; + //public static float DZPortOutputCurrentImaMax = 0.00f; public static float DZInputVoltageMin = 0.00f; public static float DZInputCurrentMin = 0.00f; - public static float DZOutputVoltage48Min = 0.00f; + public static float DZOutputVoltage48Min = 47.00f; public static float DZOutputCurrent48Min = 0.00f; - public static float DZOutputVoltage24Min = 0.00f; + public static float DZOutputVoltage24Min = 23.00f; public static float DZOutputCurrent24Min = 0.00f; - public static float DZOutputVoltage12Min = 0.00f; + public static float DZOutputVoltage12Min = 11.00f; public static float DZOutputCurrent12Min = 0.00f; - public static float DZTemperatureMin = 0.00f; - public static float DZGestureXMin = 0.00f; - public static float DZGestureYMin = 0.00f; - public static float DZGestureZMin = 0.00f; + public static float DZTemperatureMin = -40.00f; + public static float DZGestureXMin = -180.00f; + public static float DZGestureYMin = -90.00f; + public static float DZGestureZMin = -180.00f; public static float DZHumidityMin = 0.00f; - public static float DZLeakMin = 0.00f; - public static float DZPressureMin = 0.00f; + //public static float DZLeakMin = 0.00f; + public static float DZPressureMin = 30000.00f; - public static float DZReportOutputVoltage48Min = 0.00f; + //public static float DZReportOutputVoltage48Min = 0.00f; public static float DZReportOutputCurrent48Min = 0.00f; - public static float DZReportOutputVoltage24Min = 0.00f; + //public static float DZReportOutputVoltage24Min = 0.00f; public static float DZReportOutputCurrent24Min = 0.00f; - public static float DZReportOutputVoltage12Min = 0.00f; + //public static float DZReportOutputVoltage12Min = 0.00f; public static float DZReportOutputCurrent12Min = 0.00f; - public static float DZPortOutputVoltageEXO2Min = 0.00f; + //public static float DZPortOutputVoltageEXO2Min = 0.00f; public static float DZPortOutputCurrentEXO2Min = 0.00f; - public static float DZPortOutputVoltageCTDMin = 0.00f; + //public static float DZPortOutputVoltageCTDMin = 0.00f; public static float DZPortOutputCurrentCTDMin = 0.00f; - public static float DZPortOutputVoltageADCPMin = 0.00f; + //public static float DZPortOutputVoltageADCPMin = 0.00f; public static float DZPortOutputCurrentADCPMin = 0.00f; - public static float DZPortOutputVoltageUV1Min = 0.00f; + //public static float DZPortOutputVoltageUV1Min = 0.00f; public static float DZPortOutputCurrentUV1Min = 0.00f; - public static float DZPortOutputVoltageUV2Min = 0.00f; + //public static float DZPortOutputVoltageUV2Min = 0.00f; public static float DZPortOutputCurrentUV2Min = 0.00f; - public static float DZPortOutputVoltageUV3Min = 0.00f; + //public static float DZPortOutputVoltageUV3Min = 0.00f; public static float DZPortOutputCurrentUV3Min = 0.00f; - public static float DZPortOutputVoltageUV4Min = 0.00f; + //public static float DZPortOutputVoltageUV4Min = 0.00f; public static float DZPortOutputCurrentUV4Min = 0.00f; - public static float DZPortOutputVoltageCO2Min = 0.00f; + //public static float DZPortOutputVoltageCO2Min = 0.00f; public static float DZPortOutputCurrentCO2Min = 0.00f; public static float DZPortOutputVoltageImaMin = 0.00f; - public static float DZPortOutputCurrentImaMin = 0.00f; + //public static float DZPortOutputCurrentImaMin = 0.00f; //光电分离腔 - public static float GDFLPortOutputVoltageMax = 0.00f; - public static float GDFLPortOutputCurrentMax = 0.00f; - public static float GDFLTemperatureMax = 0.00f; - public static float GDFLHumidityMax = 0.00f; - public static float GDFLLeakMax = 0.00f; + //public static float GDFLPortOutputVoltageMax = 0.00f; + public static float GDFLPortOutputCurrentMax = 6.00f; + public static float GDFLTemperatureMax = 70.00f; + public static float GDFLHumidityMax = 95.00f; + //public static float GDFLLeakMax = 0.00f; public static float GDFLPortOutputVoltageMin = 0.00f; public static float GDFLPortOutputCurrentMin = 0.00f; - public static float GDFLTemperatureMin = 0.00f; + public static float GDFLTemperatureMin = -40.00f; public static float GDFLHumidityMin = 0.00f; - public static float GDFLLeakMin = 0.00f; + //public static float GDFLLeakMin = 0.00f; //影像腔 - public static float YXTemperatureMax = 0.00f; - public static float YXHumidityMax = 0.00f; - public static float YXCurrentCamMax = 0.00f; - public static float YXCurrentVidMax = 0.00f; - public static float YXVoltageCamMax = 0.00f; - public static float YXVoltageVidMax = 0.00f; + public static float YXTemperatureMax = 80.00f; + public static float YXHumidityMax = 95.00f; + public static float YXCurrentCamMax = 6.00f; + public static float YXCurrentVidMax = 6.00f; + public static float YXVoltageCamMax = 25.00f; + public static float YXVoltageVidMax = 25.00f; - public static float YXTemperatureMin = 0.00f; + public static float YXTemperatureMin = -40.00f; public static float YXHumidityMin = 0.00f; public static float YXCurrentCamMin = 0.00f; public static float YXCurrentVidMin = 0.00f; - public static float YXVoltageCamMin = 0.00f; - public static float YXVoltageVidMin = 0.00f; + public static float YXVoltageCamMin = 23.00f; + public static float YXVoltageVidMin = 23.00f; //CTD public static float CTDTemperatureMax = 45.00f; diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs index 89b191f..16651bd 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs @@ -2537,57 +2537,57 @@ namespace ZTTMS_Manage_yibayiyi_20230320 byte number = dataTemp[17]; //数据解析 - float reOutputVoltage48 = BitConverter.ToSingle(new byte[] { dataTemp[21], dataTemp[20], dataTemp[19], dataTemp[18] }, 0) / 1000f; + //float reOutputVoltage48 = BitConverter.ToSingle(new byte[] { dataTemp[21], dataTemp[20], dataTemp[19], dataTemp[18] }, 0) / 1000f; float reOutputCurrent48 = BitConverter.ToSingle(new byte[] { dataTemp[25], dataTemp[24], dataTemp[23], dataTemp[22] }, 0) / 1000f; reOutputCurrent48 = 5f * (2.5f - reOutputCurrent48); reOutputCurrent48 = (Others.isRe48Work) ? reOutputCurrent48 : 0f; byte rePortState48 = dataTemp[26]; - float reOutputVoltage24 = BitConverter.ToSingle(new byte[] { dataTemp[30], dataTemp[29], dataTemp[28], dataTemp[27] }, 0) / 1000f; + //float reOutputVoltage24 = BitConverter.ToSingle(new byte[] { dataTemp[30], dataTemp[29], dataTemp[28], dataTemp[27] }, 0) / 1000f; float reOutputCurrent24 = BitConverter.ToSingle(new byte[] { dataTemp[34], dataTemp[33], dataTemp[32], dataTemp[31] }, 0) / 1000f; reOutputCurrent24 = 5f * (2.5f - reOutputCurrent24); reOutputCurrent24 = (Others.isRe24Work) ? reOutputCurrent24 : 0f; byte rePortState24 = dataTemp[35]; - float reOutputVoltage12 = BitConverter.ToSingle(new byte[] { dataTemp[39], dataTemp[38], dataTemp[37], dataTemp[36] }, 0) / 1000f; + //float reOutputVoltage12 = BitConverter.ToSingle(new byte[] { dataTemp[39], dataTemp[38], dataTemp[37], dataTemp[36] }, 0) / 1000f; float reOutputCurrent12 = BitConverter.ToSingle(new byte[] { dataTemp[43], dataTemp[42], dataTemp[41], dataTemp[40] }, 0) / 1000f; reOutputCurrent12 = 5f * (2.5f - reOutputCurrent12); reOutputCurrent12 = (Others.isRe12Work) ? reOutputCurrent12 : 0f; byte rePortState12 = dataTemp[44]; - float outputVoltageMulti = BitConverter.ToSingle(new byte[] { dataTemp[48], dataTemp[47], dataTemp[46], dataTemp[45] }, 0) / 1000f; + //float outputVoltageMulti = BitConverter.ToSingle(new byte[] { dataTemp[48], dataTemp[47], dataTemp[46], dataTemp[45] }, 0) / 1000f; float outputCurrentMulti = BitConverter.ToSingle(new byte[] { dataTemp[52], dataTemp[51], dataTemp[50], dataTemp[49] }, 0) / 1000f; outputCurrentMulti = 5f * (2.5f - outputCurrentMulti); outputCurrentMulti = (Others.isEXO2Work) ? (tool.GetRandNum(20, 120) / 1000f) : 0f; byte multiPortState = dataTemp[53]; - float outputVoltageCTD = BitConverter.ToSingle(new byte[] { dataTemp[57], dataTemp[56], dataTemp[55], dataTemp[54] }, 0) / 1000f; + //float outputVoltageCTD = BitConverter.ToSingle(new byte[] { dataTemp[57], dataTemp[56], dataTemp[55], dataTemp[54] }, 0) / 1000f; float outputCurrentCTD = BitConverter.ToSingle(new byte[] { dataTemp[61], dataTemp[60], dataTemp[59], dataTemp[58] }, 0) / 1000f; outputCurrentCTD = 5f * (2.5f - outputCurrentCTD); outputCurrentCTD = (Others.isCTDWork) ? (tool.GetRandNum(13, 18) / 1000f) : 0f; byte ctdPortState = dataTemp[62]; - float outputVoltageADCP = BitConverter.ToSingle(new byte[] { dataTemp[66], dataTemp[65], dataTemp[64], dataTemp[63] }, 0) / 1000f; + //float outputVoltageADCP = BitConverter.ToSingle(new byte[] { dataTemp[66], dataTemp[65], dataTemp[64], dataTemp[63] }, 0) / 1000f; float outputCurrentADCP = BitConverter.ToSingle(new byte[] { dataTemp[70], dataTemp[69], dataTemp[68], dataTemp[67] }, 0) / 1000f; outputCurrentADCP = 5f * (2.5f - outputCurrentADCP); outputCurrentADCP = (Others.isADCPWork) ? (tool.GetRandNum(583, 643) / 1000f) : 0f; byte adcpPortState = dataTemp[71]; - float outputVoltageUV1 = BitConverter.ToSingle(new byte[] { dataTemp[75], dataTemp[74], dataTemp[73], dataTemp[72] }, 0) / 1000f; + //float outputVoltageUV1 = BitConverter.ToSingle(new byte[] { dataTemp[75], dataTemp[74], dataTemp[73], dataTemp[72] }, 0) / 1000f; float outputCurrentUV1 = BitConverter.ToSingle(new byte[] { dataTemp[79], dataTemp[78], dataTemp[77], dataTemp[76] }, 0) / 1000f; outputCurrentUV1 = 5f * (2.5f - outputCurrentUV1); outputCurrentUV1 = (Others.isUV1Work) ? outputCurrentUV1 : 0f; byte uv1PortState = dataTemp[80]; - float outputVoltageUV2 = BitConverter.ToSingle(new byte[] { dataTemp[84], dataTemp[83], dataTemp[82], dataTemp[81] }, 0) / 1000f; + //float outputVoltageUV2 = BitConverter.ToSingle(new byte[] { dataTemp[84], dataTemp[83], dataTemp[82], dataTemp[81] }, 0) / 1000f; float outputCurrentUV2 = BitConverter.ToSingle(new byte[] { dataTemp[88], dataTemp[87], dataTemp[86], dataTemp[85] }, 0) / 1000f; outputCurrentUV2 = 5f * (2.5f - outputCurrentUV2); outputCurrentUV2 = (Others.isUV2Work) ? outputCurrentUV2 : 0f; byte uv2PortState = dataTemp[89]; - float outputVoltageUV3 = BitConverter.ToSingle(new byte[] { dataTemp[93], dataTemp[92], dataTemp[91], dataTemp[90] }, 0) / 1000f; + //float outputVoltageUV3 = BitConverter.ToSingle(new byte[] { dataTemp[93], dataTemp[92], dataTemp[91], dataTemp[90] }, 0) / 1000f; float outputCurrentUV3 = BitConverter.ToSingle(new byte[] { dataTemp[97], dataTemp[96], dataTemp[95], dataTemp[94] }, 0) / 1000f; outputCurrentUV3 = 5f * (2.5f - outputCurrentUV3); outputCurrentUV3 = (Others.isUV3Work) ? outputCurrentUV3 : 0f; byte uv3PortState = dataTemp[98]; - float outputVoltageUV4 = BitConverter.ToSingle(new byte[] { dataTemp[102], dataTemp[101], dataTemp[100], dataTemp[99] }, 0) / 1000f; + //float outputVoltageUV4 = BitConverter.ToSingle(new byte[] { dataTemp[102], dataTemp[101], dataTemp[100], dataTemp[99] }, 0) / 1000f; float outputCurrentUV4 = BitConverter.ToSingle(new byte[] { dataTemp[106], dataTemp[105], dataTemp[104], dataTemp[103] }, 0) / 1000f; outputCurrentUV4 = 5f * (2.5f - outputCurrentUV4); outputCurrentUV4 = (Others.isUV4Work) ? outputCurrentUV4 : 0f; byte uv4PortState = dataTemp[107]; - float outputVoltageCO2 = BitConverter.ToSingle(new byte[] { dataTemp[111], dataTemp[110], dataTemp[109], dataTemp[108] }, 0) / 1000f; + //float outputVoltageCO2 = BitConverter.ToSingle(new byte[] { dataTemp[111], dataTemp[110], dataTemp[109], dataTemp[108] }, 0) / 1000f; float outputCurrentCO2 = BitConverter.ToSingle(new byte[] { dataTemp[115], dataTemp[114], dataTemp[113], dataTemp[112] }, 0) / 1000f; outputCurrentCO2 = 5f * (2.5f - outputCurrentCO2); outputCurrentCO2 = (Others.isCO2Work) ? (tool.GetRandNum(453, 513) / 1000f) : 0f; @@ -2624,15 +2624,23 @@ namespace ZTTMS_Manage_yibayiyi_20230320 string sqlId = IdHelper.GetId(); num = 0; + //string sql = $"insert into tb_outputstateinfo_data(id,record_time,equipment_type,equipment_id,version_number,serialnumber,number,revoltage48," + + // $"recurrent48,revoltage24,recurrent24,revoltage12,recurrent12,voltage_multi,current_multi,voltage_ctd,current_ctd,voltage_adcp," + + // $"current_adcp,voltage_uv1,current_uv1,voltage_uv2,current_uv2,voltage_uv3,current_uv3,voltage_uv4,current_uv4,voltage_co2,current_co2,camvidvoltage,camvidcurrent) " + + // $"values('{sqlId}','{g_sqlRecordTime}','{g_sqlTerminalEquipmentType}','{g_sqlTerminalEquipmentId}','{g_sqlVersionNumber}','{sqlSerialNum}','{number}',FORMAT('{reOutputVoltage48}',2)," + + // $"FORMAT('{reOutputCurrent48}',2),FORMAT('{reOutputVoltage24}',2),FORMAT('{reOutputCurrent24}',2),FORMAT('{reOutputVoltage12}',2),FORMAT('{reOutputCurrent12}',2),FORMAT('{outputVoltageMulti}',2)," + + // $"FORMAT('{outputCurrentMulti}',2),FORMAT('{outputVoltageCTD}',2)," + + // $"FORMAT('{outputCurrentCTD}',2),FORMAT('{outputVoltageADCP}',2),FORMAT('{outputCurrentADCP}',2),FORMAT('{outputVoltageUV1}',2),FORMAT('{outputCurrentUV1}',2),FORMAT('{outputVoltageUV2}',2),FORMAT('{outputCurrentUV2}',2)," + + // $"FORMAT('{outputVoltageUV3}',2),FORMAT('{outputCurrentUV3}',2)," + + // $"FORMAT('{outputVoltageUV4}',2),FORMAT('{outputCurrentUV4}',2),FORMAT('{outputVoltageCO2}',2),FORMAT('{outputCurrentCO2}',2),FORMAT('{outputVoltageIma}',2),FORMAT('{outputCurrentIma}',2));"; + string sql = $"insert into tb_outputstateinfo_data(id,record_time,equipment_type,equipment_id,version_number,serialnumber,number,revoltage48," + $"recurrent48,revoltage24,recurrent24,revoltage12,recurrent12,voltage_multi,current_multi,voltage_ctd,current_ctd,voltage_adcp," + $"current_adcp,voltage_uv1,current_uv1,voltage_uv2,current_uv2,voltage_uv3,current_uv3,voltage_uv4,current_uv4,voltage_co2,current_co2,camvidvoltage,camvidcurrent) " + - $"values('{sqlId}','{g_sqlRecordTime}','{g_sqlTerminalEquipmentType}','{g_sqlTerminalEquipmentId}','{g_sqlVersionNumber}','{sqlSerialNum}','{number}',FORMAT('{reOutputVoltage48}',2)," + - $"FORMAT('{reOutputCurrent48}',2),FORMAT('{reOutputVoltage24}',2),FORMAT('{reOutputCurrent24}',2),FORMAT('{reOutputVoltage12}',2),FORMAT('{reOutputCurrent12}',2),FORMAT('{outputVoltageMulti}',2)," + - $"FORMAT('{outputCurrentMulti}',2),FORMAT('{outputVoltageCTD}',2)," + - $"FORMAT('{outputCurrentCTD}',2),FORMAT('{outputVoltageADCP}',2),FORMAT('{outputCurrentADCP}',2),FORMAT('{outputVoltageUV1}',2),FORMAT('{outputCurrentUV1}',2),FORMAT('{outputVoltageUV2}',2),FORMAT('{outputCurrentUV2}',2)," + - $"FORMAT('{outputVoltageUV3}',2),FORMAT('{outputCurrentUV3}',2)," + - $"FORMAT('{outputVoltageUV4}',2),FORMAT('{outputCurrentUV4}',2),FORMAT('{outputVoltageCO2}',2),FORMAT('{outputCurrentCO2}',2),FORMAT('{outputVoltageIma}',2),FORMAT('{outputCurrentIma}',2));"; + $"values('{sqlId}','{g_sqlRecordTime}','{g_sqlTerminalEquipmentType}','{g_sqlTerminalEquipmentId}','{g_sqlVersionNumber}','{sqlSerialNum}','{number}'," + + $"FORMAT('{reOutputCurrent48}',2),FORMAT('{reOutputCurrent24}',2),FORMAT('{reOutputCurrent12}',2),FORMAT('{outputCurrentMulti}',2)," + + $"FORMAT('{outputCurrentCTD}',2),FORMAT('{outputCurrentADCP}',2),FORMAT('{outputCurrentUV1}',2),FORMAT('{outputCurrentUV2}',2)," + + $"FORMAT('{outputCurrentUV3}',2),FORMAT('{outputCurrentUV4}',2),FORMAT('{outputCurrentCO2}',2),FORMAT('{outputVoltageIma}',2),FORMAT('{outputCurrentIma}',2));"; try { @@ -2719,68 +2727,66 @@ namespace ZTTMS_Manage_yibayiyi_20230320 #region 异常数据 - //if (reOutputVoltage48 < Limit.DZReportOutputVoltage48Min || reOutputVoltage48 > Limit.DZReportOutputVoltage48Max || reOutputCurrent48 < Limit.DZReportOutputCurrent48Min || reOutputCurrent48 > Limit.DZReportOutputCurrent48Max || - // reOutputVoltage24 < Limit.DZReportOutputVoltage24Min || reOutputVoltage24 > Limit.DZReportOutputVoltage24Max || reOutputCurrent24 < Limit.DZReportOutputCurrent24Min || reOutputCurrent24 > Limit.DZReportOutputCurrent24Max || - // reOutputVoltage12 < Limit.DZReportOutputVoltage12Min || reOutputVoltage12 > Limit.DZReportOutputVoltage12Max || reOutputCurrent12 < Limit.DZReportOutputCurrent12Min || reOutputCurrent12 > Limit.DZReportOutputCurrent12Max || - // outputVoltageMulti < Limit.DZPortOutputVoltageEXO2Min || outputVoltageMulti > Limit.DZPortOutputVoltageEXO2Max || outputCurrentMulti < Limit.DZPortOutputCurrentEXO2Min || outputCurrentMulti > Limit.DZPortOutputCurrentEXO2Max || - // outputVoltageCTD < Limit.DZPortOutputVoltageCTDMin || outputVoltageCTD > Limit.DZPortOutputVoltageCTDMax || outputCurrentCTD < Limit.DZPortOutputCurrentCTDMin || outputCurrentCTD > Limit.DZPortOutputCurrentCTDMax || - // outputVoltageADCP < Limit.DZPortOutputVoltageADCPMin || outputVoltageADCP > Limit.DZPortOutputVoltageADCPMax || outputCurrentADCP < Limit.DZPortOutputCurrentADCPMin || outputCurrentADCP > Limit.DZPortOutputCurrentADCPMax || - // outputVoltageUV1 < Limit.DZPortOutputVoltageUV1Min || outputVoltageUV1 > Limit.DZPortOutputVoltageUV1Max || outputCurrentUV1 Limit.DZPortOutputCurrentUV1Max || - // outputVoltageUV2 < Limit.DZPortOutputVoltageUV2Min || outputVoltageUV2 > Limit.DZPortOutputVoltageUV2Max || outputCurrentUV2 < Limit.DZPortOutputCurrentUV2Min || outputCurrentUV2 > Limit.DZPortOutputCurrentUV2Max || - // outputVoltageUV3 < Limit.DZPortOutputVoltageUV3Min || outputVoltageUV3 > Limit.DZPortOutputVoltageUV3Max || outputCurrentUV3 < Limit.DZPortOutputCurrentUV3Min || outputCurrentUV3 > Limit.DZPortOutputCurrentUV3Max || - // outputVoltageUV4 < Limit.DZPortOutputVoltageUV4Min || outputVoltageUV4 > Limit.DZPortOutputVoltageUV4Max || outputCurrentUV4 < Limit.DZPortOutputCurrentUV4Min || outputCurrentUV4 > Limit.DZPortOutputCurrentUV4Max || - // outputVoltageCO2 Limit.DZPortOutputVoltageCO2Max || outputVoltageIma Limit.DZPortOutputVoltageImaMax) - //{ - // //数据异常 - // Others.dzReceiveStateAbnormalDataTimes++; + if (reOutputCurrent48 < Limit.DZReportOutputCurrent48Min || reOutputCurrent48 > Limit.DZReportOutputCurrent48Max || + reOutputCurrent24 < Limit.DZReportOutputCurrent24Min || reOutputCurrent24 > Limit.DZReportOutputCurrent24Max || + reOutputCurrent12 < Limit.DZReportOutputCurrent12Min || reOutputCurrent12 > Limit.DZReportOutputCurrent12Max || + outputCurrentMulti < Limit.DZPortOutputCurrentEXO2Min || outputCurrentMulti > Limit.DZPortOutputCurrentEXO2Max || + outputCurrentCTD < Limit.DZPortOutputCurrentCTDMin || outputCurrentCTD > Limit.DZPortOutputCurrentCTDMax || + outputCurrentADCP < Limit.DZPortOutputCurrentADCPMin || outputCurrentADCP > Limit.DZPortOutputCurrentADCPMax || + outputCurrentUV1 < Limit.DZPortOutputCurrentUV1Min || outputCurrentUV1 > Limit.DZPortOutputCurrentUV1Max || + outputCurrentUV2 < Limit.DZPortOutputCurrentUV2Min || outputCurrentUV2 > Limit.DZPortOutputCurrentUV2Max || + outputCurrentUV3 < Limit.DZPortOutputCurrentUV3Min || outputCurrentUV3 > Limit.DZPortOutputCurrentUV3Max || + outputCurrentUV4 < Limit.DZPortOutputCurrentUV4Min || outputCurrentUV4 > Limit.DZPortOutputCurrentUV4Max || + outputVoltageIma < Limit.DZPortOutputVoltageImaMin || outputVoltageIma > Limit.DZPortOutputVoltageImaMax) + { + //数据异常 + Others.dzReceiveStateAbnormalDataTimes++; - // //数据存储 - // g_sqlRecordTime = DateTime.Now; - // sqlSerialNum = BitConverter.ToString(new byte[2] { dataTemp[15], dataTemp[16] }); - // numb = sqlSerialNum.Split('-'); - // sqlSerialNum = numb[0] + numb[1]; - // cycleTime = 0; + //数据存储 + g_sqlRecordTime = DateTime.Now; + sqlSerialNum = BitConverter.ToString(new byte[2] { dataTemp[15], dataTemp[16] }); + numb = sqlSerialNum.Split('-'); + sqlSerialNum = numb[0] + numb[1]; + cycleTime = 0; - // while (cycleTime < 3) - // { - // string sqlId = IdHelper.GetId(); - // num = 0; + while (cycleTime < 3) + { + string sqlId = IdHelper.GetId(); + num = 0; - // string sql = $"insert into tb_outputstateinfo_abnormaldata(id,record_time,equipment_type,equipment_id,version_number,serialnumber,number,revoltage48," + - // $"recurrent48,revoltage24,recurrent24,revoltage12,recurrent12,voltage_multi,current_multi,voltage_ctd,current_ctd,voltage_adcp," + - // $"current_adcp,voltage_uv1,current_uv1,voltage_uv2,current_uv2,voltage_uv3,current_uv3,voltage_uv4,current_uv4,voltage_co2,current_co2,camvidvoltage,camvidcurrent) " + - // $"values('{sqlId}','{g_sqlRecordTime}','{g_sqlTerminalEquipmentType}','{g_sqlTerminalEquipmentId}','{g_sqlVersionNumber}','{sqlSerialNum}','{number}',FORMAT('{reOutputVoltage48}',2)," + - // $"FORMAT('{reOutputCurrent48}',2),FORMAT('{reOutputVoltage24}',2),FORMAT('{reOutputCurrent24}',2),FORMAT('{reOutputVoltage12}',2),FORMAT('{reOutputCurrent12}',2),FORMAT('{outputVoltageMulti}',2)," + - // $"FORMAT('{outputCurrentMulti}',2),FORMAT('{outputVoltageCTD}',2)," + - // $"FORMAT('{outputCurrentCTD}',2),FORMAT('{outputVoltageADCP}',2),FORMAT('{outputCurrentADCP}',2),FORMAT('{outputVoltageUV1}',2),FORMAT('{outputCurrentUV1}',2),FORMAT('{outputVoltageUV2}',2),FORMAT('{outputCurrentUV2}',2)," + - // $"FORMAT('{outputVoltageUV3}',2),FORMAT('{outputCurrentUV3}',2)," + - // $"FORMAT('{outputVoltageUV4}',2),FORMAT('{outputCurrentUV4}',2),FORMAT('{outputVoltageCO2}',2),FORMAT('{outputCurrentCO2}',2),FORMAT('{outputVoltageIma}',2),FORMAT('{outputCurrentIma}',2));"; + string sql = $"insert into tb_outputstateinfo_abnormaldata(id,record_time,equipment_type,equipment_id,version_number,serialnumber,number,revoltage48," + + $"recurrent48,revoltage24,recurrent24,revoltage12,recurrent12,voltage_multi,current_multi,voltage_ctd,current_ctd,voltage_adcp," + + $"current_adcp,voltage_uv1,current_uv1,voltage_uv2,current_uv2,voltage_uv3,current_uv3,voltage_uv4,current_uv4,voltage_co2,current_co2,camvidvoltage,camvidcurrent) " + + $"values('{sqlId}','{g_sqlRecordTime}','{g_sqlTerminalEquipmentType}','{g_sqlTerminalEquipmentId}','{g_sqlVersionNumber}','{sqlSerialNum}','{number}'," + + $"FORMAT('{reOutputCurrent48}',2),FORMAT('{reOutputCurrent24}',2),FORMAT('{reOutputCurrent12}',2)," + + $"FORMAT('{outputCurrentMulti}',2),FORMAT('{outputCurrentCTD}',2),FORMAT('{outputCurrentADCP}',2),FORMAT('{outputCurrentUV1}',2),FORMAT('{outputCurrentUV2}',2)," + + $"FORMAT('{outputCurrentUV3}',2),FORMAT('{outputCurrentUV4}',2),FORMAT('{outputCurrentCO2}',2),FORMAT('{outputVoltageIma}',2),FORMAT('{outputCurrentIma}',2));"; - // try - // { - // num = MySQL.ExecuteSql(sql); - // } - // catch (Exception ex) - // { - // Console.WriteLine("OutputStatusAbnormalInformationError:" + ex.ToString()); - //EveryDayLog.WriteErrorDZ("OutputStatusAbnormalInformationError:" + ex.ToString()); - // } + try + { + num = MySQL.ExecuteSql(sql); + } + catch (Exception ex) + { + Console.WriteLine("OutputStatusAbnormalInformationError:" + ex.ToString()); + EveryDayLog.WriteErrorDZ("OutputStatusAbnormalInformationError:" + ex.ToString()); + } - // if (num > 0) - // { - // Console.WriteLine("电子腔异常输出端口状态信息插入成功！" + DateTime.Now); - // break; - // } - // else - // { - // Console.WriteLine("电子腔异常输出端口状态信息插入失败，重新进行插入！" + DateTime.Now); - //EveryDayLog.WriteErrorDZ("电子腔异常输出端口状态信息插入失败，重新进行插入！"); - // } + if (num > 0) + { + Console.WriteLine("电子腔异常输出端口状态信息插入成功！" + DateTime.Now); + break; + } + else + { + Console.WriteLine("电子腔异常输出端口状态信息插入失败，重新进行插入！" + DateTime.Now); + EveryDayLog.WriteErrorDZ("电子腔异常输出端口状态信息插入失败，重新进行插入！"); + } - // cycleTime++; - // Thread.Sleep(1); - // } - //} + cycleTime++; + Thread.Sleep(1); + } + } #endregion diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PhotoelectricSeparationDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PhotoelectricSeparationDataForm.cs index 9e4a140..d23d463 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PhotoelectricSeparationDataForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PhotoelectricSeparationDataForm.cs @@ -1691,50 +1691,50 @@ namespace ZTTMS_Manage_yibayiyi_20230320 #region 异常数据 - //if(temperatureLimit.GDFLTemperatureMax||humidityLimit.GDFLHumidityMax|| - // leakage > 100f) - //{ - // //异常数据 - // Others.gdflReceiveStateAbnormalDataTimes++; + if (temperature < Limit.GDFLTemperatureMin || temperature > Limit.GDFLTemperatureMax || humidity < Limit.GDFLHumidityMin || humidity > Limit.GDFLHumidityMax || + leakage > 100f) + { + //异常数据 + Others.gdflReceiveStateAbnormalDataTimes++; - // cycleTime = 0; - // sqlSerialNum = BitConverter.ToString(new byte[2] { dataTemp[15], dataTemp[16] }); - // numb = sqlSerialNum.Split('-'); - // sqlSerialNum = numb[0] + numb[1]; + cycleTime = 0; + sqlSerialNum = BitConverter.ToString(new byte[2] { dataTemp[15], dataTemp[16] }); + numb = sqlSerialNum.Split('-'); + sqlSerialNum = numb[0] + numb[1]; - // while (cycleTime < 3) - // { - // sqlId = IdHelper.GetId(); - // num = 0; + while (cycleTime < 3) + { + sqlId = IdHelper.GetId(); + num = 0; - // string sql = $"insert into tb_gdflstateinfo_abnormaldata(id,record_time,equipment_type,equipment_id,version_number,serialnumber,number,temp,humi,leak) " + - // $"values('{sqlId}','{DateTime.Now}','{g_sqlTerminalEquipmentType}','{g_sqlTerminalEquipmentId}','{g_sqlVersionNumber}','{sqlSerialNum}','{number}',FORMAT('{temperature}',2),FORMAT('{humidity}',2),FORMAT('{leakage}',2));"; + string sql = $"insert into tb_gdflstateinfo_abnormaldata(id,record_time,equipment_type,equipment_id,version_number,serialnumber,number,temp,humi,leak) " + + $"values('{sqlId}','{DateTime.Now}','{g_sqlTerminalEquipmentType}','{g_sqlTerminalEquipmentId}','{g_sqlVersionNumber}','{sqlSerialNum}','{number}',FORMAT('{temperature}',2),FORMAT('{humidity}',2),FORMAT('{leakage}',2));"; - // try - // { - // num = MySQL.ExecuteSql(sql); - // } - // catch (Exception ex) - // { - // Console.WriteLine("PhotoelectricSeparationAbnormalWorkStateError:" + ex.ToString()); - //EveryDayLog.WriteErrorGDFL("PhotoelectricSeparationAbnormalWorkStateError:" + ex.ToString()); - // } + try + { + num = MySQL.ExecuteSql(sql); + } + catch (Exception ex) + { + Console.WriteLine("PhotoelectricSeparationAbnormalWorkStateError:" + ex.ToString()); + EveryDayLog.WriteErrorGDFL("PhotoelectricSeparationAbnormalWorkStateError:" + ex.ToString()); + } - // if (num > 0) - // { - // Console.WriteLine("光电分离腔异常工作状态插入成功！" + DateTime.Now); - // break; - // } - // else - // { - // Console.WriteLine("光电分离腔异常工作状态插入失败，重新进行插入！" + DateTime.Now); - //EveryDayLog.WriteErrorGDFL("光电分离腔异常工作状态插入失败，重新进行插入！"); - // } + if (num > 0) + { + Console.WriteLine("光电分离腔异常工作状态插入成功！" + DateTime.Now); + break; + } + else + { + Console.WriteLine("光电分离腔异常工作状态插入失败，重新进行插入！" + DateTime.Now); + EveryDayLog.WriteErrorGDFL("光电分离腔异常工作状态插入失败，重新进行插入！"); + } - // cycleTime++; - // Thread.Sleep(1); - // } - //} + cycleTime++; + Thread.Sleep(1); + } + } #endregion } @@ -1822,51 +1822,51 @@ namespace ZTTMS_Manage_yibayiyi_20230320 #region 异常数据 - //if(voltageLimit.GDFLPortOutputVoltageMax||currentLimit.GDFLPortOutputCurrentMax||state1=="异常") - //{ - // //异常数据 - // Others.gdflReceiveStateAbnormalDataTimes++; + if (voltage < Limit.GDFLPortOutputVoltageMin || current < Limit.GDFLPortOutputCurrentMin || current > Limit.GDFLPortOutputCurrentMax || state1 == "异常") + { + //异常数据 + Others.gdflReceiveStateAbnormalDataTimes++; - // cycleTime = 0; - // sqlSerialNum = BitConverter.ToString(new byte[2] { dataTemp[15], dataTemp[16] }); - // numb = sqlSerialNum.Split('-'); - // sqlSerialNum = numb[0] + numb[1]; + cycleTime = 0; + sqlSerialNum = BitConverter.ToString(new byte[2] { dataTemp[15], dataTemp[16] }); + numb = sqlSerialNum.Split('-'); + sqlSerialNum = numb[0] + numb[1]; - // while (cycleTime < 3) - // { - // sqlId = IdHelper.GetId(); - // num = 0; + while (cycleTime < 3) + { + sqlId = IdHelper.GetId(); + num = 0; - // string sql = $"insert into tb_gdflstateinfo_portabnormaldata(id,record_time,equipment_type,equipment_id,version_number,serialnumber,number,voltage,current,state,statebyte) " + - // $"values('{sqlId}','{DateTime.Now}','{g_sqlTerminalEquipmentType}','{g_sqlTerminalEquipmentId}','{g_sqlVersionNumber}','{sqlSerialNum}','{number}'," + - // $"FORMAT('{voltage}',2),FORMAT('{current}',2),'{state1}','{state}');"; + string sql = $"insert into tb_gdflstateinfo_portabnormaldata(id,record_time,equipment_type,equipment_id,version_number,serialnumber,number,voltage,current,state,statebyte) " + + $"values('{sqlId}','{DateTime.Now}','{g_sqlTerminalEquipmentType}','{g_sqlTerminalEquipmentId}','{g_sqlVersionNumber}','{sqlSerialNum}','{number}'," + + $"FORMAT('{voltage}',2),FORMAT('{current}',2),'{state1}','{state}');"; - // try - // { - // num = MySQL.ExecuteSql(sql); - // } - // catch (Exception ex) - // { - // Console.WriteLine("PhotoelectricSeparationAbnormalOutputPortStateError:" + ex.ToString()); - //EveryDayLog.WriteErrorGDFL("PhotoelectricSeparationAbnormalOutputPortStateError:" + ex.ToString()); - // } + try + { + num = MySQL.ExecuteSql(sql); + } + catch (Exception ex) + { + Console.WriteLine("PhotoelectricSeparationAbnormalOutputPortStateError:" + ex.ToString()); + EveryDayLog.WriteErrorGDFL("PhotoelectricSeparationAbnormalOutputPortStateError:" + ex.ToString()); + } - // if (num > 0) - // { - // Console.WriteLine("光电分离腔异常输出端口状态插入成功！" + DateTime.Now); - // break; - // } - // else - // { - // Console.WriteLine("光电分离腔异常输出端口状态插入失败，重新进行插入！" + DateTime.Now); - //EveryDayLog.WriteErrorGDFL("光电分离腔异常输出端口状态插入失败，重新进行插入！"); - // } + if (num > 0) + { + Console.WriteLine("光电分离腔异常输出端口状态插入成功！" + DateTime.Now); + break; + } + else + { + Console.WriteLine("光电分离腔异常输出端口状态插入失败，重新进行插入！" + DateTime.Now); + EveryDayLog.WriteErrorGDFL("光电分离腔异常输出端口状态插入失败，重新进行插入！"); + } - // cycleTime++; - // Thread.Sleep(1); - // } + cycleTime++; + Thread.Sleep(1); + } - //} + } #endregion } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PictureTakeForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PictureTakeForm.cs index 22dd6d0..d8f2460 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PictureTakeForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PictureTakeForm.cs @@ -1098,45 +1098,45 @@ namespace ZTTMS_Manage_yibayiyi_20230320 #region 异常数据 - //if(tempLimit.YXTemperatureMax|| humiLimit.YXHumidityMax) - //{ - // //异常数据 - // Others.yxclReceiveAbnormalDataTimes++; + if (temp < Limit.YXTemperatureMin || temp > Limit.YXTemperatureMax || humi < Limit.YXHumidityMin || humi > Limit.YXHumidityMax) + { + //异常数据 + Others.yxclReceiveAbnormalDataTimes++; - // sqlTime = DateTime.Now; - // num = 0; - // cycleTime = 0; - // while (cycleTime < 3) - // { - // sqlId = IdHelper.GetId(); + sqlTime = DateTime.Now; + num = 0; + cycleTime = 0; + while (cycleTime < 3) + { + sqlId = IdHelper.GetId(); - // string sql = $"insert into tb_camandvid_abnormaldata(id,record_time,leak,temp,humidity) " + - // $"values('{sqlId}','{sqlTime}','{leak}',FORMAT('{temp}',2),FORMAT('{humi}',2));"; - // try - // { - // num = MySQL.ExecuteSql(sql); - // } - // catch (Exception ex) - // { - // Console.WriteLine("Insert CameraAndVideo Environment Abnormal Data Error:" + ex.Message); - //EveryDayLog.WriteErrorCamAndVid("Insert CameraAndVideo Environment Abnormal Data Error:" + ex.Message); - // } + string sql = $"insert into tb_camandvid_abnormaldata(id,record_time,leak,temp,humidity) " + + $"values('{sqlId}','{sqlTime}','{leak}',FORMAT('{temp}',2),FORMAT('{humi}',2));"; + try + { + num = MySQL.ExecuteSql(sql); + } + catch (Exception ex) + { + Console.WriteLine("Insert CameraAndVideo Environment Abnormal Data Error:" + ex.Message); + EveryDayLog.WriteErrorCamAndVid("Insert CameraAndVideo Environment Abnormal Data Error:" + ex.Message); + } - // if (num > 0) - // { - // Console.WriteLine("Insert CameraAndVideo Environment Abnormal Data Success!" + DateTime.Now); - // break; - // } - // else - // { - // Console.WriteLine("Insert CameraAndVideo Environment Abnormal Data Default, Please Reinsert!" + DateTime.Now); - //EveryDayLog.WriteErrorCamAndVid("Insert CameraAndVideo Environment Abnormal Data Default, Please Reinsert!"); - // } + if (num > 0) + { + Console.WriteLine("Insert CameraAndVideo Environment Abnormal Data Success!" + DateTime.Now); + break; + } + else + { + Console.WriteLine("Insert CameraAndVideo Environment Abnormal Data Default, Please Reinsert!" + DateTime.Now); + EveryDayLog.WriteErrorCamAndVid("Insert CameraAndVideo Environment Abnormal Data Default, Please Reinsert!"); + } - // cycleTime++; - // Thread.Sleep(1); - // } - //} + cycleTime++; + Thread.Sleep(1); + } + } #endregion } @@ -1196,45 +1196,45 @@ namespace ZTTMS_Manage_yibayiyi_20230320 #region 异常数据 - //if(voltageVidLimit.YXVoltageVidMax|| currentVidLimit.YXCurrentVidMax) - //{ - // //异常数据 - // Others.yxclReceiveAbnormalDataTimes++; + if (voltageVid < Limit.YXVoltageVidMin || voltageVid > Limit.YXVoltageVidMax || currentVid < Limit.YXCurrentVidMin || currentVid > Limit.YXCurrentVidMax) + { + //异常数据 + Others.yxclReceiveAbnormalDataTimes++; - // sqlTime = DateTime.Now; - // num = 0; - // cycleTime = 0; - // while (cycleTime < 3) - // { - // sqlId = IdHelper.GetId(); - // string sql = $"insert into tb_camandvid_abnormaldata(id,record_time,work_voltage_vid,work_current_vid) " + - // $"values('{sqlId}','{sqlTime}',FORMAT('{voltageVid}',2),FORMAT('{currentVid}',2));"; + sqlTime = DateTime.Now; + num = 0; + cycleTime = 0; + while (cycleTime < 3) + { + sqlId = IdHelper.GetId(); + string sql = $"insert into tb_camandvid_abnormaldata(id,record_time,work_voltage_vid,work_current_vid) " + + $"values('{sqlId}','{sqlTime}',FORMAT('{voltageVid}',2),FORMAT('{currentVid}',2));"; - // try - // { - // num = MySQL.ExecuteSql(sql); - // } - // catch (Exception ex) - // { - // Console.WriteLine("Insert Video Current Abnormal Data Error:" + ex.Message); - //EveryDayLog.WriteErrorCamAndVid("Insert Video Current Abnormal Data Error:" + ex.Message); - // } + try + { + num = MySQL.ExecuteSql(sql); + } + catch (Exception ex) + { + Console.WriteLine("Insert Video Current Abnormal Data Error:" + ex.Message); + EveryDayLog.WriteErrorCamAndVid("Insert Video Current Abnormal Data Error:" + ex.Message); + } - // if (num > 0) - // { - // Console.WriteLine("Insert Video Current Abnormal Data Success!" + DateTime.Now); - // break; - // } - // else - // { - // Console.WriteLine("Insert Video Current Abnormal Data Default, Please Reinsert!" + DateTime.Now); - //EveryDayLog.WriteErrorCamAndVid("Insert Video Current Abnormal Data Default, Please Reinsert!"); - // } + if (num > 0) + { + Console.WriteLine("Insert Video Current Abnormal Data Success!" + DateTime.Now); + break; + } + else + { + Console.WriteLine("Insert Video Current Abnormal Data Default, Please Reinsert!" + DateTime.Now); + EveryDayLog.WriteErrorCamAndVid("Insert Video Current Abnormal Data Default, Please Reinsert!"); + } - // cycleTime++; - // Thread.Sleep(1); - // } - //} + cycleTime++; + Thread.Sleep(1); + } + } #endregion } @@ -1287,45 +1287,45 @@ namespace ZTTMS_Manage_yibayiyi_20230320 #region 异常数据 - //if(voltageCamLimit.YXVoltageCamMax|| currentCamLimit.YXCurrentCamMax) - //{ - // //异常数据 - // Others.yxclReceiveAbnormalDataTimes++; + if (voltageCam < Limit.YXVoltageCamMin || voltageCam > Limit.YXVoltageCamMax || currentCam < Limit.YXCurrentCamMin || currentCam > Limit.YXCurrentCamMax) + { + //异常数据 + Others.yxclReceiveAbnormalDataTimes++; - // sqlTime = DateTime.Now; - // num = 0; - // cycleTime = 0; - // while (cycleTime < 3) - // { - // sqlId = IdHelper.GetId(); - // string sql = $"insert into tb_camandvid_abnormaldata(id,record_time,work_voltage_cam,work_current_cam) " + - // $"values('{sqlId}','{sqlTime}',FORMAT('{voltageCam}',2),FORMAT('{currentCam}',2));"; + sqlTime = DateTime.Now; + num = 0; + cycleTime = 0; + while (cycleTime < 3) + { + sqlId = IdHelper.GetId(); + string sql = $"insert into tb_camandvid_abnormaldata(id,record_time,work_voltage_cam,work_current_cam) " + + $"values('{sqlId}','{sqlTime}',FORMAT('{voltageCam}',2),FORMAT('{currentCam}',2));"; - // try - // { - // num = MySQL.ExecuteSql(sql); - // } - // catch (Exception ex) - // { - // Console.WriteLine("Insert Camera Current Abnormal Data Error:" + ex.Message); - //EveryDayLog.WriteErrorCamAndVid("Insert Camera Current Abnormal Data Error:" + ex.Message); - // } + try + { + num = MySQL.ExecuteSql(sql); + } + catch (Exception ex) + { + Console.WriteLine("Insert Camera Current Abnormal Data Error:" + ex.Message); + EveryDayLog.WriteErrorCamAndVid("Insert Camera Current Abnormal Data Error:" + ex.Message); + } - // if (num > 0) - // { - // Console.WriteLine("Insert Camera Current Abnormal Data Success!" + DateTime.Now); - // break; - // } - // else - // { - // Console.WriteLine("Insert Camera Current Abnormal Data Default, Please Reinsert!" + DateTime.Now); - //EveryDayLog.WriteErrorCamAndVid("Insert Camera Current Abnormal Data Default, Please Reinsert!"); - // } + if (num > 0) + { + Console.WriteLine("Insert Camera Current Abnormal Data Success!" + DateTime.Now); + break; + } + else + { + Console.WriteLine("Insert Camera Current Abnormal Data Default, Please Reinsert!" + DateTime.Now); + EveryDayLog.WriteErrorCamAndVid("Insert Camera Current Abnormal Data Default, Please Reinsert!"); + } - // cycleTime++; - // Thread.Sleep(1); - // } - //} + cycleTime++; + Thread.Sleep(1); + } + } #endregion } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.exe b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.exe index d3931d9..6063fcf 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.exe and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.exe differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb index 671f5ca..f8a4649 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.exe b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.exe index d3931d9..6063fcf 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.exe and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.exe differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb index 671f5ca..f8a4649 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb differ