rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改代码注释

dev
jianjun 5 years ago
parent
af4e0a023b
commit
b12eee2935
7 changed files with 43 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java
  2. 42
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPublicityService.java
  3. 23
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
  4. 8
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPublicityTaskService.java
  5. 2
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java
  6. 2
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java
  7. 2
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java

6
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java
View File

@ -40,7 +40,7 @@ public class StatsPublicityController {
}
/**
* desc:【日】 统计发表文章最多的分类 包含 机关 部门 网格
* desc:【日】 统计标签被使用次数 包含 机关 部门 网格
*
* @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据
* @return
@ -52,7 +52,7 @@ public class StatsPublicityController {
}
/**
* desc:【月,季，年】 统计发表文章最多的分类 包含 机关 部门 网格
* desc:【月,季，年】 统计标签被使用次数 包含 机关 部门 网格
*
* @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据
* @return
@ -64,7 +64,7 @@ public class StatsPublicityController {
}
/**
* desc:【季，年】 统计发表文章最多的分类 包含 机关 部门 网格
* desc:【季，年】 统计标签被使用次数 包含 机关 部门 网格
*
* @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据
* @return

42
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPublicityService.java
View File

@ -4,74 +4,74 @@ package com.epmet.service;
import com.epmet.dto.StatsFormDTO;
public interface StatsPublicityService {
/**
* desc: 统计宣传能力的汇总信息
*
* @return: Boolean
* @date: 2020/6/17 16:11
* @author: jianjun liu
* @param statsDate
*/
Boolean articleSummaryDailyStatsjob(StatsFormDTO statsDate);
/**
* desc: 统计宣传能力的汇总信息
*
* @param formDTO
* @return: Boolean
* @date: 2020/6/17 16:11
* @author: jianjun liu
*/
Boolean articleSummaryDailyStatsjob(StatsFormDTO formDTO);
/**
* desc: 按日 统计每个标签被引用的使用文章数
*
* @param formDTO
* @return: Boolean
* @date: 2020/6/17 16:11
* @author: jianjun liu
* @param statsDate
*/
Boolean tagUsedDailyStatsjob(StatsFormDTO statsDate);
Boolean tagUsedDailyStatsjob(StatsFormDTO formDTO);
/**
* desc: 按月 统计每个标签被引用的使用文章数
*
* @param
* @param statsDate
* @param formDTO
* @return:
* @date: 2020/6/19 18:44
* @author: jianjun liu
*/
Boolean tagUsedMonthlyStatsjob(StatsFormDTO statsDate);
Boolean tagUsedMonthlyStatsjob(StatsFormDTO formDTO);
/**
* desc: 按季年统计标签被使用次数
*
* @param statsDate
* @param formDTO
* @return:
* @date: 2020/6/20 10:44
* @author: jianjun liu
*/
Boolean tagUsedQuarterlyStatsjob(StatsFormDTO statsDate);
Boolean tagUsedQuarterlyStatsjob(StatsFormDTO formDTO);
/**
* desc: 按日 统计每个标签的阅读数
*
* @param statsDate
* @param formDTO
* @return: Boolean
* @date: 2020/6/20 8:40
* @author: jianjun liu
*/
Boolean tagViewedDailyStatsjob(StatsFormDTO statsDate);
Boolean tagViewedDailyStatsjob(StatsFormDTO formDTO);
/**
* desc: 按月统计标签被查看次数
*
* @param statsDate
* @param formDTO
* @return:
* @date: 2020/6/20 10:44
* @author: jianjun liu
*/
Boolean tagViewedMonthlyStatsjob(StatsFormDTO statsDate);
Boolean tagViewedMonthlyStatsjob(StatsFormDTO formDTO);
/**
* desc: 按季年统计标签被查看次数
*
* @param statsDate
* @param formDTO
* @return:
* @date: 2020/6/20 10:44
* @author: jianjun liu
*/
Boolean tagViewedQuarterlyStatsjob(StatsFormDTO statsDate);
Boolean tagViewedQuarterlyStatsjob(StatsFormDTO formDTO);
}

23
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
View File

