Skip to content

H
haoban-manage3.0
Commit 1e5f4467 by 徐高华
Options

log

parent 024bbea5
Showing with 44 additions and 45 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkServiceImpl.java
......@@ -4,8 +4,7 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -33,7 +32,7 @@ import com.github.pagehelper.PageHelper;
@Service("hmLikService")
public class HmLinkServiceImpl implements HmLinkService {
private static final Logger log = LoggerFactory.getLogger(HmLinkService.class);
private static org.apache.logging.log4j.Logger log = LogManager.getLogger(HmLinkService.class);
public static String[] PADDING = new String[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C",
"D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X",
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkStoreServiceImpl.java
......@@ -5,6 +5,7 @@ import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -14,11 +15,15 @@ import com.gic.commons.util.UniqueIdUtils;
import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
import com.gic.haoban.manage.service.dao.mapper.hm.HmLinkStoreMapper;
import com.gic.haoban.manage.service.entity.hm.TabHmLinkStore;
import com.gic.haoban.manage.service.service.hm.HmLinkService;
import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
@Service("hmLinkStoreService")
public class HmLinkStoreServiceImpl implements HmLinkStoreService {
private static org.apache.logging.log4j.Logger log = LogManager.getLogger(HmLinkStoreService.class);
@Autowired
private HmLinkStoreMapper hmLinkStoreMapper;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkVisitLogServiceImpl.java
......@@ -2,8 +2,7 @@ package com.gic.haoban.manage.service.service.hm.impl;
import java.util.Date;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -19,7 +18,7 @@ import com.gic.haoban.manage.service.service.hm.HmLinkVisitLogService;
@Service("hmLinkVisitLogService")
public class HmLinkVisitLogServiceImpl implements HmLinkVisitLogService {
private static final Logger log = LoggerFactory.getLogger(HmLinkVisitLogService.class);
private static org.apache.logging.log4j.Logger log = LogManager.getLogger(HmLinkVisitLogService.class);
@Autowired
private HmLinkVisitLogMapper hmLinkVisitLogMapper;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmQrcodeServiceImpl.java
package com.gic.haoban.manage.service.service.hm.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -34,7 +32,7 @@ import com.github.pagehelper.PageInfo;
@Service
public class HmQrcodeServiceImpl implements HmQrcodeService {
private static final Logger log = LoggerFactory.getLogger(HmQrcodeService.class);
private static org.apache.logging.log4j.Logger log = LogManager.getLogger(HmQrcodeService.class);
@Autowired
private TabHaobanHmQrcodeMapper tabHaobanHmQrcodeMapper;
@Autowired
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmQrcodeTempServiceImpl.java
......@@ -4,8 +4,7 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -23,7 +22,7 @@ import com.gic.wechat.api.service.qywx.QywxUserApiService;
@Service
public class HmQrcodeTempServiceImpl implements HmQrcodeTempService {
private static final Logger log = LoggerFactory.getLogger(HmQrcodeTempService.class);
private static org.apache.logging.log4j.Logger log = LogManager.getLogger(HmQrcodeTempService.class);
@Autowired
private HmQrcodeTempMapper hmQrcodeTempMapper;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/WxUserAddLogServiceImpl.java
......@@ -8,8 +8,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -37,7 +36,7 @@ import com.github.pagehelper.PageHelper;
@Service("wxUserAddLogService")
public class WxUserAddLogServiceImpl implements WxUserAddLogService {
private static final Logger log = LoggerFactory.getLogger(WxUserAddLogService.class);
private static org.apache.logging.log4j.Logger log = LogManager.getLogger(WxUserAddLogService.class);
@Autowired
private WxUserAddLogMapper wxUserAddLogMapper;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java
package com.gic.haoban.manage.service.service.out.impl.hm;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.BasePageInfo;
......@@ -38,22 +49,11 @@ import com.gic.member.api.service.MemberService;
import com.gic.wechat.api.dto.qywx.welcome.QywxExternalcontactDTO;
import com.gic.wechat.api.dto.qywx.welcome.QywxExternalcontactResultDTO;
import com.gic.wechat.api.service.qywx.QywxUserApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
@Service("hmLinkApiService")
public class HmLinkApiServiceImpl implements HmLinkApiService {
private static final Logger log = LoggerFactory.getLogger(HmLinkApiService.class);
private static org.apache.logging.log4j.Logger log = LogManager.getLogger(HmLinkApiService.class);
@Autowired
private HmLinkService hmLinkService;
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java
......@@ -71,7 +71,7 @@ public class HmLinkController {
private WxUserAddLogApiService wxUserAddLogApiService;
@RequestMapping("add")
@GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.RECHAGE_CENTER, optType = GicLogRecordOptTypeEnum.RECHAGE_MODIFY_OPT, userFunc = LogRecordUserService.class, optPage = "活码")
@GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.RECHAGE_CENTER, optType = GicLogRecordOptTypeEnum.RECHAGE_MODIFY_OPT, userFunc = LogRecordUserService.class, optPage = "引流链接-新建链接")
public RestResponse<Object> save(@RequestBody HmLinkDTO dto) {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
dto.setCreatorId(loginUser.getClerkId());
......@@ -92,7 +92,7 @@ public class HmLinkController {
}
@RequestMapping("update")
@GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.RECHAGE_CENTER, optType = GicLogRecordOptTypeEnum.RECHAGE_MODIFY_OPT, userFunc = LogRecordUserService.class, optPage = "活码")
@GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.RECHAGE_CENTER, optType = GicLogRecordOptTypeEnum.RECHAGE_MODIFY_OPT, userFunc = LogRecordUserService.class, optPage = "引流链接-编辑链接")
public RestResponse<Object> update(@RequestBody HmLinkDTO dto) {
Long linkId = dto.getLinkId();
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
......@@ -523,12 +523,12 @@ public class HmLinkController {
}
jsonObject.put("orderByField", qdto.getSortColumn() + " " + qdto.getSortType());
JSONObject param = DataStatisticsParamUtils.getParam(basePageInfo, jsonObject);
Page page = DataStatisticsParamUtils.getPage(DataHttpUtil
.post(StatisticsApolloKeyConstant.data_haoban_link_list, param));
Page page = DataStatisticsParamUtils
.getPage(DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_link_list, param));
if (page == null) {
return RestResponse.successResult();
}
//查询shortCode
// 查询shortCode
String shortCode = "";
ServiceResponse<HmLinkDTO> hmLinkRes = hmLinkApiService.getByLinkId(loginUser.getWxEnterpriseId(),
loginUser.getEnterpriseId(), qdto.getLinkId());
......@@ -601,9 +601,9 @@ public class HmLinkController {
jsonObject.put("enterpriseId", loginUser.getEnterpriseId());
jsonObject.put("linkId", linkId);
JSONObject param = DataStatisticsParamUtils.getParamNoPage(jsonObject);
//HmLinkStatisticsVO vo = new HmLinkStatisticsVO();
return DataStatisticsParamUtils.responseOne(DataHttpUtil
.post(StatisticsApolloKeyConstant.data_haoban_link_overview, param));
// HmLinkStatisticsVO vo = new HmLinkStatisticsVO();
return DataStatisticsParamUtils
.responseOne(DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_link_overview, param));
}
// 统计图表
......@@ -615,7 +615,7 @@ public class HmLinkController {
jsonObject.put("enterpriseId", loginUser.getEnterpriseId());
jsonObject.put("linkId", linkId);
if (startTime == null) {
//过去7天
// 过去7天
Calendar cl = Calendar.getInstance();
cl.add(Calendar.DATE, -7);
startTime = cl.getTime();
......@@ -627,13 +627,13 @@ public class HmLinkController {
}
endTime = DateUtil.getEndTimeOfDay(endTime);
jsonObject.put("endTime", endTime);
//日期填充
// 日期填充
List<String> dateList;
//用于链接添加趋势图数据 企业+链接+日期
// 用于链接添加趋势图数据 企业+链接+日期
String apolloKey = "data_haoban_link_add_trend_d";
//用于链接点击趋势图数据 企业+链接+日期
// 用于链接点击趋势图数据 企业+链接+日期
String clickApolloKey = "data_haoban_link_click_trend_d";
//如果天数大于60，调用月接口
// 如果天数大于60，调用月接口
if (DateUtil.daysBetween(startTime, endTime) > 60) {
dateList = getMonthBetween(startTime, endTime);
apolloKey = "data_haoban_link_add_trend_m";
......@@ -692,7 +692,7 @@ public class HmLinkController {
jsonObject.put("linkSelect2", clerkSearchParams);
}
if (StringUtils.isBlank(sortColumn)) {
//今日新增人数
// 今日新增人数
sortColumn = "addNum";
}
if (StringUtils.isBlank(sortType)) {
......@@ -700,8 +700,8 @@ public class HmLinkController {
}
jsonObject.put("orderByField", sortColumn + " " + sortType);
JSONObject param = DataStatisticsParamUtils.getParam(basePageInfo, jsonObject);
return DataStatisticsParamUtils.responsePage(DataHttpUtil
.post(StatisticsApolloKeyConstant.data_haoban_link_detail, param));
return DataStatisticsParamUtils
.responsePage(DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_link_detail, param));
}
// 加好友列表
......@@ -722,7 +722,7 @@ public class HmLinkController {
public static List<String> getMonthBetween(Date minDate, Date maxDate) {
ArrayList<String> result = new ArrayList<>();
try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");//格式化为年月
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");// 格式化为年月
Calendar min = Calendar.getInstance();
Calendar max = Calendar.getInstance();
......
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