diff --git a/src/main/java/com/spring/modules/Tooling/data/IfsToolData.java b/src/main/java/com/spring/modules/Tooling/data/IfsToolData.java index 4487b533..ea1a72c2 100644 --- a/src/main/java/com/spring/modules/Tooling/data/IfsToolData.java +++ b/src/main/java/com/spring/modules/Tooling/data/IfsToolData.java @@ -5,6 +5,7 @@ import java.util.Date; public class IfsToolData extends PageData { private int id; private String site; + private String contract; private String toolId; private String toolDesc; private String toolType; @@ -41,6 +42,15 @@ public class IfsToolData extends PageData { public void setSite(String site) { this.site = site; + this.contract = site; + } + + public String getContract() { + return contract; + } + + public void setContract(String contract) { + this.contract = contract; } public String getToolId() { diff --git a/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java b/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java index 1ec40c0f..cb834be5 100644 --- a/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java +++ b/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java @@ -115,17 +115,21 @@ public class ToolServiceImpl implements ToolService { String resultMsg = String.valueOf(resultMap.get("result_msg")); throw new RuntimeException(resultMsg); } - + inData.setState("Active"); + inData.setCreateDate(new Date()); + //对象拷贝 + IfsToolData ifsToolData = new IfsToolData(); + //属性拷贝 + BeanUtils.copyProperties(inData, ifsToolData); //2.校验存在调用接口 - /* String toolURL = apiUrl + "/tool/ifs/syncToolDataToIfs"; - ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, inData); + String toolURL = apiUrl + "/tool/ifs/syncToolDataToIfs"; + ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, ifsToolData); if (!"200".equals(toolResponse.getCode())) { throw new RuntimeException("IFS Tool新增异常:" + toolResponse.getMsg()); } // 更新 ifs_row_id ifs_row_version String objStr = String.valueOf(toolResponse.getObj()); IfsToolData ifsTool = JSON.parseObject(objStr, IfsToolData.class); - inData.setCreateDate(new Date()); inData.setIfsRowId(ifsTool.getIfsRowId()); inData.setIfsRowVersion(ifsTool.getIfsRowVersion()); //删除工具信息默认的工具实例信息 @@ -137,8 +141,8 @@ public class ToolServiceImpl implements ToolService { toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, toolInstance); if (!"200".equals(toolResponse.getCode())) { throw new RuntimeException("IFS ToolInstance新增异常:" + toolResponse.getMsg()); - }*/ - inData.setState("Active"); + } + //2.调用方法保存当前的数据 toolDao.insertToolInfo(inData); }