diff --git a/src/com/szpg/task/ReadAssetInSpectionTask.java b/src/com/szpg/task/ReadAssetInSpectionTask.java index a95a28a..0499222 100644 --- a/src/com/szpg/task/ReadAssetInSpectionTask.java +++ b/src/com/szpg/task/ReadAssetInSpectionTask.java @@ -7,12 +7,9 @@ import com.szpg.db.dao.impl.PgAssetInSpectionImpl; import com.szpg.db.data.PgAssetInSpectionPlan; import com.szpg.db.data.PgAssetPlanJson; -import com.szpg.test; import com.szpg.util.HttpRequest; import org.apache.log4j.Logger; -import java.io.FileWriter; -import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -28,47 +25,40 @@ public void run(){ PgAssetInSpectionDao pgAssetInSpectionDao=new PgAssetInSpectionImpl(); - String startTime=pgAssetInSpectionDao.findLastRecordTime();//上次同步数据最后记录时间 - String endTime= dateFormat.format(new Date());//当前时间 - - if(startTime==null) - startTime=getYestodayStr(); - - StringBuilder sb = new StringBuilder(); - sb.append("tableName=").append(tableName); - sb.append("&page=-1"); - sb.append("&strWhere= UPDATEDATE"); - sb.append(" between '").append(startTime); - sb.append("' and '").append(endTime); - sb.append("'"); - - logger.info("开始请求巡检数据"); - String jsonStr = HttpRequest.sendPostByHttp(url, sb.toString()); - if (jsonStr.equals("")) - logger.error("巡检数据请求失败"); - else { - saveAsFileWriter(jsonStr,"d:\\test.txt"); - insertDB(pgAssetInSpectionDao, jsonStr); - logger.error("巡检数据存储成功"); - } - - } - - private void saveAsFileWriter(String content,String filePath) { - - FileWriter fwriter = null; try { - fwriter = new FileWriter(filePath); - fwriter.write(content); - } catch (IOException ex) { - ex.printStackTrace(); - } finally { - try { - fwriter.flush(); - fwriter.close(); - } catch (IOException ex) { - ex.printStackTrace(); + String endTime = dateFormat.format(new Date());//当前时间 + + String startTime = pgAssetInSpectionDao.findLastRecordTime();//上次同步数据最后记录时间 + if (startTime == null) { + Date dt = new Date(); + startTime = getStartDateStr(dt, -1); } + else + { + Date dtStart = dateFormat.parse(startTime); + startTime=getStartDateStr(dtStart,1); + } + + StringBuilder sb = new StringBuilder(); + sb.append("tableName=").append(tableName); + sb.append("&page=-1"); + sb.append("&strWhere= UPDATEDATE"); + sb.append(" between '").append(startTime); + sb.append("' and '").append(endTime); + sb.append("'"); + + logger.info("开始请求巡检数据"); + String jsonStr = HttpRequest.sendPostByHttp(url, sb.toString()); + if (jsonStr.equals("")) + logger.error("巡检数据请求失败"); + else { + insertDB(pgAssetInSpectionDao, jsonStr); + logger.error("巡检数据存储成功"); + } + } + catch(Exception ex) + { + ex.printStackTrace(); } } @@ -93,13 +83,13 @@ } - public String getYestodayStr() { - Date dt = new Date(); + public String getStartDateStr(Date dt,int d) { + String yesToday = ""; Date dtt = (Date) dt.clone(); Calendar calendar = Calendar.getInstance(); calendar.setTime(dtt); - calendar.add(Calendar.DAY_OF_MONTH, -1); + calendar.add(Calendar.DAY_OF_MONTH, d); yesToday = dateFormat.format(calendar.getTime()); return yesToday; diff --git a/src/com/szpg/task/ReadAssetInSpectionTask.java b/src/com/szpg/task/ReadAssetInSpectionTask.java index a95a28a..0499222 100644 --- a/src/com/szpg/task/ReadAssetInSpectionTask.java +++ b/src/com/szpg/task/ReadAssetInSpectionTask.java @@ -7,12 +7,9 @@ import com.szpg.db.dao.impl.PgAssetInSpectionImpl; import com.szpg.db.data.PgAssetInSpectionPlan; import com.szpg.db.data.PgAssetPlanJson; -import com.szpg.test; import com.szpg.util.HttpRequest; import org.apache.log4j.Logger; -import java.io.FileWriter; -import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -28,47 +25,40 @@ public void run(){ PgAssetInSpectionDao pgAssetInSpectionDao=new PgAssetInSpectionImpl(); - String startTime=pgAssetInSpectionDao.findLastRecordTime();//上次同步数据最后记录时间 - String endTime= dateFormat.format(new Date());//当前时间 - - if(startTime==null) - startTime=getYestodayStr(); - - StringBuilder sb = new StringBuilder(); - sb.append("tableName=").append(tableName); - sb.append("&page=-1"); - sb.append("&strWhere= UPDATEDATE"); - sb.append(" between '").append(startTime); - sb.append("' and '").append(endTime); - sb.append("'"); - - logger.info("开始请求巡检数据"); - String jsonStr = HttpRequest.sendPostByHttp(url, sb.toString()); - if (jsonStr.equals("")) - logger.error("巡检数据请求失败"); - else { - saveAsFileWriter(jsonStr,"d:\\test.txt"); - insertDB(pgAssetInSpectionDao, jsonStr); - logger.error("巡检数据存储成功"); - } - - } - - private void saveAsFileWriter(String content,String filePath) { - - FileWriter fwriter = null; try { - fwriter = new FileWriter(filePath); - fwriter.write(content); - } catch (IOException ex) { - ex.printStackTrace(); - } finally { - try { - fwriter.flush(); - fwriter.close(); - } catch (IOException ex) { - ex.printStackTrace(); + String endTime = dateFormat.format(new Date());//当前时间 + + String startTime = pgAssetInSpectionDao.findLastRecordTime();//上次同步数据最后记录时间 + if (startTime == null) { + Date dt = new Date(); + startTime = getStartDateStr(dt, -1); } + else + { + Date dtStart = dateFormat.parse(startTime); + startTime=getStartDateStr(dtStart,1); + } + + StringBuilder sb = new StringBuilder(); + sb.append("tableName=").append(tableName); + sb.append("&page=-1"); + sb.append("&strWhere= UPDATEDATE"); + sb.append(" between '").append(startTime); + sb.append("' and '").append(endTime); + sb.append("'"); + + logger.info("开始请求巡检数据"); + String jsonStr = HttpRequest.sendPostByHttp(url, sb.toString()); + if (jsonStr.equals("")) + logger.error("巡检数据请求失败"); + else { + insertDB(pgAssetInSpectionDao, jsonStr); + logger.error("巡检数据存储成功"); + } + } + catch(Exception ex) + { + ex.printStackTrace(); } } @@ -93,13 +83,13 @@ } - public String getYestodayStr() { - Date dt = new Date(); + public String getStartDateStr(Date dt,int d) { + String yesToday = ""; Date dtt = (Date) dt.clone(); Calendar calendar = Calendar.getInstance(); calendar.setTime(dtt); - calendar.add(Calendar.DAY_OF_MONTH, -1); + calendar.add(Calendar.DAY_OF_MONTH, d); yesToday = dateFormat.format(calendar.getTime()); return yesToday; diff --git a/src/com/szpg/task/ReadMaintanceTask.java b/src/com/szpg/task/ReadMaintanceTask.java index 1e7c811..dedab12 100644 --- a/src/com/szpg/task/ReadMaintanceTask.java +++ b/src/com/szpg/task/ReadMaintanceTask.java @@ -24,49 +24,42 @@ @Override public void run(){ PgMaintanceDao pgMaintanceDao=new PgMaintanceDaoImpl(); - Date date = new Date(); - String startTime=pgMaintanceDao.findLastRecordTime();//上次同步数据最后记录时间 - String endTime= dateFormat.format(date);//当前时间 - - if(startTime==null) - startTime=new ReadAssetInSpectionTask().getYestodayStr(); - - StringBuilder sb = new StringBuilder(); - sb.append("tableName = ").append(tableName); - sb.append("&page=-1"); - sb.append("&strWhere=采集时间"); - sb.append(" between '").append(startTime); - sb.append("' and '").append(endTime); - sb.append("'"); - - logger.info("开始请求维护数据"); - String jsonStr = HttpRequest.sendPostByHttp(url, sb.toString()); - saveAsFileWriter(jsonStr); - if(jsonStr.equals("")) - logger.info("维护数据请求失败"); - else { - insertDB(pgMaintanceDao, jsonStr); - logger.info("维护数据存储成功"); - } - } - - private String savefile = "D:\\test1.txt"; - private void saveAsFileWriter(String content) { - - FileWriter fwriter = null; try { - fwriter = new FileWriter(savefile); - fwriter.write(content); - } catch (IOException ex) { - ex.printStackTrace(); - } finally { - try { - fwriter.flush(); - fwriter.close(); - } catch (IOException ex) { - ex.printStackTrace(); + Date date = new Date(); + + String startTime = pgMaintanceDao.findLastRecordTime();//上次同步数据最后记录时间 + String endTime = dateFormat.format(date);//当前时间 + + if (startTime == null) { + Date dt = new Date(); + startTime = new ReadAssetInSpectionTask().getStartDateStr(dt, -1); + } else { + Date dtStart = dateFormat.parse(startTime); + startTime = new ReadAssetInSpectionTask().getStartDateStr(dtStart, 1); } + + StringBuilder sb = new StringBuilder(); + sb.append("tableName = ").append(tableName); + sb.append("&page=-1"); + sb.append("&strWhere=采集时间"); + sb.append(" between '").append(startTime); + sb.append("' and '").append(endTime); + sb.append("'"); + + logger.info("开始请求维护数据"); + String jsonStr = HttpRequest.sendPostByHttp(url, sb.toString()); + + if (jsonStr.equals("")) + logger.info("维护数据请求失败"); + else { + insertDB(pgMaintanceDao, jsonStr); + logger.info("维护数据存储成功"); + } + } + catch(Exception ex) + { + ex.printStackTrace(); } }