ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2025-03-24 08:58:37 +08:00
parent ac0a9dd777
commit 610a3c1d13
19 changed files with 662 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/src/main/java/com/njcn/gather/storage/pojo/param/SingleNonHarmParam.java
View File

@@ -1,8 +1,10 @@
package com.njcn.gather.storage.pojo.param;
import io.swagger.models.auth.In;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author hongawen
@@ -39,4 +41,6 @@ public class SingleNonHarmParam implements Serializable {
*/
private Integer sort;
private List<Integer> sortList;
}

5
storage/src/main/java/com/njcn/gather/storage/pojo/po/AdBaseResult.java
View File

@@ -27,4 +27,9 @@ public class AdBaseResult {
* 0.不合格 1.合格
*/
private Integer resultFlag;
/**
* 检测指标，字典表
*/
private String adType;
}

11
storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java
View File

@@ -38,27 +38,30 @@ public interface AdHarmonicService extends IService<AdHarmonicResult> {
/**
* 查询结果数据
*
* @param param
* @return
*/
Map<String, RawResultDataVO> listHarmResultData(StorageParam param) ;
Map<String, RawResultDataVO> listHarmResultData(StorageParam param);
/**
* 获取索引
*
* @param param
* @param isExculdePhaseAngle 是否排除电压相角、电流相角
* @return
*/
List<Integer> getIndex(StorageParam param,Boolean isExculdePhaseAngle);
List<Integer> getIndex(StorageParam param, Boolean isExculdePhaseAngle);
AdHarmonicResult getSingleResult(SingleNonHarmParam singleNonHarmParam);
/**
* 获取所有谐波原始数据
*
* @param scriptId
* @param code
* @param devId 设备ID
* @param devId 设备ID
* @return
*/
List<AdHarmonicResult> lisAll(String code, String devId);
List<AdHarmonicResult> listAll(String scriptId, String code, String devId);
}

3
storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java
View File

@@ -49,9 +49,10 @@ public interface AdNonHarmonicService extends IService<AdNonHarmonicResult> {
/**
* 获取所有原始数据
* @param scriptId
* @param code
* @param devId
* @return
*/
List<AdNonHarmonicResult> listAll(String code,String devId);
List<AdNonHarmonicResult> listAll(String scriptId,String code,String devId);
}

4
storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java
View File

@@ -239,11 +239,11 @@ public class AdHarmonicServiceImpl extends ServiceImpl<AdHarmonicMappper, AdHarm
}
@Override
public List<AdHarmonicResult> lisAll(String code, String devId) {
public List<AdHarmonicResult> listAll(String scriptId, String code, String devId) {
String prefix = "ad_harmonic_" + code;
DynamicTableNameHandler.setTableName(prefix);
MPJLambdaWrapper<AdHarmonicResult> wrapper = new MPJLambdaWrapper<>();
wrapper.likeRight(AdHarmonicResult::getMonitorId, devId);
wrapper.eq(AdHarmonicResult::getScriptId, scriptId).likeRight(AdHarmonicResult::getMonitorId, devId);
List<AdHarmonicResult> results = this.getBaseMapper().selectJoinList(AdHarmonicResult.class, wrapper);
DynamicTableNameHandler.remove();
return results;

5
storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java
View File

@@ -154,11 +154,12 @@ public class AdNonHarmonicServiceImpl extends ServiceImpl<AdNonHarmonicMapper, A
}
@Override
public List<AdNonHarmonicResult> listAll(String code, String devId) {
public List<AdNonHarmonicResult> listAll(String scriptId, String code, String devId) {
String prefix = "ad_non_harmonic_" + code;
DynamicTableNameHandler.setTableName(prefix);
MPJLambdaWrapper<AdNonHarmonicResult> wrapper = new MPJLambdaWrapper<>();
wrapper.likeRight(AdNonHarmonicResult::getMonitorId, devId);
wrapper.eq(AdNonHarmonicResult::getScriptId, scriptId)
.likeRight(AdNonHarmonicResult::getMonitorId, devId);
List<AdNonHarmonicResult> results = this.getBaseMapper().selectJoinList(AdNonHarmonicResult.class, wrapper);
DynamicTableNameHandler.remove();
return results;