优化

src/main/java/com/poteviohealth/cgp/statistics/controller/OrderController.java

@@ -10,7 +10,7 @@ import com.poteviohealth.cgp.common.facade.lock.DistributedLock;
 import com.poteviohealth.cgp.common.facade.time.MethodTime;
 import com.poteviohealth.cgp.common.filter.TokenContext;
 import com.poteviohealth.cgp.common.filter.repeatSubmit.RepeatSubmit;
-import com.poteviohealth.cgp.statistics.utils.ExcelUtils;
+import com.poteviohealth.cgp.statistics.utils.ExcelUtils2;
 import com.poteviohealth.cgp.statistics.model.indto.DishesOrderWebInDTO;
 import com.poteviohealth.cgp.statistics.model.indto.OrderCostWebInDTO;
 import com.poteviohealth.cgp.statistics.model.indto.OrderServiceWebInDTO;
@@ -60,7 +60,7 @@ public class OrderController extends BaseWebController {
             if ("".equals(error)) {
             orgConstrainService.fillOrgParams(orderServiceWebInDTO);
                 List<OrderExcelDTO> list = orderService.orderExcel(orderServiceWebInDTO);
-                ExcelUtils.easyDownload("classpath:excel/order_service.xlsx", Maps.newHashMap(), list,  "", resp);
+                ExcelUtils2.easyDownload("classpath:excel/order_service.xlsx", Maps.newHashMap(), list,  "", resp);
             }else{
                 throw new BusinessException(error);
             }
@@ -87,7 +87,7 @@ public class OrderController extends BaseWebController {
             if ("".equals(error)) {
                 orgConstrainService.fillOrgParams(dto);
                 List<DishesOrderWebOutDTO> list = orderService.orderDishes(dto);
-                ExcelUtils.easyDownload("classpath:excel/order_dishes.xlsx", Maps.newHashMap(), list,  "", resp);
+                ExcelUtils2.easyDownload("classpath:excel/order_dishes.xlsx", Maps.newHashMap(), list,  "", resp);
             }else{
                 throw new BusinessException(error);
             }
@@ -125,7 +125,7 @@ public class OrderController extends BaseWebController {
                 double totalActualIncome =list.stream().mapToDouble(a-> Double.parseDouble(a.getActual())).sum();
                 data.put("title",dateStr);
                 data.put("title2","标准成本合计："+totalActualCost+"元；成本金额合计："+totalActualIncome+"元");
-                ExcelUtils.easyDownload(templateLocation,data , list, filename, resp);
+                ExcelUtils2.easyDownload(templateLocation,data , list, filename, resp);
             }else{
                 throw new BusinessException(error);
             }

src/main/java/com/poteviohealth/cgp/statistics/utils/ExcelUtils.java → src/main/java/com/poteviohealth/cgp/statistics/utils/ExcelUtils2.java

@@ -29,8 +29,8 @@ import java.util.Map;
 
 @Lazy(false)
 @Component
-public class ExcelUtils implements ResourceLoaderAware {
-    private static Logger logger = LoggerFactory.getLogger(ExcelUtils.class);
+public class ExcelUtils2 implements ResourceLoaderAware {
+    private static Logger logger = LoggerFactory.getLogger(ExcelUtils2.class);
 
     /**
      * excel文件的导出下载
@@ -177,10 +177,10 @@ public class ExcelUtils implements ResourceLoaderAware {
     }
 
     private static void setResourceLoader0(ResourceLoader resourceLoader) {
-        ExcelUtils.resourceLoader = resourceLoader;
+        ExcelUtils2.resourceLoader = resourceLoader;
     }
 
-    ExcelUtils() {
+    ExcelUtils2() {
     }
 }