Browse Source

优化文件上传

zhangqiankun 3 năm trước cách đây
mục cha
commit
c53f25de9e
37 tập tin đã thay đổi với 213 bổ sung286 xóa
  1. 128 6
      src/main/java/com/persagy/proxy/adm/controller/RelationReportController.java
  2. 0 144
      src/main/java/com/persagy/proxy/adm/handler/RelationImportExcelDataHandler.java
  3. 4 12
      src/main/java/com/persagy/proxy/adm/model/AdmRelationObject.java
  4. 3 6
      src/main/java/com/persagy/proxy/adm/strategy/QueryRelationObjectContext.java
  5. 10 7
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/AbstractQueryRelationObject.java
  6. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2BdForRelationObject.java
  7. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2BdRelationObject.java
  8. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqEqBackupRelationObject.java
  9. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqEqNormalRelationObject.java
  10. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqSyBackupRelationObject.java
  11. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqSyNormalRelationObject.java
  12. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2FlForRelationObject.java
  13. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2FlRelationObject.java
  14. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2ShForRelationObject.java
  15. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2SpRelationObject.java
  16. 6 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/QueryRelationObjectStrategy.java
  17. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2BdForRelationObject.java
  18. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2FlForRelationObject.java
  19. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2ShForRelationObject.java
  20. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2SpForRelationObject.java
  21. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2BdForRelationObject.java
  22. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2FlForRelationObject.java
  23. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpConnectRelationObject.java
  24. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpFFCloseRelationObject.java
  25. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpFFOpenRelationObject.java
  26. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpMixMechRelationObject.java
  27. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpNaturalRelationObject.java
  28. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpNormalRelationObject.java
  29. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpOnewayMechRelationObject.java
  30. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpTransparentRelationObject.java
  31. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Ss2EqShipRelationObject.java
  32. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Ss2SpShipRelationObject.java
  33. 2 4
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Ss2SyShipRelationObject.java
  34. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2BdForRelationObject.java
  35. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2FlForRelationObject.java
  36. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2ShForRelationObject.java
  37. 2 3
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2SpForRelationObject.java

+ 128 - 6
src/main/java/com/persagy/proxy/adm/controller/RelationReportController.java

