月统计数据查询接口

admin/src/main/java/com/kym/admin/controller/StatController.java

@@ -2,11 +2,10 @@ package com.kym.admin.controller;
 
 import com.kym.common.R;
 import com.kym.entity.admin.queryParams.StatQueryParam;
+import com.kym.entity.admin.queryParams.StatementsQueryParam;
+import com.kym.service.admin.StationStatMonthService;
 import com.kym.service.miniapp.ChargeOrderService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author skyline
@@ -18,9 +17,11 @@ import org.springframework.web.bind.annotation.RestController;
 public class StatController {
 
     private final ChargeOrderService chargeOrderService;
+    private final StationStatMonthService stationStatMonthService;
 
-    public StatController(ChargeOrderService chargeOrderService) {
+    public StatController(ChargeOrderService chargeOrderService, StationStatMonthService stationStatMonthService) {
         this.chargeOrderService = chargeOrderService;
+        this.stationStatMonthService = stationStatMonthService;
     }
 
     /**
@@ -31,8 +32,7 @@ public class StatController {
      */
     @GetMapping("/stationStat")
     R<?> stationStat(@ModelAttribute StatQueryParam params) {
-        var res = chargeOrderService.stationStat(params);
-        return R.success(res);
+        return R.success(chargeOrderService.stationStat(params));
     }
 
     /**
@@ -42,19 +42,40 @@ public class StatController {
      */
     @GetMapping("/stationTodayStat")
     R<?> stationTodayStat(String stationId) {
-        var res = chargeOrderService.stationTodayStat(stationId);
-        return R.success(res);
+        return R.success(chargeOrderService.stationTodayStat(stationId));
     }
 
-    // TODO: 2023-12-01 站点平均单桩充电数据 日/月/整体维度
+    /**
+     * 站点详细数据统计
+     *
+     * @param params
+     * @return
+     */
+    @GetMapping("/stationStatDetail")
+    R<?> stationStatDetail(@ModelAttribute StatQueryParam params) {
+        return R.success(chargeOrderService.stationStatDetail(params));
+    }
 
-    // TODO: 2023-12-01 站点平均单度电费数据 日/月/整体维度
+    /**
+     * 站点月统计数据列表
+     *
+     * @param params
+     * @return
+     */
+    @GetMapping("/listStatMonth")
+    R<?> listStatMonth(@ModelAttribute StatementsQueryParam params) {
+        return R.success(stationStatMonthService.listStatMonth(params));
+    }
 
-    // 站点详细数据统计
-    @GetMapping("/stationStatDetail")
-    R<?> stationStatDetail(@ModelAttribute StatQueryParam params){
-        var res = chargeOrderService.stationStatDetail(params);
-        return R.success(res);
+    /**
+     * 单条站点月统计数据
+     *
+     * @param statMonthId
+     * @return
+     */
+    @GetMapping("/getStationStatMonth/{statMonthId}")
+    R<?> getStationStatMonth(@PathVariable("statMonthId") String statMonthId) {
+        return R.success(stationStatMonthService.getById(statMonthId));
     }
 
 

service/src/main/java/com/kym/service/admin/StationStatMonthService.java

@@ -2,6 +2,8 @@ package com.kym.service.admin;
 
 import com.kym.entity.admin.StationStatMonth;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kym.entity.admin.queryParams.StatementsQueryParam;
+import com.kym.entity.common.PageBean;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface StationStatMonthService extends IService<StationStatMonth> {
 
+    PageBean<StationStatMonth> listStatMonth(StatementsQueryParam params);
 }

service/src/main/java/com/kym/service/admin/impl/StationStatMonthServiceImpl.java

@@ -1,9 +1,13 @@
 package com.kym.service.admin.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.kym.common.utils.CommUtil;
 import com.kym.entity.admin.StationStatMonth;
+import com.kym.entity.admin.queryParams.StatementsQueryParam;
+import com.kym.entity.common.PageBean;
 import com.kym.mapper.admin.StationStatMonthMapper;
 import com.kym.service.admin.StationStatMonthService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class StationStatMonthServiceImpl extends ServiceImpl<StationStatMonthMapper, StationStatMonth> implements StationStatMonthService {
 
+    @Override
+    public PageBean<StationStatMonth> listStatMonth(StatementsQueryParam params) {
+        PageHelper.startPage(params.getPageNum(), params.getPageSize());
+        var res = lambdaQuery()
+                .eq(!CommUtil.isEmptyOrNull(params.getStationId()), StationStatMonth::getStationId, params.getStationId())
+                .eq(!CommUtil.isEmptyOrNull(params.getStatMonth()), StationStatMonth::getStatMonth, params.getStatMonth())
+                .orderByDesc(StationStatMonth::getStatMonth)
+                .list();
+        return new PageBean<>(res);
+    }
 }