Browse Source

Merge remote-tracking branch 'remotes/origin/dev' into release

master
jianjun 5 years ago
parent
commit
6b1b311548
  1. 2
      epmet-auth/deploy/docker-compose-dev.yml
  2. 2
      epmet-auth/pom.xml
  3. 19
      epmet-auth/src/main/java/com/epmet/controller/LoginController.java
  4. 35
      epmet-auth/src/main/java/com/epmet/dto/form/ResiWxPhoneFormDTO.java
  5. 9
      epmet-auth/src/main/java/com/epmet/service/LoginService.java
  6. 21
      epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java
  7. 31
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ServletExceptionHandler.java
  8. 120
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java
  9. 4
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java
  10. 4
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java
  11. 9
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/result/GroupSummaryInfoResultDTO.java
  12. 2
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java
  13. 7
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java
  14. 2
      epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
  15. 2
      epmet-module/data-report/data-report-server/pom.xml
  16. 9
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java
  17. 23
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
  18. 15
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java
  19. 3
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
  20. 2
      epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml
  21. 14
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
  22. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
  23. 2
      epmet-module/data-statistical/data-statistical-server/pom.xml
  24. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java
  25. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java
  26. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java
  27. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
  28. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
  29. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyDailyService.java
  30. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java
  31. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
  32. 2
      epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
  33. 2
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupAgencyDailyDao.xml
  34. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
  35. 2
      epmet-module/epmet-job/epmet-job-server/pom.xml
  36. 10
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java
  37. 8
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java
  38. 8
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java
  39. 8
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java
  40. 8
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java
  41. 8
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java
  42. 8
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java
  43. 6
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java
  44. 6
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java
  45. 6
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java
  46. 8
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java
  47. 6
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java
  48. 6
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java
  49. 6
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsTopicTask.java
  50. 6
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsUserTask.java
  51. 6
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/SyncVotingCacheAndDbTask.java
  52. 6
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TestTask.java
  53. 5
      epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml

2
epmet-auth/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-auth-server:
container_name: epmet-auth-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.30
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.31
ports:
- "8081:8081"
network_mode: host # 使用现有网络

2
epmet-auth/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.30</version>
<version>0.3.31</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

19
epmet-auth/src/main/java/com/epmet/controller/LoginController.java

@ -8,9 +8,11 @@ import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.LoginByPassWordFormDTO;
import com.epmet.dto.form.LoginByWxCodeFormDTO;
import com.epmet.dto.form.ResiWxPhoneFormDTO;
import com.epmet.dto.result.UserTokenResultDTO;
import com.epmet.service.CaptchaService;
import com.epmet.service.LoginService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -96,4 +98,21 @@ public class LoginController {
public Result logout(@LoginUser TokenDto tokenDto, HttpServletRequest request) {
return loginService.logoutByToken(tokenDto);
}
/**
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @author yinzuomei
* @description 获取用户微信绑定的手机号
* @Date 2020/7/2 14:33
**/
@PostMapping("getresiwxphone")
public Result getResiWxPhone(@RequestBody ResiWxPhoneFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, ResiWxPhoneFormDTO.AddUserInternalGroup.class);
String phone = loginService.getResiWxPhone(formDTO);
if (StringUtils.isNotBlank(phone) && !"null".equals(phone)) {
return new Result().ok(phone);
}
return new Result().ok("");
}
}

35
epmet-auth/src/main/java/com/epmet/dto/form/ResiWxPhoneFormDTO.java

@ -0,0 +1,35 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 描述一下
*
* @author yinzuomei@elink-cn.com
* @date 2020/7/2 14:28
*/
@Data
public class ResiWxPhoneFormDTO implements Serializable {
private static final long serialVersionUID = 4381236451736209332L;
public interface AddUserInternalGroup {}
/**
* 微信code
*/
@NotBlank(message = "wxCode不能为空",groups = {AddUserInternalGroup.class})
private String wxCode;
/**
* 用户信息
*/
@NotBlank(message = "encryptedData不能为空",groups = {AddUserInternalGroup.class})
private String encryptedData;
/**
* 加密算法的初始向量
*/
@NotBlank(message = "iv不能为空",groups = {AddUserInternalGroup.class})
private String iv;
}

9
epmet-auth/src/main/java/com/epmet/service/LoginService.java

@ -5,6 +5,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.LoginByPassWordFormDTO;
import com.epmet.dto.form.LoginByWxCodeFormDTO;
import com.epmet.dto.form.ResiWxPhoneFormDTO;
import com.epmet.dto.result.UserTokenResultDTO;
/**
@ -50,4 +51,12 @@ public interface LoginService {
**/
WxMaJscode2SessionResult getWxMaUser(String app, String wxCode);
/**
* @return java.lang.String
* @param formDTO
* @author yinzuomei
* @description 获取用户微信绑定的手机号
* @Date 2020/7/2 14:33
**/
String getResiWxPhone(ResiWxPhoneFormDTO formDTO);
}

21
epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java

