From dfb445fdaf3f3613069f43310364657a72da6304 Mon Sep 17 00:00:00 2001 From: yy <2565886549@qq.com> Date: Sun, 15 Dec 2024 21:58:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?= =?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?= =?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 296 +++++------------- .../edu/hust/conf/ConfigurationManager.java | 2 +- 2 files changed, 71 insertions(+), 227 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f042c63..ec3e4b2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,58 +1,18 @@ + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -278,6 +234,10 @@ + + @@ -299,18 +259,6 @@ - - - - + - - - + + - - - - + + - + + - - - - + + - + + - - - - + + - + + - - - - + + - - - - - + + - - - - - - - - + @@ -551,6 +417,7 @@ + 1529592741848 @@ -669,47 +536,24 @@ - - - - - - - - - diff --git a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java index dbae85b..f800835 100644 --- a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java +++ b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java @@ -4,7 +4,7 @@ import java.io.InputStream; import java.util.Properties; /** - * 配置文件管理类 + * 配置文件管理类两个号 * 主要的功能:从特定的properties文件中读取相应的key/value */ public class ConfigurationManager { -- 2.34.1 From 74d2d796e5221789710b39f3cfc4a319179be81f Mon Sep 17 00:00:00 2001 From: qian <2269112473@qq.com> Date: Mon, 16 Dec 2024 00:18:21 +0800 Subject: [PATCH 2/6] 111 --- src/main/java/cn/edu/hust/conf/ConfigurationManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java index f800835..bc827ba 100644 --- a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java +++ b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java @@ -11,7 +11,7 @@ public class ConfigurationManager { private static Properties prop=new Properties(); /** - * 通过静态代码块加载配置文件 + * ..........通过静态代码块加载配置文件 */ static{ try -- 2.34.1 From c3f011f88e9c65ad2c33cb9c53107af6134fabc5 Mon Sep 17 00:00:00 2001 From: qian <2269112473@qq.com> Date: Mon, 16 Dec 2024 12:37:08 +0800 Subject: [PATCH 3/6] 1 --- src/main/java/cn/edu/hust/conf/ConfigurationManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java index bc827ba..e9a7acf 100644 --- a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java +++ b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java @@ -40,6 +40,7 @@ public class ConfigurationManager { * 获取整数变量 * @param key * @return + * 11111 */ public static Integer getInteger(String key) { -- 2.34.1 From a11538d1a3d61c9277cf347fbb52e6fc633f4fb6 Mon Sep 17 00:00:00 2001 From: qian <2269112473@qq.com> Date: Mon, 16 Dec 2024 14:10:53 +0800 Subject: [PATCH 4/6] 1 --- .../java/cn/edu/hust/session/CategorySortKey.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/cn/edu/hust/session/CategorySortKey.java b/src/main/java/cn/edu/hust/session/CategorySortKey.java index cdc07ee..27f0600 100644 --- a/src/main/java/cn/edu/hust/session/CategorySortKey.java +++ b/src/main/java/cn/edu/hust/session/CategorySortKey.java @@ -4,22 +4,26 @@ package cn.edu.hust.session; import scala.math.Ordered; public class CategorySortKey implements Ordered, java.io.Serializable { - + // 定义三个 Long 类型的字段，表示点击数、订单数和支付数 private Long clickCount; private Long orderCount; private Long payCount; - + // 实现 Ordered 接口中的 compare 方法，进行排序比较 @Override public int compare(CategorySortKey categorySortKey) { + // 先比较点击数，如果当前对象的点击数与传入对象的点击数不相等，则按点击数排序 if(clickCount-categorySortKey.getClickCount()!=0) { return (int) (clickCount-categorySortKey.getClickCount()); - }else if(clickCount-categorySortKey.getClickCount()==0&&orderCount-categorySortKey.getOrderCount()!=0) + } + // 如果点击数相等，再比较订单数 + else if(clickCount-categorySortKey.getClickCount()==0&&orderCount-categorySortKey.getOrderCount()!=0) { return (int) (orderCount-categorySortKey.getOrderCount()); } + // 如果点击数和订单数都相等，再比较支付数 else if(clickCount-categorySortKey.getClickCount()==0&&orderCount-categorySortKey.getOrderCount()==0&&payCount-categorySortKey.getPayCount()!=0) - return (int) (payCount-categorySortKey.getPayCount()); + return (int) (payCount-categorySortKey.getPayCount());// 如果点击数、订单数和支付数都相等，则返回 0，表示相等 return 0; } -- 2.34.1 From 42a52025e33c655986d5e3121113dd94083c10f7 Mon Sep 17 00:00:00 2001 From: qian <2269112473@qq.com> Date: Mon, 16 Dec 2024 14:13:44 +0800 Subject: [PATCH 5/6] 11 --- .idea/jarRepositories.xml | 20 +++++++++++++++++++ .../cn/edu/hust/session/CategorySortKey.java | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/edu/hust/session/CategorySortKey.java b/src/main/java/cn/edu/hust/session/CategorySortKey.java index 27f0600..2449cff 100644 --- a/src/main/java/cn/edu/hust/session/CategorySortKey.java +++ b/src/main/java/cn/edu/hust/session/CategorySortKey.java @@ -26,7 +26,7 @@ public class CategorySortKey implements Ordered, java.io.Serial return (int) (payCount-categorySortKey.getPayCount());// 如果点击数、订单数和支付数都相等，则返回 0，表示相等 return 0; } - +//11 @Override public boolean $less(CategorySortKey categorySortKey) { if(clickCount Date: Mon, 16 Dec 2024 14:25:41 +0800 Subject: [PATCH 6/6] 1 --- .idea/encodings.xml | 2 + .idea/workspace.xml | 92 +++++++++++++++++-- .../edu/hust/conf/ConfigurationManager.java | 1 - .../cn/edu/hust/session/CategorySortKey.java | 4 +- 4 files changed, 88 insertions(+), 11 deletions(-) diff --git a/.idea/encodings.xml b/.idea/encodings.xml index b26911b..af673e7 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -2,5 +2,7 @@ + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ec3e4b2..680a1a1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,9 +4,11 @@ - + + + + - diff --git a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java index e9a7acf..bc827ba 100644 --- a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java +++ b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java @@ -40,7 +40,6 @@ public class ConfigurationManager { * 获取整数变量 * @param key * @return - * 11111 */ public static Integer getInteger(String key) { diff --git a/src/main/java/cn/edu/hust/session/CategorySortKey.java b/src/main/java/cn/edu/hust/session/CategorySortKey.java index 2449cff..7952ec0 100644 --- a/src/main/java/cn/edu/hust/session/CategorySortKey.java +++ b/src/main/java/cn/edu/hust/session/CategorySortKey.java @@ -23,8 +23,8 @@ public class CategorySortKey implements Ordered, java.io.Serial } // 如果点击数和订单数都相等，再比较支付数 else if(clickCount-categorySortKey.getClickCount()==0&&orderCount-categorySortKey.getOrderCount()==0&&payCount-categorySortKey.getPayCount()!=0) - return (int) (payCount-categorySortKey.getPayCount());// 如果点击数、订单数和支付数都相等，则返回 0，表示相等 - return 0; + return (int) (payCount-categorySortKey.getPayCount()); + return 0;// 如果点击数、订单数和支付数都相等，则返回 0，表示相等 } //11 @Override -- 2.34.1