内容访问统计

@@ -33,8 +33,8 @@
         <!--代码生成器-->
         <dependency>
             <groupId>com.topdraw</groupId>
-            <artifactId>cronos-system</artifactId>
-            <version>1.1.0</version>
+            <artifactId>cronos-common</artifactId>
+            <version>1.2.1</version>
         </dependency>
 
         <!--Mysql依赖包，版本差异，需单独引入-->

 package com.topdraw;
 
 import com.topdraw.base.BaseRepositoryFactory;
-import com.topdraw.utils.SpringContextHolder;
+import com.topdraw.modules.utils.SpringContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

@@ -3,7 +3,7 @@ package com.topdraw.business.module.activitybtn.all.service.impl;
 import com.topdraw.business.module.activitybtn.all.domain.ActTplParamClick;
 import com.topdraw.business.module.activitybtn.all.repository.ActivityBtnPvUvRepository;
 import com.topdraw.business.module.activitybtn.all.service.ActivityBtnPvUvService;
-import com.topdraw.utils.ValidationUtil;
+import com.topdraw.modules.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

@@ -3,7 +3,7 @@ package com.topdraw.business.module.activitybtn.day.service.impl;
 import com.topdraw.business.module.activitybtn.day.domain.ActTplParamClickDay;
 import com.topdraw.business.module.activitybtn.day.repository.ActivityBtnPvUvDayRepository;
 import com.topdraw.business.module.activitybtn.day.service.ActivityBtnPvUvDayService;
-import com.topdraw.utils.ValidationUtil;
+import com.topdraw.modules.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

@@ -3,7 +3,7 @@ package com.topdraw.business.module.activitybtn.hour.service.impl;
 import com.topdraw.business.module.activitybtn.hour.domain.ActTplParamClickHour;
 import com.topdraw.business.module.activitybtn.hour.repository.ActivityBtnPvUvHourRepository;
 import com.topdraw.business.module.activitybtn.hour.service.ActivityBtnPvUvHourService;
-import com.topdraw.utils.ValidationUtil;
+import com.topdraw.modules.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

@@ -3,7 +3,7 @@ package com.topdraw.business.module.content.all.service.impl;
 import com.topdraw.business.module.content.all.domain.ContentPVUV;
 import com.topdraw.business.module.content.all.repository.ContentPVUVRepository;
 import com.topdraw.business.module.content.all.service.ContentPVUVService;
-import com.topdraw.utils.ValidationUtil;
+import com.topdraw.modules.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

@@ -3,7 +3,7 @@ package com.topdraw.business.module.content.day.service.impl;
 import com.topdraw.business.module.content.day.domain.ContentPVUVDay;
 import com.topdraw.business.module.content.day.repository.ContentPVUVDayRepository;
 import com.topdraw.business.module.content.day.service.ContentPVUVDayService;
-import com.topdraw.utils.ValidationUtil;
+import com.topdraw.modules.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

@@ -3,7 +3,7 @@ package com.topdraw.business.module.content.hour.service.impl;
 import com.topdraw.business.module.content.hour.domain.ContentPVUVHour;
 import com.topdraw.business.module.content.hour.repository.ContentPVUVHourRepository;
 import com.topdraw.business.module.content.hour.service.ContentPVUVHourService;
-import com.topdraw.utils.ValidationUtil;
+import com.topdraw.modules.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

