Big-Data-Lab
/
CET-cmd-2.0
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
xbx 2024-03-27 16:24:18 +08:00
parent 74d0a72bd8 7417bfac04
commit 886e7634d3
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CenterController.java
View File

@ -63,8 +63,8 @@ public class CenterController {
return centerService.getData(college,entrydate);
}
@GetMapping("/getRate/{batch}/{level}")
public Result<JSONObject> getRateByBatch(@PathVariable("batch") Date batch, @PathVariable("level") String level) {
@GetMapping("/getRateByBatch")
public Result<JSONObject> 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<JSONObject> getRateByCollege(@PathVariable("college") String college, @PathVariable("level") String level) {
@GetMapping("/getRateByCollege")
public Result<JSONObject> getRateByCollege(@RequestParam("college") String college, @RequestParam("level") String level) {
if (level.equals("cet4")) {
Cet_4 cet = new Cet_4();
cet.setCollege(college);

6
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java
View File

@ -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_4> 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;
}