add(backend) [粉丝属性 开发版 1.0]

operation-backend/src/main/java/com/idiot/operationbackend/controller/AccountController.java

@@ -69,4 +69,7 @@ public class AccountController {
         return ResponseEntity.ok(JsonResult.success(account));
     }
 
+
+
+
 }

operation-backend/src/main/java/com/idiot/operationbackend/controller/IndexController.java

@@ -1,6 +1,7 @@
 package com.idiot.operationbackend.controller;
 
 import com.idiot.operationbackend.entity.Account;
+import com.idiot.operationbackend.entity.AccountFans;
 import com.idiot.operationbackend.entity.AccountFansStat;
 import com.idiot.operationbackend.entity.FansActionStat;
 import com.idiot.operationbackend.service.facade.AccountFansService;
@@ -11,7 +12,8 @@ import com.idiot.operationbackend.support.Constants;
 import com.idiot.operationbackend.support.CustomException;
 import com.idiot.operationbackend.support.JsonResult;
 import com.idiot.operationbackend.util.JwtTokenUtil;
-import com.idiot.operationbackend.vo.StatData;
+import com.idiot.operationbackend.vo.GeneralStatData;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -129,8 +131,8 @@ public class IndexController {
     public ResponseEntity<JsonResult<Map<String,Object>>> getFansGrowthStat (@PathVariable String accountId,
                                                               @RequestHeader String token,
                                                               @RequestParam String type,
-                                                              @RequestParam(required = false) String startDate,
-                                                              @RequestParam(required = false) String endDate) {
+                                                              @RequestParam String startDate,
+                                                              @RequestParam String endDate) {
         String userId = JwtTokenUtil.getUserId(token);
         if (!checkDate(startDate,endDate)){
             throw new CustomException(500,"请选择开始和结束时间!");
@@ -141,17 +143,17 @@ public class IndexController {
         LocalDate start = LocalDate.parse(startDate);
         LocalDate end= LocalDate.parse(endDate);
         long days = end.toEpochDay() - start.toEpochDay();
-        List<StatData> statDataList = queryFansGrowthStatData(accountId, type, start, end);
+        List<GeneralStatData> statDataList = queryFansGrowthStatData(accountId, type, start, end);
         long newNum =0;
         long addNum =0;
         long inactiveNum =0;
         long cancelNum =0;
         BigDecimal ave =BigDecimal.ZERO;
         if (CollectionUtils.isEmpty(statDataList)) {
-            newNum = statDataList.parallelStream().mapToLong(StatData::getNewNum).sum();
-            addNum = statDataList.parallelStream().mapToLong(StatData::getAddNum).sum();
-            inactiveNum = statDataList.parallelStream().mapToLong(StatData::getInactiveNum).sum();
-            cancelNum = statDataList.parallelStream().mapToLong(StatData::getCancelNum).sum();
+            newNum = statDataList.parallelStream().mapToLong(GeneralStatData::getNewNum).sum();
+            addNum = statDataList.parallelStream().mapToLong(GeneralStatData::getAddNum).sum();
+            inactiveNum = statDataList.parallelStream().mapToLong(GeneralStatData::getInactiveNum).sum();
+            cancelNum = statDataList.parallelStream().mapToLong(GeneralStatData::getCancelNum).sum();
             if (days == 0){
                 days = 1;
             }
@@ -168,6 +170,31 @@ public class IndexController {
         return ResponseEntity.ok(JsonResult.success(result));
     }
 
+
+    @GetMapping("/fansProperty/{accountId}")
+    @ApiOperation(value = "查询单个公众号--粉丝属性")
+    public ResponseEntity<JsonResult<Map<String,Object>>> getFansPropertyStat(
+                                                                @RequestHeader String token,
+                                                                @PathVariable String accountId,
+                                                                @RequestParam(required = false) String startDate,
+                                                                @RequestParam(required = false) String endDate) {
+        String userId = JwtTokenUtil.getUserId(token);
+        logger.info("用户:{}查询首页单个公众号：{}属性,startDate:{},endDate:{} --->start",userId,accountId,startDate,endDate);
+        List<AccountFans> accountFans;
+        Map<String,Object> result = new HashMap<>(4);
+        if (!StringUtils.isEmpty(startDate) && !StringUtils.isEmpty(endDate) ){
+           accountFans = fansService.queryFansByDateAndDate(accountId,startDate,endDate);
+        }else {
+
+        }
+
+        logger.info("用户:{}查询首页单个公众号：{}属性,startDate:{},endDate:{} --->end",userId,accountId,startDate,endDate);
+        return null;
+
+    }
+
+
+
     /**
      *  统计粉丝数据  好难受写不出完美的代码
      * @author wangxiao
@@ -178,9 +205,9 @@ public class IndexController {
      * @param endDate
      * @return java.util.List<com.idiot.operationbackend.vo.StatData>
      */
-    private List<StatData> queryFansGrowthStatData(String accountId, String type, LocalDate startDate, LocalDate endDate) {
-
+    private List<GeneralStatData> queryFansGrowthStatData(String accountId, String type, LocalDate startDate, LocalDate endDate) {
 
+        // 粉丝增长数据 因为能选择今天 需要在 用户动作分析里面取数据。或者一小时分析一次数据
         long disValue = 0;
         if (HOUR.equals(type)) {
             disValue = 7200;
@@ -202,8 +229,8 @@ public class IndexController {
         }
         long start = startLocalDate.toEpochSecond(Constants.DEFAULT_ZONE);
         long end = endLocalDate.toEpochSecond(Constants.DEFAULT_ZONE);
-        List<StatData> statDataList = new ArrayList<>();
-        StatData statData =  null;
+        List<GeneralStatData> statDataList = new ArrayList<>();
+        GeneralStatData statData =  null;
         List<FansActionStat> tempStatList = null;
         while (start<=end){
             long finalStart = start;
@@ -224,7 +251,7 @@ public class IndexController {
     }
 
     /**
-     *  统计
+     *  统计 粉丝增长 时间段
      * @author wangxiao
      * @date 16:45 2020/9/16
      * @param fansActionStats
@@ -233,11 +260,11 @@ public class IndexController {
      * @param type
      * @return com.idiot.operationbackend.vo.StatData
      */
-    private StatData countStatData (List<FansActionStat> fansActionStats,long start,long end,String type) {
+    private GeneralStatData countStatData (List<FansActionStat> fansActionStats, long start, long end, String type) {
 
         LocalDateTime startDateTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(start),Constants.DEFAULT_ZONE);
         LocalDateTime endDateTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(end),Constants.DEFAULT_ZONE);
-        StatData statData = new StatData();
+        GeneralStatData statData = new GeneralStatData();
         long newNum = 0;
         long cancelNum = 0;
         long inactiveNum = 0;
@@ -267,6 +294,49 @@ public class IndexController {
     }
 
 
+    /**
+     *  统计粉丝属性
+     * @author wangxiao
+     * @date 18:57 2020/9/16
+     * @param fans
+     * @param map
+     * @return void
+     */
+    private void statFansProperty(List<AccountFans> fans,Map<String,Object> map) {
+        long totalFansNum = 0;
+        long  manNum = 0;
+        BigDecimal manRate = BigDecimal.ZERO;
+        long  womanNum = 0;
+        BigDecimal womanRate = BigDecimal.ZERO;
+        Map<String,Long> subscribeScene = null;
+        if (!CollectionUtils.isEmpty(fans)) {
+            totalFansNum = fans.size();
+            manNum = fans.parallelStream().filter(e->1==e.getSex()).count();
+            womanNum = fans.parallelStream().filter(e->2==e.getSex()).count();
+            manRate = BigDecimal.valueOf((manNum*100)/totalFansNum).setScale(2);
+            womanRate = BigDecimal.valueOf((womanNum*100)/totalFansNum).setScale(2);
+            subscribeScene = fans.stream().collect(Collectors.groupingBy(AccountFans::getSubscribeScene,Collectors.reducing(0L,accountFans -> 1L,Long::sum)));
+        }
+        Map<String,Object> base = new HashMap<>(6);
+        base.put("totalFansNum",totalFansNum);
+        base.put("manNum",manNum);
+        base.put("womanNum",womanNum);
+        base.put("manRate",manRate);
+        base.put("womanRate",womanRate);
+        map.put("base",base);
+        Map<String,Object> sex = new HashMap<>(4);
+        sex.put("manNum",manNum);
+        sex.put("womanNum",womanNum);
+        sex.put("manRate",manRate);
+        sex.put("womanRate",womanRate);
+        map.put("sex",sex);
+        map.put("subscribeScene",subscribeScene);
+
+    }
+
+
+
+
 
 
 

operation-backend/src/main/java/com/idiot/operationbackend/controller/WeChatController.java

@@ -2,7 +2,9 @@ package com.idiot.operationbackend.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.idiot.operationbackend.entity.Account;
+import com.idiot.operationbackend.entity.SubscribeScene;
 import com.idiot.operationbackend.service.facade.AccountService;
+import com.idiot.operationbackend.service.facade.SubscribeSceneService;
 import com.idiot.operationbackend.service.facade.WeChatService;
 import com.idiot.operationbackend.support.AccountState;
 import com.idiot.operationbackend.support.Constants;
@@ -22,6 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.List;
 
 
 /**
@@ -43,6 +46,9 @@ public class WeChatController {
     @Autowired
     private WeChatService weChatService;
 
+    @Autowired
+    private SubscribeSceneService sceneService;
+
 
     @GetMapping("preAuth")
     @ApiOperation(value = "获取预授权码地址，微信认证公众号")
@@ -145,7 +151,12 @@ public class WeChatController {
     }
 
 
-
+    @GetMapping("/subscribeScene")
+    @ApiOperation(value = "查询用户关注公众号来源类型")
+    public ResponseEntity<JsonResult<List<SubscribeScene>>> getSubscribeScene (@RequestHeader String token) {
+        String userId = JwtTokenUtil.getUserId(token);
+        return ResponseEntity.ok(JsonResult.success(sceneService.list()));
+    }
 
 
 }

operation-backend/src/main/java/com/idiot/operationbackend/entity/SubscribeScene.java

@@ -0,0 +1,41 @@
+package com.idiot.operationbackend.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * @author wang xiao
+ * @date Created in 17:40 2020/9/16
+ */
+@TableName("t_subscribe_scene")
+public class SubscribeScene {
+
+    private Integer id;
+
+    private String key;
+
+    private String label;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+}

operation-backend/src/main/java/com/idiot/operationbackend/mappers/SubscribeSceneMapper.java

@@ -0,0 +1,11 @@
+package com.idiot.operationbackend.mappers;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.idiot.operationbackend.entity.SubscribeScene;
+
+/**
+ * @author wang xiao
+ * @date Created in 17:48 2020/9/16
+ */
+public interface SubscribeSceneMapper extends BaseMapper<SubscribeScene> {
+}

operation-backend/src/main/java/com/idiot/operationbackend/service/facade/AccountFansService.java

@@ -3,6 +3,8 @@ package com.idiot.operationbackend.service.facade;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.idiot.operationbackend.entity.AccountFans;
 
+import java.util.List;
+
 /**
  * @author wang xiao
  * @date Created in 19:24 2020/9/10
@@ -29,4 +31,16 @@ public interface AccountFansService extends IService<AccountFans> {
      * @return int
      */
     int countFansByAccountId(String accountId);
+
+
+    /**
+     *  查询一段时间内的粉丝
+     * @author wangxiao
+     * @date 18:39 2020/9/16
+     * @param accountId
+     * @param startDate
+     * @param endDate
+     * @return java.util.List<com.idiot.operationbackend.entity.AccountFans>
+     */
+    List<AccountFans> queryFansByDateAndDate (String accountId,String startDate,String endDate);
 }

operation-backend/src/main/java/com/idiot/operationbackend/service/facade/SubscribeSceneService.java

@@ -0,0 +1,11 @@
+package com.idiot.operationbackend.service.facade;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.idiot.operationbackend.entity.SubscribeScene;
+
+/**
+ * @author wang xiao
+ * @date Created in 17:48 2020/9/16
+ */
+public interface SubscribeSceneService extends IService<SubscribeScene> {
+}

operation-backend/src/main/java/com/idiot/operationbackend/service/impl/AccountFansServiceImpl.java

@@ -5,8 +5,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.idiot.operationbackend.entity.AccountFans;
 import com.idiot.operationbackend.mappers.AccountFansMapper;
 import com.idiot.operationbackend.service.facade.AccountFansService;
+import com.idiot.operationbackend.support.Constants;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.util.List;
+
 /**
  * @author wang xiao
  * @date Created in 19:24 2020/9/10
@@ -27,4 +31,15 @@ public class AccountFansServiceImpl extends ServiceImpl<AccountFansMapper, Accou
     public int countFansByAccountId(String accountId) {
         return count(Wrappers.<AccountFans>lambdaQuery().eq(AccountFans::getAccountId,accountId));
     }
+
+
+    @Override
+    public List<AccountFans> queryFansByDateAndDate(String accountId, String startDate, String endDate) {
+        LocalDate end = LocalDate.parse(endDate).plusDays(1);
+        String endStr = end.format(Constants.DATE_FORMATTER);
+        return list(Wrappers.<AccountFans>lambdaQuery()
+                .eq(AccountFans::getAccountId,accountId)
+                .ge(AccountFans::getUpdateTime,startDate)
+                .le(AccountFans::getUpdateTime,endStr));
+    }
 }

operation-backend/src/main/java/com/idiot/operationbackend/service/impl/SubscribeSceneServiceImpl.java

@@ -0,0 +1,16 @@
+package com.idiot.operationbackend.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.idiot.operationbackend.entity.SubscribeScene;
+import com.idiot.operationbackend.mappers.SubscribeSceneMapper;
+import com.idiot.operationbackend.service.facade.SubscribeSceneService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author wang xiao
+ * @date Created in 17:49 2020/9/16
+ */
+@Service
+public class SubscribeSceneServiceImpl extends ServiceImpl<SubscribeSceneMapper, SubscribeScene>
+        implements SubscribeSceneService {
+}

operation-backend/src/main/java/com/idiot/operationbackend/vo/StatData.java → operation-backend/src/main/java/com/idiot/operationbackend/vo/GeneralStatData.java

@@ -1,13 +1,12 @@
 package com.idiot.operationbackend.vo;
 
-import java.math.BigDecimal;
 
 /**
  * 粉丝 数据统计
  * @author wang xiao
  * @date Created in 17:01 2020/9/15
  */
-public class StatData {
+public class GeneralStatData {
 
     private String dateLabel;