mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改设备类型存储格式

develop
Mr.Wang 9 months ago
parent
d2c92b30be
commit
18bd3fa8e6
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java

10
zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java
View File

@ -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());

Write Preview
Loading…
Cancel
Save