From e4c65bce17b554d51ba6814c40c00645d27111c7 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 14 Nov 2017 19:09:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BBnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/fsh/job/EnterpriseStatJob.java | 22 +++++++++++-------- .../src/main/resources/applicationContext.xml | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/job/EnterpriseStatJob.java b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/job/EnterpriseStatJob.java index 9a451e0..cd901aa 100644 --- a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/job/EnterpriseStatJob.java +++ b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/job/EnterpriseStatJob.java @@ -5,6 +5,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -164,15 +165,18 @@ public class EnterpriseStatJob implements SimpleJob { if(result.size() > 0){ List list = new ArrayList(); for(Map m : result){ - PageStat stat = new PageStat(); - stat.setCity((String) m.get("city")); - stat.setEid((Long) m.get("eid")); - stat.setUri((String) m.get("uri")); - stat.setPv((Long) m.get("pv")); - stat.setUv((Long) m.get("uv")); - stat.setCreateDate(date); - stat.setFormatDate(fDate); - list.add(stat); + String city = (String) m.get("city"); + if(StringUtils.isNotBlank(city)){ + PageStat stat = new PageStat(); + stat.setCity((String) m.get("city")); + stat.setEid((Long) m.get("eid")); + stat.setUri((String) m.get("uri")); + stat.setPv((Long) m.get("pv")); + stat.setUv((Long) m.get("uv")); + stat.setCreateDate(date); + stat.setFormatDate(fDate); + list.add(stat); + } } pageStatService.saveAll(list); } diff --git a/fangjia-job/fangjia-job-fsh/src/main/resources/applicationContext.xml b/fangjia-job/fangjia-job-fsh/src/main/resources/applicationContext.xml index 21af46c..1e012e9 100644 --- a/fangjia-job/fangjia-job-fsh/src/main/resources/applicationContext.xml +++ b/fangjia-job/fangjia-job-fsh/src/main/resources/applicationContext.xml @@ -43,7 +43,7 @@ From 1d0467507e68a9580f19b407ece254798b61461a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Wed, 15 Nov 2017 13:54:52 +0800 Subject: [PATCH 2/2] update config --- .../src/main/resources/application-prod.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangjia-job/fangjia-job-fsh/src/main/resources/application-prod.properties b/fangjia-job/fangjia-job-fsh/src/main/resources/application-prod.properties index b874549..ceb24a1 100644 --- a/fangjia-job/fangjia-job-fsh/src/main/resources/application-prod.properties +++ b/fangjia-job/fangjia-job-fsh/src/main/resources/application-prod.properties @@ -15,5 +15,5 @@ spring.datasource.log.password=G00jia spring.datasource.log.driver-class-name=com.mysql.jdbc.Driver fsh.url=http://fsh.fangjia.com -zk.server-lists=192.168.10.47:2181 +zk.server-lists=192.168.0.45:2181,192.168.0.46:2181,192.168.0.109:2181 zk.namespace=fangjia-job-fsh \ No newline at end of file