Skip to content

C
ctr-estimate
Commit b32d8a32 authored by 赵建伟's avatar 赵建伟
Browse files
Options

update codes

parent cba57d67
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 302 additions and 80 deletions
libs/ctr_all.sql
View file @ b32d8a32
......@@ -58,9 +58,9 @@ CREATE TABLE `device_recently_estimate_view_pfr_new` (
`device_id` varchar(150) DEFAULT NULL COMMENT '设备ID',
`statistics_type` varchar(150) DEFAULT NULL COMMENT '统计类型',
`statistics_type_id` varchar(150) DEFAULT NULL COMMENT '统计类型id',
`project_pfr_recent1` text COMMENT '近一次项目偏好(去重后)',
`project_pfr_recent3` text COMMENT '近三次项目偏好(去重后)',
`project_pfr_recent10` text COMMENT '近十次项目偏好(去重后)',
`project_pfr_recent1` text COMMENT '近一次项目偏好(去重后，次数累加) eg: (xx:a,yy:b,zz:c)',
`project_pfr_recent3` text COMMENT '近三次项目偏好(去重后，次数累加) eg: (xx:a,yy:b,zz:c)',
`project_pfr_recent10` text COMMENT '近十次项目偏好(去重后，次数累加) eg: (xx:a,yy:b,zz:c)',
`first_demands_pfr_recent1` text COMMENT '近一次一级诉求偏好(偏好去重，次数累加) eg: (xx:a,yy:b,zz:c)',
`first_demands_pfr_recent3` text COMMENT '近三次一级诉求偏好(偏好去重，次数累加) eg: (xx:a,yy:b,zz:c)',
`first_demands_pfr_recent10` text COMMENT '近十次一级诉求偏好(偏好去重，次数累加) eg: (xx:a,yy:b,zz:c)',
......@@ -79,6 +79,7 @@ CREATE TABLE `device_recently_estimate_view_pfr_new` (
`second_solutions_pfr_recent1` text COMMENT '近一次二级方式偏好(偏好去重，次数累加) eg: (xx:a,yy:b,zz:c)',
`second_solutions_pfr_recent3` text COMMENT '近三次二级方式偏好(偏好去重，次数累加) eg: (xx:a,yy:b,zz:c)',
`second_solutions_pfr_recent10` text COMMENT '近十次二级方式偏好(偏好去重，次数累加) eg: (xx:a,yy:b,zz:c)',
`pfr_recent10_queue_info` text COMMENT '近十次偏好(去重后，次数累加，包含时间)信息',
`last_update_time` varchar(45) DEFAULT NULL COMMENT '上一次更改的时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
......
src/main/java/com/gmei/data/ctr/bean/PfrRecent10QueueBean.java 0 → 100644
View file @ b32d8a32
package com.gmei.data.ctr.bean;
import java.util.LinkedList;
import java.util.List;
/**
* @ClassName PfrRecent10QueueBean
* @Author apple
* @Date 2020/4/14
* @Version V1.0
**/
public class PfrRecent10QueueBean {
private String deviceId;
private String statisticsType;
private String statisticsTypeId;
private LinkedList<PfrRecentInfo> projectPfrQueue;
private LinkedList<PfrRecentInfo> firstDemandsPfrQueue;
private LinkedList<PfrRecentInfo> firstPositionsPfrQueue;
private LinkedList<PfrRecentInfo> firstSolutionsPfrQueue;
private LinkedList<PfrRecentInfo> secondDemandsPfrQueue;
private LinkedList<PfrRecentInfo> secondPositionsPfrQueue;
private LinkedList<PfrRecentInfo> secondSolutionsPfrQueue;
private String lastUpdateTime;
public PfrRecent10QueueBean(String deviceId, String statisticsType, String statisticsTypeId,
LinkedList<PfrRecentInfo> projectPfrQueue, LinkedList<PfrRecentInfo> firstDemandsPfrQueue,
LinkedList<PfrRecentInfo> firstPositionsPfrQueue, LinkedList<PfrRecentInfo> firstSolutionsPfrQueue,
LinkedList<PfrRecentInfo> secondDemandsPfrQueue, LinkedList<PfrRecentInfo> secondPositionsPfrQueue,
LinkedList<PfrRecentInfo> secondSolutionsPfrQueue, String lastUpdateTime) {
this.deviceId = deviceId;
this.statisticsType = statisticsType;
this.statisticsTypeId = statisticsTypeId;
this.projectPfrQueue = projectPfrQueue;
this.firstDemandsPfrQueue = firstDemandsPfrQueue;
this.firstPositionsPfrQueue = firstPositionsPfrQueue;
this.firstSolutionsPfrQueue = firstSolutionsPfrQueue;
this.secondDemandsPfrQueue = secondDemandsPfrQueue;
this.secondPositionsPfrQueue = secondPositionsPfrQueue;
this.secondSolutionsPfrQueue = secondSolutionsPfrQueue;
this.lastUpdateTime = lastUpdateTime;
}
public PfrRecent10QueueBean() {
}
public String getDeviceId() {
return deviceId;
}
public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}
public String getStatisticsType() {
return statisticsType;
}
public void setStatisticsType(String statisticsType) {
this.statisticsType = statisticsType;
}
public String getStatisticsTypeId() {
return statisticsTypeId;
}
public void setStatisticsTypeId(String statisticsTypeId) {
this.statisticsTypeId = statisticsTypeId;
}
public LinkedList<PfrRecentInfo> getProjectPfrQueue() {
return projectPfrQueue;
}
public void setProjectPfrQueue(LinkedList<PfrRecentInfo> projectPfrQueue) {
this.projectPfrQueue = projectPfrQueue;
}
public LinkedList<PfrRecentInfo> getFirstDemandsPfrQueue() {
return firstDemandsPfrQueue;
}
public void setFirstDemandsPfrQueue(LinkedList<PfrRecentInfo> firstDemandsPfrQueue) {
this.firstDemandsPfrQueue = firstDemandsPfrQueue;
}
public LinkedList<PfrRecentInfo> getFirstPositionsPfrQueue() {
return firstPositionsPfrQueue;
}
public void setFirstPositionsPfrQueue(LinkedList<PfrRecentInfo> firstPositionsPfrQueue) {
this.firstPositionsPfrQueue = firstPositionsPfrQueue;
}
public LinkedList<PfrRecentInfo> getFirstSolutionsPfrQueue() {
return firstSolutionsPfrQueue;
}
public void setFirstSolutionsPfrQueue(LinkedList<PfrRecentInfo> firstSolutionsPfrQueue) {
this.firstSolutionsPfrQueue = firstSolutionsPfrQueue;
}
public LinkedList<PfrRecentInfo> getSecondDemandsPfrQueue() {
return secondDemandsPfrQueue;
}
public void setSecondDemandsPfrQueue(LinkedList<PfrRecentInfo> secondDemandsPfrQueue) {
this.secondDemandsPfrQueue = secondDemandsPfrQueue;
}
public LinkedList<PfrRecentInfo> getSecondPositionsPfrQueue() {
return secondPositionsPfrQueue;
}
public void setSecondPositionsPfrQueue(LinkedList<PfrRecentInfo> secondPositionsPfrQueue) {
this.secondPositionsPfrQueue = secondPositionsPfrQueue;
}
public LinkedList<PfrRecentInfo> getSecondSolutionsPfrQueue() {
return secondSolutionsPfrQueue;
}
public void setSecondSolutionsPfrQueue(LinkedList<PfrRecentInfo> secondSolutionsPfrQueue) {
this.secondSolutionsPfrQueue = secondSolutionsPfrQueue;
}
public String getLastUpdateTime() {
return lastUpdateTime;
}
public void setLastUpdateTime(String lastUpdateTime) {
this.lastUpdateTime = lastUpdateTime;
}
}
src/main/java/com/gmei/data/ctr/bean/PfrRecentInfo.java 0 → 100644
View file @ b32d8a32
package com.gmei.data.ctr.bean;
/**
* @ClassName PfrRecentInfo
* @Author apple
* @Date 2020/4/14
* @Version V1.0
**/
public class PfrRecentInfo implements java.lang.Comparable<PfrRecentInfo>{
private String pfrName;
private Integer pfrCount;
private String lastUpdateTime;
public PfrRecentInfo(String pfrName, Integer pfrCount, String lastUpdateTime) {
this.pfrName = pfrName;
this.pfrCount = pfrCount;
this.lastUpdateTime = lastUpdateTime;
}
public PfrRecentInfo() {
}
public String getPfrName() {
return pfrName;
}
public void setPfrName(String pfrName) {
this.pfrName = pfrName;
}
public Integer getPfrCount() {
return pfrCount;
}
public void setPfrCount(Integer pfrCount) {
this.pfrCount = pfrCount;
}
public String getLastUpdateTime() {
return lastUpdateTime;
}
public void setLastUpdateTime(String lastUpdateTime) {
this.lastUpdateTime = lastUpdateTime;
}
@Override
public int compareTo(PfrRecentInfo pfrRecentInfo) {
return -this.lastUpdateTime.compareTo(pfrRecentInfo.getLastUpdateTime());
}
}
src/main/java/com/gmei/data/ctr/callable/CtrCrtCallable.java
View file @ b32d8a32
......@@ -3,7 +3,7 @@ package com.gmei.data.ctr.callable;
import com.gmei.data.ctr.bean.CtrCrtBean;
import com.gmei.data.ctr.common.Constants;
import com.gmei.data.ctr.utils.JDBCUtils;
import com.gmei.data.ctr.utils.JDBCUtil;
import java.sql.*;
import java.util.concurrent.Callable;
......@@ -39,7 +39,7 @@ public class CtrCrtCallable implements Callable<CtrCrtBean>{
}
private void close(Connection connection) throws Exception {
JDBCUtils.close(connection,null,null);
JDBCUtil.close(connection,null,null);
}
private CtrCrtBean findEstimateInfo(String deviceId, String partitionDate, Connection connection) throws SQLException {
......@@ -112,7 +112,7 @@ public class CtrCrtCallable implements Callable<CtrCrtBean>{
result.setPartitionDate(resultSet.getString("partition_date"));
result.setLastUpdateTime(resultSet.getString("last_update_time"));
}
JDBCUtils.close(null,statement,resultSet);
JDBCUtil.close(null,statement,resultSet);
return result;
}
}
src/main/java/com/gmei/data/ctr/operator/CtrClkCrtOperator.java
View file @ b32d8a32
......@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.gmei.data.ctr.bean.CtrClkCrtEtlBean;
import com.gmei.data.ctr.bean.CtrClkCrtBean;
import com.gmei.data.ctr.sink.CtrClkCrtMysqlSink;
import com.gmei.data.ctr.utils.DateUtils;
import com.gmei.data.ctr.utils.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.api.common.functions.FilterFunction;
import org.apache.flink.api.common.functions.MapFunction;
......@@ -66,9 +66,9 @@ public class CtrClkCrtOperator implements BaseOperator{
Double gmNginxTimestamp = jsonObject.getDouble("gm_nginx_timestamp");
if(null != gmNginxTimestamp){
long gmNginxTimestampLong = Math.round(gmNginxTimestamp * 1000);
String currentDateStr = DateUtils.getCurrentDateStr();
long currentDateBegin = DateUtils.getTimestampByDateStr(currentDateStr + " 00:00:00");
long currentDateend = DateUtils.getTimestampByDateStr(currentDateStr + " 23:59:59");
String currentDateStr = DateUtil.getCurrentDateStr();
long currentDateBegin = DateUtil.getTimestampByDateStr(currentDateStr + " 00:00:00");
long currentDateend = DateUtil.getTimestampByDateStr(currentDateStr + " 23:59:59");
if(gmNginxTimestampLong >= currentDateBegin && gmNginxTimestampLong <= currentDateend){
String type = jsonObject.getString("type");
JSONObject paramsObject = jsonObject.getJSONObject("params");
......@@ -170,8 +170,8 @@ public class CtrClkCrtOperator implements BaseOperator{
for (CtrClkCrtEtlBean estimateClickEtl : estimateClickEtls) {
CtrClkCrtBean ctrClkCrtBean = new CtrClkCrtBean();
ctrClkCrtBean.setDeviceId(estimateClickEtl.getDeviceId());
ctrClkCrtBean.setPartitionDate(DateUtils.getDateStr(date));
ctrClkCrtBean.setLastUpdateTime(DateUtils.getTimeStr(date));
ctrClkCrtBean.setPartitionDate(DateUtil.getDateStr(date));
ctrClkCrtBean.setLastUpdateTime(DateUtil.getTimeStr(date));
if("tractate_card".equals(estimateClickEtl.getEstimateType())){
ctrClkCrtBean.setTractateCardClick(1L);
}else if("content_card".equals(estimateClickEtl.getEstimateType())){
......
src/main/java/com/gmei/data/ctr/operator/CtrPfrCrtOperator.java
View file @ b32d8a32
......@@ -6,7 +6,7 @@ import com.gmei.data.ctr.bean.CtrPfrCrtEtlBean;
import com.gmei.data.ctr.bean.CtrPfrCrtBean;
import com.gmei.data.ctr.sink.CtrPfrCrtMysqlSink;
import com.gmei.data.ctr.source.JrAsyncPfrCrtSource;
import com.gmei.data.ctr.utils.DateUtils;
import com.gmei.data.ctr.utils.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.api.common.functions.FilterFunction;
import org.apache.flink.api.common.functions.MapFunction;
......@@ -67,11 +67,11 @@ public class CtrPfrCrtOperator implements BaseOperator{
Double gmNginxTimestamp = jsonObject.getDouble("gm_nginx_timestamp");
if (null != gmNginxTimestamp) {
long gmNginxTimestampLong = Math.round(gmNginxTimestamp * 1000);
String currentDateStr = DateUtils.getCurrentDateStr();
String currentDateStr = DateUtil.getCurrentDateStr();
long currentDateBegin =
DateUtils.getTimestampByDateStr(currentDateStr + " 00:00:00");
DateUtil.getTimestampByDateStr(currentDateStr + " 00:00:00");
long currentDateend =
DateUtils.getTimestampByDateStr(currentDateStr + " 23:59:59");
DateUtil.getTimestampByDateStr(currentDateStr + " 23:59:59");
if (gmNginxTimestampLong >= currentDateBegin
&& gmNginxTimestampLong <= currentDateend) {
String type = jsonObject.getString("type");
......
src/main/java/com/gmei/data/ctr/operator/CtrPfrRctOperator.java
View file @ b32d8a32
......@@ -6,7 +6,7 @@ import com.gmei.data.ctr.bean.CtrPfrRctEtlBean;
import com.gmei.data.ctr.bean.CtrPfrRctBean;
import com.gmei.data.ctr.sink.CtrPfrRctMysqlSink;
import com.gmei.data.ctr.source.JrAsyncPfrRctSource;
import com.gmei.data.ctr.utils.DateUtils;
import com.gmei.data.ctr.utils.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.api.common.functions.FilterFunction;
import org.apache.flink.api.common.functions.MapFunction;
......@@ -68,11 +68,11 @@ public class CtrPfrRctOperator implements BaseOperator{
Double gmNginxTimestamp = jsonObject.getDouble("gm_nginx_timestamp");
if (null != gmNginxTimestamp) {
long gmNginxTimestampLong = Math.round(gmNginxTimestamp * 1000);
String currentDateStr = DateUtils.getCurrentDateStr();
String currentDateStr = DateUtil.getCurrentDateStr();
long currentDateBegin =
DateUtils.getTimestampByDateStr(currentDateStr + " 00:00:00");
DateUtil.getTimestampByDateStr(currentDateStr + " 00:00:00");
long currentDateend =
DateUtils.getTimestampByDateStr(currentDateStr + " 23:59:59");
DateUtil.getTimestampByDateStr(currentDateStr + " 23:59:59");
if (gmNginxTimestampLong >= currentDateBegin
&& gmNginxTimestampLong <= currentDateend) {
String type = jsonObject.getString("type");
......
src/main/java/com/gmei/data/ctr/operator/CtrTagCrtOperator.java
View file @ b32d8a32
......@@ -7,7 +7,7 @@ import com.gmei.data.ctr.bean.CtrTagCrtTmpBean;
import com.gmei.data.ctr.sink.CtrTagCrtMysqlSink;
import com.gmei.data.ctr.source.ZxAsyncTagCrtSource;
import com.gmei.data.ctr.source.JrAsyncTagCrtSource;
import com.gmei.data.ctr.utils.DateUtils;
import com.gmei.data.ctr.utils.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.api.common.functions.FilterFunction;
import org.apache.flink.api.common.functions.MapFunction;
......@@ -80,9 +80,9 @@ public class CtrTagCrtOperator implements BaseOperator{
Double gmNginxTimestamp = jsonObject.getDouble("gm_nginx_timestamp");
if (null != gmNginxTimestamp) {
long gmNginxTimestampLong = Math.round(gmNginxTimestamp * 1000);
String currentDateStr = DateUtils.getCurrentDateStr();
long currentDateBegin = DateUtils.getTimestampByDateStr(currentDateStr + " 00:00:00");
long currentDateend = DateUtils.getTimestampByDateStr(currentDateStr + " 23:59:59");
String currentDateStr = DateUtil.getCurrentDateStr();
long currentDateBegin = DateUtil.getTimestampByDateStr(currentDateStr + " 00:00:00");
long currentDateend = DateUtil.getTimestampByDateStr(currentDateStr + " 23:59:59");
if (gmNginxTimestampLong >= currentDateBegin && gmNginxTimestampLong <= currentDateend) {
String type = jsonObject.getString("type");
JSONObject paramsObject = jsonObject.getJSONObject("params");
......
src/main/java/com/gmei/data/ctr/sink/CtrClkCrtMysqlSink.java
View file @ b32d8a32
......@@ -2,8 +2,8 @@ package com.gmei.data.ctr.sink;
import com.gmei.data.ctr.bean.CtrClkCrtBean;
import com.gmei.data.ctr.common.Constants;
import com.gmei.data.ctr.utils.DateUtils;
import com.gmei.data.ctr.utils.JDBCUtils;
import com.gmei.data.ctr.utils.DateUtil;
import com.gmei.data.ctr.utils.JDBCUtil;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.streaming.api.functions.sink.RichSinkFunction;
......@@ -58,7 +58,7 @@ public class CtrClkCrtMysqlSink extends RichSinkFunction<CtrClkCrtBean> {
}
@Override
public void close() throws Exception {
JDBCUtils.close(connection,null,null);
JDBCUtil.close(connection,null,null);
super.close();
}
......@@ -94,7 +94,7 @@ public class CtrClkCrtMysqlSink extends RichSinkFunction<CtrClkCrtBean> {
newCtrClkCrtBean.getAnswerCardClick(),
newCtrClkCrtBean.getContentCardClick(),
newCtrClkCrtBean.getTractateCardClick(),
DateUtils.getTimeStr(new Date()),
DateUtil.getTimeStr(new Date()),
newCtrClkCrtBean.getDeviceId(),
newCtrClkCrtBean.getPartitionDate()
)
......@@ -116,7 +116,7 @@ public class CtrClkCrtMysqlSink extends RichSinkFunction<CtrClkCrtBean> {
ctrClkCrtBean.getLastUpdateTime())
);
}
JDBCUtils.close(null,statement,null);
JDBCUtil.close(null,statement,null);
}
}
}
src/main/java/com/gmei/data/ctr/sink/CtrPfrCrtMysqlSink.java
View file @ b32d8a32
......@@ -2,9 +2,9 @@ package com.gmei.data.ctr.sink;
import com.gmei.data.ctr.bean.CtrPfrCrtBean;
import com.gmei.data.ctr.common.Constants;
import com.gmei.data.ctr.utils.DateUtils;
import com.gmei.data.ctr.utils.JDBCUtils;
import com.gmei.data.ctr.utils.StringUtils;
import com.gmei.data.ctr.utils.DateUtil;
import com.gmei.data.ctr.utils.JDBCUtil;
import com.gmei.data.ctr.utils.StringUtil;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.streaming.api.functions.sink.RichSinkFunction;
......@@ -58,7 +58,7 @@ public class CtrPfrCrtMysqlSink extends RichSinkFunction<CtrPfrCrtBean> {
}
@Override
public void close() throws Exception {
JDBCUtils.close(connection,null,null);
JDBCUtil.close(connection,null,null);
super.close();
}
......@@ -96,7 +96,7 @@ public class CtrPfrCrtMysqlSink extends RichSinkFunction<CtrPfrCrtBean> {
ctrPfrCrtBean.getDeviceId(),
ctrPfrCrtBean.getStatisticsType(),
ctrPfrCrtBean.getStatisticsTypeId(),
DateUtils.getDateStr(date)
DateUtil.getDateStr(date)
)
);
if (resultSet.next()){
......@@ -122,18 +122,18 @@ public class CtrPfrCrtMysqlSink extends RichSinkFunction<CtrPfrCrtBean> {
"second_solutions_pfr = '%s'," +
"last_update_time = '%s' " +
"where device_id = '%s' and statistics_type = '%s' and statistics_type_id = '%s' and partition_date = '%s'",
StringUtils.increasePfr(projectPfr,ctrPfrCrtBean.getProjectPfr()),
StringUtils.increasePfr(firstDemandsPfr,ctrPfrCrtBean.getFirstDemandsPfr()),
StringUtils.increasePfr(firstPositionsPfr,ctrPfrCrtBean.getFirstPositionsPfr()),
StringUtils.increasePfr(firstSolutionsPfr,ctrPfrCrtBean.getFirstSolutionsPfr()),
StringUtils.increasePfr(secondDemandsPfr,ctrPfrCrtBean.getSecondDemandsPfr()),
StringUtils.increasePfr(secondPositionsPfr,ctrPfrCrtBean.getSecondPositionsPfr()),
StringUtils.increasePfr(secondSolutionsPfr,ctrPfrCrtBean.getSecondSolutionsPfr()),
DateUtils.getTimeStr(date),
StringUtil.increasePfr(projectPfr,ctrPfrCrtBean.getProjectPfr()),
StringUtil.increasePfr(firstDemandsPfr,ctrPfrCrtBean.getFirstDemandsPfr()),
StringUtil.increasePfr(firstPositionsPfr,ctrPfrCrtBean.getFirstPositionsPfr()),
StringUtil.increasePfr(firstSolutionsPfr,ctrPfrCrtBean.getFirstSolutionsPfr()),
StringUtil.increasePfr(secondDemandsPfr,ctrPfrCrtBean.getSecondDemandsPfr()),
StringUtil.increasePfr(secondPositionsPfr,ctrPfrCrtBean.getSecondPositionsPfr()),
StringUtil.increasePfr(secondSolutionsPfr,ctrPfrCrtBean.getSecondSolutionsPfr()),
DateUtil.getTimeStr(date),
ctrPfrCrtBean.getDeviceId(),
ctrPfrCrtBean.getStatisticsType(),
ctrPfrCrtBean.getStatisticsTypeId(),
DateUtils.getDateStr(date)
DateUtil.getDateStr(date)
)
);
}else{
......@@ -156,19 +156,19 @@ public class CtrPfrCrtMysqlSink extends RichSinkFunction<CtrPfrCrtBean> {
ctrPfrCrtBean.getDeviceId(),
ctrPfrCrtBean.getStatisticsType(),
ctrPfrCrtBean.getStatisticsTypeId(),
StringUtils.transString2PairedString(ctrPfrCrtBean.getProjectPfr()),
StringUtils.transString2PairedString(ctrPfrCrtBean.getFirstDemandsPfr()),
StringUtils.transString2PairedString(ctrPfrCrtBean.getFirstPositionsPfr()),
StringUtils.transString2PairedString(ctrPfrCrtBean.getFirstSolutionsPfr()),
StringUtils.transString2PairedString(ctrPfrCrtBean.getSecondDemandsPfr()),
StringUtils.transString2PairedString(ctrPfrCrtBean.getSecondPositionsPfr()),
StringUtils.transString2PairedString(ctrPfrCrtBean.getSecondSolutionsPfr()),
DateUtils.getDateStr(date),
DateUtils.getTimeStr(date)
StringUtil.transString2PairedString(ctrPfrCrtBean.getProjectPfr()),
StringUtil.transString2PairedString(ctrPfrCrtBean.getFirstDemandsPfr()),
StringUtil.transString2PairedString(ctrPfrCrtBean.getFirstPositionsPfr()),
StringUtil.transString2PairedString(ctrPfrCrtBean.getFirstSolutionsPfr()),
StringUtil.transString2PairedString(ctrPfrCrtBean.getSecondDemandsPfr()),
StringUtil.transString2PairedString(ctrPfrCrtBean.getSecondPositionsPfr()),
StringUtil.transString2PairedString(ctrPfrCrtBean.getSecondSolutionsPfr()),
DateUtil.getDateStr(date),
DateUtil.getTimeStr(date)
)
);
}
JDBCUtils.close(null,statement,null);
JDBCUtil.close(null,statement,null);
}catch (Exception e){
e.printStackTrace();
}
......
src/main/java/com/gmei/data/ctr/sink/CtrTagCrtMysqlSink.java
View file @ b32d8a32
......@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.gmei.data.ctr.bean.CtrTagCrtBean;
import com.gmei.data.ctr.bean.CtrTagCrtTmpBean;
import com.gmei.data.ctr.common.Constants;
import com.gmei.data.ctr.utils.JDBCUtils;
import com.gmei.data.ctr.utils.JDBCUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.streaming.api.functions.sink.RichSinkFunction;
......@@ -58,7 +58,7 @@ public class CtrTagCrtMysqlSink extends RichSinkFunction<CtrTagCrtTmpBean> {
}
@Override
public void close() throws Exception {
JDBCUtils.close(connection,null,null);
JDBCUtil.close(connection,null,null);
super.close();
}
......@@ -308,7 +308,7 @@ public class CtrTagCrtMysqlSink extends RichSinkFunction<CtrTagCrtTmpBean> {
)
);
}
JDBCUtils.close(null,statement,null);
JDBCUtil.close(null,statement,null);
}catch (Exception e){
e.printStackTrace();
}
......@@ -636,7 +636,7 @@ public class CtrTagCrtMysqlSink extends RichSinkFunction<CtrTagCrtTmpBean> {
ctrTagCrtBean.getLastUpdateTime()
)
);
JDBCUtils.close(null,statement,null);
JDBCUtil.close(null,statement,null);
}
}catch (Exception e){
e.printStackTrace();
......
src/main/java/com/gmei/data/ctr/source/JrAsyncPfrCrtSource.java
View file @ b32d8a32
......@@ -4,7 +4,7 @@ import com.alibaba.druid.pool.DruidDataSource;
import com.gmei.data.ctr.bean.CtrPfrCrtBean;
import com.gmei.data.ctr.bean.CtrPfrCrtEtlBean;
import com.gmei.data.ctr.common.Constants;
import com.gmei.data.ctr.utils.DateUtils;
import com.gmei.data.ctr.utils.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.streaming.api.functions.async.ResultFuture;
......@@ -108,7 +108,7 @@ public class JrAsyncPfrCrtSource extends RichAsyncFunction<CtrPfrCrtEtlBean, Ctr
dcept.setDeviceId(deviceId);
dcept.setStatisticsType(statisticsType);
dcept.setStatisticsTypeId(statisticsTypeId);
dcept.setLastUpdateTime(DateUtils.getTimeStr(date));
dcept.setLastUpdateTime(DateUtil.getTimeStr(date));
}
}
}
......
src/main/java/com/gmei/data/ctr/source/JrAsyncPfrRctSource.java
View file @ b32d8a32
package com.gmei.data.ctr.source;
import com.alibaba.druid.pool.DruidDataSource;
import com.gmei.data.ctr.bean.CtrPfrCrtEtlBean;
import com.gmei.data.ctr.bean.CtrPfrCrtBean;
import com.gmei.data.ctr.bean.CtrPfrRctBean;
import com.gmei.data.ctr.bean.CtrPfrRctEtlBean;
import com.gmei.data.ctr.common.Constants;
import com.gmei.data.ctr.utils.DateUtils;
import com.gmei.data.ctr.utils.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.streaming.api.functions.async.ResultFuture;
......@@ -110,7 +108,7 @@ public class JrAsyncPfrRctSource extends RichAsyncFunction<CtrPfrRctEtlBean, Ctr
dcept.setDeviceId(deviceId);
dcept.setStatisticsType(statisticsType);
dcept.setStatisticsTypeId(statisticsTypeId);
dcept.setLastUpdateTime(DateUtils.getTimeStr(date));
dcept.setLastUpdateTime(DateUtil.getTimeStr(date));
}
}
}
......
src/main/java/com/gmei/data/ctr/source/JrAsyncTagCrtSource.java
View file @ b32d8a32
......@@ -4,7 +4,7 @@ import com.alibaba.druid.pool.DruidDataSource;
import com.gmei.data.ctr.bean.CtrTagCrtEtlBean;
import com.gmei.data.ctr.bean.CtrTagCrtTmpBean;
import com.gmei.data.ctr.common.Constants;
import com.gmei.data.ctr.utils.DateUtils;
import com.gmei.data.ctr.utils.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.streaming.api.functions.async.ResultFuture;
......@@ -104,8 +104,8 @@ public class JrAsyncTagCrtSource extends RichAsyncFunction<CtrTagCrtEtlBean, Ctr
Date date = new Date();
dcett.setType(type);
dcett.setDeviceId(ctrTagCrtEtlBean.getDeviceId());
dcett.setPartitionDate(DateUtils.getDateStr(date));
dcett.setLastUpdateTime(DateUtils.getTimeStr(date));
dcett.setPartitionDate(DateUtil.getDateStr(date));
dcett.setLastUpdateTime(DateUtil.getTimeStr(date));
}
}
}
......
src/main/java/com/gmei/data/ctr/source/MaidianKafkaSource.java
View file @ b32d8a32
package com.gmei.data.ctr.source;
import com.gmei.data.ctr.utils.DateUtils;
import com.gmei.data.ctr.utils.DateUtil;
import org.apache.flink.api.common.serialization.SimpleStringSchema;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.datastream.DataStreamSource;
......@@ -51,7 +51,7 @@ public class MaidianKafkaSource implements BaseSource{
}else if(isStartFromLatest != null){
maidianKafkaSource.getSource().setStartFromLatest();
}else if(startTime != null){
maidianKafkaSource.getSource().setStartFromTimestamp(DateUtils.getTimestampByDateStr(startTime));
maidianKafkaSource.getSource().setStartFromTimestamp(DateUtil.getTimestampByDateStr(startTime));
}
DataStreamSource maidianLogDatas = env.addSource(maidianKafkaSource.getSource());
return maidianLogDatas;
......
src/main/java/com/gmei/data/ctr/source/ZxAsyncTagCrtSource.java
View file @ b32d8a32
......@@ -4,7 +4,7 @@ import com.alibaba.druid.pool.DruidDataSource;
import com.gmei.data.ctr.bean.CtrTagCrtEtlBean;
import com.gmei.data.ctr.bean.CtrTagCrtTmpBean;
import com.gmei.data.ctr.common.Constants;
import com.gmei.data.ctr.utils.DateUtils;
import com.gmei.data.ctr.utils.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.streaming.api.functions.async.ResultFuture;
......@@ -136,8 +136,8 @@ public class ZxAsyncTagCrtSource extends RichAsyncFunction<CtrTagCrtEtlBean, Ctr
Date date = new Date();
dcett.setType(type);
dcett.setDeviceId(ctrTagCrtEtlBean.getDeviceId());
dcett.setPartitionDate(DateUtils.getDateStr(date));
dcett.setLastUpdateTime(DateUtils.getTimeStr(date));
dcett.setPartitionDate(DateUtil.getDateStr(date));
dcett.setLastUpdateTime(DateUtil.getTimeStr(date));
}
}
return dcett;
......
src/main/java/com/gmei/data/ctr/utils/DateUtils.java → src/main/java/com/gmei/data/ctr/utils/DateUtil.java
View file @ b32d8a32
......@@ -6,13 +6,13 @@ import java.util.Calendar;
import java.util.Date;
/**
* @ClassName DateUtils
* @ClassName DateUtil
* @Description: 时间工具类
* @Author apple
* @Date 2020/3/16
* @Version V1.0
**/
public class DateUtils {
public class DateUtil {
private static final String DATE_FORMATE_YMD = "yyyy-MM-dd";
private static final String DATE_FORMATE_YMDHMS = "yyyy-MM-dd HH:mm:ss";
......
src/main/java/com/gmei/data/ctr/utils/JDBCUtils.java → src/main/java/com/gmei/data/ctr/utils/JDBCUtil.java
View file @ b32d8a32
......@@ -6,14 +6,14 @@ import java.sql.SQLException;
import java.sql.Statement;
/**
* ClassName: JDBCUtils
* ClassName: JDBCUtil
* Reason: jdbc工具类
* Date: 2020-03-16 00:00:00
*
* @author zhaojianwei
* @since JDK 1.8
*/
public class JDBCUtils {
public class JDBCUtil {
synchronized public static void close(Connection connection, Statement statement, ResultSet resultSet) throws SQLException {
if(connection != null){
connection.close();
......
src/main/java/com/gmei/data/ctr/utils/StringUtils.java → src/main/java/com/gmei/data/ctr/utils/StringUtil.java
View file @ b32d8a32
package com.gmei.data.ctr.utils;
import java.util.HashMap;
import java.util.Map;
import com.alibaba.fastjson.JSONArray;
import com.gmei.data.ctr.bean.PfrRecentInfo;
import org.apache.commons.lang3.StringUtils;
import java.util.*;
/**
* @ClassName StringUtils
* @ClassName StringUtil
* @Author apple
* @Date 2020/4/13
* @Version V1.0
**/
public class StringUtils {
public class StringUtil {
public static Map<String,Integer> transPairedString2Map(String str){
Map<String,Integer> map = new HashMap<String,Integer>();
......@@ -38,13 +41,35 @@ public class StringUtils {
Map<String,Integer> map = new HashMap<String,Integer>();
String[] splits = str.split(",");
for (String split : splits) {
if(org.apache.commons.lang3.StringUtils.isNotBlank(split)){
if(StringUtils.isNotBlank(split)){
map.put(split,1);
}
}
return map;
}
public static LinkedList<PfrRecentInfo> transString2PfrRecentInfoList(String str,String timeStr){
LinkedList<PfrRecentInfo> pfrRecentInfoList = null;
String[] splits = str.split(",");
for (String split : splits) {
if(StringUtils.isNotBlank(split)){
pfrRecentInfoList.add(new PfrRecentInfo(split,1,timeStr));
}
}
return pfrRecentInfoList;
}
public static String transPfrRecentInfoList2String(LinkedList<PfrRecentInfo> list){
String str = "";
for (PfrRecentInfo pfrRecentInfo: list) {
str += pfrRecentInfo.getPfrName() + ":" + pfrRecentInfo.getPfrCount() + ",";
}
if(str.length() == 0){
return str;
}
return str.substring(0,str.length() -1);
}
public static Map<String,Integer> increaseByKey(Map<String,Integer> oldMap,String str){
Map<String, Integer> stringIntegerMap = transString2Map(str);
for(Map.Entry<String,Integer> entry : oldMap.entrySet()){
......@@ -77,5 +102,18 @@ public class StringUtils {
String s = increasePfr(str, newPfr);
System.out.println(s);
System.out.println(transString2PairedString(newPfr));
JSONArray ja = new JSONArray();
LinkedList<String> list = new LinkedList<String>();
list.add("c");
list.add("b");
list.add("d");
list.add("a");
Collections.sort(list);
list.removeLast();
for (String ss: list) {
System.out.println(ss);
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment