feat(DataLog): DistrictAnalysis

app/statistics/src/main/java/com/zrqx/statistics/bg/controller/DataLogController.java

 package com.zrqx.statistics.bg.controller;
 
-import com.zrqx.statistics.commons.form.QueryVisitorLoyaltyForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.statistics.bg.service.DataLogService;
-import com.zrqx.statistics.commons.form.QueryDistrictAnalysisForm;
-import com.zrqx.statistics.commons.form.QuerySourceForm;
-import com.zrqx.statistics.commons.form.QueryTrendForm;
-import com.zrqx.statistics.commons.form.QueryVisitorAttrForm;
-
+import com.zrqx.statistics.commons.form.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/data-log")
@@ -75,24 +69,24 @@ public class DataLogController {
     @ApiOperation("区域分析")
     @PostMapping("/district")
     public CallBack<JSONObject> getDistrictAnalysis(QueryDistrictAnalysisForm form) {
-        return CallBack.success(service.getDistrictAnalysis(form));
+        return CallBack.success(service.loadDistrictAnalysis(form));
     }
 
     @ApiOperation("访客属性")
     @PostMapping("/visitor/attr")
     public CallBack<JSONObject> getVisitorAttr(QueryVisitorAttrForm form) {
-        return CallBack.success(service.getVisitorAttr(form));
+        return CallBack.success(service.loadVisitorAttr(form));
     }
 
     @ApiOperation("新老访客")
     @PostMapping("/visitor/summary")
     public CallBack<JSONObject> getVisitorSummary(QueryVisitorAttrForm form) {
-        return CallBack.success(service.getVisitorSummary(form));
+        return CallBack.success(service.loadVisitorSummary(form));
     }
 
     @ApiOperation("忠诚度")
     @PostMapping("/visitor/loyalty")
     public CallBack<JSONObject> getLoyalty(QueryVisitorLoyaltyForm form) {
-        return CallBack.success(service.getLoyalty(form));
+        return CallBack.success(service.loadLoyalty(form));
     }
 }

app/statistics/src/main/java/com/zrqx/statistics/bg/service/DataLogService.java

 package com.zrqx.statistics.bg.service;
 
-import java.util.Date;
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.zrqx.statistics.commons.form.QueryTrendForm;
-import com.zrqx.statistics.commons.form.QueryDistrictAnalysisForm;
-import com.zrqx.statistics.commons.form.QuerySourceForm;
-import com.zrqx.statistics.commons.form.QueryVisitorAttrForm;
-import com.zrqx.statistics.commons.form.QueryVisitorLoyaltyForm;
-import com.zrqx.statistics.commons.model.DataLog;
 import com.zrqx.core.service.BaseService;
+import com.zrqx.statistics.commons.form.*;
+import com.zrqx.statistics.commons.model.DataLog;
+
+import java.util.Date;
 
 /**
  * 数据日志
@@ -66,14 +62,14 @@ public interface DataLogService extends BaseService<DataLog, String> {
      * @param form
      * @return
      */
-    JSONObject getDistrictAnalysis(QueryDistrictAnalysisForm form);
+    JSONObject loadDistrictAnalysis(QueryDistrictAnalysisForm form);
 
     /**
      * 访客属性
      * @param form
      * @return
      */
-    JSONObject getVisitorAttr(QueryVisitorAttrForm form);
+    JSONObject loadVisitorAttr(QueryVisitorAttrForm form);
     /**
      * 获取行为分析趋势分析
      * @return
@@ -95,7 +91,7 @@ public interface DataLogService extends BaseService<DataLog, String> {
      * @param form
      * @return
      */
-    JSONObject getVisitorSummary(QueryVisitorAttrForm form);
+    JSONObject loadVisitorSummary(QueryVisitorAttrForm form);
 
 
     /**
@@ -103,14 +99,14 @@ public interface DataLogService extends BaseService<DataLog, String> {
      * @param form
      * @return
      */
-    JSONObject getLoyalty(QueryVisitorLoyaltyForm form);
+    JSONObject loadLoyalty(QueryVisitorLoyaltyForm form);
 
     /**
      * 访客忠诚度-聚合结果
      * @param form
      * @return
      */
-    JSONObject getLoyaltyPolymerization(QueryVisitorLoyaltyForm form);
+    JSONObject loadLoyaltyPolymerization(QueryVisitorLoyaltyForm form);
 
 
 

