| 
					
				 | 
			
			
				@@ -6,6 +6,7 @@ import com.ozs.common.core.controller.BaseController; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ozs.common.core.domain.AjaxResult; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ozs.common.enums.BusinessType; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ozs.common.utils.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.ozs.common.utils.file.FileUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ozs.common.utils.poi.ExcelUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ozs.entity.BaseVehicle; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ozs.entity.vo.BaseVehicleVo; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -13,9 +14,12 @@ import com.ozs.service.BaseVehicleService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import io.swagger.annotations.ApiOperation; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import lombok.extern.slf4j.Slf4j; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import org.springframework.http.MediaType; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.web.bind.annotation.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.web.multipart.MultipartFile; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import javax.servlet.http.HttpServletResponse; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.io.InputStream; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.Date; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.List; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -99,7 +103,7 @@ public class BaseVehicleController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (StringUtils.isEmptySunhh(baseVehicle) || StringUtils.isEmptySunhh(baseVehicle.getId())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return AjaxResult.error("修改ID不能为空!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return baseVehicleService.vehicleUpdate(baseVehicle,getUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return baseVehicleService.vehicleUpdate(baseVehicle, getUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -140,5 +144,38 @@ public class BaseVehicleController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String message = baseVehicleService.importBaseVehicle(accountManageList, updateSupport, getUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return AjaxResult.success(message); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 机车信息导出 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * @param response 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @ApiOperation("机车信息导出") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @PostMapping("/exportBaseVehicle") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @Log(title = "机车信息台账", businessType = BusinessType.EXPORT) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public void exportBaseVehicle(HttpServletResponse response, @RequestBody BaseVehicle baseVehicle) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List<BaseVehicle> baseVehicleList = baseVehicleService.exportBaseVehicle(baseVehicle); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        ExcelUtil<BaseVehicle> util = new ExcelUtil<>(BaseVehicle.class); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        util.exportExcel(response, baseVehicleList, "机车信息台账数据"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 机车信息模板下载 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * @param response 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @ApiOperation("机车信息模板下载") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @GetMapping("/downloaExcel") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @Log(title = "机车信息台账", businessType = BusinessType.OTHER) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public void downloadZip(HttpServletResponse response) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/BaseVehicle.xlsx"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            FileUtils.setAttachmentResponseHeader(response, "机车信息模板.xlsx"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            FileUtils.writeBytesByInput(resourceAsStream, response.getOutputStream()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } catch (Exception e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            log.error("下载文件失败", e); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |