From 7b3fb2ea4eb3c8539ce3019bfafacb7ca3b21096 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Tue, 02 Mar 2021 10:06:13 +0800
Subject: [PATCH] 1.目录树调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java | 1 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java | 5 +++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 4 +++-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml | 4 ++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java | 1 +
5 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
index 1e85d35..0c2c6a1 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
@@ -40,4 +40,5 @@
List<Map<String, Object>> selectCatalogEqNUmber();
List<catalogVO> lazyTree(String tenantId, Long parentId);
+ void updateCatalog(String name, String eqid);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
index 3e93c3c..d563fde 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
@@ -106,4 +106,8 @@
</if>
</select>
+ <update id="updateCatalog">
+ update sys_catalog SET name=#{name} where eqid=#{eqid}
+</update>
+
</mapper>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java
index a949f1a..faf8583 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java
@@ -37,4 +37,5 @@
List<Map<String, Object>> selectEq();
List<Map<String, Object>> selectWar(String beginTime,String endTime);
List<catalogVO> lazyTree(String tenantId, Long parentId);
+ void updateCatalog(String name, String eqid);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
index 06320c6..00d3e5c 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
@@ -70,4 +70,9 @@
public List<catalogVO> lazyTree(String tenantId, Long parentId) {
return baseMapper.lazyTree(tenantId, parentId);
}
+
+ @Override
+ public void updateCatalog(String name, String eqid) {
+ baseMapper.updateCatalog(name, eqid);
+ }
}
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 a2927d6..839243f 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
@@ -343,7 +343,9 @@
if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
equipment.setHeartbeat(null);
}
-
+ String deviceName = equipment.getDeviceName();
+ String deviceNumber = equipment.getDeviceNumber();
+ catalogService.updateCatalog(deviceName,deviceNumber);
return R.status(equipmentService.saveOrUpdate(equipment));
}
--
Gitblit v1.9.3