From 13efa665ef67f62d0e8e5d6aade5f79ebff5187d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 20 May 2021 10:52:20 +0800
Subject: [PATCH] 视频录制修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index 9e5a85b..abcc748 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -387,6 +387,11 @@
if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
equipment.setHeartbeat(null);
}
+
+ if (equipment.getDtype() == null || equipment.getDtype().equals("")) {
+ equipment.setDtype("0");
+ }
+
//判断省市区的值是否为数字或者中文字符串
if(null!=equipment.getProvince()){
//如果不是数字，则需调用接口匹配数据(直接取区、县参数)
@@ -410,6 +415,7 @@
// catalogService.updateCatalog(deviceName,deviceNumber,pId);
// }
+
return R.status(equipmentService.saveOrUpdate(equipment));
}
@@ -430,6 +436,10 @@
if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
equipment.setHeartbeat(null);
+ }
+
+ if (equipment.getDtype() == null || equipment.getDtype().equals("")) {
+ equipment.setDtype("0");
}
// String deviceName = equipment.getDeviceName();
@@ -549,4 +559,14 @@
return R.data(map);
}
+ /**
+ * 监控台统计
+ * @author arsn 2021-5-6
+ * @return
+ */
+ @PostMapping("/SeleCs")
+ public R SeleCs() {
+ return R.data(equipmentService.selEqTypeSum());
+ }
+
}
--
Gitblit v1.9.3