lims-ruoyi-after.git

			@@ -25,7 +25,7 @@
			import com.ruoyi.device.pojo.*;
			import com.ruoyi.device.service.DataConfigService;
			import com.ruoyi.device.service.DeviceService;
			import com.ruoyi.device.service.DocumentService;
			import com.ruoyi.device.service.DeviceDocumentsService;
			import com.ruoyi.device.utils.DataAcquisition;
			import com.ruoyi.framework.exception.ErrorException;
			import com.ruoyi.inspect.mapper.InsSampleMapper;
			@@ -35,7 +35,6 @@
			import lombok.AllArgsConstructor;
			import org.apache.logging.log4j.util.Strings;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			@@ -45,6 +44,7 @@
			import java.io.OutputStream;
			import java.net.URLEncoder;
			import java.text.SimpleDateFormat;
			import java.time.LocalDate;
			import java.time.LocalDateTime;
			import java.time.format.DateTimeFormatter;
			import java.util.*;
			@@ -65,11 +65,9 @@

			private DataConfigService dataConfigService;

			private QrShowServiceImpl qrShowService;

			private InsSampleMapper insSampleMapper;

			private DocumentService documentService;
			private DeviceDocumentsService documentService;

			private DeviceMetricRecordMapper deviceMetricRecordMapper;

			@@ -96,10 +94,6 @@
			@Transactional(rollbackFor = Exception.class)
			@Override
			public int upDeviceParameter(Device itemParameter) {
			// 删除数采集配置数据
			dataConfigService.deleteDataConfig();
			// 需要同时更改 device表


			return deviceMapper.updateById(itemParameter);
			}
			@@ -117,11 +111,6 @@
			@Override
			public List<Device> search(Integer status, String deviceName, String specificationModel, String largeCategory) {
			return deviceMapper.search(status, deviceName, specificationModel, largeCategory);
			}

			@Override
			public List<Device> selectDevicePrincipal() {
			return deviceMapper.selectDevicePrincipal();
			}

			@Override
			@@ -171,7 +160,7 @@
			}
			deviceDto.setAuthorizedPersonName(name);
			//查询设备校准信息
			DeviceMetricRecord calibrate = qrShowService.getDeviceMetricRecord(id, "calibrate");
			DeviceMetricRecord calibrate = getDeviceMetricRecord(id, "calibrate");
			deviceDto.setCalibrateNo(calibrate.getCertificateSerialNumber());

			// 到了停用日期，自动将状态改为停用
			@@ -185,6 +174,21 @@
			}
			}
			return deviceDto;
			}

			/**
			* 查询设备校准/核查记录
			* @param deviceId
			* @param type
			* @return
			*/
			public DeviceMetricRecord getDeviceMetricRecord(int deviceId, String type){
			return Optional.ofNullable(
			deviceMetricRecordMapper.selectOne(Wrappers.<DeviceMetricRecord>lambdaQuery()
			.eq(DeviceMetricRecord::getDeviceId, deviceId)
			.eq(DeviceMetricRecord::getType, type)
			.orderByDesc(DeviceMetricRecord::getCreateTime)
			.last("limit 1"))).orElse(new DeviceMetricRecord());
			}

			@Override
			@@ -309,7 +313,7 @@
			// 设备信息
			Device device = baseMapper.selectById(deviceId);
			// 设备档案
			List<Document> documentList = documentService.list(Wrappers.<Document>lambdaQuery().eq(Document::getDeviceId, deviceId));
			List<DeviceDocuments> documentList = documentService.list(Wrappers.<DeviceDocuments>lambdaQuery().eq(DeviceDocuments::getDeviceId, deviceId));
			// 设备校准表
			List<DeviceMetricRecord> deviceMetricRecordList = deviceMetricRecordMapper.selectList(Wrappers.<DeviceMetricRecord>lambdaQuery().eq(DeviceMetricRecord::getDeviceId, deviceId));
			// 设备维修表
			@@ -349,6 +353,7 @@
			template.write(os);
			os.flush();
			os.close();
			inputStream.close();
			} catch (Exception e) {
			e.printStackTrace();
			throw new RuntimeException("导出失败");
			@@ -393,11 +398,11 @@
			DeviceMaintenance deviceMaintenance = deviceMaintenanceList.get(i);
			DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
			// 维修日期
			deviceMetricRecordAndMaintenanceDto.setMaintenanceDateString(deviceMaintenance.getDate().format(dateTimeFormatter));
			deviceMetricRecordAndMaintenanceDto.setMaintenanceDateString(deviceMaintenance.getMaintenanceDate().format(dateTimeFormatter));
			// 处理方法
			deviceMetricRecordAndMaintenanceDto.setHandlingMethod(deviceMaintenance.getContent());
			deviceMetricRecordAndMaintenanceDto.setHandlingMethod(deviceMaintenance.getMaintenanceContent());
			// 备注
			deviceMetricRecordAndMaintenanceDto.setComments(deviceMaintenance.getComments());
			deviceMetricRecordAndMaintenanceDto.setComments(deviceMaintenance.getRemark());
			}

			deviceMetricRecordAndMaintenanceDtoList.add(deviceMetricRecordAndMaintenanceDto);
			@@ -411,13 +416,13 @@
			* @param documentList 档案列表
			* @param documentExportWordDtoList 返回给word的数据列表
			*/
			private static void extracted(List<Document> documentList, List<DocumentExportWordDto> documentExportWordDtoList) {
			private static void extracted(List<DeviceDocuments> documentList, List<DocumentExportWordDto> documentExportWordDtoList) {
			// 给档案加序号并且分为左右两个列表在word中显示
			for (int i = 0; i < documentList.size(); i++) {
			// 创建word表格中一行的数据对象
			DocumentExportWordDto documentExportWordDto = new DocumentExportWordDto();
			// 获取档案信息
			Document document = documentList.get(i);
			DeviceDocuments document = documentList.get(i);
			// 格式化日期
			DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
			// 根据序号分别加入两个列表
			@@ -484,6 +489,7 @@
			template.write(os);
			os.flush();
			os.close();
			inputStream.close();
			} catch (Exception e) {
			e.printStackTrace();
			throw new RuntimeException("导出失败");