Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -178,6 +178,12 @@
                 <datasource.druid.user.username>epmet_user_user</datasource.druid.user.username>
                 <datasource.druid.user.password>EpmEt-db-UsEr</datasource.druid.user.password>
 
+                <datasource.druid.statsdisplay.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.statsdisplay.url>
+                <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
+                <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/IndexCalculateServiceImpl.java

@@ -2,10 +2,12 @@ package com.epmet.service.screen.impl;
 
 import com.epmet.dto.screen.form.IndexCalculateForm;
 import com.epmet.service.screen.IndexCalculateService;
+import org.springframework.stereotype.Service;
 
 /**
  * @author liujianjun
  */
+@Service
 public class IndexCalculateServiceImpl implements IndexCalculateService {
     @Override
     public void cpcIndexCalculate(IndexCalculateForm formDTO) {