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 | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 172 insertions(+), 7 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..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,19 +1,19 @@
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;
+import org.springframework.web.bind.annotation.PostMapping;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -44,6 +44,40 @@
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 调用名称
+ * @param dataName 返回数据名称
+ * @param map map集合数据
+ * @return
+ */
+ public List<ReportReturnData> getAlarmPie(String beanName, String dataName, Map<String,Object> map){
+ //将map转换为json对象
+ String body = JSON.toJSONString(map);
+ if (null!=beanName){
+ List<ReportReturnData> alarmPie = reportClient.getAlarmPie(body);
+ return alarmPie;
+ }
+ return null;
+ }
+
/**
* 获取健康码数据集合
* @param beanName 调用名称
@@ -51,10 +85,141 @@
* @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);
+ if (null!=beanName){
+ return reportClient.getHealthcodeList(s);
+ }
+ return null;
}
+ /**
+ * 获取健康码图表数据
+ * @param beanName 调用名称
+ * @param dataName 返回数据名称
+ * @param map map集合数据
+ * @return
+ */
+ public List<ReportReturnData> getHealthcodePie(String beanName, String dataName, Map<String,Object> map){
+ //将map转换为json对象
+ String s = JSON.toJSONString(map);
+ if (null!=beanName){
+ return reportClient.getHealthcodePie(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<ReportReturnData> getAnimalHeatPie(String beanName, String dataName, Map<String,Object> map){
+ //将map转换为json对象
+ String body = JSON.toJSONString(map);
+ if (null!=beanName){
+ return reportClient.getAnimalHeatPie(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){
+// 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;
+ }
+
+ /**
+ * 获取违禁品数据集合
+ * @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;
+ }
+
+
+ /**
+ * 获取违禁品统计数据
+ * @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