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
2026-02-06 15:09:30 +08:00
parent 7a5ef040bb 140ed85108
commit 23de6313a6
21 changed files with 170 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/DeviceController.java
View File

@@ -198,7 +198,7 @@ public class DeviceController extends BaseController {
@ApiOperation("修改装置通讯状态及时间")
public HttpResult<Boolean> updateDevComFlag(@RequestBody DevComFlagDTO devComFlagDTO) {
String methodDescribe = getMethodDescribe("updateDevComFlag");
boolean update = iDeviceService.lambdaUpdate().set(Objects.nonNull(devComFlagDTO.getStatus()),Device::getComFlag,devComFlagDTO.getStatus() ).set(Device::getUpdateTime, devComFlagDTO.getDate()).eq(Device::getId, devComFlagDTO.getId()).update();
boolean update = iDeviceService.lambdaUpdate().set(Objects.nonNull(devComFlagDTO.getStatus()),Device::getComFlag,devComFlagDTO.getStatus() ).set(Objects.nonNull(devComFlagDTO.getDate()),Device::getUpdateTime, devComFlagDTO.getDate()).eq(Device::getId, devComFlagDTO.getId()).update();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, update, methodDescribe);
}

2
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/TerminalVersionServiceImpl.java
View File

@@ -38,7 +38,7 @@ public class TerminalVersionServiceImpl implements TerminalVersionService {
List<TerminalVersionVO> devList = terminalVersionMapper.getTerminalVersionInfo(terminalMainQueryParam);
if(CollectionUtil.isEmpty(devList)){
throw new BusinessException(DeviceResponseEnum.DEVICE_EMPTY);
return devList;
}
List<String> subIndexes = devList.stream().map(TerminalVersionVO::getPid).collect(Collectors.toList());
List<TerminalVersionVO> subList =terminalVersionMapper.getPqLineGdAndSubList(subIndexes);

2
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineDetailMapper.xml
View File

@@ -43,7 +43,7 @@
a.name lineName,
c.Time_Interval,
d.Scale AS scale,
c.Obj_Id obyId,
c.Obj_Id objId,
c.Big_Obj_Type bigObjType
from pq_line a
inner join pq_line b on a.pid = b.id

11
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
View File

@@ -1269,7 +1269,8 @@
SELECT
voltage.id as id,
sub.id as pid,
concat( sub.NAME, " ", voltage.NAME ) as name,
<!-- 兼容国产数据库-->
concat( sub.NAME, ' ', voltage.NAME ) as name,
voltage.Sort as sort
FROM
pq_line voltage
@@ -1513,14 +1514,14 @@
line.id AS lineId,
CONCAT(sub.NAME, '_', vo.NAME, '_', line.NAME) AS lineName,
CONCAT(
IFNULL(CAST(detail.pt1 AS CHAR), 'N/A'),
IFNULL(CAST(detail.pt1 AS VARCHAR), 'N/A'),
':',
IFNULL(CAST(detail.pt2 AS CHAR), 'N/A')
IFNULL(CAST(detail.pt2 AS VARCHAR), 'N/A')
) AS pt,
CONCAT(
IFNULL(CAST(detail.ct1 AS CHAR), 'N/A'),
IFNULL(CAST(detail.ct1 AS VARCHAR), 'N/A'),
':',
IFNULL(CAST(detail.ct2 AS CHAR), 'N/A')
IFNULL(CAST(detail.ct2 AS VARCHAR), 'N/A')
) AS ct,
detail.Dev_Capacity AS Dev_Capacity,
detail.Short_Capacity AS Short_Capacity,