diff --git a/em-oop/src/day3Keisho/DepartmentData.java b/em-oop/src/day3Keisho/DepartmentData.java new file mode 100644 index 0000000..2e485c7 --- /dev/null +++ b/em-oop/src/day3Keisho/DepartmentData.java @@ -0,0 +1,41 @@ +package day3Keisho; + +public class DepartmentData extends BaseData { + private String idDepartment; + private String nmDepartment; + + public String getIdDepartment() { + return idDepartment; + } + + public void setIdDepartment(String idDepartment) { + this.idDepartment = idDepartment; + } + + public String getNmDepartment() { + return nmDepartment; + } + + public void setNmDepartment(String nmDepartment) { + this.nmDepartment = nmDepartment; + } + + @Override + public String toString() { + // TODO 自動生成されたメソッド・スタブ + return getIdDepartment() + "\t" + getNmDepartment(); + } + + @Override + public String toCSV() { + // TODO 自動生成されたメソッド・スタブ + return getIdDepartment() + "," + getNmDepartment(); + } + + @Override + public String getPrimaryKeyValue() { + // TODO 自動生成されたメソッド・スタブ + return getIdDepartment(); + } + +} diff --git a/em-oop/src/day3Keisho/EmployeeData.java b/em-oop/src/day3Keisho/EmployeeData.java index c8987f3..3a075cb 100644 --- a/em-oop/src/day3Keisho/EmployeeData.java +++ b/em-oop/src/day3Keisho/EmployeeData.java @@ -7,7 +7,20 @@ public class EmployeeData extends BaseData { private String mailAddress; private String password; private String idDepartment; - public String getIdEmployee() { + + + public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password, String idDepartment) { + this.idEmployee = idEmployee; + this.nmEmployee = nmEmployee; + this.knEmployee = knEmployee; + this.mailAddress = mailAddress; + this.password = password; + this.idDepartment = idDepartment; + } + public EmployeeData() { + } + + public String getIdEmployee(String idEmployee) { return idEmployee; } @@ -65,11 +78,13 @@ public class EmployeeData extends BaseData { public void setIdDepartment(String idDepartment) { this.idDepartment = idDepartment; } + @Override public String toString() { - return""; + return idEmployee + "\t" + nmEmployee + "\t" + knEmployee + "\t" + mailAddress + "\t" + password + "\t" + idDepartment; + } - } + @Override public String toCSV() { return idEmployee + "," + nmEmployee + "," + knEmployee + "," + mailAddress + "," + password + "," + idDepartment; diff --git a/em-oop/src/day3Keisho/Main.java b/em-oop/src/day3Keisho/Main.java index 3fb1ae4..2c315ea 100644 --- a/em-oop/src/day3Keisho/Main.java +++ b/em-oop/src/day3Keisho/Main.java @@ -1,17 +1,24 @@ package day3Keisho; + public class Main { public static void main(String[] args) { // TODO 自動生成されたメソッド・スタブ //EmployeeData[] employees = new EmployeeData[5]; - EmployeeData employee1 = new EmployeeData(); - - employee1.setIdEmployee("10000"); - employee1.setNmEmployee("山田太郎"); - employee1.setKnEmployee("ヤマダタツヤ"); - employee1.setMailAddress("yamada@hoge.jp"); - employee1.setPassword("aaa"); - employee1.setIdDepartment("10"); + BaseData[] employees = new BaseData[5]; + + employees[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10"); + employees[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10"); + employees[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11"); + employees[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12"); + employees[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13"); + + // employee1("10000"); + // employee1.setNmEmployee("山田太郎"); + // employee1.setKnEmployee("ヤマダタツヤ"); + // employee1.setMailAddress("yamada@hoge.jp"); + // employee1.setPassword("aaa"); + // employee1.setIdDepartment("10"); //1st person //EmployeeData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10"); // employees[0] = new EmployeeData(); @@ -20,14 +27,14 @@ public class Main { // employees[0].knEmployee = "ヤマダタツヤ"; // employees[0].mailAddress = "yamada@hoge.jp"; // employees[0].password = "aaa"; - // employees[0].idDepartment = "10"; - EmployeeData employee2 = new EmployeeData(); - employee2.setIdEmployee("10001"); - employee2.setNmEmployee("高橋準"); - employee2.setKnEmployee("タカハシジュン"); - employee2.setMailAddress("jtaka@hoge.jp"); - employee2.setPassword("bbb"); - employee2.setIdDepartment("10"); + // // employees[0].idDepartment = "10"; + // EmployeeData employee2 = new EmployeeData(); + // employee2.setIdEmployee("10001"); + // employee2.setNmEmployee("高橋準"); + // employee2.setKnEmployee("タカハシジュン"); + // employee2.setMailAddress("jtaka@hoge.jp"); + // employee2.setPassword("bbb"); + // employee2.setIdDepartment("10"); // //2nd person // employees[1] = new EmployeeData(); // employees[1].idEmployee = "10001"; @@ -37,13 +44,13 @@ public class Main { // employees[1].password = "bbb"; // employees[1].idDepartment = "10"; // //3rd person - EmployeeData employee3 = new EmployeeData(); - employee3.setIdEmployee("10002"); - employee3.setNmEmployee("麻枝史明"); - employee3.setKnEmployee("マエダフミアキ"); - employee3.setMailAddress("fmak@hoge.jp"); - employee3.setPassword("ccc"); - employee3.setIdDepartment("11"); + // EmployeeData employee3 = new EmployeeData(); + // employee3.setIdEmployee("10002"); + // employee3.setNmEmployee("麻枝史明"); + // employee3.setKnEmployee("マエダフミアキ"); + // employee3.setMailAddress("fmak@hoge.jp"); + // employee3.setPassword("ccc"); + // employee3.setIdDepartment("11"); // employees[2] = new EmployeeData(); // employees[2].idEmployee = "10002"; // employees[2].nmEmployee = "麻枝史明"; @@ -51,13 +58,13 @@ public class Main { // employees[2].mailAddress = "fmak@hoge.jp"; // employees[2].password = "ccc"; // employees[2].idDepartment = "11"; - EmployeeData employee4 = new EmployeeData(); - employee4.setIdEmployee("10003"); - employee4.setNmEmployee("丸戸章介"); - employee4.setKnEmployee("マルトショウスケ"); - employee4.setMailAddress("marusyo@hoge.jp"); - employee4.setPassword("ddd"); - employee4.setIdDepartment("12"); + // EmployeeData employee4 = new EmployeeData(); + // employee4.setIdEmployee("10003"); + // employee4.setNmEmployee("丸戸章介"); + // employee4.setKnEmployee("マルトショウスケ"); + // employee4.setMailAddress("marusyo@hoge.jp"); + // employee4.setPassword("ddd"); + // employee4.setIdDepartment("12"); // //4th person // employees[3] = new EmployeeData(); // employees[3].idEmployee = "10003"; @@ -66,13 +73,13 @@ public class Main { // employees[3].mailAddress = "marusyo@hoge.jp"; // employees[3].password = "ddd"; // employees[3].idDepartment = "12"; - EmployeeData employee5 = new EmployeeData(); - employee5.setIdEmployee("10004"); - employee5.setNmEmployee("三宅武"); - employee5.setKnEmployee("ミヤケタケシ"); - employee5.setMailAddress("miya@hoge.jp"); - employee5.setPassword("eee"); - employee5.setIdDepartment("13"); + // EmployeeData employee5 = new EmployeeData(); + // employee5.setIdEmployee("10004"); + // employee5.setNmEmployee("三宅武"); + // employee5.setKnEmployee("ミヤケタケシ"); + // employee5.setMailAddress("miya@hoge.jp"); + // employee5.setPassword("eee"); + // employee5.setIdDepartment("13"); // //5th pe5rson // employees[4] = new EmployeeData(); // employees[4].idEmployee = "10004"; @@ -85,13 +92,13 @@ public class Main { // for (int i = 0; i < employees.length; i++) { // employees[i].showInfo(); // } - System.out.println(employee1.toCSV()); - System.out.println(employee1.getPrimaryKeyValue()); -// employee1.showInfo(); -// employee2.showInfo(); -// employee3.showInfo(); -// employee4.showInfo(); -// employee5.showInfo(); + System.out.println(employees[0].toCSV()); + System.out.println(employees[0].getPrimaryKeyValue()); + // employee1.showInfo(); + // employee2.showInfo(); + // employee3.showInfo(); + // employee4.showInfo(); + // employee5.showInfo(); //stept 7 //System.out.println("10002 を検索します"); @@ -99,6 +106,8 @@ public class Main { // // System.out.println("99999 を検索します"); // System.out.println(employees[2].isMatchId("99999")); + System.out.println("10002 を検索します"); + System.out.println(employees[2].getPrimaryKeyValue().equals("10002")); //stept 5 // employee.showInfo(); @@ -125,9 +134,9 @@ public class Main { // } // boolean found = false; //←if it haven't this boolean , they can't be decided true or false, so we should be make boolan name (found) -// for (int i = 0; i < employees.length; i++) { -// -// } + // for (int i = 0; i < employees.length; i++) { + // + // } //System.out.println("現在社員データ数:" + EmployeeData.getEmpCount() + "件"); // if (employees[i].isMatchId(serchId)) { // employees[i].showInfo(); @@ -139,14 +148,49 @@ public class Main { // if (!found) { // System.out.println("該当する社員が見つかりませんでした"); // } -// System.out.println("--- 空文字のテスト ---"); -// employee1.setNmEmployee(""); // စာသားအလွတ် -// employee1.setIdEmployee(" "); // Space သီးသန့် -// employee1.setNmEmployee(null); // null တန်ဖိုး + // System.out.println("--- 空文字のテスト ---"); + // employee1.setNmEmployee(""); // စာသားအလွတ် + // employee1.setIdEmployee(" "); // Space သီးသန့် + // employee1.setNmEmployee(null); // null တန်ဖိုး + BaseData[] allData = new BaseData[11]; + // employees 配列の中身 (0〜4) を allData の 0〜4 にコピー + for (int i = 0; i < employees.length; i++) { + allData[i] = employees[i]; + } + DepartmentData dept1 = new DepartmentData(); + dept1.setIdDepartment("10"); + dept1.setNmDepartment("役員"); + allData[5] = dept1; + DepartmentData dept2 = new DepartmentData(); + dept2.setIdDepartment("11"); + dept2.setNmDepartment("人事・総務部"); + allData[6] = dept2; + + DepartmentData dept3 = new DepartmentData(); + dept3.setIdDepartment("12"); + dept3.setNmDepartment("経理部"); + allData[7] = dept3; + + DepartmentData dept4 = new DepartmentData(); + dept4.setIdDepartment("13"); + dept4.setNmDepartment("システム開発事業部"); + allData[8] = dept4; + + DepartmentData dept5 = new DepartmentData(); + dept5.setIdDepartment("14"); + dept5.setNmDepartment("教育事業部"); + allData[9] = dept5; + + DepartmentData dept6 = new DepartmentData(); + dept6.setIdDepartment("15"); + dept6.setNmDepartment("営業企画部"); + allData[10] = dept6; + + + for (BaseData data : allData) { + System.out.println(data.toString()); + } } - - //scan.close(); - }