修改所有导出接口

pom.xml

@@ -21,6 +21,11 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+        </dependency>
+
 
         <dependency>
             <groupId>com.github.wechatpay-apiv3</groupId>

src/main/java/com/template/api/HouseLockControllerAPI.java

@@ -46,7 +46,7 @@ public interface HouseLockControllerAPI {
 
     @GetMapping("/lockExport")
     @ApiOperation(value = "门锁导出示例", notes = "门锁导出示例", httpMethod = "GET")
-    CommonResult lockExport(HttpServletResponse response);
+    void lockExport(HttpServletResponse response);
 
     @PostMapping("/lockImport")
     @ApiOperation(value = "门锁导入", notes = "门锁导入", httpMethod = "POST")

src/main/java/com/template/api/HouseNumberControllerAPI.java

@@ -34,7 +34,7 @@ public interface HouseNumberControllerAPI {
 
     @GetMapping("/listExport")
     @ApiOperation(value = "房间水电编码导出", notes = "房间水电编码导出", httpMethod = "GET")
-    CommonResult listExport(HttpServletResponse response, String permissionSettingId, String keyWord, String startTime, String endTime);
+    void listExport(HttpServletResponse response, String permissionSettingId, String keyWord, String startTime, String endTime);
 
     @PostMapping("/importList")
     @ApiOperation(value = "房间水电编码导入", notes = "房间水电编码导入", httpMethod = "POST")

src/main/java/com/template/api/HouseOrderAPI.java

@@ -62,7 +62,7 @@ public interface HouseOrderAPI {
 
     @GetMapping("/queryExport")
     @ApiOperation(value = "订单管理-订单导出", notes = "订单管理-订单导出", httpMethod = "GET")
-    CommonResult queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime);
+    void queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime);
 
     @GetMapping("/reportStatistics")
     @ApiOperation(value = "统计报表", notes = "统计报表", httpMethod = "GET")
@@ -70,7 +70,7 @@ public interface HouseOrderAPI {
 
     @GetMapping("/reportStatisticsExport")
     @ApiOperation(value = "统计报表导出", notes = "统计报表导出", httpMethod = "GET")
-    CommonResult reportStatisticsExport(HttpServletResponse response,String permissionSettingId, String state, String keyWord, String startTime, String endTime);
+    void reportStatisticsExport(HttpServletResponse response,String permissionSettingId, String state, String keyWord, String startTime, String endTime);
 
 
     @GetMapping("/orderPage")

src/main/java/com/template/controller/HouseLockController.java

@@ -392,7 +392,7 @@ public class HouseLockController implements HouseLockControllerAPI {
     }
 
     @Override
-    public CommonResult lockExport(HttpServletResponse response) {
+    public void lockExport(HttpServletResponse response) {
         // 表头数据
         List<Object> head = Arrays.asList("房型类型","房型名称","房间号","门锁设备型号");
         // 用户1数据
@@ -414,7 +414,7 @@ public class HouseLockController implements HouseLockControllerAPI {
 // 导出数据
         ExcelUtils.export(response,"门锁绑定示例表", sheetDataList);
 
-        return CommonResult.ok();
+//        return CommonResult.ok();
     }
 
     @Override

src/main/java/com/template/controller/HouseNumberController.java

@@ -284,16 +284,16 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     }
 
     @Override
-    public CommonResult listExport(HttpServletResponse response, String permissionSettingId, String keyWord, String startTime, String endTime) {
-        PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
-        if (ObjectUtils.isEmpty(permissionSetting)) {
-            return CommonResult.fail("非法进入");
-        }
-//      判断该用户是否拥有权限
-        String hydropowerManagement = permissionSetting.getHydropowerManagement();
-        if (!"0".equals(hydropowerManagement) && !hydropowerManagement.contains("5")) {
-            return CommonResult.fail("此账号暂无该权限");
-        }
+    public void listExport(HttpServletResponse response, String permissionSettingId, String keyWord, String startTime, String endTime) {
+//        PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
+//        if (ObjectUtils.isEmpty(permissionSetting)) {
+//            return CommonResult.fail("非法进入");
+//        }
+////      判断该用户是否拥有权限
+//        String hydropowerManagement = permissionSetting.getHydropowerManagement();
+//        if (!"0".equals(hydropowerManagement) && !hydropowerManagement.contains("5")) {
+//            return CommonResult.fail("此账号暂无该权限");
+//        }
 
         List<HouseNumberPageVo> vos =houseNumberService.listExport(keyWord,startTime,endTime);
 
@@ -332,7 +332,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         // 将工作簿写入文件
         ExcelUtils2.excelDownload(workbook, "水电设备绑定表.xlsx", response);
 
-        return CommonResult.ok();
+//        return CommonResult.ok();
     }
 
     @Override

src/main/java/com/template/controller/HouseOrderController.java

@@ -1320,16 +1320,16 @@ public class HouseOrderController implements HouseOrderAPI {
     }
 
     @Override
-    public CommonResult queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime) {
-        PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
-        if (ObjectUtils.isEmpty(permissionSetting)) {
-            return CommonResult.fail("非法进入");
-        }
-//      判断该用户是否拥有权限
-        String houseTypeManagement = permissionSetting.getHouseOrderManagement();
-        if (!"0".equals(houseTypeManagement) && !houseTypeManagement.contains("9")) {
-            return CommonResult.fail("此账号暂无该权限");
-        }
+    public void queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime) {
+//        PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
+//        if (ObjectUtils.isEmpty(permissionSetting)) {
+//            return CommonResult.fail("非法进入");
+//        }
+////      判断该用户是否拥有权限
+//        String houseTypeManagement = permissionSetting.getHouseOrderManagement();
+//        if (!"0".equals(houseTypeManagement) && !houseTypeManagement.contains("9")) {
+//            return CommonResult.fail("此账号暂无该权限");
+//        }
 
         List<QueryExportVo> vos = houseOrderService.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime);
 
@@ -1420,7 +1420,7 @@ public class HouseOrderController implements HouseOrderAPI {
         // 将工作簿写入文件
         ExcelUtils2.excelDownload(workbook, "订单表.xlsx", response);
 
-        return CommonResult.ok();
+//        return CommonResult.ok();
     }
 
     @Override
@@ -1455,21 +1455,21 @@ public class HouseOrderController implements HouseOrderAPI {
     }
 
     @Override
-    public CommonResult reportStatisticsExport(HttpServletResponse response, String permissionSettingId, String state, String keyWord, String startTime, String endTime) {
-        PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
-        if (ObjectUtils.isEmpty(permissionSetting)) {
-            return CommonResult.fail("非法进入");
-        }
-
-//      判断该用户是否拥有权限
-        String reportManagement = permissionSetting.getReportManagement();
-        if (!"0".equals(reportManagement) && !reportManagement.contains("2")) {
-            return CommonResult.fail("此账号暂无该权限");
-        }
-
-        if (ObjectUtils.isEmpty(state)) {
-            return CommonResult.fail("参数异常");
-        }
+    public void reportStatisticsExport(HttpServletResponse response, String permissionSettingId, String state, String keyWord, String startTime, String endTime) {
+//        PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
+//        if (ObjectUtils.isEmpty(permissionSetting)) {
+//            return CommonResult.fail("非法进入");
+//        }
+//
+////      判断该用户是否拥有权限
+//        String reportManagement = permissionSetting.getReportManagement();
+//        if (!"0".equals(reportManagement) && !reportManagement.contains("2")) {
+//            return CommonResult.fail("此账号暂无该权限");
+//        }
+//
+//        if (ObjectUtils.isEmpty(state)) {
+//            return CommonResult.fail("参数异常");
+//        }
 
         String s = "";
         if ("1".equals(state)) {
@@ -1500,7 +1500,7 @@ public class HouseOrderController implements HouseOrderAPI {
                 Row dataRow1 = sheet.createRow(i + 1);
 
                 dataRow1.createCell(0).setCellValue(i + 1);
-                dataRow1.createCell(1).setCellValue(vo.getOrderStatus());
+                dataRow1.createCell(1).setCellValue(vo.getOrderNumber());
                 dataRow1.createCell(2).setCellValue(vo.getLiveName());
 //                房型是房间名称加房间类型
                 String roomName = vo.getRoomName();
@@ -1547,7 +1547,7 @@ public class HouseOrderController implements HouseOrderAPI {
         // 将工作簿写入文件
         ExcelUtils2.excelDownload(workbook, "订单报表.xlsx", response);
 
-        return CommonResult.ok();
+//        return CommonResult.ok();
     }
 
 

src/main/resources/mapper/template/HouseOrderMapper.xml

@@ -217,7 +217,7 @@
     <select id="reportStatisticsExport" resultType="com.template.model.vo.ReportStatisticsExportVo">
         SELECT
         ho.order_number as orderNumber,
-        ho.live_name as liveName,
+        ho.reserve_name as liveName,
         h.room_name as roomName,
         h.room_type AS roomType,
         hn.room_number AS roomNumber,