dkyChenJiang.git

			@@ -70,9 +70,6 @@
			*/
			@Override
			public int insertDeviceLog(DeviceLog deviceLog) {
			if(ObjectUtils.isEmpty(deviceLog.getId())){
			deviceLog.setId(IdGenerate.nextId());
			}
			deviceLog.setCreateDate(DateUtils.getNowDate());
			return deviceLogMapper.insertDeviceLog(deviceLog);
			}
			@@ -118,6 +115,8 @@
			public String importDeviceLog(String projectId,MultipartFile file, boolean updateSupport) {
			// 关联项目信息
			Project project = projectService.selectProjectById(projectId);
			// 关联code
			Integer number = deviceLogMapper.selectMaxDeviceLogId(projectId);

			try {
			String dest = saveExcel(file);
			@@ -127,6 +126,15 @@
			item.setProjectId(projectId);
			item.setProjectName(project.getFullName());

			// 转换number信息
			if (ObjectUtils.isEmpty(number)){
			number = 1;
			}else {
			number++;
			}
			String code = "ZK" + String.format("%06d", number);
			item.setCode(code);

			item.setCreateDate(DateUtils.getNowDate());
			insertDeviceLog(item);
			}
			@@ -134,6 +142,19 @@
			return e.toString();
			}
			return "导入完毕" ;
			}


			/**
			* 查询数据库中id最大值
			* @return
			*
			* TRUNCATE TABLE js_device_log;
			* ALTER TABLE js_device_log AUTO_INCREMENT = 1;
			*/
			@Override
			public Integer selectMaxDeviceLogId(String projectId) {
			return deviceLogMapper.selectMaxDeviceLogId(projectId);
			}

			private String saveExcel(MultipartFile file) {
			@@ -154,7 +175,6 @@

			private List<DeviceLog> readData(String filepath) {
			ExcelReader reader = ExcelUtil.getReader(filepath, 0);
			reader.addHeaderAlias("出入库单子号", "code");
			reader.addHeaderAlias("设备名称", "deviceName");
			reader.addHeaderAlias("类型", "type");
			reader.addHeaderAlias("入库时间", "inboundDate");