From b31acfa2c82b12300734df11888776ee6e91626c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 14 Apr 2021 21:28:09 +0800
Subject: [PATCH] 新增实时警情，违禁品，包裹，健康码，体温导出数据接口，通过feign 调用 jfpts 模块获取数据返回

---
 blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java |   84 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 78 insertions(+), 6 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 caa5a5a..aea23f7 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,16 +1,15 @@
 package org.springblade.report.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
-import org.springblade.report.entity.HealthcodeReturnData;
+import org.springblade.common.entity.*;
 import org.springblade.report.entity.ReportFile;
 import org.springblade.report.feign.ReportClient;
 import org.springblade.report.mapper.ReportFileMappers;
 import org.springblade.report.service.ReportFileService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -44,6 +43,23 @@
 		return page.setRecords(baseMapper.selectList(queryWrapper));
 	}
 
+
+	/**
+	 * 获取包裹数据集合
+	 * @param beanName 调用名称
+	 * @param dataName 返回数据名称
+	 * @param map map集合数据
+	 * @return
+	 */
+	public List<AlarmExcel> getAlarmList(String beanName, String dataName, Map<String,Object> map){
+		//将map转换为json对象
+		String body = JSON.toJSONString(map);
+		if (null!=beanName){
+			return reportClient.getAlarmList(body);
+		}
+		return null;
+	}
+
 	/**
 	 * 获取健康码数据集合
 	 * @param beanName 调用名称
@@ -51,10 +67,66 @@
 	 * @param map map集合数据
 	 * @return
 	 */
-	@GetMapping("/getHealthcodeList")
-	public List<HealthcodeReturnData> getHealthcodeList(String beanName, String dataName, Map<String,Object> map){
-		return reportClient.getHealthcodeList(beanName,dataName,map);
+	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);
+		}
+		return null;
 	}
 
+	/**
+	 * 获取体温数据集合
+	 * @param beanName 调用名称
+	 * @param dataName 返回数据名称
+	 * @param map map集合数据
+	 * @return
+	 */
+	public List<AnimalHeatExcel> getAnimalHeatList(String beanName, String dataName, Map<String,Object> map){
+		//将map转换为json对象
+		String body = JSON.toJSONString(map);
+		if (null!=beanName){
+			return reportClient.getAnimalHeatList(body);
+		}
+		return null;
+	}
+
+	/**
+	 * 获取包裹数据集合
+	 * @param beanName 调用名称
+	 * @param dataName 返回数据名称
+	 * @param map map集合数据
+	 * @return
+	 */
+	public List<ParcelExcel> getParcelList(String beanName, String dataName, Map<String,Object> map){
+		//将map转换为json对象
+		String body = JSON.toJSONString(map);
+		if (null!=beanName){
+			return reportClient.getParcelList(body);
+		}
+		return null;
+	}
+
+	/**
+	 * 获取违禁品数据集合
+	 * @param beanName 调用名称
+	 * @param dataName 返回数据名称
+	 * @param map map集合数据
+	 * @return
+	 */
+	public List<ParcelKindExcel> getParcelKindList(String beanName, String dataName, Map<String,Object> map){
+		//将map转换为json对象
+		String body = JSON.toJSONString(map);
+		if (null!=beanName){
+			return reportClient.getParcelKindList(body);
+		}
+		return null;
+	}
+
+
+
+
 
 }

--
Gitblit v1.9.3