diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java index 7d70f3ce..982e902c 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java @@ -209,6 +209,7 @@ public class DetectionServiceImpl { result.setMonitorId(devID + "_" + split[1]); result.setScriptId(sourceIssue.getScriptId()); result.setIndex(sourceIssue.getIndex()); + result.setAdType(pqErrSysDtls.get(0).getScriptType()); result.setDataType("avg"); if (map.containsKey(TYPE_T)) { DetectionData t = rangeComparisonList(map.get(TYPE_T), pqErrSysDtls, fData, 1.0, dataRule); @@ -324,6 +325,7 @@ public class DetectionServiceImpl { result.setMonitorId(devID + "_" + split[1]); result.setScriptId(sourceIssue.getScriptId()); result.setIndex(sourceIssue.getIndex()); + result.setAdType(pqErrSysDtls.get(0).getScriptType()); result.setDataType("avg"); //取出源所对应的相别信息 List channelTypeAList = checkData.stream() @@ -372,12 +374,14 @@ public class DetectionServiceImpl { //暂降时间处理数据 Map> dur = devListMap(dev, dataRule, DUR); //理论上根据检测脚本，能知道误差体系，可以知道多个误差体系 - List magErrList = pqErrSysDtls.stream().filter(x -> MAG.equals(x.getScriptType())).collect(Collectors.toList()); - List durErrList = pqErrSysDtls.stream().filter(x -> DUR.equals(x.getScriptType())).collect(Collectors.toList()); + List magErrList = pqErrSysDtls.stream().filter(x -> MAG.equals(x.getScriptCode())).collect(Collectors.toList()); + List durErrList = pqErrSysDtls.stream().filter(x -> DUR.equals(x.getScriptCode())).collect(Collectors.toList()); AdNonHarmonicResult magResult = voltageResult(dev.get(0).getId(), devIdMapComm, sourceIssue, dataRule, mag, magErrList, sourceIssue.getFUn(), MAG); + magResult.setAdType(magErrList.get(0).getScriptType()); AdNonHarmonicResult durResult = voltageResult(dev.get(0).getId(), devIdMapComm, sourceIssue, dataRule, dur, durErrList, sourceIssue.getFFreq(), DUR); - detectionDataDealService.acceptAdNonResult(Arrays.asList(magResult,magResult),code); + durResult.setAdType(durErrList.get(0).getScriptType()); + detectionDataDealService.acceptAdNonResult(Arrays.asList(magResult,durResult),code); List numbers = Arrays.asList(magResult.getResultFlag(), durResult.getResultFlag()).stream().distinct().collect(Collectors.toList()); if (numbers.contains(4)) { return 4; diff --git a/device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java b/device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java index bc8d5b5d..0b3cd31c 100644 --- a/device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java +++ b/device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java @@ -1,5 +1,6 @@ package com.njcn.gather.device.err.pojo.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -33,6 +34,12 @@ public class PqErrSysDtls implements Serializable { */ private String scriptType; + /** + * 脚本项类型Code + */ + @TableField(exist = false) + private String scriptCode; + /** * 误差判断起始值 */ diff --git a/device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java b/device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java index c077c1ad..fd63a686 100644 --- a/device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java +++ b/device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java @@ -8,7 +8,7 @@ import com.njcn.gather.device.err.pojo.param.PqErrSysDtlsParam; import com.njcn.gather.device.err.pojo.param.PqErrSysParam; import com.njcn.gather.device.err.pojo.po.PqErrSysDtls; import com.njcn.gather.device.err.service.IPqErrSysDtlsService; -import com.njcn.gather.device.script.pojo.po.PqScriptDtls; +import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam; import com.njcn.gather.device.script.service.IPqScriptCheckDataService; import com.njcn.gather.system.dictionary.pojo.po.DictTree; import lombok.RequiredArgsConstructor; @@ -18,7 +18,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -72,25 +71,18 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl listPqErrSysDtlsByPqErrSysIdAndTypes(PqErrSysParam.DetectionParam param) { - return this.list(new MPJLambdaWrapper() - .selectAs(DictTree::getCode, PqErrSysDtls::getScriptType) - .leftJoin(DictTree.class, DictTree::getId, PqScriptDtls::getScriptType) - .in(PqErrSysDtls::getId, Arrays.asList("ae86b657f37151d78b7c34ec64eefa10")) -// .eq(PqErrSysDtls::getErrorSysId, param.getErrorSysId()) -// .in(PqErrSysDtls::getErrorSysId, param.getType()) + PqScriptCheckDataParam script = new PqScriptCheckDataParam(); + script.setScriptId(param.getScriptId()); + script.setIndex(param.getIndex()); + script.setIsValueTypeName(false); + List valueType = pqScriptCheckDataService.getValueType(script); + //根据检测脚本id和检测序号，查询出检测子项目 + return this.list(new MPJLambdaWrapper() + .selectAs(DictTree::getCode, PqErrSysDtls::getScriptCode) + .leftJoin(DictTree.class, DictTree::getId, PqErrSysDtls::getScriptType) + .eq(PqErrSysDtls::getErrorSysId, param.getErrorSysId()) + .in(PqErrSysDtls::getScriptType, valueType) ); -// PqScriptCheckDataParam script = new PqScriptCheckDataParam(); -// script.setScriptId(param.getScriptId()); -// script.setIndex(param.getIndex()); -// script.setIsValueTypeName(false); -// List valueType = pqScriptCheckDataService.getValueType(script); -// //根据检测脚本id和检测序号，查询出检测子项目 -// return this.list(new MPJLambdaWrapper() -// .selectAs(DictTree::getCode, PqScriptDtls::getScriptCode) -// .leftJoin(DictTree.class, DictTree::getId, PqScriptDtls::getScriptType) -// .eq(PqErrSysDtls::getErrorSysId, param.getErrorSysId()) -// .in(PqErrSysDtls::getScriptType, valueType) -// ); } } diff --git a/storage/src/main/java/com/njcn/gather/storage/mapper/AdNonHarmonicMapper.java b/storage/src/main/java/com/njcn/gather/storage/mapper/AdNonHarmonicMapper.java index a857ccfa..d1ba8687 100644 --- a/storage/src/main/java/com/njcn/gather/storage/mapper/AdNonHarmonicMapper.java +++ b/storage/src/main/java/com/njcn/gather/storage/mapper/AdNonHarmonicMapper.java @@ -1,16 +1,9 @@ package com.njcn.gather.storage.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.storage.pojo.po.AdHarmonicResult; +import com.njcn.db.mybatisplus.mapper.BatchBaseMapper; import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface AdNonHarmonicMapper extends BaseMapper { - - - +public interface AdNonHarmonicMapper extends BatchBaseMapper { } diff --git a/storage/src/main/java/com/njcn/gather/storage/mapper/DetectionDataDealMapper.java b/storage/src/main/java/com/njcn/gather/storage/mapper/DetectionDataDealMapper.java index a1e482e7..348085c4 100644 --- a/storage/src/main/java/com/njcn/gather/storage/mapper/DetectionDataDealMapper.java +++ b/storage/src/main/java/com/njcn/gather/storage/mapper/DetectionDataDealMapper.java @@ -1,11 +1,9 @@ package com.njcn.gather.storage.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.db.mybatisplus.mapper.BatchBaseMapper; import com.njcn.gather.storage.pojo.po.AdHarmonicResult; -import org.apache.ibatis.annotations.Mapper; -@Mapper -public interface DetectionDataDealMapper extends BaseMapper { +public interface DetectionDataDealMapper extends BatchBaseMapper { diff --git a/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/AdNonHarmonicMapper.xml b/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/AdNonHarmonicMapper.xml new file mode 100644 index 00000000..d98510dc --- /dev/null +++ b/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/AdNonHarmonicMapper.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/DetectionDataDealMapper.xml b/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/DetectionDataDealMapper.xml new file mode 100644 index 00000000..e163aad9 --- /dev/null +++ b/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/DetectionDataDealMapper.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java index feb76677..d05804cc 100644 --- a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java +++ b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java @@ -1,5 +1,6 @@ package com.njcn.gather.storage.pojo.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; @@ -36,7 +37,7 @@ public class AdHarmonicResult { */ private String scriptId; - + @TableField("`INDEX`") private Integer index; /** diff --git a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java index 894aced4..25b5ccc8 100644 --- a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java +++ b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java @@ -1,5 +1,6 @@ package com.njcn.gather.storage.pojo.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; @@ -36,6 +37,7 @@ public class AdNonHarmonicResult { */ private String scriptId; + @TableField("`INDEX`") private Integer index; /** diff --git a/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java b/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java index 66ccda1e..d4467682 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java @@ -1,12 +1,10 @@ package com.njcn.gather.storage.service; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.storage.pojo.po.AdHarmonicResult; +import com.njcn.db.mybatisplus.service.IReplenishMybatisService; import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult; -import java.util.List; -public interface AdNonHarmonicService extends IService { +public interface AdNonHarmonicService extends IReplenishMybatisService { diff --git a/storage/src/main/java/com/njcn/gather/storage/service/DetectionDataDealService.java b/storage/src/main/java/com/njcn/gather/storage/service/DetectionDataDealService.java index f16cda00..08ebdd7f 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/DetectionDataDealService.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/DetectionDataDealService.java @@ -1,12 +1,12 @@ package com.njcn.gather.storage.service; -import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.db.mybatisplus.service.IReplenishMybatisService; import com.njcn.gather.storage.pojo.po.AdHarmonicResult; import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult; import java.util.List; -public interface DetectionDataDealService extends IService { +public interface DetectionDataDealService extends IReplenishMybatisService { diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java index b9984492..2701bd73 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java @@ -1,23 +1,17 @@ package com.njcn.gather.storage.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.db.mybatisplus.handler.DynamicTableNameHandler; +import com.njcn.db.mybatisplus.service.impl.ReplenishMybatisServiceImpl; import com.njcn.gather.storage.mapper.AdNonHarmonicMapper; -import com.njcn.gather.storage.mapper.DetectionDataDealMapper; -import com.njcn.gather.storage.pojo.po.AdHarmonicResult; import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult; import com.njcn.gather.storage.service.AdNonHarmonicService; -import com.njcn.gather.storage.service.DetectionDataDealService; -import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.List; /** * */ @Service -public class AdNonHarmonicServiceImpl extends ServiceImpl implements AdNonHarmonicService { +public class AdNonHarmonicServiceImpl extends ReplenishMybatisServiceImpl implements AdNonHarmonicService { } diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java index f1cfeeea..13d68fa4 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java @@ -1,7 +1,7 @@ package com.njcn.gather.storage.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.db.mybatisplus.handler.DynamicTableNameHandler; +import com.njcn.db.mybatisplus.service.impl.ReplenishMybatisServiceImpl; import com.njcn.gather.storage.mapper.DetectionDataDealMapper; import com.njcn.gather.storage.pojo.po.AdHarmonicResult; import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult; @@ -18,7 +18,7 @@ import java.util.List; */ @Service @RequiredArgsConstructor -public class DetectionDataServiceImpl extends ServiceImpl implements DetectionDataDealService { +public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl implements DetectionDataDealService { private final AdNonHarmonicService adNonHarmonicService; @@ -43,7 +43,7 @@ public class DetectionDataServiceImpl extends ServiceImpl adNonHarmonicResultList,String code) { - String adNonTableResult = "ad_non_harmonic_"; + String adNonTableResult = "ad_non_harmonic_result_"; DynamicTableNameHandler.setTableName(adNonTableResult +code); adNonHarmonicService.saveBatch(adNonHarmonicResultList,100); DynamicTableNameHandler.remove(); @@ -52,7 +52,7 @@ public class DetectionDataServiceImpl extends ServiceImpl adHarmonicResultList,String code) { - String adTableResult = "ad_harmonic_"; + String adTableResult = "ad_harmonic_result_"; DynamicTableNameHandler.setTableName(adTableResult +code); this.saveBatch(adHarmonicResultList,100); DynamicTableNameHandler.remove();