设备维护--设备报表--下载文件，改bug

src/main/java/org/rcisoft/business/device/report/service/impl/ReportServiceImpl.java

@@ -45,9 +45,9 @@ public class ReportServiceImpl implements ReportService {
         //如果有文件
         String fileName = filePath + proId + File.separator + year + File.separator + month + File.separator + day + ".xls";
         File file = new File(fileName);
+        if (!file.getParentFile().exists()) file.getParentFile().mkdirs();
         try(OutputStream outputStream = response.getOutputStream()) {
-            //如果不存在
-            if (!file.exists()) file = this.createExcel(proId, year, month, day, file);
+            file = this.createExcel(proId, year, month, day, file);
             //转成字节
             bytes = FileUtils.readFileToByteArray(file);
             //设置下载头

src/main/java/org/rcisoft/business/manage/controller/SysCityController.java

@@ -32,7 +32,7 @@ public class SysCityController {
 
     @ApiOperation(value="查询城市", notes="查询城市")
     @ApiImplicitParams({@ApiImplicitParam(name = "pid", value = "城市主键", required = true, dataType = "字符串")})
-    @RequestMapping("/city")
+    @RequestMapping("/city/{pid:\\w+}")
     public Result city(@PathVariable String pid) {
         return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, sysCityServiceImpl.city(pid));
     }