From 86c97c6581193886b3922f9e651170cebf1b4522 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期四, 06 一月 2022 09:59:55 +0800
Subject: [PATCH] 回复
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java | 3 -
2 files changed, 167 insertions(+), 3 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
index 2d5156f..55394c3 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
@@ -94,13 +94,10 @@
wrapper1.ge(beginTime!=null && beginTime!="","send_date",beginTime);
wrapper1.le(endTime!=null && endTime!="","send_date",endTime);
- OrderTask orderTask = iOrderTaskService.getOne(wrapper1);
DrivingRecord drivingRecord = iDrivingRecordService.getOne(wrapper);
AddOil addOil = iAddOilService.getOne(queryWrapper);
-
-
if (addOil!=null){
carVo.setMoney(addOil.getMoney());
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java
new file mode 100644
index 0000000..56b3be0
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java
@@ -0,0 +1,167 @@
+package cn.exrick.xboot.your.controller.pc;
+
+import cn.exrick.xboot.core.common.utils.ResultUtil;
+import cn.exrick.xboot.core.common.vo.Result;
+import cn.exrick.xboot.your.entity.Car;
+import cn.exrick.xboot.your.service.IEventLogService;
+import cn.exrick.xboot.your.service.IOrderTaskService;
+import cn.exrick.xboot.your.vo.Month;
+import cn.exrick.xboot.your.service.ICarService;
+import cn.exrick.xboot.your.service.ICustomerService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+/**
+ * @author whj
+ */
+@Slf4j
+@RestController
+@Api(tags = "澶у睆缁熻鍏朵粬椤甸潰鎺ュ彛")
+@RequestMapping("/xboot/pcStatistic2")
+@Transactional
+public class Statistic2Controller {
+
+ @Autowired
+ private ICarService iCarService;
+ @Autowired
+ private ICustomerService iCustomerService;
+ @Autowired
+ private IOrderTaskService iOrderTaskService;
+ @Autowired
+ private IEventLogService iEventLogService;
+
+ @RequestMapping(value = "/getCarCount", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇杞﹁締鏁扮洰")
+ public Result<Object> getCarCount() {
+ Calendar cal = Calendar.getInstance();
+ int year = cal.get(Calendar.YEAR);
+ QueryWrapper<Car> wrapper = new QueryWrapper<>();
+
+ Month month= iCarService.getCarCount(year);
+ List<Integer> list = new ArrayList<>();
+ list.add(month.getJanuary());
+ list.add(month.getFebruary());
+ list.add(month.getMarch());
+ list.add(month.getApril());
+ list.add(month.getMay());
+ list.add(month.getJune());
+ list.add(month.getJuly());
+ list.add(month.getAugust());
+ list.add(month.getSeptember());
+ list.add(month.getOctober());
+ list.add(month.getNovember());
+ list.add(month.getDecember());
+ return new ResultUtil<Object>().setData(list);
+ }
+
+ @RequestMapping(value = "/getCustomerCount", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍟嗘埛鏁扮洰")
+ public Result<Object> getCustomerCount() {
+ Calendar cal = Calendar.getInstance();
+ int year = cal.get(Calendar.YEAR);
+ QueryWrapper<Car> wrapper = new QueryWrapper<>();
+
+ Month month= iCustomerService.getCustomerCount(year);
+ List<Integer> list = new ArrayList<>();
+ list.add(month.getJanuary());
+ list.add(month.getFebruary());
+ list.add(month.getMarch());
+ list.add(month.getApril());
+ list.add(month.getMay());
+ list.add(month.getJune());
+ list.add(month.getJuly());
+ list.add(month.getAugust());
+ list.add(month.getSeptember());
+ list.add(month.getOctober());
+ list.add(month.getNovember());
+ list.add(month.getDecember());
+ return new ResultUtil<Object>().setData(list);
+ }
+
+ @RequestMapping(value = "/getSendNum", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇姣忎釜鏈堥�佽揣鏁伴噺")
+ public Result<Object> getSendNum() {
+ Calendar cal = Calendar.getInstance();
+ int year = cal.get(Calendar.YEAR);
+ QueryWrapper<Car> wrapper = new QueryWrapper<>();
+
+ Month month= iOrderTaskService.getSendNum(year);
+ List<Integer> list = new ArrayList<>();
+ list.add(month.getJanuary());
+ list.add(month.getFebruary());
+ list.add(month.getMarch());
+ list.add(month.getApril());
+ list.add(month.getMay());
+ list.add(month.getJune());
+ list.add(month.getJuly());
+ list.add(month.getAugust());
+ list.add(month.getSeptember());
+ list.add(month.getOctober());
+ list.add(month.getNovember());
+ list.add(month.getDecember());
+ return new ResultUtil<Object>().setData(list);
+ }
+
+ @RequestMapping(value = "/getAvgNum", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍟嗘埛骞冲潎閫佽揣鏁伴噺")
+ public Result<Object> getAvgNum() {
+ Calendar cal = Calendar.getInstance();
+ int year = cal.get(Calendar.YEAR);
+ QueryWrapper<Car> wrapper = new QueryWrapper<>();
+
+ Month month= iCustomerService.getCustomerCount(year);
+ Month month2= iOrderTaskService.getSendNum(year);
+
+ List<Integer> list = new ArrayList<>();
+
+ list.add(month.getJanuary()!=0 ? month2.getJanuary()/month.getJanuary() : 0);
+ list.add(month.getFebruary()!=0 ? month2.getFebruary()/month.getFebruary() : 0);
+ list.add(month.getMarch()!=0 ? month2.getMarch()/month.getMarch() : 0);
+ list.add(month.getApril()!=0 ? month2.getApril()/month.getApril() : 0);
+ list.add(month.getMay()!=0 ? month2.getMay()/month.getMay() : 0);
+ list.add(month.getJune()!=0 ? month2.getJune()/month.getJune() : 0);
+ list.add(month.getJuly()!=0 ? month2.getJuly()/month.getJuly() : 0);
+ list.add(month.getAugust()!=0 ? month2.getAugust()/month.getAugust() : 0);
+ list.add(month.getSeptember()!=0 ? month2.getSeptember()/month.getSeptember() : 0);
+ list.add(month.getOctober()!=0 ? month2.getOctober()/month.getOctober() : 0);
+ list.add(month.getNovember()!=0 ? month2.getNovember()/month.getNovember() : 0);
+ list.add(month.getDecember()!=0 ? month2.getDecember()/month.getDecember() : 0);
+
+ return new ResultUtil<Object>().setData(list);
+ }
+
+ @RequestMapping(value = "/getEventNum", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍟嗘埛骞冲潎閫佽揣鏁伴噺")
+ public Result<Object> getEventNum(Integer type) {
+ Calendar cal = Calendar.getInstance();
+ int year = cal.get(Calendar.YEAR);
+ QueryWrapper<Car> wrapper = new QueryWrapper<>();
+
+ Month month= iEventLogService.getEventNum(year,type);
+
+ List<Integer> list = new ArrayList<>();
+ if (month!=null){
+ list.add(month.getJanuary());
+ list.add(month.getFebruary());
+ list.add(month.getMarch());
+ list.add(month.getApril());
+ list.add(month.getMay());
+ list.add(month.getJune());
+ list.add(month.getJuly());
+ list.add(month.getAugust());
+ list.add(month.getSeptember());
+ list.add(month.getOctober());
+ list.add(month.getNovember());
+ list.add(month.getDecember());
+ }
+
+ return new ResultUtil<Object>().setData(list);
+ }
+}
--
Gitblit v1.9.1