From cef6ee12bbbb42b8674fc3f9353d08df013115d7 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 11 一月 2022 15:32:10 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java
index 56ecf50..ab3b00c 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java
@@ -5,10 +5,7 @@
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
-import cn.exrick.xboot.your.entity.Area;
-import cn.exrick.xboot.your.entity.Car;
-import cn.exrick.xboot.your.entity.EventLog;
-import cn.exrick.xboot.your.entity.OrderTask;
+import cn.exrick.xboot.your.entity.*;
import cn.exrick.xboot.your.service.*;
import cn.exrick.xboot.your.util.HaiKangPost;
import cn.hutool.core.date.DateUtil;
@@ -106,7 +103,57 @@
@RequestMapping(value = "/getAnalysis", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇閰嶉�佸垎鏋�")
public Result<Object> getAnalysis() {
- List<Area> list = iAreaService.list();
+ List<Area> list = iAreaService.list2();
+ for(Area area:list){
+ double sum = 0;
+ int flag = 0;
+ for(AreaSection areaSection: area.getChildren()){
+ sum+=areaSection.getStability();
+ flag++;
+ }
+ if(flag>0){
+ double v = sum / flag;
+ area.setVariance(trans2(v));
+ }
+ }
return new ResultUtil<Object>().setData(list);
}
+
+ @RequestMapping(value = "/getAnalysisDetail", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇閰嶉�佸垎鏋愯鎯�")
+ public Result<Object> getAnalysisDetail(String areaName,String selectName) {
+ QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
+ wrapper.eq("name",areaName);
+ Area one = iAreaService.getOne(wrapper);
+
+ QueryWrapper<AreaSection> wrapper2 = new QueryWrapper<AreaSection>();
+ wrapper2.eq("area_id",one.getId());
+ wrapper2.eq("name",selectName);
+ AreaSection one1 = iAreaSectionService.getOne(wrapper2);
+
+ List<OrderTask> list = iOrderTaskService.groupByTime(one.getId(),one1.getId());
+
+ List<String> list1 = new ArrayList<>();
+ List<Integer> list2 = new ArrayList<>();
+ List<Integer> list3 = new ArrayList<>();
+ List<Integer> list4 = new ArrayList<>();
+
+ for(OrderTask obj:list){
+ list1.add(obj.getCustomerName());
+ list2.add(Integer.valueOf(obj.getTime()/60000));
+ list3.add(Integer.valueOf(obj.getNum()/60000));
+ list4.add(Integer.valueOf(obj.getLevel()/60000));
+ }
+ Map<String,Object> map = new HashMap<>();
+ map.put("name",list1);
+ map.put("avg",list2);
+ map.put("min",list3);
+ map.put("max",list4);
+
+ return new ResultUtil<Object>().setData(map);
+ }
+
+ public double trans2(double v2){
+ return (double) Math.round(v2 * 100) / 100;
+ }
}
--
Gitblit v1.9.1