From 9e0ea7679740059f28bb9d1d56f0279d278a83f3 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Mon, 30 Sep 2024 15:11:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A9=E8=BE=9B=E8=87=AA=E5=8A=A8=E5=8C=96?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/autoweb/GetBasicData.java | 321 ++++++++++++++---- .../com/bonus/autoweb/ui/frame/Jframe.java | 3 - 2 files changed, 247 insertions(+), 77 deletions(-) diff --git a/src/main/java/com/bonus/autoweb/GetBasicData.java b/src/main/java/com/bonus/autoweb/GetBasicData.java index bf22fc1..0a7de8b 100644 --- a/src/main/java/com/bonus/autoweb/GetBasicData.java +++ b/src/main/java/com/bonus/autoweb/GetBasicData.java @@ -70,9 +70,56 @@ public class GetBasicData { */ public static void getYuJingActionBasicData(int classes) throws ParseException, InterruptedException { Thread.sleep(5000); +// webDriver.findElement(By.xpath("//*[@id=\"app\"]/section/header/form/div/div[2]/button[1]")).click(); +// Thread.sleep(300); +// String date1 = DateTimeUtils.getLastDayYYYYMMDD() + " 00:00"; +// String date2 = DateTimeUtils.getLastDayYYYYMMDD() + " 23:59"; +// if (classes == 2) { +// date1 = DateTimeUtils.getCurrentDay() + " 00:00"; +// date2 = DateTimeUtils.getCurrentDay() + " 23:59"; +// } +// webDriver.findElement(By.xpath("//*[@id=\"app\"]/section/header/form/div/div[1]/div[3]/div[1]/div/div/div/input[1]")).sendKeys(date1); +// Thread.sleep(300); +// webDriver.findElement(By.xpath("//*[@id=\"app\"]/section/header/form/div/div[1]/div[3]/div[1]/div/div/div/input[2]")).sendKeys(date2); +// Thread.sleep(300); +// webDriver.findElement(By.xpath("//*[@id=\"app\"]/section/header/form/div/div[2]/button[2]")).click(); +// Thread.sleep(1000); +// WebElement numEle = webDriver.findElement(By.xpath("//*[@id=\"tab-已完工\"]/div/span")); DailyBean dailyBean = readDailyBean("morning_daily"); DailyBean dailyBean2 = readDailyBean("evening_daily"); LogBean logBean = readDutyBean(); +// if (!"0".equals(numEle.getText())) { +// int num = parseInt(numEle.getText()); +// if (num > 10) { +// num = 10; +// } +// webDriver.findElement(By.xpath("//*[@id=\"tab-已完工\"]")).click(); +// Thread.sleep(2000); +// String[] strings = new String[num]; +// for (int i = 1; i <= num; i++) { +// WebElement companyElem = webDriver.findElement(By.xpath("//*[@id=\"app\"]/section/main/main/div/div[3]/table/tbody/tr[" + i + "]/td[5]/div/div")); +// String name = getDailyName(companyElem.getText()); +// strings[i - 1] = name; +// } +// Map countMap = new HashMap<>(); +// for (String str : strings) { +// if (countMap.containsKey(str)) { +// countMap.put(str, countMap.get(str) + 1); +// } else { +// countMap.put(str, 1); +// } +// } +// String codeYuJing = "(8)针对预警,公司各单位开展预警响应,对线路、变电站进行特巡,共计开展特巡" + numEle.getText() + "次，"; +// if (num > 0) { +// codeYuJing += "其中:"; +// for (Map.Entry entry : countMap.entrySet()) { +// codeYuJing += entry.getKey() + "公司特巡" + entry.getValue() + "次，"; +// } +// } +// dailyBean.setPersonnel_daily_work(dailyBean.getPersonnel_daily_work() + codeYuJing); +// dailyBean2.setPersonnel_daily_work(dailyBean.getPersonnel_daily_work() + codeYuJing); +// logBean.setGeneral_chronicles_content(logBean.getGeneral_chronicles_content() + codeYuJing); +// } String month = DateTimeUtils.getCurrentDay().substring(5, 7); if ("11".equals(month) || "12".equals(month) || "01".equals(month) || "02".equals(month) || "03".equals(month)) { dailyBean.getTenBean().setUhv("0"); @@ -309,16 +356,16 @@ public class GetBasicData { //一、总体情况 dailyBean.setOverall(data + dailyContentArrayArray[2].trim()); - dailyBean.setWarningCompany(code + dailyContentArrayArray[18]); + dailyBean.setWarning_company(code + dailyContentArrayArray[18]); } else { data = data2 + "07:00至" + data2 + "18:00，"; dailyBean2.setOverall(data + dailyContentArrayArray[2].trim()); - dailyBean2.setWarningCompany(code + dailyContentArrayArray[18]); + dailyBean2.setWarning_company(code + dailyContentArrayArray[18]); } - logBean.setWarningDisposalTitle("利辛县未发布预警,".equals(code) ? "今日预警情况" : "预警一项"); - logBean.setWarningDisposalContent(logData + code + logContentArrayArray[20]); + logBean.setWarning_disposal_title("利辛县未发布预警,".equals(code) ? "今日预警情况" : "预警一项"); + logBean.setWarning_disposal_content(logData + code + logContentArrayArray[20]); insertData(null, logBean, "log"); log.info("天气预警日志更新完成"); @@ -341,12 +388,16 @@ public class GetBasicData { String[] logContentArrayArray = logContent.split("--头部不可修改--"); String[] checkContentArrayArray = checkContent.split("资源核查情况："); String[] videoContentArrayArray = videoContent.split("--头部不可修改--"); +// log.info("读取本地模板数据成功"); //昨天的日期 String data1 = DateTimeUtils.getLastDay(); +// log.info("昨天的日期：" + data1); //今天的日期 String data2 = DateTimeUtils.getCurrentDay2(); +// log.info("今天的日期：" + data2); //明天的日期 String data3 = DateTimeUtils.getTomorrowDate(); +// log.info("明天的日期：" + data2); //日志时间 String logData = data2 + "08:15至" + data3 + "8:15，"; /** @@ -370,6 +421,124 @@ public class GetBasicData { } else { time = DateTimeUtils.getCurrentDay(); } + +// webDriver.findElement(By.xpath("/html/body/div/div/header/form/div[4]/div/button[1]")).click(); +// Thread.sleep(800); +// webDriver.findElement(By.xpath("/html/body/div[1]/div/header/form/div[6]/div/div/input[1]")).sendKeys(DateTimeUtils.getCurrentDay()); +// Thread.sleep(800); +// webDriver.findElement(By.xpath("/html/body/div[1]/div/header/form/div[6]/div/div/input[2]")).sendKeys(DateTimeUtils.getCurrentDay()); +// Thread.sleep(800); +// webDriver.findElement(By.xpath("/html/body/div[1]/div/header/form/div[8]/div/button[2]")).click(); +// Thread.sleep(2000); +// int i = 1; +// while (tf) { +// Thread.sleep(10000); +// WebElement numberEle = webDriver.findElement(By.xpath("/html/body/div[1]/div/main/div/div/footer/span")); +// log.info("numberEle:" + numberEle.getText()); +//// String num = numberEle.getText().substring(2, 3); +// String num1 = numberEle.getText().substring(2, numberEle.getText().length()); +// String num = num1.substring(0, num1.length() - 2); +// log.info("num:" + num); +// if ("0".equals(num)) { +// tf = false; +// } else { +// WebElement timeEle; +//// if ("1".equals(num)) { +//// timeEle = webDriver.findElement(By.xpath("/html/body/div/div/main/div/div/div[2]/div/div[3]/table/tbody/tr/td[8]/div")); +//// } else { +// timeEle = webDriver.findElement(By.xpath("/html/body/div[1]/div/main/div/div/div[2]/div/div[3" + +// "]/table/tbody/tr[" + i + "]/td[8]/div")); +//// } +// +// System.out.println(timeEle.getText()); +// if (time.equals(timeEle.getText())) { +// //操练环节 -通信测试 日常操练 +// WebElement drillSessionEle; +//// if ("1".equals(num)) { +//// drillSessionEle = webDriver.findElement(By.xpath("/html/body/div/div/main/div/div/div[2]/div/div[3]/table/tbody/tr/td[6]/div")); +//// } else { +// drillSessionEle = webDriver.findElement(By.xpath("/html/body/div[1]/div/main/div/div/div[2" + +// "]/div/div[3]/table/tbody/tr[" + i + "]/td[6]/div")); +//// } +// log.info("操练环节:" + drillSessionEle.getText()); +// //供电公司 +// WebElement powerSupplyCompaniesEle; +//// if ("1".equals(num)) { +//// powerSupplyCompaniesEle = webDriver.findElement(By.xpath("/html/body/div/div/main/div/div/div[2]/div/div[3]/table/tbody/tr/td[5]/div")); +//// } else { +// powerSupplyCompaniesEle = webDriver.findElement(By.xpath("/html/body/div[1]/div/main/div/div" + +// "/div[2]/div/div[3]/table/tbody/tr[" + i + "]/td[5]/div")); +//// } +// log.info("供电公司:" + powerSupplyCompaniesEle.getText()); +// if ("通信测试".equals(drillSessionEle.getText())) { +// communicationTestNum++; +// communicationTestName1 += getDailyName(powerSupplyCompaniesEle.getText()) + "、"; +// } else if ("重要站线视频连线检查".equals(drillSessionEle.getText())) { +// dailyExercisesNum++; +//// dailyExercisesName1 += powerSupplyCompaniesEle.getText().substring(0, powerSupplyCompaniesEle.getText().length() - 4) + "、"; +// dailyExercisesName1 += getDailyName(powerSupplyCompaniesEle.getText()) + "、"; +// } else { +// dailyExercisesNum++; +//// dailyExercisesName2 += powerSupplyCompaniesEle.getText().substring(0, powerSupplyCompaniesEle.getText().length() - 4) + "、"; +// WebElement ele = webDriver.findElement(By.xpath("/html/body/div[1]/div/main/div/div/div[2" + +// "]/div/div[3]/table/tbody/tr[" + i + "]/td[7]/div")); +// if ("物资".equals(ele.getText())) +// materialName += getDailyName(powerSupplyCompaniesEle.getText()) + "、"; +// if ("车辆".equals(ele.getText())) +// carName += getDailyName(powerSupplyCompaniesEle.getText()) + "、"; +// if ("队伍".equals(ele.getText())) +// contingentName += getDailyName(powerSupplyCompaniesEle.getText()) + "、"; +// dailyExercisesName2 += getDailyName(powerSupplyCompaniesEle.getText()) + "、"; +// } +// int x = parseInt(num); +// if (i == parseInt(num)) { +// tf = false; +// } +// i++; +// } else { +// tf = false; +// } +// } +// } +// log.info("communicationTestName1:" + communicationTestName1); +// if (communicationTestNum > 0) { +// communicationTestName = "今日市公司本部对所属" + communicationTestNum + "家县公司（" + communicationTestName1.substring(0, communicationTestName1.length() - 1) + "）进行通信测试"; +// } else { +// communicationTestName = "今日市公司本部对所属县公司无通信测试"; +// } +// if (dailyExercisesName1.length() > 0) { +// dailyExercisesName1 = dailyExercisesName1.substring(0, dailyExercisesName1.length() - 1); +// } +// if (dailyExercisesName2.length() > 0) { +// dailyExercisesName2 = dailyExercisesName2.substring(0, dailyExercisesName2.length() - 1); +// } +// String fourElementVerification = ""; +// if (materialName.length() > 0) { +// materialName = materialName.substring(0, materialName.length() - 1); +// fourElementVerification += materialName + "公司四要素物资核查、"; +// } +// if (carName.length() > 0) { +// carName = carName.substring(0, carName.length() - 1); +// fourElementVerification += carName + "公司四要素车辆核查、"; +// } +// if (contingentName.length() > 0) { +// contingentName = contingentName.substring(0, contingentName.length() - 1); +// fourElementVerification += contingentName + "公司四要素队伍核查、"; +// } +// if (dailyExercisesName1.length() > 0 && dailyExercisesName2.length() > 0) { +// dailyExercisesName = "今日市公司本部对所属" + dailyExercisesNum + "家县公司进行日常操练（" + fourElementVerification + dailyExercisesName1 + "公司重要站连线检查）"; +// } else if (dailyExercisesName1.length() == 0 && dailyExercisesName2.length() > 0) { +// dailyExercisesName = "今日市公司本部对所属" + dailyExercisesNum + "家县公司进行日常操练（" + fourElementVerification + "）"; +// } else if (dailyExercisesName1.length() > 0 && fourElementVerification.length() == 0) { +// dailyExercisesName = "今日市公司本部对所属" + dailyExercisesNum + "家县公司进行日常操练（" + dailyExercisesName1 + "公司重要站连线检查）"; +// } else { +// dailyExercisesName = "今日市公司本部对所属" + dailyExercisesNum + "家县公司进行日常操练"; +// } +//// dailyExercisesName = "今日市公司本部对所属" + 0 + "家县公司进行日常操练"; +// log.info("communicationTestName:" + communicationTestName); +// log.info("dailyExercisesName:" + dailyExercisesName); +// log.info("communicationTestNum:" + communicationTestNum); +// log.info("dailyExercisesNum:" + dailyExercisesNum); String type = ""; Random rand = new Random(); Set generated = new HashSet<>(); @@ -390,53 +559,58 @@ public class GetBasicData { String data = data2 + "18:00至" + data3 + "07:00，"; //二、重要事项 - dailyBean.setImportantMatters(data + dailyContentArrayArray[4].trim()); + dailyBean.setImportant_matters(data + dailyContentArrayArray[4].trim()); //三、安全生产情况 - dailyBean.setSafetyProduction(data + dailyContentArrayArray[6].trim()); + dailyBean.setSafety_production(data + dailyContentArrayArray[6].trim()); //四、值班员日常工作情况 - dailyBean.setPersonnelDailyWork(data + dailyContentArrayArray[8].trim() + "（5）资源核查情况：" + checkContentArrayArray[num].trim() + dailyBean.setPersonnel_daily_work(data + dailyContentArrayArray[8].trim() + "（5）资源核查情况：" + checkContentArrayArray[num].trim() + "（6）检查"+video+"视频显示清晰,无异常情况（7）09：00-11：00,值班人员视频轮询供电所值班情况。"); //五、供电保障情况 //（一）今日重大活动保电情况 - dailyBean.setPowerGuaranteeTodayWork(dailyContentArrayArray[11]); + dailyBean.setPower_guarantee_today_work(dailyContentArrayArray[11]); //（二）明日重大活动保电安排 - dailyBean.setPowerGuaranteeTomorrowWork(dailyContentArrayArray[13]); + dailyBean.setPower_guarantee_tomorrow_work(dailyContentArrayArray[13]); //（三）今日疫情防控应急保电情况 - dailyBean.setPowerGuaranteeTodayPestilence(dailyContentArrayArray[15]); + dailyBean.setPower_guarantee_today_pestilence(dailyContentArrayArray[15]); //六、预警及应急响应情况 //（一）公司预警情况 --另外一个方法使用 //（二）公司应急响应情况 - dailyBean.setWarningCompanyImpatient(data + dailyContentArrayArray[20]); + dailyBean.setWarning_company_impatient(data + dailyContentArrayArray[20]); //（三）社会突发事件救援及处置情况 - dailyBean.setWarningSocietyEmergency(data + dailyContentArrayArray[22]); + dailyBean.setWarning_society_emergency(data + dailyContentArrayArray[22]); //七、其他情况说明 - dailyBean.setOtherSituations(data + dailyContentArrayArray[24]); + dailyBean.setOther_situations(data + dailyContentArrayArray[24]); //附件表一 - dailyBean.getOneBean().setExercisePersonNum(getRandom(1, 50) + ""); - dailyBean.getOneBean().setExerciseVehicleNum(getRandom(1, 20) + ""); - dailyBean.getOneBean().setExercisePowerVehicleNum(getRandom(1, 3) + ""); - dailyBean.getOneBean().setExerciseDynamoNum(getRandom(1, 10) + ""); - dailyBean.getOneBean().setExerciseFindProblems("0"); + dailyBean.getOneBean().setExercise_person_num(getRandom(1, 50) + ""); + dailyBean.getOneBean().setExercise_vehicle_num(getRandom(1, 20) + ""); + dailyBean.getOneBean().setExercise_power_vehicle_num(getRandom(1, 3) + ""); + dailyBean.getOneBean().setExercise_dynamo_num(getRandom(1, 10) + ""); + dailyBean.getOneBean().setExercise_find_problems("0"); insertData(dailyBean, null, type); +// log.info("日报数据更新完成"); //事件监测内容 - logBean.setEventDetectionContent(logData + logContentArrayArray[3].trim()); - logBean.setEventDetectionTitle(logContentArrayArray[2].trim()); - logBean.setPowerWorkTitle(logContentArrayArray[5]); - logBean.setPowerWorkContent(logData + logContentArrayArray[6]); - logBean.setResourceCheckTitle(logContentArrayArray[8]); - logBean.setResourceCheckContent(logData + checkContentArrayArray[num]); - logBean.setCommunicationsTestTitle(logContentArrayArray[10]); - logBean.setCommunicationsTestContent(logContentArrayArray[11]); - logBean.setDailyOperationTitle(logContentArrayArray[13]); - logBean.setDailyOperationContent(logContentArrayArray[14]); - logBean.setDailySubmissionTitle(logContentArrayArray[16]); - logBean.setDailySubmissionContent(logData + logContentArrayArray[17]); - logBean.setGeneralChroniclesTitle(logContentArrayArray[22]); - logBean.setGeneralChroniclesContent(logContentArrayArray[23]); + logBean.setEvent_detection_content(logData + logContentArrayArray[3].trim()); + logBean.setEvent_detection_title(logContentArrayArray[2].trim()); +// logBean.setEvent_detection_content(data + logContentArrayArray[3].trim() + data2 + logContentArrayArray[4].trim()); + logBean.setPower_work_title(logContentArrayArray[5]); + logBean.setPower_work_content(logData + logContentArrayArray[6]); + logBean.setResource_check_title(logContentArrayArray[8]); + logBean.setResource_check_content(logData + checkContentArrayArray[num]); + logBean.setCommunications_test_title(logContentArrayArray[10]); + logBean.setCommunications_test_content(logContentArrayArray[11]); + logBean.setDaily_operation_title(logContentArrayArray[13]); + logBean.setDaily_operation_content(logContentArrayArray[14]); + logBean.setDaily_submission_title(logContentArrayArray[16]); + logBean.setDaily_submission_content(logData + logContentArrayArray[17]); + logBean.setGeneral_chronicles_title(logContentArrayArray[22]); + logBean.setGeneral_chronicles_content(logContentArrayArray[23]); insertData(null, logBean, "log"); +// log.info("日志数据更新完成"); +// log.info("日报数据：" + dailyBean); +// log.info("日志数据：" + logBean); } else { type = "evening_daily"; //晚报 @@ -446,52 +620,54 @@ public class GetBasicData { //一、总体情况 // dailyBean2.setOverall(data + dailyContentArrayArray[2].trim() + data2 + "17：30，" + dailyContentArrayArray[3].trim()); //二、重要事项 - dailyBean2.setImportantMatters(data + dailyContentArrayArray[4].trim()); + dailyBean2.setImportant_matters(data + dailyContentArrayArray[4].trim()); //三、安全生产情况 - dailyBean2.setSafetyProduction(data + dailyContentArrayArray[6].trim()); + dailyBean2.setSafety_production(data + dailyContentArrayArray[6].trim()); //四、值班员日常工作情况 - dailyBean2.setPersonnelDailyWork(data + dailyContentArrayArray[8].trim() + "（5）资源核查情况：" + checkContentArrayArray[num].trim() + dailyBean2.setPersonnel_daily_work(data + dailyContentArrayArray[8].trim() + "（5）资源核查情况：" + checkContentArrayArray[num].trim() + "（6）检查"+video+"视频显示清晰,无异常情况（7）09：00-11：00,值班人员视频轮询供电所值班情况。"); //五、供电保障情况 //（一）今日重大活动保电情况 - dailyBean2.setPowerGuaranteeTodayWork(dailyContentArrayArray[11]); + dailyBean2.setPower_guarantee_today_work(dailyContentArrayArray[11]); //（二）明日重大活动保电安排 - dailyBean2.setPowerGuaranteeTomorrowWork(dailyContentArrayArray[13]); + dailyBean2.setPower_guarantee_tomorrow_work(dailyContentArrayArray[13]); //（三）今日疫情防控应急保电情况 - dailyBean2.setPowerGuaranteeTodayPestilence(dailyContentArrayArray[15]); + dailyBean2.setPower_guarantee_today_pestilence(dailyContentArrayArray[15]); //六、预警及应急响应情况 //（一）公司预警情况 --另外一个方法使用 //（二）公司应急响应情况 - dailyBean2.setWarningCompanyImpatient(data + dailyContentArrayArray[20]); + dailyBean2.setWarning_company_impatient(data + dailyContentArrayArray[20]); //（三）社会突发事件救援及处置情况 - dailyBean2.setWarningSocietyEmergency(data + dailyContentArrayArray[22]); + dailyBean2.setWarning_society_emergency(data + dailyContentArrayArray[22]); //七、其他情况说明 - dailyBean2.setOtherSituations(data + dailyContentArrayArray[24]); + dailyBean2.setOther_situations(data + dailyContentArrayArray[24]); //附件表一 - dailyBean2.getOneBean().setExercisePersonNum(getRandom(1, 50) + ""); - dailyBean2.getOneBean().setExerciseVehicleNum(getRandom(1, 20) + ""); - dailyBean2.getOneBean().setExercisePowerVehicleNum(getRandom(1, 3) + ""); - dailyBean2.getOneBean().setExerciseDynamoNum(getRandom(1, 10) + ""); - dailyBean2.getOneBean().setExerciseFindProblems("0"); + dailyBean2.getOneBean().setExercise_person_num(getRandom(1, 50) + ""); + dailyBean2.getOneBean().setExercise_vehicle_num(getRandom(1, 20) + ""); + dailyBean2.getOneBean().setExercise_power_vehicle_num(getRandom(1, 3) + ""); + dailyBean2.getOneBean().setExercise_dynamo_num(getRandom(1, 10) + ""); + dailyBean2.getOneBean().setExercise_find_problems("0"); insertData(dailyBean2, null, type); - logBean.setEventDetectionTitle(logContentArrayArray[2].trim()); +// log.info("日报数据更新完成"); + logBean.setEvent_detection_title(logContentArrayArray[2].trim()); //事件监测内容 - logBean.setEventDetectionContent(logData + logContentArrayArray[3].trim()); - logBean.setPowerWorkTitle(logContentArrayArray[5]); - logBean.setPowerWorkContent(logData + logContentArrayArray[6]); - logBean.setResourceCheckTitle(logContentArrayArray[8]); - logBean.setResourceCheckContent(logData + checkContentArrayArray[num]); - logBean.setCommunicationsTestTitle(logContentArrayArray[10]); - logBean.setCommunicationsTestContent(logContentArrayArray[11]); - logBean.setDailyOperationTitle(logContentArrayArray[13]); - logBean.setDailyOperationContent(logContentArrayArray[14]); - logBean.setDailySubmissionTitle(logContentArrayArray[16]); - logBean.setDailySubmissionContent(logData + logContentArrayArray[17]); - logBean.setGeneralChroniclesTitle(logContentArrayArray[22]); - logBean.setGeneralChroniclesContent(logContentArrayArray[23]); + logBean.setEvent_detection_content(logData + logContentArrayArray[3].trim()); +// logBean.setEvent_detection_content(data + logContentArrayArray[3].trim() + data2 + logContentArrayArray[4].trim()); + logBean.setPower_work_title(logContentArrayArray[5]); + logBean.setPower_work_content(logData + logContentArrayArray[6]); + logBean.setResource_check_title(logContentArrayArray[8]); + logBean.setResource_check_content(logData + checkContentArrayArray[num]); + logBean.setCommunications_test_title(logContentArrayArray[10]); + logBean.setCommunications_test_content(logContentArrayArray[11]); + logBean.setDaily_operation_title(logContentArrayArray[13]); + logBean.setDaily_operation_content(logContentArrayArray[14]); + logBean.setDaily_submission_title(logContentArrayArray[16]); + logBean.setDaily_submission_content(logData + logContentArrayArray[17]); + logBean.setGeneral_chronicles_title(logContentArrayArray[22]); + logBean.setGeneral_chronicles_content(logContentArrayArray[23]); insertData(null, logBean, "log"); } } @@ -505,7 +681,7 @@ public class GetBasicData { public static DailyBean readDailyBean(String type) { DailyBean bean; XStream xstream = new XStream(new JettisonMappedXmlDriver()); - String path = DataConfig.FILE_PATH + "\\" + type + ".xml"; + String path = DataConfig.filePath + "\\" + type + ".xml"; File file = new File(path); InputStreamReader in = null; String xml = null; @@ -536,7 +712,7 @@ public class GetBasicData { public static LogBean readDutyBean() { LogBean bean; XStream xstream = new XStream(new JettisonMappedXmlDriver()); - File file = new File(DataConfig.FILE_PATH + "\\log.xml"); + File file = new File(DataConfig.filePath + "\\log.xml"); InputStreamReader in = null; String xml = null; try { @@ -560,7 +736,7 @@ public class GetBasicData { private static void insertData(DailyBean dailyBean, LogBean logBean, String type) { - String path = DataConfig.FILE_PATH + "\\" + type + ".xml"; + String path = DataConfig.filePath + "\\" + type + ".xml"; String xml = null; XStream xstream = new XStream(new JettisonMappedXmlDriver()); xstream.setMode(XStream.NO_REFERENCES); @@ -602,9 +778,6 @@ public class GetBasicData { case "涡阳县供电公司": name = "涡阳"; break; - default: - name = text; - break; } return name; } @@ -1009,21 +1182,21 @@ public class GetBasicData { webDriver.findElement(By.xpath("/html/body/div[3]/div/div[2]/section/header/form/div/div[5]/div/div[2]")).click(); Thread.sleep(3000); if("通信测试".equals(type)){ - webDriver.findElement(By.xpath("/html/body/div[7]/div/div[2]/section/section/main/div/div[3]/table/tbody" + - "/tr[1]")).click(); + webDriver.findElement(By.xpath("/html/body/div[7]/div/div[2]/section/main/div[1]/div[3]/table/tbody/tr[1]/td[1]/div/label")).click(); Thread.sleep(500); - webDriver.findElement(By.xpath("/html/body/div[7]/div/div[2]/section/section/main/div/div[3]/table/tbody" + - "/tr[2]")).click(); + webDriver.findElement(By.xpath("/html/body/div[7]/div/div[2]/section/main/div[1]/div[3]/table/tbody/tr[2" + + "]/td[1]/div/label")).click(); Thread.sleep(1000); + webDriver.findElement(By.xpath("/html/body/div[7]/div/div[2]/section/footer/button[2]")).click(); }else { for (int i = 1; i < 3; i++) { - webDriver.findElement(By.xpath("/html/body/div[7]/div/div[2]/section/section/main/div/div[3]/table" + - "/tbody/tr["+i+"]")).click(); + webDriver.findElement(By.xpath("/html/body/div[7]/div/div[2]/section/main/div[1]/div[3]/table" + + "/tbody/tr["+i+"]/td[1]/div/label")).click(); Thread.sleep(1000); } + Thread.sleep(3000); + webDriver.findElement(By.xpath("/html/body/div[7]/div/div[2]/section/footer[2]/button[2]")).click(); } - Thread.sleep(3000); - webDriver.findElement(By.xpath("/html/body/div[7]/div/div[2]/section/footer/button[2]")).click(); Thread.sleep(2000); //提交 webDriver.findElement(By.xpath("/html/body/div[2]/div/div[2]/section/div/button[3]")).click(); diff --git a/src/main/java/com/bonus/autoweb/ui/frame/Jframe.java b/src/main/java/com/bonus/autoweb/ui/frame/Jframe.java index 984e55e..7cfb9ac 100644 --- a/src/main/java/com/bonus/autoweb/ui/frame/Jframe.java +++ b/src/main/java/com/bonus/autoweb/ui/frame/Jframe.java @@ -6,9 +6,6 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -/** - * @author Lenovo - */ public class Jframe extends JFrame { private JPanel contentPane;