|
...
|
...
|
@@ -130,15 +130,28 @@ public class DeviceCommandListenServiceImpl implements DeviceCommandServiceFacto |
|
|
|
*/
|
|
|
|
private String reverseKey(String number, String dataIdentifier)
|
|
|
|
{
|
|
|
|
String[] arr = number.split("_");
|
|
|
|
if (arr.length < 3) {
|
|
|
|
return null;
|
|
|
|
String area = "A"; // A
|
|
|
|
String mappedNumber = "0"; // 09
|
|
|
|
String index = "0"; // 1
|
|
|
|
String probe = null; // 探头编号(如果有)
|
|
|
|
|
|
|
|
if("0".equals(number))
|
|
|
|
{
|
|
|
|
area = "A";
|
|
|
|
mappedNumber = "0";
|
|
|
|
index = "0";
|
|
|
|
}else{
|
|
|
|
String[] arr = number.split("_");
|
|
|
|
if (arr.length < 3) {
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
area = arr[0]; // A
|
|
|
|
mappedNumber = arr[1]; // 09
|
|
|
|
index = arr[2]; // 1
|
|
|
|
probe = arr.length > 3 ? arr[3] : null; // 探头编号(如果有)
|
|
|
|
}
|
|
|
|
|
|
|
|
String area = arr[0]; // A
|
|
|
|
String mappedNumber = arr[1]; // 09
|
|
|
|
String index = arr[2]; // 1
|
|
|
|
String probe = arr.length > 3 ? arr[3] : null; // 探头编号(如果有)
|
|
|
|
|
|
|
|
// 反向查找设备类型(identifier)
|
|
|
|
String identifier = getIdentifierByMappedNumber(mappedNumber);
|
...
|
...
|
|