From a562efe488ff3f3d45bc66a8817fed70c576445c Mon Sep 17 00:00:00 2001 From: xbx <1827135378@qq.com> Date: Thu, 30 May 2024 20:51:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A7=A3=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CenterServiceImpl.java | 1 + .../service/impl/Cet_4ServiceImpl.java | 42 +- pom.xml | 877 +++++++++--------- 3 files changed, 474 insertions(+), 446 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 db11b37e..51217506 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 @@ -188,6 +188,7 @@ public class CenterServiceImpl extends ServiceImpl implement //判断是否存在缓存 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)); } //获取所有batch 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 aa1ccc6a..f4892b7c 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 @@ -89,6 +89,7 @@ public class Cet_4ServiceImpl extends ServiceImpl implements throw new RuntimeException(e); } JSONObject jsonObject = new JSONObject(new LinkedHashMap<>()); + JSONObject resultData = new JSONObject(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); //构造查询条件 @@ -98,13 +99,32 @@ public class Cet_4ServiceImpl extends ServiceImpl implements queryWrapper.eq(Cet_4::getBatch, batch).ge(Cet_4::getResult, 425); List result = cet4Mapper.selectList(queryWrapper); collect = result.stream().collect(Collectors.groupingBy(Cet_4::getCollege)); - + //获取全校人数 + long allStudent = getNumAll(batch); + //获取全校通过人数 + LambdaQueryWrapper passQW = new LambdaQueryWrapper<>(); + passQW.eq(Cet_4::getBatch, batch).ge(Cet_4::getResult, 425); + long passStudent = cet4Mapper.selectCount(queryWrapper); + double passRateSum = passStudent / (double) allStudent * 100; + DecimalFormat decimalFormat = new DecimalFormat("#.#"); + String rate = decimalFormat.format(passRateSum); + double res = Double.parseDouble(rate); + resultData.put("sumRate", res); } else { queryWrapper.eq(Cet_4::getCollege, college).eq(Cet_4::getBatch, batch).ge(Cet_4::getResult, 425); List result = cet4Mapper.selectList(queryWrapper); collect = result.stream().collect(Collectors.groupingBy(Cet_4::getMajorname)); - - + //获取学院人数 + long allStudent = getNumCollege(college, batch); + //获取学院通过人数 + LambdaQueryWrapper passQW = new LambdaQueryWrapper<>(); + passQW.eq(Cet_4::getCollege, college).eq(Cet_4::getBatch, batch).ge(Cet_4::getResult, 425); + long passStudent = cet4Mapper.selectCount(queryWrapper); + double passRateSum = passStudent / (double) allStudent * 100; + DecimalFormat decimalFormat = new DecimalFormat("#.#"); + String rate = decimalFormat.format(passRateSum); + double res = Double.parseDouble(rate); + resultData.put("sumRate", res); } // System.out.println(collect); // List result = cet4Mapper.selectList(queryWrapper); @@ -120,7 +140,6 @@ public class Cet_4ServiceImpl extends ServiceImpl implements cet4MajorQW.select(Cet4_major::getMajorname).eq(Cet4_major::getCollege, college).groupBy(Cet4_major::getMajorname); //若为转专业的则剔除 List majorList = cet4_MajorMapper.selectObjs(cet4MajorQW); - System.out.println(majorList); if (majorList.contains(entry.getKey())) { sum = (double) getNumMajor(entry.getKey(), batch); } else { @@ -137,15 +156,14 @@ public class Cet_4ServiceImpl extends ServiceImpl implements } //对jsonObject的值进行排序 List> list = new ArrayList<>(jsonObject.entrySet()); - System.out.println(list); Collections.sort(list, (o1, o2) -> (double) o1.getValue() > (double) o2.getValue() ? -1 : 1); jsonObject.clear(); - for (Map.Entry stringObjectEntry : list) { jsonObject.put(stringObjectEntry.getKey(), stringObjectEntry.getValue()); - } - return Result.OK(jsonObject); + resultData.put("data", jsonObject); + System.out.println(resultData); + return Result.OK(resultData); } @Override @@ -508,12 +526,20 @@ public class Cet_4ServiceImpl extends ServiceImpl implements 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<>(); queryWrapper.eq(Cet_4::getCollege, college).eq(Cet_4::getBatch, batch); return cet4Mapper.selectCount(queryWrapper); } + //获取专业的人数 private long getNumMajor(String major, Date batch) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Cet_4::getMajorname, major).eq(Cet_4::getBatch, batch); diff --git a/pom.xml b/pom.xml index f91856b3..9785786b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,205 +1,206 @@ - - 4.0.0 - org.jeecgframework.boot - jeecg-boot-parent - 3.6.2 - pom - JEECG BOOT ${project.version} + + 4.0.0 + org.jeecgframework.boot + jeecg-boot-parent + 3.6.2 + pom + JEECG BOOT ${project.version} - - - 北京国炬信息技术有限公司 - jeecgos@163.com - http://www.guojusoft.com - - + + + 北京国炬信息技术有限公司 + jeecgos@163.com + http://www.guojusoft.com + + - - http://www.jeecg.com - http://guojusoft.com - http://www.jeecg.com/vip - - - - org.springframework.boot - spring-boot-starter-parent - 2.7.10 - - + + http://www.jeecg.com + http://guojusoft.com + http://www.jeecg.com/vip + - - 3.6.2 - 1.8 - UTF-8 + + org.springframework.boot + spring-boot-starter-parent + 2.7.10 + + - - 2021.0.3 + + 3.6.2 + 1.8 + UTF-8 + + + 2021.0.3 2021.0.1.0 - 2.0.4 + 2.0.4 - 2.2.0 + 2.2.0 1.2.83 - 1.6.0 - 3.0.3 - 2.0.9 - - 42.2.25 - 11.2.0.3 - 4.0 - 8.0.27 - 5.8.23 - - 8.1.1.49 - - - 3.5.3.1 - 4.1.3 - 1.2.19 - 1.9.5 + 1.6.0 + 3.0.3 + 2.0.9 + + 42.2.25 + 11.2.0.3 + 4.0 + 8.0.27 + 5.8.23 + + 8.1.1.49 - - 1.6.6 - 2.6 - 2.1.0 - 3.11.2 - - 1.12.0 - 3.11.0 - 3.2.2 - 1.4.4 - 1.4.7 - 8.0.3 - 1.3.4 - 1.6.1 - 7.4.0 - - 2.17.0 - 1.2.9 - - 1.5.2 - + + 3.5.3.1 + 4.1.3 + 1.2.19 + 1.9.5 - + + 1.6.6 + 2.6 + 2.1.0 + 3.11.2 + + 1.12.0 + 3.11.0 + 3.2.2 + 1.4.4 + 1.4.7 + 8.0.3 + 1.3.4 + 1.6.1 + 7.4.0 + + 2.17.0 + 1.2.9 + + 1.5.2 + + + jeecg-boot-base-core jeecg-module-demo jeecg-module-system - - + + aliyun aliyun Repository https://maven.aliyun.com/repository/public - false - + false + - + jeecg jeecg Repository https://maven.jeecg.org/nexus/content/repositories/jeecg - false - - - - jeecg-snapshots - jeecg-snapshots Repository - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - + false + + + + jeecg-snapshots + jeecg-snapshots Repository + https://oss.sonatype.org/content/repositories/snapshots + + false + + + true + + + - - - org.springframework.boot - spring-boot-starter-test - test - - - junit - junit - test - - - - org.projectlombok - lombok - - - - com.alibaba - fastjson - ${fastjson.version} - - - - org.pegdown - pegdown - ${pegdown.version} - - + + + org.springframework.boot + spring-boot-starter-test + test + + + junit + junit + test + + + + org.projectlombok + lombok + + + + com.alibaba + fastjson + ${fastjson.version} + + + + org.pegdown + pegdown + ${pegdown.version} + + - - - - - org.springframework.cloud - spring-cloud-dependencies + + + + + org.springframework.cloud + spring-cloud-dependencies ${spring-cloud.version} - pom - import - - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies + pom + import + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies ${spring-cloud-alibaba.version} - pom - import - - - io.seata - seata-spring-boot-starter - ${seata.version} - + pom + import + + + io.seata + seata-spring-boot-starter + ${seata.version} + - - - org.jeecgframework.boot - jeecg-system-biz - ${jeecgboot.version} - + + + org.jeecgframework.boot + jeecg-system-biz + ${jeecgboot.version} + - - - org.jeecgframework.boot - jeecg-boot-common - ${jeecgboot.version} - - - - org.jeecgframework.boot - jeecg-boot-base-core - ${jeecgboot.version} - - - - org.jeecgframework.boot - jeecg-system-local-api - ${jeecgboot.version} - - - - org.jeecgframework.boot - jeecg-system-cloud-api - ${jeecgboot.version} - + + + org.jeecgframework.boot + jeecg-boot-common + ${jeecgboot.version} + + + + org.jeecgframework.boot + jeecg-boot-base-core + ${jeecgboot.version} + + + + org.jeecgframework.boot + jeecg-system-local-api + ${jeecgboot.version} + + + + org.jeecgframework.boot + jeecg-system-cloud-api + ${jeecgboot.version} + @@ -207,195 +208,195 @@ jeecg-boot-starter-cloud ${jeecgboot.version} - - - org.jeecgframework.boot - jeecg-boot-starter-job - ${jeecgboot.version} - - - - org.jeecgframework.boot - jeecg-boot-starter-lock - ${jeecgboot.version} - - - - org.jeecgframework.boot - jeecg-boot-starter-rabbitmq - ${jeecgboot.version} - - - - org.jeecgframework.boot - jeecg-boot-starter-shardingsphere - ${jeecgboot.version} - - - org.hibernate - hibernate-core - 5.6.7.Final - - - commons-collections - commons-collections - - - - - org.jeecgframework.boot - hibernate-re - 3.6.1-RC - + + + org.jeecgframework.boot + jeecg-boot-starter-job + ${jeecgboot.version} + + + + org.jeecgframework.boot + jeecg-boot-starter-lock + ${jeecgboot.version} + + + + org.jeecgframework.boot + jeecg-boot-starter-rabbitmq + ${jeecgboot.version} + + + + org.jeecgframework.boot + jeecg-boot-starter-shardingsphere + ${jeecgboot.version} + + + org.hibernate + hibernate-core + 5.6.7.Final + + + commons-collections + commons-collections + + + + + org.jeecgframework.boot + hibernate-re + 3.6.1-RC + - - - org.jeecgframework.boot - jeecg-boot-starter-mongon - ${jeecgboot.version} - - - - org.jeecgframework - kingbase8 - 9.0.0 - runtime - - - - com.dameng - Dm8JdbcDriver18 - 8.1.1.49 - - - com.dameng - DmDialect-for-hibernate5.0 - 8.1.1.49 - - - - com.qiniu - qiniu-java-sdk - ${qiniu-java-sdk.version} - - - okhttp - com.squareup.okhttp3 - - - - - - dom4j - dom4j - ${dom4j.version} - - - - commons-fileupload - commons-fileupload - 1.5 - - - commons-io - commons-io - - - + + + org.jeecgframework.boot + jeecg-boot-starter-mongon + ${jeecgboot.version} + + + + org.jeecgframework + kingbase8 + 9.0.0 + runtime + + + + com.dameng + Dm8JdbcDriver18 + 8.1.1.49 + + + com.dameng + DmDialect-for-hibernate5.0 + 8.1.1.49 + + + + com.qiniu + qiniu-java-sdk + ${qiniu-java-sdk.version} + + + okhttp + com.squareup.okhttp3 + + + + + + dom4j + dom4j + ${dom4j.version} + + + + commons-fileupload + commons-fileupload + 1.5 + + + commons-io + commons-io + + + - - - com.xkcoding.justauth - justauth-spring-boot-starter - ${justauth-spring-boot-starter.version} - - - hutool-core - cn.hutool - - - fastjson - com.alibaba - - - - - com.squareup.okhttp3 - okhttp - 4.4.1 - - - - cn.hutool - hutool-core - ${hutool.version} - - - cn.hutool - hutool-crypto - ${hutool.version} - - - - io.minio - minio - ${minio.version} - - - okio - com.squareup.okio - - - okhttp - com.squareup.okhttp3 - - - - - - org.jeecgframework - jeewx-api - 1.5.2 - - - commons-beanutils - commons-beanutils - - - commons-lang - commons-lang - - - - - - org.jeecgframework - minidao-spring-boot-starter - ${minidao.version} - - - - org.jeecgframework.jimureport - jimureport-spring-boot-starter - ${jimureport-spring-boot-starter.version} - - - autopoi-web - org.jeecgframework - - - - - org.jeecgframework.jimureport - jimureport-nosql-starter - 1.6.0 - - - + + + com.xkcoding.justauth + justauth-spring-boot-starter + ${justauth-spring-boot-starter.version} + + + hutool-core + cn.hutool + + + fastjson + com.alibaba + + + + + com.squareup.okhttp3 + okhttp + 4.4.1 + + + + cn.hutool + hutool-core + ${hutool.version} + + + cn.hutool + hutool-crypto + ${hutool.version} + + + + io.minio + minio + ${minio.version} + + + okio + com.squareup.okio + + + okhttp + com.squareup.okhttp3 + + + + + + org.jeecgframework + jeewx-api + 1.5.2 + + + commons-beanutils + commons-beanutils + + + commons-lang + commons-lang + + + + + + org.jeecgframework + minidao-spring-boot-starter + ${minidao.version} + + + + org.jeecgframework.jimureport + jimureport-spring-boot-starter + ${jimureport-spring-boot-starter.version} + + + autopoi-web + org.jeecgframework + + + + + org.jeecgframework.jimureport + jimureport-nosql-starter + 1.6.0 + + + - - - + + + org.apache.maven.plugins maven-compiler-plugin @@ -407,17 +408,17 @@ - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + org.apache.maven.plugins maven-resources-plugin - 3.1.0 + 3.1.0 woff @@ -428,36 +429,36 @@ - - - + + + src/main/resources true - - src/main/java - - **/*.xml - **/*.json - **/*.ftl - - - - + + src/main/java + + **/*.xml + **/*.json + **/*.ftl + + + + + + + + jeecg + jeecg Repository + http://maven.jeecg.com:8090/nexus/content/repositories/jeecg + + + jeecg-snapshots + jeecg Snapshot Repository + http://maven.jeecg.com:8090/nexus/content/repositories/snapshots/ + + - - - jeecg - jeecg Repository - http://maven.jeecg.com:8090/nexus/content/repositories/jeecg - - - jeecg-snapshots - jeecg Snapshot Repository - http://maven.jeecg.com:8090/nexus/content/repositories/snapshots/ - - - @@ -472,28 +473,28 @@ dev jeecg-boot-nacos:8848 - - - - DEFAULT_GROUP - - - - + + + + DEFAULT_GROUP + + + + - + test @@ -502,14 +503,14 @@ test jeecg-boot-nacos:8848 - - - - DEFAULT_GROUP - - - - + + + + DEFAULT_GROUP + + + + @@ -520,23 +521,23 @@ prod jeecg-boot-nacos:8848 - - - - DEFAULT_GROUP - - - - + + + + DEFAULT_GROUP + + + + - - - SpringCloud - - - jeecg-server-cloud - - + + + SpringCloud + + + jeecg-server-cloud + + \ No newline at end of file