From 70ca58b0beb989c52bb677b4d44c2960bc4d20d2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 21 Apr 2021 08:45:38 +0800
Subject: [PATCH] 多余包删除
---
blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java b/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
index 4fd2877..8e77fa9 100644
--- a/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
+++ b/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
@@ -1,7 +1,6 @@
package org.springblade.report.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,10 +11,7 @@
import org.springblade.report.mapper.ReportFileMappers;
import org.springblade.report.service.ReportFileService;
import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
import java.util.List;
import java.util.Map;
@@ -74,7 +70,8 @@
//将map转换为json对象
String body = JSON.toJSONString(map);
if (null!=beanName){
- return reportClient.getAlarmPie(body);
+ List<ReportReturnData> alarmPie = reportClient.getAlarmPie(body);
+ return alarmPie;
}
return null;
}
@@ -123,7 +120,6 @@
//将map转换为json对象
String body = JSON.toJSONString(map);
if (null!=beanName){
- System.out.println("reportClient.getAnimalHeatList(body) = " + reportClient.getAnimalHeatList(body));
return reportClient.getAnimalHeatList(body);
}
return null;
@@ -136,12 +132,10 @@
* @param map map集合数据
* @return
*/
- @PostMapping("getAnimalHeatPie")
public List<ReportReturnData> getAnimalHeatPie(String beanName, String dataName, Map<String,Object> map){
//将map转换为json对象
String body = JSON.toJSONString(map);
if (null!=beanName){
- System.out.println("reportClient = " + reportClient.getAnimalHeatPie(body));
return reportClient.getAnimalHeatPie(body);
}
return null;
@@ -164,6 +158,23 @@
}
/**
+ * 获取包裹统计数据
+ * @param beanName 调用名称
+ * @param dataName 返回数据名称
+ * @param map map集合数据
+ * @return
+ */
+ @PostMapping("getParcelPie")
+ public List<ReportReturnData> getParcelPie(String beanName, String dataName, Map<String,Object> map){
+ //将map转换为json对象
+ String body = JSON.toJSONString(map);
+ if (null!=beanName){
+ return reportClient.getParcelPie(body);
+ }
+ return null;
+ }
+
+ /**
* 获取违禁品数据集合
* @param beanName 调用名称
* @param dataName 返回数据名称
@@ -180,6 +191,24 @@
}
+ /**
+ * 获取违禁品统计数据
+ * @param beanName 调用名称
+ * @param dataName 返回数据名称
+ * @param map map集合数据
+ * @return
+ */
+ @PostMapping("getParcelKindPie")
+ public List<ReportReturnData> getParcelKindPie(String beanName, String dataName, Map<String,Object> map){
+ //将map转换为json对象
+ String body = JSON.toJSONString(map);
+ if (null!=beanName){
+ return reportClient.getParcelKindPie(body);
+ }
+ return null;
+ }
+
+
--
Gitblit v1.9.3