| | |
| | | |
| | | @Override |
| | | public Result<?> dataAcquisition(HttpServletRequest request, DeviceCollectionDto dto) { |
| | | |
| | | |
| | | |
| | | // 查询检验项 |
| | | List<Integer> itemIds = dto.getItemIds(); |
| | | if (CollectionUtils.isEmpty(itemIds)) { |
| | |
| | | // 数采返回信息 |
| | | Map<String, Object> map = new HashMap<>(); |
| | | for (Device device : deviceList) { |
| | | |
| | | Device device1 = deviceMapper.selectById(device.getId()); |
| | | dto.setDbUserName(device1.getDbUserName()); |
| | | dto.setDbPassword(device1.getDbPassword()); |
| | | dto.setDbTable(device1.getDbTable()); |
| | | //NS-YL3141:哑铃片全自动检测实验室 |
| | | if(!StringUtils.equals(device1.getManagementNumber(),"NS-YL3141")){ |
| | | dto.setDbTable(device1.getDbTable()); |
| | | } |
| | | String ip = device.getIp(); |
| | | |
| | | // 根据检验项获取config |