From 415814e8a20419d8fc6e8fb06b48538c8370960c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 13 May 2021 08:52:02 +0800
Subject: [PATCH] 警情办结，设备状态修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 c1e0564..0f8cf7c 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
@@ -388,7 +388,7 @@
equipment.setHeartbeat(null);
}
- if (equipment.getDtype() != null && equipment.getDtype().equals("")) {
+ if (equipment.getDtype() == null || equipment.getDtype().equals("")) {
equipment.setDtype("0");
}
@@ -415,6 +415,7 @@
// catalogService.updateCatalog(deviceName,deviceNumber,pId);
// }
+
return R.status(equipmentService.saveOrUpdate(equipment));
}
@@ -437,7 +438,7 @@
equipment.setHeartbeat(null);
}
- if (equipment.getDtype() != null && equipment.getDtype().equals("")) {
+ if (equipment.getDtype() == null || equipment.getDtype().equals("")) {
equipment.setDtype("0");
}
--
Gitblit v1.9.3