From 5ee338a5e19319386f2f6298d22a8e4ac96dc7cb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 15:24:42 +0800
Subject: [PATCH] 1.设备故障状态合并到设备状态中,设备状态接口修改 2.警情处理完成后修改设备状态为正常,修改警情处理接口

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
index aa190c5..24d78b1 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -31,6 +31,7 @@
 import org.springblade.system.cache.SysCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -183,9 +184,23 @@
 		baseMapper.updateexpireTime(expireTime,deviceNumber);
 	}
 
+	/**
+	 * 修改设备状态  2021-5-6 arsn修改
+	 * @param state 设备状态
+	 * @param reason 原因
+	 * @param deviceNumber 设备编号
+	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void updateExstate(String state, String reason, String deviceNumber) {
-		baseMapper.updateExstate(state, reason, deviceNumber);
+		if(state.equals("系统故障")){
+			String dType = "3";
+			baseMapper.updateExstate(dType, reason, deviceNumber);
+		}
+		if(state.equals("处理完成")){
+			String dType = "1";
+			baseMapper.updateExstate(dType, reason, deviceNumber);
+		}
 	}
 
 	@Override

--
Gitblit v1.9.3