代码优化

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/ApplicationContextUtils.java

+package com.gic.enterprise.utils;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * Spring ApplicationContext 工具类
+ * @ClassName: ApplicationContextUtils

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/11/11 10:22 AM

+ */
+@Component
+public class ApplicationContextUtils implements ApplicationContextAware{
+
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        ApplicationContextUtils.applicationContext = applicationContext;
+    }
+
+    public static <T> T getBean(String beanName) {
+        if (applicationContext.containsBean(beanName)) {
+            return (T) applicationContext.getBean(beanName);
+        }
+        return null;
+    }
+
+    public static <T> T getBean(Class<T> clazz) {
+        return applicationContext.getBean(clazz);
+    }
+}

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/BillingAccountBalanceRecord.java

 package com.gic.enterprise.utils.chart;
 
-import com.gic.enterprise.dto.HomeStatisticsDTO;
-import com.gic.enterprise.qo.HomeStatisticsQO;
-import com.gic.enterprise.service.BillingAccountBalanceRecordService;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import java.util.List;
+import com.gic.enterprise.dto.HomeStatisticsDTO;
+import com.gic.enterprise.qo.HomeStatisticsQO;
+import com.gic.enterprise.service.BillingAccountBalanceRecordService;
 /**
  * 余额支付消费明细
  * @ClassName: BillingAccountBalanceRecord

@@ -15,22 +15,18 @@ import java.util.List;
  * @author guojuxing

  * @date 2019/8/23 2:19 PM

  */