@@ -108,9 +108,6 @@ public class TemplateParamValue implements Serializable {
     @Column(name = "page_code")
     private String pageCode;
 
-    @Column(name = "page_title")
-    private String pageTitle;
-
     //展现形式
     @Column(name = "display_form")
     private Integer displayForm;

 package com.topdraw.business.module.uv.all.service.impl;
 
 import com.topdraw.business.module.uv.all.domain.PvUv;
-import com.topdraw.utils.ValidationUtil;
-import com.topdraw.utils.FileUtil;
+import com.topdraw.modules.utils.ValidationUtil;
+import com.topdraw.modules.utils.FileUtil;
 import com.topdraw.business.module.uv.all.repository.PvUvRepository;
 import com.topdraw.business.module.uv.all.service.PvUvService;
 import com.topdraw.business.module.uv.all.service.dto.PvUvDTO;
@@ -16,9 +16,9 @@ import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.Assert;
-import com.topdraw.utils.PageUtil;
-import com.topdraw.utils.QueryHelp;
-import com.topdraw.utils.StringUtils;
+import com.topdraw.modules.utils.PageUtil;
+import com.topdraw.modules.utils.QueryHelp;
+import com.topdraw.modules.utils.StringUtils;
 
 import java.util.List;
 import java.util.Map;

 package com.topdraw.business.module.uv.day.service.impl;
 
 import com.topdraw.business.module.uv.day.domain.PvUvDay;
-import com.topdraw.utils.ValidationUtil;
-import com.topdraw.utils.FileUtil;
+import com.topdraw.modules.utils.ValidationUtil;
+import com.topdraw.modules.utils.FileUtil;
 import com.topdraw.business.module.uv.day.repository.PvUvDayRepository;
 import com.topdraw.business.module.uv.day.service.PvUvDayService;
 import com.topdraw.business.module.uv.day.service.dto.PvUvDayDTO;
@@ -16,9 +16,9 @@ import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.Assert;
-import com.topdraw.utils.PageUtil;
-import com.topdraw.utils.QueryHelp;
-import com.topdraw.utils.StringUtils;
+import com.topdraw.modules.utils.PageUtil;
+import com.topdraw.modules.utils.QueryHelp;
+import com.topdraw.modules.utils.StringUtils;
 
 import java.util.List;
 import java.util.Map;

 package com.topdraw.business.module.uv.hour.service.impl;
 
 import com.topdraw.business.module.uv.hour.domain.PvUvHour;
-import com.topdraw.utils.ValidationUtil;
-import com.topdraw.utils.FileUtil;
+import com.topdraw.modules.utils.ValidationUtil;
+import com.topdraw.modules.utils.FileUtil;
 import com.topdraw.business.module.uv.hour.repository.PvUvHourRepository;
 import com.topdraw.business.module.uv.hour.service.PvUvHourService;
 import com.topdraw.business.module.uv.hour.service.dto.PvUvHourDTO;
@@ -16,9 +16,9 @@ import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.Assert;
-import com.topdraw.utils.PageUtil;
-import com.topdraw.utils.QueryHelp;
-import com.topdraw.utils.StringUtils;
+import com.topdraw.modules.utils.PageUtil;
+import com.topdraw.modules.utils.QueryHelp;
+import com.topdraw.modules.utils.StringUtils;
 
 import java.util.List;
 import java.util.Map;

@@ -7,7 +7,7 @@ import com.topdraw.business.module.activitybtn.day.service.ActivityBtnPvUvDaySer
 import com.topdraw.business.module.activitybtn.hour.domain.ActTplParamClickHour;
 import com.topdraw.business.module.activitybtn.hour.service.ActivityBtnPvUvHourService;
 import com.topdraw.util.TimestampUtil;
-import com.topdraw.utils.RedisUtils;
+import com.topdraw.modules.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

@@ -7,15 +7,9 @@ import com.topdraw.business.module.content.day.service.ContentPVUVDayService;
 import com.topdraw.business.module.content.hour.domain.ContentPVUVHour;
 import com.topdraw.business.module.content.hour.service.ContentPVUVHourService;
 import com.topdraw.business.module.template.service.TemplateParamValueService;
-import com.topdraw.business.module.uv.all.domain.PvUv;
-import com.topdraw.business.module.uv.all.service.PvUvService;
-import com.topdraw.business.module.uv.day.domain.PvUvDay;
-import com.topdraw.business.module.uv.day.service.PvUvDayService;
-import com.topdraw.business.module.uv.hour.domain.PvUvHour;
-import com.topdraw.business.module.uv.hour.service.PvUvHourService;
 import com.topdraw.util.TimestampUtil;
-import com.topdraw.utils.RedisUtils;
-import com.topdraw.utils.StringUtils;
+import com.topdraw.modules.utils.RedisUtils;
+import com.topdraw.modules.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,21 +46,25 @@ public class ContentCalculateTask {
         //循环所有内容，
         Map<Object, Object> allContents = this.getAllContents();
         Set<Object> contentCodes = allContents.keySet();
-        List<Long> btnIds = contentCodes.stream().map(item -> {return Long.parseLong(item.toString().split("#")[0]);}).collect(Collectors.toList());
-        Map<Long, String> btnNames = templateParamValueService.btnNames(btnIds);
+//        log.info("all content codes: {}", contentCodes);
         //查询btn name集合
         if (CollectionUtils.isNotEmpty(contentCodes)) {
+            List<Long> btnIds = contentCodes.stream().map(item -> {return Long.parseLong(item.toString().split("#")[0]);}).collect(Collectors.toList());
+            Map<Long, String> btnNames = templateParamValueService.btnNames(btnIds);
             for (Object item : contentCodes) {
                 String key = String.valueOf(item);
+//                log.info("now content: {}", key);
                 String[] split = key.split("#");
                 if (split.length < 2) {
                     continue;
                 }
                 Long btnId = Long.parseLong(split[0]);
                 String contentCode = split[1];
-                String name = allContents.get(item).toString();
+                Object contentName = allContents.get(key);
+//                log.info("content name: {}", contentName);
+                String name = contentName != null ? contentName.toString() : "";
                 name = StringUtils.isNotEmpty(name) ? name : btnNames.get(btnId);
-
+//                log.info("final key: {}, name: {}", key, name);
                 String day = LocalDate.now().toString();
                 Integer hour = LocalDateTime.now().getHour();
 

@@ -7,7 +7,7 @@ import com.topdraw.business.module.uv.day.service.PvUvDayService;
 import com.topdraw.business.module.uv.hour.domain.PvUvHour;
 import com.topdraw.business.module.uv.hour.service.PvUvHourService;
 import com.topdraw.util.TimestampUtil;
-import com.topdraw.utils.RedisUtils;
+import com.topdraw.modules.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

 package com.topdraw.redis.config;
 
+import com.topdraw.modules.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;