好办小程序埋点分组接口调整：去掉合计

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/EventTrackingController.java

@@ -150,8 +150,7 @@ public class EventTrackingController extends NewBaseController {
         qo.dealWithParam(jsonObject);
         storeAuthUtils.setStoreGroupJsonParam(jsonObject, qo);
         jsonObject.put("apolloKey", "data_point_anal_hb_app_store");
-        DataPageVO vo = storeAuthUtils.getDataCommon(jsonObject.toJSONString(), qo.getPageNum(), "data_point_anal_hb_app_store", qo.getPageSize(), true);
-        storeAuthUtils.deleteTotalData(vo);
+        DataPageVO vo = storeAuthUtils.getDataCommonParent(jsonObject.toJSONString(), qo.getPageNum(), "data_point_anal_hb_app_store", qo.getPageSize(), true, true);
         if (CollectionUtils.isNotEmpty(vo.getRows())) {
             vo.setRows(JSONArray.parseArray(JSON.toJSONString(vo.getRows()), WechatEventTrackingStoreGroupVO.class));
         }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/handle/WechatEventTrackingStoreGroupHandle.java

@@ -26,9 +26,8 @@ public class WechatEventTrackingStoreGroupHandle extends DownloadHandlerAbstract
 
     @Override
     public List<WechatEventTrackingStoreGroupVO> getData(Context context, String searchDataParams, Integer currentPage) {
-        List<JSONObject> list = storeAuthUtils.getDataCommon(searchDataParams, currentPage,
-                "数据-登录数据-好办使用详情导出日志进来", getPageSize(), false).getRows();
-        list = storeAuthUtils.deleteTotalData(list);
+        List<JSONObject> list = storeAuthUtils.getDataCommonParent(searchDataParams, currentPage,
+                "数据-登录数据-好办使用详情导出日志进来", getPageSize(), false, true).getRows();
         if (CollectionUtils.isNotEmpty(list)) {
             List<WechatEventTrackingStoreGroupVO> result = JSONObject.parseArray(JSON.toJSONString(list), WechatEventTrackingStoreGroupVO.class);
             return result;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/utils/data/StoreAuthUtils.java

@@ -156,6 +156,10 @@ public class StoreAuthUtils {
     }
 
     public DataPageVO getDataCommon(String searchDataParams, Integer currentPage, String logStr, Integer pageSize, boolean hasCountPerPage) {
+        return getDataCommonParent(searchDataParams, currentPage, logStr, pageSize, hasCountPerPage, false);
+    }
+
+    public DataPageVO getDataCommonParent(String searchDataParams, Integer currentPage, String logStr, Integer pageSize, boolean hasCountPerPage, boolean noTotal) {
         boolean isFirst = currentPage != null && currentPage == 1;
         if (isFirst) {
             log.info(logStr);
@@ -180,6 +184,7 @@ public class StoreAuthUtils {
         Integer totalCount = page.getTotalCount();
         vo.setTotalNum(totalCount);
 
+        if (!noTotal) {
             //调用一次合计
             if (hasCountPerPage || (isFirst && CollectionUtils.isNotEmpty(list))) {
                 if (hasCountPerPage && CollectionUtils.isEmpty(list)) {
@@ -205,30 +210,11 @@ public class StoreAuthUtils {
 
                 list.add(0, total);
             }
+        }
         vo.setRows(list);
         return vo;
     }
 
-    /**
-     * 删除合计的那条数据
-     * @param vo
-     */
-    public void deleteTotalData(DataPageVO vo) {
-        deleteTotalData(vo.getRows());
-    }
-
-    public List<JSONObject> deleteTotalData(List<JSONObject> list) {
-        if (CollectionUtils.isNotEmpty(list)) {
-            if (list.size() == 1 && "all".equals(list.get(0).getString("storeGroupId"))) {
-                 return Collections.EMPTY_LIST;
-            } else {
-                //删除合计的那条数据
-                list.remove(0);
-            }
-        }
-        return list;
-    }
-
     private List<String> getStore(String enterpriseId, String userId, String search, List<String> storeGroupIdList, List<String> status, List<String> storeIdList) {
         StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
         storeSearchDTO.setEnterpriseId(enterpriseId);