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-01-17 14:16:56 +08:00
parent 6b33a40200
commit 1d87a607df
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
detection/src/main/java/com/njcn/gather/plan/pojo/enums/PlanResponseEnum.java
View File

@@ -8,7 +8,9 @@ import lombok.Getter;
*/ */
@Getter @Getter
public enum PlanResponseEnum { public enum PlanResponseEnum {
PLAN_REPEATED("A003014", "当前模式下，该计划已存在"); PLAN_REPEATED("A003014", "当前模式下，该计划已存在"),
PLAN_NOT_EXIST("A003015", "该计划不存在"),
SCRIPT_RELATE_DICT_NOT_EXIST("A003016","脚本关联的字典不存在");
private final String message; private final String message;
private final String code; private final String code;

5
detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanVO.java
View File

@@ -92,4 +92,9 @@ public class AdPlanVO {
* 自动生成，用于生成数据表后缀 * 自动生成，用于生成数据表后缀
*/ */
private Integer code; private Integer code;
/**
* 创建时间
*/
private String createTime;
} }

12
detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
View File

@@ -73,6 +73,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
List<AdPlanVO> adPlanVOList = adPlans.stream().map(adPlan -> { List<AdPlanVO> adPlanVOList = adPlans.stream().map(adPlan -> {
AdPlanVO adPlanVO = new AdPlanVO(); AdPlanVO adPlanVO = new AdPlanVO();
BeanUtil.copyProperties(adPlan, adPlanVO); BeanUtil.copyProperties(adPlan, adPlanVO);
adPlanVO.setCreateTime(adPlanVO.getCreateTime().replace("T", " "));
adPlanVO.setDatasourceIds(Arrays.asList(adPlan.getDatasourceId().split(StrUtil.COMMA))); adPlanVO.setDatasourceIds(Arrays.asList(adPlan.getDatasourceId().split(StrUtil.COMMA)));
return adPlanVO; return adPlanVO;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
@@ -320,6 +321,9 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
public List<Map<String, String>> getBigTestItem(String planId) { public List<Map<String, String>> getBigTestItem(String planId) {
List<Map<String, String>> result = new ArrayList<>(); List<Map<String, String>> result = new ArrayList<>();
AdPlan adPlan = this.getById(planId); AdPlan adPlan = this.getById(planId);
if (ObjectUtil.isNull(adPlan)) {
throw new BusinessException(PlanResponseEnum.PLAN_NOT_EXIST);
}
String scriptId = adPlan.getScriptId(); String scriptId = adPlan.getScriptId();
List<PqScriptDtls> scriptDtlsList = pqScriptDtlsService.listPqScriptDtlByScriptId(scriptId); List<PqScriptDtls> scriptDtlsList = pqScriptDtlsService.listPqScriptDtlByScriptId(scriptId);
@@ -332,8 +336,12 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("id", key); map.put("id", key);
DictTree dictTree = dictTreeService.getById(key); DictTree dictTree = dictTreeService.getById(key);
map.put("code", dictTree.getCode()); if(ObjectUtil.isNotNull(dictTree)){
map.put("scriptName", dictTree.getName()); map.put("code", dictTree.getCode());
map.put("scriptName", dictTree.getName());
}else{
throw new BusinessException(PlanResponseEnum.SCRIPT_RELATE_DICT_NOT_EXIST);
}
result.add(map); result.add(map);
}); });

12
device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptDtlsServiceImpl.java
View File

@@ -105,7 +105,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
queryWrapper.selectAll(PqScriptDtls.class) queryWrapper.selectAll(PqScriptDtls.class)
.leftJoin(PqScript.class, PqScript::getId, PqScriptDtls::getScriptId) .leftJoin(PqScript.class, PqScript::getId, PqScriptDtls::getScriptId)
.eq(PqScript::getState, DataStateEnum.ENABLE.getCode()) .eq(PqScript::getState, DataStateEnum.ENABLE.getCode())
.eq(PqScriptDtls::getScriptId, scriptId); .eq(StrUtil.isNotBlank(scriptId), PqScriptDtls::getScriptId, scriptId);
return this.getBaseMapper().selectJoinList(PqScriptDtls.class, queryWrapper); return this.getBaseMapper().selectJoinList(PqScriptDtls.class, queryWrapper);
} }
@@ -125,7 +125,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
if (voltSet.size() == 1 && currSet.size() == 1) { if (voltSet.size() == 1 && currSet.size() == 1) {
Double volt = voltSet.stream().collect(Collectors.toList()).stream().findFirst().get(); Double volt = voltSet.stream().collect(Collectors.toList()).stream().findFirst().get();
Double curr = currSet.stream().collect(Collectors.toList()).stream().findFirst().get(); Double curr = currSet.stream().collect(Collectors.toList()).stream().findFirst().get();
List<PqScriptDtls> pqScriptDtls = this.pqScriptDtls(param.getScriptId(), param.getIsPhaseSequence(), volt, curr,param.getIndexList()); List<PqScriptDtls> pqScriptDtls = this.pqScriptDtls(param.getScriptId(), param.getIsPhaseSequence(), volt, curr, param.getIndexList());
Boolean isValueType = pqScriptMapper.selectScriptIsValueType(param.getScriptId()); Boolean isValueType = pqScriptMapper.selectScriptIsValueType(param.getScriptId());
if (CollUtil.isNotEmpty(pqScriptDtls)) { if (CollUtil.isNotEmpty(pqScriptDtls)) {
/** /**
@@ -159,7 +159,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
checkDataParam.setIndex(freqDtls.getIndex()); checkDataParam.setIndex(freqDtls.getIndex());
checkDataParam.setIsValueTypeName(true); checkDataParam.setIsValueTypeName(true);
issue.setDevValueTypeList(pqScriptCheckDataService.getValueType(checkDataParam)); issue.setDevValueTypeList(pqScriptCheckDataService.getValueType(checkDataParam));
issue.setDesc(ScriptDtlsDesc.getStringBuffer(value,isValueType).toString()); issue.setDesc(ScriptDtlsDesc.getStringBuffer(value, isValueType).toString());
issue.setScriptId(freqDtls.getScriptId()); issue.setScriptId(freqDtls.getScriptId());
issue.setFUn(volt); issue.setFUn(volt);
issue.setFIn(curr); issue.setFIn(curr);
@@ -204,8 +204,6 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
} }
@Override @Override
public List<Integer> getIndexList(String scriptType, String scriptId) { public List<Integer> getIndexList(String scriptType, String scriptId) {
MPJLambdaWrapper<PqScriptDtls> wrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<PqScriptDtls> wrapper = new MPJLambdaWrapper<>();
@@ -216,7 +214,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
return this.getBaseMapper().selectJoinList(PqScriptDtls.class, wrapper).stream().map(PqScriptDtls::getIndex).collect(Collectors.toList()); return this.getBaseMapper().selectJoinList(PqScriptDtls.class, wrapper).stream().map(PqScriptDtls::getIndex).collect(Collectors.toList());
} }
public List<PqScriptDtls> pqScriptDtls(String scriptId, String isPhaseSequence, Double volt, Double curr,List<Integer> indexList) { public List<PqScriptDtls> pqScriptDtls(String scriptId, String isPhaseSequence, Double volt, Double curr, List<Integer> indexList) {
List<PqScriptDtls> pqScriptDtls; List<PqScriptDtls> pqScriptDtls;
MPJLambdaWrapper<PqScriptDtls> queryWrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<PqScriptDtls> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(PqScriptDtls.class) queryWrapper.selectAll(PqScriptDtls.class)
@@ -232,7 +230,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
queryWrapper.eq(PqScriptDtls::getIndex, -1) queryWrapper.eq(PqScriptDtls::getIndex, -1)
.eq(PqScriptDtls::getEnable, 1); .eq(PqScriptDtls::getEnable, 1);
pqScriptDtls = this.list(queryWrapper); pqScriptDtls = this.list(queryWrapper);
}else if(isPhaseSequence.equals(CommonEnum.COEFFICIENT_TEST.getValue())){ } else if (isPhaseSequence.equals(CommonEnum.COEFFICIENT_TEST.getValue())) {
//系数 //系数
queryWrapper.in(PqScriptDtls::getIndex, indexList) queryWrapper.in(PqScriptDtls::getIndex, indexList)
.eq(PqScriptDtls::getEnable, 1); .eq(PqScriptDtls::getEnable, 1);