feat(service): 添加设备版本信息中的通讯协议和nDid字段

- 在DevVersionVO中新增accessMethod和nDid属性
- 在CsEquipmentDeliveryServiceImpl中设置设备访问方法和nDid值
- 移除控制器中的多余空行以优化代码格式
This commit is contained in:
xy
2026-07-17 15:38:33 +08:00
parent dbfd6e2b52
commit 08d83c8c1e
3 changed files with 11 additions and 2 deletions

View File

@@ -56,6 +56,15 @@ public class DevVersionVO {
*/ */
private String crc; private String crc;
/**
* 设备通讯协议
*/
private String accessMethod;
/**
* nDid
*/
private String nDid;
/** /**
* 所属工程 * 所属工程

View File

@@ -59,8 +59,6 @@ public class CsUpgradeLogsController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, re, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, re, methodDescribe);
} }
@OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD) @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
@GetMapping("/getByDevId") @GetMapping("/getByDevId")
@ApiOperation("查询指定devId的所有升级日志") @ApiOperation("查询指定devId的所有升级日志")

View File

@@ -1356,6 +1356,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
devVersionVO.setVersion(softInfoPO.getAppVersion()); devVersionVO.setVersion(softInfoPO.getAppVersion());
devVersionVO.setVersionDate(softInfoPO.getAppDate()); devVersionVO.setVersionDate(softInfoPO.getAppDate());
devVersionVO.setCrc(softInfoPO.getAppCheck()); devVersionVO.setCrc(softInfoPO.getAppCheck());
devVersionVO.setAccessMethod(item.getDevAccessMethod());
devVersionVO.setNDid(item.getNdid());
CsEdDataPO csEdDataPO = csEdDataService.findByDevTypeIdAndVersionNo(item.getDevModel(), softInfoPO.getAppVersion()); CsEdDataPO csEdDataPO = csEdDataService.findByDevTypeIdAndVersionNo(item.getDevModel(), softInfoPO.getAppVersion());
if (ObjectUtil.isNotNull(csEdDataPO)) { if (ObjectUtil.isNotNull(csEdDataPO)) {
devVersionVO.setProtocolVersion(csEdDataPO.getVersionAgreement()); devVersionVO.setProtocolVersion(csEdDataPO.getVersionAgreement());