系统更新
This commit is contained in:
		
							parent
							
								
									7ae9d8e8a2
								
							
						
					
					
						commit
						21c0b2bdc2
					
				| 
						 | 
				
			
			@ -248,7 +248,7 @@ public class GetBasicData {
 | 
			
		|||
        Thread.sleep(5000);
 | 
			
		||||
        String code = "";
 | 
			
		||||
 | 
			
		||||
        String code_child = "灵璧公司安排抢修以伍12支(主网10支,配网2支)、车辆12台、发电机1台、照明灯40套、配变10台、箱变4台、电缆1千米、电杆50根、金具50套、绝缘子100串。";
 | 
			
		||||
        String code_child = "宿州灵璧公司安排抢修以伍12支(主网10支,配网2支)、车辆12台、发电机1台、照明灯40套、配变10台、箱变4台、电缆1千米、电杆50根、金具50套、绝缘子100串。";
 | 
			
		||||
        String code_chlid2 = "针对此次预警,今日宿州灵璧供电公司开展预警响应,对重要保电线路、变电站进行特巡,安排抢修队伍、绑定应急车辆、装备,抢修队长,通过i" +
 | 
			
		||||
                "国网反馈巡视照片、视频,在新一代系统里均形成巡视记录、车辆队伍轨迹,未发现问题。";
 | 
			
		||||
        //判断是否有发布数据
 | 
			
		||||
| 
						 | 
				
			
			@ -314,19 +314,47 @@ public class GetBasicData {
 | 
			
		|||
        logBean.setGeneral_chronicles_content(logBean.getGeneral_chronicles_content());
 | 
			
		||||
        insertData(null, logBean, "log");
 | 
			
		||||
        log.info("天气预警日志更新完成");
 | 
			
		||||
        dailyBean.setWarning_company(data+code + code_child + dailyContentArrayArray[20]+code_chlid2);
 | 
			
		||||
        if ("0".equals(numClasses.getText())) {
 | 
			
		||||
            dailyBean.setWarning_company(data+code + code_child);
 | 
			
		||||
            dailyBean.setWarning_company_impatient(data+code + code_child);
 | 
			
		||||
            dailyBean2.setWarning_company(data+code + code_child );
 | 
			
		||||
            dailyBean2.setWarning_company_impatient(data +code + code_child);
 | 
			
		||||
            dailyBean.setImportant_matters(data + "1"+code +"2"+dailyContentArrayArray[5].trim());
 | 
			
		||||
            dailyBean2.setImportant_matters(data + "1"+code +"2"+dailyContentArrayArray[5].trim());
 | 
			
		||||
        }else {
 | 
			
		||||
            dailyBean.setWarning_company(data+code +"对系统检测图层中气象实况风速、温度、降雨进行查看、对专题灾害图层地震、台风防汛进行查看均正常,未对宿州灵璧" +
 | 
			
		||||
                    "辖区造成影响。通过首页公共气象图层检查宿州灵璧境内公共预警正常;降雨预报、预警正常;雷达预报正常。"+ code_child);
 | 
			
		||||
            dailyBean.setWarning_company_impatient(data+code +"对系统检测图层中气象实况风速、温度、降雨进行查看、对专题灾害图层地震、台风防汛进行查看均正常,未对宿州灵璧" +
 | 
			
		||||
                    "辖区造成影响。通过首页公共气象图层检查宿州灵璧境内公共预警正常;降雨预报、预警正常;雷达预报正常。"+ code_child);
 | 
			
		||||
            dailyBean2.setWarning_company(data+code +"对系统检测图层中气象实况风速、温度、降雨进行查看、对专题灾害图层地震、台风防汛进行查看均正常,未对宿州灵璧" +
 | 
			
		||||
                    "辖区造成影响。通过首页公共气象图层检查宿州灵璧境内公共预警正常;降雨预报、预警正常;雷达预报正常。"+ code_child);
 | 
			
		||||
            dailyBean2.setWarning_company_impatient(data+code +"对系统检测图层中气象实况风速、温度、降雨进行查看、对专题灾害图层地震、台风防汛进行查看均正常,未对宿州灵璧" +
 | 
			
		||||
                    "辖区造成影响。通过首页公共气象图层检查宿州灵璧境内公共预警正常;降雨预报、预警正常;雷达预报正常。"+ code_child);
 | 
			
		||||
            dailyBean.setImportant_matters(data + "1"+code +"对系统检测图层中气象实况风速、温度、降雨进行查看、对专题灾害图层地震、台风防汛进行查看均正常,未对宿州灵璧" +
 | 
			
		||||
                    "辖区造成影响。通过首页公共气象图层检查宿州灵璧境内公共预警正常;降雨预报、预警正常;雷达预报正常。"+"2"+dailyContentArrayArray[5].trim());
 | 
			
		||||
            dailyBean2.setImportant_matters(data + "1"+code +"对系统检测图层中气象实况风速、温度、降雨进行查看、对专题灾害图层地震、台风防汛进行查看均正常,未对宿州灵璧" +
 | 
			
		||||
                    "辖区造成影响。通过首页公共气象图层检查宿州灵璧境内公共预警正常;降雨预报、预警正常;雷达预报正常。"+"2"+dailyContentArrayArray[5].trim());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        //一、总体情况
 | 
			
		||||
        dailyBean.setOverall(data + dailyContentArrayArray[2].trim() + (classes == 1 ? data3+"08:30," : data2+"17:30" +
 | 
			
		||||
        /*dailyBean.setOverall(data + dailyContentArrayArray[2].trim() + (classes == 1 ? data3+"08:30," : data2+"17:30" +
 | 
			
		||||
                ",") + dailyContentArrayArray[3].trim() + code +
 | 
			
		||||
                "对系统检测图层中气象实况风速、温度、降雨进行查看、对专题灾害图层地震、台风防汛进行查看均正常,未对宿州灵璧辖区造成影响。通过首页公共气象图层检查宿州灵璧境内公共预警正常;降雨预报、预警正常;雷达预报正常。");
 | 
			
		||||
        */
 | 
			
		||||
        dailyBean.setOverall(data + dailyContentArrayArray[2].trim());
 | 
			
		||||
        dailyBean.setPersonnel_daily_work(dailyBean.getPersonnel_daily_work());
 | 
			
		||||
//        +("0".equals(numClasses.getText())  ?  "" :"针对此次预警,今日砀山供电公司开展预警响应,对重要保电线路、变电站进行特巡,安排抢修队伍、绑定应急车辆、装备,抢修队长,通过i国网反馈巡视照片、视频,在新一代系统里均形成巡视记录、车辆队伍轨迹,未发现问题")
 | 
			
		||||
        dailyBean2.setOverall(data + dailyContentArrayArray[2].trim() + (classes == 1 ? data3+"08:30," : data2+"17:30" +
 | 
			
		||||
       /* dailyBean2.setOverall(data + dailyContentArrayArray[2].trim() + (classes == 1 ? data3+"08:30," : data2+"17:30" +
 | 
			
		||||
                ",") + dailyContentArrayArray[3].trim() + code +
 | 
			
		||||
                "对系统检测图层中气象实况风速、温度、降雨进行查看、对专题灾害图层地震、台风防汛进行查看均正常,未对宿州灵璧辖区造成影响。通过首页公共气象图层检查宿州灵璧内公共预警正常;降雨预报、预警正常;雷达预报正常。");
 | 
			
		||||
        */
 | 
			
		||||
        dailyBean2.setOverall(data + dailyContentArrayArray[2].trim());
 | 
			
		||||
        dailyBean2.setPersonnel_daily_work(dailyBean2.getPersonnel_daily_work());
 | 
			
		||||
        dailyBean2.setWarning_company(data+code+ code_child + dailyContentArrayArray[20]+code_chlid2);
 | 
			
		||||
        //dailyBean2.setWarning_company(data+code+ code_child + dailyContentArrayArray[20]+code_chlid2);
 | 
			
		||||
       /* dailyBean2.setWarning_company(code +"对系统检测图层中气象实况风速、温度、降雨进行查看、对专题灾害图层地震、台风防汛进行查看均正常,未对宿州灵璧" +
 | 
			
		||||
                "辖区造成影响。通过首页公共气象图层检查宿州灵璧境内公共预警正常;降雨预报、预警正常;雷达预报正常。"+ code_child);
 | 
			
		||||
        dailyBean2.setWarning_company_impatient(code +"对系统检测图层中气象实况风速、温度、降雨进行查看、对专题灾害图层地震、台风防汛进行查看均正常,未对宿州灵璧" +
 | 
			
		||||
                "辖区造成影响。通过首页公共气象图层检查宿州灵璧境内公共预警正常;降雨预报、预警正常;雷达预报正常。"+ code_child);*/
 | 
			
		||||
        insertData(dailyBean, null, "morning_daily");
 | 
			
		||||
        insertData(dailyBean2, null, "evening_daily");
 | 
			
		||||
        log.info("日志内容:" + readDutyBean());
 | 
			
		||||
| 
						 | 
				
			
			@ -370,27 +398,27 @@ public class GetBasicData {
 | 
			
		|||
            //早报
 | 
			
		||||
            String data = data2 + "17:30至" + data3 + "08:30,";
 | 
			
		||||
            //二、重要事项
 | 
			
		||||
            dailyBean.setImportant_matters(data + dailyContentArrayArray[5].trim());
 | 
			
		||||
            //dailyBean.setImportant_matters(data + dailyContentArrayArray[5].trim());
 | 
			
		||||
            //三、安全生产情况
 | 
			
		||||
            dailyBean.setSafety_production(data + dailyContentArrayArray[7].trim());
 | 
			
		||||
            //四、值班员日常工作情况
 | 
			
		||||
            dailyBean.setPersonnel_daily_work(data + dailyContentArrayArray[9].trim() + "(4)资源核查:"+checkContentArrayArray[num]+dailyContentArrayArray[10]+"(7)、视频核查:灵璧县公司对1座变电站视频监控进行检查,发现"+videoContentArr[videoNum]+"视频接入正常。");
 | 
			
		||||
            //五、供电保障情况
 | 
			
		||||
            //(一)今日重大活动保电情况
 | 
			
		||||
            dailyBean.setPower_guarantee_today_work(dailyContentArrayArray[13]);
 | 
			
		||||
            dailyBean.setPower_guarantee_today_work(dailyContentArrayArray[12]);
 | 
			
		||||
            //(二)明日重大活动保电安排
 | 
			
		||||
            dailyBean.setPower_guarantee_tomorrow_work(dailyContentArrayArray[15]);
 | 
			
		||||
            dailyBean.setPower_guarantee_tomorrow_work(dailyContentArrayArray[14]);
 | 
			
		||||
            //(三)今日疫情防控应急保电情况
 | 
			
		||||
            dailyBean.setPower_guarantee_today_pestilence(dailyContentArrayArray[17]);
 | 
			
		||||
            dailyBean.setPower_guarantee_today_pestilence(dailyContentArrayArray[16]);
 | 
			
		||||
            //六、预警及应急响应情况
 | 
			
		||||
            //(一)公司预警情况   --另外一个方法使用
 | 
			
		||||
 | 
			
		||||
            //(二)公司应急响应情况
 | 
			
		||||
            dailyBean.setWarning_company_impatient(data + dailyContentArrayArray[22]);
 | 
			
		||||
            //dailyBean.setWarning_company_impatient(data + dailyContentArrayArray[22]);
 | 
			
		||||
            //(三)社会突发事件救援及处置情况
 | 
			
		||||
            dailyBean.setWarning_society_emergency(data + dailyContentArrayArray[24]);
 | 
			
		||||
            dailyBean.setWarning_society_emergency(data + dailyContentArrayArray[23]);
 | 
			
		||||
            //七、其他情况说明
 | 
			
		||||
            dailyBean.setOther_situations(data + dailyContentArrayArray[26]);
 | 
			
		||||
            dailyBean.setOther_situations(data + dailyContentArrayArray[25]);
 | 
			
		||||
            //附件表一
 | 
			
		||||
            dailyBean.getOneBean().setExercise_person_num(getRandom(1, 50) + "");
 | 
			
		||||
            dailyBean.getOneBean().setExercise_vehicle_num(getRandom(1, 20) + "");
 | 
			
		||||
| 
						 | 
				
			
			@ -425,7 +453,7 @@ public class GetBasicData {
 | 
			
		|||
            String data = data2 + "08:30至" + data2 + "17:30,";
 | 
			
		||||
            //一、总体情况
 | 
			
		||||
            //二、重要事项
 | 
			
		||||
            dailyBean2.setImportant_matters(data + dailyContentArrayArray[5].trim());
 | 
			
		||||
            //dailyBean2.setImportant_matters(data + dailyContentArrayArray[5].trim());
 | 
			
		||||
            //三、安全生产情况
 | 
			
		||||
            //三、安全生产情况
 | 
			
		||||
            dailyBean2.setSafety_production(data + dailyContentArrayArray[7].trim());
 | 
			
		||||
| 
						 | 
				
			
			@ -433,20 +461,20 @@ public class GetBasicData {
 | 
			
		|||
            dailyBean2.setPersonnel_daily_work(data + dailyContentArrayArray[9].trim() + "(4)资源核查:"+checkContentArrayArray[num]+dailyContentArrayArray[10]+"(7)视频核查:灵璧县公司对1座变电站视频监控进行检查,发现"+videoContentArr[videoNum]+"视频接入正常。");
 | 
			
		||||
            //五、供电保障情况
 | 
			
		||||
            //(一)今日重大活动保电情况
 | 
			
		||||
            dailyBean2.setPower_guarantee_today_work(dailyContentArrayArray[13]);
 | 
			
		||||
            dailyBean2.setPower_guarantee_today_work(dailyContentArrayArray[12]);
 | 
			
		||||
            //(二)明日重大活动保电安排
 | 
			
		||||
            dailyBean2.setPower_guarantee_tomorrow_work(dailyContentArrayArray[15]);
 | 
			
		||||
            dailyBean2.setPower_guarantee_tomorrow_work(dailyContentArrayArray[14]);
 | 
			
		||||
            //(三)今日疫情防控应急保电情况
 | 
			
		||||
            dailyBean2.setPower_guarantee_today_pestilence(dailyContentArrayArray[17]);
 | 
			
		||||
            dailyBean2.setPower_guarantee_today_pestilence(dailyContentArrayArray[16]);
 | 
			
		||||
            //六、预警及应急响应情况
 | 
			
		||||
            //(一)公司预警情况   --另外一个方法使用
 | 
			
		||||
 | 
			
		||||
            //(二)公司应急响应情况
 | 
			
		||||
            dailyBean2.setWarning_company_impatient(data + dailyContentArrayArray[22]);
 | 
			
		||||
            //dailyBean2.setWarning_company_impatient(data + dailyContentArrayArray[22]);
 | 
			
		||||
            //(三)社会突发事件救援及处置情况
 | 
			
		||||
            dailyBean2.setWarning_society_emergency(data + dailyContentArrayArray[24]);
 | 
			
		||||
            dailyBean2.setWarning_society_emergency(data + dailyContentArrayArray[23]);
 | 
			
		||||
            //七、其他情况说明
 | 
			
		||||
            dailyBean2.setOther_situations(data + dailyContentArrayArray[26]);
 | 
			
		||||
            dailyBean2.setOther_situations(data + dailyContentArrayArray[25]);
 | 
			
		||||
            //附件表一
 | 
			
		||||
            dailyBean2.getOneBean().setExercise_person_num(getRandom(1, 50) + "");
 | 
			
		||||
            dailyBean2.getOneBean().setExercise_vehicle_num(getRandom(1, 20) + "");
 | 
			
		||||
| 
						 | 
				
			
			@ -595,20 +623,20 @@ public class GetBasicData {
 | 
			
		|||
        dailyBean.setPersonnel_daily_work(data + dailyContentArrayArray[9].trim() + "(4)资源核查:"+checkContentArrayArray[num]+dailyContentArrayArray[10]+"(7)视频核查:灵璧县公司对1座变电站视频监控进行检查,发现"+videoContentArr[videoNum]+"视频接入正常。");
 | 
			
		||||
        //五、供电保障情况
 | 
			
		||||
        //(一)今日重大活动保电情况
 | 
			
		||||
        dailyBean.setPower_guarantee_today_work(dailyContentArrayArray[13]);
 | 
			
		||||
        dailyBean.setPower_guarantee_today_work(dailyContentArrayArray[12]);
 | 
			
		||||
        //(二)明日重大活动保电安排
 | 
			
		||||
        dailyBean.setPower_guarantee_tomorrow_work(dailyContentArrayArray[15]);
 | 
			
		||||
        dailyBean.setPower_guarantee_tomorrow_work(dailyContentArrayArray[14]);
 | 
			
		||||
        //(三)今日疫情防控应急保电情况
 | 
			
		||||
        dailyBean.setPower_guarantee_today_pestilence(dailyContentArrayArray[17]);
 | 
			
		||||
        dailyBean.setPower_guarantee_today_pestilence(dailyContentArrayArray[16]);
 | 
			
		||||
        //六、预警及应急响应情况
 | 
			
		||||
        //(一)公司预警情况   --另外一个方法使用
 | 
			
		||||
 | 
			
		||||
        //(二)公司应急响应情况
 | 
			
		||||
        dailyBean.setWarning_company_impatient(data + dailyContentArrayArray[22]);
 | 
			
		||||
        //dailyBean.setWarning_company_impatient(data + dailyContentArrayArray[22]);
 | 
			
		||||
        //(三)社会突发事件救援及处置情况
 | 
			
		||||
        dailyBean.setWarning_society_emergency(data + dailyContentArrayArray[24]);
 | 
			
		||||
        dailyBean.setWarning_society_emergency(data + dailyContentArrayArray[23]);
 | 
			
		||||
        //七、其他情况说明
 | 
			
		||||
        dailyBean.setOther_situations(data + dailyContentArrayArray[26]);
 | 
			
		||||
        dailyBean.setOther_situations(data + dailyContentArrayArray[25]);
 | 
			
		||||
        //附件表一
 | 
			
		||||
        dailyBean.getOneBean().setExercise_person_num(getRandom(1, 50) + "");
 | 
			
		||||
        dailyBean.getOneBean().setExercise_vehicle_num(getRandom(1, 20) + "");
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
 | 
			
		|||
 */
 | 
			
		||||
public class TestMain {
 | 
			
		||||
    private static Logger log = LoggerFactory.getLogger(TestMain.class);
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    public static void main(String[] args) throws Exception {
 | 
			
		||||
        log.info("执行任务开始。。。。。。");
 | 
			
		||||
//        testRCCL();
 | 
			
		||||
| 
						 | 
				
			
			@ -149,6 +149,34 @@ public class TestMain {
 | 
			
		|||
        return count;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private static int testqd() {
 | 
			
		||||
        int count = 0;
 | 
			
		||||
        try {
 | 
			
		||||
            //操作日志
 | 
			
		||||
            AutoWebTask autoWebTask = new AutoWebTask();
 | 
			
		||||
            autoWebTask.dutySigin(2, 1, DataConfig.USER_NAME1, DataConfig.PASS1);
 | 
			
		||||
            Thread.sleep(2000);
 | 
			
		||||
            autoWebTask.dutySigin(2, 1, DataConfig.USER_NAME2, DataConfig.PASS2);
 | 
			
		||||
        } catch (Exception e) {
 | 
			
		||||
            e.printStackTrace();
 | 
			
		||||
        }
 | 
			
		||||
        return count;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private static int testjjb() {
 | 
			
		||||
        int count = 0;
 | 
			
		||||
        try {
 | 
			
		||||
            //操作日志
 | 
			
		||||
            AutoWebTask autoWebTask = new AutoWebTask();
 | 
			
		||||
            autoWebTask.dutyChangeTask1(2, DataConfig.USER_NAME1, DataConfig.PASS1);
 | 
			
		||||
            Thread.sleep(2000);
 | 
			
		||||
            autoWebTask.dutyChangeTask2(2, DataConfig.USER_NAME1, DataConfig.PASS1);
 | 
			
		||||
        } catch (Exception e) {
 | 
			
		||||
            e.printStackTrace();
 | 
			
		||||
        }
 | 
			
		||||
        return count;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 自动化任务
 | 
			
		||||
     *
 | 
			
		||||
| 
						 | 
				
			
			@ -192,47 +220,47 @@ public class TestMain {
 | 
			
		|||
                log.error("时间", e);
 | 
			
		||||
            }
 | 
			
		||||
            log.info("服务正在运行。。。" + new Date());
 | 
			
		||||
            if(DateTimeUtils.isEffectiveDate("18:10", "18:40")){
 | 
			
		||||
            if (DateTimeUtils.isEffectiveDate("18:10", "18:40")) {
 | 
			
		||||
                //进行日报信息系统采集及获取工作
 | 
			
		||||
                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:29", "06:59")) {
 | 
			
		||||
            } else if (DateTimeUtils.isEffectiveDate("06:29", "06:59")) {
 | 
			
		||||
                //自动完成当值值班日报(早报)填写上报
 | 
			
		||||
                if (dailyzao == 0) {
 | 
			
		||||
                    getTime(900);
 | 
			
		||||
                    try {
 | 
			
		||||
                        dailyzao = autoWebTask.dutyAddDailyLogsTask(1,DataConfig.USER_NAME1,DataConfig.PASS1);
 | 
			
		||||
                    }catch (Exception e){
 | 
			
		||||
                        dailyzao = autoWebTask.dutyAddDailyLogsTask(1, DataConfig.USER_NAME1, DataConfig.PASS1);
 | 
			
		||||
                    } 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(600);
 | 
			
		||||
                    try {
 | 
			
		||||
                        logzao = autoWebTask.dutyAddLogsTask(1,DataConfig.USER_NAME1,DataConfig.PASS1);
 | 
			
		||||
                    }catch (Exception e){
 | 
			
		||||
                        logzao = autoWebTask.dutyAddLogsTask(1, DataConfig.USER_NAME1, DataConfig.PASS1);
 | 
			
		||||
                    } catch (Exception e) {
 | 
			
		||||
                        log.error("日志工作", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }else if (DateTimeUtils.isEffectiveDate("07:31", "07:59")) {
 | 
			
		||||
            } else if (DateTimeUtils.isEffectiveDate("07:31", "07:59")) {
 | 
			
		||||
                //自动完成当值值班签到(值班主任、值班人员都要签到)
 | 
			
		||||
                if (signInzao == 0 && signInzao2 == 0){
 | 
			
		||||
                        getTime(600);
 | 
			
		||||
                    }
 | 
			
		||||
                if (signInzao == 0 && signInzao2 == 0) {
 | 
			
		||||
                    getTime(600);
 | 
			
		||||
                }
 | 
			
		||||
                if (signInzao == 0) {
 | 
			
		||||
                    log.info("郭建账号开始打卡任务---------------------");
 | 
			
		||||
                    //使用郭建账号签到
 | 
			
		||||
| 
						 | 
				
			
			@ -256,7 +284,7 @@ public class TestMain {
 | 
			
		|||
                        log.error("王宗彦打卡任务", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }else if (DateTimeUtils.isEffectiveDate("08:10", "08:20")) {
 | 
			
		||||
            } else if (DateTimeUtils.isEffectiveDate("08:10", "08:20")) {
 | 
			
		||||
//                if (jjbzao == 0 && jjbzao2 == 0){
 | 
			
		||||
//                    getTime(420);
 | 
			
		||||
//                }
 | 
			
		||||
| 
						 | 
				
			
			@ -269,21 +297,21 @@ public class TestMain {
 | 
			
		|||
//                        jjbzao2 = autoWebTask.dutyChangeTask2(1,DataConfig.USER_NAME1,DataConfig.PASS1);
 | 
			
		||||
//                    }
 | 
			
		||||
//                }
 | 
			
		||||
                if (jjbzao == 0){
 | 
			
		||||
                if (jjbzao == 0) {
 | 
			
		||||
                    getTime(420);
 | 
			
		||||
                }
 | 
			
		||||
                if (jjbzao == 0){
 | 
			
		||||
                if (jjbzao == 0) {
 | 
			
		||||
                    jjbzao = autoWebTask.dutyChangeTask(1);
 | 
			
		||||
                }
 | 
			
		||||
            }else if (DateTimeUtils.isEffectiveDate("08:31", "08:40")) {
 | 
			
		||||
                if(signOutzao == 0 && signOutzao2 == 0){
 | 
			
		||||
            } else if (DateTimeUtils.isEffectiveDate("08:31", "08:40")) {
 | 
			
		||||
                if (signOutzao == 0 && signOutzao2 == 0) {
 | 
			
		||||
                    getTime(420);
 | 
			
		||||
                }
 | 
			
		||||
                if (signOutzao == 0) {
 | 
			
		||||
                    try {
 | 
			
		||||
                        signOutzao = autoWebTask.dutySignOutTask(1, DataConfig.USER_NAME1, DataConfig.PASS1);
 | 
			
		||||
                    }catch (Exception e){
 | 
			
		||||
                        log.error("签退",e);
 | 
			
		||||
                    } catch (Exception e) {
 | 
			
		||||
                        log.error("签退", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                try {
 | 
			
		||||
| 
						 | 
				
			
			@ -291,18 +319,18 @@ public class TestMain {
 | 
			
		|||
                } catch (Exception e) {
 | 
			
		||||
                    log.error("时间", e);
 | 
			
		||||
                }
 | 
			
		||||
                if (signOutzao2 == 0){
 | 
			
		||||
                if (signOutzao2 == 0) {
 | 
			
		||||
                    try {
 | 
			
		||||
                        signOutzao2 = autoWebTask.dutySignOutTask(1, DataConfig.USER_NAME2, DataConfig.PASS2);
 | 
			
		||||
                    }catch (Exception e){
 | 
			
		||||
                        log.error("签退",e);
 | 
			
		||||
                    } catch (Exception e) {
 | 
			
		||||
                        log.error("签退", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }else if (DateTimeUtils.isEffectiveDate("08:50", "09:10")){
 | 
			
		||||
                if(addExercisePlan == 0){
 | 
			
		||||
            } else if (DateTimeUtils.isEffectiveDate("08:50", "09:10")) {
 | 
			
		||||
                if (addExercisePlan == 0) {
 | 
			
		||||
                    getTime(1200);
 | 
			
		||||
                }
 | 
			
		||||
                if(addExercisePlan == 0) {
 | 
			
		||||
                if (addExercisePlan == 0) {
 | 
			
		||||
                    addExercisePlan = autoWebTask.addExercisePlan("通信测试", "", 0, DataConfig.USER_NAME1,
 | 
			
		||||
                            DataConfig.PASS1);
 | 
			
		||||
                    Thread.sleep(1000 * 650);
 | 
			
		||||
| 
						 | 
				
			
			@ -310,45 +338,45 @@ public class TestMain {
 | 
			
		|||
                            DataConfig.PASS1);
 | 
			
		||||
                    Thread.sleep(2000);
 | 
			
		||||
                }
 | 
			
		||||
            }else if (DateTimeUtils.isEffectiveDate("12:30", "16:20")) {
 | 
			
		||||
            } else if (DateTimeUtils.isEffectiveDate("12:30", "16:20")) {
 | 
			
		||||
                //进行日志信息系统采集及获取工作
 | 
			
		||||
                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(700);
 | 
			
		||||
                    try {
 | 
			
		||||
                        dailywan = autoWebTask.dutyAddDailyLogsTask(2,DataConfig.USER_NAME1,DataConfig.PASS1);
 | 
			
		||||
                    }catch (Exception e){
 | 
			
		||||
                        dailywan = autoWebTask.dutyAddDailyLogsTask(2, DataConfig.USER_NAME1, DataConfig.PASS1);
 | 
			
		||||
                    } catch (Exception e) {
 | 
			
		||||
                        log.error("日报工作", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }else if (DateTimeUtils.isEffectiveDate("16:30", "16:45")) {
 | 
			
		||||
            } else if (DateTimeUtils.isEffectiveDate("16:30", "16:45")) {
 | 
			
		||||
//            }else if (DateTimeUtils.isEffectiveDate("10:00", "16:45")) {
 | 
			
		||||
                //完成值班日志填写提交(白班日志,此次值班日志为总结前一天晚上的情况)
 | 
			
		||||
                if (logwan == 0) {
 | 
			
		||||
                    getTime(600);
 | 
			
		||||
                    try {
 | 
			
		||||
                        logwan = autoWebTask.dutyAddLogsTask(2,DataConfig.USER_NAME1,DataConfig.PASS1);
 | 
			
		||||
                    }catch (Exception e){
 | 
			
		||||
                        logwan = autoWebTask.dutyAddLogsTask(2, DataConfig.USER_NAME1, DataConfig.PASS1);
 | 
			
		||||
                    } catch (Exception e) {
 | 
			
		||||
                        log.error("日志工作", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }else if (DateTimeUtils.isEffectiveDate("16:46", "16:59")) {
 | 
			
		||||
            } else if (DateTimeUtils.isEffectiveDate("16:46", "16:59")) {
 | 
			
		||||
                //自动完成当值值班签到(值班主任、值班人员都要签到)
 | 
			
		||||
                if(signInwan == 0 && signInwan2 == 0){
 | 
			
		||||
                if (signInwan == 0 && signInwan2 == 0) {
 | 
			
		||||
                    getTime(550);
 | 
			
		||||
                }
 | 
			
		||||
                if (signInwan == 0) {
 | 
			
		||||
| 
						 | 
				
			
			@ -374,28 +402,28 @@ public class TestMain {
 | 
			
		|||
                        log.error("王宗彦打卡任务", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }else if (DateTimeUtils.isEffectiveDate("17:30", "17:45")) {
 | 
			
		||||
            } else if (DateTimeUtils.isEffectiveDate("17:30", "17:45")) {
 | 
			
		||||
                //自动在系统内完成接班(上一值完成交班后)
 | 
			
		||||
                if(jjbwan == 0 && jjbwan2 == 0){
 | 
			
		||||
                if (jjbwan == 0 && jjbwan2 == 0) {
 | 
			
		||||
                    getTime(600);
 | 
			
		||||
                }
 | 
			
		||||
                if (jjbwan == 0 || jjbwan2 == 0){
 | 
			
		||||
                    if (jjbwan == 0){
 | 
			
		||||
                        jjbwan = autoWebTask.dutyChangeTask1(2,DataConfig.USER_NAME1,DataConfig.PASS1);
 | 
			
		||||
                if (jjbwan == 0 || jjbwan2 == 0) {
 | 
			
		||||
                    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, DataConfig.USER_NAME1, DataConfig.PASS1);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }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 (signOutwan == 0) {
 | 
			
		||||
                    try {
 | 
			
		||||
                        signOutwan = autoWebTask.dutySignOutTask(2, DataConfig.USER_NAME1, DataConfig.PASS1);
 | 
			
		||||
                    }catch (Exception e){
 | 
			
		||||
                        log.error("签退",e);
 | 
			
		||||
                    } catch (Exception e) {
 | 
			
		||||
                        log.error("签退", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                try {
 | 
			
		||||
| 
						 | 
				
			
			@ -403,15 +431,14 @@ public class TestMain {
 | 
			
		|||
                } catch (Exception e) {
 | 
			
		||||
                    log.error("时间", e);
 | 
			
		||||
                }
 | 
			
		||||
                if (signOutwan2 == 0){
 | 
			
		||||
                if (signOutwan2 == 0) {
 | 
			
		||||
                    try {
 | 
			
		||||
                        signOutwan2 = autoWebTask.dutySignOutTask(2, DataConfig.USER_NAME2, DataConfig.PASS2);
 | 
			
		||||
                    }catch (Exception e){
 | 
			
		||||
                        log.error("签退",e);
 | 
			
		||||
                    } catch (Exception e) {
 | 
			
		||||
                        log.error("签退", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            else if (DateTimeUtils.isEffectiveDate("20:05", "20:08")) {//重置标识
 | 
			
		||||
            } else if (DateTimeUtils.isEffectiveDate("20:05", "20:08")) {//重置标识
 | 
			
		||||
                log.info("-----开始重置各标识符-----");
 | 
			
		||||
                logGatherCount = 0;
 | 
			
		||||
                logGatherCount1 = 0;
 | 
			
		||||
| 
						 | 
				
			
			@ -457,7 +484,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 {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -66,7 +66,7 @@ public class DutyChangeShifts {
 | 
			
		|||
        Thread.sleep(1000*2);
 | 
			
		||||
        webDriver.findElement(By.xpath(xpaht)).click();
 | 
			
		||||
        log.info("定位交接班并点击2----------");
 | 
			
		||||
        Thread.sleep(5000);
 | 
			
		||||
        Thread.sleep(7000);
 | 
			
		||||
        //交接事项说明
 | 
			
		||||
        if (type == 1) {
 | 
			
		||||
//            /html/body/div[3]/div/div[2]/div/form/div[7]/div/div[1]/textarea
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue