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

浙江报告与日志功能

Browse Source
This commit is contained in:
hongawen
2025-04-11 11:03:16 +08:00
parent 6727dee61e
commit 6f890daad6
50 changed files with 2703 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,9 @@
package com.njcn.gather.storage.pojo.param;
import io.swagger.models.auth.In;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
@@ -12,6 +14,8 @@ import java.util.List;
* @data 2025/1/10 16:06
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class SingleNonHarmParam implements Serializable {
private static final long serialVersionUID = 1L;
@@ -36,6 +40,11 @@ public class SingleNonHarmParam implements Serializable {
*/
private String adType;
/**
* 测试项类型，暂态的存在多个
*/
private List<String> valueTypeList;
/**
* 测试项所在脚本的位置
*/
@@ -43,4 +52,35 @@ public class SingleNonHarmParam implements Serializable {
private List<Integer> sortList;
public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, String adType, Integer sort) {
this.planCode = planCode;
this.devId = devId;
this.channelNo = channelNo;
this.adType = adType;
this.sort = sort;
}
public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, String adType, List<Integer> sortList) {
this.planCode = planCode;
this.devId = devId;
this.channelNo = channelNo;
this.adType = adType;
this.sortList = sortList;
}
public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, List<String> valueTypeList, Integer sort) {
this.planCode = planCode;
this.devId = devId;
this.channelNo = channelNo;
this.valueTypeList = valueTypeList;
this.sort = sort;
}
public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, List<String> valueTypeList, List<Integer> sortList) {
this.planCode = planCode;
this.devId = devId;
this.channelNo = channelNo;
this.valueTypeList = valueTypeList;
this.sortList = sortList;
}
}

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

@@ -55,4 +55,12 @@ public interface AdNonHarmonicService extends IService<AdNonHarmonicResult> {
* @return
*/
List<AdNonHarmonicResult> listAll(String scriptId,String code,String devId);
/**
* 根据查询条件查找结果
* @param param 查询条件
*/
List<AdNonHarmonicResult> queryByCondition(SingleNonHarmParam param);
}

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

@@ -230,6 +230,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl<AdHarmonicMappper, AdHarm
.eq(AdHarmonicResult::getSort, singleNonHarmParam.getSort())
.eq(AdHarmonicResult::getAdType, singleNonHarmParam.getAdType());
List<AdHarmonicResult> adHarmonicResults = this.getBaseMapper().selectJoinList(AdHarmonicResult.class, wrapper);
DynamicTableNameHandler.remove();
if (CollectionUtil.isNotEmpty(adHarmonicResults)) {
return adHarmonicResults.get(0);
}

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

@@ -14,6 +14,7 @@ import com.njcn.gather.storage.mapper.AdNonHarmonicMapper;
import com.njcn.gather.storage.pojo.param.SingleNonHarmParam;
import com.njcn.gather.storage.pojo.param.StorageParam;
import com.njcn.gather.storage.pojo.po.AdBaseResult;
import com.njcn.gather.storage.pojo.po.AdHarmonicResult;
import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult;
import com.njcn.gather.storage.pojo.vo.RawDataVO;
import com.njcn.gather.storage.pojo.vo.RawResultDataVO;
@@ -164,6 +165,20 @@ public class AdNonHarmonicServiceImpl extends ServiceImpl<AdNonHarmonicMapper, A
return results;
}
@Override
public List<AdNonHarmonicResult> queryByCondition(SingleNonHarmParam param) {
String prefix = "ad_non_harmonic_result_";
DynamicTableNameHandler.setTableName(prefix + param.getPlanCode());
MPJLambdaWrapper<AdNonHarmonicResult> wrapper = new MPJLambdaWrapper<>();
wrapper.like(AdNonHarmonicResult::getMonitorId, param.getDevId() + "_" + param.getChannelNo())
.in(AdNonHarmonicResult::getSort, param.getSortList())
.in(AdNonHarmonicResult::getAdType, param.getValueTypeList());
List<AdNonHarmonicResult> adNonHarmonicResults = this.getBaseMapper().selectJoinList(AdNonHarmonicResult.class, wrapper);
DynamicTableNameHandler.remove();
return adNonHarmonicResults;
}
private String unit(String code) {
String unit = "";
switch (code) {