Merge branch 'FSHJOB1.2' into 'master'

Fshjob1.2

See merge request !4
This commit is contained in:
虞继恩
2017-11-15 13:58:24 +08:00
3 changed files with 15 additions and 11 deletions
@@ -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<PageStat> list = new ArrayList<PageStat>();
for(Map<String, Object> 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);
}
@@ -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
@@ -43,7 +43,7 @@
<!-- 企业统计任务 每天0点1分执行 -->
<job:simple id="enterpriseStatJob" class="com.fangjia.job.fsh.job.EnterpriseStatJob" registry-center-ref="regCenter"
sharding-total-count="1" cron="0 1 0 * * ?" sharding-item-parameters=""
sharding-total-count="1" cron="0 0 1 * * ?" sharding-item-parameters=""
failover="true" description="【房生活】企业统计任务,每天0点1分开始执行,主要统计企业相关的数据,统计内容参考 EnterpriseStat"
overwrite="true" event-trace-rdb-data-source="elasticJobLog" job-exception-handler="com.fangjia.job.fsh.handler.CustomJobExceptionHandler">