代码调整
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.njcn.gather.storage.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.njcn.db.mybatisplus.handler.DynamicTableNameHandler;
|
||||
import com.njcn.db.mybatisplus.service.impl.ReplenishMybatisServiceImpl;
|
||||
@@ -12,9 +13,11 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 接收检测的原始数据以及计算后的结果
|
||||
*
|
||||
* @author chendaofei
|
||||
*/
|
||||
@Service
|
||||
@@ -25,71 +28,63 @@ public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl<Detect
|
||||
|
||||
|
||||
@Override
|
||||
public Boolean acceptAdNon(List<AdNonHarmonicResult> adNonHarmonicResultList,String code) {
|
||||
public Boolean acceptAdNon(List<AdNonHarmonicResult> adNonHarmonicResultList, String code) {
|
||||
String adNonTable = "ad_non_harmonic_";
|
||||
DynamicTableNameHandler.setTableName(adNonTable +code);
|
||||
for(AdNonHarmonicResult item :adNonHarmonicResultList){
|
||||
adNonHarmonicService.remove(new LambdaQueryWrapper<AdNonHarmonicResult>()
|
||||
.eq(AdNonHarmonicResult::getMonitorId,item.getMonitorId())
|
||||
.eq(AdNonHarmonicResult::getSort,item.getSort())
|
||||
.eq(AdNonHarmonicResult::getScriptId,item.getScriptId())
|
||||
);
|
||||
DynamicTableNameHandler.setTableName(adNonTable + code);
|
||||
List<String> monitorIds = adNonHarmonicResultList.stream().map(AdNonHarmonicResult::getMonitorId).distinct().collect(Collectors.toList());
|
||||
if(CollUtil.isNotEmpty(monitorIds)){
|
||||
adNonHarmonicService.remove(new LambdaQueryWrapper<AdNonHarmonicResult>().in(AdNonHarmonicResult::getMonitorId, monitorIds).eq(AdNonHarmonicResult::getScriptId,adNonHarmonicResultList.get(0).getScriptId()));
|
||||
adNonHarmonicService.saveBatch(adNonHarmonicResultList, 100);
|
||||
}
|
||||
|
||||
adNonHarmonicService.saveBatch(adNonHarmonicResultList,100);
|
||||
DynamicTableNameHandler.remove();
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean acceptAd(List<AdHarmonicResult> adHarmonicResultList,String code) {
|
||||
public Boolean acceptAd(List<AdHarmonicResult> adHarmonicResultList, String code) {
|
||||
String adTable = "ad_harmonic_";
|
||||
DynamicTableNameHandler.setTableName(adTable +code);
|
||||
DynamicTableNameHandler.setTableName(adTable + code);
|
||||
List<String> monitorIds = adHarmonicResultList.stream().map(AdHarmonicResult::getMonitorId).distinct().collect(Collectors.toList());
|
||||
if(CollUtil.isNotEmpty(monitorIds)){
|
||||
this.remove(new LambdaQueryWrapper<AdHarmonicResult>().in(AdHarmonicResult::getMonitorId, monitorIds).eq(AdHarmonicResult::getScriptId,adHarmonicResultList.get(0).getScriptId()));
|
||||
this.saveBatch(adHarmonicResultList, 100);
|
||||
|
||||
for(AdHarmonicResult item :adHarmonicResultList){
|
||||
this.remove(new LambdaQueryWrapper<AdHarmonicResult>()
|
||||
.eq(AdHarmonicResult::getMonitorId,item.getMonitorId())
|
||||
.eq(AdHarmonicResult::getSort,item.getSort())
|
||||
.eq(AdHarmonicResult::getScriptId,item.getScriptId())
|
||||
);
|
||||
}
|
||||
|
||||
this.saveBatch(adHarmonicResultList,100);
|
||||
DynamicTableNameHandler.remove();
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean acceptAdNonResult(List<AdNonHarmonicResult> adNonHarmonicResultList,String code) {
|
||||
public Boolean acceptAdNonResult(List<AdNonHarmonicResult> adNonHarmonicResultList, String code) {
|
||||
String adNonTableResult = "ad_non_harmonic_result_";
|
||||
DynamicTableNameHandler.setTableName(adNonTableResult +code);
|
||||
DynamicTableNameHandler.setTableName(adNonTableResult + code);
|
||||
|
||||
for(AdNonHarmonicResult item :adNonHarmonicResultList){
|
||||
for (AdNonHarmonicResult item : adNonHarmonicResultList) {
|
||||
adNonHarmonicService.remove(new LambdaQueryWrapper<AdNonHarmonicResult>()
|
||||
.eq(AdNonHarmonicResult::getMonitorId,item.getMonitorId())
|
||||
.eq(AdNonHarmonicResult::getSort,item.getSort())
|
||||
.eq(AdNonHarmonicResult::getScriptId,item.getScriptId())
|
||||
.eq(AdNonHarmonicResult::getMonitorId, item.getMonitorId())
|
||||
.eq(AdNonHarmonicResult::getSort, item.getSort())
|
||||
.eq(AdNonHarmonicResult::getScriptId, item.getScriptId())
|
||||
|
||||
);
|
||||
}
|
||||
adNonHarmonicService.saveBatch(adNonHarmonicResultList,100);
|
||||
adNonHarmonicService.saveBatch(adNonHarmonicResultList, 100);
|
||||
DynamicTableNameHandler.remove();
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean acceptAdResult(List<AdHarmonicResult> adHarmonicResultList,String code) {
|
||||
public Boolean acceptAdResult(List<AdHarmonicResult> adHarmonicResultList, String code) {
|
||||
String adTableResult = "ad_harmonic_result_";
|
||||
DynamicTableNameHandler.setTableName(adTableResult +code);
|
||||
for(AdHarmonicResult item :adHarmonicResultList){
|
||||
DynamicTableNameHandler.setTableName(adTableResult + code);
|
||||
for (AdHarmonicResult item : adHarmonicResultList) {
|
||||
this.remove(new LambdaQueryWrapper<AdHarmonicResult>()
|
||||
.eq(AdHarmonicResult::getMonitorId,item.getMonitorId())
|
||||
.eq(AdHarmonicResult::getSort,item.getSort())
|
||||
.eq(AdHarmonicResult::getScriptId,item.getScriptId())
|
||||
.eq(AdHarmonicResult::getMonitorId, item.getMonitorId())
|
||||
.eq(AdHarmonicResult::getSort, item.getSort())
|
||||
.eq(AdHarmonicResult::getScriptId, item.getScriptId())
|
||||
|
||||
);
|
||||
}
|
||||
this.saveBatch(adHarmonicResultList,100);
|
||||
this.saveBatch(adHarmonicResultList, 100);
|
||||
DynamicTableNameHandler.remove();
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user