Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts: # jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICet_4Service.java # jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java
This commit is contained in:
commit
1a078ceddd
|
@ -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 {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -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<CetClean> {
|
||||||
|
}
|
|
@ -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<CetCleanMapper, CetClean> {
|
||||||
|
}
|
|
@ -24,4 +24,5 @@ public interface ICet_4Service extends IService<Cet_4> {
|
||||||
Result<JSONObject> getRateByMajor(JSONObject webData);
|
Result<JSONObject> getRateByMajor(JSONObject webData);
|
||||||
|
|
||||||
Result<JSONObject> getDataByStudent(Integer studentId, String studentName);
|
Result<JSONObject> getDataByStudent(Integer studentId, String studentName);
|
||||||
|
boolean cleanData();
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,12 +5,15 @@ import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
|
||||||
|
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.modules.entity.Cet4_major;
|
import org.jeecg.modules.entity.Cet4_major;
|
||||||
|
import org.jeecg.modules.entity.CetClean;
|
||||||
import org.jeecg.modules.entity.Cet_4;
|
import org.jeecg.modules.entity.Cet_4;
|
||||||
import org.jeecg.modules.mapper.Cet4_majorMapper;
|
import org.jeecg.modules.mapper.Cet4_majorMapper;
|
||||||
import org.jeecg.modules.mapper.Cet_4Mapper;
|
import org.jeecg.modules.mapper.Cet_4Mapper;
|
||||||
import org.jeecg.modules.service.CenterService;
|
import org.jeecg.modules.service.CenterService;
|
||||||
|
import org.jeecg.modules.service.CetCleanService;
|
||||||
import org.jeecg.modules.service.ICet_4Service;
|
import org.jeecg.modules.service.ICet_4Service;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.data.redis.core.RedisTemplate;
|
import org.springframework.data.redis.core.RedisTemplate;
|
||||||
|
@ -41,6 +44,8 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
|
||||||
private CenterService centerService;
|
private CenterService centerService;
|
||||||
@Resource
|
@Resource
|
||||||
private Cet4_majorMapper cet4_majorMapper;
|
private Cet4_majorMapper cet4_majorMapper;
|
||||||
|
@Autowired
|
||||||
|
CetCleanService cetCleanService;
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private RedisTemplate<String,Object> redisTemplate;
|
private RedisTemplate<String,Object> redisTemplate;
|
||||||
|
@ -536,6 +541,18 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
|
||||||
return Result.ok(result);
|
return Result.ok(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value = "仅用作清洗数据")
|
||||||
|
@Override
|
||||||
|
public boolean cleanData() {
|
||||||
|
LambdaQueryWrapper<CetClean> cleanWrapper=new LambdaQueryWrapper<>();
|
||||||
|
cleanWrapper.groupBy(CetClean::getCollege);
|
||||||
|
List<CetClean> list = cetCleanService.list(cleanWrapper);
|
||||||
|
Set<String> collegeSet = list.stream().map(CetClean::getCollege).collect(Collectors.toSet());
|
||||||
|
LambdaQueryWrapper<Cet_4> cet4Wrapper=new LambdaQueryWrapper<>();
|
||||||
|
cet4Wrapper.notIn(Cet_4::getCollege,collegeSet);
|
||||||
|
return remove(cet4Wrapper);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 依据学生id和姓名获取四级数据
|
* 依据学生id和姓名获取四级数据
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue