From de9658eaaf60f7b8dbe12dd66e9420b7831dbb38 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Mon, 30 Sep 2024 15:11:29 +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 --- .../com/bonus/autoweb/base/DataConfig.java | 9 +- .../bonus/autoweb/base/DutyChangeShifts.java | 20 +- .../com/bonus/autoweb/base/DutyClock.java | 12 +- .../bonus/autoweb/base/DutyDailyCheck.java | 10 +- .../com/bonus/autoweb/base/DutyDailyOp.java | 268 +++++++++++------- 5 files changed, 204 insertions(+), 115 deletions(-) diff --git a/src/main/java/com/bonus/autoweb/base/DataConfig.java b/src/main/java/com/bonus/autoweb/base/DataConfig.java index 0994680..2125da5 100644 --- a/src/main/java/com/bonus/autoweb/base/DataConfig.java +++ b/src/main/java/com/bonus/autoweb/base/DataConfig.java @@ -1,8 +1,5 @@ package com.bonus.autoweb.base; -/** - * @author Lenovo - */ public class DataConfig { /** * url 网站地址 @@ -55,9 +52,11 @@ public class DataConfig { /** * 浏览器驱动地址 */ - protected static final String DRIVE_PATH = "E:\\bns\\chromedriver_win32\\chromedriver.exe"; +// protected static final String drivePath = "E:\\bns\\chromedriver_win32\\geckodriver.exe";//个人本地 +// protected static final String drivePath = "E:\\chromedriver_win32\\chromedriver.exe";//个人本地 + protected static final String drivePath = "E:\\bns\\chromedriver_win32\\chromedriver.exe";//宿州客户地址 - public static final String FILE_PATH = "E:\\bns\\config"; + public static final String filePath = "E:\\bns\\config"; } diff --git a/src/main/java/com/bonus/autoweb/base/DutyChangeShifts.java b/src/main/java/com/bonus/autoweb/base/DutyChangeShifts.java index ba37e41..846d93d 100644 --- a/src/main/java/com/bonus/autoweb/base/DutyChangeShifts.java +++ b/src/main/java/com/bonus/autoweb/base/DutyChangeShifts.java @@ -11,8 +11,8 @@ import org.slf4j.Logger; * 操作交接班 */ public class DutyChangeShifts { - private final Logger log = LoggerFactory.getLogger(DutyChangeShifts.class); - private final WebDriver webDriver; + private Logger log = LoggerFactory.getLogger(DutyChangeShifts.class); + private WebDriver webDriver; public DutyChangeShifts(WebDriver webDriver) { this.webDriver = webDriver; @@ -36,6 +36,12 @@ public class DutyChangeShifts { * @param type 交班类型 1 交班 2接班 */ public void dutychangeOper(int classes, int type) throws InterruptedException { +// JavascriptExecutor jsExecutor = (JavascriptExecutor) webDriver; +// boolean pageLoaded = false; +// +// do { +// pageLoaded = (Boolean) jsExecutor.executeScript("return document.readyState").equals("complete"); +// } while (!pageLoaded); Thread.sleep(5000); //标签位置 String xpaht; @@ -70,11 +76,16 @@ public class DutyChangeShifts { //提交 webDriver.findElement(By.xpath("/html/body/div[3]/div/div[3]/div/button[2]")).click(); + //取消 +// webDriver.findElement(By.xpath("/html/body/div[3]/div/div[3]/div/button[1]")).click(); + log.info("交班提交----------"); Thread.sleep(300); }else{ //提交 webDriver.findElement(By.xpath("/html/body/div[3]/div/div[3]/div/button[2]")).click(); +// 取消 +// webDriver.findElement(By.xpath("/html/body/div[3]/div/div[3]/div/button[1]")).click(); log.info("接班提交----------"); Thread.sleep(300); } @@ -137,6 +148,11 @@ public class DutyChangeShifts { tr = DateTimeUtils.getWeekNum(mothDay); td = DateTimeUtils.getWeekOfDate(mothDay); xpath = "//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[2]/table/tbody/tr[" + tr + "]" + "/td[" + td + "]"; +// String dayNum = mothDay.substring(8, 10); +// WebElement spanElement = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[2]/table/tbody/tr[" + tr + "]" + "/td[" + td + "]/div/div/div[1]/span")); +// if (dayNum.equals(spanElement.getText())) { +// xpath = "//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[2]/table/tbody/tr[" + (tr + 1) + "]" + "/td[" + td + "]/div"; +// } } log.info("前一天的地址："+xpath); //选择前一天的日期 diff --git a/src/main/java/com/bonus/autoweb/base/DutyClock.java b/src/main/java/com/bonus/autoweb/base/DutyClock.java index d24beed..07b05cf 100644 --- a/src/main/java/com/bonus/autoweb/base/DutyClock.java +++ b/src/main/java/com/bonus/autoweb/base/DutyClock.java @@ -10,7 +10,6 @@ import org.slf4j.Logger; /** * 值班打卡 - * @author Lenovo */ public class DutyClock { private Logger log = LoggerFactory.getLogger(DutyClock.class); @@ -39,6 +38,12 @@ public class DutyClock { */ public void dutyClockOper(int classes, int type) throws InterruptedException { openDutyClock(); +// JavascriptExecutor jsExecutor = (JavascriptExecutor) webDriver; +// boolean pageLoaded = false; +// +// do { +// pageLoaded = (Boolean) jsExecutor.executeScript("return document.readyState").equals("complete"); +// } while (!pageLoaded); Thread.sleep(5000); //标签位置 String xpaht; @@ -125,6 +130,11 @@ public class DutyClock { td = DateTimeUtils.getWeekOfDate(mothDay); xpath = "//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[2]/table/tbody/tr[" + tr + "]" + "/td[" + td + "]"; +// String dayNum = mothDay.substring(8, 10); +// WebElement spanElement = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[2]/table/tbody/tr[" + tr + "]" + "/td[" + td + "]/div/div/div[1]/span")); +// if (dayNum.equals(spanElement.getText())) { +// xpath = "//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[2]/table/tbody/tr[" + (tr + 1) + "]" + "/td[" + td + "]/div"; +// } } //选择前一天的日期 webDriver.findElement(By.xpath(xpath)).click(); diff --git a/src/main/java/com/bonus/autoweb/base/DutyDailyCheck.java b/src/main/java/com/bonus/autoweb/base/DutyDailyCheck.java index c369061..7982cb9 100644 --- a/src/main/java/com/bonus/autoweb/base/DutyDailyCheck.java +++ b/src/main/java/com/bonus/autoweb/base/DutyDailyCheck.java @@ -9,7 +9,6 @@ import org.slf4j.Logger; /** * 日报审核工作 - * @author Lenovo */ public class DutyDailyCheck { private Logger log = LoggerFactory.getLogger(DutyDailyCheck.class); @@ -24,6 +23,12 @@ public class DutyDailyCheck { * @param type 1早报 2晚报 */ public void dutyCheckOp(int type) throws Exception { +// JavascriptExecutor jsExecutor = (JavascriptExecutor) webDriver; +// boolean pageLoaded = false; +// +// do { +// pageLoaded = (Boolean) jsExecutor.executeScript("return document.readyState").equals("complete"); +// } while (!pageLoaded); Thread.sleep(10000); //定位值班日报并点击 webDriver.findElement(By.id("tab-4")).click(); @@ -41,6 +46,8 @@ public class DutyDailyCheck { log.info("日报审核类型："+type+",地址："+checkXpath+"--------"); WebElement checkBtn=webDriver.findElement(By.xpath(checkXpath)); +// JavascriptExecutor js =(JavascriptExecutor)webDriver; +// js.executeScript("arguments[0].setAttribute(arguments[1],arguments[2])",checkBtn,"style","color:rgb(0,145,255)"); log.info("审核按钮：",checkBtn.getText()); Thread.sleep(1000*3); @@ -69,6 +76,7 @@ public class DutyDailyCheck { log.info("同意审核按钮："+tyCheckBtn.getAttribute("type")); log.info("同意审核按钮："+tyCheckBtn.getText()); tyCheckBtn.click(); +// webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[19]/button[1]")).click(); }else{ log.info("同意审核按钮不存在-----------"); diff --git a/src/main/java/com/bonus/autoweb/base/DutyDailyOp.java b/src/main/java/com/bonus/autoweb/base/DutyDailyOp.java index 85ce5c3..d04d9e6 100644 --- a/src/main/java/com/bonus/autoweb/base/DutyDailyOp.java +++ b/src/main/java/com/bonus/autoweb/base/DutyDailyOp.java @@ -18,7 +18,6 @@ import java.util.List; /** * 日志填报工作类 - * @author Lenovo */ public class DutyDailyOp { private Logger log = LoggerFactory.getLogger(DutyDailyOp.class); @@ -34,6 +33,13 @@ public class DutyDailyOp { * @param type 1 早报 2晚报 */ public void openDutyDaily(int type) throws InterruptedException { + // 使用JavaScriptExecutor判断网页加载状态 +// JavascriptExecutor jsExecutor = (JavascriptExecutor) webDriver; +// boolean pageLoaded = false; +// +// do { +// pageLoaded = (Boolean) jsExecutor.executeScript("return document.readyState").equals("complete"); +// } while (!pageLoaded); Thread.sleep(5000); //定位值班日报并点击 @@ -80,7 +86,7 @@ public class DutyDailyOp { //获取当日日报内容 if (type == 1) { //早报内容 - File file = new File(DataConfig.FILE_PATH + "\\morning_daily.xml"); + File file = new File(DataConfig.filePath + "\\morning_daily.xml"); InputStreamReader in = null; String xml = null; try { @@ -102,7 +108,7 @@ public class DutyDailyOp { bean = (DailyBean) xstream.fromXML(xml); } else { //晚报内容 - File file = new File(DataConfig.FILE_PATH + "\\evening_daily.xml"); + File file = new File(DataConfig.filePath + "\\evening_daily.xml"); InputStreamReader in = null; String xml = null; try { @@ -133,7 +139,7 @@ public class DutyDailyOp { Thread.sleep(1000); //重要事项填写 - String zysx = bean.getImportantMatters(); + String zysx = bean.getImportant_matters(); WebElement zysxEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/form/div[2]/div/div/div/div/div[1]/textarea")); zysxEle.clear(); zysxEle.sendKeys(zysx); @@ -141,7 +147,7 @@ public class DutyDailyOp { Thread.sleep(500); //安全生产情况 - String aqscqk = bean.getSafetyProduction(); + String aqscqk = bean.getSafety_production(); WebElement aqscqkEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/form/div[3]/div/div/div/div/div/textarea")); aqscqkEle.clear(); Thread.sleep(1000); @@ -150,7 +156,7 @@ public class DutyDailyOp { Thread.sleep(1000); //值班员日常工作情况 - String zbyrcgzqk = bean.getPersonnelDailyWork(); + String zbyrcgzqk = bean.getPersonnel_daily_work(); WebElement zbyrcgzqkEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/form/div[4]/div/div/div/div/div[1]/textarea")); zbyrcgzqkEle.clear(); zbyrcgzqkEle.sendKeys(zbyrcgzqk); @@ -158,7 +164,7 @@ public class DutyDailyOp { Thread.sleep(1000); //供电保障情况1 - String gdbzqk1 = bean.getPowerGuaranteeTodayWork(); + String gdbzqk1 = bean.getPower_guarantee_today_work(); //*[@id="app"]/div/section/div/div[4]/div[1]/form/div[5]/div[2]/div/div/div/div/div[1]/textarea WebElement gdbzqk1Ele = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/form/div[5]/div[2]/div/div/div/div/div/textarea")); gdbzqk1Ele.clear(); @@ -167,7 +173,7 @@ public class DutyDailyOp { Thread.sleep(1000); //供电保障情况2 - String gdbzqk2 = bean.getPowerGuaranteeTomorrowWork(); + String gdbzqk2 = bean.getPower_guarantee_tomorrow_work(); WebElement gdbzqk2Ele = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/form/div[5]/div[3]/div/div/div/div/div/textarea")); gdbzqk2Ele.clear(); gdbzqk2Ele.sendKeys(gdbzqk2); @@ -176,7 +182,7 @@ public class DutyDailyOp { try { //供电保障情况3 - String gdbzqk3 = bean.getPowerGuaranteeTodayPestilence(); + String gdbzqk3 = bean.getPower_guarantee_today_pestilence(); WebElement gdbzqk3Ele = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/form" + "/div[5]/div[4]/div/div/div/div/div[1]/textarea")); gdbzqk3Ele.clear(); @@ -188,7 +194,7 @@ public class DutyDailyOp { } //预警及应急响应情况1 - String yjjyjxy1 = bean.getWarningCompany(); + String yjjyjxy1 = bean.getWarning_company(); WebElement yjjyjxy1Ele = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/form/div[6]/div[2]/div/div/div/div/div/textarea")); yjjyjxy1Ele.clear(); yjjyjxy1Ele.sendKeys(yjjyjxy1); @@ -196,7 +202,7 @@ public class DutyDailyOp { Thread.sleep(1000); //预警及应急响应情况2 - String yjjyjxy2 = bean.getWarningCompanyImpatient(); + String yjjyjxy2 = bean.getWarning_company_impatient(); WebElement yjjyjxy2Ele = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/form/div[6]/div[3]/div/div/div/div/div/textarea")); yjjyjxy2Ele.clear(); yjjyjxy2Ele.sendKeys(yjjyjxy2); @@ -205,7 +211,7 @@ public class DutyDailyOp { //预警及应急响应情况3 - String yjjyjxy3 = bean.getWarningSocietyEmergency(); + String yjjyjxy3 = bean.getWarning_society_emergency(); WebElement yjjyjxy3Ele = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/form/div[6]/div[4]/div/div/div/div/div/textarea")); yjjyjxy3Ele.clear(); yjjyjxy3Ele.sendKeys(yjjyjxy3); @@ -213,7 +219,7 @@ public class DutyDailyOp { Thread.sleep(1000); //其他情况说明 - String qtqksm = bean.getOtherSituations(); + String qtqksm = bean.getOther_situations(); WebElement qtqksmEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/form/div[7]/div/div/div/div/div/div/textarea")); qtqksmEle.clear(); qtqksmEle.sendKeys(qtqksm); @@ -229,6 +235,29 @@ public class DutyDailyOp { * @param obj */ private void dailySchedule1(AnnexOneBean obj, DailyBean bean) throws InterruptedException { + //点击操作内容选择框 + //*[@id="app"]/div/section/div/div[4]/div[1]/div[1]/div[2]/div/div/div[3]/table/tbody/tr/td[3]/div/div/div +// webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[1]/div[2]/div/div/div[3]/table/tbody/tr/td[3]/div/div/div[1]")).click(); +// +// Thread.sleep(300); +// //获取到的操作内容 +// String operaContent = obj.getExercise_content(); +// //操作内容地址 +// String operaxpath = "/html/body/div[4]/div[1]/div[1]/ul/li[1]"; +// +// if ("“四要素”检查".equals(operaContent)) { +// // /html/body/div[2]/div[1]/div[1]/ul/li[1] +// operaxpath = "/html/body/div[2]/div[1]/div[1]/ul/li[1]"; +// } else if ("通信测试".equals(operaContent)) { +// operaxpath = "/html/body/div[2]/div[1]/div[1]/ul/li[2]"; +// } else { +// operaxpath = "/html/body/div[2]/div[1]/div[1]/ul/li[3]"; +// } +// //选择操作内容 +// webDriver.findElement(By.xpath(operaxpath)).click(); +// log.info("选择操作内容----------"); +// Thread.sleep(300); + try { WebElement personNumEle = webDriver.findElement(By.xpath("/html/body/div/div/section/div/div[4]/div[1]/div[1]/div[2]/div/div/div[3]/table/tbody/tr[1]/td[7]/div/div/input")); personNumEle.sendKeys("无问题"); @@ -256,6 +285,28 @@ public class DutyDailyOp { log.info("填写重大战线视频连线检查问题不存在此元素----------"); } Thread.sleep(500); +// //填写发电机数量 +// String fdjNum = obj.getExercise_dynamo_num(); +// WebElement fdjNumEle= webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[1]/div[2]/div/div/div[3]/table/tbody/tr/td[7]/div/div/input")); +// fdjNumEle.clear(); +// fdjNumEle.sendKeys(fdjNum); +// log.info("填写发电机数量----------"); +// Thread.sleep(300); +// +// +// //填写操作发现问题 +// String czfxwt = obj.getExercise_find_problems(); +// WebElement czfxwtEle=webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[1]/div[2]/div/div/div[3]/table/tbody/tr/td[8]/div/div/input")); +// czfxwtEle.clear(); +// czfxwtEle.sendKeys(czfxwt); +// log.info("填写操作发现问题----------"); +// Thread.sleep(300); +// //填写备注 +// String bz = obj.getRemark(); +// WebElement bzEle=webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[1]/div[2]/div/div/div[3]/table/tbody/tr/td[9]/div/div/input")); +// bzEle.clear(); +// bzEle.sendKeys(bz); +// log.info("填写备注----------"); dailySchedule2(bean.getTwoBean(), bean); } @@ -263,7 +314,7 @@ public class DutyDailyOp { //操作附表2 private void dailySchedule2(AnnexTwoBean obj, DailyBean bean) throws InterruptedException { //填写人员数量 - String personNum = obj.getVerificationPersonNum(); + String personNum = obj.getVerification_person_num(); WebElement personNumEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[2]/div[2]/div/div/div[3]/table/tbody/tr/td[3]/div/div/div/input")); personNumEle.clear(); personNumEle.sendKeys(personNum); @@ -271,7 +322,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写队伍数量 - String teamNum = obj.getVerificationTeamNum(); + String teamNum = obj.getVerification_team_num(); WebElement teamNumEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[2]/div[2]/div/div/div[3]/table/tbody/tr/td[4]/div/div/div/input")); teamNumEle.clear(); teamNumEle.sendKeys(teamNum); @@ -280,7 +331,7 @@ public class DutyDailyOp { //填写装备数量 - String zbNum = obj.getVerificationEquipNum(); + String zbNum = obj.getVerification_equip_num(); WebElement zbNumEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[2]/div[2]/div/div/div[3]/table/tbody/tr/td[5]/div/div/div/input")); zbNumEle.clear(); zbNumEle.sendKeys(zbNum); @@ -289,7 +340,7 @@ public class DutyDailyOp { //填写物资数量 - String wzNum = obj.getVerificationMaterialNum(); + String wzNum = obj.getVerification_material_num(); WebElement wzNumEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[2]/div[2]/div/div/div[3]/table/tbody/tr/td[6]/div/div/div/input")); wzNumEle.clear(); wzNumEle.sendKeys(wzNum); @@ -298,7 +349,7 @@ public class DutyDailyOp { //填写车辆数量 - String carNum = obj.getVerificationVehicleNum(); + String carNum = obj.getVerification_vehicle_num(); WebElement carNumEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[2]/div[2]/div/div/div[3]/table/tbody/tr/td[7]/div/div/div/input")); carNumEle.clear(); carNumEle.sendKeys(carNum); @@ -307,7 +358,7 @@ public class DutyDailyOp { //填写核查发现问题 - String hzfxwt = obj.getVerificationFindProblems(); + String hzfxwt = obj.getVerification_find_problems(); WebElement hzfxwtEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[2]/div[2]/div/div/div[3]/table/tbody/tr/td[8]/div/div/input")); hzfxwtEle.clear(); hzfxwtEle.sendKeys(hzfxwt); @@ -765,7 +816,7 @@ public class DutyDailyOp { log.info("附表6没有数据不需要填写"); } else { //填写领导及指挥人员 - String ldjzhry = obj.getLeadersCommandStaff(); + String ldjzhry = obj.getLeaders_command_staff(); WebElement ldjzhryEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1" + "]/div[3]/div/div[2]/div/div/div[3]/table/tbody/tr/td[9]/div/div/input")); @@ -776,7 +827,7 @@ public class DutyDailyOp { //填写人员数量 - String personNum = obj.getInputAmountPerson(); + String personNum = obj.getInput_amount_person(); WebElement ryslEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[3" + "]/div/div[2]/div/div/div[3]/table/tbody/tr/td[10]/div/div/div/input")); ryslEle.clear(); @@ -787,7 +838,7 @@ public class DutyDailyOp { //填写车辆数量 - String carNum = obj.getInputAmountVehicle(); + String carNum = obj.getInput_amount_vehicle(); WebElement clslEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[3" + "]/div/div[2]/div/div/div[3]/table/tbody/tr/td[11]/div/div/div/input")); clslEle.clear(); @@ -798,7 +849,7 @@ public class DutyDailyOp { //填写发电车数量 - String fdcNum = obj.getInputAmountPowerVehicle(); + String fdcNum = obj.getInput_amount_power_vehicle(); WebElement fdcNumEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div" + "[3]/div/div[2]/div/div/div[3]/table/tbody/tr/td[12]/div/div/div/input")); fdcNumEle.clear(); @@ -809,7 +860,7 @@ public class DutyDailyOp { //填写发电机数量 - String fdjNum = obj.getInputAmountDynamo(); + String fdjNum = obj.getInput_amount_dynamo(); WebElement fdjNumEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div" + "[3]/div/div[2]/div/div/div[3]/table/tbody/tr/td[13]/div/div/div/input")); fdjNumEle.clear(); @@ -833,7 +884,7 @@ public class DutyDailyOp { //操作附表7 --- > 变成4 private void dailySchedule7(AnnexSevenBean obj, DailyBean bean) throws InterruptedException { //填写因灾停运-特高压 - String psaou = obj.getPowerSubstationAddOutageUvh(); + String psaou = obj.getPower_substation_add_outage_uvh(); WebElement psaouEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[4]/div/div/div/input")); psaouEle.clear(); @@ -843,7 +894,7 @@ public class DutyDailyOp { //填写因灾停运-500 - String psaof = obj.getPowerSubstationAddOutageFive(); + String psaof = obj.getPower_substation_add_outage_five(); WebElement psaofEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[5]/div/div/div/input")); psaofEle.clear(); @@ -853,7 +904,7 @@ public class DutyDailyOp { //填写因灾停运-300 - String psaot = obj.getPowerSubstationAddOutageTwo(); + String psaot = obj.getPower_substation_add_outage_two(); WebElement psaotEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[6]/div/div/div/input")); psaotEle.clear(); @@ -862,7 +913,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写因灾停运-100 - String psaoo = obj.getPowerSubstationAddOutageOne(); + String psaoo = obj.getPower_substation_add_outage_one(); WebElement psaooEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[7]/div/div/div/input")); psaooEle.clear(); @@ -871,7 +922,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写因灾停运-35 - String psaoth = obj.getPowerSubstationAddOutageThree(); + String psaoth = obj.getPower_substation_add_outage_three(); WebElement psaothEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[8]/div/div/div/input")); psaothEle.clear(); @@ -881,7 +932,7 @@ public class DutyDailyOp { //填写抢修恢复-特高压 - String psaru = obj.getPowerSubstationAddRepairUvh(); + String psaru = obj.getPower_substation_add_repair_uvh(); WebElement psaruEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[9]/div/div/div/input")); psaruEle.clear(); @@ -890,7 +941,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-500 - String psarf = obj.getPowerSubstationAddRepairFive(); + String psarf = obj.getPower_substation_add_repair_five(); WebElement psarfEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[10]/div/div/div/input")); psarfEle.clear(); @@ -899,7 +950,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-220/300 - String psart = obj.getPowerSubstationAddRepairTwo(); + String psart = obj.getPower_substation_add_repair_two(); WebElement psartEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[11]/div/div/div/input")); psartEle.clear(); @@ -908,7 +959,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-100 - String psaro = obj.getPowerSubstationAddRepairOne(); + String psaro = obj.getPower_substation_add_repair_one(); WebElement psaroEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[12]/div/div/div/input")); psaroEle.clear(); @@ -917,7 +968,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-35 - String psarth = obj.getPowerSubstationAddRepairThree(); + String psarth = obj.getPower_substation_add_repair_three(); WebElement psarthEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[13]/div/div/div/input")); psarthEle.clear(); @@ -927,7 +978,7 @@ public class DutyDailyOp { //填写尚未恢复-特高压 - String psanru = obj.getPowerSubstationAddNoRepairUvh(); + String psanru = obj.getPower_substation_add_no_repair_uvh(); WebElement psanruEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[14]/div/div/div/input")); psanruEle.clear(); @@ -936,7 +987,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-500 - String psanrf = obj.getPowerSubstationAddNoRepairFive(); + String psanrf = obj.getPower_substation_add_no_repair_five(); WebElement psanrfEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[15]/div/div/div/input")); psanrfEle.clear(); @@ -945,7 +996,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-220/300 - String psanrt = obj.getPowerSubstationAddNoRepairTwo(); + String psanrt = obj.getPower_substation_add_no_repair_two(); WebElement psanrtEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[16]/div/div/div/input")); psanrtEle.clear(); @@ -954,7 +1005,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-100 - String psanro = obj.getPowerSubstationAddNoRepairOne(); + String psanro = obj.getPower_substation_add_no_repair_one(); WebElement psanroEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[17]/div/div/div/input")); psanroEle.clear(); @@ -963,7 +1014,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-35 - String psanrth = obj.getPowerSubstationAddNoRepairThree(); + String psanrth = obj.getPower_substation_add_no_repair_three(); WebElement psanrthEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[4" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[18]/div/div/div/input")); psanrthEle.clear(); @@ -973,7 +1024,7 @@ public class DutyDailyOp { //填写因灾停运-特高压 - String pscou = obj.getPowerSubstationCumulativeOutageUvh(); + String pscou = obj.getPower_substation_cumulative_outage_uvh(); WebElement pscouEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[4]/div/div/div/input")); pscouEle.clear(); @@ -983,7 +1034,7 @@ public class DutyDailyOp { //填写因灾停运-500 - String pscof = obj.getPowerSubstationCumulativeOutageFive(); + String pscof = obj.getPower_substation_cumulative_outage_five(); WebElement pscofEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[5]/div/div/div/input")); pscofEle.clear(); @@ -993,7 +1044,7 @@ public class DutyDailyOp { //填写因灾停运-300 - String pscot = obj.getPowerSubstationCumulativeOutageTwo(); + String pscot = obj.getPower_substation_cumulative_outage_two(); WebElement pscotEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[6]/div/div/div/input")); pscotEle.clear(); @@ -1002,7 +1053,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写因灾停运-100 - String pscoo = obj.getPowerSubstationCumulativeOutageOne(); + String pscoo = obj.getPower_substation_cumulative_outage_one(); WebElement pscooEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[7]/div/div/div/input")); pscooEle.clear(); @@ -1011,7 +1062,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写因灾停运-35 - String pscoth = obj.getPowerSubstationCumulativeOutageThree(); + String pscoth = obj.getPower_substation_cumulative_outage_three(); WebElement pscothEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[8]/div/div/div/input")); pscothEle.clear(); @@ -1021,7 +1072,7 @@ public class DutyDailyOp { //填写抢修恢复-特高压 - String pscru = obj.getPowerSubstationCumulativeRepairUvh(); + String pscru = obj.getPower_substation_cumulative_repair_uvh(); WebElement pscruEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[9]/div/div/div/input")); pscruEle.clear(); @@ -1030,7 +1081,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-500 - String pscrf = obj.getPowerSubstationCumulativeRepairFive(); + String pscrf = obj.getPower_substation_cumulative_repair_five(); WebElement pscrfEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[10]/div/div/div/input")); pscrfEle.clear(); @@ -1039,7 +1090,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-220/300 - String pscrt = obj.getPowerSubstationCumulativeOutageTwo(); + String pscrt = obj.getPower_substation_cumulative_outage_two(); WebElement pscrtEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[11]/div/div/div/input")); pscrtEle.clear(); @@ -1048,7 +1099,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-100 - String pscro = obj.getPowerSubstationCumulativeRepairOne(); + String pscro = obj.getPower_substation_cumulative_repair_one(); WebElement pscroEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[12]/div/div/div/input")); pscroEle.clear(); @@ -1057,7 +1108,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-35 - String pscrth = obj.getPowerSubstationCumulativeOutageThree(); + String pscrth = obj.getPower_substation_cumulative_outage_three(); WebElement pscrthEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[13]/div/div/div/input")); pscrthEle.clear(); @@ -1067,7 +1118,7 @@ public class DutyDailyOp { //填写尚未恢复-特高压 - String pscnru = obj.getPowerSubstationCumulativeNoRepairUvh(); + String pscnru = obj.getPower_substation_cumulative_no_repair_uvh(); WebElement pscnruEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[14]/div/div/div/input")); pscnruEle.clear(); @@ -1076,7 +1127,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-500 - String pscnrf = obj.getPowerSubstationCumulativeNoRepairFive(); + String pscnrf = obj.getPower_substation_cumulative_no_repair_five(); WebElement pscnrfEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[15]/div/div/div/input")); pscnrfEle.clear(); @@ -1085,7 +1136,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-220/300 - String pscnrt = obj.getPowerSubstationCumulativeNoRepairTwo(); + String pscnrt = obj.getPower_substation_cumulative_no_repair_two(); WebElement pscnrtEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[16]/div/div/div/input")); pscnrtEle.clear(); @@ -1094,7 +1145,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-100 - String pscnro = obj.getPowerSubstationCumulativeNoRepairOne(); + String pscnro = obj.getPower_substation_cumulative_no_repair_one(); WebElement pscnroEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[17]/div/div/div/input")); pscnroEle.clear(); @@ -1103,7 +1154,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-35 - String pscnrth = obj.getPowerSubstationCumulativeNoRepairThree(); + String pscnrth = obj.getPower_substation_cumulative_no_repair_three(); WebElement pscnrthEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[5" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[18]/div/div/div/input")); pscnrthEle.clear(); @@ -1115,7 +1166,7 @@ public class DutyDailyOp { private void dailySchedule8(AnnexEightBean obj, DailyBean bean) throws InterruptedException { //填写因灾停运-特高压 - String traou = obj.getTransmitElectricityAddOutageUvh(); + String traou = obj.getTransmit_electricity_add_outage_uvh(); WebElement traouEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[4]/div/div/div/input")); traouEle.clear(); @@ -1125,7 +1176,7 @@ public class DutyDailyOp { //填写因灾停运-500 - String traof = obj.getTransmitElectricityAddOutageFive(); + String traof = obj.getTransmit_electricity_add_outage_five(); WebElement traofEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[5]/div/div/div/input")); traofEle.clear(); @@ -1135,7 +1186,7 @@ public class DutyDailyOp { //填写因灾停运-300 - String traot = obj.getTransmitElectricityAddOutageTwo(); + String traot = obj.getTransmit_electricity_add_outage_two(); WebElement traotEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[6]/div/div/div/input")); traotEle.clear(); @@ -1144,7 +1195,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写因灾停运-100 - String traoo = obj.getTransmitElectricityAddOutageOne(); + String traoo = obj.getTransmit_electricity_add_outage_one(); WebElement traooEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[7]/div/div/div/input")); traooEle.clear(); @@ -1153,7 +1204,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写因灾停运-35 - String traoth = obj.getTransmitElectricityAddOutageThree(); + String traoth = obj.getTransmit_electricity_add_outage_three(); WebElement traothEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[8]/div/div/div/input")); traothEle.clear(); @@ -1162,7 +1213,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写因灾停运-10 - String traote = obj.getTransmitElectricityAddOutageTen(); + String traote = obj.getTransmit_electricity_add_outage_ten(); WebElement traoteEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[9]/div/div/div/input")); traoteEle.clear(); @@ -1172,7 +1223,7 @@ public class DutyDailyOp { //填写抢修恢复-特高压 - String traru = obj.getTransmitElectricityAddRepairUvh(); + String traru = obj.getTransmit_electricity_add_repair_uvh(); WebElement traruEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[10]/div/div/div/input")); traruEle.clear(); @@ -1181,7 +1232,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-500 - String trarf = obj.getTransmitElectricityAddRepairFive(); + String trarf = obj.getTransmit_electricity_add_repair_five(); WebElement trarfEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[11]/div/div/div/input")); trarfEle.clear(); @@ -1190,7 +1241,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-220/300 - String trart = obj.getTransmitElectricityAddRepairTwo(); + String trart = obj.getTransmit_electricity_add_repair_two(); WebElement trartEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[12]/div/div/div/input")); trartEle.clear(); @@ -1199,7 +1250,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-100 - String traro = obj.getTransmitElectricityAddRepairOne(); + String traro = obj.getTransmit_electricity_add_repair_one(); WebElement traroEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[13]/div/div/div/input")); traroEle.clear(); @@ -1208,7 +1259,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-35 - String trarth = obj.getTransmitElectricityAddRepairThree(); + String trarth = obj.getTransmit_electricity_add_repair_three(); WebElement trarthEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[14]/div/div/div/input")); trarthEle.clear(); @@ -1217,7 +1268,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-10 - String trarte = obj.getTransmitElectricityAddRepairTen(); + String trarte = obj.getTransmit_electricity_add_repair_ten(); WebElement trarteEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[15]/div/div/div/input")); trarteEle.clear(); @@ -1226,7 +1277,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-特高压 - String tranru = obj.getTransmitElectricityAddNoRepairUvh(); + String tranru = obj.getTransmit_electricity_add_no_repair_uvh(); WebElement tranruEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[16]/div/div/div/input")); tranruEle.clear(); @@ -1235,7 +1286,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-500 - String tranrf = obj.getTransmitElectricityAddNoRepairFive(); + String tranrf = obj.getTransmit_electricity_add_no_repair_five(); WebElement tranrfEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[17]/div/div/div/input")); tranrfEle.clear(); @@ -1244,7 +1295,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-220/300 - String tranrt = obj.getTransmitElectricityAddNoRepairTwo(); + String tranrt = obj.getTransmit_electricity_add_no_repair_two(); WebElement tranrtEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[18]/div/div/div/input")); tranrtEle.clear(); @@ -1253,7 +1304,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-100 - String tranro = obj.getTransmitElectricityAddNoRepairOne(); + String tranro = obj.getTransmit_electricity_add_no_repair_one(); WebElement tranroEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[19]/div/div/div/input")); tranroEle.clear(); @@ -1262,7 +1313,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-35 - String tranrth = obj.getTransmitElectricityAddNoRepairThree(); + String tranrth = obj.getTransmit_electricity_add_no_repair_three(); WebElement tranrthEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[20]/div/div/div/input")); tranrthEle.clear(); @@ -1271,7 +1322,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-10 - String tranrte = obj.getTransmitElectricityAddNoRepairTen(); + String tranrte = obj.getTransmit_electricity_add_no_repair_ten(); WebElement tranrteEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[6" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[21]/div/div/div/input")); tranrteEle.clear(); @@ -1280,7 +1331,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写因灾停运-特高压 - String trcou = obj.getTransmitElectricityCumulativeOutageUvh(); + String trcou = obj.getTransmit_electricity_cumulative_outage_uvh(); WebElement trcouEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[4]/div/div/div/input")); trcouEle.clear(); @@ -1290,7 +1341,7 @@ public class DutyDailyOp { //填写因灾停运-500 - String trcof = obj.getTransmitElectricityCumulativeOutageFive(); + String trcof = obj.getTransmit_electricity_cumulative_outage_five(); WebElement trcofEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[5]/div/div/div/input")); trcofEle.clear(); @@ -1300,7 +1351,7 @@ public class DutyDailyOp { //填写因灾停运-300 - String trcot = obj.getTransmitElectricityCumulativeOutageTwo(); + String trcot = obj.getTransmit_electricity_cumulative_outage_two(); WebElement trcotEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[6]/div/div/div/input")); trcotEle.clear(); @@ -1309,7 +1360,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写因灾停运-100 - String trcoo = obj.getTransmitElectricityCumulativeOutageOne(); + String trcoo = obj.getTransmit_electricity_cumulative_outage_one(); WebElement trcooEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[7]/div/div/div/input")); trcooEle.clear(); @@ -1318,7 +1369,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写因灾停运-35 - String trcoth = obj.getTransmitElectricityCumulativeOutageThree(); + String trcoth = obj.getTransmit_electricity_cumulative_outage_three(); WebElement trcothEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[8]/div/div/div/input")); trcothEle.clear(); @@ -1327,7 +1378,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写因灾停运-10 - String trcote = obj.getTransmitElectricityCumulativeOutageTen(); + String trcote = obj.getTransmit_electricity_cumulative_outage_ten(); WebElement trcoteEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[9]/div/div/div/input")); trcoteEle.clear(); @@ -1336,7 +1387,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-特高压 - String trcru = obj.getTransmitElectricityCumulativeRepairUvh(); + String trcru = obj.getTransmit_electricity_cumulative_repair_uvh(); WebElement trcruEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[10]/div/div/div/input")); trcruEle.clear(); @@ -1345,7 +1396,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-500 - String trcrf = obj.getTransmitElectricityCumulativeRepairFive(); + String trcrf = obj.getTransmit_electricity_cumulative_repair_five(); WebElement trcrfEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[11]/div/div/div/input")); trcrfEle.clear(); @@ -1354,7 +1405,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-220/300 - String trcrt = obj.getTransmitElectricityCumulativeRepairTwo(); + String trcrt = obj.getTransmit_electricity_cumulative_repair_two(); WebElement trcrtEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[12]/div/div/div/input")); trcrtEle.clear(); @@ -1363,7 +1414,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-100 - String trcro = obj.getTransmitElectricityCumulativeRepairOne(); + String trcro = obj.getTransmit_electricity_cumulative_repair_one(); WebElement trcroEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[13]/div/div/div/input")); trcroEle.clear(); @@ -1372,7 +1423,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-35 - String trcrth = obj.getTransmitElectricityCumulativeRepairThree(); + String trcrth = obj.getTransmit_electricity_cumulative_repair_three(); WebElement trcrthEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[14]/div/div/div/input")); trcrthEle.clear(); @@ -1381,7 +1432,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写抢修恢复-10 - String trcrte = obj.getTransmitElectricityCumulativeRepairTen(); + String trcrte = obj.getTransmit_electricity_cumulative_repair_ten(); WebElement trcrteEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[15]/div/div/div/input")); trcrteEle.clear(); @@ -1390,7 +1441,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-特高压 - String trcnru = obj.getTransmitElectricityCumulativeNoRepairUvh(); + String trcnru = obj.getTransmit_electricity_cumulative_no_repair_uvh(); WebElement trcnruEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[16]/div/div/div/input")); trcnruEle.clear(); @@ -1399,7 +1450,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-500 - String trcnrf = obj.getTransmitElectricityCumulativeNoRepairFive(); + String trcnrf = obj.getTransmit_electricity_cumulative_no_repair_five(); WebElement trcnrfEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[17]/div/div/div/input")); trcnrfEle.clear(); @@ -1408,7 +1459,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-220/300 - String trcnrt = obj.getTransmitElectricityCumulativeNoRepairTwo(); + String trcnrt = obj.getTransmit_electricity_cumulative_no_repair_two(); WebElement trcnrtEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[18]/div/div/div/input")); trcnrtEle.clear(); @@ -1417,7 +1468,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-100 - String trcnro = obj.getTransmitElectricityCumulativeNoRepairOne(); + String trcnro = obj.getTransmit_electricity_cumulative_no_repair_one(); WebElement trcnroEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[19]/div/div/div/input")); trcnroEle.clear(); @@ -1426,7 +1477,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-35 - String trcnrth = obj.getTransmitElectricityCumulativeNoRepairThree(); + String trcnrth = obj.getTransmit_electricity_cumulative_no_repair_three(); WebElement trcnrthEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[20]/div/div/div/input")); trcnrthEle.clear(); @@ -1435,7 +1486,7 @@ public class DutyDailyOp { Thread.sleep(300); //填写尚未恢复-10 - String trcnrte = obj.getTransmitElectricityCumulativeNoRepairTen(); + String trcnrte = obj.getTransmit_electricity_cumulative_no_repair_ten(); WebElement trcnrteEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[7" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[21]/div/div/div/input")); trcnrteEle.clear(); @@ -1449,7 +1500,7 @@ public class DutyDailyOp { private void dailySchedule9(AnnexNineBean obj, DailyBean bean) throws InterruptedException { //因灾停电-台区 - String abtd = obj.getAddBlackoutTaiDistrict(); + String abtd = obj.getAdd_blackout_tai_district(); WebElement abtdEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[8" + "]/div/div[2]/div/div/div[3]/table/tbody/tr/td[4]/div/div/div/input")); abtdEle.clear(); @@ -1458,7 +1509,7 @@ public class DutyDailyOp { Thread.sleep(300); //因灾停电-用户 - String abtu = obj.getAddBlackoutUser(); + String abtu = obj.getAdd_blackout_user(); WebElement abtuEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[8" + "]/div/div[2]/div/div/div[3]/table/tbody/tr/td[5]/div/div/div/input")); abtuEle.clear(); @@ -1467,7 +1518,7 @@ public class DutyDailyOp { Thread.sleep(300); //抢修恢复-台区 - String artd = obj.getAddRepairTaiDistrict(); + String artd = obj.getAdd_repair_tai_district(); WebElement artdEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[8" + "]/div/div[2]/div/div/div[3]/table/tbody/tr/td[6]/div/div/div/input")); artdEle.clear(); @@ -1476,7 +1527,7 @@ public class DutyDailyOp { Thread.sleep(300); //抢修恢复-用户 - String artu = obj.getAddRepairUser(); + String artu = obj.getAdd_repair_user(); WebElement artuEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[8" + "]/div/div[2]/div/div/div[3]/table/tbody/tr/td[7]/div/div/div/input")); artuEle.clear(); @@ -1485,7 +1536,7 @@ public class DutyDailyOp { Thread.sleep(300); //尚未恢复-台区 - String anrtd = obj.getAddNoRepairTaiDistrict(); + String anrtd = obj.getAdd_no_repair_tai_district(); WebElement anrtdEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[8" + "]/div/div[2]/div/div/div[3]/table/tbody/tr/td[8]/div/div/div/input")); anrtdEle.clear(); @@ -1494,7 +1545,7 @@ public class DutyDailyOp { Thread.sleep(300); //尚未恢复-用户 - String anrtu = obj.getAddNoRepairUser(); + String anrtu = obj.getAdd_no_repair_user(); WebElement anrtuEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[8" + "]/div/div[2]/div/div/div[3]/table/tbody/tr/td[9]/div/div/div/input")); anrtuEle.clear(); @@ -1503,7 +1554,7 @@ public class DutyDailyOp { Thread.sleep(300); //出动抢修力量-用户 - String app = obj.getAddPowerPersonnel(); + String app = obj.getAdd_power_personnel(); WebElement appEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[8]/div" + "/div[2]/div/div/div[3]/table/tbody/tr/td[10]/div/div/div/input")); appEle.clear(); @@ -1512,7 +1563,7 @@ public class DutyDailyOp { Thread.sleep(300); //出动抢修力量-车辆 - String apv = obj.getAddPowerVehicle(); + String apv = obj.getAdd_power_vehicle(); WebElement apvEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[8]/div" + "/div[2]/div/div/div[3]/table/tbody/tr/td[11]/div/div/div/input")); apvEle.clear(); @@ -1522,7 +1573,7 @@ public class DutyDailyOp { //因灾停电-台区 - String cbtd = obj.getCumulativeBlackoutTaiDistrict(); + String cbtd = obj.getCumulative_blackout_tai_district(); WebElement cbtdEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[9" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[4]/div/div/div/input")); cbtdEle.clear(); @@ -1531,7 +1582,7 @@ public class DutyDailyOp { Thread.sleep(300); //因灾停电-用户 - String cbtu = obj.getCumulativeBlackoutUser(); + String cbtu = obj.getCumulative_blackout_user(); WebElement cbtuEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[9" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[5]/div/div/div/input")); cbtuEle.clear(); @@ -1540,7 +1591,7 @@ public class DutyDailyOp { Thread.sleep(300); //抢修恢复-台区 - String crtd = obj.getCumulativeRepairTaiDistrict(); + String crtd = obj.getCumulative_repair_tai_district(); WebElement crtdEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[9" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[6]/div/div/div/input")); crtdEle.clear(); @@ -1549,7 +1600,7 @@ public class DutyDailyOp { Thread.sleep(300); //抢修恢复-用户 - String crtu = obj.getCumulativeRepairUser(); + String crtu = obj.getCumulative_repair_user(); WebElement crtuEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[9" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[7]/div/div/div/input")); crtuEle.clear(); @@ -1558,7 +1609,7 @@ public class DutyDailyOp { Thread.sleep(300); //尚未恢复-台区 - String cnrtd = obj.getCumulativeNoRepairTaiDistrict(); + String cnrtd = obj.getCumulative_no_repair_tai_district(); WebElement cnrtdEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[9" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[8]/div/div/div/input")); cnrtdEle.clear(); @@ -1567,7 +1618,7 @@ public class DutyDailyOp { Thread.sleep(300); //尚未恢复-用户 - String cnrtu = obj.getCumulativeNoRepairUser(); + String cnrtu = obj.getCumulative_no_repair_user(); WebElement cnrtuEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[9" + "]/div[2]/div/div/div[3]/table/tbody/tr/td[9]/div/div/div/input")); cnrtuEle.clear(); @@ -1576,7 +1627,7 @@ public class DutyDailyOp { Thread.sleep(300); //出动抢修力量-用户 - String cpp = obj.getCumulativePowerPersonnel(); + String cpp = obj.getCumulative_power_personnel(); WebElement cppEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[9]/div" + "[2]/div/div/div[3]/table/tbody/tr/td[10]/div/div/div/input")); cppEle.clear(); @@ -1585,7 +1636,7 @@ public class DutyDailyOp { Thread.sleep(300); //出动抢修力量-车辆 - String cpv = obj.getCumulativePowerVehicle(); + String cpv = obj.getCumulative_power_vehicle(); WebElement cpvEle = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[9]/div" + "[2]/div/div/div[3]/table/tbody/tr/td[11]/div/div/div/input")); cpvEle.clear(); @@ -2125,6 +2176,11 @@ public class DutyDailyOp { log.info("点击弹出框确认----------"); Thread.sleep(300); + //测试 点击取消按钮 + /* webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/div/div[4]/div[1]/div[19]/button[1]")).click(); + log.info("点击取消----------"); + Thread.sleep(300);*/ + //退出当前iframe, webDriver.switchTo().defaultContent(); log.info("退出当前iframe----------");