diff --git a/.vs/VRS/FileContentIndex/a8aeeaa3-841b-418d-9975-3542f68a9f35.vsidx b/.vs/VRS/FileContentIndex/a8aeeaa3-841b-418d-9975-3542f68a9f35.vsidx new file mode 100644 index 00000000..349d2990 Binary files /dev/null and b/.vs/VRS/FileContentIndex/a8aeeaa3-841b-418d-9975-3542f68a9f35.vsidx differ diff --git a/.vs/VRS/FileContentIndex/read.lock b/.vs/VRS/FileContentIndex/read.lock new file mode 100644 index 00000000..e69de29b diff --git a/.vs/VRS/v17/.suo b/.vs/VRS/v17/.suo new file mode 100644 index 00000000..b2409d9a Binary files /dev/null and b/.vs/VRS/v17/.suo differ diff --git a/RuralPower/RuralPowerAPI.cs b/RuralPower/RuralPowerAPI.cs index fba4e82c..ca0e7544 100644 --- a/RuralPower/RuralPowerAPI.cs +++ b/RuralPower/RuralPowerAPI.cs @@ -75,6 +75,7 @@ namespace RuralPower DataBase.user_fault_list = new List(); DataBase.achievement_list = new List(); DataBase.achievement_details_list = new List(); + DataBase.user_fault_record_list = new List(); DataBase.path = Path; if (DataBase.user_list.Where(a => a.user_id == UserId).Count() <= 0) { @@ -607,320 +608,327 @@ namespace RuralPower var user_exam_model = DataBase.user_exam_list.Where(a => a.ExamId == ExamId && a.UserId == UserId).FirstOrDefault(); if (user_exam_model != null) { - if (user_exam_model.Status == "已结束") + //if (user_exam_model.Status == "已结束") + //{ + var model = new SGAnswer(lesson_plan_id, new List()); + var answer_info = new List(); + var answer_info_model1 = new SGAnswerInfo("1", "巡检工器具", 0, 0, 0, "", new List()); + var answer_info_model2 = new SGAnswerInfo("2", "排故工器具", 0, 0, 0, "", new List()); + var answer_info_model3 = new SGAnswerInfo("3", "停电操作票", 0, 0, 0, "", new List()); + var answer_info_model4 = new SGAnswerInfo("4", "送电操作票", 0, 0, 0, "", new List()); + var answer_info_model5 = new SGAnswerInfo("5", "停电操作票步骤", 0, 0, 0, "", new List()); + var answer_info_model6 = new SGAnswerInfo("6", "送电操作票步骤", 0, 0, 0, "", new List()); + var answer_info_model7 = new SGAnswerInfo("7", "围栏", 0, 0, 0, "", new List()); + var answer_info_model8 = new SGAnswerInfo("8", "验电", 0, 0, 0, "", new List()); + var answer_info_model9 = new SGAnswerInfo("9", "时间分", 0, 0, 0, "", new List()); + var answer_info_model10 = new SGAnswerInfo("10", "缺陷查找、缺陷处理、缺陷分类分值", 0, 0, 0, "", new List()); + var answer_info_model11 = new SGAnswerInfo("11", "其它扣分项", 0, 0, 0, "", new List()); + + var data = DataBase.achievement_details_list.Where(a => a.AchievementId == achievement_model.AchievementId).OrderBy(a => a.CreateTime).ToList(); + + #region 巡检工器具 + var all_line_tool_list = new List(); + var line_tool_model = data.Where(a => a.Type == "巡线工器具").FirstOrDefault(); + if (line_tool_model != null) { - var model = new SGAnswer(lesson_plan_id, new List()); - var answer_info = new List(); - var answer_info_model1 = new SGAnswerInfo("1", "巡检工器具", 3, 0, 0, "", new List()); - var answer_info_model2 = new SGAnswerInfo("2", "排故工器具", 3, 0, 0, "", new List()); - var answer_info_model3 = new SGAnswerInfo("3", "停电操作票", 5, 0, 0, "", new List()); - var answer_info_model4 = new SGAnswerInfo("4", "送电操作票", 5, 0, 0, "", new List()); - var answer_info_model5 = new SGAnswerInfo("5", "停电操作票步骤", 5, 0, 0, "", new List()); - var answer_info_model6 = new SGAnswerInfo("6", "送电操作票步骤", 5, 0, 0, "", new List()); - var answer_info_model7 = new SGAnswerInfo("7", "围栏", 2, 0, 0, "", new List()); - var answer_info_model8 = new SGAnswerInfo("8", "验电", 2, 0, 0, "", new List()); - var answer_info_model9 = new SGAnswerInfo("9", "时间分", 5, 0, 0, "", new List()); - var answer_info_model10 = new SGAnswerInfo("10", "缺陷查找、缺陷处理、缺陷分类分值", 65, 0, 0, "", new List()); - var answer_info_model11 = new SGAnswerInfo("11", "其它扣分项", 0, 0, 0, "", new List()); - - var data = DataBase.achievement_details_list.Where(a => a.AchievementId == achievement_model.AchievementId).OrderBy(a => a.CreateTime).ToList(); - - #region 巡检工器具 - var all_line_tool_list = new List(); - var line_tool_model = data.Where(a => a.Type == "巡线工器具").FirstOrDefault(); - if (line_tool_model != null) - { - var tool_model = new SGStep(line_tool_model.ItemName, double.Parse(line_tool_model.TotalScore.ToString()), double.Parse(line_tool_model.ItemizedScore.ToString())); - all_line_tool_list.Add(tool_model); - } - else - { - var tool_model = new SGStep("巡检工器具选择", 3, 0); - all_line_tool_list.Add(tool_model); - } - - var user_tool_list = DataBase.user_tool_list.Where(a => a.ExamId == ExamId && a.UserId == UserId && a.IsScore == "1").ToList(); - var line_tool_list = user_tool_list.Where(a => a.Purpose == "巡线").ToList(); - for (int i = 0; i < line_tool_list.Count; i++) - { - double score = 0; - if (line_tool_list[i].IsSelect == "1") - { - score = LineMultipleScore; - } - else - { - score = LineMomentScore; - } - var tool_model = new SGStep(line_tool_list[i].ToolName, 0, double.Parse((-score).ToString())); - all_line_tool_list.Add(tool_model); - } - - if (all_line_tool_list.Count() > 0) - { - answer_info_model1.StepArr = all_line_tool_list; - } - #endregion - - #region 排故工器具 - var all_trouble_tool_list = new List(); - var trouble_tool_model = data.Where(a => a.Type == "排故工器具").FirstOrDefault(); - if (trouble_tool_model != null) - { - var tool_model = new SGStep(trouble_tool_model.ItemName, double.Parse(trouble_tool_model.TotalScore.ToString()), double.Parse(trouble_tool_model.ItemizedScore.ToString())); - all_trouble_tool_list.Add(tool_model); - } - else - { - var tool_model = new SGStep("排故工器具选择", 3, 0); - all_trouble_tool_list.Add(tool_model); - } - - var trouble_tool_list = user_tool_list.Where(a => a.Purpose == "排故").ToList(); - for (int i = 0; i < trouble_tool_list.Count; i++) - { - double score = 0; - if (trouble_tool_list[i].IsSelect == "1") - { - score = LineMultipleScore; - } - else - { - score = LineMomentScore; - } - var tool_model = new SGStep(trouble_tool_list[i].ToolName, 0, double.Parse((-score).ToString())); - all_trouble_tool_list.Add(tool_model); - } - if (all_trouble_tool_list.Count() > 0) - { - answer_info_model2.StepArr = all_trouble_tool_list; - } - #endregion - - #region 停电操作票 - var power_failure_model = data.Where(a => a.Type == "停电操作票").FirstOrDefault(); - if (power_failure_model != null) - { - var power_model = new SGStep(power_failure_model.ItemName, double.Parse(power_failure_model.TotalScore.ToString()), double.Parse(power_failure_model.ItemizedScore.ToString())); - answer_info_model3.StepArr = new List() { power_model }; - } - else - { - var power_model = new SGStep("停电操作票选择", 5, 0); - answer_info_model3.StepArr = new List() { power_model }; - } - #endregion - - #region 送电操作票 - var power_transmission_model = data.Where(a => a.Type == "送电操作票").FirstOrDefault(); - if (power_transmission_model != null) - { - var power_model = new SGStep(power_transmission_model.ItemName, double.Parse(power_transmission_model.TotalScore.ToString()), double.Parse(power_transmission_model.ItemizedScore.ToString())); - answer_info_model4.StepArr = new List() { power_model }; - } - else - { - var power_model = new SGStep("送电操作票选择", 5, 0); - answer_info_model4.StepArr = new List() { power_model }; - } - #endregion - - #region 停电操作票步骤 - var all_power_failure_step_list = new List(); - var power_failure_step_model = data.Where(a => a.Type == "停电操作票步骤").FirstOrDefault(); - if (power_failure_step_model != null) - { - var power_model = new SGStep(power_failure_step_model.ItemName, double.Parse(power_failure_step_model.TotalScore.ToString()), double.Parse(power_failure_step_model.ItemizedScore.ToString())); - all_power_failure_step_list.Add(power_model); - } - else - { - var power_model = new SGStep("停电操作票步骤", 5, 0); - all_power_failure_step_list.Add(power_model); - } - - var proc_ticket_list = DataBase.user_operation_proc_ticket_list.Where(a => a.ExamId == ExamId && a.UserId == UserId && a.IsScore == "1").ToList(); - var power_failure_step_list = proc_ticket_list.Where(a => a.Type == "停电").OrderBy(a => a.SerialNumber).ToList(); - for (int i = 0; i < power_failure_step_list.Count; i++) - { - var power_model = new SGStep(power_failure_step_list[i].Content, 0, double.Parse((-power_failure_step_list[i].Score).ToString())); - all_power_failure_step_list.Add(power_model); - } - if (all_power_failure_step_list.Count() > 0) - { - answer_info_model5.StepArr = all_power_failure_step_list; - } - #endregion - - #region 送电操作票步骤 - var all_power_transmission_step_list = new List(); - var power_transmission_step_model = data.Where(a => a.Type == "送电操作票步骤").FirstOrDefault(); - if (power_transmission_step_model != null) - { - var power_model = new SGStep(power_transmission_step_model.ItemName, double.Parse(power_transmission_step_model.TotalScore.ToString()), double.Parse(power_transmission_step_model.ItemizedScore.ToString())); - all_power_transmission_step_list.Add(power_model); - } - else - { - var power_model = new SGStep("送电操作票步骤", 5, 0); - all_power_transmission_step_list.Add(power_model); - } - - var power_transmission_step_list = proc_ticket_list.Where(a => a.Type == "送电").OrderBy(a => a.SerialNumber).ToList(); - for (int i = 0; i < power_transmission_step_list.Count; i++) - { - var power_model = new SGStep(power_transmission_step_list[i].Content, 0, double.Parse((-power_transmission_step_list[i].Score).ToString())); - all_power_transmission_step_list.Add(power_model); - } - if (all_power_transmission_step_list.Count() > 0) - { - answer_info_model6.StepArr = all_power_transmission_step_list; - } - #endregion - - #region 围栏 - var place_model = data.Where(a => a.Type == "围栏").FirstOrDefault(); - if (place_model != null) - { - var power_model = new SGStep(place_model.ItemName, double.Parse(place_model.TotalScore.ToString()), double.Parse(place_model.ItemizedScore.ToString())); - answer_info_model7.StepArr = new List() { power_model }; - } - else - { - var power_model = new SGStep("不放置围栏分值", 2, 0); - answer_info_model7.StepArr = new List() { power_model }; - } - #endregion - - #region 验电 - var electricity_model = data.Where(a => a.Type == "验电").FirstOrDefault(); - if (electricity_model != null) - { - var power_model = new SGStep(electricity_model.ItemName, double.Parse(electricity_model.TotalScore.ToString()), double.Parse(electricity_model.ItemizedScore.ToString())); - answer_info_model8.StepArr = new List() { power_model }; - } - else - { - var power_model = new SGStep("箱门或插座未验电或验电顺序错误", 2, 0); - answer_info_model8.StepArr = new List() { power_model }; - } - #endregion - - #region 时间分 - var time_model = data.Where(a => a.Type == "时间分").FirstOrDefault(); - if (time_model != null) - { - var power_model = new SGStep(time_model.ItemName, double.Parse(time_model.TotalScore.ToString()), double.Parse(time_model.ItemizedScore.ToString())); - answer_info_model9.StepArr = new List() { power_model }; - } - else - { - var power_model = new SGStep("时间分", 5, 0); - answer_info_model9.StepArr = new List() { power_model }; - } - #endregion - - #region 缺陷查找、缺陷处理、缺陷分类分值 - var all_fault_list = new List(); - var fault_list = data.Where(a => a.Type == "故障记录选择" || a.Type == "故障选择题处理" || a.Type == "故障排故处理").OrderBy(a => a.CreateTime).ToList(); - var fault_type_list = fault_list.GroupBy(a => a.FaultDesc).ToList(); - for (int i = 0; i < fault_type_list.Count; i++) - { - var fault = fault_list.Where(a => a.FaultDesc == fault_type_list[i].Key).ToList(); - - var first = fault.Where(a => a.ScoreType == "缺陷查找分值").FirstOrDefault(); - if (first != null) - { - var power_model = new SGStep(fault_type_list[i].Key + "-查找", double.Parse(first.TotalScore.ToString()), double.Parse(first.ItemizedScore.ToString())); - all_fault_list.Add(power_model); - } - else - { - var power_model = new SGStep(fault_type_list[i].Key + "-查找", 0, 0); - all_fault_list.Add(power_model); - } - - var second = fault.Where(a => a.ScoreType == "缺陷分类分值").FirstOrDefault(); - if (second != null) - { - var power_model = new SGStep(fault_type_list[i].Key + "-分类", double.Parse(second.TotalScore.ToString()), double.Parse(second.ItemizedScore.ToString())); - all_fault_list.Add(power_model); - } - else - { - var power_model = new SGStep(fault_type_list[i].Key + "-分类", 0, 0); - all_fault_list.Add(power_model); - } - - var third = fault.Where(a => a.ScoreType == "缺陷处理分值").FirstOrDefault(); - if (third != null) - { - var power_model = new SGStep(fault_type_list[i].Key + "-处理", double.Parse(third.TotalScore.ToString()), double.Parse(third.ItemizedScore.ToString())); - all_fault_list.Add(power_model); - } - else - { - var power_model = new SGStep(fault_type_list[i].Key + "-处理", 0, 0); - all_fault_list.Add(power_model); - } - } - if (all_fault_list.Count() > 0) - { - answer_info_model10.StepArr = all_fault_list; - } - #endregion - - #region 其它扣分项 - var other_step_list = new List(); - //巡检爬杆 - var climbrod_model = data.Where(a => a.Type == "巡检爬杆").FirstOrDefault(); - if (climbrod_model != null) - { - var power_model = new SGStep(climbrod_model.ItemName, double.Parse(climbrod_model.TotalScore.ToString()), double.Parse(climbrod_model.ItemizedScore.ToString())); - other_step_list.Add(power_model); - } - - var platform_area_model = data.Where(a => a.Type == "台区选择").FirstOrDefault(); - if (platform_area_model != null) - { - var power_model = new SGStep(platform_area_model.ItemName, double.Parse(platform_area_model.TotalScore.ToString()), double.Parse(platform_area_model.ItemizedScore.ToString())); - other_step_list.Add(power_model); - } - - var fusible_core_model = data.Where(a => a.Type == "未分闸状态拉合熔芯").FirstOrDefault(); - if (fusible_core_model != null) - { - var power_model = new SGStep(fusible_core_model.ItemName, double.Parse(fusible_core_model.TotalScore.ToString()), double.Parse(fusible_core_model.ItemizedScore.ToString())); - other_step_list.Add(power_model); - } - - if (other_step_list.Count() > 0) - { - answer_info_model11.StepArr = other_step_list; - } - #endregion - - answer_info.Add(answer_info_model1); - answer_info.Add(answer_info_model2); - answer_info.Add(answer_info_model3); - answer_info.Add(answer_info_model4); - answer_info.Add(answer_info_model5); - answer_info.Add(answer_info_model6); - answer_info.Add(answer_info_model7); - answer_info.Add(answer_info_model8); - answer_info.Add(answer_info_model9); - answer_info.Add(answer_info_model10); - answer_info.Add(answer_info_model11); - model.AnswerInfo = answer_info; - list.Add(model); + answer_info_model1.AutoScore = double.Parse(line_tool_model.ItemizedScore.ToString()); + var tool_model = new SGStep(line_tool_model.ItemName, double.Parse(line_tool_model.TotalScore.ToString()), double.Parse(line_tool_model.ItemizedScore.ToString())); + all_line_tool_list.Add(tool_model); } + else + { + var tool_model = new SGStep("巡检工器具选择", 3, 0); + all_line_tool_list.Add(tool_model); + } + + var user_tool_list = DataBase.user_tool_list.Where(a => a.ExamId == ExamId && a.UserId == UserId && a.IsScore == "1").ToList(); + var line_tool_list = user_tool_list.Where(a => a.Purpose == "巡线").ToList(); + for (int i = 0; i < line_tool_list.Count; i++) + { + double score = 0; + if (line_tool_list[i].IsSelect == "1") + { + score = LineMultipleScore; + } + else + { + score = LineMomentScore; + } + var tool_model = new SGStep(line_tool_list[i].ToolName, 0, double.Parse((-score).ToString())); + all_line_tool_list.Add(tool_model); + } + + if (all_line_tool_list.Count() > 0) + { + answer_info_model1.StepArr = all_line_tool_list; + } + #endregion + + #region 排故工器具 + var all_trouble_tool_list = new List(); + var trouble_tool_model = data.Where(a => a.Type == "排故工器具").FirstOrDefault(); + if (trouble_tool_model != null) + { + answer_info_model2.AutoScore = double.Parse(trouble_tool_model.ItemizedScore.ToString()); + var tool_model = new SGStep(trouble_tool_model.ItemName, double.Parse(trouble_tool_model.TotalScore.ToString()), double.Parse(trouble_tool_model.ItemizedScore.ToString())); + all_trouble_tool_list.Add(tool_model); + } + else + { + var tool_model = new SGStep("排故工器具选择", 3, 0); + all_trouble_tool_list.Add(tool_model); + } + + var trouble_tool_list = user_tool_list.Where(a => a.Purpose == "排故").ToList(); + for (int i = 0; i < trouble_tool_list.Count; i++) + { + double score = 0; + if (trouble_tool_list[i].IsSelect == "1") + { + score = LineMultipleScore; + } + else + { + score = LineMomentScore; + } + var tool_model = new SGStep(trouble_tool_list[i].ToolName, 0, double.Parse((-score).ToString())); + all_trouble_tool_list.Add(tool_model); + } + if (all_trouble_tool_list.Count() > 0) + { + answer_info_model2.StepArr = all_trouble_tool_list; + } + #endregion + + #region 停电操作票 + var power_failure_model = data.Where(a => a.Type == "停电操作票").FirstOrDefault(); + if (power_failure_model != null) + { + answer_info_model3.AutoScore = double.Parse(power_failure_model.ItemizedScore.ToString()); + var power_model = new SGStep(power_failure_model.ItemName, double.Parse(power_failure_model.TotalScore.ToString()), double.Parse(power_failure_model.ItemizedScore.ToString())); + answer_info_model3.StepArr = new List() { power_model }; + } + else + { + var power_model = new SGStep("停电操作票选择", 5, 0); + answer_info_model3.StepArr = new List() { power_model }; + } + #endregion + + #region 送电操作票 + var power_transmission_model = data.Where(a => a.Type == "送电操作票").FirstOrDefault(); + if (power_transmission_model != null) + { + answer_info_model4.AutoScore = double.Parse(power_transmission_model.ItemizedScore.ToString()); + var power_model = new SGStep(power_transmission_model.ItemName, double.Parse(power_transmission_model.TotalScore.ToString()), double.Parse(power_transmission_model.ItemizedScore.ToString())); + answer_info_model4.StepArr = new List() { power_model }; + } + else + { + var power_model = new SGStep("送电操作票选择", 5, 0); + answer_info_model4.StepArr = new List() { power_model }; + } + #endregion + + #region 停电操作票步骤 + var all_power_failure_step_list = new List(); + var power_failure_step_model = data.Where(a => a.Type == "停电操作票步骤").FirstOrDefault(); + if (power_failure_step_model != null) + { + answer_info_model5.AutoScore = double.Parse(power_failure_step_model.ItemizedScore.ToString()); + var power_model = new SGStep(power_failure_step_model.ItemName, double.Parse(power_failure_step_model.TotalScore.ToString()), double.Parse(power_failure_step_model.ItemizedScore.ToString())); + all_power_failure_step_list.Add(power_model); + } + else + { + var power_model = new SGStep("停电操作票步骤", 5, 0); + all_power_failure_step_list.Add(power_model); + } + + var proc_ticket_list = DataBase.user_operation_proc_ticket_list.Where(a => a.ExamId == ExamId && a.UserId == UserId && a.IsScore == "1").ToList(); + var power_failure_step_list = proc_ticket_list.Where(a => a.Type == "停电").OrderBy(a => a.SerialNumber).ToList(); + for (int i = 0; i < power_failure_step_list.Count; i++) + { + var power_model = new SGStep(power_failure_step_list[i].Content, 0, double.Parse((-power_failure_step_list[i].Score).ToString())); + all_power_failure_step_list.Add(power_model); + } + if (all_power_failure_step_list.Count() > 0) + { + answer_info_model5.StepArr = all_power_failure_step_list; + } + #endregion + + #region 送电操作票步骤 + var all_power_transmission_step_list = new List(); + var power_transmission_step_model = data.Where(a => a.Type == "送电操作票步骤").FirstOrDefault(); + if (power_transmission_step_model != null) + { + answer_info_model6.AutoScore = double.Parse(power_transmission_step_model.ItemizedScore.ToString()); + var power_model = new SGStep(power_transmission_step_model.ItemName, double.Parse(power_transmission_step_model.TotalScore.ToString()), double.Parse(power_transmission_step_model.ItemizedScore.ToString())); + all_power_transmission_step_list.Add(power_model); + } + else + { + var power_model = new SGStep("送电操作票步骤", 5, 0); + all_power_transmission_step_list.Add(power_model); + } + + var power_transmission_step_list = proc_ticket_list.Where(a => a.Type == "送电").OrderBy(a => a.SerialNumber).ToList(); + for (int i = 0; i < power_transmission_step_list.Count; i++) + { + var power_model = new SGStep(power_transmission_step_list[i].Content, 0, double.Parse((-power_transmission_step_list[i].Score).ToString())); + all_power_transmission_step_list.Add(power_model); + } + if (all_power_transmission_step_list.Count() > 0) + { + answer_info_model6.StepArr = all_power_transmission_step_list; + } + #endregion + + #region 围栏 + var place_model = data.Where(a => a.Type == "围栏").FirstOrDefault(); + if (place_model != null) + { + answer_info_model7.AutoScore = double.Parse(place_model.ItemizedScore.ToString()); + var power_model = new SGStep(place_model.ItemName, double.Parse(place_model.TotalScore.ToString()), double.Parse(place_model.ItemizedScore.ToString())); + answer_info_model7.StepArr = new List() { power_model }; + } + else + { + var power_model = new SGStep("不放置围栏分值", 2, 0); + answer_info_model7.StepArr = new List() { power_model }; + } + #endregion + + #region 验电 + var electricity_model = data.Where(a => a.Type == "验电").FirstOrDefault(); + if (electricity_model != null) + { + answer_info_model8.AutoScore = double.Parse(electricity_model.ItemizedScore.ToString()); + var power_model = new SGStep(electricity_model.ItemName, double.Parse(electricity_model.TotalScore.ToString()), double.Parse(electricity_model.ItemizedScore.ToString())); + answer_info_model8.StepArr = new List() { power_model }; + } + else + { + var power_model = new SGStep("箱门或插座未验电或验电顺序错误", 2, 0); + answer_info_model8.StepArr = new List() { power_model }; + } + #endregion + + #region 时间分 + var time_model = data.Where(a => a.Type == "时间分").FirstOrDefault(); + if (time_model != null) + { + answer_info_model9.AutoScore = double.Parse(time_model.ItemizedScore.ToString()); + var power_model = new SGStep(time_model.ItemName, double.Parse(time_model.TotalScore.ToString()), double.Parse(time_model.ItemizedScore.ToString())); + answer_info_model9.StepArr = new List() { power_model }; + } + else + { + var power_model = new SGStep("时间分", 5, 0); + answer_info_model9.StepArr = new List() { power_model }; + } + #endregion + + #region 缺陷查找、缺陷处理、缺陷分类分值 + var all_fault_list = new List(); + var fault_list = data.Where(a => a.Type == "故障记录选择" || a.Type == "故障选择题处理" || a.Type == "故障排故处理").OrderBy(a => a.CreateTime).ToList(); + var fault_type_list = fault_list.GroupBy(a => a.FaultDesc).ToList(); + for (int i = 0; i < fault_type_list.Count; i++) + { + var fault = fault_list.Where(a => a.FaultDesc == fault_type_list[i].Key).ToList(); + + var first = fault.Where(a => a.ScoreType == "缺陷查找分值").FirstOrDefault(); + if (first != null) + { + var power_model = new SGStep(fault_type_list[i].Key + "-查找", double.Parse(first.TotalScore.ToString()), double.Parse(first.ItemizedScore.ToString())); + all_fault_list.Add(power_model); + } + else + { + var power_model = new SGStep(fault_type_list[i].Key + "-查找", 0, 0); + all_fault_list.Add(power_model); + } + + var second = fault.Where(a => a.ScoreType == "缺陷分类分值").FirstOrDefault(); + if (second != null) + { + var power_model = new SGStep(fault_type_list[i].Key + "-分类", double.Parse(second.TotalScore.ToString()), double.Parse(second.ItemizedScore.ToString())); + all_fault_list.Add(power_model); + } + else + { + var power_model = new SGStep(fault_type_list[i].Key + "-分类", 0, 0); + all_fault_list.Add(power_model); + } + + var third = fault.Where(a => a.ScoreType == "缺陷处理分值").FirstOrDefault(); + if (third != null) + { + var power_model = new SGStep(fault_type_list[i].Key + "-处理", double.Parse(third.TotalScore.ToString()), double.Parse(third.ItemizedScore.ToString())); + all_fault_list.Add(power_model); + } + else + { + var power_model = new SGStep(fault_type_list[i].Key + "-处理", 0, 0); + all_fault_list.Add(power_model); + } + } + if (all_fault_list.Count() > 0) + { + answer_info_model10.AutoScore = all_fault_list.Sum(a => a.TotalScore); + answer_info_model10.StepArr = all_fault_list; + } + #endregion + + #region 其它扣分项 + var other_step_list = new List(); + //巡检爬杆 + var climbrod_model = data.Where(a => a.Type == "巡检爬杆").FirstOrDefault(); + if (climbrod_model != null) + { + var power_model = new SGStep(climbrod_model.ItemName, double.Parse(climbrod_model.TotalScore.ToString()), double.Parse(climbrod_model.ItemizedScore.ToString())); + other_step_list.Add(power_model); + } + + var platform_area_model = data.Where(a => a.Type == "台区选择").FirstOrDefault(); + if (platform_area_model != null) + { + var power_model = new SGStep(platform_area_model.ItemName, double.Parse(platform_area_model.TotalScore.ToString()), double.Parse(platform_area_model.ItemizedScore.ToString())); + other_step_list.Add(power_model); + } + + var fusible_core_model = data.Where(a => a.Type == "未分闸状态拉合熔芯").FirstOrDefault(); + if (fusible_core_model != null) + { + var power_model = new SGStep(fusible_core_model.ItemName, double.Parse(fusible_core_model.TotalScore.ToString()), double.Parse(fusible_core_model.ItemizedScore.ToString())); + other_step_list.Add(power_model); + } + + if (other_step_list.Count() > 0) + { + answer_info_model11.AutoScore = other_step_list.Sum(a => a.TotalScore); + answer_info_model11.StepArr = other_step_list; + } + #endregion + + answer_info.Add(answer_info_model1); + answer_info.Add(answer_info_model2); + answer_info.Add(answer_info_model3); + answer_info.Add(answer_info_model4); + answer_info.Add(answer_info_model5); + answer_info.Add(answer_info_model6); + answer_info.Add(answer_info_model7); + answer_info.Add(answer_info_model8); + answer_info.Add(answer_info_model9); + answer_info.Add(answer_info_model10); + answer_info.Add(answer_info_model11); + model.AnswerInfo = answer_info; + list.Add(model); + //} } } - return list; - //ResponObject responObject = getPractiseInfo.UploadAnswer(practiseId, userId, answerList); - //HttpPractiseService getPractiseInfo = new HttpPractiseService(); - } /// @@ -1347,7 +1355,7 @@ namespace RuralPower return Write(APICode.Fail, "考生考试已结束"); } - var achievement_model = DataBase.achievement_list.Where(a => a.ExamId == model.ExamId && a.UserId == model.UserId).FirstOrDefault(); ; + var achievement_model = DataBase.achievement_list.Where(a => a.ExamId == model.ExamId && a.UserId == model.UserId).FirstOrDefault(); if (achievement_model == null) { return Write(APICode.Fail, "考生成绩数据不存在"); diff --git a/Test/Program.cs b/Test/Program.cs index b955f740..31f97378 100644 --- a/Test/Program.cs +++ b/Test/Program.cs @@ -13,13 +13,15 @@ namespace Test { static void Main(string[] args) { - //RuralPowerAPI test = new RuralPowerAPI(); + RuralPowerAPI test = new RuralPowerAPI(); //var result = test.Login("http://umayle.com:8092", "SQ002", "", "kfb263"); - //var result = test.GetExam("123", "1"); - //var result2 = test.StartExam("2867f9b1ccf1449dbf4c0a5b0fa9efcd", "123"); - //var result3 = test.AddUserTool("{\"UserId\":\"123\",\"ExamId\":\"2867f9b1ccf1449dbf4c0a5b0fa9efcd\",\"Purpose\":\"巡线\",\"Tool\":[{\"ToolName\":\"红外热成像\",\"Quantity\":1}]}"); - //var result4 = test.EndExam("2867f9b1ccf1449dbf4c0a5b0fa9efcd", "123"); - //var result5 = test.GetAnswer("2867f9b1ccf1449dbf4c0a5b0fa9efcd", "123", 1); + var result = test.GetExam("","123", "3", AppDomain.CurrentDomain.BaseDirectory); + var result2 = test.StartExam("", "048dd77b0a734856a86153e2feaa1d1d", "123"); + var result3 = test.AddUserTool("", "{\"UserId\":\"123\",\"ExamId\":\"048dd77b0a734856a86153e2feaa1d1d\",\"Purpose\":\"巡线\",\"Tool\":[{\"ToolName\":\"红外热成像\",\"Quantity\":1}]}"); + + var result6 = test.AddUserFaultRecord("", "{\"ExamId\":\"048dd77b0a734856a86153e2feaa1d1d\",\"UserId\":\"123\",\"Data\":[{\"Cache_Key\":\"2_0_-1_3_-1\",\"Cache_Content\":\"变压器台架-411东线-无剩余电流断路器试验记录卡-一般缺陷\",\"Cache_Value\":\"配电箱-0-无剩余电流断路器试验记录卡-0\",\"FaultId\":\"b5f840480cd311eda2ff7cd30a92bb1c\",\"FaultType\":\"配电箱\",\"Type\":\"配电箱\",\"FaultDesc\":\"无剩余电流断路器试验记录卡\",\"RootDeviceId\":\"6b8da25e0c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"6b8da25e0c0d11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"变压器台架-411东线-无剩余电流断路器试验记录卡-一般缺陷\",\"Value\":\"\"},{\"Cache_Key\":\"2_0_-1_5_-1\",\"Cache_Content\":\"变压器台架-411东线-配电箱杂物-一般缺陷\",\"Cache_Value\":\"配电箱-0-配电箱杂物-0\",\"FaultId\":\"bf68cc5c0cd311eda2ff7cd30a92bb1c\",\"FaultType\":\"配电箱\",\"Type\":\"配电箱\",\"FaultDesc\":\"配电箱杂物\",\"RootDeviceId\":\"6b8da25e0c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"6b8da25e0c0d11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"变压器台架-411东线-配电箱杂物-一般缺陷\",\"Value\":\"\"},{\"Cache_Key\":\"2_0_-1_4_-1\",\"Cache_Content\":\"变压器台架-411东线-配电箱孔洞未封堵-一般缺陷\",\"Cache_Value\":\"配电箱-0-配电箱孔洞未封堵-0\",\"FaultId\":\"43b034330e7011eda2ff7cd30a92bb1c\",\"FaultType\":\"配电箱\",\"Type\":\"配电箱\",\"FaultDesc\":\"配电箱孔洞未封堵\",\"RootDeviceId\":\"6b8da25e0c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"6b8da25e0c0d11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"变压器台架-411东线-配电箱孔洞未封堵-一般缺陷\",\"Value\":\"\"},{\"Cache_Key\":\"2_0_-1_1_-1\",\"Cache_Content\":\"变压器台架-411东线-出线开关编号牌缺失-一般缺陷\",\"Cache_Value\":\"配电箱-0-出线开关编号牌缺失-0\",\"FaultId\":\"f5d5b6bf0ee211eda2ff7cd30a92bb1c\",\"FaultType\":\"配电箱\",\"Type\":\"配电箱\",\"FaultDesc\":\"出线开关编号牌缺失\",\"RootDeviceId\":\"6b8da25e0c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"9d8da9360c0f11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"变压器台架-411东线-出线开关编号牌缺失-一般缺陷\",\"Value\":\"\"},{\"Cache_Key\":\"2_0_-1_9_1\",\"Cache_Content\":\"变压器台架-411东线-熔芯损坏-B相-一般缺陷\",\"Cache_Value\":\"配电箱-0-熔芯损坏-B相\",\"FaultId\":\"6aa962530ee311eda2ff7cd30a92bb1c\",\"FaultType\":\"配电箱\",\"Type\":\"配电箱\",\"FaultDesc\":\"熔芯损坏\",\"RootDeviceId\":\"6b8da25e0c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"9d8da9360c0f11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"变压器台架-411东线-熔芯损坏-B相-一般缺陷\",\"Value\":\"B相熔芯\"},{\"Cache_Key\":\"2_0_-1_13_-1\",\"Cache_Content\":\"变压器台架-411东线-漏电保护设置不合理-一般缺陷\",\"Cache_Value\":\"配电箱-0-漏电保护设置不合理-0\",\"FaultId\":\"5c6ad4320e4811eda2ff7cd30a92bb1c\",\"FaultType\":\"智能开关参数\",\"Type\":\"断路器\",\"FaultDesc\":\"漏电保护设置不合理\",\"RootDeviceId\":\"6b8da25e0c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"f3a279fc50e14420a0be0098843d849f\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"变压器台架-411东线-漏电保护设置不合理-一般缺陷\",\"Value\":\"\"},{\"Cache_Key\":\"2_0_-1_15_-1\",\"Cache_Content\":\"变压器台架-411东线-短路延时保护设置错误-一般缺陷\",\"Cache_Value\":\"配电箱-0-短路延时保护设置错误-0\",\"FaultId\":\"179528ae0e4911eda2ff7cd30a92bb1c\",\"FaultType\":\"智能开关参数\",\"Type\":\"断路器\",\"FaultDesc\":\"短路延时保护设置错误\",\"RootDeviceId\":\"6b8da25e0c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"f3a279fc50e14420a0be0098843d849f\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"变压器台架-411东线-短路延时保护设置错误-一般缺陷\",\"Value\":\"\"},{\"Cache_Key\":\"2_0_-1_19_-1\",\"Cache_Content\":\"变压器台架-411东线-缺相保护设置错误-一般缺陷\",\"Cache_Value\":\"配电箱-0-缺相保护设置错误-0\",\"FaultId\":\"a74335e00e4911eda2ff7cd30a92bb1c\",\"FaultType\":\"智能开关参数\",\"Type\":\"断路器\",\"FaultDesc\":\"缺相保护设置错误\",\"RootDeviceId\":\"6b8da25e0c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"f3a279fc50e14420a0be0098843d849f\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"变压器台架-411东线-缺相保护设置错误-一般缺陷\",\"Value\":\"\"},{\"Cache_Key\":\"0_0_1_17_3\",\"Cache_Content\":\"杆塔-411东线-002#杆-拉线松动-北侧-一般缺陷\",\"Cache_Value\":\"杆塔-002#杆-拉线松动-北侧\",\"FaultId\":\"efe4fa570f2911eda2ff7cd30a92bb1c\",\"FaultType\":\"线路拉线类\",\"Type\":\"杆塔\",\"FaultDesc\":\"拉线松动\",\"RootDeviceId\":\"e8fc27440c0c11ed844e7cd30a92bb1c\",\"DeviceId\":\"e8fc27440c0c11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"杆塔-411东线-002#杆-拉线松动-北侧-一般缺陷\",\"Value\":\"北侧\"},{\"Cache_Key\":\"0_0_2_8_-1\",\"Cache_Content\":\"杆塔-411东线-003#杆-电杆倾斜-一般缺陷\",\"Cache_Value\":\"杆塔-003#杆-电杆倾斜-0\",\"FaultId\":\"fba33ff70f2c11eda2ff7cd30a92bb1c\",\"FaultType\":\"线路杆塔类\",\"Type\":\"杆塔\",\"FaultDesc\":\"电杆倾斜\",\"RootDeviceId\":\"04c4be780c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"04c4be780c0d11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"杆塔-411东线-003#杆-电杆倾斜-一般缺陷\",\"Value\":\"\"},{\"Cache_Key\":\"0_0_3_3_-1\",\"Cache_Content\":\"杆塔-411东线-004#杆-通道有异物-一般缺陷\",\"Cache_Value\":\"杆塔-004#杆-通道有异物-0\",\"FaultId\":\"7dee2ed80f2611eda2ff7cd30a92bb1c\",\"FaultType\":\"线路通道类\",\"Type\":\"杆塔\",\"FaultDesc\":\"通道有异物\",\"RootDeviceId\":\"0903073e0c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"0903073e0c0d11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"杆塔-411东线-004#杆-通道有异物-一般缺陷\",\"Value\":\"\"},{\"Cache_Key\":\"0_0_4_4_-1\",\"Cache_Content\":\"杆塔-411东线-005#杆-鸟巢-一般缺陷\",\"Cache_Value\":\"杆塔-005#杆-鸟巢-0\",\"FaultId\":\"a072a2360f2711eda2ff7cd30a92bb1c\",\"FaultType\":\"线路通道类\",\"Type\":\"杆塔\",\"FaultDesc\":\"鸟巢\",\"RootDeviceId\":\"0eb9ec5f0c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"0eb9ec5f0c0d11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"杆塔-411东线-005#杆-鸟巢-一般缺陷\",\"Value\":\"\"},{\"Cache_Key\":\"0_0_5_9_-1\",\"Cache_Content\":\"杆塔-411东线-006#杆-电杆杆身露筋、有裂纹-一般缺陷\",\"Cache_Value\":\"杆塔-006#杆-电杆杆身露筋、有裂纹-0\",\"FaultId\":\"dce4e74d0f2b11eda2ff7cd30a92bb1c\",\"FaultType\":\"线路杆塔类\",\"Type\":\"杆塔\",\"FaultDesc\":\"电杆杆身露筋、有裂纹\",\"RootDeviceId\":\"15b709dc0c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"15b709dc0c0d11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"杆塔-411东线-006#杆-电杆杆身露筋、有裂纹-一般缺陷\",\"Value\":\"\"},{\"Cache_Key\":\"0_0_5_12_-1\",\"Cache_Content\":\"杆塔-411东线-006#杆-横担锈蚀-一般缺陷\",\"Cache_Value\":\"杆塔-006#杆-横担锈蚀-0\",\"FaultId\":\"74ea1f530f4111eda2ff7cd30a92bb1c\",\"FaultType\":\"线路金具类\",\"Type\":\"杆塔\",\"FaultDesc\":\"横担锈蚀\",\"RootDeviceId\":\"15b709dc0c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"8cd1dc640c0d11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"杆塔-411东线-006#杆-横担锈蚀-一般缺陷\",\"Value\":\"\"},{\"Cache_Key\":\"0_0_6_20_3\",\"Cache_Content\":\"杆塔-411东线-007#杆-接头发热-N相-一般缺陷\",\"Cache_Value\":\"杆塔-007#杆-接头发热-N相\",\"FaultId\":\"ff957c080f2a11eda2ff7cd30a92bb1c\",\"FaultType\":\"接户线\",\"Type\":\"杆塔\",\"FaultDesc\":\"接头发热\",\"RootDeviceId\":\"20c4d6b40c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"20c4d6b40c0d11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"杆塔-411东线-007#杆-接头发热-N相-一般缺陷\",\"Value\":\"N相\"},{\"Cache_Key\":\"1_0_2_4_3\",\"Cache_Content\":\"线档-411东线-003#-004#杆-线路弧垂不一致-N相-一般缺陷\",\"Cache_Value\":\"线档-003#-004#杆-线路弧垂不一致-N相\",\"FaultId\":\"7e5b23890fce11eda2ff7cd30a92bb1c\",\"FaultType\":\"线路导线类\",\"Type\":\"线档\",\"FaultDesc\":\"线路弧垂不一致\",\"RootDeviceId\":\"269657410c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"a2c582520c0d11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"线档-411东线-003#-004#杆-线路弧垂不一致-N相-一般缺陷\",\"Value\":\"N相\"},{\"Cache_Key\":\"1_0_4_3_-1\",\"Cache_Content\":\"线档-411东线-005#-006#杆-鱼塘附近没有垂钓警示牌-一般缺陷\",\"Cache_Value\":\"线档-005#-006#杆-鱼塘附近没有垂钓警示牌-0\",\"FaultId\":\"44348f400fce11eda2ff7cd30a92bb1c\",\"FaultType\":\"线路通道类\",\"Type\":\"线档\",\"FaultDesc\":\"鱼塘附近没有垂钓警示牌\",\"RootDeviceId\":\"269657410c0d11ed844e7cd30a92bb1c\",\"DeviceId\":\"adae7d710c0d11ed844e7cd30a92bb1c\",\"DefectLevel\":\"一般\",\"IsCorrect\":\"1\",\"Answer\":\"\",\"Content\":\"线档-411东线-005#-006#杆-鱼塘附近没有垂钓警示牌-一般缺陷\",\"Value\":\"\"}]}"); + var result4 = test.EndExam("", "048dd77b0a734856a86153e2feaa1d1d", "123"); + var result5 = test.GetAnswer("048dd77b0a734856a86153e2feaa1d1d", "123", 1); //var result = test.UploadFile("http://192.168.1.213:8088", "c7080a513ec043f2baf695e866efcb67", "USER202204211516089625", "测试", "C:\\Users\\Public\\Nwt\\cache\\recv\\吕浩\\04_user-2022-08-18-52150s-800x600.mp4"); //Console.WriteLine(result); diff --git a/Test/bin/Debug/DataService.dll b/Test/bin/Debug/DataService.dll index a6ddee78..d9caa8f0 100644 Binary files a/Test/bin/Debug/DataService.dll and b/Test/bin/Debug/DataService.dll differ diff --git a/Test/bin/Debug/DataService.pdb b/Test/bin/Debug/DataService.pdb index 8034ef42..77a2ce25 100644 Binary files a/Test/bin/Debug/DataService.pdb and b/Test/bin/Debug/DataService.pdb differ diff --git a/Test/bin/Debug/RuralPower.dll b/Test/bin/Debug/RuralPower.dll index 607b3ae4..c141badb 100644 Binary files a/Test/bin/Debug/RuralPower.dll and b/Test/bin/Debug/RuralPower.dll differ diff --git a/Test/bin/Debug/RuralPower.pdb b/Test/bin/Debug/RuralPower.pdb index ba968f49..6512ca0b 100644 Binary files a/Test/bin/Debug/RuralPower.pdb and b/Test/bin/Debug/RuralPower.pdb differ diff --git a/Test/bin/Debug/Test.exe b/Test/bin/Debug/Test.exe index 9e445210..f227958f 100644 Binary files a/Test/bin/Debug/Test.exe and b/Test/bin/Debug/Test.exe differ diff --git a/Test/bin/Debug/Test.pdb b/Test/bin/Debug/Test.pdb index cc8d396b..2a2533e5 100644 Binary files a/Test/bin/Debug/Test.pdb and b/Test/bin/Debug/Test.pdb differ diff --git a/Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f489326a..3351b9fb 100644 Binary files a/Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Test/obj/Debug/Test.csproj.AssemblyReference.cache b/Test/obj/Debug/Test.csproj.AssemblyReference.cache index d902d99f..43f9122f 100644 Binary files a/Test/obj/Debug/Test.csproj.AssemblyReference.cache and b/Test/obj/Debug/Test.csproj.AssemblyReference.cache differ diff --git a/Test/obj/Debug/Test.csproj.CoreCompileInputs.cache b/Test/obj/Debug/Test.csproj.CoreCompileInputs.cache index 701981f3..d9f692b2 100644 --- a/Test/obj/Debug/Test.csproj.CoreCompileInputs.cache +++ b/Test/obj/Debug/Test.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -68ffea9b70775bcd7cf8666a9a194d531d27c259 +96d58f48116c07bc55adb5036638db9328555e7a diff --git a/Test/obj/Debug/Test.csproj.FileListAbsolute.txt b/Test/obj/Debug/Test.csproj.FileListAbsolute.txt index 1af2c791..4ecbdb03 100644 --- a/Test/obj/Debug/Test.csproj.FileListAbsolute.txt +++ b/Test/obj/Debug/Test.csproj.FileListAbsolute.txt @@ -63,3 +63,48 @@ F:\项目\国网江苏农电竞赛后台项目\单机对接平台版本\GuoWangJ F:\项目\国网江苏农电竞赛后台项目\单机对接平台版本\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\bbffb84455914db5a5b7f046001dcf53.jpg F:\项目\国网江苏农电竞赛后台项目\单机对接平台版本\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\ef303b8a22ba445a9fb2ac8b7e142c27.jpg F:\项目\国网江苏农电竞赛后台项目\单机对接平台版本\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\f5170a2eebb74286ac12fc628578df2e.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Json\FaultTree.json +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\09cf8e9e438e433f8f6f4812f42b9d60.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\130325584e444fc99dc0bbe22ed10f54.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\2501023fa4cb4fd69953deddaa68d7bd.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\30f32e8463614c72831d4fc503664cd3.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\3a8ee214bf1c4b4e8341aa53c71e763f.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\494872614e334c8596dfc5f646fc2ff6.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\61391d97c4924e568221a2e5d5f97d95.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\67a9ee9420384ef0bac95d9dbcf63ee1.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\72598d78ecb640b4b97d6e60d72b36e7.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\a238b4cf0e974facaba6c189654ce7f0.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\b3537636ce954bc79e3c61b73d7a76d5.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\b93f0bfabce844fc924e968e70f5f81d.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\bbffb84455914db5a5b7f046001dcf53.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\ef303b8a22ba445a9fb2ac8b7e142c27.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Upload\Cable\2024-04-07\f5170a2eebb74286ac12fc628578df2e.jpg +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Json\exam.json +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Json\exam_fault.json +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Json\exam_operation_ticket.json +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Json\exam_tool.json +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Json\line.json +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Json\platform_area.json +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Json\scene.json +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Json\exam1.json +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Json\exam2.json +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Json\exam3.json +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Test.exe.config +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Test.exe +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Test.pdb +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\RuralPower.dll +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\SGUnitySDK.dll +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\DataService.dll +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Newtonsoft.Json.dll +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\ICSharpCode.SharpZipLib.dll +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\RuralPower.pdb +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\RuralPower.dll.config +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\DataService.pdb +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\DataService.dll.config +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\bin\Debug\Newtonsoft.Json.xml +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\obj\Debug\Test.csproj.AssemblyReference.cache +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\obj\Debug\Test.csproj.SuggestedBindingRedirects.cache +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\obj\Debug\Test.csproj.CoreCompileInputs.cache +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\obj\Debug\Test.csproj.CopyComplete +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\obj\Debug\Test.exe +F:\项目\国网江苏农电竞赛后台项目\GuoWangJingSai-Server\GuoWangJingSai-Server\Test\obj\Debug\Test.pdb diff --git a/Test/obj/Debug/Test.exe b/Test/obj/Debug/Test.exe index 9e445210..f227958f 100644 Binary files a/Test/obj/Debug/Test.exe and b/Test/obj/Debug/Test.exe differ diff --git a/Test/obj/Debug/Test.pdb b/Test/obj/Debug/Test.pdb index cc8d396b..2a2533e5 100644 Binary files a/Test/obj/Debug/Test.pdb and b/Test/obj/Debug/Test.pdb differ