diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CenterController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CenterController.java index e9215344..b6f1a56b 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CenterController.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CenterController.java @@ -63,8 +63,8 @@ public class CenterController { return centerService.getData(college,entrydate); } - @GetMapping("/getRate/{batch}/{level}") - public Result getRateByBatch(@PathVariable("batch") Date batch, @PathVariable("level") String level) { + @GetMapping("/getRateByBatch") + public Result getRateByBatch(@RequestParam("batch") Date batch, @RequestParam("level") String level) { //四六级分开查询 if (level.equals("cet4")) { Cet_4 cet = new Cet_4(); @@ -80,8 +80,8 @@ public class CenterController { } //根据batch/college是否为空判断两种查询方式 - @GetMapping("getRate/{college}/{level}") - public Result getRateByCollege(@PathVariable("college") String college, @PathVariable("level") String level) { + @GetMapping("/getRateByCollege") + public Result getRateByCollege(@RequestParam("college") String college, @RequestParam("level") String level) { if (level.equals("cet4")) { Cet_4 cet = new Cet_4(); cet.setCollege(college); 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 07c3d27c..0fba524c 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 @@ -38,6 +38,10 @@ public class CenterServiceImpl implements CenterService { */ @Override public JSONObject getCollege() { + // 判断是否存在缓存 ‘getBatch’ + if (Boolean.TRUE.equals(redisTemplate.hasKey("getCollege"))) { + return (JSONObject) redisTemplate.opsForValue().get("getCollege"); + } JSONObject result = new JSONObject(); // 收集学院名称 LambdaQueryWrapper Cet_4CollegeQW = new LambdaQueryWrapper<>(); @@ -66,7 +70,7 @@ public class CenterServiceImpl implements CenterService { } result.put("colleges", colleges); // 将数据存入缓存 - redisTemplate.opsForValue().set("getBatch", result); + redisTemplate.opsForValue().set("getCollege", result); return result; }