调整设备区域查询方法

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/ScreenMapper.java

@@ -24,4 +24,6 @@ public interface ScreenMapper {
     List<Map<String, String>> userCount(@Param("screenDto") ScreenDto screenDto);
 
     List<Map<String, Object>> supervisorCount(@Param("screenDto") ScreenDto screenDto);
+
+    String getOrgCodeByCompanyCode(@Param("cityCode") String cityCode);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/ScreenMapper.xml

@@ -49,6 +49,9 @@
 		GROUP BY
 			bi.industry_supervisor
 	</select>
+    <select id="getOrgCodeByCompanyCode" resultType="java.lang.String">
+		select org_code from privilege_company where company_code = #{cityCode} limit 1
+	</select>
 
 </mapper>
 

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.boot.module.tcm.api.dto.ScreenDto;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.ScreenMapper;
 import com.yeejoin.amos.boot.module.tcm.api.service.statistics.IScreenService;
+import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
@@ -22,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 @Service
 public class ScreenImpl implements IScreenService {
@@ -31,6 +33,7 @@ public class ScreenImpl implements IScreenService {
 
     @Autowired
     RestHighLevelClient restHighLevelClient;
+    private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
     @Override
     public List<Map<String,Object>> companyInfo(ScreenDto screenDto) {
 
@@ -450,9 +453,9 @@ public class ScreenImpl implements IScreenService {
         SearchRequest searchRequest = new SearchRequest("idx_biz_view_jg_all");
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         //设置模糊搜索
+        String orgCode = getAndSetOrgCode(screenDto.getCityCode());
         searchSourceBuilder.query(QueryBuilders.boolQuery()
-                .must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*"+screenDto.getCityCode()+"*"))
-                .must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true)));
+                .must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*")));
         searchSourceBuilder.aggregation(
                         AggregationBuilders.terms("USE_SITE_CODE").field("USE_SITE_CODE")
         );
@@ -533,5 +536,14 @@ public class ScreenImpl implements IScreenService {
         }
         return returnList;
     }
-
+    private String getAndSetOrgCode(String cityCode) {
+        String orgCode = regionCodeOrgCodeMap.get(cityCode);
+        if (orgCode == null) {
+            orgCode = screenMapper.getOrgCodeByCompanyCode(cityCode);
+            if (orgCode != null) {
+                regionCodeOrgCodeMap.put(cityCode, orgCode);
+            }
+        }
+        return orgCode;
+    }
 }