活码图表按活码维度区分

src/main/java/com/mokamrp/privates/controller/pangu/PromoteCodeDataController.java

@@ -78,16 +78,16 @@ public class PromoteCodeDataController{
         Map<String,Object> res = new HashMap<>();
         if (duration.toDays() > 1){
             List<PanCSLTRecordTotal> longTouchPvRes = panCSLTRecordService.getLongTouchPvByDay(
-                    dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toDays()))
+                    dateHandle.getId(),dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toDays()))
             );
             List<PanCSLTRecordTotal> longTouchUvRes = panCSLTRecordService.getLongTouchUvByDay(
-                    dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toDays()))
+                    dateHandle.getId(),dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toDays()))
             );
             List<PanCSTQRecordTotal> takeQrPvRes = panCSTQRecordService.getTakeQRPvByDay(
-                    dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toDays()))
+                    dateHandle.getId(),dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toDays()))
             );
             List<PanCSTQRecordTotal> takeQrUvRes = panCSTQRecordService.getTakeQRUvByDay(
-                    dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toDays()))
+                    dateHandle.getId(),dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toDays()))
             );
             res.put("longtouchPv",longTouchPvRes);
             res.put("longtouchUv",longTouchUvRes);
@@ -96,16 +96,16 @@ public class PromoteCodeDataController{
             return AjaxResult.success(res);
         }else{
             List<PanCSLTRecordTotal> longTouchPvRes = panCSLTRecordService.getLongTouchPvByHour(
-                    dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toHours()))
+                    dateHandle.getId(),dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toHours()))
             );
             List<PanCSLTRecordTotal> longTouchUvRes = panCSLTRecordService.getLongTouchUvByHour(
-                    dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toHours()))
+                    dateHandle.getId(),dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toHours()))
             );
             List<PanCSTQRecordTotal> takeQrPvRes = panCSTQRecordService.getTakeQrPvByHour(
-                    dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toHours()))
+                    dateHandle.getId(),dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toHours()))
             );
             List<PanCSTQRecordTotal> takeQrUvRes = panCSTQRecordService.getTakeQrUvByHour(
-                    dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toHours()))
+                    dateHandle.getId(),dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toHours()))
             );
             res.put("longtouchPv",longTouchPvRes);
             res.put("longtouchUv",longTouchUvRes);

src/main/java/com/mokamrp/privates/entity/DateHandle.java

@@ -1,10 +1,14 @@
 package com.mokamrp.privates.entity;
 