@ -1,6 +1,8 @@
package com.epmet.service.impl;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
import com.epmet.common.token.constant.LoginConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
@ -129,6 +131,25 @@ public class LoginServiceImpl implements LoginService {
return wxMaJscode2SessionResult;
}
@Override
public String getResiWxPhone(ResiWxPhoneFormDTO formDTO) {
String phone="";
try {
WxMaService wxMaService = wxMaServiceUtils.resiWxMaService();
WxMaJscode2SessionResult wxMaJscode2SessionResult = wxMaService.jsCode2SessionInfo(formDTO.getWxCode());
WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(wxMaJscode2SessionResult.getSessionKey(),
formDTO.getEncryptedData(),
formDTO.getIv());
if (null != phoneNoInfo) {
phone= phoneNoInfo.getPurePhoneNumber();
}
} catch (WxErrorException e) {
e.printStackTrace();
log.error(String.format("获取用户微信绑定的手机号接口异常"));
}
return phone;
}
/**
* 根据openId查询用户id
*

31
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ServletExceptionHandler.java

@ -0,0 +1,31 @@
package com.epmet.commons.tools.aspect;/**
* @author jianjun liu
* @email liujianjun@yunzongnet.com
* @date 2020-07-02 14:08
**/
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.utils.Result;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import javax.servlet.ServletException;
/**
* desc
*
* @author lyn
* @date 2020/7/2 14:08
*/
@Slf4j
@ControllerAdvice
public class ServletExceptionHandler {
@ExceptionHandler(ServletException.class)
public Result globalException(ServletException e) {
log.error("globalException", e);
return new Result<String>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
}
}

120
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java

@ -1,8 +1,8 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* <p>
* https://www.renren.io
*
* <p>
* 版权所有侵权必究
*/
@ -14,9 +14,7 @@ import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletRequest;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.util.Enumeration;
import java.util.regex.Pattern;
/**
* IP工具类
@ -26,59 +24,69 @@ import java.util.Enumeration;
*/
public class IpUtils {
private static Logger logger = LoggerFactory.getLogger(IpUtils.class);
public static final String LOCALHOST = "127.0.0.1";
public static final String ANYHOST = "0.0.0.0";
private static final Pattern IP_PATTERN = Pattern.compile("\\d{1,3}(\\.\\d{1,3}){3,5}$");
public static String getIpAddr(HttpServletRequest request) {
String ip = null;
try {
ip = request.getHeader("x-forwarded-for");
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
if (StringUtils.isEmpty(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("WL-Proxy-Client-IP");
}
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_CLIENT_IP");
}
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
}
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
} catch (Exception e) {
logger.error("IpUtils ERROR ", e);
}
public static String getIpAddr(HttpServletRequest request) {
String ip = null;
try {
ip = request.getHeader("x-forwarded-for");
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
if (StringUtils.isEmpty(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("WL-Proxy-Client-IP");
}
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_CLIENT_IP");
}
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
}
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
} catch (Exception e) {
logger.error("IpUtils ERROR ", e);
}
return ip;
}
return ip;
}
/**
* desc:获取本地Ip
* @return
*/
public static String getServerIp() {
String SERVER_IP = "";
try {
/**
* 遍历本地网卡的方式在云平台虚拟机取不到真正的ip
* @return
*/
InetAddress localAddress = InetAddress.getLocalHost();
if (isValidAddress(localAddress)) {
return localAddress.getHostAddress();
}
logger.warn("Could not get local host ip address");
return null;
} catch (Exception e) {
logger.error("IpUtils getServerIp exception ", e);
}
/**
* desc:获取本地Ip
* @return
*/
public static String getServerIp(){
String SERVER_IP = "";
try {
Enumeration netInterfaces = NetworkInterface.getNetworkInterfaces();
InetAddress ip = null;
while (netInterfaces.hasMoreElements()) {
NetworkInterface ni = (NetworkInterface) netInterfaces
.nextElement();
ip = ni.getInetAddresses().nextElement();
SERVER_IP = ip.getHostAddress();
if (!ip.isSiteLocalAddress() && !ip.isLoopbackAddress()
&& ip.getHostAddress().indexOf(":") == -1) {
SERVER_IP = ip.getHostAddress();
break;
}else{
ip = null;
}
}
} catch (SocketException e) {
logger.error("IpUtils getServerIp exception ", e);
}
return SERVER_IP;
}
return SERVER_IP;
}
private static boolean isValidAddress(InetAddress address) {
if (address == null || address.isLoopbackAddress())
return false;
String name = address.getHostAddress();
return (name != null
&& !ANYHOST.equals(name)
&& !LOCALHOST.equals(name)
&& IP_PATTERN.matcher(name).matches());
}
}

4
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java

@ -2,6 +2,7 @@ package com.epmet.commons.tools.utils;
import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.dto.form.DingTalkTextMsg;
import com.epmet.commons.tools.exception.RenException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.CharEncoding;
@ -37,6 +38,9 @@ public class ModuleUtils {
String errorMessage = "Failure to connect " + serverName;
String errorLog = errorMessage + "::[method]->{}::[params]->{}";
log.error(errorLog, methodName, JSON.toJSONString(params));
DingdingMsgSender msgSender = new DingdingMsgSender();
DingTalkTextMsg dingTalkTextMsg = new DingTalkTextMsg();
msgSender.sendMsgAsync(dingTalkTextMsg);
return new Result().error();
}

4
epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java

@ -9,4 +9,8 @@ public interface GroupConstant {
String MONTH = "month";
String DATE = "day";
String RAIL = "-";
String DOT = ".";
}

9
epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/result/GroupSummaryInfoResultDTO.java

