Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/liaoning' into liaoning

Browse Source
This commit is contained in:
wr
2025-08-27 15:54:27 +08:00
parent 44b4501436 38ed0797e0
commit 39a149090a
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -3724,11 +3724,26 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
PqsTerminalPushLogDTO pqsTerminalPushLogDTO = new PqsTerminalPushLogDTO();
if(Objects.equals(temp.getTerminalType(),6)){
pqsTerminalPushLogDTO.setId(temp.getId());
//如果不存在该设备id,说明设备也被删除，直接走下边的设备删除此处不做处理
String deviceId;
//如果不存在该设备id,说明监测点删除
if(!lineDeviceMap.containsKey(temp.getObjIndex())){
return;
String temLos = "%s监测点名称: %s";
List<String> strings = this.parseTemplateValues(temLos, temp.getTerminalDescribe());
String[] lineName = strings.get(1).split("->");
List<Line> devList = lineById.stream().filter(line -> Objects.equals(line.getName(), lineName[1])).collect(Collectors.toList());
if(CollectionUtils.isEmpty(devList)){
//如果不存在该设备说明设备也被删除，直接走下边删除设备逻辑;
return;
}else {
Line sub = lineById.stream().filter(line -> Objects.equals(line.getName(), lineName[0])).collect(Collectors.toList()).get(0);
Line tempDev = devList.stream().filter(dev->dev.getPid().equals(sub.getId())).collect(Collectors.toList()).get(0);
deviceId = tempDev.getId();
}
}else {
deviceId = lineDeviceMap.get(temp.getObjIndex());
}
String deviceId = lineDeviceMap.get(temp.getObjIndex());
pqsTerminalPushLogDTO.setDevId(deviceId);
pqsTerminalPushLogDTO.setDevName(lineMap.get(deviceId).getName());
@@ -3776,7 +3791,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
pqsTerminalPushLogDTO1.setNodeName(nodeMap.get(nodeId).getName());
pqsTerminalPushLogDTO1.setProcessUpdateFlag(true);
pqsTerminalPushLogDTO1.setProcessNum(processId2);
pqsTerminalPushLogDTOList.add(pqsTerminalPushLogDTO);
pqsTerminalPushLogDTOList.add(pqsTerminalPushLogDTO1);
}else {
pqsTerminalPushLogDTO.setId(temp.getId());
@@ -4074,6 +4089,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
op = Param.DEL_ZN;
List<Line> stationList = logsList.stream().filter(it->it.getLevel().equals(SUB_LEVEL.getCode())).collect(Collectors.toList());
subMap = stationList.stream().collect(Collectors.toMap(Line::getId,Function.identity()));
break;
default:
op=Param.UNKONOW;
@@ -4093,6 +4109,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
}
String subName;
String levelOperate;
String tem;
String nodeName = "";
if(line.getLevel().equals(LINE_LEVEL.getCode())){
levelOperate = LINE_LEVEL.getMessage();
@@ -4105,7 +4122,14 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
}
subName = subMap.get(line.getPids().split(StrUtil.COMMA)[SUB_LEVEL.getCode()]).getName();
String temLos = "%s进行%s%s操作;详细信息: %s名称: %s";
String tem = String.format(temLos,name,op,levelOperate,levelOperate,subName+"_"+line.getName()+nodeName);
if(line.getLevel().equals(LINE_LEVEL.getCode())){
String devName = this.getById(line.getPids().split(StrUtil.COMMA)[DEVICE_LEVEL.getCode()]).getName();
tem = String.format(temLos,name,op,levelOperate,levelOperate,subName+"->"+devName+"->"+line.getName()+nodeName);
}else{
tem = String.format(temLos,name,op,levelOperate,levelOperate,subName+"->"+line.getName()+nodeName);
}
pqsTerminalLogs.setTerminalDescribe(tem);
pqsTerminalLogs.setState(DataStateEnum.ENABLE.getCode());
pqsTerminalLogs.setIsPush(0);

5
pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/ThemeParam.java
View File

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.io.Serializable;
import java.util.List;
@@ -37,11 +38,11 @@ public class ThemeParam implements Serializable {
private String color;
@ApiModelProperty("logo图片")
@NotBlank(message = ValidMessage.LOGO_NOT_BLANK)
@NotNull(message = ValidMessage.LOGO_NOT_BLANK)
private MultipartFile logoFile;
@ApiModelProperty("favicon图标")
@NotBlank(message = ValidMessage.FAVICON_NOT_BLANK)
@NotNull(message = ValidMessage.FAVICON_NOT_BLANK)
private MultipartFile faviconFile;
@ApiModelProperty("切换栏位置")