Merge branch 'develop' into test

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentBlacklistController.java

@@ -70,6 +70,7 @@ public class RentBlacklistController {
         return new Result();
     }
 
+    @NoRepeatSubmit
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<RentBlacklistDTO> list = rentBlacklistService.list(params);

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractFileController.java

@@ -71,11 +71,4 @@ public class RentContractFileController {
         return new Result();
     }
 
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<RentContractFileDTO> list = rentContractFileService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, RentContractFileExcel.class);
-    }
-
-
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java

@@ -79,6 +79,7 @@ public class RentContractInfoController {
         return new Result();
     }
 
+    @NoRepeatSubmit
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<RentContractInfoDTO> list = rentContractInfoService.list(params);

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentHouseController.java

@@ -71,6 +71,7 @@ public class RentHouseController {
         return new Result();
     }
 
+    @NoRepeatSubmit
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<RentHouseDTO> list = rentHouseService.list(params);

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentTenantInfoController.java

@@ -84,6 +84,7 @@ public class RentTenantInfoController {
         return new Result();
     }
 
+    @NoRepeatSubmit
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<RentTenantInfoDTO> list = rentTenantInfoService.list(params);

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java

@@ -43,7 +43,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Autowired
-    LoginUserUtil loginUserUtil;
+    private LoginUserUtil loginUserUtil;
 
     @Override
     public PageData<RentBlacklistDTO> page(Map<String, Object> params) {

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java

@@ -52,7 +52,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
     private RentContractInfoRedis rentContractInfoRedis;
 
     @Autowired
-    LoginUserUtil loginUserUtil;
+    private LoginUserUtil loginUserUtil;
 
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java

@@ -40,7 +40,7 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
     private RentTenantInfoRedis rentTenantInfoRedis;
 
     @Autowired
-    LoginUserUtil loginUserUtil;
+    private LoginUserUtil loginUserUtil;
 
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;