利润分析接口和首页数据展示接口

zhongnanhuang
1 parent ea62f287
Showing 5 changed files with 19 additions and 30 deletions
src/main/java/com/order/erp/controller/IndexController.java
src/main/java/com/order/erp/domain/vo/IndexDataVO.java
src/main/java/com/order/erp/mapper/order/OrderBaseInfoMapper.java
src/main/java/com/order/erp/service/order/OrderBaseInfoService.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 /**
  * @author zhongnanhuang
@@ -56,8 +58,6 @@ public class IndexController {
         long orderReport = orderCompletionReportService.countByOrderStatus(OrderStatusEnum.REPORT_WAIT_AUDIT.getStatus());
         long orderYearReport = orderCompletionReportService.countYearByOrderStatus(OrderStatusEnum.REPORT_WAIT_AUDIT.getStatus());
-        //当天订单数据
-        IndexDataVO.ChartData chartData = orderBaseInfoService.countHoursFromDay();
         IndexDataVO indexDataVo = new IndexDataVO();
         indexDataVo.setOrderFinishedCount(orderTotalFinished);
@@ -68,8 +68,14 @@ public class IndexController {
         indexDataVo.setOrderRecentWeekProfitWaitAuditCount(orderRecentWeekProfitWaitAudit);
         indexDataVo.setOrderReportWaitAuditCount(orderReport);
         indexDataVo.setOrderReportRecentYearWaitAuditCount(orderYearReport);
-        indexDataVo.setChartData(chartData);
         return ServerResult.success(indexDataVo);
     }
+
+    @GetMapping("/chartData")
+    public ServerResult getChartData(){
+        //订单趋势数据
+        List<Map<String,Integer>> chartData = orderBaseInfoService.countDaysOrder();
+        return ServerResult.success(chartData);
+    }
 }
@@ -33,13 +33,4 @@ public class IndexDataVO {
     private Long orderReportRecentYearWaitAuditCount;
-    private ChartData chartData;
-
-    @Data
-    @AllArgsConstructor
-    @NoArgsConstructor
-    public static class ChartData{
-        private String[] x;//小时
-        private int[] y;//订单量
-    }
 }
@@ -7,6 +7,7 @@ import com.order.erp.domain.vo.OrderCountVO;
 import org.apache.ibatis.annotations.Select;
 import java.util.List;
+import java.util.Map;
 /**
  * 订单基础信息表(OrderBaseInfo)表数据库访问层
@@ -20,7 +21,7 @@ public interface OrderBaseInfoMapper extends BaseMapper&lt;OrderBaseInfoDO&gt; {
     @Select("SELECT count(*) FROM order_base_info WHERE order_status=#{orderStatus} and DATE_SUB(CURDATE(), INTERVAL 1 MONTH) <= date(create_time);")
     long countRecentMonthByOrderStatus(Integer orderStatus);
-    @Select("SELECT HOUR(create_time) AS hour, COUNT(*) AS count FROM order_base_info WHERE create_time >= DATE_SUB(NOW(), INTERVAL 1 DAY) GROUP BY HOUR(create_time);")
-    List<OrderCountVO> countHoursFromDay();
+    @Select("SELECT DATE(create_time) AS dateTime, COUNT(*) AS orderCount FROM order_base_info GROUP BY dateTime;")
+    List<Map<String, Integer>> countDaysOrder();
 }
@@ -9,6 +9,8 @@ import com.order.erp.domain.vo.order.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 /**
  * 订单基础信息表(OrderBaseInfo)表服务接口
@@ -85,5 +87,6 @@ public interface OrderBaseInfoService extends IService&lt;OrderBaseInfoDO&gt; {
     long countRecentMonthByOrderStatus(Integer orderFinish);
-    IndexDataVO.ChartData countHoursFromDay();
+
+    List<Map<String, Integer>> countDaysOrder();
 }
@@ -616,21 +616,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     }
     @Override
-    public IndexDataVO.ChartData countHoursFromDay() {
-        List<OrderCountVO> orderCountVOS = this.baseMapper.countHoursFromDay();
-        Map<String,Integer> countValueMap = new HashMap<>();
-        if (orderCountVOS!=null&& orderCountVOS.size()>0){
-            for (OrderCountVO orderCountVO : orderCountVOS) {
-                countValueMap.put(orderCountVO.getHour(),orderCountVO.getCount());
-            }
-        }
-        String[] x = new String[24];
-        int[] y = new int[24];
-        for (int i = 0; i < 24; i++) {
-            x[i] = i+":00";
-            y[i] = countValueMap.get(i+"")==null?0:countValueMap.get(i+"");
-        }
-        return new IndexDataVO.ChartData(x,y);
+    public List<Map<String, Integer>> countDaysOrder() {
+        return this.baseMapper.countDaysOrder();
     }
+
 }