ReliabilitySimulation.git

			@@ -1226,6 +1226,7 @@
			List<ModelNode> modelNodeList,
			List<ModelLine> modelLineList,
			List<ProductImg> productImgList) {
			Object jsonValue = null;
			for (int i = 0; i < rbdJsonArray.size(); i++) {
			JSONObject jsonObject = rbdJsonArray.getJSONObject(i);
			String shape = jsonObject.get("shape").toString();
			@@ -1245,39 +1246,45 @@
			modelNode.setNodeType(JsonUtils2.getJsonValueByPath(jsonObject, "data/nodeType".split("/")).toString());
			modelNode.setPositionX(Double.valueOf(JsonUtils2.getJsonValueByPath(jsonObject, "position/x".split("/")).toString()));
			modelNode.setPositionY(Double.valueOf(JsonUtils2.getJsonValueByPath(jsonObject, "position/y".split("/")).toString()));
			Object voteNum = JsonUtils2.getJsonValueByPath(jsonObject, "data/voteNum".split("/"));
			if (voteNum!=null && StringUtils.isNotBlank(voteNum.toString())) {
			modelNode.setVoteNum(Integer.valueOf(voteNum.toString()));
			jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/voteNum".split("/"));
			if (jsonValue!=null && StringUtils.isNotBlank(jsonValue.toString())) {
			modelNode.setVoteNum(Integer.valueOf(jsonValue.toString()));
			}
			if ("node".equals(modelNode.getNodeType())) {
			ProductImg productImg = new ProductImg();
			String dataId = JsonUtils2.getJsonValueByPath(jsonObject, "data/dataId".split("/")).toString();
			modelNode.setDataId(Long.valueOf(dataId));
			modelNode.setNodeTypeExt(JsonUtils2.getJsonValueByPath(jsonObject, "data/nodeTypeExt".split("/")).toString());
			Object name = JsonUtils2.getJsonValueByPath(jsonObject, "attrs/text/text".split("/"));
			modelNode.setName(name==null ? "" : name.toString());
			jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "attrs/text/text".split("/"));
			modelNode.setName(jsonValue==null ? "" : jsonValue.toString());

			productImg.setDataId(dataId);
			String productType = JsonUtils2.getJsonValueByPath(jsonObject, "data/productType".split("/")).toString();
			productImg.setProductType(productType);
			if ("product_sb".equals(productType)) {
			Object obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/reliabDistribType".split("/"));
			if (obj != null && StringUtils.isNotBlank(obj.toString())) {
			productImg.setReliabDistribType(Integer.valueOf(obj.toString()));
			jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/reliabDistribType".split("/"));
			if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
			productImg.setReliabDistribType(Integer.valueOf(jsonValue.toString()));
			}
			productImg.setTaskMtbcf(JsonUtils2.getJsonValueByPath(jsonObject, "data/taskMtbcf".split("/")).toString());
			productImg.setTaskMtbcfOther(JsonUtils2.getJsonValueByPath(jsonObject, "data/taskMtbcfOther".split("/")).toString());
			obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/isRepair".split("/"));
			if (obj != null && StringUtils.isNotBlank(obj.toString())) {
			productImg.setIsRepair(Integer.valueOf(obj.toString()));
			jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/taskMtbcfOtherParams2".split("/"));
			if (null != jsonValue) productImg.setTaskMtbcfOtherParams2(jsonValue.toString());
			jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/taskMtbcfOtherParams3".split("/"));
			if (null != jsonValue) productImg.setTaskMtbcfOtherParams3(jsonValue.toString());
			jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/isRepair".split("/"));
			if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
			productImg.setIsRepair(Integer.valueOf(jsonValue.toString()));
			}
			if (1 == productImg.getIsRepair()) {
			obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/repairDistribType".split("/"));
			if (obj != null && StringUtils.isNotBlank(obj.toString())) {
			productImg.setRepairDistribType(Integer.valueOf(obj.toString()));
			jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/repairDistribType".split("/"));
			if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
			productImg.setRepairDistribType(Integer.valueOf(jsonValue.toString()));
			}
			productImg.setRepairMttcr(JsonUtils2.getJsonValueByPath(jsonObject, "data/repairMttcr".split("/")).toString());
			productImg.setRepairMttcrOther(JsonUtils2.getJsonValueByPath(jsonObject, "data/repairMttcrOther".split("/")).toString());
			jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/repairMttcrOtherParams2".split("/"));
			if (null != jsonValue) productImg.setRepairMttcrOtherParams2(jsonValue.toString());
			jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/repairMttcrOtherParams3".split("/"));
			if (null != jsonValue) productImg.setRepairMttcrOtherParams3(jsonValue.toString());
			}
			}
			productImgList.add(productImg);

	modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ProductImg.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java	39 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -47,7 +47,9 @@
			@TableField(exist = false)
			private String taskMtbcf;
			@TableField(exist = false)
			private String taskMtbcfOther;
			private String taskMtbcfOtherParams2;
			@TableField(exist = false)
			private String taskMtbcfOtherParams3;

			@TableField(exist = false)
			private String svgContent;
			@@ -59,6 +61,8 @@
			@TableField(exist = false)
			private String RepairMttcr;
			@TableField(exist = false)
			private String RepairMttcrOther;
			private String RepairMttcrOtherParams2;
			@TableField(exist = false)
			private String RepairMttcrOtherParams3;

			}