From 18bd3fa8e66cded348f8067b814032e7bc2ffa1d Mon Sep 17 00:00:00 2001 From: "Mr.Wang" Date: Tue, 9 Jul 2024 18:10:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=98=E5=82=A8=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DcEmergencyPlansServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java index c98aab20..6d889df3 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java @@ -900,7 +900,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { } result.put("device", device.getId()); result.put("deviceName", device.getDeviceName()); - result.put("deviceType", deviceType); + result.put("deviceType", device.getDeviceType()); processingDeviceParameters(functionId, functionList, props); @@ -930,7 +930,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { JSONObject result = new JSONObject(); result.put("device", device.getId()); result.put("deviceName", device.getDeviceName()); - result.put("deviceType", deviceType); + result.put("deviceType", device.getDeviceType()); result.put("content", UniversalEnum.RESTORE_LAST_TIME.getValue()); result.put("result", ajaxResult1B); resultArray.add(result); @@ -961,7 +961,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { errorResult.put("device", device.getId()); errorResult.put("content", UniversalEnum.THE_CORRESPONDING_TEMPLATE_CONTENT_IS_NOT_MATCHED.getValue()); errorResult.put("deviceName", device.getDeviceName()); - errorResult.put("deviceType", deviceType); + errorResult.put("deviceType", device.getDeviceType()); JSONObject result = new JSONObject(); result.put("result",errorResult); result.put("code",UniversalEnum.FIVE_HUNDRED.getNumber()); @@ -996,7 +996,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { JSONObject errorResult = new JSONObject(); errorResult.put("device", device.getId()); errorResult.put("deviceName", device.getDeviceName()); - errorResult.put("deviceType", deviceType); + errorResult.put("deviceType", device.getDeviceType()); errorResult.put("content", UniversalEnum.NO_BROADCAST_CONTENT_IS_MATCHED_PROCEDURE.getValue()); JSONObject resu = new JSONObject(); resu.put("code",UniversalEnum.FIVE_HUNDRED.getNumber()); @@ -1020,7 +1020,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { JSONObject result = new JSONObject(); result.put("device", device.getId()); result.put("deviceName", device.getDeviceName()); - result.put("deviceType", deviceType); + result.put("deviceType", device.getDeviceType()); result.put("content", params.get("text")); remark.append(UniversalEnum.RELEASE_VOICE_BROADCAST.getValue());