diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java index f160cbb..31490f6 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java @@ -66,10 +66,10 @@ public class CsEquipmentDeliveryDTO { */ private String devAccessMethod; -// /** -// * 装置程序版本 -// */ -// private String programVersion; + /** + * 装置程序版本 + */ + private String programVersionName; /** * 调试人员 diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java index c154b55..1002347 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java @@ -16,6 +16,7 @@ import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; import com.njcn.csdevice.pojo.vo.DeviceManagerVO; import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO; +import com.njcn.csdevice.service.CsDevModelRelationService; import com.njcn.csdevice.service.CsEquipmentDeliveryService; import com.njcn.csdevice.service.IMqttUserService; import com.njcn.csdevice.utils.ExcelStyleUtil; @@ -57,6 +58,7 @@ public class EquipmentDeliveryController extends BaseController { private final CsEquipmentDeliveryService csEquipmentDeliveryService; private final IMqttUserService mqttUserService; + private final CsDevModelRelationService csDevModelRelationService; @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/addEquipmentDelivery") @@ -141,6 +143,8 @@ public class EquipmentDeliveryController extends BaseController { List collect = csEquipmentDeliveryPOS.stream().map(temp -> { CsEquipmentDeliveryDTO csEquipmentDeliveryDTO = new CsEquipmentDeliveryDTO(); BeanUtils.copyProperties(temp, csEquipmentDeliveryDTO); + String versionByDevId = csDevModelRelationService.getVersionByDevId(temp.getId()); + csEquipmentDeliveryDTO.setProgramVersionName(versionByDevId); return csEquipmentDeliveryDTO; }).collect(Collectors.toList()); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, collect, methodDescribe); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDevModelRelationMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDevModelRelationMapper.java index 87f2b9c..6743acd 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDevModelRelationMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDevModelRelationMapper.java @@ -17,4 +17,5 @@ public interface CsDevModelRelationMapper extends BaseMapper + \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java index 19d822b..8d6737b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java @@ -53,4 +53,7 @@ public interface CsDevModelRelationService extends IService