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-09 10:34:36 +08:00
parent 12e1dc258a
commit cd78ad0588
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java
View File

@@ -174,7 +174,7 @@ public class PqDevParam {
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public static class QueryParam extends BaseParam { public static class QueryParam extends BaseParam {
@ApiModelProperty("名称") @ApiModelProperty("名称")
//@Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR) // @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR)
private String name; private String name;
@ApiModelProperty(value = "设备模式，字典表（数字、模拟、比对）") @ApiModelProperty(value = "设备模式，字典表（数字、模拟、比对）")

21
device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
View File

@@ -224,7 +224,11 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
@Override @Override
public List<Map<String, Object>> listUnbound(String pattern) { public List<Map<String, Object>> listUnbound(String pattern) {
List<PqDev> pqDevList = this.lambdaQuery().eq(PqDev::getPattern, pattern).eq(PqDev::getState, DataStateEnum.ENABLE.getCode()).isNull(PqDev::getPlanId).list(); List<PqDev> pqDevList = this.lambdaQuery()
.eq(PqDev::getPattern, pattern)
.eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
.isNull(PqDev::getPlanId)
.orderByAsc(PqDev::getCreateTime).list();
List<Map<String, Object>> result = pqDevList.stream().map(pqDev -> { List<Map<String, Object>> result = pqDevList.stream().map(pqDev -> {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("id", pqDev.getId()); map.put("id", pqDev.getId());
@@ -243,7 +247,9 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
.eq(ObjectUtil.isNotNull(param.getCheckResult()), PqDev::getCheckResult, param.getCheckResult()) .eq(ObjectUtil.isNotNull(param.getCheckResult()), PqDev::getCheckResult, param.getCheckResult())
.eq(ObjectUtil.isNotNull(param.getCheckResult()), PqDev::getCheckResult, param.getCheckResult()) .eq(ObjectUtil.isNotNull(param.getCheckResult()), PqDev::getCheckResult, param.getCheckResult())
.eq(ObjectUtil.isNotNull(param.getReportState()), PqDev::getReportState, param.getReportState()) .eq(ObjectUtil.isNotNull(param.getReportState()), PqDev::getReportState, param.getReportState())
.eq(PqDev::getState, DataStateEnum.ENABLE.getCode()).list(); .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
.orderByAsc(PqDev::getCreateTime)
.list();
// List<Map<String, Object>> result = pqDevList.stream().map(pqDev -> { // List<Map<String, Object>> result = pqDevList.stream().map(pqDev -> {
// Map<String, Object> map = new HashMap<>(); // Map<String, Object> map = new HashMap<>();
// map.put("id", pqDev.getId()); // map.put("id", pqDev.getId());
@@ -297,7 +303,10 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
@Override @Override
public List<PqDev> listUnchecked() { public List<PqDev> listUnchecked() {
return this.lambdaQuery().eq(PqDev::getCheckState, CheckStateEnum.UNCHECKED.getValue()).eq(PqDev::getState, DataStateEnum.ENABLE.getCode()).list(); return this.lambdaQuery()
.eq(PqDev::getCheckState, CheckStateEnum.UNCHECKED.getValue())
.eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
.orderByAsc(PqDev::getCreateTime).list();
} }
@Override @Override
@@ -411,11 +420,11 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
for (PreDetection preDetection : preDetections) { for (PreDetection preDetection : preDetections) {
List<PreDetection.MonitorListDTO> monitorList = preDetection.getMonitorList(); List<PreDetection.MonitorListDTO> monitorList = preDetection.getMonitorList();
if(CollUtil.isEmpty(monitorList)){ if (CollUtil.isEmpty(monitorList)) {
PreDetection.MonitorListDTO monitorListDTO; PreDetection.MonitorListDTO monitorListDTO;
for (int i = 1; i <= preDetection.getDevChns(); i++) { for (int i = 1; i <= preDetection.getDevChns(); i++) {
monitorListDTO=new PreDetection.MonitorListDTO(); monitorListDTO = new PreDetection.MonitorListDTO();
monitorListDTO.setLineId(preDetection.getDevIP()+"_"+i); monitorListDTO.setLineId(preDetection.getDevIP() + "_" + i);
monitorListDTO.setLine(i); monitorListDTO.setLine(i);
monitorListDTO.setPt(1); monitorListDTO.setPt(1);
monitorListDTO.setPt(1); monitorListDTO.setPt(1);