|
@@ -129,9 +129,10 @@ public class AmsHexdefineDetailServiceImpl implements IAmsHexdefineDetailService
|
|
|
//如果是数字需要进行转换
|
|
|
if (basTask.getValType() == 2) {
|
|
|
if (StringUtils.isEmpty(amsTask.getStr(basTask.getColVal()))) {
|
|
|
- continue;
|
|
|
+ sb.append(String.format("%04X", Integer.parseInt("0")));
|
|
|
+ }else {
|
|
|
+ sb.append(String.format("%04X", Integer.parseInt(amsTask.getStr(basTask.getColVal()))));
|
|
|
}
|
|
|
- sb.append(String.format("%04X", Integer.parseInt(amsTask.getStr(basTask.getColVal()))));
|
|
|
} else {
|
|
|
sb.append(basTask.getColVal());
|
|
|
}
|
|
@@ -140,21 +141,20 @@ public class AmsHexdefineDetailServiceImpl implements IAmsHexdefineDetailService
|
|
|
if (basTask.getValType() == 1) {
|
|
|
//如果是数字需要进行转换,Priority为2位其余4位
|
|
|
if (basTask.getColName().equals("Priority")) {
|
|
|
- if (StringUtils.isEmpty(amsTask.getStr(basTask.getColVal()))) {
|
|
|
- continue;
|
|
|
- }
|
|
|
sb.append(String.format("%02X", Integer.parseInt(amsTask.getStr(basTask.getColVal()))+ 0x80));
|
|
|
}else {
|
|
|
if (StringUtils.isEmpty(amsTask.getStr(basTask.getColVal()))) {
|
|
|
- continue;
|
|
|
+ sb.append(String.format("%04X", Integer.parseInt("0")));
|
|
|
+ }else {
|
|
|
+ sb.append(String.format("%04X", Integer.parseInt(amsTask.getStr(basTask.getColVal()))));
|
|
|
}
|
|
|
- sb.append(String.format("%04X", Integer.parseInt(amsTask.getStr(basTask.getColVal()))));
|
|
|
}
|
|
|
} else {
|
|
|
if (StringUtils.isEmpty(amsTask.getStr(basTask.getColVal()))) {
|
|
|
- continue;
|
|
|
+ sb.append("0000");
|
|
|
+ }else {
|
|
|
+ sb.append(amsTask.getStr(basTask.getColVal()));
|
|
|
}
|
|
|
- sb.append(amsTask.getStr(basTask.getColVal()));
|
|
|
}
|
|
|
}
|
|
|
}
|