app/statistics/src/main/java/com/zrqx/statistics/bg/service/DataLogServiceImpl.java

 package com.zrqx.statistics.bg.service;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import com.zrqx.core.enums.statistics.CharacterEnums;
-import com.zrqx.statistics.commons.form.QueryDistrictAnalysisForm;
-import com.zrqx.statistics.commons.form.QueryVisitorAttrForm;
-import com.zrqx.statistics.commons.form.QueryVisitorLoyaltyForm;
-import com.zrqx.statistics.commons.model.DataLog;
-import com.zrqx.core.enums.statistics.QueryTimeUnitEnum;
-import com.zrqx.core.mapper.BaseMapper;
-import com.zrqx.core.service.BaseServiceImpl;
-import com.zrqx.statistics.commons.form.BaiduLogQueryForm;
-import com.zrqx.statistics.utils.baidu.config.BaiduConfig;
-import com.zrqx.statistics.utils.baidu.config.ParamStringConfig;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zrqx.core.enums.statistics.CharacterEnums;
 import com.zrqx.core.enums.statistics.QueryTimeUnitEnum;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.statistics.bg.mapper.DataLogMapper;
-import com.zrqx.statistics.commons.form.BaiduLogQueryForm;
-import com.zrqx.statistics.commons.form.QueryTrendForm;
-import com.zrqx.statistics.commons.form.QueryDistrictAnalysisForm;
-import com.zrqx.statistics.commons.form.QuerySourceForm;
-import com.zrqx.statistics.commons.form.QueryVisitorAttrForm;
+import com.zrqx.statistics.commons.form.*;
 import com.zrqx.statistics.commons.model.DataLog;
 import com.zrqx.statistics.utils.DateUtils;
 import com.zrqx.statistics.utils.MathUtils;
@@ -41,8 +17,15 @@ import com.zrqx.statistics.utils.baidu.HttpUtils;
 import com.zrqx.statistics.utils.baidu.config.BaiduConfig;
 import com.zrqx.statistics.utils.baidu.config.BaiduStatisticsBody;
 import com.zrqx.statistics.utils.baidu.config.BaiduStatisticsHeader;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 数据日志
@@ -494,7 +477,7 @@ public class DataLogServiceImpl extends BaseServiceImpl<DataLog, String> impleme
     }
 
     @Override
-    public JSONObject getDistrictAnalysis(QueryDistrictAnalysisForm form) {
+    public JSONObject loadDistrictAnalysis(QueryDistrictAnalysisForm form) {
         BaiduStatisticsBody body = null;
         if (StringUtils.isNotBlank(form.getAreaType()) && TABLE.equals(form.getAreaType())) {
             body = new BaiduStatisticsBody(
@@ -529,7 +512,7 @@ public class DataLogServiceImpl extends BaseServiceImpl<DataLog, String> impleme
     }
 
     @Override
-    public JSONObject getVisitorAttr(QueryVisitorAttrForm form) {
+    public JSONObject loadVisitorAttr(QueryVisitorAttrForm form) {
         BaiduStatisticsBody body = new BaiduStatisticsBody(
                 form.getStart_date(),
                 form.getEnd_date(),
@@ -551,7 +534,7 @@ public class DataLogServiceImpl extends BaseServiceImpl<DataLog, String> impleme
     }
 
     @Override
-    public JSONObject getVisitorSummary(QueryVisitorAttrForm form) {
+    public JSONObject loadVisitorSummary(QueryVisitorAttrForm form) {
         BaiduStatisticsBody body = new BaiduStatisticsBody(
                 form.getStart_date(),
                 form.getEnd_date(),
@@ -573,7 +556,7 @@ public class DataLogServiceImpl extends BaseServiceImpl<DataLog, String> impleme
     }
 
     @Override
-    public JSONObject getLoyalty(QueryVisitorLoyaltyForm form) {
+    public JSONObject loadLoyalty(QueryVisitorLoyaltyForm form) {
         BaiduStatisticsBody body = new BaiduStatisticsBody(
                 form.getStart_date(),
                 form.getEnd_date(),
@@ -596,7 +579,7 @@ public class DataLogServiceImpl extends BaseServiceImpl<DataLog, String> impleme
     }
 
     @Override
-    public JSONObject getLoyaltyPolymerization(QueryVisitorLoyaltyForm form) {
+    public JSONObject loadLoyaltyPolymerization(QueryVisitorLoyaltyForm form) {
         Map<String, String> character = CharacterEnums.getAllEnumMap();
         JSONObject result = new JSONObject();