1.大屏-区域安全指数接口优重写初稿

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/AQZSDPStatisticsServiceImpl.java

@@ -21,12 +21,10 @@ import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.client.core.CountResponse;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -52,18 +50,25 @@ public class AQZSDPStatisticsServiceImpl {
 
     private final static String NO_DATA_STR = "--";
 
-    @Autowired
-    RestHighLevelClient restHighLevelClient;
 
-    @Resource
+    private RestHighLevelClient restHighLevelClient;
+
+
     private AQZSDPStatisticsMapper statisticsMapper;
 
-    @Autowired
-    CylinderStatisticsMapper cylinderStatisticsMapper;
 
-    @Autowired
+    private CylinderStatisticsMapper cylinderStatisticsMapper;
+
+
     private StCommonServiceImpl stCommonService;
 
+    public AQZSDPStatisticsServiceImpl(RestHighLevelClient restHighLevelClient, AQZSDPStatisticsMapper statisticsMapper, CylinderStatisticsMapper cylinderStatisticsMapper, StCommonServiceImpl stCommonService) {
+        this.restHighLevelClient = restHighLevelClient;
+        this.statisticsMapper = statisticsMapper;
+        this.cylinderStatisticsMapper = cylinderStatisticsMapper;
+        this.stCommonService = stCommonService;
+    }
+
 
     private String getLicenseEfficiencyByRegion(String orgCode) {
         List<KeyValueDto> keyValueDtos = statisticsMapper.queryLicenseEfficiencyOfRegion(orgCode);