优化：设备列表查询，根据机构筛选

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -12,17 +13,13 @@ import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
 import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgConstructionInfoDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgInspectionDetectionInfoDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgMainPartsDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgMaintenanceRecordInfoDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgProtectionDevicesDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
+import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
@@ -30,7 +27,6 @@ import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.recycler.Recycler;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -69,13 +65,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private static final String EQUDEFINE = "EQU_DEFINE";
     private static final String EQUDEFINECODE = "EQU_DEFINE_CODE";
 
-    /**
-     * levlel=company,是企业,如果不是都是监管单位,
-     * * 在接口中查询当前登录人所属单位是监管单位还是企业。
-     * * 如果为监管单位添加监管机构查询参数（ORG_BRANCH_CODE）；
-     * * 如果为企业添加使用单位查询参数(USE_UNIT_CREDIT_CODE)
-     */
-    private static final String LEVEL = "company";
     // 新增修改标识
     private static final String OPERATESAVE = "save";
     private static final String OPERATEEDIT = "edit";
@@ -123,6 +112,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     @Autowired
     private SuperviseInfoMapper superviseInfoMapper;
 
+
     /**
      * 设备注册信息
      *
@@ -541,55 +531,34 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         builder.trackTotalHits(true);
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
 
+        //获取当前登录人单位类型
+        JSONObject company = getCompanyType();
+        if (ValidationUtil.isEmpty(company)) {
+            result.setRecords(new ArrayList<>());
+            result.setTotal(0);
+            return result;
+        }
+        String companyCode = company.getString("companyCode").contains("_") ?
+                company.getString("companyCode").split("_")[1] : company.getString("companyCode");
+        String type = company.getString("companyType");
+        if (ValidationUtil.isEmpty(type) || ValidationUtil.isEmpty(companyCode)) {
+            result.setRecords(new ArrayList<>());
+            result.setTotal(0);
+            return result;
+        }
+
         //根据当前登录人查询
         if (!ValidationUtil.isEmpty(map.get(EQUSTATE))) {
             map.put(EQUSTATE, EquimentEnum.getCode.get(map.get(EQUSTATE).toString()).toString());
         }
-        //获取当前登录人单位类型
-        List<JSONObject> companyType = getCompanyType();
-        if (!ValidationUtil.isEmpty(companyType)) {
-            JSONObject object = getCompanyType().get(0);
-            String level = object.getString("level");
-            String code = object.getString("orgCode");
-            String companyCode = object.getString("companyCode").contains("_") ?
-                    object.getString("companyCode").split("_")[1] : object.getString("companyCode");
-            String type = object.getString("companyType");
 
         // 根据当前登录用户类型及管辖机构筛选条件添加对应参数
-            if (!ValidationUtil.isEmpty(level)) {
-                if (LEVEL.equals(level)) {
-                    //企业
         if (!ValidationUtil.isEmpty(type) && ValidationUtil.equals(type, "使用单位")) {
             map.put("USE_UNIT_CREDIT_CODE", companyCode);
         } else if (!ValidationUtil.isEmpty(type) && ValidationUtil.equals(type, "安装改造维修单位")) {
             map.put("USC_UNIT_CREDIT_CODE", companyCode);
         }
 
-                    if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
-                        BoolQueryBuilder query = QueryBuilders.boolQuery();
-                        String test = QueryParser.escape(map.getString("ORG_BRANCH_CODE"));
-                        query.must(QueryBuilders.matchPhrasePrefixQuery("ORG_BRANCH_CODE", test));
-                        boolMust.must(query);
-                    }
-                } else {
-                    if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
-                        String paramCode = map.getString("ORG_BRANCH_CODE");
-                        if (paramCode.contains(code)) {
-                            BoolQueryBuilder query = QueryBuilders.boolQuery();
-                            String test = QueryParser.escape(map.getString("ORG_BRANCH_CODE"));
-                            query.must(QueryBuilders.matchPhrasePrefixQuery("ORG_BRANCH_CODE", test));
-                            boolMust.must(query);
-                        } else {
-                            return result;
-                        }
-                    } else {
-                        //监管单位
-                        map.put("ORG_BRANCH_CODE", code);
-                    }
-                }
-            }
-        }
-
         // 默认条件【STATUS==="" || null】
         BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
         meBuilder.must(QueryBuilders.boolQuery()
@@ -732,23 +701,22 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      *
      * @return
      */
-    public List<JSONObject> getCompanyType() {
+    public JSONObject getCompanyType() {
 
-        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        List<CompanyModel> companys = reginParams.getUserModel().getCompanys();
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        CompanyBo company = reginParams.getCompany();
 
-        List<JSONObject> objectList = new ArrayList<>();
-        if (!ValidationUtil.isEmpty(companys)) {
-            for (CompanyModel company : companys) {
         JSONObject object = new JSONObject();
+        if (!ValidationUtil.isEmpty(company)) {
             object.put("level", company.getLevel());
             object.put("orgCode", company.getOrgCode());
             object.put("companyCode", company.getCompanyCode());
-                object.put("companyType", company.getCompanyType());
-                objectList.add(object);
+            CompanyModel result = Privilege.companyClient.queryByCompanyCode(company.getCompanyCode()).getResult();
+            if(!ValidationUtil.isEmpty(result)){
+                object.put("companyType", result.getCompanyType());
             }
         }
-        return objectList;
+        return object;
     }
 
     private String batchSubmitOrUpdate(Map<String, Object> map) {