From a329b820e45c3f5b0884d1db3261ca7f74918ab7 Mon Sep 17 00:00:00 2001 From: Cool <747682928@qq.com> Date: Wed, 23 Oct 2024 18:51:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/service/ICet_4Service.java | 9 ++++-- .../service/impl/Cet_4ServiceImpl.java | 30 ++++++++++--------- .../service/impl/Cet_6ServiceImpl.java | 12 ++++++-- 3 files changed, 31 insertions(+), 20 deletions(-) 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 7ee23944..81d386e0 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 @@ -2,6 +2,7 @@ package org.jeecg.modules.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.dto.getRateByEntryDateDto; import org.jeecg.modules.dto.getRateByMajorAndLastestBatchDto; @@ -15,7 +16,7 @@ import java.util.Map; /** * @Description: cet_4 * @Author: jeecg-boot - * @Date: 2024-03-26 + * @Date: 2024-03-26 * @Version: V1.0 */ public interface ICet_4Service extends IService { @@ -31,7 +32,8 @@ public interface ICet_4Service extends IService { Result getDataByStudent(JSONObject jsonObject); - JSONObject getGradeByBatch(Date batch,String college); + JSONObject getGradeByBatch(Date batch, String college); + boolean cleanData(); Result getRateByMajorAndLastestBatch(getRateByMajorAndLastestBatchDto getRateByMajorAndLastestBatchParam); @@ -39,5 +41,6 @@ public interface ICet_4Service extends IService { Result getRateByEntryDate(getRateByEntryDateDto getRateByEntryDateDtoParams); Result loadImportDataList(); - List getJsonObjects(Map map); + + List getJsonObjects(List> list); } 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 08a59572..298c130d 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 @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.dto.getRateByEntryDateDto; @@ -626,26 +627,27 @@ public class Cet_4ServiceImpl extends ServiceImpl implements @Override public Result loadImportDataList() { - List list = list(); - Map map = centerService.dealList(list, Cet_4::getBatch); - List res = getJsonObjects(map); + // 创建 QueryWrapper + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("batch", "COUNT(*) AS count") + .groupBy("batch"); + + // 执行查询，获取结果列表 + List> list = this.listMaps(queryWrapper); + List res = getJsonObjects(list); return Result.ok(new JSONObject().fluentPut("data", res)); } @NotNull - public List getJsonObjects(Map map) { + @Override + public List getJsonObjects(List> list) { List res = new ArrayList<>(); - if (map != null && !map.isEmpty()) { - for (Map.Entry entry : map.entrySet()) { - JSONObject jsonObject = new JSONObject(); - //格式化key为"yyyy-MM-dd" - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - jsonObject.fluentPut("batch", sdf.format(entry.getKey())) - .fluentPut("attendNumber", entry.getValue()); - res.add(jsonObject); - } + for (Map map : list) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("batch", map.get("batch")); + jsonObject.put("attendNumber", map.get("count")); + res.add(jsonObject); } - // res按照batch倒序排序 res.sort((o1, o2) -> o2.getString("batch").compareTo(o1.getString("batch"))); return res; } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_6ServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_6ServiceImpl.java index 3d1cabf5..7a2cdc22 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_6ServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_6ServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.Cet4_major; @@ -110,9 +111,14 @@ public class Cet_6ServiceImpl extends ServiceImpl implements @Override public Result loadImportDataList() { - List list = list(); - Map map = centerService.dealList(list, Cet_6::getBatch); - List res =cet4Service.getJsonObjects(map); + // 创建 QueryWrapper + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("batch", "COUNT(*) AS count") + .groupBy("batch"); + + // 执行查询，获取结果列表 + List> list = this.listMaps(queryWrapper); + List res = cet4Service.getJsonObjects(list); return Result.ok(new JSONObject().fluentPut("data", res)); }