From 284a9a6b482347a9fe65223a3280421d6a65e2e4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 08 May 2021 11:37:17 +0800
Subject: [PATCH] 1.处警队伍列表接口修改 2.近一周警情接口修改，返回一键求助 3.报警设备报警时bug修复，新增判断接警员的在线状态和工作状态是否为空
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
index cb4660d..ebd565a 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
@@ -12,6 +12,8 @@
import org.springblade.jfpt.parcel.service.ParcelService;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -195,6 +197,21 @@
ConditionVo conditionVo = getConditionVo(map);
//查询数据并返回数据
List<ParcelExcel> parcelExcels = parcelService.exportParcel(conditionVo);
+// 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);
+// try {
+// int time = 9000;
+// System.out.println("休眠时间 = " + time);
+// Thread.sleep(time);
+// } catch (InterruptedException e) {
+// e.printStackTrace();
+// }
return parcelExcels;
}
--
Gitblit v1.9.3