+import lombok.Data;
+
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
+@Data
 public class DateHandle {
+    public Integer id;
     @NotNull(message = "startDate不可为空")
     public LocalDateTime startDate;
     @NotNull(message = "endDate不可为空")

src/main/java/com/mokamrp/privates/mapper/data/PanCSLTRecordMapper.java

@@ -20,8 +20,8 @@ import java.util.List;
  * @since 2021-04-12
  */
 public interface PanCSLTRecordMapper extends BaseMapper<PanCSLTRecord> {
-    public List<PanCSLTRecordTotal> getDayPvTotal(@Param("startTimestamp") Long startTimestamp, @Param("endTimestamp") Long endTimestamp);
+    public List<PanCSLTRecordTotal> getDayPvTotal(@Param("promoteId") Integer promoteId,@Param("startTimestamp") Long startTimestamp, @Param("endTimestamp") Long endTimestamp);
 
-    public List<PanCSLTRecordTotal> getDayUvTotal(@Param("startTimestamp") Long startTimestamp,@Param("endTimestamp") Long endTimestamp);
+    public List<PanCSLTRecordTotal> getDayUvTotal(@Param("promoteId") Integer promoteId,@Param("startTimestamp") Long startTimestamp,@Param("endTimestamp") Long endTimestamp);
 
 }

src/main/java/com/mokamrp/privates/mapper/data/PanCSLTRecordMapper.xml

@@ -8,12 +8,14 @@
         from ods_hera_pangu_record_custservice_longtouch
         where promote_id is not null
         and custservice_id <![CDATA[ <> ]]> '0'
+        <if test="promoteId != null"> and promote_id = #{promoteId}</if>
         and timestamp between #{startTimestamp} and #{endTimestamp}
     </select>
     <select id="getDayUvTotal" resultType="com.mokamrp.privates.mapper.data.pojo.PanCSLTRecordTotal">
         select DISTINCT uuid,timestamp
         from ods_hera_pangu_record_custservice_longtouch
         where promote_id is not null
+        <if test="promoteId != null"> and promote_id = #{promoteId}</if>
         and custservice_id <![CDATA[ <> ]]> '0'
         and timestamp between #{startTimestamp} and #{endTimestamp}
     </select>

src/main/java/com/mokamrp/privates/mapper/data/PanCSTQRecordMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @since 2021-04-12
  */
 public interface PanCSTQRecordMapper extends BaseMapper<PanCSTQRecord> {
-    public List<PanCSTQRecordTotal> getDayPvTotal(@Param("startTimestamp") Long startTimestamp, @Param("endTimestamp") Long endTimestamp);
-    public List<PanCSTQRecordTotal> getDayUvTotal(@Param("startTimestamp") Long startTimestamp, @Param("endTimestamp") Long endTimestamp);
+    public List<PanCSTQRecordTotal> getDayPvTotal(@Param("promoteId") Integer promoteId,@Param("startTimestamp") Long startTimestamp, @Param("endTimestamp") Long endTimestamp);
+    public List<PanCSTQRecordTotal> getDayUvTotal(@Param("promoteId") Integer promoteId,@Param("startTimestamp") Long startTimestamp, @Param("endTimestamp") Long endTimestamp);
 
 }

src/main/java/com/mokamrp/privates/mapper/data/PanCSTQRecordMapper.xml

@@ -8,6 +8,7 @@
         from ods_hera_pangu_record_promotecode_take_qrcode
         where promote_id is not null
           and custservice_id <![CDATA[ <> ]]> '0'
+        <if test="promoteId != null"> and promote_id = #{promoteId}</if>
           and timestamp between #{startTimestamp} and #{endTimestamp}
     </select>
     <select id="getDayUvTotal" resultType="com.mokamrp.privates.mapper.data.pojo.PanCSTQRecordTotal">
@@ -15,6 +16,7 @@
         from ods_hera_pangu_record_promotecode_take_qrcode
         where promote_id is not null
           and custservice_id <![CDATA[ <> ]]> '0'
+        <if test="promoteId != null"> and promote_id = #{promoteId}</if>
           and timestamp between #{startTimestamp} and #{endTimestamp}
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/service/data/PanCSLTRecordService.java

@@ -22,13 +22,13 @@ public interface PanCSLTRecordService extends IService<PanCSLTRecord> {
     //.获取客服码指定日器长按人数 按DS聚合
     public List<PanCSLTRecord> getCustserviceLongTouchUvByDateGroupDs(Long startDate, Long endDate);
     //.获取长按识别指定范围的PV数据(天)
-    public List<PanCSLTRecordTotal> getLongTouchPvByDay(LocalDateTime startDate, LocalDateTime endDate, Integer gapDay);
+    public List<PanCSLTRecordTotal> getLongTouchPvByDay(Integer promoteId,LocalDateTime startDate, LocalDateTime endDate, Integer gapDay);
     //.获取长按识别指定范围的UV数据(天)
-    public List<PanCSLTRecordTotal> getLongTouchUvByDay(LocalDateTime startDate, LocalDateTime endDate, Integer gapDay);
+    public List<PanCSLTRecordTotal> getLongTouchUvByDay(Integer promoteId,LocalDateTime startDate, LocalDateTime endDate, Integer gapDay);
     //.获取长按识别指定范围的PV数据(小时)
-    public List<PanCSLTRecordTotal> getLongTouchPvByHour(LocalDateTime startDate, LocalDateTime endDate, Integer gapHour);
+    public List<PanCSLTRecordTotal> getLongTouchPvByHour(Integer promoteId,LocalDateTime startDate, LocalDateTime endDate, Integer gapHour);
     //.获取长按识别指定范围的UV数据(小时)
-    public List<PanCSLTRecordTotal> getLongTouchUvByHour(LocalDateTime startDate, LocalDateTime endDate, Integer gapHour);
+    public List<PanCSLTRecordTotal> getLongTouchUvByHour(Integer promoteId,LocalDateTime startDate, LocalDateTime endDate, Integer gapHour);
 
 
 }

src/main/java/com/mokamrp/privates/service/data/PanCSTQRecordService.java

@@ -21,12 +21,12 @@ public interface PanCSTQRecordService extends IService<PanCSTQRecord> {
     //.获取客服码指定日器扫码人数 按DS聚合
     public List<PanCSTQRecord> getCustserviceTakeQrcodeUvByDateGroupDs(Long startDate, Long endDate);
     //.获取扫码指定范围的PV数据(天)
-    public List<PanCSTQRecordTotal> getTakeQRPvByDay(LocalDateTime startDate, LocalDateTime endDate, Integer gapDay);
+    public List<PanCSTQRecordTotal> getTakeQRPvByDay(Integer promoteId, LocalDateTime startDate, LocalDateTime endDate, Integer gapDay);
     //.获取扫码指定范围的UV数据(天)
-    public List<PanCSTQRecordTotal> getTakeQRUvByDay(LocalDateTime startDate, LocalDateTime endDate, Integer gapDay);
+    public List<PanCSTQRecordTotal> getTakeQRUvByDay(Integer promoteId,LocalDateTime startDate, LocalDateTime endDate, Integer gapDay);
     //.获取扫码指定范围的PV数据(小时)
-    public List<PanCSTQRecordTotal> getTakeQrPvByHour(LocalDateTime startDate, LocalDateTime endDate, Integer gapHour);
+    public List<PanCSTQRecordTotal> getTakeQrPvByHour(Integer promoteId,LocalDateTime startDate, LocalDateTime endDate, Integer gapHour);
     //.获取扫码指定范围的PV数据(小时)
-    public List<PanCSTQRecordTotal> getTakeQrUvByHour(LocalDateTime startDate, LocalDateTime endDate, Integer gapHour);
+    public List<PanCSTQRecordTotal> getTakeQrUvByHour(Integer promoteId,LocalDateTime startDate, LocalDateTime endDate, Integer gapHour);
 
 }

src/main/java/com/mokamrp/privates/service/data/impl/PanCSLTRecordServiceImpl.java

@@ -101,11 +101,11 @@ public class PanCSLTRecordServiceImpl extends ServiceImpl<PanCSLTRecordMapper, P
      * @param gapDay
      * @return
      */
-    public List<PanCSLTRecordTotal> getLongTouchPvByDay(LocalDateTime startDate,LocalDateTime endDate,Integer gapDay){
+    public List<PanCSLTRecordTotal> getLongTouchPvByDay(Integer promoteId,LocalDateTime startDate,LocalDateTime endDate,Integer gapDay){
         List<PanCSLTRecordTotal> dataList = new ArrayList<>();
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         //.查询时间段内所有数据
-        List<PanCSLTRecordTotal> res = panCSLTRecordMapper.getDayPvTotal(startDate.plusDays(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
+        List<PanCSLTRecordTotal> res = panCSLTRecordMapper.getDayPvTotal(promoteId,startDate.plusDays(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
         for (Integer i = -1;i<gapDay;i++) {
             Long date1 = startDate.plusDays(i).toEpochSecond(ZoneOffset.of("+8"));
             LocalDateTime localDate2 =  startDate.plusDays(i+1);
@@ -131,11 +131,11 @@ public class PanCSLTRecordServiceImpl extends ServiceImpl<PanCSLTRecordMapper, P
      * @param gapDay
      * @return
      */
-    public List<PanCSLTRecordTotal> getLongTouchUvByDay(LocalDateTime startDate,LocalDateTime endDate,Integer gapDay){
+    public List<PanCSLTRecordTotal> getLongTouchUvByDay(Integer promoteId,LocalDateTime startDate,LocalDateTime endDate,Integer gapDay){
         List<PanCSLTRecordTotal> dataList = new ArrayList<>();
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         //.查询时间段内所有数据
-        List<PanCSLTRecordTotal> res = panCSLTRecordMapper.getDayUvTotal(startDate.plusDays(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
+        List<PanCSLTRecordTotal> res = panCSLTRecordMapper.getDayUvTotal(promoteId,startDate.plusDays(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
         for (Integer i = -1;i<gapDay;i++) {
             Long date1 = startDate.plusDays(i).toEpochSecond(ZoneOffset.of("+8"));
             LocalDateTime localDate2 =  startDate.plusDays(i+1);
@@ -168,11 +168,11 @@ public class PanCSLTRecordServiceImpl extends ServiceImpl<PanCSLTRecordMapper, P
      * @param gapHour
      * @return
      */
-    public List<PanCSLTRecordTotal> getLongTouchPvByHour(LocalDateTime startDate, LocalDateTime endDate, Integer gapHour){
+    public List<PanCSLTRecordTotal> getLongTouchPvByHour(Integer promoteId,LocalDateTime startDate, LocalDateTime endDate, Integer gapHour){
         List<PanCSLTRecordTotal> dataList = new ArrayList<>();
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         //.查询时间段内所有数据
-        List<PanCSLTRecordTotal> res = panCSLTRecordMapper.getDayPvTotal(startDate.plusHours(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
+        List<PanCSLTRecordTotal> res = panCSLTRecordMapper.getDayPvTotal(promoteId,startDate.plusHours(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
         for (Integer i = -1;i<gapHour;i++) {
             Long date1 = startDate.plusHours(i).toEpochSecond(ZoneOffset.of("+8"));
             LocalDateTime localDate2 =  startDate.plusHours(i+1);
@@ -197,11 +197,11 @@ public class PanCSLTRecordServiceImpl extends ServiceImpl<PanCSLTRecordMapper, P
      * @param gapHour
      * @return
      */
-    public List<PanCSLTRecordTotal> getLongTouchUvByHour(LocalDateTime startDate,LocalDateTime endDate,Integer gapHour){
+    public List<PanCSLTRecordTotal> getLongTouchUvByHour(Integer promoteId,LocalDateTime startDate,LocalDateTime endDate,Integer gapHour){
         List<PanCSLTRecordTotal> dataList = new ArrayList<>();
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         //.查询时间段内所有数据
-        List<PanCSLTRecordTotal> res = panCSLTRecordMapper.getDayUvTotal(startDate.plusHours(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
+        List<PanCSLTRecordTotal> res = panCSLTRecordMapper.getDayUvTotal(promoteId,startDate.plusHours(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
         for (Integer i = -1;i<gapHour;i++) {
             Long date1 = startDate.plusHours(i).toEpochSecond(ZoneOffset.of("+8"));
             LocalDateTime localDate2 =  startDate.plusHours(i+1);

src/main/java/com/mokamrp/privates/service/data/impl/PanCSTQRecordServiceImpl.java

@@ -119,11 +119,11 @@ public class PanCSTQRecordServiceImpl  extends ServiceImpl<PanCSTQRecordMapper,P
      * @param gapDay
      * @return
      */
-    public List<PanCSTQRecordTotal> getTakeQRPvByDay(LocalDateTime startDate, LocalDateTime endDate, Integer gapDay){
+    public List<PanCSTQRecordTotal> getTakeQRPvByDay(Integer promoteId,LocalDateTime startDate, LocalDateTime endDate, Integer gapDay){
         List<PanCSTQRecordTotal> dataList = new ArrayList<>();
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         //.查询时间段内所有数据
-        List<PanCSTQRecordTotal> res = panCSTQRecordMapper.getDayPvTotal(startDate.plusDays(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
+        List<PanCSTQRecordTotal> res = panCSTQRecordMapper.getDayPvTotal(promoteId,startDate.plusDays(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
         for (Integer i = -1;i<gapDay;i++) {
             Long date1 = startDate.plusDays(i).toEpochSecond(ZoneOffset.of("+8"));
             LocalDateTime localDate2 =  startDate.plusDays(i+1);
@@ -149,11 +149,11 @@ public class PanCSTQRecordServiceImpl  extends ServiceImpl<PanCSTQRecordMapper,P
      * @param gapDay
      * @return
      */
-    public List<PanCSTQRecordTotal> getTakeQRUvByDay(LocalDateTime startDate, LocalDateTime endDate, Integer gapDay){
+    public List<PanCSTQRecordTotal> getTakeQRUvByDay(Integer promoteId,LocalDateTime startDate, LocalDateTime endDate, Integer gapDay){
         List<PanCSTQRecordTotal> dataList = new ArrayList<>();
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         //.查询时间段内所有数据
-        List<PanCSTQRecordTotal> res = panCSTQRecordMapper.getDayUvTotal(startDate.plusDays(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
+        List<PanCSTQRecordTotal> res = panCSTQRecordMapper.getDayUvTotal(promoteId,startDate.plusDays(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
         for (Integer i = -1;i<gapDay;i++) {
             Long date1 = startDate.plusDays(i).toEpochSecond(ZoneOffset.of("+8"));
             LocalDateTime localDate2 =  startDate.plusDays(i+1);
@@ -186,11 +186,11 @@ public class PanCSTQRecordServiceImpl  extends ServiceImpl<PanCSTQRecordMapper,P
      * @param gapHour
      * @return
      */
-    public List<PanCSTQRecordTotal> getTakeQrPvByHour(LocalDateTime startDate, LocalDateTime endDate, Integer gapHour){
+    public List<PanCSTQRecordTotal> getTakeQrPvByHour(Integer promoteId, LocalDateTime startDate, LocalDateTime endDate, Integer gapHour){
         List<PanCSTQRecordTotal> dataList = new ArrayList<>();
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         //.查询时间段内所有数据
-        List<PanCSTQRecordTotal> res = panCSTQRecordMapper.getDayPvTotal(startDate.plusHours(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
+        List<PanCSTQRecordTotal> res = panCSTQRecordMapper.getDayPvTotal(promoteId,startDate.plusHours(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
         for (Integer i = -1;i<gapHour;i++) {
             Long date1 = startDate.plusHours(i).toEpochSecond(ZoneOffset.of("+8"));
             LocalDateTime localDate2 =  startDate.plusHours(i+1);
@@ -215,11 +215,11 @@ public class PanCSTQRecordServiceImpl  extends ServiceImpl<PanCSTQRecordMapper,P
      * @param gapHour
      * @return
      */
-    public List<PanCSTQRecordTotal> getTakeQrUvByHour(LocalDateTime startDate,LocalDateTime endDate,Integer gapHour){
+    public List<PanCSTQRecordTotal> getTakeQrUvByHour(Integer promoteId,LocalDateTime startDate,LocalDateTime endDate,Integer gapHour){
         List<PanCSTQRecordTotal> dataList = new ArrayList<>();
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         //.查询时间段内所有数据
-        List<PanCSTQRecordTotal> res = panCSTQRecordMapper.getDayUvTotal(startDate.plusHours(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
+        List<PanCSTQRecordTotal> res = panCSTQRecordMapper.getDayUvTotal(promoteId,startDate.plusHours(-1).toEpochSecond(ZoneOffset.of("+8")),endDate.toEpochSecond(ZoneOffset.of("+8")));
         for (Integer i = -1;i<gapHour;i++) {
             Long date1 = startDate.plusHours(i).toEpochSecond(ZoneOffset.of("+8"));
             LocalDateTime localDate2 =  startDate.plusHours(i+1);