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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
wr
2025-12-10 16:22:42 +08:00
parent 0fdc3edb89 a730ad61b1
commit c03a516931
3 changed files with 237 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java
View File

@@ -45,6 +45,9 @@ public class Knife4jSwaggerConfig {
@Value("${microservice.gateway.url}") @Value("${microservice.gateway.url}")
private String gatewayUrl; private String gatewayUrl;
@Value("${swagger.enable:true}")
private Boolean swaggerEnable;
/** /**
* swagger通用配置 * swagger通用配置
*/ */
@@ -96,7 +99,7 @@ public class Knife4jSwaggerConfig {
//securyContext //securyContext
return new Docket(DocumentationType.SWAGGER_2) return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo()) .apiInfo(apiInfo())
.enable(true) .enable(swaggerEnable)
.select() .select()
// 指定添加swagger注解的方法 // 指定添加swagger注解的方法
// .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) // .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))

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

@@ -156,7 +156,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
private Integer devCD; private Integer devCD;
/** /**
* 终端新增操作 * 终端新增操作
* *
@@ -898,6 +897,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
} }
} }
private void decoderM3d(Device deviceDetail) { private void decoderM3d(Device deviceDetail) {
if (StrUtil.isNotBlank(deviceDetail.getDevKey())) { if (StrUtil.isNotBlank(deviceDetail.getDevKey())) {
deviceDetail.setDevKey(DeviceUtil.decoderString(devCD, deviceDetail.getDevKey())); deviceDetail.setDevKey(DeviceUtil.decoderString(devCD, deviceDetail.getDevKey()));
@@ -1427,7 +1427,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
.collect(Collectors.toList()); .collect(Collectors.toList());
this.removeByIds(substationIds); this.removeByIds(substationIds);
substationMapper.deleteBatchIds(substationIds); substationMapper.deleteBatchIds(substationIds);
@@ -1828,11 +1827,17 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
Voltage voltage = voltageMapper.selectById(line.getPid()); Voltage voltage = voltageMapper.selectById(line.getPid());
//监测点限值 //监测点限值
DictData scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()).getData(); DictData scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()).getData();
System.out.println("======================" + scaleResult);
System.out.println("======================" + scaleResult.getValue());
if (Objects.isNull(scaleResult)) { if (Objects.isNull(scaleResult)) {
throw new BusinessException(CommonResponseEnum.DIC_DATA); throw new BusinessException(CommonResponseEnum.DIC_DATA);
} }
if (StrUtil.isBlank(voltage.getScale())) {
System.out.println(111);
}
float voltageLevel = Float.parseFloat(scaleResult.getValue()); float voltageLevel = Float.parseFloat(scaleResult.getValue());
Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0); Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0);
overlimit.setId(lineDetail.getId()); overlimit.setId(lineDetail.getId());
@@ -2430,16 +2435,16 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
// } // }
// } // }
//更新终端信息 //更新终端信息
List<Device> existIp = deviceMapper.getDeviceBySubId(pids.get(LineBaseEnum.SUB_LEVEL.getCode()), oracleTerminalExcel.getIp(), oracleTerminalExcel.getPort(), null); // List<Device> existIp = deviceMapper.getDeviceBySubId(pids.get(LineBaseEnum.SUB_LEVEL.getCode()), oracleTerminalExcel.getIp(), oracleTerminalExcel.getPort(), null);
if (CollectionUtil.isNotEmpty(existIp)) { // if (CollectionUtil.isNotEmpty(existIp)) {
Device device = existIp.get(0); // Device device = existIp.get(0);
if (!device.getId().equalsIgnoreCase(temp.getId())) { // if (!device.getId().equalsIgnoreCase(temp.getId())) {
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "IP地址：" + oracleTerminalExcel.getIp() + "已存在")); // oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "IP地址：" + oracleTerminalExcel.getIp() + "已存在"));
//删除刚刚新增装置信息 // //删除刚刚新增装置信息
this.baseMapper.deleteById(temp.getId()); // this.baseMapper.deleteById(temp.getId());
continue; // continue;
} // }
} // }
//处理终端厂家 //处理终端厂家
DictData manufacturer = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.DEV_MANUFACTURER.getName(), oracleTerminalExcel.getManufacturer()).getData(); DictData manufacturer = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.DEV_MANUFACTURER.getName(), oracleTerminalExcel.getManufacturer()).getData();
if (Objects.isNull(manufacturer)) { if (Objects.isNull(manufacturer)) {
@@ -2548,16 +2553,16 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
BeanUtils.copyProperties(oracleTerminalExcel, lineDetail); BeanUtils.copyProperties(oracleTerminalExcel, lineDetail);
lineDetail.setId(temp.getId()); lineDetail.setId(temp.getId());
//判断监测点号是否已被占用 //判断监测点号是否已被占用
List<LineDetail> lineDetails = lineDetailMapper.getLineDetail(pids.get(LineBaseEnum.DEVICE_LEVEL.getCode()), Stream.of(oracleTerminalExcel.getLineNum()).collect(Collectors.toList())); // List<LineDetail> lineDetails = lineDetailMapper.getLineDetail(pids.get(LineBaseEnum.DEVICE_LEVEL.getCode()), Stream.of(oracleTerminalExcel.getLineNum()).collect(Collectors.toList()));
if (CollectionUtil.isNotEmpty(lineDetails)) { // if (CollectionUtil.isNotEmpty(lineDetails)) {
LineDetail lineDetail1 = lineDetails.get(0); // LineDetail lineDetail1 = lineDetails.get(0);
if (lineDetail1.getId().equalsIgnoreCase(temp.getId())) { // if (lineDetail1.getId().equalsIgnoreCase(temp.getId())) {
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "监测点线路号：" + oracleTerminalExcel.getLineNum() + "已存在")); // oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "监测点线路号：" + oracleTerminalExcel.getLineNum() + "已存在"));
//删除刚刚新增装置信息 // //删除刚刚新增装置信息
this.baseMapper.deleteById(temp.getId()); // this.baseMapper.deleteById(temp.getId());
continue; // continue;
} // }
} // }
//获取该监测点的限值数据 //获取该监测点的限值数据
// List<OverLimitExcel> overLimitList = overLimitExcels.stream() // List<OverLimitExcel> overLimitList = overLimitExcels.stream()
// .filter(overLimitExcel -> overLimitExcel.getId().equals(oracleTerminalExcel.getId())) // .filter(overLimitExcel -> overLimitExcel.getId().equals(oracleTerminalExcel.getId()))
@@ -3949,7 +3954,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (!CollectionUtils.isEmpty(pqsTerminalPushLogDTOList1)) { if (!CollectionUtils.isEmpty(pqsTerminalPushLogDTOList1)) {
String devNameString = pqsTerminalPushLogDTOList1.stream().map(PqsTerminalPushLogDTO::getDevName).distinct().collect(Collectors.joining(",")); String devNameString = pqsTerminalPushLogDTOList1.stream().map(PqsTerminalPushLogDTO::getDevName).distinct().collect(Collectors.joining(","));
List<String> resultDevIds = pqsTerminalPushLogDTOList1.stream().map(PqsTerminalPushLogDTO::getDevId).distinct().collect(Collectors.toList()); PreCommandDTO preCommandDTO = new PreCommandDTO(); List<String> resultDevIds = pqsTerminalPushLogDTOList1.stream().map(PqsTerminalPushLogDTO::getDevId).distinct().collect(Collectors.toList());
PreCommandDTO preCommandDTO = new PreCommandDTO();
String guid = IdUtil.simpleUUID(); String guid = IdUtil.simpleUUID();
String command = "新增前置机：" + pqsTerminalPushLogDTO.getNodeName() + "下进程：" + processId + "下终端" + devNameString; String command = "新增前置机：" + pqsTerminalPushLogDTO.getNodeName() + "下进程：" + processId + "下终端" + devNameString;
preCommandDTO.setGuid(guid); preCommandDTO.setGuid(guid);
@@ -3971,7 +3977,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (!CollectionUtils.isEmpty(pqsTerminalPushLogDTOList1)) { if (!CollectionUtils.isEmpty(pqsTerminalPushLogDTOList1)) {
String devNameString = pqsTerminalPushLogDTOList1.stream().map(PqsTerminalPushLogDTO::getDevName).distinct().collect(Collectors.joining(",")); String devNameString = pqsTerminalPushLogDTOList1.stream().map(PqsTerminalPushLogDTO::getDevName).distinct().collect(Collectors.joining(","));
List<String> resultDevIds = pqsTerminalPushLogDTOList1.stream().map(PqsTerminalPushLogDTO::getDevId).distinct().collect(Collectors.toList()); PreCommandDTO preCommandDTO = new PreCommandDTO(); List<String> resultDevIds = pqsTerminalPushLogDTOList1.stream().map(PqsTerminalPushLogDTO::getDevId).distinct().collect(Collectors.toList());
PreCommandDTO preCommandDTO = new PreCommandDTO();
String guid = IdUtil.simpleUUID(); String guid = IdUtil.simpleUUID();
String command = "修改前置机：" + pqsTerminalPushLogDTO.getNodeName() + "下进程：" + processId + "下终端" + devNameString; String command = "修改前置机：" + pqsTerminalPushLogDTO.getNodeName() + "下进程：" + processId + "下终端" + devNameString;
preCommandDTO.setGuid(guid); preCommandDTO.setGuid(guid);
@@ -4018,122 +4025,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
@Override @Override
public PushResultDTO getPushResult(String guid) { public PushResultDTO getPushResult(String guid) {
PushResultDTO pushResultDTO = new PushResultDTO(); PushResultDTO pushResultDTO = new PushResultDTO();
String stringByKey = redisUtil.getStringByKey(RedisKeyPrefix.TOPIC_REPLY.concat(guid)); String stringByKey = redisUtil.getStringByKey(RedisKeyPrefix.TOPIC_REPLY.concat(guid));
@@ -4220,8 +4111,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
} }
/** /**
* 终端日志记录(只记录新增删除) * 终端日志记录(只记录新增删除)
*/ */
@@ -4298,6 +4187,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
/** /**
* 终端日志记录(记录修改) * 终端日志记录(记录修改)
*
* @param op * @param op
* @param updateDeviceParam * @param updateDeviceParam
* @param devicePO * @param devicePO
@@ -4361,6 +4251,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
} }
} }
} }
private boolean compareAndAppend(StringBuilder sb, String oldValue, String newValue, String fieldName) { private boolean compareAndAppend(StringBuilder sb, String oldValue, String newValue, String fieldName) {
if (oldValue != null && !oldValue.equals(newValue)) { if (oldValue != null && !oldValue.equals(newValue)) {
sb.append(String.format("%s由 %s 改为> %s;", fieldName, oldValue, newValue)); sb.append(String.format("%s由 %s 改为> %s;", fieldName, oldValue, newValue));

1
pqs-gateway/src/main/resources/bootstrap.yml
View File

@@ -217,6 +217,7 @@ whitelist:
- /pqs-auth/judgeToken/guangZhou - /pqs-auth/judgeToken/guangZhou
- /webjars/** - /webjars/**
- /actuator/**
- /doc.html - /doc.html
- /swagger-resources/** - /swagger-resources/**
- /*/v2/api-docs - /*/v2/api-docs