diff --git a/BaiHu/Temp/002c9a23-8b0b-d54d-b62f-a15e8399dfaf.jpeg b/BaiHu/Temp/002c9a23-8b0b-d54d-b62f-a15e8399dfaf.jpeg new file mode 100644 index 00000000..e4ecde05 Binary files /dev/null and b/BaiHu/Temp/002c9a23-8b0b-d54d-b62f-a15e8399dfaf.jpeg differ diff --git a/BaiHu/Temp/05f860b4-0812-c4ff-2ee6-95af7db899f1.jpeg b/BaiHu/Temp/05f860b4-0812-c4ff-2ee6-95af7db899f1.jpeg new file mode 100644 index 00000000..e4ecde05 Binary files /dev/null and b/BaiHu/Temp/05f860b4-0812-c4ff-2ee6-95af7db899f1.jpeg differ diff --git a/BaiHu/Temp/1a566169-52c5-a646-7d40-5ac058ac0df6.jpeg b/BaiHu/Temp/1a566169-52c5-a646-7d40-5ac058ac0df6.jpeg new file mode 100644 index 00000000..e4ecde05 Binary files /dev/null and b/BaiHu/Temp/1a566169-52c5-a646-7d40-5ac058ac0df6.jpeg differ diff --git a/BaiHu/Temp/1f755f5b-ffc0-310d-0ec4-519efa36f7a8.jpeg b/BaiHu/Temp/1f755f5b-ffc0-310d-0ec4-519efa36f7a8.jpeg new file mode 100644 index 00000000..e4ecde05 Binary files /dev/null and b/BaiHu/Temp/1f755f5b-ffc0-310d-0ec4-519efa36f7a8.jpeg differ diff --git a/BaiHu/Temp/47762ce8-5409-2701-6c74-b386586d6cb6.jpeg b/BaiHu/Temp/47762ce8-5409-2701-6c74-b386586d6cb6.jpeg new file mode 100644 index 00000000..e4ecde05 Binary files /dev/null and b/BaiHu/Temp/47762ce8-5409-2701-6c74-b386586d6cb6.jpeg differ diff --git a/QingLong/src/main/HTMLParser/Sql/HuiYa.sql b/QingLong/src/main/HTMLParser/Sql/HuiYa.sql index 2e34b31b..1e579955 100644 --- a/QingLong/src/main/HTMLParser/Sql/HuiYa.sql +++ b/QingLong/src/main/HTMLParser/Sql/HuiYa.sql @@ -31,7 +31,7 @@ FROM RankedTasks WHERE - rn = 1 order by model_id; + rn = 1 and seconds_difference>0 order by model_id; #end -- 显示日志 #sql("wxGetJournal") diff --git a/QingLong/src/main/java/com/dsideal/QingLong/HuiYa/Model/HuiYaModel.java b/QingLong/src/main/java/com/dsideal/QingLong/HuiYa/Model/HuiYaModel.java index f581164c..b7b870a0 100644 --- a/QingLong/src/main/java/com/dsideal/QingLong/HuiYa/Model/HuiYaModel.java +++ b/QingLong/src/main/java/com/dsideal/QingLong/HuiYa/Model/HuiYaModel.java @@ -542,7 +542,7 @@ public class HuiYaModel { */ public static List wxGetCostTimeList = new ArrayList<>(); public static DateTime wxGetCostTimeListBeginTime = DateTime.now(); - public static Map wxGetCostMap = new HashMap<>(); + public static Map wxGetCostMap = new HashMap<>(); public void wxGetCostTimeMap() { long between = wxGetCostTimeListBeginTime.between(DateTime.now(), DateUnit.MINUTE);//计算相差时长 @@ -554,11 +554,13 @@ public class HuiYaModel { SqlPara sqlPara = Db.getSqlPara("HuiYa.wxGetCostTime"); wxGetCostTimeList = Db.find(sqlPara); wxGetCostTimeListBeginTime = DateTime.now(); - wxGetCostTimeList.forEach(record -> { + + for (int i = 0; i < wxGetCostTimeList.size(); i++) { + Record record = wxGetCostTimeList.get(i); int model_id = record.getInt("model_id"); - int seconds_difference = record.getInt("seconds_difference"); + long seconds_difference = record.getLong("seconds_difference"); wxGetCostMap.put(model_id, seconds_difference); - }); + } } } @@ -578,19 +580,19 @@ public class HuiYaModel { for (int i = 0; i < list.size(); i++) { Record record = list.get(i); model_id = record.getInt("model_id"); - int seconds_difference = 60;//如果前面的某个模型没有最后一次的执行耗时,那么默认是1分钟 + long seconds_difference = 60;//如果前面的某个模型没有最后一次的执行耗时,那么默认是1分钟 if (wxGetCostMap.containsKey(model_id)) { seconds_difference = wxGetCostMap.get(model_id); } secondsToAdd += seconds_difference; } //再加上当前任务的生成时间 - int current_task_seconds = 60; + long current_task_seconds = 60; if (wxGetCostMap.containsKey(model_id)) { current_task_seconds = wxGetCostMap.get(model_id); } - int m = (secondsToAdd + current_task_seconds) / 60; - int s = (secondsToAdd + current_task_seconds) % 60; + long m = (secondsToAdd + current_task_seconds) / 60; + long s = (secondsToAdd + current_task_seconds) % 60; if (s > 0) { res = "约" + m + "分" + s + "秒后到作品中查看。"; } else {