@ -198,6 +198,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
try {
log.info("tagUsedMonthlyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId());
statsTagUsedMonthly(dimIdBean.getMonthId(), formDTO.getCustomerId());
} catch (Exception e) {
log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedMonthlyStatsjob", formDTO.getCustomerId(), dimIdBean.getMonthId()), e);
@ -206,6 +207,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
int pageNo = NumConstant.ONE;
int pageSize = NumConstant.ONE_HUNDRED;
List<String> customerIdList = null;
log.info("tagUsedMonthlyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId());
do {
customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
if (!CollectionUtils.isEmpty(customerIdList)) {
@ -228,6 +230,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
try {
log.info("tagViewedDailyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId());
statsTagViewedDaily(statsDate, dimIdBean, formDTO.getCustomerId());
} catch (Exception e) {
log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedDailyStatsjob", formDTO.getCustomerId(), dimIdBean.getMonthId()), e);
@ -236,6 +239,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
int pageNo = NumConstant.ONE;
int pageSize = NumConstant.ONE_HUNDRED;
List<String> customerIdList = null;
log.info("tagViewedDailyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId());
do {
customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
if (!CollectionUtils.isEmpty(customerIdList)) {
@ -259,6 +263,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
try {
log.info("tagViewedMonthlyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId());
statsTagViewedMonthly(dimIdBean.getMonthId(), formDTO.getCustomerId());
} catch (Exception e) {
log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedMonthlyStatsjob", formDTO.getCustomerId(), dimIdBean.getDateId()), e);
@ -267,6 +272,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
int pageNo = NumConstant.ONE;
int pageSize = NumConstant.ONE_HUNDRED;
List<String> customerIdList = null;
log.info("tagViewedMonthlyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId());
do {
customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
if (!CollectionUtils.isEmpty(customerIdList)) {
@ -289,6 +295,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
try {
log.info("tagUsedQuarterlyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId());
try {
log.debug("start === statsTagUsedQuarterly ");
statsTagUsedQuarterly(dimIdBean.getQuarterId(), formDTO.getCustomerId());
@ -305,6 +312,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedMonthlyStatsjob", formDTO.getCustomerId(), dimIdBean.getDateId()), e);
}
} else {
log.info("tagUsedQuarterlyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId());
int pageNo = NumConstant.ONE;
int pageSize = NumConstant.ONE_HUNDRED;
List<String> customerIdList = null;
@ -336,6 +344,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
Date statsDate = getStatsDateFromParam(formDTO);
DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
log.info("tagViewedQuarterlyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId());
try {
log.debug("start === statsTagViewedQuarterly ");
statsTagViewedQuarterly(dimIdBean.getQuarterId(), formDTO.getCustomerId());
@ -349,6 +358,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagViewedQuarterly", formDTO.getCustomerId(), dimIdBean.getYearId()), e);
}
} else {
log.info("tagViewedQuarterlyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId());
int pageNo = NumConstant.ONE;
int pageSize = NumConstant.ONE_HUNDRED;
List<String> customerIdList = null;
@ -474,7 +484,6 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
}
boolean b = factArticlePublishedGridDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), gridDailyEntityMap.values());
} catch (Exception e) {
e.printStackTrace();
log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsPublishedGridDaily", customerId, statsDate), e);
}
}
@ -560,14 +569,10 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
*
* @param statsDate
* @param dimIdBean
* @param customerId
* @param customerId remark:获取当天发布的文章数据，然后根据文章标签 进行统计，加上默认标签的数量 没有则为0
*/
private void statsTagUsedDaily(Date statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId) {
//1.业务数据来源 发布时间为统计时间的
// 因为一个客户的发布文章数在同一天不会特别的多，所以以客户为单位查询今天发布的所有带有标签的文章 根据发布单位类型进行拆分
// 1.1查出今天所有的文章标签 根据网格Id
// 1.2
//获取所有网格
List<DimAgencyEntity> agencyDTOList = dimAgencyService.getAgencyListByCustomerId(customerId);
if (CollectionUtils.isEmpty(agencyDTOList)) {
@ -715,14 +720,10 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
*
* @param statsDate
* @param dimIdBean
* @param customerId
* @param customerId remark:根据统计时间的阅读文章记录，然后根据文章Id获取到对应的标签 然后 进行统计
*/
private void statsTagViewedDaily(Date statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId) {
//1.业务数据来源 发布时间为统计时间的
// 因为一个客户的发布文章数在同一天不会特别的多，所以以客户为单位查询今天发布的所有带有标签的文章 根据发布单位类型进行拆分
// 1.1查出今天所有的文章标签 根据网格Id
// 1.2
//获取所有机关 用于后面想上级添加数据
List<DimAgencyEntity> agencyDTOList = dimAgencyService.getAgencyListByCustomerId(customerId);
if (CollectionUtils.isEmpty(agencyDTOList)) {

8
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPublicityTaskService.java
View File

@ -22,7 +22,7 @@ public interface StatsPublicityTaskService {
Result articleSummaryDailyStatsjob(StatsFormDTO formDTO);
/**
* desc: 定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格
* desc: 定时任务 【日】统计标签被使用次数 包含 机关 部门 网格
*
* @return:
* @date: 2020/6/22 9:09
@ -31,7 +31,7 @@ public interface StatsPublicityTaskService {
Result tagUsedDailyStatsjob(StatsFormDTO formDTO);
/**
* desc: 【月】 统计发表文章最多的分类 包含 机关 部门 网格
* desc: 【月】 统计标签被使用次数包含 机关 部门 网格
*
* @date: 2020/6/22 9:09
* @author: jianjun liu
@ -39,7 +39,7 @@ public interface StatsPublicityTaskService {
Result tagUsedMonthlyStatsjob(StatsFormDTO formDTO);
/**
* desc: 【季，年】 统计发表文章最多的分类 包含 机关 部门 网格
* desc: 【季，年】 统计标签被使用次数 包含 机关 部门 网格
*
* @date: 2020/6/22 9:09
* @author: jianjun liu
@ -55,7 +55,7 @@ public interface StatsPublicityTaskService {
Result tagViewedDailyStatsjob(StatsFormDTO formDTO);
/**
* desc: 【月，季，年】 统计阅读最多的标签 包含 机关 网格
* desc: 【月】 统计阅读最多的标签 包含 机关 网格
*
* @date: 2020/6/22 9:09
* @author: jianjun liu

2
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java
View File

@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* desc:标签被使用次数 【月、季、年】统计定时任务
* desc:标签被使用次数 【月】统计定时任务
*/
@Component("publicityTagUsedMonthlyStatsTask")
public class PublicityTagUsedMonthlyStatsTask implements ITask {

2
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java
View File

@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* desc:标签被使用次数 【月、季、年】统计定时任务
* desc:标签被使用次数 【季、年】统计定时任务
*/
@Component("publicityTagUsedQuarterlyAndYearlyStatsTask")
public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask {

2
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java
View File

@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* desc:标签被阅读次数 【月、季、年】统计定时任务
* desc:标签被阅读次数 【月】统计定时任务
*/
@Component("publicityTagViewedMonthlyStatsTask")
public class PublicityTagViewedMonthlyStatsTask implements ITask {

Write Preview
Loading…
Cancel
Save