@ -1,5 +1,6 @@
package com.epmet.group.dto.result;
import com.epmet.commons.tools.constant.NumConstant;
import lombok.Data;
import java.io.Serializable;
@ -16,22 +17,22 @@ public class GroupSummaryInfoResultDTO implements Serializable {
/**
* 网格总数量
*/
private Integer gridTotalCount;
private Integer gridTotalCount = NumConstant.ZERO;
/**
* 小组总数量
*/
private Integer groupTotalCount;
private Integer groupTotalCount = NumConstant.ZERO;
/**
* 小组平均人数
*/
private Integer groupPeopleAvg;
private Integer groupPeopleAvg = NumConstant.ZERO;
/**
* 小组人数中位数
*/
private Integer groupPeopleMedian;
private Integer groupPeopleMedian = NumConstant.ZERO;
/**
* 数据更新至 时间

2
epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java

@ -8,6 +8,8 @@ public interface ProjectConstant {
String DAY = "day";
String MONTH = "month";
String PENDING = "处理中";
String CLOSED = "已结案";
/**
* 根据Token获取组织信息失败

7
epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java

@ -25,6 +25,13 @@ public interface TopicConstant {
String SHIFTED = "已转议题";
/**
* 话题分析的type month,day
*/
String MONTH = "month";
String DATE = "day";
String RAIL = "-";
String DOT = ".";
}

2
epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
data-report-server:
container_name: data-report-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.19
image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.22
ports:
- "8109:8109"
network_mode: host # 使用现有网络

2
epmet-module/data-report/data-report-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.19</version>
<version>0.3.22</version>
<artifactId>data-report-server</artifactId>
<parent>

9
epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java

