From 018b55434cc9acaf050f8a5ed0daf924e04efd27 Mon Sep 17 00:00:00 2001 From: YuNan <3194726156@qq.com> Date: Mon, 9 Sep 2024 21:37:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E5=AD=A6=E7=94=9Fid=E5=92=8C?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E8=8E=B7=E5=8F=96=E5=9B=9B=E7=BA=A7=E6=88=90?= =?UTF-8?q?=E7=BB=A9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/controller/Cet_4Controller.java | 9 +--- .../jeecg/modules/service/ICet_4Service.java | 2 +- .../service/impl/Cet_4ServiceImpl.java | 41 +++++++------------ .../src/test/java/org/jeecg/modules/text.java | 2 +- 4 files changed, 19 insertions(+), 35 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/Cet_4Controller.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/Cet_4Controller.java index 49f23461..c2b483eb 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/Cet_4Controller.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/Cet_4Controller.java @@ -170,13 +170,8 @@ public class Cet_4Controller extends JeecgController { * 依据学生id和姓名获取四级成绩 */ @GetMapping("/getDataByStudent") - public Result getDataByStudent(@RequestParam("id") Integer id, @RequestParam("name") String name){ - // 参数检查 - if (id == null || name == null) { - return Result.error("ID 或姓名不能为空"); - } - - return cet_4Service.getDataByStudent(id , name); + public Result getDataByStudent(@RequestBody JSONObject jsonObject){ + return cet_4Service.getDataByStudent(jsonObject); } } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICet_4Service.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICet_4Service.java index 1afafc30..46cf1ff1 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICet_4Service.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICet_4Service.java @@ -23,6 +23,6 @@ public interface ICet_4Service extends IService { Result getRateByMajor(JSONObject webData); - Result getDataByStudent(Integer studentId, String studentName); + Result getDataByStudent(JSONObject jsonObject); boolean cleanData(); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java index 1802b500..d3487f14 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java @@ -48,7 +48,7 @@ public class Cet_4ServiceImpl extends ServiceImpl implements CetCleanService cetCleanService; @Resource - private RedisTemplate redisTemplate; + private RedisTemplate redisTemplate; @Override @@ -544,12 +544,12 @@ public class Cet_4ServiceImpl extends ServiceImpl implements @ApiOperation(value = "仅用作清洗数据") @Override public boolean cleanData() { - LambdaQueryWrapper cleanWrapper=new LambdaQueryWrapper<>(); + LambdaQueryWrapper cleanWrapper = new LambdaQueryWrapper<>(); cleanWrapper.groupBy(CetClean::getCollege); List list = cetCleanService.list(cleanWrapper); Set collegeSet = list.stream().map(CetClean::getCollege).collect(Collectors.toSet()); - LambdaQueryWrapper cet4Wrapper=new LambdaQueryWrapper<>(); - cet4Wrapper.notIn(Cet_4::getCollege,collegeSet); + LambdaQueryWrapper cet4Wrapper = new LambdaQueryWrapper<>(); + cet4Wrapper.notIn(Cet_4::getCollege, collegeSet); return remove(cet4Wrapper); } @@ -557,30 +557,18 @@ public class Cet_4ServiceImpl extends ServiceImpl implements * 依据学生id和姓名获取四级数据 */ @Override - public Result getDataByStudent(Integer id,String name) { - //判断是否存在缓存 - String key = "getDataByStudent:"+id + name; - if (Boolean.TRUE.equals(redisTemplate.hasKey(key))) { - System.out.println((JSONObject) redisTemplate.opsForValue().get(key)); - return Result.ok((JSONObject) redisTemplate.opsForValue().get(key)); + public Result getDataByStudent(JSONObject jsonObject) { + String name = jsonObject.getString("name"); + Integer id = jsonObject.getInteger("id"); + if (name == null || id == null) { + return Result.error("请填写完整的参数"); } JSONObject result = new JSONObject(); - //收集成绩 - LambdaQueryWrapper Cet_4ResultQW = new LambdaQueryWrapper<>(); - Cet_4ResultQW.select(Cet_4::getResult) - .groupBy(Cet_4::getResult); - - List> Cet_4Result = cet4Mapper.selectMaps(Cet_4ResultQW); - if (Cet_4Result == null) { - return Result.error("查询结果为空"); - } - System.out.println(Cet_4Result); - - result.put("results", Cet_4Result); - - //将数据存入缓存 - redisTemplate.opsForValue().set(key, result); - + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Cet_4::getName, name) + .eq(Cet_4::getId, id); + List list = list(wrapper); + result.put("results", list); return Result.ok(result); } @@ -590,6 +578,7 @@ public class Cet_4ServiceImpl extends ServiceImpl implements queryWrapper.eq(Cet_4::getBatch, batch); return cet4Mapper.selectCount(queryWrapper); } + //获取学院的人数 private long getNumCollege(String college, Date batch) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/text.java b/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/text.java index 3e7c5c8f..663575c2 100644 --- a/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/text.java +++ b/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/text.java @@ -21,7 +21,7 @@ public class text { System.err.println("Cet_4Controller 未正确注入"); return; } - Result result = cet_4Controller.getDataByStudent(2023011559, "余映婵"); +// Result result = cet_4Controller.getDataByStudent(2023011559, "余映婵"); System.out.println(result); } }