diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevVersionVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevVersionVO.java index 30d836b..e03ed70 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevVersionVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevVersionVO.java @@ -56,6 +56,15 @@ public class DevVersionVO { */ private String crc; + /** + * 设备通讯协议 + */ + private String accessMethod; + + /** + * nDid + */ + private String nDid; /** * 所属工程 diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java index 57a7770..a983732 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java @@ -59,8 +59,6 @@ public class CsUpgradeLogsController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, re, methodDescribe); } - - @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD) @GetMapping("/getByDevId") @ApiOperation("查询指定devId的所有升级日志") diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index 4c8034e..0a6e63f 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -1356,6 +1356,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl