From f89b68efc5ab927b2ec7bbb5b01f2f576e803329 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 13 Apr 2021 23:46:39 +0800
Subject: [PATCH] 新增健康码统计接口，供 report模块调用获取数据
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java | 2 ++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/feign/HealthcodeFeign.java | 36 ++++++++++++++++++++++++++++++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java | 1 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/HealthcodeReturnData.java | 10 ++++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java | 8 --------
5 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
index 93bd4ea..fe2271e 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
@@ -23,6 +23,7 @@
import org.springblade.jfpt.webscoket.WebSocketServer;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
/**
* Desk启动器
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
index 176a7af..e8de633 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
@@ -4,24 +4,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.jfpt.alarm.constant.AlarmTimeConstant;
-import org.springblade.jfpt.alarm.vo.AlarmExcel;
-import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.animalheat.entity.BladeAnimalHeat;
import org.springblade.jfpt.animalheat.mapper.AnimalHeatMapper;
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.jfpt.animalheat.util.ImageUtil;
import org.springblade.jfpt.animalheat.vo.AnimalHeatExcel;
import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
-import org.springblade.jfpt.animalheat.vo.StatisVo;
-import org.springblade.jfpt.healthcode.entity.Healthcode;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
-import javax.validation.Valid;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.*;
import static org.springblade.core.tool.utils.DateUtil.now;
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
index c6873e5..38418b0 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
@@ -253,4 +253,6 @@
List<HealthcodeExcel> list = ihealthcodeService.exportHealthcode(healthcodeVO);
ExcelUtil.export(response, "健康码数据" + DateUtil.time(), "健康码数据表", list, HealthcodeExcel.class);
}
+
+
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/HealthcodeReturnData.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/HealthcodeReturnData.java
new file mode 100644
index 0000000..60fd771
--- /dev/null
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/HealthcodeReturnData.java
@@ -0,0 +1,10 @@
+package org.springblade.jfpt.healthcode.entity;
+
+import lombok.Data;
+
+@Data
+public class HealthcodeReturnData {
+
+ private String type;
+ private Integer num;
+}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/feign/HealthcodeFeign.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/feign/HealthcodeFeign.java
new file mode 100644
index 0000000..aff7cad
--- /dev/null
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/feign/HealthcodeFeign.java
@@ -0,0 +1,36 @@
+package org.springblade.jfpt.healthcode.feign;
+
+
+import lombok.AllArgsConstructor;
+import org.springblade.jfpt.healthcode.entity.HealthcodeReturnData;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@AllArgsConstructor
+public class HealthcodeFeign {
+
+ /**
+ * 获取健康码数据集合
+ * @param beanName 调用名称
+ * @param dataName 返回数据名称
+ * @param map map集合数据
+ * @return
+ */
+ @GetMapping("getHealthcodeList")
+ public List<HealthcodeReturnData> getHealthcodeList(String beanName, String dataName, Map<String,Object> map){
+ List<HealthcodeReturnData> list = new ArrayList<>();
+ HealthcodeReturnData healthcodeReturnData = new HealthcodeReturnData();
+ healthcodeReturnData.setType("绿色健康码");
+ healthcodeReturnData.setNum(900);
+ list.add(healthcodeReturnData);
+ //返回数据
+ return list;
+ }
+}
--
Gitblit v1.9.3