From c7d05af4e7ebf92b67308df21bde17282c0c50f1 Mon Sep 17 00:00:00 2001 From: Administrator <admin> Date: Thu, 06 May 2021 21:44:06 +0800 Subject: [PATCH] 1.警情导出bug修复 2.警情统计接口修改 3.一键报警设备接收报文时修改设备状态 --- blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) 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 38418b0..38042d5 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 @@ -22,6 +22,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; +import org.springblade.common.entity.HealthcodeExcel; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; @@ -29,11 +30,8 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springblade.jfpt.alarm.vo.AlarmExcel; -import org.springblade.jfpt.alarm.vo.AlarmVO; import org.springblade.jfpt.healthcode.entity.Healthcode; import org.springblade.jfpt.healthcode.service.IhealthcodeService; -import org.springblade.jfpt.healthcode.vo.HealthcodeExcel; import org.springblade.jfpt.healthcode.vo.HealthcodeVO; import org.springblade.jfpt.healthcode.wrapper.healthcodeWrapper; import org.springframework.web.bind.annotation.*; -- Gitblit v1.9.3