From 1ceb6ae074bc40a687852ce0fcef1ff2aa9c5840 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 17:29:37 +0800
Subject: [PATCH] 1.客户列表接口修改，新增返回字段 deptName 2.删除 system.out... 以往语句

---
 blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 48 insertions(+), 9 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..7b6c850 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,9 @@
 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.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -74,7 +72,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;
 	}
@@ -89,7 +88,6 @@
 	public List<HealthcodeExcel> getHealthcodeList(String beanName, String dataName, Map<String,Object> map){
 		//将map转换为json对象
 		String s = JSON.toJSONString(map);
-		System.out.println("s = " + s);
 		if (null!=beanName){
 			return reportClient.getHealthcodeList(s);
 		}
@@ -123,7 +121,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 +133,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;
@@ -158,7 +153,33 @@
 		//将map转换为json对象
 		String body = JSON.toJSONString(map);
 		if (null!=beanName){
-			return reportClient.getParcelList(body);
+//			List<ParcelExcel> parcelExcels = new ArrayList<>();
+//			ParcelExcel parcelExcel = new ParcelExcel();
+//			parcelExcel.setCheckMachineCode("ceshi");
+//			parcelExcel.setCheckMachineName("ceshi");
+//			parcelExcel.setCheckMachinePosition("ceshi");
+//			parcelExcel.setImgUrl("ceshi");
+//			parcelExcel.setDecisioDiagramResultDetails("ceshi");
+//			parcelExcels.add(parcelExcel);
+			List<ParcelExcel> parcelList = reportClient.getParcelList(body);
+			return parcelList;
+		}
+		return null;
+	}
+
+	/**
+	 * 获取包裹统计数据
+	 * @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;
 	}
@@ -180,6 +201,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