列表设备排序按设备编号正序

Lius

2023-10-08 95cef064268b1c13b32111636c267871b54bb24b

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java

@@ -70,14 +70,14 @@
    private IEquipmentWorkLineService equipmentWorkLineService;
    @Resource
    private IMdcDriveTypeParamConfigService mdcDriveTypeParamConfigService;
    @Resource
    private XYZAliasesMapper xyzAliasesMapper;
    @Resource
    private IEquipmentXYZService equipmentXYZService;
    @Resource
    private IEquipmentBaseInfoService equipmentBaseInfoService;
    @Resource
    private IEquipmentTemperatureService equipmentTemperatureService;
//    @Resource
//    private XYZAliasesMapper xyzAliasesMapper;
//    @Resource
//    private IEquipmentXYZService equipmentXYZService;
//    @Resource
//    private IEquipmentBaseInfoService equipmentBaseInfoService;
//    @Resource
//    private IEquipmentTemperatureService equipmentTemperatureService;

    @Override
    public Map<String, String> getDepNamesByEquipmentIds(List<String> equipmentIds) {
@@ -349,10 +349,12 @@
        mdcEquipmentDto.setDevicePower(mdcEquipment.getDevicePower());
        mdcEquipmentDto.setDeviceType(mdcEquipment.getDriveType());
        mdcEquipmentDto.setRemark(mdcEquipment.getRemark());
        mdcEquipmentDto.setEquipmentID(mdcEquipment.getEquipmentId());//设备编号
        //设备编号
        mdcEquipmentDto.setEquipmentID(mdcEquipment.getEquipmentId());
        mdcEquipmentDto.setEquipmentName(mdcEquipment.getEquipmentName());
        mdcEquipmentDto.setEquipmentIP(mdcEquipment.getEquipmentIp());
        mdcEquipmentDto.setEquipmentModel(mdcEquipment.getEquipmentModel());//设备型号
        //设备型号
        mdcEquipmentDto.setEquipmentModel(mdcEquipment.getEquipmentModel());
        mdcEquipmentDto.setDriveType(mdcEquipment.getDriveType());
        mdcEquipmentDto.setDataPort(mdcEquipment.getDataPort());
        mdcEquipmentDto.setDataFlag(Integer.parseInt(CommonConstant.STATUS_1));