@ -14,6 +14,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@ -39,7 +40,13 @@ public class GroupServiceImpl implements GroupService {
@Override
public GroupSummaryInfoResultDTO summaryInfo(TokenDto tokenDto) {
String agencyId = this.getLoginUserDetails(tokenDto);
return groupDao.summaryInfo(agencyId);
GroupSummaryInfoResultDTO result = groupDao.summaryInfo(agencyId);
if (null==result){
GroupSummaryInfoResultDTO resultDTO = new GroupSummaryInfoResultDTO();
resultDTO.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(GroupConstant.RAIL,GroupConstant.DOT));
return resultDTO;
}
return result;
}
/**

23
epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@ -3,6 +3,7 @@ package com.epmet.service.project.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.dao.project.ProjectDao;
import com.epmet.dto.form.LoginUserDetailsFormDTO;
import com.epmet.dto.result.LoginUserDetailsResultDTO;
@ -20,6 +21,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@ -54,6 +56,16 @@ public class ProjectServiceImpl implements ProjectService {
//将小数转成百分比
resultDTO.setPendingRatio(percent.format(pendingRatio.doubleValue()));
resultDTO.setClosedRatio(percent.format(resultDTO.getClosedRatioInt().setScale(4, RoundingMode.HALF_UP).doubleValue()));
} else {
resultDTO = new ProjectSummaryResultDTO();
resultDTO.setAgencyId(agencyId);
Date date = DateUtils.getBeforeDay(new Date());
resultDTO.setDateName(DateUtils.format(date, "yyyy.MM.dd"));
resultDTO.setProjectTotal(NumConstant.ZERO);
resultDTO.setPendingTotal(NumConstant.ZERO);
resultDTO.setPendingRatio("0%");
resultDTO.setClosedTotal(NumConstant.ZERO);
resultDTO.setClosedRatio("0%");
}
return resultDTO;
}
@ -78,6 +90,17 @@ public class ProjectServiceImpl implements ProjectService {
//先四舍五入保留四位小数再把小数转成百分比
sum.setRatio(percent.format(sum.getRatioInt().setScale(4, RoundingMode.HALF_UP).doubleValue()));
});
} else {
ProjectSummaryInfoResultDTO pending = new ProjectSummaryInfoResultDTO();
pending.setName(ProjectConstant.PENDING);
pending.setValue(NumConstant.ZERO);
pending.setRatio("0%");
resultList.add(pending);
ProjectSummaryInfoResultDTO closed = new ProjectSummaryInfoResultDTO();
closed.setName(ProjectConstant.CLOSED);
closed.setValue(NumConstant.ZERO);
closed.setRatio("0%");
resultList.add(closed);
}
return resultList;
}

15
epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java

@ -56,7 +56,20 @@ public class PublicityServiceImpl implements PublicityService {
@Override
public FactPublishedAgencyDailyDTO summaryInfo(TokenDto tokenDto) {
String agencyId = this.getLoginUserDetails(tokenDto);
return publicityDao.summaryInfo(agencyId);
FactPublishedAgencyDailyDTO factPublishedAgencyDailyDTO = publicityDao.summaryInfo(agencyId);
if (null == factPublishedAgencyDailyDTO) {
factPublishedAgencyDailyDTO = new FactPublishedAgencyDailyDTO();
Date dateFact = DateUtils.addDateDays(new Date(), -1);
String strDate = DateUtils.format(dateFact, DateUtils.DATE_PATTERN_YYYYMMDD);
String yearId = strDate.substring(0, 4);
String monthId = strDate.substring(5, 6);
String dayId = strDate.substring(7, 8);
factPublishedAgencyDailyDTO.setPublishedTotal(0);
factPublishedAgencyDailyDTO.setPublishingTotal(0);
factPublishedAgencyDailyDTO.setDateName(yearId + "." + monthId + "." + dayId);
}
return factPublishedAgencyDailyDTO;
}

3
epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java

@ -6,6 +6,7 @@ import com.epmet.dao.topic.TopicDao;
import com.epmet.dto.form.LoginUserDetailsFormDTO;
import com.epmet.dto.result.LoginUserDetailsResultDTO;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.group.constant.GroupConstant;
import com.epmet.service.topic.TopicService;
import com.epmet.topic.constant.TopicConstant;
import com.epmet.topic.dto.form.TopicIncrTrendFormDTO;
@ -41,9 +42,9 @@ public class TopicServiceImpl implements TopicService {
@Override
public TopicSummaryResultDTO topicSummary(TokenDto tokenDto) {
TopicSummaryResultDTO result = new TopicSummaryResultDTO();
result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(TopicConstant.RAIL,TopicConstant.DOT));
String agencyId = this.getLoginUserDetails(tokenDto);
List<TopicStatusResultDTO> topicStatus = topicDao.getTopicStatus(agencyId);
result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString());
if (topicStatus.size() != NumConstant.ZERO){
topicStatus.forEach(topic -> {
if (topic.getTopicStatus().equals(TopicConstant.DISCUSSING)){

2
epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml

@ -10,7 +10,7 @@
group_total_count AS groupTotalCount,
group_member_avg_count AS groupPeopleAvg,
group_median AS groupPeopleMedian,
DATE_FORMAT( date_id, '%Y-%m-%d' ) AS deadline
DATE_FORMAT( date_id, '%Y.%m.%d' ) AS deadline
FROM fact_group_agency_daily
WHERE del_flag = '0'
AND agency_id = #{agencyId}

14
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@ -29,7 +29,7 @@ public interface DataStatisticalOpenFeignClient {
* @author: jianjun liu
*/
@PostMapping(value = "data/stats/statspublicity/articleSummaryDailyStatsjob")
Result articleSummaryDailyStatsjob(StatsFormDTO formDTO);
Result articleSummaryDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
/**
* desc: 定时任务 统计文章总数及在线文章总数 包含 机关 部门 网格
@ -39,7 +39,7 @@ public interface DataStatisticalOpenFeignClient {
* @author: jianjun liu
*/
@PostMapping(value = "data/stats/statspublicity/tagUsedDailyStatsjob")
Result tagUsedDailyStatsjob(StatsFormDTO formDTO);
Result tagUsedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
/**
* desc: 统计发表文章最多的分类 包含 机关 部门 网格
@ -48,7 +48,7 @@ public interface DataStatisticalOpenFeignClient {
* @author: jianjun liu
*/
@PostMapping(value = "data/stats/statspublicity/tagUsedMonthlyStatsjob")
Result tagUsedMonthlyStatsjob(StatsFormDTO formDTO);
Result tagUsedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
/**
* desc: 统计发表文章最多的分类 包含 机关 部门 网格
@ -57,7 +57,7 @@ public interface DataStatisticalOpenFeignClient {
* @author: jianjun liu
*/
@PostMapping(value = "data/stats/statspublicity/tagUsedQuarterlyStatsjob")
Result tagUsedQuarterlyStatsjob(StatsFormDTO formDTO);
Result tagUsedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
/**
* desc: 统计阅读最多的标签 包含 机关 网格
@ -66,7 +66,7 @@ public interface DataStatisticalOpenFeignClient {
* @author: jianjun liu
*/
@PostMapping(value = "data/stats/statspublicity/tagViewedDailyStatsjob")
Result tagViewedDailyStatsjob(StatsFormDTO formDTO);
Result tagViewedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
/**
* desc: 统计阅读最多的标签 包含 机关 网格
@ -75,7 +75,7 @@ public interface DataStatisticalOpenFeignClient {
* @author: jianjun liu
*/
@PostMapping(value = "data/stats/statspublicity/tagViewedMonthlyStatsjob")
Result tagViewedMonthlyStatsjob(StatsFormDTO formDTO);
Result tagViewedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
/**
* desc: 统计阅读最多的标签 包含 机关 网格
@ -85,7 +85,7 @@ public interface DataStatisticalOpenFeignClient {
* @param date
*/
@PostMapping(value = "data/stats/statspublicity/tagViewedQuarterlyStatsjob")
Result tagViewedQuarterlyStatsjob(StatsFormDTO formDTO);
Result tagViewedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
/**
* @Description 统计 网格小组 dim网格-

2
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
data-statistical-server:
container_name: data-statistical-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.29
image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.32
ports:
- "8108:8108"
network_mode: host # 使用现有网络

2
epmet-module/data-statistical/data-statistical-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.29</version>
<version>0.3.32</version>
<parent>
<artifactId>data-statistical</artifactId>
<groupId>com.epmet</groupId>

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java

@ -1,5 +1,6 @@
package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.group.form.GroupStatsFormDTO;
import com.epmet.service.StatsGroupService;
import org.springframework.beans.factory.annotation.Autowired;
@ -30,8 +31,9 @@ public class StatsGroupController {
* @author zxc
*/
@PostMapping("groupgriddaily")
public void groupGridDaily(@RequestBody GroupStatsFormDTO formDTO){
public Result groupGridDaily(@RequestBody GroupStatsFormDTO formDTO){
statsGroupService.groupGridDaily(formDTO);
return new Result();
}
/**
@ -40,8 +42,9 @@ public class StatsGroupController {
* @author zxc
*/
@PostMapping("groupagencydaily")
public void groupAgencyDaily(@RequestBody GroupStatsFormDTO formDTO){
public Result groupAgencyDaily(@RequestBody GroupStatsFormDTO formDTO){
statsGroupService.groupAgencyDaily(formDTO);
return new Result();
}
/**
@ -50,8 +53,9 @@ public class StatsGroupController {
* @author zxc
*/
@PostMapping("groupagencymonthly")
public void groupAgencyMonthly(@RequestBody GroupStatsFormDTO formDTO){
public Result groupAgencyMonthly(@RequestBody GroupStatsFormDTO formDTO){
statsGroupService.groupAgencyMonthly(formDTO);
return new Result();
}
}

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java

@ -1,8 +1,10 @@
package com.epmet.controller;
import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.StatsFormDTO;
import com.epmet.service.StatsPublicityService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -14,6 +16,7 @@ import java.util.concurrent.ExecutorService;
/**
* desc:宣传能力controller
*/
@Slf4j
@RequestMapping("statspublicity")
@RestController
public class StatsPublicityController {
@ -32,6 +35,7 @@ public class StatsPublicityController {
*/
@PostMapping(value = "articleSummaryDailyStatsjob")
public Result<Boolean> articleSummaryDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
log.debug("articleSummaryDailyStatsjob param:{}", JSON.toJSONString(formDTO));
return new Result<Boolean>().ok(statsPublicityService.articleSummaryDailyStatsjob(formDTO));
}
@ -43,6 +47,7 @@ public class StatsPublicityController {
*/
@PostMapping(value = "tagUsedDailyStatsjob")
public Result<Boolean> tagUsedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
log.debug("tagUsedDailyStatsjob param:{}", JSON.toJSONString(formDTO));
return new Result<Boolean>().ok(statsPublicityService.tagUsedDailyStatsjob(formDTO));
}
@ -54,6 +59,7 @@ public class StatsPublicityController {
*/
@PostMapping(value = "tagUsedMonthlyStatsjob")
public Result<Boolean> tagUsedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
log.debug("tagUsedMonthlyStatsjob param:{}", JSON.toJSONString(formDTO));
return new Result<Boolean>().ok(statsPublicityService.tagUsedMonthlyStatsjob(formDTO));
}
@ -65,6 +71,7 @@ public class StatsPublicityController {
*/
@PostMapping(value = "tagUsedQuarterlyStatsjob")
public Result<Boolean> tagUsedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
log.debug("tagUsedQuarterlyStatsjob param:{}", JSON.toJSONString(formDTO));
return new Result<Boolean>().ok(statsPublicityService.tagUsedQuarterlyStatsjob(formDTO));
}
@ -76,6 +83,7 @@ public class StatsPublicityController {
*/
@PostMapping(value = "tagViewedDailyStatsjob")
public Result<Boolean> tagViewedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
log.debug("tagViewedDailyStatsjob param:{}", JSON.toJSONString(formDTO));
return new Result<Boolean>().ok(statsPublicityService.tagViewedDailyStatsjob(formDTO));
}
@ -87,6 +95,7 @@ public class StatsPublicityController {
*/
@PostMapping(value = "tagViewedMonthlyStatsjob")
public Result<Boolean> tagViewedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
log.debug("tagViewedMonthlyStatsjob param:{}", JSON.toJSONString(formDTO));
return new Result<Boolean>().ok(statsPublicityService.tagViewedMonthlyStatsjob(formDTO));
}
@ -98,6 +107,7 @@ public class StatsPublicityController {
*/
@PostMapping(value = "tagViewedQuarterlyStatsjob")
public Result<Boolean> tagViewedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
log.debug("tagViewedQuarterlyStatsjob param:{}", JSON.toJSONString(formDTO));
return new Result<Boolean>().ok(statsPublicityService.tagViewedQuarterlyStatsjob(formDTO));
}
}

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java

@ -48,7 +48,7 @@ public interface FactGroupAgencyDailyDao extends BaseDao<FactGroupAgencyDailyEnt
* @param
* @author zxc
*/
List<AgencyMonthlyFormDTO> getLastDayAgency(@Param("monthId") String monthId);
List<AgencyMonthlyFormDTO> getLastDayAgency(@Param("dateId") String dateId);
/**
* @Description 查询 月的小组增量

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java

@ -114,7 +114,8 @@ public class StatsGroupServiceImpl implements StatsGroupService {
public void groupAgencyMonthly(GroupStatsFormDTO formDTO) {
DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO);
String monthId = dimIdBean.getMonthId();
List<AgencyMonthlyFormDTO> lastDayAgency = factGroupAgencyDailyService.getLastDayAgency(monthId);
String dateId = dimIdBean.getDateId();
List<AgencyMonthlyFormDTO> lastDayAgency = factGroupAgencyDailyService.getLastDayAgency(dateId);
List<AgencyGroupMonthlyResultDTO> monthGroupIncr = factGroupAgencyDailyService.getMonthGroupIncr(monthId);
if (monthGroupIncr.size() == NumConstant.ZERO){
lastDayAgency.forEach(agency -> {

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java

@ -114,8 +114,10 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
//如果不传时间 则统计数据为今天之前的数据和,否则统计的是截止到传入的日期数据的和
//入参有客户Id的则按客户Id执行,没有的则全部客户都执行
if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
log.info("articleSummaryDailyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId());
statsSummaryByCustomerId(dimIdBean, statsDateStr, formDTO.getCustomerId());
} else {
log.info("articleSummaryDailyStatsjob execute all customer,dateId:{}", dimIdBean.getDateId());
int pageNo = NumConstant.ONE;
int pageSize = NumConstant.ONE_HUNDRED;
List<String> customerIdList = null;
@ -162,11 +164,13 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
//统计
try {
log.info("tagUsedDailyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId());
statsTagUsedDaily(statsDate, dimIdBean, formDTO.getCustomerId());
} catch (Exception e) {
log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedDailyStatsjob", formDTO.getCustomerId(), dimIdBean.getDateId()), e);
}
} else {
log.info("tagUsedDailyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId());
int pageNo = NumConstant.ONE;
int pageSize = NumConstant.ONE_HUNDRED;
List<String> customerIdList = null;

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyDailyService.java

@ -108,7 +108,7 @@ public interface FactGroupAgencyDailyService extends BaseService<FactGroupAgency
* @param
* @author zxc
*/
List<AgencyMonthlyFormDTO> getLastDayAgency(String monthId);
List<AgencyMonthlyFormDTO> getLastDayAgency(String dateId);
/**
* @Description 查询 月的小组增量

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java

@ -122,8 +122,8 @@ public class FactGroupAgencyDailyServiceImpl extends BaseServiceImpl<FactGroupAg
* @param
* @author zxc
*/
public List<AgencyMonthlyFormDTO> getLastDayAgency(String monthId){
return baseDao.getLastDayAgency(monthId);
public List<AgencyMonthlyFormDTO> getLastDayAgency(String dateId){
return baseDao.getLastDayAgency(dateId);
}
/**

6
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java

@ -347,7 +347,7 @@ public class TopicServiceImpl implements TopicService {
gridDistinct.put(k,false);
});
List<ResiGroupTopicResultDTO> topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDate,dataPacket.getCustomerId());
List<ResiGroupTopicResultDTO> topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDateCheck,dataPacket.getCustomerId());
Map<String,List<ResiGroupTopicResultDTO>> GridGroupMapBetweenTimeRange =
topicsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiGroupTopicResultDTO::getGridId));
List<ResiGroupTopicResultDTO> groupListBetweenTimeRange = new LinkedList<>();
@ -357,7 +357,7 @@ public class TopicServiceImpl implements TopicService {
groupListBetweenTimeRange.addAll(entryBetweenTimeRange.getValue());
}
List<ResiTopicOperationResultDTO> operationsBetweenTimeRange =
topicDao.selectTopicOperationRecordBetweenTimeRange(calendar.getTime(),targetDate);
topicDao.selectTopicOperationRecordBetweenTimeRange(calendar.getTime(),targetDateCheck);
Map<String,List<ResiTopicOperationResultDTO>> topicOperationMapBetweenTimeRange =
operationsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiTopicOperationResultDTO::getTopicId));
@ -1127,7 +1127,7 @@ public class TopicServiceImpl implements TopicService {
gridDistinct.put(k,false);
});
List<ResiGroupTopicResultDTO> topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDate,dataPacket.getCustomerId());
List<ResiGroupTopicResultDTO> topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDateCheck,dataPacket.getCustomerId());
//key : gridId
Map<String,List<ResiGroupTopicResultDTO>> GridGroupMapBetweenTimeRange =
topicsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiGroupTopicResultDTO::getGridId));

2
epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml

@ -125,7 +125,7 @@
<!--日志文档保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录ERROR级别的 -->
<!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
<filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>

2
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupAgencyDailyDao.xml

@ -91,7 +91,7 @@
fact_group_agency_daily
WHERE
del_flag = '0'
AND date_id = (SELECT MAX(date_id) FROM fact_group_agency_daily WHERE del_flag = '0')
AND date_id = #{dateId}
</select>
<!-- 查询 月的小组增量 -->

2
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-job-server:
container_name: epmet-job-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.17
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.19
ports:
- "8084:8084"
network_mode: host # 使用现有网络

2
epmet-module/epmet-job/epmet-job-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.17</version>
<version>0.3.19</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-job</artifactId>

10
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java

@ -23,21 +23,21 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask {
@Override
public void run(String params) {
logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = null;
logger.info("publicityArticleSummaryDailyStatsTask定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = new StatsFormDTO();
if (StringUtils.isNotBlank(params)){
formDTO = JSON.parseObject(params,StatsFormDTO.class);
}
Result result = statsPublicityTaskService.articleSummaryDailyStatsjob(formDTO);
if (result.success()) {
logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行成功");
logger.info("publicityArticleSummaryDailyStatsTask定时任务执行成功");
} else {
logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg());
logger.error("publicityArticleSummaryDailyStatsTask定时任务执行失败:" + result.getMsg());
}
}
public static void main(String[] args) {
StatsFormDTO formDTO = null;
StatsFormDTO formDTO = new StatsFormDTO();
String params = "{'date':'\"2020-06-20','customerId':'123'}";
if (StringUtils.isNotBlank(params)){
formDTO = JSON.parseObject(params,StatsFormDTO.class);

8
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java

@ -23,16 +23,16 @@ public class PublicityTagUsedDailyStatsTask implements ITask {
@Override
public void run(String params) {
logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = null;
logger.info("publicityTagUsedDailyStatsTask定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = new StatsFormDTO();
if (StringUtils.isNotBlank(params)){
formDTO = JSON.parseObject(params,StatsFormDTO.class);
}
Result result = statsPublicityTaskService.tagUsedDailyStatsjob(formDTO);
if (result.success()) {
logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行定时任务执行成功");
logger.info("publicityTagUsedDailyStatsTask定时任务执行成功");
} else {
logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行定时任务执行失败:" + result.getMsg());
logger.error("publicityTagUsedDailyStatsTask定时任务执行失败:" + result.getMsg());
}
}
}

8
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java

@ -23,16 +23,16 @@ public class PublicityTagUsedMonthlyStatsTask implements ITask {
@Override
public void run(String params) {
logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = null;
logger.info("publicityTagUsedMonthlyStatsTask定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = new StatsFormDTO();
if (StringUtils.isNotBlank(params)){
formDTO = JSON.parseObject(params,StatsFormDTO.class);
}
Result result = statsPublicityTaskService.tagUsedMonthlyStatsjob(formDTO);
if (result.success()) {
logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行成功");
logger.info("publicityTagUsedMonthlyStatsTask定时任务执行成功");
} else {
logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行失败:" + result.getMsg());
logger.error("publicityTagUsedMonthlyStatsTask定时任务执行失败:" + result.getMsg());
}
}
}

8
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java

@ -23,16 +23,16 @@ public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask {
@Override
public void run(String params) {
logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = null;
logger.info("publicityTagUsedQuarterlyAndYearlyStatsTask定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = new StatsFormDTO();
if (StringUtils.isNotBlank(params)){
formDTO = JSON.parseObject(params,StatsFormDTO.class);
}
Result result = statsPublicityTaskService.tagUsedQuarterlyStatsjob(formDTO);
if (result.success()) {
logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行成功");
logger.info("publicityTagUsedQuarterlyAndYearlyStatsTask定时任务执行成功");
} else {
logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行失败:" + result.getMsg());
logger.error("publicityTagUsedQuarterlyAndYearlyStatsTask定时任务执行失败:" + result.getMsg());
}
}
}

8
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java

@ -23,16 +23,16 @@ public class PublicityTagViewedDailyStatsTask implements ITask {
@Override
public void run(String params) {
logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = null;
logger.info("publicityTagViewedDailyStatsTask定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = new StatsFormDTO();
if (StringUtils.isNotBlank(params)){
formDTO = JSON.parseObject(params,StatsFormDTO.class);
}
Result result = statsPublicityTaskService.tagViewedDailyStatsjob(formDTO);
if (result.success()) {
logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行定时任务执行成功");
logger.info("publicityTagViewedDailyStatsTask定时任务执行成功");
} else {
logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg());
logger.error("publicityTagViewedDailyStatsTask定时任务执行失败:" + result.getMsg());
}
}
}

8
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java

@ -23,16 +23,16 @@ public class PublicityTagViewedMonthlyStatsTask implements ITask {
@Override
public void run(String params) {
logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = null;
logger.info("publicityTagViewedMonthlyStatsTask定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = new StatsFormDTO();
if (StringUtils.isNotBlank(params)){
formDTO = JSON.parseObject(params,StatsFormDTO.class);
}
Result result = statsPublicityTaskService.tagViewedMonthlyStatsjob(formDTO);
if (result.success()) {
logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行成功");
logger.info("publicityTagViewedMonthlyStatsTask定时任务执行成功");
} else {
logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg());
logger.error("publicityTagViewedMonthlyStatsTask定时任务执行失败:" + result.getMsg());
}
}
}

8
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java

@ -23,16 +23,16 @@ public class PublicityTagViewedQuarterlyAndYearlyhlyStatsTask implements ITask {
@Override
public void run(String params) {
logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = null;
logger.info("publicityTagViewedMonthlyStatsTask定时任务正在执行,参数为:{}", params);
StatsFormDTO formDTO = new StatsFormDTO();
if (StringUtils.isNotBlank(params)){
formDTO = JSON.parseObject(params,StatsFormDTO.class);
}
Result result = statsPublicityTaskService.tagViewedQuarterlyStatsjob(formDTO);
if (result.success()) {
logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行成功");
logger.info("publicityTagViewedMonthlyStatsTask定时任务执行成功");
} else {
logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg());
logger.error("publicityTagViewedMonthlyStatsTask定时任务执行失败:" + result.getMsg());
}
}
}

6
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java

@ -23,12 +23,12 @@ public class StatsGroupAgencyDailyTask implements ITask {
@Override
public void run(String params) {
logger.debug("StatsGroupAgencyDailyTask定时任务正在执行,参数为:{}", params);
logger.info("StatsGroupAgencyDailyTask定时任务正在执行,参数为:{}", params);
Result result = statsGroupService.groupAgencyDaily(params);
if (result.success()){
logger.debug("StatsGroupAgencyDailyTask定时任务正在执行定时任务执行成功");
logger.info("StatsGroupAgencyDailyTask定时任务执行成功");
}else {
logger.debug("StatsGroupAgencyDailyTask定时任务正在执行定时任务执行失败:" + result.getMsg());
logger.error("StatsGroupAgencyDailyTask定时任务执行失败:" + result.getMsg());
}
}
}

6
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java

@ -23,12 +23,12 @@ public class StatsGroupAgencyMonthlyTask implements ITask {
@Override
public void run(String params) {
logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行,参数为:{}", params);
logger.info("StatsGroupAgencyMonthlyTask定时任务正在执行,参数为:{}", params);
Result result = statsGroupService.groupAgencyMonthly(params);
if (result.success()){
logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行定时任务执行成功");
logger.info("StatsGroupAgencyMonthlyTask定时任务执行成功");
}else {
logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行定时任务执行失败:" + result.getMsg());
logger.error("StatsGroupAgencyMonthlyTask定时任务执行失败:" + result.getMsg());
}
}
}

6
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java

@ -24,12 +24,12 @@ public class StatsGroupGridDailyTask implements ITask {
@Override
public void run(String params) {
logger.debug("StatsGroupGridDailyTask定时任务正在执行,参数为:{}", params);
logger.info("StatsGroupGridDailyTask定时任务正在执行,参数为:{}", params);
Result result = statsGroupService.groupGridDaily(params);
if (result.success()){
logger.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行成功");
logger.info("StatsGroupGridDailyTask定时任务执行成功");
}else {
logger.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行失败:" + result.getMsg());
logger.error("StatsGroupGridDailyTask定时任务执行失败:" + result.getMsg());
}
}
}

8
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java

@ -3,10 +3,8 @@ package com.epmet.task;
import com.epmet.commons.tools.utils.Result;
import com.epmet.service.StatsIssueService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.logging.Log;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
/**
* @author zhaoqifeng
@ -21,12 +19,12 @@ public class StatsIssueTask implements ITask {
@Override
public void run(String params) {
log.debug("StatsGroupGridDailyTask定时任务正在执行,参数为:{}", params);
log.info("StatsGroupGridDailyTask定时任务正在执行,参数为:{}", params);
Result result = statsIssueService.agencyGridIssueStats(params);
if (result.success()){
log.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行成功");
log.info("StatsGroupGridDailyTask定时任务执行成功");
}else {
log.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行失败:" + result.getMsg());
log.error("StatsGroupGridDailyTask定时任务执行失败:" + result.getMsg());
}
}
}

6
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java

@ -21,12 +21,12 @@ public class StatsProjectAgencyTask implements ITask {
@Override
public void run(String params) {
log.debug("StatsProjectAgencyTask定时任务正在执行,参数为:{}", params);
log.info("StatsProjectAgencyTask定时任务正在执行,参数为:{}", params);
Result result = statsProjectService.agencyProjectStats(params);
if (result.success()){
log.debug("StatsProjectAgencyTask定时任务正在执行定时任务执行成功");
log.info("StatsProjectAgencyTask定时任务执行成功");
}else {
log.debug("StatsProjectAgencyTask定时任务正在执行定时任务执行失败:" + result.getMsg());
log.error("StatsProjectAgencyTask定时任务执行失败:" + result.getMsg());
}
}
}

6
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java

@ -24,12 +24,12 @@ public class StatsProjectGridTask implements ITask {
@Override
public void run(String params) {
log.debug("StatsProjectGridTask定时任务正在执行,参数为:{}", params);
log.info("StatsProjectGridTask定时任务正在执行,参数为:{}", params);
Result result = statsProjectService.gridProjectStats(params);
if (result.success()){
log.debug("StatsProjectGridTask定时任务正在执行定时任务执行成功");
log.info("StatsProjectGridTask定时任务执行成功");
}else {
log.debug("StatsProjectGridTask定时任务正在执行定时任务执行失败:" + result.getMsg());
log.error("StatsProjectGridTask定时任务执行失败:" + result.getMsg());
}
}
}

6
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsTopicTask.java

@ -23,12 +23,12 @@ public class StatsTopicTask implements ITask {
@Override
public void run(String params) {
logger.debug("StatsTopicTask定时任务正在执行,参数为:{}", params);
logger.info("StatsTopicTask定时任务正在执行,参数为:{}", params);
Result result = statsTopicService.execTopicStatistical(params);
if (result.success()){
logger.debug("StatsTopicTask定时任务正在执行定时任务执行成功");
logger.info("StatsTopicTask定时任务执行成功");
}else {
logger.debug("StatsTopicTask定时任务正在执行定时任务执行失败:" + result.getMsg());
logger.error("StatsTopicTask定时任务执行失败:" + result.getMsg());
}
}
}

6
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsUserTask.java

@ -23,12 +23,12 @@ public class StatsUserTask implements ITask {
@Override
public void run(String params) {
logger.debug("StatsUserTask定时任务正在执行,参数为:{}", params);
logger.info("StatsUserTask定时任务正在执行,参数为:{}", params);
Result result = statsUserService.execUserStatistical(params);
if (result.success()){
logger.debug("StatsUserTask定时任务正在执行定时任务执行成功");
logger.info("StatsUserTask定时任务执行成功");
}else {
logger.debug("StatsUserTask定时任务正在执行定时任务执行失败:" + result.getMsg());
logger.error("StatsUserTask定时任务执行失败:" + result.getMsg());
}
}
}

6
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/SyncVotingCacheAndDbTask.java

@ -22,12 +22,12 @@ public class SyncVotingCacheAndDbTask implements ITask {
@Override
public void run(String params) {
logger.debug("syncVotingCacheAndDbTask定时任务正在执行,参数为:{}", params);
logger.info("syncVotingCacheAndDbTask定时任务正在执行,参数为:{}", params);
Result result = syncVotingCacheAndDbService.syncVotingCacheAndDb();
if(result.success()){
logger.debug("syncVotingCacheAndDbTask定时任务正在执行定时任务执行成功");
logger.info("syncVotingCacheAndDbTask定时任务执行成功");
}else{
logger.debug("syncVotingCacheAndDbTask定时任务正在执行定时任务执行失败:"+result.getMsg());
logger.debug("syncVotingCacheAndDbTask定时任务执行失败:"+result.getMsg());
}
}
}

6
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TestTask.java

@ -30,12 +30,12 @@ public class TestTask implements ITask{
private TestTaskService testTaskService;
@Override
public void run(String params){
logger.debug("TestTask定时任务正在执行,参数为:{}", params);
logger.info("TestTask定时任务正在执行,参数为:{}", params);
Result result=testTaskService.testTask(params);
if(result.success()){
logger.debug("TestTask定时任务执行成功");
logger.info("TestTask定时任务执行成功");
}else{
logger.debug("TestTask定时任务执行失败:"+result.getMsg());
logger.error("TestTask定时任务执行失败:"+result.getMsg());
}
}
}

5
epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml

@ -125,11 +125,12 @@
<!--日志文档保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录ERROR级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
<webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</webHook>
<secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</secret>
</filter>
</appender>

Loading…
Cancel
Save