From b2169019c79801bb9aadcc74737ca6585127619f Mon Sep 17 00:00:00 2001
From: unknown <yuanhung@ximple.com.tw>
Date: Thu, 12 Jun 2014 16:12:57 +0800
Subject: [PATCH] Merge branch 'origin/2.1.x' ndd
---
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/DMMSNddUpdateJob.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/DMMSNddUpdateJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/DMMSNddUpdateJob.java
index ae62dc1..c35dcbb 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/DMMSNddUpdateJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/DMMSNddUpdateJob.java
@@ -309,8 +309,8 @@
String[] tmpArray;
String sTemp;
List<String> arraySQLVals= new ArrayList<String>();
-
- if(!jobOnLine(postsql, "nddcanton"))
+ boolean bActiveCheckDBSchedule=true;
+ if(!jobOnLine(postsql, "nddcanton")&& bActiveCheckDBSchedule)
{
return;
@@ -318,6 +318,7 @@
logger.info("begin nddxml to postsql");
logger.info("getftpfile...");
String[] xmls= getNDDStrings(info, "neighbor_affect_customers.xml") ;
+
logger.info(String.format("total %d file(s)",xmls.length));
for(int iRow=0;iRow<xmls.length;iRow++)
{
@@ -386,13 +387,13 @@
t0= t0.substring(t0.length()-2);
t1= t1.substring(t1.length()-2);
String insertDBSQL=" insert into ndd.nddcanton_history (project_id,department_id,county_id,district_id,neighbor_id,affectcustomers,affectcustomersever"+
- ",yy,mm,dd,tt) values ";
+ ",yy,mm,dd,tt,ts_ser) values ";
for(int j=0;j<arraySQLVals.size();j++)
{
sqlExec(postsql,insertDBSQL + arraySQLVals.get(j)+
- String.format(",%s,%s,%s,'%s%s')",
- yy,mm,dd,t0,t1
-
+ String.format(",%s,%s,%s,'%s%s',%s)",
+ yy,mm,dd,t0,t1,
+ yy+mm+dd+"."+t0+t1
) ,
new String[]{});
@@ -2455,7 +2456,7 @@
if(lstXML.size()>0)
return lstXML. toArray(new String[0]);
- return null;
+ return new String[]{};
}
--
Gitblit v0.0.0-SNAPSHOT