mobilCode改为String类型，自动补足3位

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

@@ -97,7 +97,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         }
         // 新增账号
         this.onInsert(addHandle.getRaw());
-        addHandle.getRaw().setMobileUnioCode(String.format("%02d", addHandle.getRaw().getStationId()) + String.format("%02d", addHandle.getRaw().getMobileCode()));
+        addHandle.getRaw().setMobileUnioCode(String.format("%03d", addHandle.getRaw().getStationId()) + String.format("%03d", addHandle.getRaw().getMobileCode()));
         fosterwxMobileService.save(addHandle.getRaw());
         // 判断开始做任务时间是否设置了
         AjaxResult ajaxResult = null;
@@ -195,6 +195,8 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         if (fosterwxStation == null) {
             return AjaxResult.error(HttpStatus.LOGIN_ERROR, HttpMsg.needLogin);
         }
+        //.补足三位数
+        addHandle.getRaw().setMobileCode(String.format("%03d",addHandle.getRaw().getMobileCode()));
         this.onInsert(addHandle.getRaw());
         Boolean res = fosterwxMobileService.save(addHandle.getRaw());
         if (res) {

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

@@ -112,6 +112,7 @@ public class FosterwxStationController extends BaseController<FosterwxStation> {
         if (fosterwxStationService.count(fosterwxStationLambdaQueryWrapper) > 0) {
             return AjaxResult.error("用户名重复");
         }
+        addHandle.getRaw().setStationName(String.format("%03d",addHandle.getRaw().getStationName()));
         addHandle.getRaw().setUploadUid(user.getId());
         this.onInsert(addHandle.getRaw());
         Boolean res = fosterwxStationService.save(addHandle.getRaw());

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

@@ -0,0 +1,80 @@
+package com.mokamrp.privates.controller.pangu;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.constant.Constants;
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.constant.RedisKey;
+import com.mokamrp.privates.controller.BaseController;
+import com.mokamrp.privates.entity.AddHandle;
+import com.mokamrp.privates.entity.DateHandle;
+import com.mokamrp.privates.entity.DelHandle;
+import com.mokamrp.privates.entity.EditHandle;
+import com.mokamrp.privates.entity.pangu.PromoteCodeListHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.mapper.data.pojo.PanCSLTRecord;
+import com.mokamrp.privates.mapper.data.pojo.PanCSLTRecordDayTotal;
+import com.mokamrp.privates.mapper.pangu.pojo.PromoteQrcodePool;
+import com.mokamrp.privates.service.data.PanCSLTRecordService;
+import com.mokamrp.privates.service.pangu.PromoteQrcodePoolRecordService;
+import com.mokamrp.privates.service.pangu.PromoteQrcodePoolService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+import com.mokamrp.privates.service.pangu.PromoteCodeService;
+import com.mokamrp.privates.mapper.pangu.pojo.PromoteCode;
+
+import javax.validation.Valid;
+import java.time.Duration;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 盘古活码库 数据面板
+ * </p>
+ *
+ * @author leon
+ * @since 2021-08-06
+ */
+@RestController
+@RequestMapping("/pangu/promoteCode")
+public class PromoteCodeDataController{
+
+    @Autowired
+    public PromoteCodeService promoteCodeService;
+
+    @Autowired
+    public PromoteQrcodePoolService promoteQrcodePoolService;
+
+    @Autowired
+    public PromoteQrcodePoolRecordService promoteQrcodePoolRecordService;
+
+    @Autowired
+    public StringRedisTemplate stringRedisTemplate;
+
+    @Autowired
+    public PanCSLTRecordService panCSLTRecordService;
+
+    public Object getTotal(){
+        return null;
+    }
+
+    @PostMapping("/getDataTrend")
+    public Object getDataTrend(@Valid @RequestBody DateHandle dateHandle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        Duration duration = java.time.Duration.between(dateHandle.startDate, dateHandle.endDate);
+        if (duration.toDays() > 1){
+            List<PanCSLTRecordDayTotal> res = panCSLTRecordService.getLongTouchPvByDay(
+                    dateHandle.startDate, dateHandle.endDate, Integer.parseInt(String.valueOf(duration.toDays()))
+            );
+            return AjaxResult.success(res);
+        }
+        return null;
+    }
+}
+

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

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

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

@@ -1,8 +1,15 @@
 package com.mokamrp.privates.mapper.data;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mokamrp.privates.entity.pangu.GetPromoteQrcodePoolHandle;
 import com.mokamrp.privates.mapper.data.pojo.PanCSLTRecord;
+import com.mokamrp.privates.mapper.data.pojo.PanCSLTRecordDayTotal;
+import com.mokamrp.privates.mapper.pangu.pojo.PromoteQrcodePoolVo;
 import com.mokamrp.privates.service.data.PanCSLTRecordService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,5 +20,8 @@ import com.mokamrp.privates.service.data.PanCSLTRecordService;
  * @since 2021-04-12
  */
 public interface PanCSLTRecordMapper extends BaseMapper<PanCSLTRecord> {
+    public List<PanCSLTRecordDayTotal> getDayPvTotal(@Param("startTimestamp") Long startTimestamp,@Param("endTimestamp") Long endTimestamp);
+
+    public List<PanCSLTRecordDayTotal> getDayUvTotal(@Param("startTimestamp") Long startTimestamp,@Param("endTimestamp") Long endTimestamp);
 
 }

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

@@ -3,4 +3,18 @@
 <mapper namespace="com.mokamrp.privates.mapper.data.PanCSLTRecordMapper">
 
 
+    <select id="getDayPvTotal" resultType="com.mokamrp.privates.mapper.data.pojo.PanCSLTRecordDayTotal">
+        select timestamp,uuid
+        from ods_hera_pangu_record_custservice_longtouch_holo
+        where promote_id is not null
+        and custservice_id <![CDATA[ <> ]]> '0'
+        and timestamp between #{startTimestamp} and #{endTimestamp}
+    </select>
+    <select id="getDayUvTotal" resultType="com.mokamrp.privates.mapper.data.pojo.PanCSLTRecordDayTotal">
+        select timestamp,uuid
+        from ods_hera_pangu_record_custservice_longtouch_holo
+        where promote_id is not null
+        and custservice_id <![CDATA[ <> ]]> '0'
+        and timestamp between #{startTimestamp} and #{endTimestamp}
+    </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/data/pojo/PanCSLTRecord.java

@@ -18,8 +18,8 @@ public class PanCSLTRecord extends Model<PanCSLTRecord>{
 
     private Integer longTouchCnt;
 
-    private Integer custserviceId;
+    private Integer custserviceId = 0;
 
-    private Integer promoteId;
+    private Integer promoteId = 0;
 
 }

src/main/java/com/mokamrp/privates/mapper/data/pojo/PanCSLTRecordDayTotal.java

@@ -0,0 +1,31 @@
+package com.mokamrp.privates.mapper.data.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 企业
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-19
+ */
+@Data
+public class PanCSLTRecordDayTotal extends Model<PanCSLTRecordDayTotal>{
+
+    private Long timestamp;
+
+    private String uuid;
+
+    @TableField(exist = false)
+    private Integer cnt;
+
+    @TableField(exist = false)
+    private LocalDateTime date;
+
+}

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxMobile.java

@@ -39,7 +39,7 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
     /**
      * 手机编号
      */
-    private Integer mobileCode;
+    private String mobileCode;
 
     /**
      * 手机唯一编码
@@ -186,14 +186,6 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
         this.stationId = stationId;
     }
 
-    public Integer getMobileCode() {
-        return mobileCode;
-    }
-
-    public void setMobileCode(Integer mobileCode) {
-        this.mobileCode = mobileCode;
-    }
-
     public String getMobileUnioCode() {
         return mobileUnioCode;
     }

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxMobilePool.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  * @author leon
  * @since 2021-07-30
  */
+@Data
 @TableName("pan_fosterwx_mobile_pool")
 public class FosterwxMobilePool extends Model<FosterwxMobilePool> {
 
@@ -46,7 +48,7 @@ public class FosterwxMobilePool extends Model<FosterwxMobilePool> {
     /**
      * 手机编号
      */
-    private Integer mobileCode;
+    private String mobileCode;
 
     /**
      * 手机号码
@@ -143,13 +145,6 @@ public class FosterwxMobilePool extends Model<FosterwxMobilePool> {
         this.stationName = stationName;
     }
 
-    public Integer getMobileCode() {
-        return mobileCode;
-    }
-
-    public void setMobileCode(Integer mobileCode) {
-        this.mobileCode = mobileCode;
-    }
 
     public String getMobileNo() {
         return mobileNo;

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxTaskSchedule.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
@@ -19,6 +20,7 @@ import java.time.LocalDateTime;
  * @author leon
  * @since 2021-07-23
  */
+@Data
 @TableName("pan_fosterwx_task_schedule")
 public class FosterwxTaskSchedule extends Model<FosterwxTaskSchedule> {
 
@@ -43,7 +45,7 @@ public class FosterwxTaskSchedule extends Model<FosterwxTaskSchedule> {
     /**
      * 手机编号
      */
-    private Integer mobileCode;
+    private String mobileCode;
 
     /**
      * 模板id
@@ -151,13 +153,6 @@ public class FosterwxTaskSchedule extends Model<FosterwxTaskSchedule> {
         this.stationName = stationName;
     }
 
-    public Integer getMobileCode() {
-        return mobileCode;
-    }
-
-    public void setMobileCode(Integer mobileCode) {
-        this.mobileCode = mobileCode;
-    }
 
     public Integer getTemplateId() {
         return templateId;

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

@@ -2,10 +2,15 @@ package com.mokamrp.privates.service.data;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.mapper.data.pojo.PanCSLTRecord;
+import com.mokamrp.privates.mapper.data.pojo.PanCSLTRecordDayTotal;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 public interface PanCSLTRecordService extends IService<PanCSLTRecord> {
     //.获取客服码长按次数
     public List<PanCSLTRecord> getCustserviceLongTouchPv();
+    //.获取长按识别每天PV
+    public List<PanCSLTRecordDayTotal> getLongTouchPvByDay(LocalDateTime startDate, LocalDateTime endDate, Integer gapDay);
+
 }

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

@@ -5,14 +5,25 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.mapper.data.PanCSLTRecordMapper;
 import com.mokamrp.privates.mapper.data.pojo.PanCSLTRecord;
+import com.mokamrp.privates.mapper.data.pojo.PanCSLTRecordDayTotal;
 import com.mokamrp.privates.service.data.PanCSLTRecordService;
+import org.apache.tomcat.jni.Local;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 
 @Service
 @DS("datadb")
 public class PanCSLTRecordServiceImpl extends ServiceImpl<PanCSLTRecordMapper, PanCSLTRecord> implements PanCSLTRecordService {
+
+    @Autowired
+    public PanCSLTRecordMapper panCSLTRecordMapper;
     /**
      * 获取客服码长按次数
      * @return
@@ -26,5 +37,59 @@ public class PanCSLTRecordServiceImpl extends ServiceImpl<PanCSLTRecordMapper, P
         System.out.println(res);
         return res;
     }
+
+    public List<PanCSLTRecordDayTotal> getLongTouchPvByDay(LocalDateTime startDate,LocalDateTime endDate,Integer gapDay){
+        List<PanCSLTRecordDayTotal> dataList = new ArrayList<>();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        //.查询时间段内所有数据
+        List<PanCSLTRecordDayTotal> res = panCSLTRecordMapper.getDayPvTotal(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);
+            Long date2 = startDate.plusDays(i+1).toEpochSecond(ZoneOffset.of("+8"));
+            Integer cnt = 0;
+            for(PanCSLTRecordDayTotal data : res) {
+                if (data.getTimestamp() >= date1 && data.getTimestamp() <= date2){
+                    cnt++;
+                }
+            }
+            PanCSLTRecordDayTotal total = new PanCSLTRecordDayTotal();
+            total.setCnt(cnt);
+            total.setDate(localDate2);
+            dataList.add(total);
+        }
+        return dataList;
+    }
+
+    public List<PanCSLTRecordDayTotal> getLongTouchUvByDay(LocalDateTime startDate,LocalDateTime endDate,Integer gapDay){
+        List<PanCSLTRecordDayTotal> dataList = new ArrayList<>();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        //.查询时间段内所有数据
+        List<PanCSLTRecordDayTotal> res = panCSLTRecordMapper.getDayUvTotal(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);
+            Long date2 = startDate.plusDays(i+1).toEpochSecond(ZoneOffset.of("+8"));
+            Integer cnt = 0;
+            Map<String,Boolean> uuidRecord = new HashMap<>();
+            for(PanCSLTRecordDayTotal data : res) {
+                if (data.getTimestamp() >= date1 && data.getTimestamp() <= date2){
+                    if (uuidRecord.get(data.getUuid()) == null){
+                        cnt++;
+                        uuidRecord.put(data.getUuid(),true);
+                    }
+                }
+            }
+            PanCSLTRecordDayTotal total = new PanCSLTRecordDayTotal();
+            total.setCnt(cnt);
+            total.setDate(localDate2);
+            dataList.add(total);
+        }
+        return dataList;
+    }
+
+//    public List<PanCSLTRecord> getLongTouchUvByDay(){
+//
+//    }
 }
 

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxMobileServiceImpl.java

@@ -85,7 +85,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
             Map<String, String> cell = row.get(i);
             FosterwxMobile fosterwxMobile = new FosterwxMobile();
             fosterwxMobile.setStationId(Integer.parseInt(row.get(i).get("stationId")));
-            fosterwxMobile.setMobileCode(Integer.parseInt(row.get(i).get("mobileCode")));
+            fosterwxMobile.setMobileCode(row.get(i).get("mobileCode"));
             fosterwxMobile.setMobileNo(row.get(i).get("mobileNo"));
             fosterwxMobile.setMobileOperator(Integer.parseInt(row.get(i).get("mobileOperator")));
             fosterwxMobile.setMobileCreateAt(LocalDateTime.parse(row.get(i).get("mobileCreateAt"),df));
@@ -108,7 +108,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
             }
             fosterwxMobile.setCreateAt(nowDate);
             fosterwxMobile.setUpdateAt(nowDate);
-            fosterwxMobile.setMobileUnioCode(String.format("%02d", fosterwxMobile.getStationId()) + String.format("%02d", fosterwxMobile.getMobileCode()));
+            fosterwxMobile.setMobileUnioCode(String.format("%03d", fosterwxMobile.getStationId()) + String.format("%03d", fosterwxMobile.getMobileCode()));
             this.save(fosterwxMobile);
             //.批量录入微信好友
             List<FosterwxMobileWxfriend> addFriend = new ArrayList<>();

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxTaskScheduleServiceImpl.java

@@ -201,17 +201,17 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
 
         String mobileCode = "";
         for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
-            Integer code = fosterwxTaskSchedule.getMobileCode();
+            String code = fosterwxTaskSchedule.getMobileCode();
             // 第一条数据
             if (mobileCode.isEmpty()) {
-                mobileCode = String.format("%03d", code) + "、";
+                mobileCode = code + "、";
             } else {
                 // 按顿号分组数据
                 String[] mobileArry = mobileCode.split("、");
                 if (mobileArry[mobileArry.length - 1].contains("-")) {
                     // 已经有组了
                     String[] mobiles = mobileArry[mobileArry.length - 1].split("-");
-                    if (Integer.valueOf(mobiles[1]) + 1 == code) {
+                    if (Integer.valueOf(mobiles[1]) + 1 == Integer.parseInt(code)) {
                         mobileArry[mobileArry.length - 1] = mobiles[0] + "-" + String.format("%03d", code);
                         mobileCode = "";
                         for (int i = 0; i < mobileArry.length; i++) {
@@ -221,14 +221,14 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
                         mobileCode += String.format("%03d", code) + "、";
                     }
                 } else {
-                    if (Integer.valueOf(mobileArry[mobileArry.length - 1]) + 1 == code) {
-                        mobileArry[mobileArry.length - 1] += "-" + String.format("%03d", code);
+                    if (Integer.valueOf(mobileArry[mobileArry.length - 1]) + 1 == Integer.parseInt(code)) {
+                        mobileArry[mobileArry.length - 1] += "-" + code;
                         mobileCode = "";
                         for (int i = 0; i < mobileArry.length; i++) {
                             mobileCode += mobileArry[i] + "、";
                         }
                     } else {
-                        mobileCode += String.format("%03d", code) + "、";
+                        mobileCode +=  code + "、";
                     }
                 }
             }

src/main/java/com/mokamrp/privates/task/pangu/SyncFosterwxEdit.java

@@ -78,7 +78,7 @@ public class SyncFosterwxEdit {
                     fosterwxMobileLambdaQueryWrapper.eq(FosterwxMobile::getMobileCode, fosterwxMobile.getMobileCode());
                     if (fosterwxMobileService.count(fosterwxMobileLambdaQueryWrapper) > 0) continue;
                     
-                    fosterwxMobile.setMobileUnioCode(String.format("%02d", fosterwxMobile.getStationId()) + String.format("%02d", fosterwxMobile.getMobileCode()));
+                    fosterwxMobile.setMobileUnioCode(String.format("%03d", fosterwxMobile.getStationId()) + String.format("%03d", fosterwxMobile.getMobileCode()));
                     fosterwxMobile.setCreateAt(LocalDateTime.now());
                     fosterwxMobile.setUpdateAt(LocalDateTime.now());
                     fosterwxMobileService.save(fosterwxMobile);