| | |
| | | String dbPassword = StringUtils.isNotBlank(dto.getDbPassword())?dto.getDbPassword():""; |
| | | String dbTable = StringUtils.isNotBlank(dto.getDbTable())?dto.getDbTable():""; |
| | | map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getLotBatchNo(),dto.getLotBatchNo(), ip, insProducts.get(0).getCableTag(),dbUserName,dbPassword,dbTable)); |
| | | if(StringUtils.equals(".mysql",device.getFileType())){ |
| | | |
| | | }else{ |
| | | } |
| | | } |
| | | } |
| | | |
| | |
| | | list.add(2,collectBridge.getCollectValue());//实际电阻值 |
| | | }else { |
| | | // 从 Redis 中获取列表数据 |
| | | Set<Object> objectList = RedisUtil.getZSetRange(refery, 0, -1); |
| | | Set<Object> objectList = RedisUtil.getZSetRange(refery, 0, -1,"DESC"); |
| | | list.addAll(objectList); |
| | | } |
| | | numberOfDataEntries.getAndIncrement(); |