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 6f4b68d0..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 @@ -3,6 +3,9 @@ package org.jeecg.modules.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.entity.Cet_4; @@ -35,6 +38,9 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class Cet_4Controller extends JeecgController { @Autowired private ICet_4Service cet_4Service; + + + /** * 分页列表查询 @@ -160,4 +166,12 @@ public class Cet_4Controller extends JeecgController { return super.importExcel(request, response, Cet_4.class); } + /** + * 依据学生id和姓名获取四级成绩 + */ + @GetMapping("/getDataByStudent") + 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 e9eac43d..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 @@ -22,5 +22,7 @@ public interface ICet_4Service extends IService { Result getRateByCollege(JSONObject webData); Result getRateByMajor(JSONObject webData); + + 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 f8f13746..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,21 +544,41 @@ 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); } + /** + * 依据学生id和姓名获取四级数据 + */ + @Override + 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 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); + } + //获取全校人数 private long getNumAll(Date batch) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); 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 new file mode 100644 index 00000000..663575c2 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/text.java @@ -0,0 +1,27 @@ +package org.jeecg.modules; + +import com.alibaba.fastjson.JSONObject; +import org.jeecg.JeecgSystemApplication; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.controller.Cet_4Controller; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest(classes= JeecgSystemApplication.class)//指定要测试的Spring应用程序类 +public class text { + + @Autowired + private Cet_4Controller cet_4Controller; + + @Test + public void T() { + // 检查 cet_4Controller 是否为 null + if (cet_4Controller == null) { + System.err.println("Cet_4Controller 未正确注入"); + return; + } +// Result result = cet_4Controller.getDataByStudent(2023011559, "余映婵"); + System.out.println(result); + } +}