dkyChenJiang.git

			@@ -6,11 +6,7 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Controller;
			import org.springframework.ui.ModelMap;
			import org.springframework.web.bind.annotation.GetMapping;
			import org.springframework.web.bind.annotation.PathVariable;
			import org.springframework.web.bind.annotation.PostMapping;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.ResponseBody;
			import org.springframework.web.bind.annotation.*;
			import com.javaweb.common.annotation.Log;
			import com.javaweb.common.enums.BusinessType;
			import com.javaweb.geo.domain.DeviceLog;
			@@ -19,6 +15,7 @@
			import com.javaweb.common.core.domain.AjaxResult;
			import com.javaweb.common.utils.poi.ExcelUtil;
			import com.javaweb.common.core.page.TableDataInfo;
			import org.springframework.web.multipart.MultipartFile;

			/**
			* 设备出入库记录Controller
			@@ -70,7 +67,8 @@
			* 新增设备出入库记录
			*/
			@GetMapping("/add")
			public String add() {
			public String add(String projectId, ModelMap mmap) {
			mmap.put("projectId", projectId);
			return prefix + "/add";
			}

			@@ -116,4 +114,17 @@
			public AjaxResult remove(String ids) {
			return toAjax(deviceLogService.deleteDeviceLogByIds(ids));
			}


			/**
			* 导入设备出入库记录
			*/
			@RequiresPermissions("geo:deviceLog:import")
			@Log(title = "导入设备出入库记录")
			@PostMapping( "/importDeviceLog/{projectId}")
			@ResponseBody
			public AjaxResult importDeviceLog(@PathVariable("projectId") String projectId, @RequestParam("file") MultipartFile file, boolean updateSupport) throws Exception{
			String message = deviceLogService.importDeviceLog(projectId,file,updateSupport);
			return AjaxResult.success(message);
			}
			}