From 736a7bf3bdf46c01dac88ef8f252b9be9f693871 Mon Sep 17 00:00:00 2001 From: YuNan <3194726156@qq.com> Date: Sun, 16 Mar 2025 15:13:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=95=B0=E6=8D=AE=E4=B8=BANa?= =?UTF-8?q?N=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CenterServiceImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java index 68fc6a7a..7dadc1cc 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java @@ -209,10 +209,10 @@ public class CenterServiceImpl extends ServiceImpl implement public Result getData(String college, String major, String entryDate) { //判断是否存在缓存 String key = "getData:" + college + major + entryDate; - if (Boolean.TRUE.equals(redisTemplate.hasKey(key))) { - System.out.println((JSONObject) redisTemplate.opsForValue().get(key)); - return Result.ok((JSONObject) redisTemplate.opsForValue().get(key)); - } +// if (Boolean.TRUE.equals(redisTemplate.hasKey(key))) { +// System.out.println((JSONObject) redisTemplate.opsForValue().get(key)); +// return Result.ok((JSONObject) redisTemplate.opsForValue().get(key)); +// } //获取所有batch JSONObject batch = getBatch(); JSONArray batchsArray = batch.getJSONArray("batches"); @@ -339,8 +339,8 @@ public class CenterServiceImpl extends ServiceImpl implement json.put("batch", batchList.get(i)); json.put("attendNumber", attendNumber4[i]);//每个年级的参加人数, json.put("passNumber", passNew4[i]);//每个年级的新通过人数 - json.put("batchpassrate", df.format((passNew4[i] / (double) attendNumber4[i])));//每个批次新通过人数/参加人数 - json.put("gradepassrate", df.format((passNumber[i] / (double) allStudent)));//累计通过 / 总人数 + json.put("batchpassrate", df.format(((attendNumber4[i] == 0) ? 0 : passNew4[i] / (double) attendNumber4[i])));//每个批次新通过人数/参加人数 + json.put("gradepassrate", df.format(((allStudent == 0) ? 0 : passNumber[i] / (double) allStudent)));//累计通过 / 总人数 gradeArray.add(json); resultJson.put(grade[i / 2], gradeArray); } else { @@ -350,8 +350,8 @@ public class CenterServiceImpl extends ServiceImpl implement json.put("batch", batchList.get(j)); json.put("attendNumber", attendNumber4[j]);//每个年级的参加人数, json.put("passNumber", passNew4[j]);//每个年级的新通过人数 - json.put("batchpassrate", df.format((passNew4[j] / (double) attendNumber4[j])));//每个批次新通过人数/参加人数 - json.put("gradepassrate", df.format((passNumber[i + 1] / (double) allStudent)));//累计通过 / 总人数 + json.put("batchpassrate", df.format(((attendNumber4[j] == 0) ? 0 : passNew4[j] / (double) attendNumber4[j])));//每个批次新通过人数/参加人数 + json.put("gradepassrate", df.format(((allStudent == 0) ? 0 : passNumber[i + 1] / (double) allStudent)));//累计通过 / 总人数 gradeArray.add(json); } resultJson.put(grade[i / 2], gradeArray); @@ -363,7 +363,8 @@ public class CenterServiceImpl extends ServiceImpl implement result.put("total", allStudent);//总人数 result.put("totalName", totalName);//总人数 result.put("passNumber", passNumber[n - 1]);//累计通过人数 - result.put("passRate", df.format((passNumber[n - 1] / (double) allStudent)));//累计通过率 + result.put("passRate", df.format(((allStudent == 0) ? 0 : passNumber[n - 1] / (double) allStudent)));//累计通过率 + // 将数据存入缓存 redisTemplate.opsForValue().set(key, result, Duration.ofDays(7)); return Result.ok(result);