From 39abbde096789b2f64e8060156f7c569d2a3e845 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 12 May 2021 14:15:54 +0800
Subject: [PATCH] 设备新增逻辑调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 fa578b5..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
@@ -239,7 +239,6 @@
List<DeptVo> deptVos = deptFeignApi.selDeptList();
//获取设备数据信息
IPage<EquipmentVO> page = equipmentService.selectDeptPages(Condition.getPage(query), equipment, pid, dxtype);
- System.out.println("page = " + page);
//遍历数据
for (int j = 0; j < page.getRecords().size(); j++) {
if (null!=page.getRecords().get(j).getDeptId()){
@@ -388,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()){
//如果不是数字，则需调用接口匹配数据(直接取区、县参数)
@@ -411,6 +415,7 @@
// catalogService.updateCatalog(deviceName,deviceNumber,pId);
// }
+
return R.status(equipmentService.saveOrUpdate(equipment));
}
@@ -433,6 +438,10 @@
equipment.setHeartbeat(null);
}
+ if (equipment.getDtype() == null || equipment.getDtype().equals("")) {
+ equipment.setDtype("0");
+ }
+
// String deviceName = equipment.getDeviceName();
// String deviceNumber = equipment.getDeviceNumber();
// String pId = equipment.getPid();
--
Gitblit v1.9.3