@@ -2,13 +2,22 @@ package com.persagy.proxy.adm.controller;
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,9 +27,10 @@ import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Lists;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
-import com.persagy.proxy.adm.handler.RelationImportExcelDataHandler;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IRelationReportService;
@@ -232,7 +242,7 @@ public class RelationReportController {
 	/************************************************** 文件上传 ***********************************************/
 	
 	/**
-	 * 文件导入
+	 * 文件导入,这里由于需要回写文件,且存储到本地,采用原始POI文件解析、上传、回写、存储
 	 * 
 	 * @param relType
 	 * @param code
@@ -240,24 +250,99 @@ public class RelationReportController {
 	 * @param request
 	 * @param response
 	 */
+	@SuppressWarnings("resource")
 	@RequestMapping("/graphic/import")
 	public AdmResponse importFile(@RequestParam("file") MultipartFile file, @RequestParam String relType, @RequestParam(required = false) String zoneType, 
 			HttpServletRequest request, HttpServletResponse response) {
 		String failure = null;
+		FileOutputStream fileOutputStream = null;
 		try {
 			if (file == null) {
 				return AdmResponse.failure("未选择文件");
 			}
+			
+			int failurNum = 0;
+			int successNum = 0;
+			String graphId = null;
+			// 临时存储行号
+			Set<Integer> rowNums = new HashSet<Integer>();
+			// 批量更新数据
+			List<ObjectNode> relationObjects = new ArrayList<ObjectNode>();
+			
 			String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
 			String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
 			
-			RelationImportExcelDataHandler excelDataHandler = new RelationImportExcelDataHandler(groupCode, projectId, relType, queryRelationObjectContext);
-        	EasyExcel.read(file.getInputStream(), AdmRelationObject.class, excelDataHandler).sheet(EXPORT_SHEET_NAME).doRead();
+			XSSFWorkbook workbook = new XSSFWorkbook(file.getInputStream());
+		    XSSFSheet sheet = workbook.getSheet("关系维护");
+		    // 获取识别码的属性
+		    String code = sheet.getRow(2).getCell(1).toString();
+		    int lastRowNum = sheet.getLastRowNum();
+		    for (int i = 4; i < lastRowNum; i++) {
+		    	XSSFRow xssfRow = sheet.getRow(i);
+		    	if (xssfRow == null) {
+					continue;
+				}
+		    	// 封装cell数据
+		    	XSSFCell masterCodeCell = xssfRow.getCell(0);
+		    	XSSFCell slaveCodeCell = xssfRow.getCell(8);
+		    	XSSFCell masterIdCell = xssfRow.getCell(3);
+		    	XSSFCell slaveIdCell = xssfRow.getCell(11);
+		    	
+		    	AdmRelationObject relationObject = new AdmRelationObject();
+		    	relationObject.setMasterCode(masterCodeCell == null ? null : masterCodeCell.getStringCellValue());
+		    	relationObject.setSlaveCode(slaveCodeCell == null ? null : slaveCodeCell.getStringCellValue());
+		    	relationObject.setMasterId(masterIdCell == null ? null : masterIdCell.getStringCellValue());
+		    	relationObject.setSlaveId(slaveIdCell == null ? null : slaveIdCell.getStringCellValue());
+		    	
+		    	// 校验数据
+				Object result = this.queryRelationObjectContext.checkRelationObject(relationObject, groupCode, projectId, relType, code);
+				if (result instanceof String) {
+					failurNum++;
+					xssfRow.createCell(16).setCellValue((String)result);
+					continue;
+				}
+				ObjectNode relation = (ObjectNode) result;
+				graphId = relation.get("graphId") == null ? graphId : relation.get("graphId").asText();
+				
+				// 每一千条数据,批量新增一次
+				rowNums.add(i);
+				relationObjects.add(relation);
+				if (relationObjects.size() >= 1000) {
+					boolean objects = this.queryRelationObjectContext.saveRelationObjects(relationObjects, groupCode, projectId, relType);
+					if (objects) {
+						successNum += relationObjects.size();
+					} else {
+						failurNum += relationObjects.size();
+						for (int rowNum : rowNums) {
+							sheet.getRow(rowNum).createCell(16).setCellValue("调用中台,存储失败");
+						}
+					}
+					rowNums.clear();
+					relationObjects.clear();
+				}
+			}
+		    
+        	try {
+        		// 调用中台存储完成之后,此文件存储至本地
+        		String uploadFile = projectId + AdmCommonConstant.LINE_THROUGH + relType + AdmCommonConstant.EXCEL_SUFFIX_XLSX;
+        		File templateFile = this.createTemplateFile(uploadFile);
+        		fileOutputStream = new FileOutputStream(templateFile);
+        		workbook.write(fileOutputStream);
+			} catch (Exception e) {
+				log.error("文件存储失败", e);
+			}
         	
-        	return AdmResponse.success(Lists.newArrayList(excelDataHandler.afterWriteObject()));
+        	return AdmResponse.success(Lists.newArrayList(this.getImportResult(graphId, successNum, failurNum)));
 		} catch (Exception e) {
 			log.error("文件导入失败", e);
 			failure = e.getMessage();
+		} finally {
+			if (fileOutputStream != null) {
+				try {
+					fileOutputStream.flush();
+					fileOutputStream.close();
+				} catch (IOException e) {}
+			}
 		}
 		return AdmResponse.failure(failure);
 	}
@@ -265,7 +350,7 @@ public class RelationReportController {
 	
 	
 	
-	/************************************************** 本地文件获取 ***********************************************/
+	/************************************************** 本地文件获取、创建 ***********************************************/
 	
 	
 	/**
@@ -310,5 +395,42 @@ public class RelationReportController {
 		}
 		return file;
 	}
+	
+	/**
+	 * 创建本地文件,这里不再在classpath下创建
+	 * 
+	 * @param uploadFile 文件名称,带后缀
+	 * @throws IOException 
+	 */
+	private File createTemplateFile(String uploadFile) throws IOException {
+		String path = AdmCommonConstant.SERVER_ROOT_PATH + "/template/" + uploadFile;
+		File file = new File(path);
+		if (file == null || !file.exists()) {
+			file.createNewFile();
+		}
+		return file;
+	}
+	
+	/**
+	 * 获取导入结果
+	 * 
+	 * @return
+	 */
+	private JSONObject getImportResult(String graphId, int successNum, int failureNum) {
+		JSONObject result = new JSONObject();
+		result.put("relationType", graphId);
+		result.put("successCount", successNum);
+		result.put("failCount", failureNum);
+		String state = null;
+        if (successNum > 0 && failureNum > 0) {
+        	state = "1";
+        } else if (successNum > 0 && failureNum == 0) {
+            state = "0";
+        } else {
+            state = "2";
+        }
+        result.put("state", state);
+		return result;
+	}
 
 }

+ 0 - 144
src/main/java/com/persagy/proxy/adm/handler/RelationImportExcelDataHandler.java

@@ -1,144 +0,0 @@
-package com.persagy.proxy.adm.handler;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import com.alibaba.excel.metadata.CellData;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.dmp.common.helper.SpringHelper;
-import com.persagy.proxy.adm.model.AdmRelationObject;
-import com.persagy.proxy.adm.strategy.QueryRelationObjectContext;
-
-import cn.hutool.core.collection.CollectionUtil;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 传感器数据导入, 此类不能被spring管理,要每次读取excel都要new
- * 
- * @version v1.0.0
- * @company persagy
- * @author zhangqiankun
- * @date 2020-11-25 19:52:37
- */
-@Slf4j
-@SuppressWarnings("unchecked")
-public class RelationImportExcelDataHandler extends AnalysisEventListener<AdmRelationObject> {
-	
-	private final String groupCode;
-	
-	private final String projectId;
-	
-	private final String relType;
-	
-	private String code;
-	
-	private final ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
-	
-	private final QueryRelationObjectContext queryRelationObjectContext;
-	
-	/** 失败信息描述*/
-	private Map<Integer, String> failureMap = new HashMap<Integer, String>(256);
-	
-	private String graphId;		// 图类型ID
-	
-	private int failureNum = 0;
-	
-	private int successNum = 0;
-	
-
-	/**
-	 * 上传的数据
-	 */
-	private List<ObjectNode> relationObjects = new ArrayList<ObjectNode>();
-	
-	public RelationImportExcelDataHandler(String groupCode, String projectId, String relType, QueryRelationObjectContext queryRelationObjectContext) {
-		this.relType = relType;
-		this.groupCode = groupCode;
-		this.projectId = projectId;
-		this.queryRelationObjectContext = queryRelationObjectContext;
-	}
-	
-	/**
-	 * 每一条数据解析都会来调用
-	 * 
-	 * @param data one row value {@link AnalysisContext#readRowHolder()}
-	 * @param context
-	 */
-	@Override
-	public void invoke(AdmRelationObject data, AnalysisContext context) {
-		// 数据不可为空校验
-		int rowIndex = context.readRowHolder().getRowIndex();
-		if (rowIndex == 2 && code == null) {
-			CellData<String> cell = (CellData<String>)context.readRowHolder().getCellMap().get(1);
-			code = cell.getStringValue();
-		}
-		// 数据校验
-		ObjectNode objectNode = this.objectMapper.createObjectNode();
-		String checkResult = this.queryRelationObjectContext.checkRelationObject(objectNode, data, groupCode, projectId, relType, code);
-		if (checkResult != null) {
-			this.failureMap.put(rowIndex, checkResult);
-			return;
-		}
-		this.graphId = objectNode.get("graphId") == null ? graphId : objectNode.get("graphId").asText();
-		
-		// 批量插入
-		relationObjects.add(objectNode);
-		if (relationObjects.size() >= 1000) {
-			boolean saveRelationObjects = this.queryRelationObjectContext.saveRelationObjects(relationObjects, groupCode, projectId, relType);
-			if (saveRelationObjects) {
-				successNum += relationObjects.size();
-			} else {
-				failureNum += relationObjects.size();
-			}
-			relationObjects.clear();
-		}
-	}
-
-	/**
-	 * 所有数据解析完成了都会来调用,在这里进行数据存储,可确保最后遗留的数据也被存储到数据库
-	 * 
-	 * @param context
-	 */
-	@Override
-	public void doAfterAllAnalysed(AnalysisContext context) {
-		if (CollectionUtil.isNotEmpty(relationObjects)) {
-			boolean saveRelationObjects = this.queryRelationObjectContext.saveRelationObjects(relationObjects, groupCode, projectId, relType);
-			if (saveRelationObjects) {
-				successNum += relationObjects.size();
-			} else {
-				failureNum += relationObjects.size();
-			}
-			relationObjects.clear();
-		}
-		log.info("集团: {},项目: {},类型:{},关系数据导入成功,", groupCode, projectId, relType);
-	}
-
-	/**
-	 * 数据写入完成后,可以通过此方法获取部分信息
-	 * 
-	 * @return
-	 */
-	public JSONObject afterWriteObject() {
-		JSONObject result = new JSONObject();
-		result.put("relationType", graphId);
-		result.put("successCount", successNum);
-		result.put("failCount", failureNum);
-		String state = null;
-        if (successNum > 0 && failureNum > 0) {
-        	state = "1";
-        } else if (successNum > 0 && failureNum == 0) {
-            state = "0";
-        } else {
-            state = "2";
-        }
-        result.put("state", state);
-		return result;
-	}
-	
-}

+ 4 - 12
src/main/java/com/persagy/proxy/adm/model/AdmRelationObject.java

@@ -69,6 +69,10 @@ public class AdmRelationObject {
 	@ExcelProperty(value = "所属建筑楼层", index = 15)
 	private String slaveBelong;
 	
+	// 失败原因
+	@ExcelProperty(index = 16)
+	private String failureMsg;			// 失败原因
+	
 	@ExcelIgnore
 	private String masterBuildingName;	// 建筑本地名称
 
@@ -81,16 +85,4 @@ public class AdmRelationObject {
 	@ExcelIgnore
 	private String slaveFloorName;		// 楼层本地名称
 	
-	@ExcelIgnore
-	private String graphId;				// 图类型ID
-	
-	@ExcelIgnore
-	private String graphCode;			// 图类型编码
-	
-	@ExcelIgnore
-	private String relCode;				// 边类型编码
-	
-	@ExcelIgnore
-	private String relVaue;				// 关系值
-
 }

+ 3 - 6
src/main/java/com/persagy/proxy/adm/strategy/QueryRelationObjectContext.java

@@ -12,8 +12,6 @@ import com.google.common.collect.Lists;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 import com.persagy.proxy.adm.strategy.relationdata.QueryRelationObjectStrategy;
 
-import cn.hutool.core.util.StrUtil;
-
 /**
  * 获取关系对象的上下文类
  * 
@@ -59,16 +57,15 @@ public class QueryRelationObjectContext {
 	 * @param relationObject 当前需要校验的对象
 	 * @param relType ADM-类型
 	 * @param code 获取对象的依据
-	 * @return null - 检验通过,not null - 校验不通过,并返回原因
+	 * @return String - 校验失败的原因, ObjectNode -- BDTP接口的参数,不会返回null,请用instanceOf 判断返回值
 	 */
-	public String checkRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode, String projectId, String relType, String code) {
+	public Object checkRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String relType, String code) {
 		QueryRelationObjectStrategy strategy = this.relationObjectStrategyMap.get(relType);
 		if (strategy == null) {
 			return "不存在此策略类";
 		}
 		
-		String result = strategy.beforeSaveRelationObject(objectNode, relationObject, groupCode, projectId, code);
-		return StrUtil.isBlank(result) ? null : result;
+		return strategy.beforeSaveRelationObject(relationObject, groupCode, projectId, code);
 	}
 	
 	/**

+ 10 - 7
src/main/java/com/persagy/proxy/adm/strategy/relationdata/AbstractQueryRelationObject.java

@@ -160,9 +160,9 @@ public abstract class AbstractQueryRelationObject implements QueryRelationObject
 	 * @param relationObject
 	 * @param relationTypeEnum AdmRelationTypeEnum枚举类
 	 * @param code
-	 * @return 当为null时,检查通过,否则失败,返回失败原因
+	 * @return String - 校验失败的原因, ObjectNode -- BDTP接口的参数,不会返回null,请用instanceOf 判断返回值
 	 */
-	protected String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, AdmRelationTypeEnum relationTypeEnum,
+	protected Object beforeSaveRelationObject(AdmRelationObject relationObject, AdmRelationTypeEnum relationTypeEnum,
 			String groupCode, String projectId, String code) {
 		if (!StrUtil.isAllNotBlank(relationObject.getMasterCode(), relationObject.getSlaveCode())) {
 			return "主对象或从对象的识别编码为空";
@@ -204,19 +204,22 @@ public abstract class AbstractQueryRelationObject implements QueryRelationObject
 		String masterClassCode = master.get("classCode") == null ? AdmCommonConstant.EMPTY : master.get("classCode").asText();
 		String slaveClassCode = slave.get("classCode") == null ? AdmCommonConstant.EMPTY : slave.get("classCode").asText();
 		
-		if (objectNode != null) {
+		String result = this.checkRelationObject(master, masterClassCode, slave, slaveClassCode);
+		if (StrUtil.isBlank(result)) {
+			ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 			String graphCode = relationTypeEnum.getGraphCode();
 			objectNode.put("graphId", "Gt" + graphCode + "001");
 			objectNode.put("graphCode", graphCode);
 			objectNode.put("relCode", relCode);
 			if ("Sp".equals(relCodePrefix)) {
-				relationObject.setRelVaue(masterClassCode);
+				objectNode.put("relValue", masterClassCode);
 			}
-			objectNode.put("objFrom", master.get("id").asText());
-			objectNode.put("objTo", slave.get("id").asText());
+			objectNode.put("objFrom", relationObject.getMasterId());
+			objectNode.put("objTo", relationObject.getSlaveId());
+			return objectNode;
 		}
 		
-		return this.checkRelationObject(master, masterClassCode, slave, slaveClassCode);
+		return result; 
 	} 
 	
 	/**

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2BdForRelationObject.java

@@ -95,9 +95,8 @@ public class Eq2BdForRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2BD_FOR, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2BD_FOR, groupCode, projectId, code);
 	}
 
 }

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2BdRelationObject.java

@@ -86,9 +86,8 @@ public class Eq2BdRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2BD, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2BD, groupCode, projectId, code);
 	}
 
 }

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqEqBackupRelationObject.java

@@ -38,10 +38,8 @@ public class Eq2EqEqBackupRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_2,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_2, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqEqNormalRelationObject.java

@@ -38,10 +38,8 @@ public class Eq2EqEqNormalRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_1,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_1, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqSyBackupRelationObject.java

@@ -38,10 +38,8 @@ public class Eq2EqSyBackupRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_4,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_4, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2EqSyNormalRelationObject.java

@@ -38,10 +38,8 @@ public class Eq2EqSyNormalRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_3,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_3, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2FlForRelationObject.java

@@ -96,9 +96,8 @@ public class Eq2FlForRelationObject extends AbstractQueryRelationObject {
 	}
 	
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2FL_FOR, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2FL_FOR, groupCode, projectId, code);
 	}
 
 }

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2FlRelationObject.java

@@ -80,9 +80,8 @@ public class Eq2FlRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2FL, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2FL, groupCode, projectId, code);
 	}
 	
 }

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2ShForRelationObject.java

@@ -95,9 +95,8 @@ public class Eq2ShForRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2SH_FOR, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2SH_FOR, groupCode, projectId, code);
 	}
 	
 }

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Eq2SpRelationObject.java

@@ -75,9 +75,8 @@ public class Eq2SpRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2SP_IN, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2SP_IN, groupCode, projectId, code);
 	}
 	
 }

+ 6 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/QueryRelationObjectStrategy.java

@@ -4,7 +4,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.proxy.adm.model.AdmRelationObject;
 
 /**
@@ -20,6 +22,8 @@ public interface QueryRelationObjectStrategy {
 	
 	String OBJ_TYPE = "objType";
 	
+	ObjectMapper OBJECT_MAPPER = SpringHelper.getBean(ObjectMapper.class);
+	
 	Map<String, String> OBJNAME_2_TYPE = new HashMap<String,String>(){
 		private static final long serialVersionUID = 1L;
 		{
@@ -43,14 +47,13 @@ public interface QueryRelationObjectStrategy {
 	/**
 	 * 保存之前校验数据的合法性
 	 * 
-	 * @param objectNode 校验通过后为其赋予必要的值
 	 * @param relationObject 需要校验的对象
 	 * @param groupCode
 	 * @param projectId
 	 * @param code 参考 OBJNAME_2_TYPE
-	 * @return null - 校验通过,否则-失败原因
+	 * @return String - 校验失败的原因, ObjectNode -- BDTP接口的参数,不会返回null,请用instanceOf 判断返回值
 	 */
-	String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode, String projectId, String code);
+	Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code);
 
 	/**
 	 * 批量保存对象之间的关系

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2BdForRelationObject.java

@@ -75,9 +75,8 @@ public class Sh2BdForRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SH2BD_ARCHFORARCH, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SH2BD_ARCHFORARCH, groupCode, projectId, code);
 	}
 	
 }

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2FlForRelationObject.java

@@ -83,9 +83,8 @@ public class Sh2FlForRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SH2FL_ARCHFORARCH, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SH2FL_ARCHFORARCH, groupCode, projectId, code);
 	}
 	
 }

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2ShForRelationObject.java

@@ -75,8 +75,7 @@ public class Sh2ShForRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SH2SH_ARCHFORARCH, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SH2SH_ARCHFORARCH, groupCode, projectId, code);
 	}
 }

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sh2SpForRelationObject.java

@@ -95,9 +95,8 @@ public class Sh2SpForRelationObject extends AbstractQueryRelationObject {
 	}
 	
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SH2SP_ARCHFORARCH, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SH2SP_ARCHFORARCH, groupCode, projectId, code);
 	}
 
 }

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2BdForRelationObject.java

@@ -93,9 +93,8 @@ public class Sp2BdForRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SP2BD_ARCHFORARCH, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SP2BD_ARCHFORARCH, groupCode, projectId, code);
 	}
 	
 }

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2FlForRelationObject.java

@@ -95,9 +95,8 @@ public class Sp2FlForRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SP2FL_ARCHFORARCH, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SP2FL_ARCHFORARCH, groupCode, projectId, code);
 	}
 	
 }

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpConnectRelationObject.java

@@ -38,10 +38,8 @@ public class Sp2SpConnectRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_2,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_2, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpFFCloseRelationObject.java

@@ -38,10 +38,8 @@ public class Sp2SpFFCloseRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_3,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_3, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpFFOpenRelationObject.java

@@ -38,10 +38,8 @@ public class Sp2SpFFOpenRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_2,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_2, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpMixMechRelationObject.java

@@ -38,10 +38,8 @@ public class Sp2SpMixMechRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_2,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_2, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpNaturalRelationObject.java

@@ -38,10 +38,8 @@ public class Sp2SpNaturalRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_1,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_1, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpNormalRelationObject.java

@@ -38,10 +38,8 @@ public class Sp2SpNormalRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_1,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_1, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpOnewayMechRelationObject.java

@@ -38,10 +38,8 @@ public class Sp2SpOnewayMechRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_3,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_3, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sp2SpTransparentRelationObject.java

@@ -38,10 +38,8 @@ public class Sp2SpTransparentRelationObject extends AbstractQueryRelationObject
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_1,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_1, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Ss2EqShipRelationObject.java

@@ -39,10 +39,8 @@ public class Ss2EqShipRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2EQ_SENSORRELATIONSHIP_SS2EQ,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2EQ_SENSORRELATIONSHIP_SS2EQ, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Ss2SpShipRelationObject.java

@@ -39,10 +39,8 @@ public class Ss2SpShipRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2SP_SENSORRELATIONSHIP_SS2SP,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2SP_SENSORRELATIONSHIP_SS2SP, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 4
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Ss2SyShipRelationObject.java

@@ -39,10 +39,8 @@ public class Ss2SyShipRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.EQ2SY_SENSORRELATIONSHIP_SS2SY,
-				groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.EQ2SY_SENSORRELATIONSHIP_SS2SY, groupCode, projectId, code);
 	}
 
 	@Override

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2BdForRelationObject.java

@@ -75,9 +75,8 @@ public class Sy2BdForRelationObject extends AbstractQueryRelationObject {
 	}
 	
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SY2BD_FOR, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SY2BD_FOR, groupCode, projectId, code);
 	}
 
 }

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2FlForRelationObject.java

@@ -84,9 +84,8 @@ public class Sy2FlForRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SY2FL_FOR, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SY2FL_FOR, groupCode, projectId, code);
 	}
 	
 }

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2ShForRelationObject.java

@@ -75,9 +75,8 @@ public class Sy2ShForRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SY2SH_FOR, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SY2SH_FOR, groupCode, projectId, code);
 	}
 	
 }

+ 2 - 3
src/main/java/com/persagy/proxy/adm/strategy/relationdata/Sy2SpForRelationObject.java

@@ -96,9 +96,8 @@ public class Sy2SpForRelationObject extends AbstractQueryRelationObject {
 	}
 
 	@Override
-	public String beforeSaveRelationObject(ObjectNode objectNode, AdmRelationObject relationObject, String groupCode,
-			String projectId, String code) {
-		return this.beforeSaveRelationObject(objectNode, relationObject, AdmRelationTypeEnum.SY2SP_FOR, groupCode, projectId, code);
+	public Object beforeSaveRelationObject(AdmRelationObject relationObject, String groupCode, String projectId, String code) {
+		return this.beforeSaveRelationObject(relationObject, AdmRelationTypeEnum.SY2SP_FOR, groupCode, projectId, code);
 	}
 	
 }