Browse Source

允许信息点excel文件

menglu 3 years ago
parent
commit
3aa1385fe9

+ 2 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -875,8 +875,8 @@ public class RWDLoadUtil {
 						JSONObject pointListItem = new JSONObject();
 						pointListItem.put("equipTypeName", equipTypeName);
 						pointListItem.put("infoCode", infoCode);
-						pointListItem.put("isControlParam", infoType.equals("设定参数") ? true : false);
-						pointListItem.put("isRunParam", infoType.equals("运行参数") ? true : false);
+						pointListItem.put("isControlParam", (infoType != null && infoType.equals("设定参数")) ? true : false);
+						pointListItem.put("isRunParam", (infoType != null && infoType.equals("运行参数")) ? true : false);
 						pointListItem.put("isBatchControlParam", (isBatchControlParam != null && isBatchControlParam.equals("Y")) ? true : false);
 						pointListItem.put("isKeyPoint", (isKeyPoint != null && isKeyPoint.equals("Y")) ? true : false);
 						InfoPointListArray.add(pointListItem);