fix: 压力管道长度统计方法调用修正

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

@@ -101,13 +101,15 @@ public class AQZSDPStatisticsServiceImpl {
 
     private StCommonServiceImpl stCommonService;
 
+    private JGDPStatisticsServiceImpl jgDPStatisticsService;
+
     private DataDictionaryMapper dataDictionaryMapper;
 
     @Autowired
     private ComprehensiveStatisticalAnalysisServiceImpl statisticalAnalysisService;
 
 
-    public AQZSDPStatisticsServiceImpl(RestHighLevelClient restHighLevelClient, AQZSDPStatisticsMapper statisticsMapper, TzBaseEnterpriseInfoMapper enterpriseInfoMapper, TzsUserInfoMapper userInfoMapper, CylinderStatisticsMapper cylinderStatisticsMapper, StCommonServiceImpl stCommonService, DataDictionaryMapper dataDictionaryMapper) {
+    public AQZSDPStatisticsServiceImpl(RestHighLevelClient restHighLevelClient, AQZSDPStatisticsMapper statisticsMapper, TzBaseEnterpriseInfoMapper enterpriseInfoMapper, TzsUserInfoMapper userInfoMapper, CylinderStatisticsMapper cylinderStatisticsMapper, StCommonServiceImpl stCommonService, DataDictionaryMapper dataDictionaryMapper, JGDPStatisticsServiceImpl jgDPStatisticsService) {
         this.restHighLevelClient = restHighLevelClient;
         this.statisticsMapper = statisticsMapper;
         this.enterpriseInfoMapper = enterpriseInfoMapper;
@@ -115,6 +117,7 @@ public class AQZSDPStatisticsServiceImpl {
         this.cylinderStatisticsMapper = cylinderStatisticsMapper;
         this.stCommonService = stCommonService;
         this.dataDictionaryMapper = dataDictionaryMapper;
+        this.jgDPStatisticsService = jgDPStatisticsService;
     }
 
 
@@ -906,7 +909,8 @@ public class AQZSDPStatisticsServiceImpl {
         long hasSupervisoryCodeEquipCount = stCommonService.queryHasSupervisoryCodeEquipCount(orgCode, false);
         result.put("total", hasSupervisoryCodeEquipCount);
         //2.压力管道长度统计
-        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
+//        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
+        jgDPStatisticsService.staticsCenterMapCountPipLine(result, orgCode);
         //3.单位数量统计
         // 单位统计修改为查询es
 //        this.staticsCenterMapCountDataForCompany(result, orgCode, dpFilterParamDto.getCityCode());
@@ -1019,7 +1023,8 @@ public class AQZSDPStatisticsServiceImpl {
         // 1. 8大类设备数量统计,压力容器里包括气瓶所以需要特殊处理，在统计压力容器时去掉气瓶的数量
         stCommonService.staticsCenterMapCountDataForEquip(result, cylinderNum, orgCode,true,true, false);
         // 2. 压力管道长度统计
-        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
+//        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
+        jgDPStatisticsService.staticsCenterMapCountPipLine(result, orgCode);
         //3.单位数量统计
         // 单位统计修改为查询es
 //        this.staticsCenterMapCountDataForCompany(result, orgCode, dpFilterParamDto.getCityCode());

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/JGDPStatisticsServiceImpl.java

@@ -475,7 +475,7 @@ public class JGDPStatisticsServiceImpl {
     }
 
 
-    private void staticsCenterMapCountPipLine(Map<String, Object> result, String orgCode) {
+    public void staticsCenterMapCountPipLine(Map<String, Object> result, String orgCode) {
         SearchRequest request = new SearchRequest();
         SearchSourceBuilder builder = new SearchSourceBuilder();
         request.indices(StatisticalAnalysisEnum.equip.getKey());
@@ -1804,7 +1804,8 @@ public class JGDPStatisticsServiceImpl {
         long hasSupervisoryCodeEquipCount = stCommonService.queryHasSupervisoryCodeEquipCount(orgCode, false);
         result.put("total", hasSupervisoryCodeEquipCount);
         // 2.压力管道长度统计
-        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode, true, false);
+//        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode, true, false);
+        this.staticsCenterMapCountPipLine(result, orgCode);
         // 3.已纳管设备总数
         this.staticsCenterMapCountDataForEquipIsManage(result);
         // 4.登记证总数

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/JYJCDPStatisticsServiceImpl.java

@@ -107,13 +107,15 @@ public class JYJCDPStatisticsServiceImpl {
 
     private SafetyProblemTracingMapper safetyProblemTracingMapper;
 
+    private JGDPStatisticsServiceImpl jgDPStatisticsService;
+
     /**
      * 法定检验机构名单
      */
     @Value("${jyjc.legal.companyCode:12610100750228848W,12610300MB2943942F,12610400435630992M,12610200435252143F,126105007326878566,12610600MB29845683,126108004366752362,12610700MB296441XY,12610900353680128G,126110004363154256,126100004352004822}")
     private String legalCompanyCodes;
 
-    public JYJCDPStatisticsServiceImpl(JyjcInspectionApplicationEquipMapper inspectionApplicationEquipMapper, JyjcInspectionApplicationMapper inspectionApplicationMapper, TzsUserInfoMapper tzsUserInfoMapper, JyjcInspectionResultMapper inspectionResultMapper, JyjcOpeningApplicationMapper openingApplicationMapper, RestHighLevelClient restHighLevelClient, StCommonServiceImpl stCommonService, JYJCStatisticsMapper jyjcStatisticsMapper, SafetyProblemTracingMapper safetyProblemTracingMapper) {
+    public JYJCDPStatisticsServiceImpl(JyjcInspectionApplicationEquipMapper inspectionApplicationEquipMapper, JyjcInspectionApplicationMapper inspectionApplicationMapper, TzsUserInfoMapper tzsUserInfoMapper, JyjcInspectionResultMapper inspectionResultMapper, JyjcOpeningApplicationMapper openingApplicationMapper, RestHighLevelClient restHighLevelClient, StCommonServiceImpl stCommonService, JYJCStatisticsMapper jyjcStatisticsMapper, SafetyProblemTracingMapper safetyProblemTracingMapper, JGDPStatisticsServiceImpl jgDPStatisticsService) {
         this.inspectionApplicationEquipMapper = inspectionApplicationEquipMapper;
         this.inspectionApplicationMapper = inspectionApplicationMapper;
         this.tzsUserInfoMapper = tzsUserInfoMapper;
@@ -123,6 +125,7 @@ public class JYJCDPStatisticsServiceImpl {
         this.stCommonService = stCommonService;
         this.jyjcStatisticsMapper = jyjcStatisticsMapper;
         this.safetyProblemTracingMapper = safetyProblemTracingMapper;
+        this.jgDPStatisticsService = jgDPStatisticsService;
     }
 
 
@@ -544,7 +547,8 @@ public class JYJCDPStatisticsServiceImpl {
         long hasSupervisoryCodeEquipCount = stCommonService.queryHasSupervisoryCodeEquipCount(orgCode, false);
         result.put("total", hasSupervisoryCodeEquipCount);
         // 3.压力管道统计
-        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
+//        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
+        jgDPStatisticsService.staticsCenterMapCountPipLine(result, orgCode);
         // 4.报检数量统计
         this.staticsCenterMapCountDataReporting(result, dpFilterParamDto);
         // 5.检验检测临期设备数数量统计