diff --git a/pom.xml b/pom.xml
index 5c56d6b..7e561fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,11 @@
slf4j-log4j12
1.7.26
-
+
+ org.apache.poi
+ poi-ooxml
+ 4.1.2
+
\ No newline at end of file
diff --git a/src/main/java/com/bonus/autoweb/GetBasicData.java b/src/main/java/com/bonus/autoweb/GetBasicData.java
index dc0dae6..83b5b29 100644
--- a/src/main/java/com/bonus/autoweb/GetBasicData.java
+++ b/src/main/java/com/bonus/autoweb/GetBasicData.java
@@ -377,7 +377,7 @@ public class GetBasicData {
logBean.setGeneral_chronicles_content(logBean.getGeneral_chronicles_content());
insertData(null, logBean, "log");
log.info("天气预警日志更新完成");
- dailyBean.setWarning_company(data + code + dailyContentArrayArray[28] + code_chlid2);
+ dailyBean.setWarning_company(data + code+code_child + dailyContentArrayArray[28] + code_chlid2);
//一、总体情况
dailyBean.setOverall(data + dailyContentArrayArray[2].trim() + (classes == 1 ? data3 + "08：00，" : data2 + "17：30" +
@@ -387,7 +387,7 @@ public class GetBasicData {
dailyBean2.setOverall(data + dailyContentArrayArray[2].trim() + (classes == 1 ? data3 + "08：00，" : data2 + "17：30" +
"，") + dailyContentArrayArray[3].trim() + code + "对系统检测图层中气象实况风速、温度、降雨进行查看、对专题灾害图层地震、台风防汛进行查看均正常，未对砀山辖区造成影响。通过首页公共气象图层检查砀山境内公共预警正常；降雨预报、预警正常；雷达预报正常。");
dailyBean2.setPersonnel_daily_work(dailyBean2.getPersonnel_daily_work());
- dailyBean2.setWarning_company(data + code + dailyContentArrayArray[28] + code_chlid2);
+ dailyBean2.setWarning_company(data + code+code_child + dailyContentArrayArray[28] + code_chlid2);
insertData(dailyBean, null, "morning_daily");
insertData(dailyBean2, null, "evening_daily");
log.info("日志内容:" + readDutyBean());
@@ -407,6 +407,8 @@ public class GetBasicData {
String logContent = resolveGarbledCode("E:\\bns\\config\\日志基本信息.txt");
String videoContent = resolveGarbledCode("E:\\bns\\config\\变电站名称.txt");
String lineContent = resolveGarbledCode("E:\\bns\\config\\线路名称.txt");
+ String maximumLoad = resolveGarbledCode("E:\\bns\\config\\最大负荷.txt");
+
// String useContent = resolveGarbledCode("E:\\bns\\config\\七家公司两天记录.txt");
String[] dailyContentArrayArray = dailyContent.split("--头部不可修改--");
String[] logContentArrayArray = logContent.split("--头部不可修改--");
@@ -414,6 +416,7 @@ public class GetBasicData {
String[] lineContentArrayArray = lineContent.split("--头部不可修改--");
String[] checkContentArrayArray = checkContent.split("资源核查情况：");
String[] checkContentNumArrayArray = checkNumContent.split("装备数量：");
+ String[] maximumLoadArr = maximumLoad.split("；");
// log.info("------开始获取企业停电的天气数据");
// log.info("------url:" + DataConfig.weatherUrl);
@@ -659,10 +662,12 @@ public class GetBasicData {
//二、重要事项
dailyBean.setImportant_matters(data + dailyContentArrayArray[5].trim());
//随机-1 到 1 直接的两位小数
- double randomNum = Math.random() * 2 - 1;
+ double randomNum = Math.random() * 8 - 4;
double numRandom = (double) Math.round(randomNum * 100) / 100;
//三、安全生产情况
- dailyBean.setSafety_production(data + dailyContentArrayArray[7].trim().split("--")[0] + (String.format("%.2f", Double.parseDouble(dailyContentArrayArray[7].trim().split("--")[1]) + numRandom)) + dailyContentArrayArray[7].trim().split("--")[2]);
+ dailyBean.setSafety_production(data + dailyContentArrayArray[7].trim().split("--")[0] + (String.format("%" +
+ ".2f", Double.parseDouble(maximumLoadArr[0].split("：")[1]) + numRandom)) + dailyContentArrayArray[7].trim().split(
+ "--")[2]);
//四、值班员日常工作情况
dailyBean.setPersonnel_daily_work(data + dailyContentArrayArray[10].trim() + "（4）资源核查情况：20:00至21:00" + checkContentArrayArray[num].trim()
+ dailyContentArrayArray[11].trim() + communicationTestName + dailyContentArrayArray[13].trim() + dailyContentArrayArray[14].trim() + dailyExercisesName + dailyContentArrayArray[16].trim() + "砀山公司对" + videoContentStr + "视频监控进行检查，未发现问题，对" + lineContentStr + "线路视频进行检查，视频接入正常。");
@@ -737,9 +742,7 @@ public class GetBasicData {
//二、重要事项
dailyBean2.setImportant_matters(data + dailyContentArrayArray[5].trim());
//三、安全生产情况
- Random random = new Random();
- //随机-1 到 1 直接的两位小数
- double randomNum = Math.random() * 2 - 1;
+ double randomNum = Math.random() * 8 - 4;
double numRandom = (double) Math.round(randomNum * 100) / 100;
//四、值班员日常工作情况
@@ -773,7 +776,8 @@ public class GetBasicData {
dailyBean2.getTwoBean().setVerification_team_num("1");
dailyBean2.getTwoBean().setVerification_equip_num(checkContentNumArrayArray[num].split("-")[2]);
//三、安全生产情况
- dailyBean2.setSafety_production(data + dailyContentArrayArray[7].trim().split("--")[0] + (String.format("%.2f", Double.parseDouble(dailyContentArrayArray[7].trim().split("--")[1]) + numRandom)) + dailyContentArrayArray[7].trim().split("--")[2]);
+ dailyBean2.setSafety_production(data + dailyContentArrayArray[7].trim().split("--")[0] + (String.format(
+ "%.2f", Double.parseDouble(maximumLoadArr[1].split("：")[1]) + numRandom)) + dailyContentArrayArray[7].trim().split("--")[2]);
insertData(dailyBean2, null, type);
logBean.setWeather(weatherNight);
@@ -968,6 +972,14 @@ public class GetBasicData {
// "(6)日常操练情况:14:30至15:00,市公司对所属" + 0 + "家县公司进行日常操练,未发现其他问题" + dailyContentArrayArray[18]);
// insertData(null, logBean, "log");
// AutoUtils.write("E:\\bns\\config\\七家公司两天记录.txt", useLogArr[1] + "记录:" + useLogArr[2] + "记录:" + 0);
+ String maximumLoad = resolveGarbledCode("E:\\bns\\config\\最大负荷.txt");
+ double randomNum = Math.random() * 8 - 4;
+ double numRandom = (double) Math.round(randomNum * 100) / 100;
+ String[] maximumLoadArr = maximumLoad.split("；");
+ System.out.println(Double.parseDouble(maximumLoadArr[0].split("：")[1])+numRandom);
+ System.out.println(Double.parseDouble(maximumLoadArr[1].split("：")[1])+numRandom);
+
+
}
String[] powerSupplyStations = {"关帝庙中心供电所", "城北中心供电所", "玄庙中心供电所", "周寨中心供电所", "城郊中心供电所", "官庄中心供电所", "李庄中心供电所", "葛集中心供电所", "唐寨中心供电所", "赵屯中心供电所", "朱楼中心供电所", "砀城客服中心供电所",};
diff --git a/src/main/java/com/bonus/autoweb/TestMain.java b/src/main/java/com/bonus/autoweb/TestMain.java
index 00c8fe3..9bfe0c9 100644
--- a/src/main/java/com/bonus/autoweb/TestMain.java
+++ b/src/main/java/com/bonus/autoweb/TestMain.java
@@ -1,6 +1,7 @@
package com.bonus.autoweb;
import com.bonus.autoweb.UI.entity.WeatherData;
+import com.bonus.autoweb.base.AutoMain;
import com.bonus.autoweb.base.AutoUtils;
import com.bonus.autoweb.base.DataConfig;
import com.bonus.autoweb.task.AutoWebTask;
@@ -25,11 +26,12 @@ import java.util.concurrent.TimeUnit;
/**
* 系统测试
+ *
* @author 24526
*/
public class TestMain {
private static Logger log = LoggerFactory.getLogger(TestMain.class);
-
+
public static void main(String[] args) throws Exception {
log.info("执行任务开始。。。。。。");
// testRCCL();
@@ -40,6 +42,10 @@ public class TestMain {
// testDailrb();
// start("工作人员请注意，桌号8001顾客正在寻求帮助！！");
// testLog();
+// changeTodayPersonaTask();
+// readAccount();
+// updateYesterdaySAccount();
+// readAccount();
new Thread(new Runnable() {
@SneakyThrows
@Override
@@ -52,6 +58,16 @@ public class TestMain {
}
}
}).start();
+// for (int i = 1; i < 6; i++) {
+// AutoWebTask autoWebTask = new AutoWebTask();
+// if (i == 1 || i == 5 || i == 4) {
+// System.out.println(autoWebTask.checkIsUpload(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3, i, 1));
+// System.out.println(autoWebTask.checkIsUpload(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3, i, 2));
+// } else {
+// System.out.println(autoWebTask.checkIsUpload(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3, i, 1));
+// }
+//
+// }
}
private static void testWeather() throws InterruptedException, IOException {
@@ -80,15 +96,15 @@ public class TestMain {
WeatherData.WeatherDataChild weatherDataChild = weatherData.getData();
log.info("------weatherDataChild:" + weatherDataChild);
String city = weatherDataChild.getCity();
- log.info("city:"+city);
+ log.info("city:" + city);
String weatherNoon = weatherDataChild.getWeatherNoon();
- log.info("weatherNoon:"+weatherNoon);
+ log.info("weatherNoon:" + weatherNoon);
String weatherNight = weatherDataChild.getWeatherNight();
- log.info("weatherNight:"+weatherNight);
+ log.info("weatherNight:" + weatherNight);
String minTemperature = weatherDataChild.getMinTemperature();
- log.info("minTemperature:"+minTemperature);
+ log.info("minTemperature:" + minTemperature);
String maxTemperature = weatherDataChild.getMaxTemperature();
- log.info("maxTemperature:"+maxTemperature);
+ log.info("maxTemperature:" + maxTemperature);
} catch (IOException e) {
throw new IOException("天气get请求失败", e);
}
@@ -100,20 +116,52 @@ public class TestMain {
String content = GetBasicData.resolveGarbledCode("E:\\bns\\config\\account.txt");
String date = content.toString().split(";")[0].split(":")[1];
String num = content.toString().split(";")[1].split(":")[1];
- if("1".equals(num)){
+ if ("1".equals(num)) {
log.info("xgd,yj签到签退任务");
- }else {
+ } else {
log.info("zkj,zh签到签退任务");
}
-// AutoWebTask autoWebTask = new AutoWebTask();
-// autoWebTask.dutyClockTask(2);
+ }
+
+ //账号更新测试
+ private static void changeTodayPersonaTask() throws IOException {
+ AutoWebTask autoWebTask = new AutoWebTask();
+ autoWebTask.changeTodayPersonaTask(DataConfig.USER_NAME3, DataConfig.PASS3);
+ }
+
+ //更新昨日账号
+ private static void updateYesterdaySAccount() throws IOException {
+ String value = GetBasicData.resolveGarbledCode("E:\\bns\\config\\今日值班账号.txt");
+ AutoUtils.write("E:\\bns\\config\\昨日值班账号.txt", value);
+ }
+
+ private static void readAccount() {
+ String todayContent = GetBasicData.resolveGarbledCode("E:\\bns\\config\\今日值班账号.txt");
+ String yesterdayContent = GetBasicData.resolveGarbledCode("E:\\bns\\config\\昨日值班账号.txt");
+ //今日签到值班人员
+ String todaySignInPerson = todayContent.toString().split("；")[0].split("：")[1];
+ String todaySignInPersonPassword = todayContent.toString().split("；")[1].split("：")[1];
+
+ String todaySignInPerson1 = todayContent.toString().split("；")[2].split("：")[1];
+ String todaySignInPersonPassword1 = todayContent.toString().split("；")[3].split("：")[1];
+
+ System.out.println(todaySignInPerson + ":" + todaySignInPersonPassword);
+ System.out.println(todaySignInPerson1 + ":" + todaySignInPersonPassword1);
+ //昨日签退人员
+ String yesterdaySignOutPerson = yesterdayContent.toString().split("；")[0].split("：")[1];
+ String yesterdaySignOutPersonPassword = yesterdayContent.toString().split("；")[1].split("：")[1];
+ String yesterdaySignOutPerson1 = yesterdayContent.toString().split("；")[2].split("：")[1];
+ String yesterdaySignOutPersonPassword1 = yesterdayContent.toString().split("；")[3].split("：")[1];
+ System.out.println(yesterdaySignOutPerson + ":" + yesterdaySignOutPersonPassword);
+ System.out.println(yesterdaySignOutPerson1 + ":" + yesterdaySignOutPersonPassword1);
}
//
private static void testjjb() {
AutoWebTask autoWebTask = new AutoWebTask();
- autoWebTask.dutyChangeTask1(2,DataConfig.USER_NAME1,DataConfig.PASS1);
+ autoWebTask.dutyChangeTask1(2, DataConfig.USER_NAME1, DataConfig.PASS1);
}
+
//自动获取数据测试
private static void testGetData() throws ParseException, InterruptedException {
AutoWebTask autoWebTask = new AutoWebTask();
@@ -131,12 +179,13 @@ public class TestMain {
//操作日报
//日报审核工作
AutoWebTask autoWebTask = new AutoWebTask();
- autoWebTask.dutyAddDailyLogsTask(1,DataConfig.USER_NAME1,DataConfig.PASS1);
+ autoWebTask.dutyAddDailyLogsTask(1, DataConfig.USER_NAME1, DataConfig.PASS1);
Thread.sleep(1000);
} catch (Exception e) {
e.printStackTrace();
}
}
+
//日常操练测试
private static void testRCCL() throws InterruptedException {
int addExercisePlan = 0;
@@ -173,10 +222,10 @@ public class TestMain {
try {
//操作日志
AutoWebTask autoWebTask = new AutoWebTask();
- autoWebTask.dutyAddLogsTask(2,DataConfig.USER_NAME3,DataConfig.PASS3);
+ autoWebTask.dutyAddLogsTask(2, DataConfig.USER_NAME3, DataConfig.PASS3);
count = 1;
Thread.sleep(1000);
- log.info("count",count);
+ log.info("count", count);
System.out.println(count);
} catch (Exception e) {
e.printStackTrace();
@@ -202,13 +251,13 @@ public class TestMain {
String content = GetBasicData.resolveGarbledCode("E:\\bns\\config\\account.txt");
String date = content.toString().split(";")[0].split(":")[1];
String num = content.toString().split(";")[1].split(":")[1];
- if(addExercisePlan == 0) {
- if("1".equals(num)){
+ if (addExercisePlan == 0) {
+ if ("1".equals(num)) {
addExercisePlan = autoWebTask.addExercisePlan("通信测试", "", 0, DataConfig.USER_NAME3, DataConfig.PASS3);
Thread.sleep(2000);
addExercisePlan = autoWebTask.addExercisePlan("日常操练", "", 0, DataConfig.USER_NAME3, DataConfig.PASS3);
Thread.sleep(2000);
- }else {
+ } else {
addExercisePlan = autoWebTask.addExercisePlan("通信测试", "", 0, DataConfig.USER_NAME1, DataConfig.PASS1);
Thread.sleep(2000);
addExercisePlan = autoWebTask.addExercisePlan("日常操练", "", 0, DataConfig.USER_NAME1, DataConfig.PASS1);
@@ -221,7 +270,7 @@ public class TestMain {
// if (addExercisePlan == 0){
// autoWebTask.addExercisePlan("日常操练","萧县",4,DataConfig.USER_NAME3,DataConfig.PASS3);
// }
- }else if (DateTimeUtils.isEffectiveDate("20:05", "20:08")) {
+ } else if (DateTimeUtils.isEffectiveDate("20:05", "20:08")) {
addExercisePlan = 0;
}
}
@@ -257,6 +306,7 @@ public class TestMain {
int logzao = 0;
int logwan = 0;
int resetCode = 0;
+ int resetCode1 = 0;
int addExercisePlan = 0;
@@ -270,379 +320,584 @@ public class TestMain {
log.error("时间", e);
}
log.info("服务正在运行。。。" + new Date());
- String content = GetBasicData.resolveGarbledCode("E:\\bns\\config\\account.txt");
- String date = content.toString().split(";")[0].split(":")[1];
- String num = content.toString().split(";")[1].split(":")[1];
- if(DateTimeUtils.isEffectiveDate("18:01", "18:15")){
+// String content = GetBasicData.resolveGarbledCode("E:\\bns\\config\\account.txt");
+// String date = content.toString().split(";")[0].split(":")[1];
+// String num = content.toString().split(";")[1].split(":")[1];
+ String todayContent = GetBasicData.resolveGarbledCode("E:\\bns\\config\\今日值班账号.txt");
+ String yesterdayContent = GetBasicData.resolveGarbledCode("E:\\bns\\config\\昨日值班账号.txt");
+ //今日签到值班人员
+ String todaySignInPerson = todayContent.toString().split("；")[0].split("：")[1];
+ String todaySignInPersonPassword = todayContent.toString().split("；")[1].split("：")[1];
+
+ String todaySignInPerson1 = todayContent.toString().split("；")[2].split("：")[1];
+ String todaySignInPersonPassword1 = todayContent.toString().split("；")[3].split("：")[1];
+
+ System.out.println(todaySignInPerson + ":" + todaySignInPersonPassword);
+ System.out.println(todaySignInPerson1 + ":" + todaySignInPersonPassword1);
+ //昨日签退人员
+ String yesterdaySignOutPerson = yesterdayContent.toString().split("；")[0].split("：")[1];
+ String yesterdaySignOutPersonPassword = yesterdayContent.toString().split("；")[1].split("：")[1];
+ String yesterdaySignOutPerson1 = yesterdayContent.toString().split("；")[2].split("：")[1];
+ String yesterdaySignOutPersonPassword1 = yesterdayContent.toString().split("；")[3].split("：")[1];
+ if (DateTimeUtils.isEffectiveDate("18:01", "18:15")) {
//进行日报信息系统采集及获取工作
try {
- if (logGatherCount == 0){
+ if (logGatherCount == 0) {
logGatherCount = autoWebTask.getCaoLianData(1);
}
Thread.sleep(3000);
- if (dailyGatherCount == 0){
+ if (dailyGatherCount == 0) {
dailyGatherCount = autoWebTask.getYuJingData(1);
Thread.sleep(2000);
GetBasicData.getYuJingActionBasicData(1);
}
- }catch (Exception e) {
+ } catch (Exception e) {
log.error("信息采集工作", e);
}
- }else if (DateTimeUtils.isEffectiveDate("06:01", "06:30")) {
+ } else if (DateTimeUtils.isEffectiveDate("06:01", "06:30")) {
//进行日志信息系统采集及获取工作
- }else if (DateTimeUtils.isEffectiveDate("06:31", "06:59")) {
+ } else if (DateTimeUtils.isEffectiveDate("05:00", "05:10")) {
+ //TODO 更新今日
+ try {
+ autoWebTask.changeTodayPersonaTask(todaySignInPerson, todaySignInPersonPassword);
+ } catch (IOException e) {
+ log.error("更新早上打卡人员", e);
+ }
+ } else if (DateTimeUtils.isEffectiveDate("06:31", "06:59")) {
//自动完成当值值班日报（早报）填写上报
if (dailyzao == 0) {
- getTime(1000);
+ getTime(600);
try {
- if("1".equals(num)){
- dailyzao = autoWebTask.dutyAddDailyLogsTask(1,DataConfig.USER_NAME1,DataConfig.PASS1);
- }else {
- dailyzao = autoWebTask.dutyAddDailyLogsTask(1,DataConfig.USER_NAME3,DataConfig.PASS3);
+// if("1".equals(num)){
+// dailyzao = autoWebTask.dutyAddDailyLogsTask(1,DataConfig.USER_NAME1,DataConfig.PASS1);
+// }else {
+// dailyzao = autoWebTask.dutyAddDailyLogsTask(1,DataConfig.USER_NAME3,DataConfig.PASS3);
+// }
+ dailyzao = autoWebTask.dutyAddDailyLogsTask(1, yesterdaySignOutPerson, yesterdaySignOutPersonPassword);
+ if (dailyzao == 1) {
+ int code = autoWebTask.checkIsUpload(1, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 2, 1);
+ if (code == 0) {
+ dailyzao = autoWebTask.dutyAddDailyLogsTask(1, yesterdaySignOutPerson, yesterdaySignOutPersonPassword);
+ }
}
- }catch (Exception e){
+ } catch (Exception e) {
log.error("日报工作", e);
}
}
- }else if (DateTimeUtils.isEffectiveDate("07:01", "07:30")) {
+ } else if (DateTimeUtils.isEffectiveDate("07:01", "07:30")) {
//完成值班日志填写提交（晚班日志，此次值班日志为总结前一天晚上的情况）
if (logzao == 0) {
getTime(1000);
try {
- if("1".equals(num)){
- logzao = autoWebTask.dutyAddLogsTask(1,DataConfig.USER_NAME1,DataConfig.PASS1);
- }else {
- logzao = autoWebTask.dutyAddLogsTask(1,DataConfig.USER_NAME3,DataConfig.PASS3);
+// if("1".equals(num)){
+// logzao = autoWebTask.dutyAddLogsTask(1,DataConfig.USER_NAME1,DataConfig.PASS1);
+// }else {
+// logzao = autoWebTask.dutyAddLogsTask(1,DataConfig.USER_NAME3,DataConfig.PASS3);
+// }
+ logzao = autoWebTask.dutyAddLogsTask(1, yesterdaySignOutPerson, yesterdaySignOutPersonPassword);
+ if (logzao == 1) {
+ int code = autoWebTask.checkIsUpload(1, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 3, 1);
+ if (code == 0) {
+ logzao = autoWebTask.dutyAddLogsTask(1, yesterdaySignOutPerson, yesterdaySignOutPersonPassword);
+ }
}
- }catch (Exception e){
+ } catch (Exception e) {
log.error("日志工作", e);
}
}
- }else if (DateTimeUtils.isEffectiveDate("07:31", "07:50")) {
+ } else if (DateTimeUtils.isEffectiveDate("07:31", "07:50")) {
//自动完成当值值班签到（值班主任、值班人员都要签到）
- if ("error".equals(content)) {
- log.error("读取前一天人员数据错误");
- }else {
- log.info("昨天的日期:" + date + "昨天的账号类别:" + num);
- if (signInzao == 0 && signInzao2 == 0){
- getTime(600);
- }
- if ("1".equals(num)){
- if (signInzao == 0) {
- log.info("陈亚账号开始打卡任务---------------------");
- //使用陈亚账号签到
- try {
- signInzao = autoWebTask.dutySigin(1, 1, DataConfig.USER_NAME3, DataConfig.PASS3);
- } catch (Exception e) {
- log.error("陈亚打卡任务", e);
- }
- }
- try {
- Thread.sleep(1000 * 2);
- } catch (Exception e) {
- log.error("打卡任务", e);
- }
- if (signInzao2 == 0) {
- //使用赵静账号签到
- log.info("赵静宇账号开始打卡任务---------------------");
- try {
- signInzao2 = autoWebTask.dutySigin(1, 1, DataConfig.USER_NAME4, DataConfig.PASS4);
- } catch (Exception e) {
- log.error("赵静打卡任务", e);
- }
- }
- }else {
- if (signInzao == 0) {
- log.info("方春芳账号开始打卡任务---------------------");
- //使用方春芳账号签到
- try {
- signInzao = autoWebTask.dutySigin(1, 1, DataConfig.USER_NAME1, DataConfig.PASS1);
- } catch (Exception e) {
- log.error("方春芳打卡任务", e);
- }
- }
- try {
- Thread.sleep(1000 * 2);
- } catch (Exception e) {
- log.error("打卡任务", e);
- }
- if (signInzao2 == 0) {
- //使用王鹤账号签到
- log.info("王鹤账号开始打卡任务---------------------");
- try {
- signInzao2 = autoWebTask.dutySigin(1, 1, DataConfig.USER_NAME2, DataConfig.PASS2);
- } catch (Exception e) {
- log.error("王鹤打卡任务", e);
- }
+// if ("error".equals(content)) {
+// log.error("读取前一天人员数据错误");
+// }else {
+// log.info("昨天的日期:" + date + "昨天的账号类别:" + num);
+// if (signInzao == 0 && signInzao2 == 0){
+// getTime(600);
+// }
+// if ("1".equals(num)){
+// if (signInzao == 0) {
+// log.info("陈亚账号开始打卡任务---------------------");
+// //使用陈亚账号签到
+// try {
+// signInzao = autoWebTask.dutySigin(1, 1, DataConfig.USER_NAME3, DataConfig.PASS3);
+// } catch (Exception e) {
+// log.error("陈亚打卡任务", e);
+// }
+// }
+// try {
+// Thread.sleep(1000 * 2);
+// } catch (Exception e) {
+// log.error("打卡任务", e);
+// }
+// if (signInzao2 == 0) {
+// //使用王鹤账号签到
+// log.info("王鹤账号开始打卡任务---------------------");
+// try {
+// signInzao2 = autoWebTask.dutySigin(1, 1, DataConfig.USER_NAME2, DataConfig.PASS2);
+// } catch (Exception e) {
+// log.error("王鹤打卡任务", e);
+// }
+// }
+// }else {
+// if (signInzao == 0) {
+// log.info("王晓锋账号开始打卡任务---------------------");
+// //使用王晓锋账号签到
+// try {
+// signInzao = autoWebTask.dutySigin(1, 1, DataConfig.USER_NAME1, DataConfig.PASS1);
+// } catch (Exception e) {
+// log.error("王晓锋打卡任务", e);
+// }
+// }
+// try {
+// Thread.sleep(1000 * 2);
+// } catch (Exception e) {
+// log.error("打卡任务", e);
+// }
+// if (signInzao2 == 0) {
+// //使用赵静账号签到
+// log.info("赵静账号开始打卡任务---------------------");
+// try {
+// signInzao2 = autoWebTask.dutySigin(1, 1, DataConfig.USER_NAME4, DataConfig.PASS4);
+// } catch (Exception e) {
+// log.error("赵静打卡任务", e);
+// }
+// }
+//
+// }
+// }
+ if (signInzao == 0 && signInzao2 == 0) {
+ getTime(600);
+ }
+ if (signInzao == 0) {
+ log.info(todaySignInPerson + "账号开始打卡任务---------------------");
+ //使用王晓锋账号签到
+ try {
+ signInzao = autoWebTask.dutySigin(1, 1, todaySignInPerson, todaySignInPersonPassword);
+ int code = autoWebTask.checkIsUpload(1, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 1, 1);
+ if (code == 0) {
+ signInzao = autoWebTask.dutySigin(1, 1, todaySignInPerson, todaySignInPersonPassword);
}
+ } catch (Exception e) {
+ log.error(todaySignInPerson + "打卡任务", e);
}
}
- }else if (DateTimeUtils.isEffectiveDate("07:51", "08:10")) {
- if (jjbzao == 0 && jjbzao2 == 0){
+ try {
+ Thread.sleep(1000 * 2);
+ } catch (Exception e) {
+ log.error("打卡任务", e);
+ }
+ if (signInzao2 == 0) {
+ //使用赵静账号签到
+ log.info(todaySignInPerson1 + "账号开始打卡任务---------------------");
+ try {
+ signInzao2 = autoWebTask.dutySigin(1, 1, todaySignInPerson1, todaySignInPersonPassword1);
+ int code = autoWebTask.checkIsUpload(1, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 1, 2);
+ if (code == 0) {
+ signInzao2 = autoWebTask.dutySigin(1, 1, todaySignInPerson1, todaySignInPersonPassword1);
+ }
+ } catch (Exception e) {
+ log.error(todaySignInPerson1 + "打卡任务", e);
+ }
+ }
+ } else if (DateTimeUtils.isEffectiveDate("07:51", "08:10")) {
+ if (jjbzao == 0 && jjbzao2 == 0) {
getTime(800);
}
- try{
+ try {
//自动在系统内完成接班（上一值完成交班后）
- if (jjbzao == 0 || jjbzao2 == 0){
- if("1".equals(num)){
- if (jjbzao == 0){
- jjbzao = autoWebTask.dutyChangeTask1(1,DataConfig.USER_NAME1,DataConfig.PASS1);
+ if (jjbzao == 0 || jjbzao2 == 0) {
+// if("1".equals(num)){
+// if (jjbzao == 0){
+// jjbzao = autoWebTask.dutyChangeTask1(1,DataConfig.USER_NAME1,DataConfig.PASS1);
+// }
+// if (jjbzao2 == 0){
+// jjbzao2 = autoWebTask.dutyChangeTask2(1,DataConfig.USER_NAME3,DataConfig.PASS3);
+// }
+// }else {
+// if (jjbzao == 0){
+// jjbzao = autoWebTask.dutyChangeTask1(1,DataConfig.USER_NAME3,DataConfig.PASS3);
+// }
+// if (jjbzao2 == 0){
+// jjbzao2 = autoWebTask.dutyChangeTask2(1,DataConfig.USER_NAME1,DataConfig.PASS1);
+// }
+// }
+ if (jjbzao == 0) {
+ jjbzao = autoWebTask.dutyChangeTask1(1, yesterdaySignOutPerson, yesterdaySignOutPersonPassword);
+ int code = autoWebTask.checkIsUpload(1, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 4, 1);
+ if (code == 0) {
+ jjbzao = autoWebTask.dutyChangeTask1(1, yesterdaySignOutPerson, yesterdaySignOutPersonPassword);
}
- if (jjbzao2 == 0){
- jjbzao2 = autoWebTask.dutyChangeTask2(1,DataConfig.USER_NAME3,DataConfig.PASS3);
- }
- }else {
- if (jjbzao == 0){
- jjbzao = autoWebTask.dutyChangeTask1(1,DataConfig.USER_NAME3,DataConfig.PASS3);
- }
- if (jjbzao2 == 0){
- jjbzao2 = autoWebTask.dutyChangeTask2(1,DataConfig.USER_NAME1,DataConfig.PASS1);
+ }
+ if (jjbzao2 == 0) {
+ jjbzao2 = autoWebTask.dutyChangeTask2(1, todaySignInPerson, todaySignInPersonPassword);
+ int code = autoWebTask.checkIsUpload(1, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 4, 2);
+ if (code == 0) {
+ jjbzao2 = autoWebTask.dutyChangeTask2(1, todaySignInPerson, todaySignInPersonPassword);
}
}
}
- }catch (Exception e){
- log.error("交接班",e);
+ } catch (Exception e) {
+ log.error("交接班", e);
}
- }else if (DateTimeUtils.isEffectiveDate("08:15", "08:30")) {
- if(signOutzao == 0 || signOutzao2 == 0){
+ } else if (DateTimeUtils.isEffectiveDate("08:15", "08:30")) {
+ if (signOutzao == 0 && signOutzao2 == 0) {
getTime(500);
}
//自动在系统内完成签退
- if ("1".equals(num)){
- if (signOutzao == 0) {
- try {
- signOutzao = autoWebTask.dutySignOutTask(1, DataConfig.USER_NAME1, DataConfig.PASS1);
- }catch (Exception e){
- log.error("签退",e);
- }
- }
+// if ("1".equals(num)){
+// if (signOutzao == 0) {
+// try {
+// signOutzao = autoWebTask.dutySignOutTask(1, DataConfig.USER_NAME1, DataConfig.PASS1);
+// }catch (Exception e){
+// log.error("签退",e);
+// }
+// }
+// try {
+// Thread.sleep(1000 * 3);
+// } catch (Exception e) {
+// log.error("时间", e);
+// }
+// if (signOutzao2 == 0){
+// try {
+// signOutzao2 = autoWebTask.dutySignOutTask(1, DataConfig.USER_NAME4, DataConfig.PASS4);
+// }catch (Exception e){
+// log.error("签退",e);
+// }
+// }
+// }else {
+// if (signOutzao == 0) {
+// try {
+// signOutzao = autoWebTask.dutySignOutTask(1, DataConfig.USER_NAME3, DataConfig.PASS3);
+// }catch (Exception e){
+// log.error("签退",e);
+// }
+// }
+// try {
+// Thread.sleep(1000 * 3);
+// } catch (Exception e) {
+// log.error("时间", e);
+// }
+// if (signOutzao2 == 0){
+// try {
+// signOutzao2 = autoWebTask.dutySignOutTask(1, DataConfig.USER_NAME2, DataConfig.PASS2);
+// }catch (Exception e){
+// log.error("签退",e);
+// }
+// }
+// }
+ if (signOutzao == 0) {
try {
- Thread.sleep(1000 * 3);
+ signOutzao = autoWebTask.dutySignOutTask(1, yesterdaySignOutPerson, yesterdaySignOutPersonPassword);
+ int code = autoWebTask.checkIsUpload(1, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 5, 1);
+ if (code == 0) {
+ signOutzao = autoWebTask.dutySignOutTask(1, yesterdaySignOutPerson, yesterdaySignOutPersonPassword);
+ }
} catch (Exception e) {
- log.error("时间", e);
- }
- if (signOutzao2 == 0){
- try {
- signOutzao2 = autoWebTask.dutySignOutTask(1, DataConfig.USER_NAME2, DataConfig.PASS2);
- }catch (Exception e){
- log.error("签退",e);
- }
- }
- }else {
- if (signOutzao == 0) {
- try {
- signOutzao = autoWebTask.dutySignOutTask(1, DataConfig.USER_NAME3, DataConfig.PASS3);
- }catch (Exception e){
- log.error("签退",e);
- }
- }
- try {
- Thread.sleep(1000 * 3);
- } catch (Exception e) {
- log.error("时间", e);
- }
- if (signOutzao2 == 0){
- try {
- signOutzao2 = autoWebTask.dutySignOutTask(1, DataConfig.USER_NAME4, DataConfig.PASS4);
- }catch (Exception e){
- log.error("签退",e);
- }
+ log.error("签退", e);
}
}
- }else if (DateTimeUtils.isEffectiveDate("08:40", "10:10")){
- if(addExercisePlan == 0){
+ try {
+ Thread.sleep(1000 * 3);
+ } catch (Exception e) {
+ log.error("时间", e);
+ }
+ if (signOutzao2 == 0) {
+ try {
+ signOutzao2 = autoWebTask.dutySignOutTask(1, yesterdaySignOutPerson1, yesterdaySignOutPersonPassword1);
+ int code = autoWebTask.checkIsUpload(1, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 5, 2);
+ if (code == 0) {
+ signOutzao2 = autoWebTask.dutySignOutTask(1, yesterdaySignOutPerson1, yesterdaySignOutPersonPassword1);
+ }
+ } catch (Exception e) {
+ log.error("签退", e);
+ }
+ }
+ } else if (DateTimeUtils.isEffectiveDate("08:40", "10:10")) {
+ if (addExercisePlan == 0) {
getTime(1200);
}
try {
- if(addExercisePlan == 0) {
+ if (addExercisePlan == 0) {
addExercisePlan = autoWebTask.addExercisePlan("通信测试", "", 0, DataConfig.USER_NAME3, DataConfig.PASS3);
Thread.sleep(2000);
addExercisePlan = autoWebTask.addExercisePlan("日常操练", "", 0, DataConfig.USER_NAME3, DataConfig.PASS3);
Thread.sleep(2000);
}
- }catch (Exception e){
- log.error("日常操练",e);
+ } catch (Exception e) {
+ log.error("日常操练", e);
}
} else if (DateTimeUtils.isEffectiveDate("12:30", "15:30")) {
//进行日志信息系统采集及获取工作
try {
- if (logGatherCount1 == 0){
+ if (logGatherCount1 == 0) {
logGatherCount1 = autoWebTask.getCaoLianData(2);
}
Thread.sleep(3000);
- if (dailyGatherCount1 == 0){
- dailyGatherCount1= autoWebTask.getYuJingData(2);
+ if (dailyGatherCount1 == 0) {
+ dailyGatherCount1 = autoWebTask.getYuJingData(2);
Thread.sleep(2000);
GetBasicData.getYuJingActionBasicData(2);
}
- }catch (Exception e) {
+ } catch (Exception e) {
log.error("信息采集工作", e);
}
- }else if (DateTimeUtils.isEffectiveDate("17:01", "17:15")) {
+ } else if (DateTimeUtils.isEffectiveDate("17:01", "17:15")) {
//自动完成当值值班日报（晚报）填写上报
if (dailywan == 0) {
getTime(600);
try {
- if ("1".equals(num)) {
- dailywan = autoWebTask.dutyAddDailyLogsTask(2,DataConfig.USER_NAME3,DataConfig.PASS3);
- }else {
- dailywan = autoWebTask.dutyAddDailyLogsTask(2,DataConfig.USER_NAME1,DataConfig.PASS1);
+// if ("1".equals(num)) {
+// dailywan = autoWebTask.dutyAddDailyLogsTask(2,DataConfig.USER_NAME3,DataConfig.PASS3);
+// }else {
+// dailywan = autoWebTask.dutyAddDailyLogsTask(2,DataConfig.USER_NAME1,DataConfig.PASS1);
+// }
+ dailywan = autoWebTask.dutyAddDailyLogsTask(2, todaySignInPerson, todaySignInPersonPassword);
+ int code = autoWebTask.checkIsUpload(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 2, 1);
+ if (code == 0) {
+ dailywan = autoWebTask.dutyAddDailyLogsTask(2, todaySignInPerson, todaySignInPersonPassword);
}
- }catch (Exception e){
+ } catch (Exception e) {
log.error("日报工作", e);
}
}
- }else if (DateTimeUtils.isEffectiveDate("16:46", "17:00")) {
+ } else if (DateTimeUtils.isEffectiveDate("16:46", "17:00")) {
//完成值班日志填写提交（白班日志，此次值班日志为总结前一天晚上的情况）
if (logwan == 0) {
getTime(600);
try {
- if ("1".equals(num)) {
- logwan = autoWebTask.dutyAddLogsTask(2,DataConfig.USER_NAME3,DataConfig.PASS3);
- }else {
- logwan = autoWebTask.dutyAddLogsTask(2,DataConfig.USER_NAME1,DataConfig.PASS1);
+// if ("1".equals(num)) {
+// logwan = autoWebTask.dutyAddLogsTask(2,DataConfig.USER_NAME3,DataConfig.PASS3);
+// }else {
+// logwan = autoWebTask.dutyAddLogsTask(2,DataConfig.USER_NAME1,DataConfig.PASS1);
+// }
+ logwan = autoWebTask.dutyAddLogsTask(2, todaySignInPerson, todaySignInPersonPassword);
+ int code = autoWebTask.checkIsUpload(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 3, 1);
+ if (code == 0) {
+ logwan = autoWebTask.dutyAddLogsTask(2, todaySignInPerson, todaySignInPersonPassword);
}
- }catch (Exception e){
+ } catch (Exception e) {
log.error("日志工作", e);
}
}
- }else if (DateTimeUtils.isEffectiveDate("16:31", "16:45")) {
+ } else if (DateTimeUtils.isEffectiveDate("16:31", "16:45")) {
//自动完成当值值班签到（值班主任、值班人员都要签到）
- if ("error".equals(content)) {
- log.error("读取前一天人员数据错误");
- }else {
- log.info("昨天的日期:" + date + "昨天的账号类别:" + num);
- if(signInwan == 0 && signInwan2 == 0){
- getTime(600);
- }
- if ("1".equals(num)){
- if (signInwan == 0) {
- log.info("陈亚账号开始打卡任务---------------------");
- //使用陈亚账号签到
- try {
- signInwan = autoWebTask.dutySigin(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3);
- } catch (Exception e) {
- log.error("陈亚打卡任务", e);
- }
- }
- try {
- Thread.sleep(1000 * 2);
- } catch (Exception e) {
- log.error("打卡任务", e);
- }
- if (signInwan2 == 0) {
- //使用赵静账号签到
- log.info("赵静宇账号开始打卡任务---------------------");
- try {
- signInwan2 = autoWebTask.dutySigin(2, 1, DataConfig.USER_NAME4, DataConfig.PASS4);
- } catch (Exception e) {
- log.error("赵静打卡任务", e);
- }
- }
- }else {
- if (signInwan == 0) {
- log.info("方春芳账号开始打卡任务---------------------");
- //使用方春芳账号签到
- try {
- signInwan = autoWebTask.dutySigin(2, 1, DataConfig.USER_NAME1, DataConfig.PASS1);
- } catch (Exception e) {
- log.error("方春芳打卡任务", e);
- }
- }
- try {
- Thread.sleep(1000 * 2);
- } catch (Exception e) {
- log.error("打卡任务", e);
- }
- if (signInwan2 == 0) {
- //使用王鹤账号签到
- log.info("王鹤账号开始打卡任务---------------------");
- try {
- signInwan2 = autoWebTask.dutySigin(2, 1, DataConfig.USER_NAME2, DataConfig.PASS2);
- } catch (Exception e) {
- log.error("王鹤打卡任务", e);
- }
+// if ("error".equals(content)) {
+// log.error("读取前一天人员数据错误");
+// }else {
+// log.info("昨天的日期:" + date + "昨天的账号类别:" + num);
+// if(signInwan == 0 && signInwan2 == 0){
+// getTime(600);
+// }
+// if ("1".equals(num)){
+// if (signInwan == 0) {
+// log.info("陈亚账号开始打卡任务---------------------");
+// //使用陈亚账号签到
+// try {
+// signInwan = autoWebTask.dutySigin(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3);
+// } catch (Exception e) {
+// log.error("陈亚打卡任务", e);
+// }
+// }
+// try {
+// Thread.sleep(1000 * 2);
+// } catch (Exception e) {
+// log.error("打卡任务", e);
+// }
+// if (signInwan2 == 0) {
+// //使用王鹤账号签到
+// log.info("王鹤账号开始打卡任务---------------------");
+// try {
+// signInwan2 = autoWebTask.dutySigin(2, 1, DataConfig.USER_NAME2, DataConfig.PASS2);
+// } catch (Exception e) {
+// log.error("王鹤打卡任务", e);
+// }
+// }
+// }else {
+// if (signInwan == 0) {
+// log.info("王晓锋账号开始打卡任务---------------------");
+// //使用王晓锋账号签到
+// try {
+// signInwan = autoWebTask.dutySigin(2, 1, DataConfig.USER_NAME1, DataConfig.PASS1);
+// } catch (Exception e) {
+// log.error("王晓锋打卡任务", e);
+// }
+// }
+// try {
+// Thread.sleep(1000 * 2);
+// } catch (Exception e) {
+// log.error("打卡任务", e);
+// }
+// if (signInwan2 == 0) {
+// //使用赵静账号签到
+// log.info("赵静账号开始打卡任务---------------------");
+// try {
+// signInwan2 = autoWebTask.dutySigin(2, 1, DataConfig.USER_NAME4, DataConfig.PASS4);
+// } catch (Exception e) {
+// log.error("赵静打卡任务", e);
+// }
+// }
+// }
+// }
+ if (signInwan == 0 && signInwan2 == 0) {
+ getTime(600);
+ }
+ if (signInwan == 0) {
+ log.info(todaySignInPerson + "账号开始打卡任务---------------------");
+ //使用王晓锋账号签到
+ try {
+ signInwan = autoWebTask.dutySigin(2, 1, todaySignInPerson, todaySignInPersonPassword);
+ int code = autoWebTask.checkIsUpload(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 1, 1);
+ if (code == 0) {
+ signInwan = autoWebTask.dutySigin(2, 1, todaySignInPerson, todaySignInPersonPassword);
}
+ } catch (Exception e) {
+ log.error("王晓锋打卡任务", e);
}
}
- }else if (DateTimeUtils.isEffectiveDate("17:31", "17:45")) {
+ try {
+ Thread.sleep(1000 * 2);
+ } catch (Exception e) {
+ log.error("打卡任务", e);
+ }
+ if (signInwan2 == 0) {
+ //使用赵静账号签到
+ log.info(todaySignInPerson1 + "账号开始打卡任务---------------------");
+ try {
+ signInwan2 = autoWebTask.dutySigin(2, 1, todaySignInPerson1, todaySignInPersonPassword1);
+ int code = autoWebTask.checkIsUpload(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 1, 2);
+ if (code == 0) {
+ signInwan2 = autoWebTask.dutySigin(2, 1, todaySignInPerson1, todaySignInPersonPassword1);
+ }
+ } catch (Exception e) {
+ log.error("打卡任务", e);
+ }
+ }
+ } else if (DateTimeUtils.isEffectiveDate("17:31", "17:45")) {
//自动在系统内完成接班（上一值完成交班后）
- if(jjbwan == 0 && jjbwan2 == 0){
+ if (jjbwan == 0 && jjbwan2 == 0) {
getTime(600);
}
try {
- if (jjbwan == 0 || jjbwan2 == 0){
- if("1".equals(num)){
- if (jjbwan == 0){
- jjbwan = autoWebTask.dutyChangeTask1(2,DataConfig.USER_NAME3,DataConfig.PASS3);
+ if (jjbwan == 0 || jjbwan2 == 0) {
+// if ("1".equals(num)) {
+// if (jjbwan == 0) {
+// jjbwan = autoWebTask.dutyChangeTask1(2, DataConfig.USER_NAME3, DataConfig.PASS3);
+// }
+// if (jjbwan2 == 0) {
+// jjbwan2 = autoWebTask.dutyChangeTask2(2, DataConfig.USER_NAME3, DataConfig.PASS3);
+// }
+// } else {
+// if (jjbwan == 0) {
+// jjbwan = autoWebTask.dutyChangeTask1(2, DataConfig.USER_NAME1, DataConfig.PASS1);
+// }
+// if (jjbwan2 == 0) {
+// jjbwan2 = autoWebTask.dutyChangeTask2(2, DataConfig.USER_NAME1, DataConfig.PASS1);
+// }
+// }
+ if (jjbwan == 0) {
+ jjbwan = autoWebTask.dutyChangeTask1(2, yesterdaySignOutPerson, yesterdaySignOutPersonPassword);
+ int code = autoWebTask.checkIsUpload(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 4, 1);
+ if (code == 0) {
+ jjbwan = autoWebTask.dutyChangeTask1(2, yesterdaySignOutPerson, yesterdaySignOutPersonPassword);
}
- if (jjbwan2 == 0){
- jjbwan2 = autoWebTask.dutyChangeTask2(2,DataConfig.USER_NAME3,DataConfig.PASS3);
- }
- }else {
- if (jjbwan == 0){
- jjbwan = autoWebTask.dutyChangeTask1(2,DataConfig.USER_NAME1,DataConfig.PASS1);
- }
- if (jjbwan2 == 0){
- jjbwan2 = autoWebTask.dutyChangeTask2(2,DataConfig.USER_NAME1,DataConfig.PASS1);
+ }
+ if (jjbwan2 == 0) {
+ jjbwan2 = autoWebTask.dutyChangeTask2(2, todaySignInPerson, todaySignInPersonPassword);
+ int code = autoWebTask.checkIsUpload(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 4, 2);
+ if (code == 0) {
+ jjbwan2 = autoWebTask.dutyChangeTask2(2, todaySignInPerson, todaySignInPersonPassword);
}
}
}
- }catch (Exception e){
- log.error("交接班",e);
+ } catch (Exception e) {
+ log.error("交接班", e);
}
- }else if (DateTimeUtils.isEffectiveDate("17:46", "18:00")) {
- if (signOutwan == 0 && signOutwan2 == 0){
+ } else if (DateTimeUtils.isEffectiveDate("17:46", "18:00")) {
+ if (signOutwan == 0 && signOutwan2 == 0) {
getTime(500);
}
- //自动在系统内完成签退
- if ("1".equals(num)){
- if (signOutwan == 0) {
- try {
- signOutwan = autoWebTask.dutySignOutTask(2, DataConfig.USER_NAME3, DataConfig.PASS3);
- }catch (Exception e){
- log.error("签退",e);
- }
- }
+// //自动在系统内完成签退
+// if ("1".equals(num)) {
+// if (signOutwan == 0) {
+// try {
+// signOutwan = autoWebTask.dutySignOutTask(2, DataConfig.USER_NAME3, DataConfig.PASS3);
+// } catch (Exception e) {
+// log.error("签退", e);
+// }
+// }
+// try {
+// Thread.sleep(1000 * 3);
+// } catch (Exception e) {
+// log.error("时间", e);
+// }
+// if (signOutwan2 == 0) {
+// try {
+// signOutwan2 = autoWebTask.dutySignOutTask(2, DataConfig.USER_NAME2, DataConfig.PASS2);
+// } catch (Exception e) {
+// log.error("签退", e);
+// }
+// }
+// } else {
+// if (signOutwan == 0) {
+// try {
+// signOutzao = autoWebTask.dutySignOutTask(2, DataConfig.USER_NAME1, DataConfig.PASS1);
+// } catch (Exception e) {
+// log.error("签退", e);
+// }
+// }
+// try {
+// Thread.sleep(1000 * 3);
+// } catch (Exception e) {
+// log.error("时间", e);
+// }
+// if (signOutwan2 == 0) {
+// try {
+// signOutwan2 = autoWebTask.dutySignOutTask(2, DataConfig.USER_NAME4, DataConfig.PASS4);
+// } catch (Exception e) {
+// log.error("签退", e);
+// }
+// }
+// }
+ if (signOutwan == 0) {
try {
- Thread.sleep(1000 * 3);
+ signOutwan = autoWebTask.dutySignOutTask(2, todaySignInPerson, todaySignInPersonPassword);
+ int code = autoWebTask.checkIsUpload(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 5, 1);
+ if (code == 0) {
+ signOutwan = autoWebTask.dutySignOutTask(2, todaySignInPerson, todaySignInPersonPassword);
+ }
} catch (Exception e) {
- log.error("时间", e);
- }
- if (signOutwan2 == 0){
- try {
- signOutwan2 = autoWebTask.dutySignOutTask(2, DataConfig.USER_NAME4, DataConfig.PASS4);
- }catch (Exception e){
- log.error("签退",e);
- }
- }
- }else {
- if (signOutwan == 0) {
- try {
- signOutzao = autoWebTask.dutySignOutTask(2, DataConfig.USER_NAME1, DataConfig.PASS1);
- }catch (Exception e){
- log.error("签退",e);
- }
- }
- try {
- Thread.sleep(1000 * 3);
- } catch (Exception e) {
- log.error("时间", e);
- }
- if (signOutwan2 == 0){
- try {
- signOutwan2 = autoWebTask.dutySignOutTask(2, DataConfig.USER_NAME2, DataConfig.PASS2);
- }catch (Exception e){
- log.error("签退",e);
- }
+ log.error("签退", e);
}
}
- }else if (DateTimeUtils.isEffectiveDate("18:20", "18:25")) {
- if(resetCode == 0){
- log.info("-----开始更新当日打卡人账号及日期-----");
- resetCode = AutoUtils.write("E:\\bns\\config\\account.txt","data:"+DateTimeUtils.getCurrentDay()+";num:"+ ("1".equals(num) ? "ok" : "1"));
+ try {
+ Thread.sleep(1000 * 3);
+ } catch (Exception e) {
+ log.error("时间", e);
+ }
+ if (signOutwan2 == 0) {
+ try {
+ signOutwan2 = autoWebTask.dutySignOutTask(2, todaySignInPerson1, todaySignInPersonPassword1);
+ int code = autoWebTask.checkIsUpload(2, 1, DataConfig.USER_NAME3, DataConfig.PASS3, 5, 2);
+ if (code == 0) {
+ signOutwan2 = autoWebTask.dutySignOutTask(2, todaySignInPerson1, todaySignInPersonPassword1);
+ }
+ } catch (Exception e) {
+ log.error("签退", e);
+ }
+ }
+ } else if (DateTimeUtils.isEffectiveDate("11:00", "11:05")) {
+ log.info("-----开始更新上次需签退账号-----");
+ if (resetCode == 0) {
+ String value = GetBasicData.resolveGarbledCode("E:\\bns\\config\\今日值班账号.txt");
+ resetCode = AutoUtils.write("E:\\bns\\config\\昨日值班账号.txt", value);
+ }
+ } else if (DateTimeUtils.isEffectiveDate("18:20", "18:25")) {
+ log.info("-----开始更新下次需签退账号-----");
+ if (resetCode1 == 0) {
+ String value = GetBasicData.resolveGarbledCode("E:\\bns\\config\\今日值班账号.txt");
+ resetCode1 = AutoUtils.write("E:\\bns\\config\\昨日值班账号.txt", value);
}
} else if (DateTimeUtils.isEffectiveDate("20:05", "20:08")) {//重置标识
log.info("-----开始重置各标识符-----");
@@ -667,6 +922,7 @@ public class TestMain {
logzao = 0;
logwan = 0;
resetCode = 0;
+ resetCode1 = 0;
addExercisePlan = 0;
} else {
continue;
@@ -690,7 +946,7 @@ public class TestMain {
return numbers;
}
- private void getTime(int code){
+ private void getTime(int code) {
int time = randNum(0, code);
log.info("随机时间为：" + time);
try {
diff --git a/src/main/java/com/bonus/autoweb/base/DataConfig.java b/src/main/java/com/bonus/autoweb/base/DataConfig.java
index 1895311..1aad81c 100644
--- a/src/main/java/com/bonus/autoweb/base/DataConfig.java
+++ b/src/main/java/com/bonus/autoweb/base/DataConfig.java
@@ -16,12 +16,14 @@ public class DataConfig {
/**
* 用户名1 方春芳
*/
- public static final String USER_NAME1 = "fangcf0043";
+// public static final String USER_NAME1 = "fangcf0043";
+ public static final String USER_NAME1 = "wangxf0016";
/**
* 密码1
*/
- public static final String PASS1 = "fcf--2868";
+// public static final String PASS1 = "fcf--2868";
+ public static final String PASS1 = "ahdl6851#*";
/**
* 用户名2 王鹤
diff --git a/src/main/java/com/bonus/autoweb/base/DutyChangeShifts.java b/src/main/java/com/bonus/autoweb/base/DutyChangeShifts.java
index be3c748..ab45d16 100644
--- a/src/main/java/com/bonus/autoweb/base/DutyChangeShifts.java
+++ b/src/main/java/com/bonus/autoweb/base/DutyChangeShifts.java
@@ -1,6 +1,7 @@
package com.bonus.autoweb.base;
import com.bonus.autoweb.DateTimeUtils;
+import com.bonus.autoweb.UI.frame.StringHelper;
import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
@@ -175,4 +176,169 @@ public class DutyChangeShifts {
}
+ public int checkIsUpload(int classes, int type, String userName, String pass, int dataType, int frequency) {
+ int count = 0;
+ try {
+ DutyClock dutyClock = new DutyClock(webDriver);
+ String tab = "";
+ String xpaht = "";
+ switch (dataType){
+ case 1:
+ //签到
+ webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[1]/div[2]/div/button[2]")).click();
+ tab = "tab-2";
+ if (frequency == 1){
+ if (classes == 1){
+ xpaht = "//*[@id=\"pane-2\"]/div/div[3]/div[1]/div[2]/div[3]/table/tbody/tr[1]/td[3]/div/span";
+ }else{
+ xpaht = "//*[@id=\"pane-2\"]/div/div[3]/div[2]/div[2]/div[3]/table/tbody/tr[1]/td[3]/div/span";
+ }
+ }else{
+ if (classes == 1){
+ xpaht = "//*[@id=\"pane-2\"]/div/div[3]/div[1]/div[2]/div[3]/table/tbody/tr[2]/td[3]/div/span";
+ }else{
+ xpaht = "//*[@id=\"pane-2\"]/div/div[3]/div[2]/div[2]/div[3]/table/tbody/tr[2]/td[3]/div/span";
+ }
+ }
+ break;
+ case 2:
+ //日报
+ tab = "tab-4";
+ webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[1]/div[2]/div/button[2]")).click();
+ if (classes == 1){
+ xpaht = "//*[@id=\"pane-4\"]/div/div[3]/div/div/div[3]/table/tbody/tr[1]/td[3]/div/div";
+ }else{
+ xpaht = "//*[@id=\"pane-4\"]/div/div[3]/div/div/div[3]/table/tbody/tr[2]/td[3]/div/div";
+ }
+ break;
+ case 3:
+ //日志
+ tab = "tab-5";
+ if (classes == 1){
+ changeCheckDay();
+ xpaht = "//*[@id=\"pane-5\"]/div/div[3]/div[2]/div/div[3]/table/tbody/tr/td[3]/div";
+ }else{
+ webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[1]/div[2]/div/button[2]")).click();
+ xpaht = "//*[@id=\"pane-5\"]/div/div[3]/div[1]/div/div[3]/table/tbody/tr/td[3]/div";
+ }
+ break;
+ case 4:
+ //交接班
+ tab = "tab-6";
+ if (frequency == 1){
+ if (classes == 1){
+ changeCheckDay();
+ xpaht = "//*[@id=\"pane-6\"]/div/div[3]/div[2]/div[2]/div[3]/table/tbody/tr[2]/td[3]/div/span";
+ }else{
+ webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[1]/div[2]/div/button[2]")).click();
+ xpaht = "//*[@id=\"pane-6\"]/div/div[3]/div[1]/div[2]/div[3]/table/tbody/tr[2]/td[3]/div/span";
+ }
+ }else{
+ if (classes == 1){
+ webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[1]/div[2]/div/button[2]")).click();
+ xpaht = "//*[@id=\"pane-6\"]/div/div[3]/div[1]/div[2]/div[3]/table/tbody/tr[1]/td[3]/div/span";
+ }else{
+ webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[1]/div[2]/div/button[2]")).click();
+ xpaht = "//*[@id=\"pane-6\"]/div/div[3]/div[2]/div[2]/div[3]/table/tbody/tr[1]/td[3]/div/span";
+ }
+ }
+ break;
+ case 5:
+ //签退
+ tab = "tab-2";
+ if (frequency == 1){
+ if (classes == 1){
+ changeCheckDay();
+ xpaht = "//*[@id=\"pane-2\"]/div/div[3]/div[2]/div[2]/div[3]/table/tbody/tr[1]/td[4]/div/span";
+ }else{
+ webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[1]/div[2]/div/button[2]")).click();
+ xpaht = "//*[@id=\"pane-2\"]/div/div[3]/div[1]/div[2]/div[3]/table/tbody/tr[1]/td[4]/div/span";
+ }
+ }else{
+ if (classes == 1){
+ changeCheckDay();
+ xpaht = "//*[@id=\"pane-2\"]/div/div[3]/div[2]/div[2]/div[3]/table/tbody/tr[2]/td[4]/div/span";
+ }else{
+ webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[1]/div[2]/div/button[2]")).click();
+ xpaht = "//*[@id=\"pane-2\"]/div/div[3]/div[1]/div[2]/div[3]/table/tbody/tr[2]/td[4]/div/span";
+ }
+ }
+ break;
+ default:
+ break;
+ }
+ dutyClock.changeTab(tab);
+ WebElement webElement = webDriver.findElement(By.xpath(xpaht));
+ String time = webElement.getText();
+ if (StringHelper.isEmpty(time)){
+ count = 0;
+ log.info("数据类型："+dataType+"classes："+classes+"frequency："+frequency+"上报时间:"+time);
+ }else{
+ log.info("数据类型："+dataType+"classes："+classes+"frequency："+frequency+"上报时间:"+time);
+ count = 1;
+ }
+ } catch (Exception e) {
+ log.error("签到任务", e);
+ }
+ return count;
+ }
+
+ public void changeCheckDay() throws Exception {
+ Thread.sleep(1000*3);
+ //判断当前日期是不是每月第一天的日期,true
+ log.info("选择前一天----------");
+ int tr = 1;
+ int td = 1;
+ String xpath;
+ if (!DateTimeUtils.isOneDay()) {
+ //不是本月第一天
+ String currentDay = DateTimeUtils.getCurrentDay();
+ log.info("currentDay:"+currentDay);
+ int weekNum = DateTimeUtils.getWeekNum(currentDay);
+ log.info("weekNum:"+weekNum);
+ int dayNum = DateTimeUtils.getWeekOfDate(currentDay);
+ log.info("dayNum:"+dayNum);
+ if (dayNum == 1) {
+ if(DateTimeUtils.getMonthOneDayIs0()){//第一天是0
+ tr = weekNum;
+ }else{
+ tr = weekNum-1;
+ if (weekNum == 1){
+ tr = 5;
+ }
+ }
+ td = 7;
+ }else {
+ if(DateTimeUtils.getMonthOneDayIs0()){//第一天是0
+ tr = weekNum+1;
+ }else{
+ tr = weekNum;
+ }
+ td = dayNum - 1;
+ }
+ xpath = "//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[2]/table/tbody/tr[" + tr + "]" + "/td[" + td + "]";
+ } else {
+ //点击上月按钮，切换至上月
+ webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[1]/div[2]/div/button[1]")).click();
+ log.info("点击上月按钮，切换至上月----------");
+ Thread.sleep(300);
+
+ //获取上月最后一天日期
+ String mothDay = DateTimeUtils.getBeforeLastMonthdate();
+ //判断上个月最后一天的位置
+ 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 + "]";
+ }
+ log.info("前一天的地址："+xpath);
+ //选择前一天的日期
+ webDriver.findElement(By.xpath(xpath)).click();
+ log.info("选择前一天的日期----------");
+ Thread.sleep(300);
+// //将日期选择回当日
+// webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[1]/div[2]/div/button[2]")).click();
+// log.info("将日期选择回当日----------");
+// Thread.sleep(300);
+
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/bonus/autoweb/base/DutyClock.java b/src/main/java/com/bonus/autoweb/base/DutyClock.java
index b79820c..f2b6bf9 100644
--- a/src/main/java/com/bonus/autoweb/base/DutyClock.java
+++ b/src/main/java/com/bonus/autoweb/base/DutyClock.java
@@ -30,6 +30,14 @@ public class DutyClock {
Thread.sleep(300);
}
+ public void changeTab(String tab) throws InterruptedException {
+ Thread.sleep(1000*4);
+ //定位值班打卡并点击
+ webDriver.findElement(By.id(tab)).click();
+ log.info("定位数据类型并点击----------");
+ Thread.sleep(300);
+ }
+
/**
* 值班打卡操作
*