From b1ad18fced80d4592e1657f36bcf8a1275c91586 Mon Sep 17 00:00:00 2001 From: yizhiyun <2094853677@qq.com> Date: Thu, 18 Apr 2024 23:51:10 +0800 Subject: [PATCH 1/6] feat:zuoye --- .../java_2302_yizhiyun_2000212322/Ac.java | 17 +++++++++++++ .../Student.java | 25 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Ac.java create mode 100644 work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Student.java diff --git a/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Ac.java b/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Ac.java new file mode 100644 index 0000000..ea8207e --- /dev/null +++ b/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Ac.java @@ -0,0 +1,17 @@ +package com.java.minxi.java_20240418.java_2302_yizhiyun_2000212322; + +public class Ac { + public static void main(String[] args) { + + Student s1 = new Student(1, "张三", 21, "男"); + Student s2 = new Student(2, "李四", 25, "男"); + Student s3 = new Student(3, "王五", 19, "女"); + s1.run(); + s2.eat(); + s3.sleep(); + System.out.println("学生1" + s1); + System.out.println("学生2" + s2); + System.out.println("学生3" + s3); + } + +} diff --git a/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Student.java b/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Student.java new file mode 100644 index 0000000..5562dbd --- /dev/null +++ b/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Student.java @@ -0,0 +1,25 @@ +package com.java.minxi.java_20240418.java_2302_yizhiyun_2000212322; + +public class Student { + public int id; + public String name; + public int age; + public String sex; + + public Student(int id, String name, int age, String sex){ + this.id =id; + this.name=name; + this.age=age; + this.sex=sex; + } + public void run(){ + System.out.println(this.name+"跑步"); + } + public void eat(){ + System.out.println(this.name+"吃饭"); + } + public void sleep(){ + System.out.println(this.name+"睡觉"); + } + +} -- Gitee From 98ae6edbcf04c0c6ae90ce6eb2a5c253e544f213 Mon Sep 17 00:00:00 2001 From: yizhiyun <2094853677@qq.com> Date: Fri, 19 Apr 2024 01:41:10 +0000 Subject: [PATCH 2/6] =?UTF-8?q?update=20work/com/java/minxi/java=5F2024041?= =?UTF-8?q?5/java=5F2302=5F=E5=BC=A0=E4=B8=89=5F2000212322/MainTest.java.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yizhiyun <2094853677@qq.com> --- .../MainTest.java" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" "b/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" index fdbea2f..374f7dd 100644 --- "a/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" +++ "b/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240415.java_2302_张三_2000212322; +package com.java.minxi.java_20240415.java_2302_易志昀_2000212322; public class MainTest { -- Gitee From 6759e4463ed0b5aaf87d1ea32a8a82afa28cf332 Mon Sep 17 00:00:00 2001 From: yizhiyun <2094853677@qq.com> Date: Fri, 19 Apr 2024 01:41:57 +0000 Subject: [PATCH 3/6] =?UTF-8?q?update=20work/com/java/minxi/java=5F2024041?= =?UTF-8?q?5/java=5F2302=5F=E6=98=93=E5=BF=97=E6=98=80=5F2000212322/MainTe?= =?UTF-8?q?st.java.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yizhiyun <2094853677@qq.com> --- .../MainTest.java" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" "b/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" index 374f7dd..29174ad 100644 --- "a/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" +++ "b/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" @@ -4,5 +4,5 @@ public class MainTest { public static void main(String[] args) { System.out.println("Hello World"); - } + } } \ No newline at end of file -- Gitee From d85f6c23a4812c45267fb57891e696ceba215e42 Mon Sep 17 00:00:00 2001 From: yizhiyun <2094853677@qq.com> Date: Fri, 19 Apr 2024 01:43:03 +0000 Subject: [PATCH 4/6] =?UTF-8?q?update=20work/com/java/minxi/java=5F2024041?= =?UTF-8?q?8/java=5F2302=5F=E6=98=93=E5=BF=97=E6=98=80=5F2000212322/Studen?= =?UTF-8?q?t.java.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yizhiyun <2094853677@qq.com> --- .../java_20240418/java_2302_yizhiyun_2000212322/Student.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Student.java b/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Student.java index 5562dbd..ff31aef 100644 --- a/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Student.java +++ b/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Student.java @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240418.java_2302_yizhiyun_2000212322; +package com.java.minxi.java_20240418.java_2302_易志昀_2000212322; public class Student { public int id; -- Gitee From c6b025d7f6c410f2e24efd7cdc4e45e0edd27f73 Mon Sep 17 00:00:00 2001 From: Laofan <545690097@qq.com> Date: Fri, 19 Apr 2024 10:59:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E6=95=B4=E7=90=86=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainTest.java" | 0 .../Ac.java" | 2 +- .../Student.java" | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename "work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" => "work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2344000000/MainTest.java" (100%) rename work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Ac.java => "work/com/java/minxi/java_20240418/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Ac.java" (86%) rename work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Student.java => "work/com/java/minxi/java_20240418/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Student.java" (87%) diff --git "a/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" "b/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2344000000/MainTest.java" similarity index 100% rename from "work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" rename to "work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2344000000/MainTest.java" diff --git a/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Ac.java "b/work/com/java/minxi/java_20240418/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Ac.java" similarity index 86% rename from work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Ac.java rename to "work/com/java/minxi/java_20240418/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Ac.java" index ea8207e..eb1d2c4 100644 --- a/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Ac.java +++ "b/work/com/java/minxi/java_20240418/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Ac.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240418.java_2302_yizhiyun_2000212322; +package com.java.minxi.java_20240418.java_2302_易志昀_2344310235; public class Ac { public static void main(String[] args) { diff --git a/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Student.java "b/work/com/java/minxi/java_20240418/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Student.java" similarity index 87% rename from work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Student.java rename to "work/com/java/minxi/java_20240418/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Student.java" index ff31aef..02aca54 100644 --- a/work/com/java/minxi/java_20240418/java_2302_yizhiyun_2000212322/Student.java +++ "b/work/com/java/minxi/java_20240418/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Student.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240418.java_2302_易志昀_2000212322; +package com.java.minxi.java_20240418.java_2302_易志昀_2344310235; public class Student { public int id; -- Gitee From a0d8f353717d1af6935c5da32c4be419d01a26a9 Mon Sep 17 00:00:00 2001 From: yizhiyun <2094853677@qq.com> Date: Tue, 23 Apr 2024 22:16:12 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=E4=BA=A4=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ACd.java" | 98 +++++++++++++++++++ .../ZY.java" | 55 +++++++++++ 2 files changed, 153 insertions(+) create mode 100644 "work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" create mode 100644 "work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" diff --git "a/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" "b/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" new file mode 100644 index 0000000..37e7710 --- /dev/null +++ "b/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" @@ -0,0 +1,98 @@ +package com.java.minxi.java2302.work.com.java.minxi.java_20240423.java_2302_易志昀_2344310235; + +public class ACd { + public String logo; + public int weight; + public String kind; + + public boolean wash(){ + if(this.kind.equals("洗衣机")){ + System.out.println(this.logo+this.kind+"正在洗衣服"); + return true; + }else { + System.out.println("不是洗衣机怎么洗衣服"); + return false; + } + } + + public boolean cook(){ + if(this.kind.equals("电饭锅")){ + System.out.println(this.logo+this.kind+"正在炖鸡汤"); + return true; + }else { + System.out.println("不是电饭锅怎么做饭"); + return false; + } + } + + public void weigh(){ + System.out.println(this.logo+this.kind+"有"+weight+"kg重"); + } + + public ACd(){} + public ACd(String logo, int weight, String kind) { + this.logo = logo; + this.weight = weight; + this.kind = kind; + } + + public String getLogo() { + return logo; + } + + public void setLogo(String logo) { + this.logo = logo; + } + + public int getWeight() { + return weight; + } + + public void setWeight(int weight) { + this.weight = weight; + } + + public String getKind() { + return kind; + } + + public void setKind(String kind) { + this.kind = kind; + } + + public static class Air_conditioner{ + public String logo; + public String kind; + + public void cold(){ + System.out.println(this.logo+this.kind+"正在制冷"); + } + public void hot(){ + System.out.println(this.logo+this.kind+"正在制热"); + } + public Air_conditioner() { + } + + public Air_conditioner(String logo, String kind) { + this.logo = logo; + this.kind = kind; + } + + public String getLogo() { + return logo; + } + + public void setLogo(String logo) { + this.logo = logo; + } + + public String getKind() { + return kind; + } + + public void setKind(String kind) { + this.kind = kind; + } + } + } + diff --git "a/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" "b/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" new file mode 100644 index 0000000..4740a91 --- /dev/null +++ "b/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" @@ -0,0 +1,55 @@ +package com.java.minxi.java2302.work.com.java.minxi.java_20240423.java_2302_易志昀_2344310235; +public class ZY { + public static void main(String[] args) { + ACd xyj=new ACd(); + xyj.logo="海尔"; + xyj.weight=1; + xyj.kind="洗衣机"; + ACd dfg=new ACd(); + dfg.logo="美的"; + dfg.weight=2; + dfg.kind="电饭锅"; + ACd bx=new ACd(); + bx.logo="海尔"; + bx.weight=50; + bx.kind="冰箱"; + ACd.Air_conditioner kt= new ACd.Air_conditioner(); + kt.logo="大金"; + kt.kind="空调"; + xyj.wash(); + dfg.cook(); + bx.weigh(); + kt.cold(); + + ACd xyj1=new ACd(); + xyj1.setLogo("海尔"); + xyj1.setWeight(1); + xyj1.setKind("洗衣机"); + ACd dfg1=new ACd(); + dfg1.setLogo("美的"); + dfg1.setWeight(2); + dfg1.setKind("电饭锅"); + ACd bx1=new ACd(); + bx1.setLogo("海尔"); + bx1.setWeight(50); + bx1.setKind("冰箱"); + ACd.Air_conditioner kt1=new ACd.Air_conditioner(); + kt1.setLogo("大金"); + kt1.setKind("空调"); + xyj1.wash(); + dfg1.cook(); + bx1.weigh(); + kt1.cold(); + + ACd xyj2=new ACd("海尔",1,"洗衣机"); + ACd dfg2=new ACd("美的",2,"电饭锅"); + ACd bx2=new ACd("海尔",50,"冰箱"); + ACd.Air_conditioner kt2=new ACd.Air_conditioner("大金","空调"); + xyj2.wash(); + dfg2.cook(); + bx2.weigh(); + kt2.cold(); + } + +} + -- Gitee