-@Component
+@Component("billingAccountBalanceRecord")
 public class BillingAccountBalanceRecord implements IFeeChart{
     @Autowired
     private BillingAccountBalanceRecordService billingAccountBalanceRecordService;
-    private static BillingAccountBalanceRecord billingAccountBalanceRecord;
-    @PostConstruct
-    public void init() {
-        billingAccountBalanceRecord = this;
-    }
+
     @Override
     public List<HomeStatisticsDTO> listHomeStatistics(HomeStatisticsQO params) {
-        return billingAccountBalanceRecord.billingAccountBalanceRecordService.listHomeStatistics(params);
+        return this.billingAccountBalanceRecordService.listHomeStatistics(params);
     }
 
     @Override
     public double getFee(Integer enterpriseId, Integer dateType) {
-        return billingAccountBalanceRecord.billingAccountBalanceRecordService.getFee(enterpriseId, dateType);
+        return this.billingAccountBalanceRecordService.getFee(enterpriseId, dateType);
     }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/BillingDoubleCallingRecord.java

 package com.gic.enterprise.utils.chart;
 
-import com.gic.enterprise.dto.HomeStatisticsDTO;
-import com.gic.enterprise.qo.HomeStatisticsQO;
-import com.gic.enterprise.service.BillingDoubleCallingRecordService;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import java.util.List;
+import com.gic.enterprise.dto.HomeStatisticsDTO;
+import com.gic.enterprise.qo.HomeStatisticsQO;
+import com.gic.enterprise.service.BillingDoubleCallingRecordService;
 /**
  * 双向呼叫消费明细
  * @ClassName: BillingDoubleCallingRecord

@@ -15,22 +15,17 @@ import java.util.List;
  * @author guojuxing

  * @date 2019/8/23 2:20 PM

  */
-@Component
+@Component("billingDoubleCallingRecord")
 public class BillingDoubleCallingRecord implements IFeeChart{
     @Autowired
     private BillingDoubleCallingRecordService billingDoubleCallingRecordService;
-    private static BillingDoubleCallingRecord billingDoubleCallingRecord;
-    @PostConstruct
-    public void init() {
-        billingDoubleCallingRecord = this;
-    }
     @Override
     public List<HomeStatisticsDTO> listHomeStatistics(HomeStatisticsQO params) {
-        return billingDoubleCallingRecord.billingDoubleCallingRecordService.listHomeStatistics(params);
+        return this.billingDoubleCallingRecordService.listHomeStatistics(params);
     }
 
     @Override
     public double getFee(Integer enterpriseId, Integer dateType) {
-        return billingDoubleCallingRecord.billingDoubleCallingRecordService.getFee(enterpriseId, dateType);
+        return this.billingDoubleCallingRecordService.getFee(enterpriseId, dateType);
     }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/BillingInternationSmsRecord.java

@@ -2,8 +2,6 @@ package com.gic.enterprise.utils.chart;
 
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -18,22 +16,17 @@ import com.gic.enterprise.service.BillingInternationalSmsRecordService;
  * @author guojuxing

  * @date 2019/8/23 2:19 PM

  */
-@Component
+@Component("billingInternationSmsRecord")
 public class BillingInternationSmsRecord implements IFeeChart{
     @Autowired
     private BillingInternationalSmsRecordService billingInternationalSmsRecordService;
-    private static BillingInternationSmsRecord billingInternationSmsRecord;
-    @PostConstruct
-    public void init() {
-        billingInternationSmsRecord = this;
-    }
     @Override
     public List<HomeStatisticsDTO> listHomeStatistics(HomeStatisticsQO params) {
-        return billingInternationSmsRecord.billingInternationalSmsRecordService.listHomeStatistics(params);
+        return this.billingInternationalSmsRecordService.listHomeStatistics(params);
     }
 
     @Override
     public double getFee(Integer enterpriseId, Integer dateType) {
-        return billingInternationSmsRecord.billingInternationalSmsRecordService.getFee(enterpriseId, dateType);
+        return this.billingInternationalSmsRecordService.getFee(enterpriseId, dateType);
     }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/BillingRecordingStorageRecord.java

 package com.gic.enterprise.utils.chart;
 
-import com.gic.enterprise.dto.HomeStatisticsDTO;
-import com.gic.enterprise.qo.HomeStatisticsQO;
-import com.gic.enterprise.service.BillingRecordingStorageRecordService;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import java.util.List;
+import com.gic.enterprise.dto.HomeStatisticsDTO;
+import com.gic.enterprise.qo.HomeStatisticsQO;
+import com.gic.enterprise.service.BillingRecordingStorageRecordService;
 /**
  * 语音存储消费明细
  * @ClassName: BillingRecordingStorageRecord

@@ -15,22 +15,17 @@ import java.util.List;
  * @author guojuxing

  * @date 2019/8/23 2:20 PM

  */
-@Component
+@Component("billingRecordingStorageRecord")
 public class BillingRecordingStorageRecord implements IFeeChart{
     @Autowired
     private BillingRecordingStorageRecordService billingRecordingStorageRecordService;
-    private static BillingRecordingStorageRecord billingRecordingStorageRecord;
-    @PostConstruct
-    public void init() {
-        billingRecordingStorageRecord = this;
-    }
     @Override
     public List<HomeStatisticsDTO> listHomeStatistics(HomeStatisticsQO params) {
-        return billingRecordingStorageRecord.billingRecordingStorageRecordService.listHomeStatistics(params);
+        return this.billingRecordingStorageRecordService.listHomeStatistics(params);
     }
 
     @Override
     public double getFee(Integer enterpriseId, Integer dateType) {
-        return billingRecordingStorageRecord.billingRecordingStorageRecordService.getFee(enterpriseId, dateType);
+        return this.billingRecordingStorageRecordService.getFee(enterpriseId, dateType);
     }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/BillingSmsPackageRecord.java

 package com.gic.enterprise.utils.chart;
 
-import com.gic.enterprise.dto.HomeStatisticsDTO;
-import com.gic.enterprise.qo.HomeStatisticsQO;
-import com.gic.enterprise.service.BillingSmsPackageRecordService;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import java.util.List;
+import com.gic.enterprise.dto.HomeStatisticsDTO;
+import com.gic.enterprise.qo.HomeStatisticsQO;
+import com.gic.enterprise.service.BillingSmsPackageRecordService;
 /**
  * 短信套餐包消费明细
  * @ClassName: BillingSmsPackageRecord

@@ -15,22 +15,17 @@ import java.util.List;
  * @author guojuxing

  * @date 2019/8/23 2:20 PM

  */
-@Component
+@Component("billingSmsPackageRecord")
 public class BillingSmsPackageRecord implements IFeeChart{
     @Autowired
     private BillingSmsPackageRecordService billingSmsPackageRecordService;
-    private static BillingSmsPackageRecord billingSmsPackageRecord;
-    @PostConstruct
-    public void init() {
-        billingSmsPackageRecord = this;
-    }
     @Override
     public List<HomeStatisticsDTO> listHomeStatistics(HomeStatisticsQO params) {
-        return billingSmsPackageRecord.billingSmsPackageRecordService.listHomeStatistics(params);
+        return this.billingSmsPackageRecordService.listHomeStatistics(params);
     }
 
     @Override
     public double getFee(Integer enterpriseId, Integer dateType) {
-        return billingSmsPackageRecord.billingSmsPackageRecordService.getFee(enterpriseId, dateType);
+        return this.billingSmsPackageRecordService.getFee(enterpriseId, dateType);
     }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/BillingSmsRecord.java

 package com.gic.enterprise.utils.chart;
 
-import com.gic.enterprise.dto.HomeStatisticsDTO;
-import com.gic.enterprise.qo.HomeStatisticsQO;
-import com.gic.enterprise.service.BillingSmsRecordService;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import java.util.List;
+import com.gic.enterprise.dto.HomeStatisticsDTO;
+import com.gic.enterprise.qo.HomeStatisticsQO;
+import com.gic.enterprise.service.BillingSmsRecordService;
 /**
  * 短信消费明细
  * @ClassName: BillingSmsRecord

@@ -15,22 +15,17 @@ import java.util.List;
  * @author guojuxing

  * @date 2019/8/23 2:21 PM

  */
-@Component
+@Component("billingSmsRecord")
 public class BillingSmsRecord implements IFeeChart{
     @Autowired
     private BillingSmsRecordService billingSmsRecordService;
-    private static BillingSmsRecord billingSmsRecord;
-    @PostConstruct
-    public void init() {
-        billingSmsRecord = this;
-    }
     @Override
     public List<HomeStatisticsDTO> listHomeStatistics(HomeStatisticsQO params) {
-        return billingSmsRecord.billingSmsRecordService.listHomeStatistics(params);
+        return billingSmsRecordService.listHomeStatistics(params);
     }
 
     @Override
     public double getFee(Integer enterpriseId, Integer dateType) {
-        return billingSmsRecord.billingSmsRecordService.getFee(enterpriseId, dateType);
+        return billingSmsRecordService.getFee(enterpriseId, dateType);
     }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/BillingVoiceCodeRecord.java

 package com.gic.enterprise.utils.chart;
 
-import com.gic.enterprise.dto.HomeStatisticsDTO;
-import com.gic.enterprise.qo.HomeStatisticsQO;
-import com.gic.enterprise.service.BillingVoiceCodeRecordService;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import java.util.List;
+import com.gic.enterprise.dto.HomeStatisticsDTO;
+import com.gic.enterprise.qo.HomeStatisticsQO;
+import com.gic.enterprise.service.BillingVoiceCodeRecordService;
 /**
  * 语音验证码消费明细
  * @ClassName: BillingVoiceCodeRecord

@@ -15,22 +15,17 @@ import java.util.List;
  * @author guojuxing

  * @date 2019/8/23 2:21 PM

  */
-@Component
+@Component("billingVoiceCodeRecord")
 public class BillingVoiceCodeRecord implements IFeeChart{
     @Autowired
     private BillingVoiceCodeRecordService billingVoiceCodeRecordService;
-    private static BillingVoiceCodeRecord billingVoiceCodeRecord;
-    @PostConstruct
-    public void init() {
-        billingVoiceCodeRecord = this;
-    }
     @Override
     public List<HomeStatisticsDTO> listHomeStatistics(HomeStatisticsQO params) {
-        return billingVoiceCodeRecord.billingVoiceCodeRecordService.listHomeStatistics(params);
+        return this.billingVoiceCodeRecordService.listHomeStatistics(params);
     }
 
     @Override
     public double getFee(Integer enterpriseId, Integer dateType) {
-        return billingVoiceCodeRecord.billingVoiceCodeRecordService.getFee(enterpriseId, dateType);
+        return this.billingVoiceCodeRecordService.getFee(enterpriseId, dateType);
     }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/ReadFeeChartConfig.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import com.gic.enterprise.utils.ApplicationContextUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
@@ -36,7 +37,7 @@ public class ReadFeeChartConfig {
 
             Set<Map.Entry<Object, Object>> entrySet = properties.entrySet();
             for (Map.Entry<Object, Object> entry : entrySet) {
-                map.put(Integer.parseInt((String) entry.getKey()), createClass((String) entry.getValue()));
+                map.put(Integer.parseInt((String) entry.getKey()), ApplicationContextUtils.getBean((String) entry.getValue()));
             }
         } catch (Exception e) {
             LOGGER.warn("解析config/feechart.properties文件失败:{}", e.getMessage(), e);

gic-platform-enterprise-service/src/main/resources/config/feechart.properties

 ###计费中心首页图表 服务配置
-7:com.gic.enterprise.utils.chart.BillingAccountBalanceRecord
-3:com.gic.enterprise.utils.chart.BillingSmsRecord
-4:com.gic.enterprise.utils.chart.BillingSmsPackageRecord
-8:com.gic.enterprise.utils.chart.BillingInternationSmsRecord
\ No newline at end of file
+7:billingAccountBalanceRecord
+3:billingSmsRecord
+4:billingSmsPackageRecord
+8:billingInternationSmsRecord
\ No newline at end of file