From b121cd653c81b9c3e4c348f43e457f3e1dab0120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=88=E7=8B=87?= <1706442984@qq.com> Date: Sun, 28 Apr 2024 18:13:33 +0800 Subject: [PATCH 1/9] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StaffMain.java" | 10 +++---- .../Staffs.java" | 12 ++++----- .../Main.java" | 9 +++++++ .../Person.java" | 27 +++++++++++++++++++ .../Student.java" | 21 +++++++++++++++ 5 files changed, 68 insertions(+), 11 deletions(-) rename "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" => "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staffs.java" (84%) create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" diff --git "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" index e2b7bdf6..46a6cfb5 100644 --- "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" +++ "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" @@ -4,7 +4,7 @@ import java.util.Scanner; public class StaffMain { public static void main(String[] args) { - Staff st=new Staff("admin","123456"); + Staffs st=new Staffs("admin","123456"); boolean a=true; do { System.out.println("----------员工管理系统----------"); @@ -24,7 +24,7 @@ public class StaffMain { }while (a); } - public static void begin(Staff st){ + public static void begin(Staffs st){ Scanner sc=new Scanner(System.in); System.out.print("请输入账号:"); String zh=sc.nextLine(); @@ -45,7 +45,7 @@ public class StaffMain { public static void da(){ boolean a=true; - Staff st=new Staff(22,"123456"); + Staffs st=new Staffs(22,"123456"); do { System.out.println("----------员工管理系统----------"); System.out.println("------------1.打卡------------"); @@ -63,7 +63,7 @@ public class StaffMain { } }while (a); } - public static void ka(Staff st) { + public static void ka(Staffs st) { boolean a=true; do { Scanner sc = new Scanner(System.in); @@ -87,7 +87,7 @@ public class StaffMain { } public static void queren(){ - Staff st=new Staff(22,"陈智宏",18); + Staffs st=new Staffs(22,"陈智宏",18); st.queren(); Scanner sc=new Scanner(System.in); System.out.println("如正确请输入确认"); diff --git "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staffs.java" similarity index 84% rename from "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" rename to "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staffs.java" index 9d1603ae..07a88184 100644 --- "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" +++ "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staffs.java" @@ -1,6 +1,6 @@ package com.java.minxi.java_20240425.java_2301_陈智宏_234310122; -public class Staff { +public class Staffs { private long id; private String account; private String password; @@ -10,10 +10,10 @@ public class Staff { - public Staff() { + public Staffs() { } - public Staff(long id, String account, String password, String name, int age) { + public Staffs(long id, String account, String password, String name, int age) { this.id = id; this.account = account; this.password = password; @@ -21,17 +21,17 @@ public class Staff { this.age = age; } - public Staff(long id,String password ) { + public Staffs(long id,String password ) { this.password = password; this.id = id; } - public Staff(String account, String password) { + public Staffs(String account, String password) { this.account = account; this.password = password; } - public Staff(long id, String name, int age) { + public Staffs(long id, String name, int age) { this.id = id; this.name = name; this.age = age; diff --git "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" new file mode 100644 index 00000000..64afec35 --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" @@ -0,0 +1,9 @@ +package com.java.minxi.java_20240428.java_2301_陈智宏_234310122; + +public class Main { + public static void main(String[] args) { + Student student =new Student("张三",18); + student.setSchool("龙岩学院"); + student.intro(); + } +} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" new file mode 100644 index 00000000..740a630c --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" @@ -0,0 +1,27 @@ +package com.java.minxi.java_20240428.java_2301_陈智宏_234310122; + +public class Person { + private String name; + private int age; + + public Person(String name, int age) { + this.name=name; + this.age=age; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } +} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" new file mode 100644 index 00000000..3122fb55 --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" @@ -0,0 +1,21 @@ +package com.java.minxi.java_20240428.java_2301_陈智宏_234310122; + +public class Student extends Person{ + private String school; + + Student(String name,int age){ + super(name,age); + } + + public String getSchool() { + return school; + } + + public void setSchool(String school) { + this.school = school; + } + + void intro(){ + System.out.println("姓名："+getName()+"，"+"年龄："+getAge()+"，"+"学校："+school); + } +} -- Gitee From 3abd9ceafb9a46391f13243b73ebb644745c2dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=88=E7=8B=87?= <1706442984@qq.com> Date: Mon, 29 Apr 2024 11:50:07 +0000 Subject: [PATCH 2/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20work?= =?UTF-8?q?/com/java/minxi/java=5F20240425/java=5F2301=5F=E9=99=88?= =?UTF-8?q?=E6=99=BA=E5=AE=8F=5F234310122?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StaffMain.java" | 104 ------------------ .../Staffs.java" | 93 ---------------- 2 files changed, 197 deletions(-) delete mode 100644 "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" delete mode 100644 "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staffs.java" diff --git "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" deleted file mode 100644 index 46a6cfb5..00000000 --- "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" +++ /dev/null @@ -1,104 +0,0 @@ -package com.java.minxi.java_20240425.java_2301_陈智宏_234310122; - -import java.util.Scanner; - -public class StaffMain { - public static void main(String[] args) { - Staffs st=new Staffs("admin","123456"); - boolean a=true; - do { - System.out.println("----------员工管理系统----------"); - System.out.println("------------1.登陆------------"); - System.out.println("------------2.退出------------"); - System.out.println("-----------------------------"); - Scanner sc = new Scanner(System.in); - System.out.print("请输入你的选择:"); - int b=sc.nextInt(); - if(b==1){ - begin(st); - break; - } else if (b==2) { - st.end(); - a=false; - } - }while (a); - - } - public static void begin(Staffs st){ - Scanner sc=new Scanner(System.in); - System.out.print("请输入账号:"); - String zh=sc.nextLine(); - System.out.println(); - Scanner sc1=new Scanner(System.in); - System.out.print("请输入密码:"); - String mm=sc1.nextLine(); - System.out.println(); - if (zh.equals(st.getAccount())&&mm.equals(st.getPassword())){ - st.begin(); - da(); - } else { - System.out.println("账号或密码错误"); - - } - } - - - public static void da(){ - boolean a=true; - Staffs st=new Staffs(22,"123456"); - do { - System.out.println("----------员工管理系统----------"); - System.out.println("------------1.打卡------------"); - System.out.println("------------2.退出------------"); - System.out.println("-----------------------------"); - Scanner sc = new Scanner(System.in); - System.out.print("请输入你的选择:"); - int b=sc.nextInt(); - if(b==1){ - ka(st); - break; - } else if (b==2) { - st.end(); - a=false; - } - }while (a); - } - public static void ka(Staffs st) { - boolean a=true; - do { - Scanner sc = new Scanner(System.in); - System.out.print("请输入ID:"); - int id = sc.nextInt(); - System.out.println(); - Scanner sc1 = new Scanner(System.in); - System.out.print("请输入密码:"); - String mm = sc1.nextLine(); - System.out.println(); - if (id== st.getId()&&mm.equals(st.getPassword())) { - queren(); - a=false; - } else { - System.out.println("ID或密码错误"); - da(); - } - - }while (a); - - - } - public static void queren(){ - Staffs st=new Staffs(22,"陈智宏",18); - st.queren(); - Scanner sc=new Scanner(System.in); - System.out.println("如正确请输入确认"); - String qr=sc.nextLine(); - if(qr.equals("确认")){ - st.daka(); - }else { - da(); - } - - - } - -} diff --git "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staffs.java" "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staffs.java" deleted file mode 100644 index 07a88184..00000000 --- "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staffs.java" +++ /dev/null @@ -1,93 +0,0 @@ -package com.java.minxi.java_20240425.java_2301_陈智宏_234310122; - -public class Staffs { - private long id; - private String account; - private String password; - private String name; - private int age; - - - - - public Staffs() { - } - - public Staffs(long id, String account, String password, String name, int age) { - this.id = id; - this.account = account; - this.password = password; - this.name = name; - this.age = age; - } - - public Staffs(long id,String password ) { - this.password = password; - this.id = id; - } - - public Staffs(String account, String password) { - this.account = account; - this.password = password; - } - - public Staffs(long id, String name, int age) { - this.id = id; - this.name = name; - this.age = age; - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getAccount() { - return account; - } - - public void setAccount(String account) { - this.account = account; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } - void begin(){ - System.out.println("登陆成功"); - } - void daka(){ - System.out.println("打卡成功"); - } - - void end(){ - System.out.println("退出成功"); - } - void queren(){ - System.out.println("id："+id+"\n"+"名称："+name+"\n"+"年龄："+age); - } - -} -- Gitee From d286a501a96b346bb88936a43a70e60c36cd3416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=88=E7=8B=87?= <1706442984@qq.com> Date: Mon, 29 Apr 2024 11:50:12 +0000 Subject: [PATCH 3/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20work?= =?UTF-8?q?/com/java/minxi/java=5F20240428/java=5F2301=5F=E9=99=88?= =?UTF-8?q?=E6=99=BA=E5=AE=8F=5F234310122?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main.java" | 9 ------- .../Person.java" | 27 ------------------- .../Student.java" | 21 --------------- 3 files changed, 57 deletions(-) delete mode 100644 "work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" delete mode 100644 "work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" delete mode 100644 "work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" diff --git "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" deleted file mode 100644 index 64afec35..00000000 --- "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" +++ /dev/null @@ -1,9 +0,0 @@ -package com.java.minxi.java_20240428.java_2301_陈智宏_234310122; - -public class Main { - public static void main(String[] args) { - Student student =new Student("张三",18); - student.setSchool("龙岩学院"); - student.intro(); - } -} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" deleted file mode 100644 index 740a630c..00000000 --- "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" +++ /dev/null @@ -1,27 +0,0 @@ -package com.java.minxi.java_20240428.java_2301_陈智宏_234310122; - -public class Person { - private String name; - private int age; - - public Person(String name, int age) { - this.name=name; - this.age=age; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } -} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" deleted file mode 100644 index 3122fb55..00000000 --- "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" +++ /dev/null @@ -1,21 +0,0 @@ -package com.java.minxi.java_20240428.java_2301_陈智宏_234310122; - -public class Student extends Person{ - private String school; - - Student(String name,int age){ - super(name,age); - } - - public String getSchool() { - return school; - } - - public void setSchool(String school) { - this.school = school; - } - - void intro(){ - System.out.println("姓名："+getName()+"，"+"年龄："+getAge()+"，"+"学校："+school); - } -} -- Gitee From 0cddeb3b9edda78ed6ea44890deae16c88183d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=88=E7=8B=87?= <1706442984@qq.com> Date: Mon, 29 Apr 2024 19:53:21 +0800 Subject: [PATCH 4/9] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4425=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Staff.java" | 93 ++++++++++++++++ .../StaffMain.java" | 104 ++++++++++++++++++ 2 files changed, 197 insertions(+) create mode 100644 "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" create mode 100644 "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" diff --git "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" new file mode 100644 index 00000000..9d1603ae --- /dev/null +++ "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" @@ -0,0 +1,93 @@ +package com.java.minxi.java_20240425.java_2301_陈智宏_234310122; + +public class Staff { + private long id; + private String account; + private String password; + private String name; + private int age; + + + + + public Staff() { + } + + public Staff(long id, String account, String password, String name, int age) { + this.id = id; + this.account = account; + this.password = password; + this.name = name; + this.age = age; + } + + public Staff(long id,String password ) { + this.password = password; + this.id = id; + } + + public Staff(String account, String password) { + this.account = account; + this.password = password; + } + + public Staff(long id, String name, int age) { + this.id = id; + this.name = name; + this.age = age; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + void begin(){ + System.out.println("登陆成功"); + } + void daka(){ + System.out.println("打卡成功"); + } + + void end(){ + System.out.println("退出成功"); + } + void queren(){ + System.out.println("id："+id+"\n"+"名称："+name+"\n"+"年龄："+age); + } + +} diff --git "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" new file mode 100644 index 00000000..e2b7bdf6 --- /dev/null +++ "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" @@ -0,0 +1,104 @@ +package com.java.minxi.java_20240425.java_2301_陈智宏_234310122; + +import java.util.Scanner; + +public class StaffMain { + public static void main(String[] args) { + Staff st=new Staff("admin","123456"); + boolean a=true; + do { + System.out.println("----------员工管理系统----------"); + System.out.println("------------1.登陆------------"); + System.out.println("------------2.退出------------"); + System.out.println("-----------------------------"); + Scanner sc = new Scanner(System.in); + System.out.print("请输入你的选择:"); + int b=sc.nextInt(); + if(b==1){ + begin(st); + break; + } else if (b==2) { + st.end(); + a=false; + } + }while (a); + + } + public static void begin(Staff st){ + Scanner sc=new Scanner(System.in); + System.out.print("请输入账号:"); + String zh=sc.nextLine(); + System.out.println(); + Scanner sc1=new Scanner(System.in); + System.out.print("请输入密码:"); + String mm=sc1.nextLine(); + System.out.println(); + if (zh.equals(st.getAccount())&&mm.equals(st.getPassword())){ + st.begin(); + da(); + } else { + System.out.println("账号或密码错误"); + + } + } + + + public static void da(){ + boolean a=true; + Staff st=new Staff(22,"123456"); + do { + System.out.println("----------员工管理系统----------"); + System.out.println("------------1.打卡------------"); + System.out.println("------------2.退出------------"); + System.out.println("-----------------------------"); + Scanner sc = new Scanner(System.in); + System.out.print("请输入你的选择:"); + int b=sc.nextInt(); + if(b==1){ + ka(st); + break; + } else if (b==2) { + st.end(); + a=false; + } + }while (a); + } + public static void ka(Staff st) { + boolean a=true; + do { + Scanner sc = new Scanner(System.in); + System.out.print("请输入ID:"); + int id = sc.nextInt(); + System.out.println(); + Scanner sc1 = new Scanner(System.in); + System.out.print("请输入密码:"); + String mm = sc1.nextLine(); + System.out.println(); + if (id== st.getId()&&mm.equals(st.getPassword())) { + queren(); + a=false; + } else { + System.out.println("ID或密码错误"); + da(); + } + + }while (a); + + + } + public static void queren(){ + Staff st=new Staff(22,"陈智宏",18); + st.queren(); + Scanner sc=new Scanner(System.in); + System.out.println("如正确请输入确认"); + String qr=sc.nextLine(); + if(qr.equals("确认")){ + st.daka(); + }else { + da(); + } + + + } + +} -- Gitee From a5d8a1ba4a6ddb2dc25034b233c7445c42a17155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=88=E7=8B=87?= <1706442984@qq.com> Date: Mon, 29 Apr 2024 19:57:28 +0800 Subject: [PATCH 5/9] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4428=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main.java" | 9 +++++++ .../Person.java" | 27 +++++++++++++++++++ .../Student.java" | 21 +++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" diff --git "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" new file mode 100644 index 00000000..64afec35 --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" @@ -0,0 +1,9 @@ +package com.java.minxi.java_20240428.java_2301_陈智宏_234310122; + +public class Main { + public static void main(String[] args) { + Student student =new Student("张三",18); + student.setSchool("龙岩学院"); + student.intro(); + } +} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" new file mode 100644 index 00000000..c3438894 --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" @@ -0,0 +1,27 @@ +package com.java.minxi.java_20240428.java_2301_陈智宏_234310122; + +public class Person { + private String name; + private int age; + + public Person(String name, int age) { + this.name=name; + this.age=age; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } +} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" new file mode 100644 index 00000000..54255a1b --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" @@ -0,0 +1,21 @@ +package com.java.minxi.java_20240428.java_2301_陈智宏_234310122; + +public class Student extends Person{ + private String school; + + Student(String name,int age){ + super(name,age); + } + + public String getSchool() { + return school; + } + + public void setSchool(String school) { + this.school = school; + } + + void intro(){ + System.out.println("姓名："+getName()+"，"+"年龄："+getAge()+"，"+"学校："+school); + } +} -- Gitee From 4d764f70e3140720f6468497544e1c715f2ec314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=88=E7=8B=87?= <1706442984@qq.com> Date: Mon, 29 Apr 2024 11:58:51 +0000 Subject: [PATCH 6/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20work?= =?UTF-8?q?/com/java/minxi/java=5F20240428/java=5F2301=5F=E9=99=88?= =?UTF-8?q?=E6=99=BA=E5=AE=8F=5F234310122?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main.java" | 9 ------- .../Person.java" | 27 ------------------- .../Student.java" | 21 --------------- 3 files changed, 57 deletions(-) delete mode 100644 "work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" delete mode 100644 "work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" delete mode 100644 "work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" diff --git "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" deleted file mode 100644 index 64afec35..00000000 --- "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Main.java" +++ /dev/null @@ -1,9 +0,0 @@ -package com.java.minxi.java_20240428.java_2301_陈智宏_234310122; - -public class Main { - public static void main(String[] args) { - Student student =new Student("张三",18); - student.setSchool("龙岩学院"); - student.intro(); - } -} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" deleted file mode 100644 index c3438894..00000000 --- "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Person.java" +++ /dev/null @@ -1,27 +0,0 @@ -package com.java.minxi.java_20240428.java_2301_陈智宏_234310122; - -public class Person { - private String name; - private int age; - - public Person(String name, int age) { - this.name=name; - this.age=age; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } -} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" "b/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" deleted file mode 100644 index 54255a1b..00000000 --- "a/work/com/java/minxi/java_20240428/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Student.java" +++ /dev/null @@ -1,21 +0,0 @@ -package com.java.minxi.java_20240428.java_2301_陈智宏_234310122; - -public class Student extends Person{ - private String school; - - Student(String name,int age){ - super(name,age); - } - - public String getSchool() { - return school; - } - - public void setSchool(String school) { - this.school = school; - } - - void intro(){ - System.out.println("姓名："+getName()+"，"+"年龄："+getAge()+"，"+"学校："+school); - } -} -- Gitee From 5bb86af1ec9b4fc05d37711bf5fb5603c99eb4df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=88=E7=8B=87?= <1706442984@qq.com> Date: Mon, 29 Apr 2024 12:03:22 +0000 Subject: [PATCH 7/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20work?= =?UTF-8?q?/com/java/minxi/java=5F20240425/java=5F2301=5F=E9=99=88?= =?UTF-8?q?=E6=99=BA=E5=AE=8F=5F234310122?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Staff.java" | 93 ---------------- .../StaffMain.java" | 104 ------------------ 2 files changed, 197 deletions(-) delete mode 100644 "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" delete mode 100644 "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" diff --git "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" deleted file mode 100644 index 9d1603ae..00000000 --- "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" +++ /dev/null @@ -1,93 +0,0 @@ -package com.java.minxi.java_20240425.java_2301_陈智宏_234310122; - -public class Staff { - private long id; - private String account; - private String password; - private String name; - private int age; - - - - - public Staff() { - } - - public Staff(long id, String account, String password, String name, int age) { - this.id = id; - this.account = account; - this.password = password; - this.name = name; - this.age = age; - } - - public Staff(long id,String password ) { - this.password = password; - this.id = id; - } - - public Staff(String account, String password) { - this.account = account; - this.password = password; - } - - public Staff(long id, String name, int age) { - this.id = id; - this.name = name; - this.age = age; - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getAccount() { - return account; - } - - public void setAccount(String account) { - this.account = account; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } - void begin(){ - System.out.println("登陆成功"); - } - void daka(){ - System.out.println("打卡成功"); - } - - void end(){ - System.out.println("退出成功"); - } - void queren(){ - System.out.println("id："+id+"\n"+"名称："+name+"\n"+"年龄："+age); - } - -} diff --git "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" deleted file mode 100644 index e2b7bdf6..00000000 --- "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" +++ /dev/null @@ -1,104 +0,0 @@ -package com.java.minxi.java_20240425.java_2301_陈智宏_234310122; - -import java.util.Scanner; - -public class StaffMain { - public static void main(String[] args) { - Staff st=new Staff("admin","123456"); - boolean a=true; - do { - System.out.println("----------员工管理系统----------"); - System.out.println("------------1.登陆------------"); - System.out.println("------------2.退出------------"); - System.out.println("-----------------------------"); - Scanner sc = new Scanner(System.in); - System.out.print("请输入你的选择:"); - int b=sc.nextInt(); - if(b==1){ - begin(st); - break; - } else if (b==2) { - st.end(); - a=false; - } - }while (a); - - } - public static void begin(Staff st){ - Scanner sc=new Scanner(System.in); - System.out.print("请输入账号:"); - String zh=sc.nextLine(); - System.out.println(); - Scanner sc1=new Scanner(System.in); - System.out.print("请输入密码:"); - String mm=sc1.nextLine(); - System.out.println(); - if (zh.equals(st.getAccount())&&mm.equals(st.getPassword())){ - st.begin(); - da(); - } else { - System.out.println("账号或密码错误"); - - } - } - - - public static void da(){ - boolean a=true; - Staff st=new Staff(22,"123456"); - do { - System.out.println("----------员工管理系统----------"); - System.out.println("------------1.打卡------------"); - System.out.println("------------2.退出------------"); - System.out.println("-----------------------------"); - Scanner sc = new Scanner(System.in); - System.out.print("请输入你的选择:"); - int b=sc.nextInt(); - if(b==1){ - ka(st); - break; - } else if (b==2) { - st.end(); - a=false; - } - }while (a); - } - public static void ka(Staff st) { - boolean a=true; - do { - Scanner sc = new Scanner(System.in); - System.out.print("请输入ID:"); - int id = sc.nextInt(); - System.out.println(); - Scanner sc1 = new Scanner(System.in); - System.out.print("请输入密码:"); - String mm = sc1.nextLine(); - System.out.println(); - if (id== st.getId()&&mm.equals(st.getPassword())) { - queren(); - a=false; - } else { - System.out.println("ID或密码错误"); - da(); - } - - }while (a); - - - } - public static void queren(){ - Staff st=new Staff(22,"陈智宏",18); - st.queren(); - Scanner sc=new Scanner(System.in); - System.out.println("如正确请输入确认"); - String qr=sc.nextLine(); - if(qr.equals("确认")){ - st.daka(); - }else { - da(); - } - - - } - -} -- Gitee From 14365722299dfdf8ffffbe6c5a57ecd0cd46c6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=88=E7=8B=87?= <1706442984@qq.com> Date: Mon, 29 Apr 2024 20:04:13 +0800 Subject: [PATCH 8/9] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4425=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Staff.java" | 93 ++++++++++++++++ .../StaffMain.java" | 104 ++++++++++++++++++ 2 files changed, 197 insertions(+) create mode 100644 "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" create mode 100644 "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" diff --git "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" new file mode 100644 index 00000000..9d1603ae --- /dev/null +++ "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" @@ -0,0 +1,93 @@ +package com.java.minxi.java_20240425.java_2301_陈智宏_234310122; + +public class Staff { + private long id; + private String account; + private String password; + private String name; + private int age; + + + + + public Staff() { + } + + public Staff(long id, String account, String password, String name, int age) { + this.id = id; + this.account = account; + this.password = password; + this.name = name; + this.age = age; + } + + public Staff(long id,String password ) { + this.password = password; + this.id = id; + } + + public Staff(String account, String password) { + this.account = account; + this.password = password; + } + + public Staff(long id, String name, int age) { + this.id = id; + this.name = name; + this.age = age; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + void begin(){ + System.out.println("登陆成功"); + } + void daka(){ + System.out.println("打卡成功"); + } + + void end(){ + System.out.println("退出成功"); + } + void queren(){ + System.out.println("id："+id+"\n"+"名称："+name+"\n"+"年龄："+age); + } + +} diff --git "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" new file mode 100644 index 00000000..e2b7bdf6 --- /dev/null +++ "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" @@ -0,0 +1,104 @@ +package com.java.minxi.java_20240425.java_2301_陈智宏_234310122; + +import java.util.Scanner; + +public class StaffMain { + public static void main(String[] args) { + Staff st=new Staff("admin","123456"); + boolean a=true; + do { + System.out.println("----------员工管理系统----------"); + System.out.println("------------1.登陆------------"); + System.out.println("------------2.退出------------"); + System.out.println("-----------------------------"); + Scanner sc = new Scanner(System.in); + System.out.print("请输入你的选择:"); + int b=sc.nextInt(); + if(b==1){ + begin(st); + break; + } else if (b==2) { + st.end(); + a=false; + } + }while (a); + + } + public static void begin(Staff st){ + Scanner sc=new Scanner(System.in); + System.out.print("请输入账号:"); + String zh=sc.nextLine(); + System.out.println(); + Scanner sc1=new Scanner(System.in); + System.out.print("请输入密码:"); + String mm=sc1.nextLine(); + System.out.println(); + if (zh.equals(st.getAccount())&&mm.equals(st.getPassword())){ + st.begin(); + da(); + } else { + System.out.println("账号或密码错误"); + + } + } + + + public static void da(){ + boolean a=true; + Staff st=new Staff(22,"123456"); + do { + System.out.println("----------员工管理系统----------"); + System.out.println("------------1.打卡------------"); + System.out.println("------------2.退出------------"); + System.out.println("-----------------------------"); + Scanner sc = new Scanner(System.in); + System.out.print("请输入你的选择:"); + int b=sc.nextInt(); + if(b==1){ + ka(st); + break; + } else if (b==2) { + st.end(); + a=false; + } + }while (a); + } + public static void ka(Staff st) { + boolean a=true; + do { + Scanner sc = new Scanner(System.in); + System.out.print("请输入ID:"); + int id = sc.nextInt(); + System.out.println(); + Scanner sc1 = new Scanner(System.in); + System.out.print("请输入密码:"); + String mm = sc1.nextLine(); + System.out.println(); + if (id== st.getId()&&mm.equals(st.getPassword())) { + queren(); + a=false; + } else { + System.out.println("ID或密码错误"); + da(); + } + + }while (a); + + + } + public static void queren(){ + Staff st=new Staff(22,"陈智宏",18); + st.queren(); + Scanner sc=new Scanner(System.in); + System.out.println("如正确请输入确认"); + String qr=sc.nextLine(); + if(qr.equals("确认")){ + st.daka(); + }else { + da(); + } + + + } + +} -- Gitee From 678bf1133409e746d99827917fe89406768a89fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=88=E7=8B=87?= <1706442984@qq.com> Date: Mon, 29 Apr 2024 20:14:58 +0800 Subject: [PATCH 9/9] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StaffMain.java" | 10 +++++----- .../Staffs.java" | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) rename "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" => "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staffs.java" (84%) diff --git "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" index e2b7bdf6..46a6cfb5 100644 --- "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" +++ "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/StaffMain.java" @@ -4,7 +4,7 @@ import java.util.Scanner; public class StaffMain { public static void main(String[] args) { - Staff st=new Staff("admin","123456"); + Staffs st=new Staffs("admin","123456"); boolean a=true; do { System.out.println("----------员工管理系统----------"); @@ -24,7 +24,7 @@ public class StaffMain { }while (a); } - public static void begin(Staff st){ + public static void begin(Staffs st){ Scanner sc=new Scanner(System.in); System.out.print("请输入账号:"); String zh=sc.nextLine(); @@ -45,7 +45,7 @@ public class StaffMain { public static void da(){ boolean a=true; - Staff st=new Staff(22,"123456"); + Staffs st=new Staffs(22,"123456"); do { System.out.println("----------员工管理系统----------"); System.out.println("------------1.打卡------------"); @@ -63,7 +63,7 @@ public class StaffMain { } }while (a); } - public static void ka(Staff st) { + public static void ka(Staffs st) { boolean a=true; do { Scanner sc = new Scanner(System.in); @@ -87,7 +87,7 @@ public class StaffMain { } public static void queren(){ - Staff st=new Staff(22,"陈智宏",18); + Staffs st=new Staffs(22,"陈智宏",18); st.queren(); Scanner sc=new Scanner(System.in); System.out.println("如正确请输入确认"); diff --git "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staffs.java" similarity index 84% rename from "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" rename to "work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staffs.java" index 9d1603ae..07a88184 100644 --- "a/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staff.java" +++ "b/work/com/java/minxi/java_20240425/java_2301_\351\231\210\346\231\272\345\256\217_234310122/Staffs.java" @@ -1,6 +1,6 @@ package com.java.minxi.java_20240425.java_2301_陈智宏_234310122; -public class Staff { +public class Staffs { private long id; private String account; private String password; @@ -10,10 +10,10 @@ public class Staff { - public Staff() { + public Staffs() { } - public Staff(long id, String account, String password, String name, int age) { + public Staffs(long id, String account, String password, String name, int age) { this.id = id; this.account = account; this.password = password; @@ -21,17 +21,17 @@ public class Staff { this.age = age; } - public Staff(long id,String password ) { + public Staffs(long id,String password ) { this.password = password; this.id = id; } - public Staff(String account, String password) { + public Staffs(String account, String password) { this.account = account; this.password = password; } - public Staff(long id, String name, int age) { + public Staffs(long id, String name, int age) { this.id = id; this.name = name; this.age = age; -- Gitee