Browse Source

首页数据

zhaoxian 2 năm trước cách đây
mục cha
commit
3b109c23a3

+ 6 - 6
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/controller/ReportController.java

@@ -77,13 +77,13 @@ public class ReportController {
      * @param mediaId
      * @param mediaId
      */
      */
     @GetMapping("/getTrendCharge")
     @GetMapping("/getTrendCharge")
-    public Result<Object> getTrendCharge(String type,String mediaId, Long projectId, String startTime, String endTime) {
+    public Result<Object> getTrendCharge(String type, String mediaId, Long projectId, String startTime, String endTime) {
         try {
         try {
             JSONObject data = null;
             JSONObject data = null;
             if ("1".equals(mediaId)) {
             if ("1".equals(mediaId)) {
-                data = bytedanceReportService.getTrendCharge(type,projectId, startTime, endTime);
+                data = bytedanceReportService.getTrendCharge(type, projectId, startTime, endTime);
             } else {
             } else {
-                data = kuaishouReportService.getTrendCharge(type,projectId, startTime, endTime);
+                data = kuaishouReportService.getTrendCharge(type, projectId, startTime, endTime);
             }
             }
             return Result.OK(data);
             return Result.OK(data);
         } catch (Exception e) {
         } catch (Exception e) {
@@ -100,12 +100,12 @@ public class ReportController {
      * @param mediaId
      * @param mediaId
      */
      */
     @GetMapping("/getProjectReport")
     @GetMapping("/getProjectReport")
-    public Result<Object> getProjectReport(String mediaId,String sortCode,String order, Long projectId, String startTime, String endTime, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+    public Result<Object> getProjectReport(String mediaId,String category, String sortCode, String order, Long projectId, String startTime, String endTime, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         try {
         try {
             if ("1".equals(mediaId)) {
             if ("1".equals(mediaId)) {
-                return bytedanceReportService.getProjectReport(projectId, startTime, endTime,sortCode,order, pageSize, pageNo);
+                return bytedanceReportService.getProjectReport(category,projectId, startTime, endTime, sortCode, order, pageSize, pageNo);
             } else {
             } else {
-                return kuaishouReportService.getProjectReport(projectId, startTime, endTime,sortCode,order, pageSize, pageNo);
+                return kuaishouReportService.getProjectReport(category,projectId, startTime, endTime, sortCode, order, pageSize, pageNo);
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();

+ 5 - 5
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/BytedanceAccountReportDailyDwMapper.java

@@ -18,17 +18,17 @@ public interface BytedanceAccountReportDailyDwMapper {
 
 
     Long getProjectToDayReportTotal(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("hour") Integer hour);
     Long getProjectToDayReportTotal(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("hour") Integer hour);
 
 
-    List<JSONObject> getProjectToDayReport(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("hour") Integer hour);
+    List<JSONObject> getProjectToDayReport(@Param("category") String category, @Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("hour") Integer hour, @Param("sortCode") String sortCode, @Param("order") String order);
 
 
     Long getProjectMoreDaysReportTotal(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("hour") Integer hour);
     Long getProjectMoreDaysReportTotal(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("hour") Integer hour);
 
 
-    List<JSONObject> getProjectMoreDaysReport(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("hour") Integer hour);
+    List<JSONObject> getProjectMoreDaysReport(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("hour") Integer hour, @Param("sortCode") String sortCode, @Param("order") String order);
 
 
-    List<JSONObject> getProjectNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTimeInt") Integer endTimeInt);
+    List<JSONObject> getProjectNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTime") Integer endTimeInt);
 
 
-    List<JSONObject> getAdvertiserNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTimeInt") Integer endTimeInt);
+    List<JSONObject> getAdvertiserNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTime") Integer endTimeInt);
 
 
     List<JSONObject> getUnitNoByHours(@Param("startTime") Integer startTimeInt);
     List<JSONObject> getUnitNoByHours(@Param("startTime") Integer startTimeInt);
 
 
-    List<JSONObject> getUnitNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTimeInt") Integer endTimeInt);
+    List<JSONObject> getUnitNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTime") Integer endTimeInt);
 }
 }

+ 4 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/KuaishouAccountReportDailyDwMapper.java

@@ -18,18 +18,18 @@ public interface KuaishouAccountReportDailyDwMapper {
 
 
     Long getProjectToDayReportTotal(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("hour") Integer hour);
     Long getProjectToDayReportTotal(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("hour") Integer hour);
 
 
-    List<JSONObject> getProjectToDayReport(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("hour") Integer hour, @Param("sortCode") String sortCode, @Param("order") String order);
+    List<JSONObject> getProjectToDayReport(@Param("category") String category, @Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("hour") Integer hour, @Param("sortCode") String sortCode, @Param("order") String order);
 
 
     Long getProjectMoreDaysReportTotal(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("hour") Integer hour);
     Long getProjectMoreDaysReportTotal(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("hour") Integer hour);
 
 
     List<JSONObject> getProjectMoreDaysReport(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("hour") Integer hour, @Param("sortCode") String sortCode, @Param("order") String order);
     List<JSONObject> getProjectMoreDaysReport(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("hour") Integer hour, @Param("sortCode") String sortCode, @Param("order") String order);
 
 
-    List<JSONObject> getProjectNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTimeInt") Integer endTimeInt);
+    List<JSONObject> getProjectNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTime") Integer endTimeInt);
 
 
-    List<JSONObject> getAdvertiserNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTimeInt") Integer endTimeInt);
+    List<JSONObject> getAdvertiserNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTime") Integer endTimeInt);
 
 
     List<JSONObject> getUnitNoByHours(@Param("startTime") Integer startTimeInt);
     List<JSONObject> getUnitNoByHours(@Param("startTime") Integer startTimeInt);
 
 
-    List<JSONObject> getUnitNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTimeInt") Integer endTimeInt);
+    List<JSONObject> getUnitNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTime") Integer endTimeInt);
 
 
 }
 }

+ 6 - 5
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/BytedanceAccountReportDailyDwMapper.xml

@@ -95,6 +95,7 @@
 
 
 
 
     <select id="getProjectToDayReport" resultType="com.alibaba.fastjson.JSONObject">
     <select id="getProjectToDayReport" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT * FROM (
         SELECT
         SELECT
         t1.project_id as 'projectId',
         t1.project_id as 'projectId',
         t3.project_name AS 'projectName',
         t3.project_name AS 'projectName',
@@ -170,10 +171,12 @@
         <if test="projectId != null and projectId != ''">
         <if test="projectId != null and projectId != ''">
             AND t1.project_id = #{projectId}
             AND t1.project_id = #{projectId}
         </if>
         </if>
-        <if test="projectId == null">
             GROUP BY t1.project_id
             GROUP BY t1.project_id
             HAVING sum(cost) > 0
             HAVING sum(cost) > 0
-            ORDER BY sum(cost) desc
+            ORDER BY ${sortCode} ${order}
+        ) t
+        <if test="category == 1">
+            WHERE rio &lt;= -0.1 AND rio !='-'
         </if>
         </if>
     </select>
     </select>
 
 
@@ -259,11 +262,9 @@
         <if test="projectId != null and projectId != ''">
         <if test="projectId != null and projectId != ''">
             AND t1.project_id = #{projectId}
             AND t1.project_id = #{projectId}
         </if>
         </if>
-        <if test="projectId == null">
             GROUP BY t1.project_id
             GROUP BY t1.project_id
             HAVING sum(cost) > 0
             HAVING sum(cost) > 0
-            ORDER BY sum(cost) desc
-        </if>
+            ORDER BY ${sortCode} ${order}
     </select>
     </select>
 
 
 
 

+ 15 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/KuaishouAccountReportDailyDwMapper.xml

@@ -98,6 +98,7 @@
     </select>
     </select>
 
 
     <select id="getProjectToDayReport" resultType="com.alibaba.fastjson.JSONObject">
     <select id="getProjectToDayReport" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT * FROM (
         SELECT
         SELECT
         t1.project_id as 'projectId',
         t1.project_id as 'projectId',
         t3.project_name AS 'projectName',
         t3.project_name AS 'projectName',
@@ -167,12 +168,16 @@
         GROUP BY project_id
         GROUP BY project_id
         ) t10 ON t1.project_id = t10.project_id
         ) t10 ON t1.project_id = t10.project_id
         LEFT JOIN (
         LEFT JOIN (
-        SELECT project_id,new_unit_num,new_trush_unit_num FROM application.app_kuaishou_account_today_base_info_d WHERE
-        stat_date = #{startTime}
+        SELECT project_id, SUM(new_unit_num) as 'new_unit_num',SUM(new_trush_unit_num) as 'new_trush_unit_num'
+        FROM application.app_kuaishou_account_today_base_info_d
+        WHERE stat_date = #{startTime}
+        GROUP BY project_id
         )t11 ON t1.project_id = t11.project_id
         )t11 ON t1.project_id = t11.project_id
         LEFT JOIN (
         LEFT JOIN (
-        SELECT project_id,new_unit_num,new_trush_unit_num FROM application.app_kuaishou_account_today_base_info_d WHERE
+        SELECT project_id,SUM(new_unit_num) as 'new_unit_num', SUM(new_trush_unit_num) as 'new_trush_unit_num'
+        FROM application.app_kuaishou_account_today_base_info_d WHERE
         stat_date = DATE_FORMAT(DATE_SUB(#{startTime}, INTERVAL 1 DAY ), '%Y%m%d')
         stat_date = DATE_FORMAT(DATE_SUB(#{startTime}, INTERVAL 1 DAY ), '%Y%m%d')
+        GROUP BY project_id
         )t12 ON t1.project_id = t12.project_id
         )t12 ON t1.project_id = t12.project_id
         LEFT JOIN
         LEFT JOIN
         (SELECT dimension , SUM(material_upload_media_num) as 'material_upload_media_num' FROM
         (SELECT dimension , SUM(material_upload_media_num) as 'material_upload_media_num' FROM
@@ -189,6 +194,10 @@
         GROUP BY t1.project_id
         GROUP BY t1.project_id
         HAVING sum(charge) > 0
         HAVING sum(charge) > 0
         ORDER BY ${sortCode} ${order}
         ORDER BY ${sortCode} ${order}
+        ) t
+        <if test="category == 1">
+            WHERE rio &lt;= -0.1 AND rio !='-'
+        </if>
     </select>
     </select>
 
 
 
 
@@ -266,9 +275,11 @@
         GROUP BY project_id
         GROUP BY project_id
         ) t10 ON t1.project_id = t10.project_id
         ) t10 ON t1.project_id = t10.project_id
         LEFT JOIN (
         LEFT JOIN (
-        SELECT project_id,new_unit_num,new_trush_unit_num FROM application.app_kuaishou_account_today_base_info_d
+        SELECT project_id, SUM(new_unit_num) as 'new_unit_num',SUM(new_trush_unit_num) as 'new_trush_unit_num'
+        FROM application.app_kuaishou_account_today_base_info_d
         WHERE stat_date >= #{startTime}
         WHERE stat_date >= #{startTime}
         AND stat_date &lt;= #{endTime}
         AND stat_date &lt;= #{endTime}
+        GROUP BY project_id
         )t11 ON t1.project_id = t11.project_id
         )t11 ON t1.project_id = t11.project_id
         LEFT JOIN
         LEFT JOIN
         (SELECT dimension , SUM(material_upload_media_num) as 'material_upload_media_num' FROM
         (SELECT dimension , SUM(material_upload_media_num) as 'material_upload_media_num' FROM

+ 1 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/IBytedanceAccountReportDailyDwService.java

@@ -11,5 +11,5 @@ public interface IBytedanceAccountReportDailyDwService {
 
 
     JSONObject getTrendCharge(String type, Long projectId, String startTime, String endTime);
     JSONObject getTrendCharge(String type, Long projectId, String startTime, String endTime);
 
 
-    Result<Object> getProjectReport(Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception;
+    Result<Object> getProjectReport(String category,Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception;
 }
 }

+ 1 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/IKuaishouAccountReportDailyDwService.java

@@ -11,5 +11,5 @@ public interface IKuaishouAccountReportDailyDwService {
 
 
     JSONObject getTrendCharge(String type,Long projectId, String startTime, String endTime);
     JSONObject getTrendCharge(String type,Long projectId, String startTime, String endTime);
 
 
-    Result<Object> getProjectReport(Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception;
+    Result<Object> getProjectReport(String category,Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception;
 }
 }

+ 10 - 3
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/BytedanceAccountReportDailyDwServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.ctop.material.constants.Check;
 import org.jeecg.ctop.material.mapper.BytedanceAccountReportDailyDwMapper;
 import org.jeecg.ctop.material.mapper.BytedanceAccountReportDailyDwMapper;
 import org.jeecg.ctop.material.service.IBytedanceAccountReportDailyDwService;
 import org.jeecg.ctop.material.service.IBytedanceAccountReportDailyDwService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -84,7 +85,13 @@ public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccou
     }
     }
 
 
     @Override
     @Override
-    public Result<Object> getProjectReport(Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception {
+    public Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception {
+        if (Check.isNull(order)) {
+            order = "DESC";
+        }
+        if (Check.isNull(sortCode)) {
+            sortCode = "SUM(cost)";
+        }
         Integer startTimeInt = DateUtils.getDateInteger(startTime);
         Integer startTimeInt = DateUtils.getDateInteger(startTime);
         Integer endTimeInt = DateUtils.getDateInteger(endTime);
         Integer endTimeInt = DateUtils.getDateInteger(endTime);
         //当前小时
         //当前小时
@@ -96,11 +103,11 @@ public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccou
         if (startTime.equals(endTime) && today.equals(startTime)) {
         if (startTime.equals(endTime) && today.equals(startTime)) {
 //            total = bytedanceAccountReportDailyDwMapper.getProjectToDayReportTotal(projectId, startTimeInt, nowHour);
 //            total = bytedanceAccountReportDailyDwMapper.getProjectToDayReportTotal(projectId, startTimeInt, nowHour);
 //            PageHelper.startPage(pageNo, pageSize, false);
 //            PageHelper.startPage(pageNo, pageSize, false);
-            data = bytedanceAccountReportDailyDwMapper.getProjectToDayReport(projectId, startTimeInt, nowHour);
+            data = bytedanceAccountReportDailyDwMapper.getProjectToDayReport(category, projectId, startTimeInt, nowHour,sortCode, order);
         } else {
         } else {
 //            total = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReportTotal(projectId, startTimeInt, endTimeInt, nowHour);
 //            total = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReportTotal(projectId, startTimeInt, endTimeInt, nowHour);
 //            PageHelper.startPage(pageNo, pageSize, false);
 //            PageHelper.startPage(pageNo, pageSize, false);
-            data = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReport(projectId, startTimeInt, endTimeInt, nowHour);
+            data = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReport(projectId, startTimeInt, endTimeInt, nowHour,sortCode, order);
         }
         }
         PageInfo<JSONObject> page = new PageInfo<>();
         PageInfo<JSONObject> page = new PageInfo<>();
         page.setList(data);
         page.setList(data);

+ 2 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/KuaishouAccountReportDailyDwServiceImpl.java

@@ -84,7 +84,7 @@ public class KuaishouAccountReportDailyDwServiceImpl implements IKuaishouAccount
     }
     }
 
 
     @Override
     @Override
-    public Result<Object> getProjectReport(Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception {
+    public Result<Object> getProjectReport(String category,Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception {
         if (Check.isNull(order)) {
         if (Check.isNull(order)) {
             order = "DESC";
             order = "DESC";
         }
         }
@@ -103,7 +103,7 @@ public class KuaishouAccountReportDailyDwServiceImpl implements IKuaishouAccount
         if (startTime.equals(endTime) && today.equals(startTime)) {
         if (startTime.equals(endTime) && today.equals(startTime)) {
 //            total = kuaishouAccountReportDailyDwMapper.getProjectToDayReportTotal(projectId, startTimeInt, nowHour);
 //            total = kuaishouAccountReportDailyDwMapper.getProjectToDayReportTotal(projectId, startTimeInt, nowHour);
 //            PageHelper.startPage(pageNo, pageSize, false);
 //            PageHelper.startPage(pageNo, pageSize, false);
-            data = kuaishouAccountReportDailyDwMapper.getProjectToDayReport(projectId, startTimeInt, nowHour, sortCode, order);
+            data = kuaishouAccountReportDailyDwMapper.getProjectToDayReport(category,projectId, startTimeInt, nowHour, sortCode, order);
         } else {
         } else {
 //            total = kuaishouAccountReportDailyDwMapper.getProjectMoreDaysReportTotal(projectId, startTimeInt, endTimeInt, nowHour);
 //            total = kuaishouAccountReportDailyDwMapper.getProjectMoreDaysReportTotal(projectId, startTimeInt, endTimeInt, nowHour);
 //            PageHelper.startPage(pageNo, pageSize, false);
 //            PageHelper.startPage(pageNo, pageSize, false);