From 6d8a6208bfd415af719fa83ca0c5aae592e503ed Mon Sep 17 00:00:00 2001 From: Cool <747682928@qq.com> Date: Mon, 9 Sep 2024 21:04:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E6=B4=97cet4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/entity/CetClean.java | 25 +++++++++++++++++++ .../jeecg/modules/mapper/CetCleanMapper.java | 7 ++++++ .../modules/service/CetCleanService.java | 19 ++++++++++++++ .../jeecg/modules/service/ICet_4Service.java | 1 + .../service/impl/Cet_4ServiceImpl.java | 17 +++++++++++++ 5 files changed, 69 insertions(+) create mode 100644 jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetClean.java create mode 100644 jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/CetCleanMapper.java create mode 100644 jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/CetCleanService.java diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetClean.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetClean.java new file mode 100644 index 00000000..2bbc2395 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CetClean.java @@ -0,0 +1,25 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * Created with IntelliJ IDEA. + * + * @Author: Cool + * @Date: 2024/09/09/20:45 + * @Description: + */ +@TableName("cet_4_20240907") +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="cet_4数据清洗实体类", description="仅用作cet_4数据清洗") +public class CetClean extends Cet_4 { + + + +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/CetCleanMapper.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/CetCleanMapper.java new file mode 100644 index 00000000..5ed6e9c6 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/CetCleanMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.entity.CetClean; + +public interface CetCleanMapper extends BaseMapper { +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/CetCleanService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/CetCleanService.java new file mode 100644 index 00000000..a41e5b2b --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/CetCleanService.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.entity.CetClean; +import org.jeecg.modules.mapper.CetCleanMapper; +import org.springframework.stereotype.Service; + +/** + * Created with IntelliJ IDEA. + * + * @Author: Cool + * @Date: 2024/09/09/20:47 + * @Description: + */ +@Service +@Slf4j +public class CetCleanService extends ServiceImpl { +} 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 64a1b931..e9eac43d 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,4 +22,5 @@ public interface ICet_4Service extends IService { Result getRateByCollege(JSONObject webData); Result getRateByMajor(JSONObject webData); + 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 e4b6327a..f8f13746 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,12 +5,15 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.Cet4_major; +import org.jeecg.modules.entity.CetClean; import org.jeecg.modules.entity.Cet_4; import org.jeecg.modules.mapper.Cet4_majorMapper; import org.jeecg.modules.mapper.Cet_4Mapper; import org.jeecg.modules.service.CenterService; +import org.jeecg.modules.service.CetCleanService; import org.jeecg.modules.service.ICet_4Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -41,6 +44,8 @@ public class Cet_4ServiceImpl extends ServiceImpl implements private CenterService centerService; @Resource private Cet4_majorMapper cet4_majorMapper; + @Autowired + CetCleanService cetCleanService; @Resource private RedisTemplate redisTemplate; @@ -536,6 +541,18 @@ public class Cet_4ServiceImpl extends ServiceImpl implements return Result.ok(result); } + @ApiOperation(value = "仅用作清洗数据") + @Override + public boolean cleanData() { + 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); + return remove(cet4Wrapper); + } + //获取全校人数 private long getNumAll(Date batch) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();