From c778f5c7393809ee3280bd4152654340d9a76c18 Mon Sep 17 00:00:00 2001 From: liujl Date: Thu, 2 Jan 2020 14:20:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A1=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- com.connor.jd.plm/META-INF/MANIFEST.MF | 3 +- .../connor/jd/plm/dialogs/CSXWHDialog.java | 126 +++++++++++++++++- 2 files changed, 124 insertions(+), 5 deletions(-) diff --git a/com.connor.jd.plm/META-INF/MANIFEST.MF b/com.connor.jd.plm/META-INF/MANIFEST.MF index a24cdf4..a880e52 100644 --- a/com.connor.jd.plm/META-INF/MANIFEST.MF +++ b/com.connor.jd.plm/META-INF/MANIFEST.MF @@ -12,8 +12,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.108.0", com.teamcenter.rac.kernel;bundle-version="12000.1.0", com.teamcenter.rac.ui.views;bundle-version="12000.1.0", org.eclipse.core.runtime;bundle-version="3.12.0", - org.eclipse.ui.forms;bundle-version="3.7.0", - org.eclipse.swt + org.eclipse.ui.forms;bundle-version="3.7.0" Automatic-Module-Name: JDProject Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.connor.jd.plm.action, diff --git a/com.connor.jd.plm/src/com/connor/jd/plm/dialogs/CSXWHDialog.java b/com.connor.jd.plm/src/com/connor/jd/plm/dialogs/CSXWHDialog.java index a334a53..86e6055 100644 --- a/com.connor.jd.plm/src/com/connor/jd/plm/dialogs/CSXWHDialog.java +++ b/com.connor.jd.plm/src/com/connor/jd/plm/dialogs/CSXWHDialog.java @@ -269,7 +269,7 @@ public class CSXWHDialog extends Application { if (delCompList.get(i) == findList.get(j).getCompId()) { String sql = "delete from JD2_Component where test_id=?"; update(sql, findList.get(j).getCompId()); - // System.out.println("移除了原本数据库就有的"); + System.out.println("移除了原本数据库就有的"); findList.remove(j); } Iterator compIt = componentData.iterator(); @@ -277,7 +277,7 @@ public class CSXWHDialog extends Application { int compid = compIt.next().getCompId(); if (delCompList.get(i) == compid) { compIt.remove(); - // System.out.println("初始结果集移除了一条"); + System.out.println("初始结果集移除了一条"); } } } @@ -300,14 +300,17 @@ public class CSXWHDialog extends Application { } if (flag) { for (ComponentBean com : findList) { - System.out.println("状态" + com.getStage()); + // System.out.println("状态" + com.getStage()); if (com.getStage() == 1) { insert(com); com.setStage(0); + selectId(com); + System.out.println("com的Id" + com.getCompId()); } if (com.getStage() == 2) { update(com); com.setStage(0); + } } tableView0.refresh(); @@ -519,6 +522,7 @@ public class CSXWHDialog extends Application { if (mac.getStage() == 1) { insertMac(mac); mac.setStage(0); + selectMacId(mac); } if (mac.getStage() == 2) { updateMac(mac); @@ -576,6 +580,66 @@ public class CSXWHDialog extends Application { return results; } + private void selectId(ComponentBean com) { + String sql = "select component_id_seq.nextval from dual"; + con = DBConnectionUtil.dbConn("infodba", "infodba"); + try { + ps = con.prepareStatement(sql); + rs = ps.executeQuery(); + while (rs.next()) { + int id = rs.getInt(1) - 1; + System.out.println("id" + id); + com.setCompId(id); + } + } catch (Exception e) { + System.out.println("查找失败"); + } finally { + if (ps != null) { + try { + ps.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + if (con != null) { + try { + con.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + } + } + + private void selectMacId(MachineBean com) { + String sql = "select machine_id_seq.nextval from dual"; + con = DBConnectionUtil.dbConn("infodba", "infodba"); + try { + ps = con.prepareStatement(sql); + rs = ps.executeQuery(); + while (rs.next()) { + int id = rs.getInt(1); + com.setMacId(id); + } + } catch (Exception e) { + } finally { + if (ps != null) { + try { + ps.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + if (con != null) { + try { + con.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + } + } + private void insert(ComponentBean com) { String sql = "insert into JD2_Component(test_type,test_project,test_time,test_num,test_cost) values(?,?,?,?,?)"; con = DBConnectionUtil.dbConn("infodba", "infodba"); @@ -602,6 +666,20 @@ public class CSXWHDialog extends Application { } catch (Exception e) { System.out.println("添加失败"); } finally { + if (ps != null) { + try { + ps.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + if (con != null) { + try { + con.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } } } @@ -627,6 +705,20 @@ public class CSXWHDialog extends Application { } catch (Exception e) { System.out.println("添加失败"); } finally { + if (ps != null) { + try { + ps.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + if (con != null) { + try { + con.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } } } @@ -656,6 +748,20 @@ public class CSXWHDialog extends Application { } catch (Exception e) { } finally { + if (ps != null) { + try { + ps.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + if (con != null) { + try { + con.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } } } @@ -709,6 +815,20 @@ public class CSXWHDialog extends Application { } catch (Exception e) { } finally { + if (ps != null) { + try { + ps.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + if (con != null) { + try { + con.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } } } } \ No newline at end of file