Merge remote-tracking branch 'origin/master'

portal-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java

@@ -35,4 +35,6 @@ public class RedisKey {
 
     public static final String KEY_DEVICE_EVENT_CLICK_CACHE = "device:event:click";
 
+    public static final String KEY_DEVICE_EVENT_CLICK_CACHE_DAY = "device:event:click:day";
+
 }

portal-manager/src/main/java/com/mortals/xhx/module/page/service/impl/PageEventServiceImpl.java

@@ -4,6 +4,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.RedisKey;
@@ -88,6 +89,18 @@ public class PageEventServiceImpl extends AbstractCRUDServiceImpl<PageEventDao,
                     pageEventCensusVo.setTotal(pageEventCensusVo.getTotal()+1);
                     cacheService.hset(RedisKey.KEY_DEVICE_EVENT_CLICK_CACHE, key, pageEventCensusVo);
                 }
+                PageEventCensusVo pageEventCensusVoDay = cacheService.hget(RedisKey.KEY_DEVICE_EVENT_CLICK_CACHE_DAY,key,PageEventCensusVo.class);
+                if(ObjectUtils.isEmpty(pageEventCensusVoDay)){
+                    pageEventCensusVoDay = new PageEventCensusVo();
+                    pageEventCensusVoDay.setProductId(entity.getProductId());
+                    pageEventCensusVoDay.setEventCode("Click");
+                    pageEventCensusVoDay.setEventName("点击");
+                    pageEventCensusVoDay.setTotal(1);
+                    cacheService.hset(RedisKey.KEY_DEVICE_EVENT_CLICK_CACHE_DAY, key, pageEventCensusVoDay);
+                }else {
+                    pageEventCensusVoDay.setTotal(pageEventCensusVoDay.getTotal()+1);
+                    cacheService.hset(RedisKey.KEY_DEVICE_EVENT_CLICK_CACHE_DAY, key, pageEventCensusVoDay);
+                }
             }
         }
     }
@@ -311,10 +324,19 @@ public class PageEventServiceImpl extends AbstractCRUDServiceImpl<PageEventDao,
                     if(CollectionUtils.isNotEmpty(list)) {
                         cacheService.hset(RedisKey.KEY_DEVICE_EVENT_CLICK_CACHE, entry.getKey(), list.get(0));
                     }
+                    query.setDateTimeStart(DateUtils.getCurrDateTime("yyyy-MM-dd"));
+                    query.setDateTimeEnd(DateUtils.getCurrDateTime("yyyy-MM-dd"));
+                    List<PageEventCensusVo> listDay = dao.getPageClickEventCensus(query);
+                    if(CollectionUtils.isNotEmpty(listDay)) {
+                        cacheService.hset(RedisKey.KEY_DEVICE_EVENT_CLICK_CACHE_DAY, entry.getKey(), listDay.get(0));
+                    }
                 }
             }
         }
         return null;
     }
 
+    public static void main(String[] args) {
+        System.out.println(DateUtils.getCurrDateTime("yyyy-MM-dd"));
+    }
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/page/web/PageCensusController.java

@@ -359,6 +359,16 @@ public class PageCensusController extends BaseJsonBodyController {
 
                 }
                 model.put("data", pageEventCensusVo);
+                PageEventCensusVo pageEventCensusVoDay = cacheService.hget(RedisKey.KEY_DEVICE_EVENT_CLICK_CACHE_DAY,key,PageEventCensusVo.class);
+                if(null == pageEventCensusVoDay){
+                    pageEventCensusVoDay = new PageEventCensusVo();
+                    pageEventCensusVoDay.setProductId(query.getProductId());
+                    pageEventCensusVoDay.setEventCode("Click");
+                    pageEventCensusVoDay.setEventName("点击");
+                    pageEventCensusVoDay.setTotal(0);
+
+                }
+                model.put("dataDay", pageEventCensusVoDay);
                 model.put("message_info", busiDesc + "成功");
             }
 

portal-manager/src/main/resources/sqlmap/module/page/PageEventMapperExt.xml

@@ -187,6 +187,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="dateTimeStart!=null and dateTimeStart!=''">
+                AND t.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{dateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="dateTimeEnd!=null and dateTimeEnd!=''">
+                AND t.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{dateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
         GROUP BY
             t.eventCode,
             t.eventName