fix:大屏-关键位置客运索道企业列表改为查询对接过的企业

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/AlertStatisticsMapper.java

@@ -17,7 +17,6 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Mapper 接口
@@ -65,5 +64,5 @@ public interface AlertStatisticsMapper extends BaseMapper<AlertStatistics> {
 
     List<AlertPaperInfoDto> getAlertPaperInfoList(@Param("regionCodes") List<String> regionCodes, @Param("isHistory") Boolean isHistory);
 
-    List<JSONObject> getUseUnitByCreditCode(@Param("useUnitCreditCode")Set<String> useUnitCreditCode);
+    List<JSONObject> getKeyMonitorUseUnitByCityCode(@Param("cityCode")String cityCode);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AlertStatisticsMapper.xml

@@ -449,10 +449,16 @@
 
     </select>
 
-    <select id="getUseUnitByCreditCode" resultType="com.alibaba.fastjson.JSONObject">
-        select sequence_nbr sequenceNbr, use_unit_code useUnitCode, use_unit useUnit from tz_base_enterprise_info where use_unit_code in
-        <foreach collection="useUnitCreditCode" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+    <select id="getKeyMonitorUseUnitByCityCode" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            v.region_code,
+            v.use_unit_code,
+            (SELECT use_unit FROM tz_base_enterprise_info WHERE use_code = v.use_unit_code)
+        FROM
+            tz_base_enterprise_video v
+        WHERE
+            region_code LIKE CONCAT('%', #{cityCode}, '%')
+        GROUP BY
+            use_unit_code
     </select>
 </mapper>

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Sets;
 import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
@@ -16,8 +15,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.common.api.entity.AlertRescueStatistics;
 import com.yeejoin.amos.boot.module.common.api.entity.AlertUseUnitStatistics;
 import com.yeejoin.amos.boot.module.common.api.enums.AlertCallEnum;
-import com.yeejoin.amos.boot.module.common.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.JYJCTypeEnum;
 import com.yeejoin.amos.boot.module.statistics.api.dto.AlertUseUnitStatisticsDto;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertRescueStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
@@ -39,12 +36,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.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.DateTimeUtil;
@@ -775,41 +770,11 @@ public class YJDPStatisticsServiceImpl {
     }
 
     public List<JSONObject> getKeyPositionMonitor(DPFilterParamForDetailDto filterParamDto) {
-        String orgCode = stCommonService.getAndSetOrgCode(filterParamDto.getCityCode());
-        return getKeyPositionMonitorByES(orgCode, filterParamDto);
+        return getKeyPositionMonitorByES(filterParamDto);
     }
 
-    private List<JSONObject> getKeyPositionMonitorByES(String orgCode, DPFilterParamForDetailDto filterParamDto) {
-        SearchRequest request = new SearchRequest();
-        request.indices("idx_biz_view_jg_all");
-        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
-        // 按照管辖机构区域信息模糊查询
-        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
-        // 根据设备种类查询重点监控单位
-        boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", filterParamDto.getEquListCode()));
-        SearchSourceBuilder builder = new SearchSourceBuilder();
-        builder.query(boolMust);
-        request.source(builder);
-        List<JSONObject> list = null;
-        Set<String> useUnitCreditCodeSet = Sets.newHashSet();
-        try {
-            SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
-            for (SearchHit hit : response.getHits().getHits()) {
-                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
-                JSONObject source = jsonObject.getJSONObject("sourceAsMap");
-                useUnitCreditCodeSet.add(source.getString("USE_UNIT_CREDIT_CODE"));
-            }
-            if (!ValidationUtil.isEmpty(useUnitCreditCodeSet)) {
-                list = alertStatisticsMapper.getUseUnitByCreditCode(useUnitCreditCodeSet);
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return list;
+    private List<JSONObject> getKeyPositionMonitorByES(DPFilterParamForDetailDto filterParamDto) {
+        return alertStatisticsMapper.getKeyMonitorUseUnitByCityCode(filterParamDto.getCityCode());
     }
 
-
-
 }