1.日志打印修改system->log

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

@@ -36,6 +36,7 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
@@ -76,6 +77,7 @@ import static com.alibaba.fastjson.JSON.toJSONString;
  * @date 2023-08-17
  */
 @Service
+@Slf4j
 public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegisterInfoDto, IdxBizJgRegisterInfo, IdxBizJgRegisterInfoMapper> implements IIdxBizJgRegisterInfoService {
     public final static String USE_TYPE_NAME = "使用单位";
     public final static String INDIVIDUAL_TYPE_NAME = "个人主体";
@@ -1379,7 +1381,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             pBuilder.must(QueryBuilders.wildcardQuery("PRODUCE_UNIT_NAME", "*" + test.toLowerCase() + "*"));
             boolMust.must(pBuilder);
         }
-        System.err.println(boolMust);
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
         builder.from((pageNumber - 1) * size);
@@ -1387,7 +1388,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         request.source(builder);
         List<JSONObject> list = new LinkedList<>();
         long totle = 0;
-
+        if(log.isDebugEnabled()){
+            log.debug("查询es 的查询条件: {}", request);
+        }
         try {
             SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
             for (org.elasticsearch.search.SearchHit hit : response.getHits().getHits()) {
@@ -1421,15 +1424,21 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     equAddressMap = useInfoListByEquIds.stream().collect(Collectors.toMap(IdxBizJgUseInfo::getRecord,
                                     useInfo -> {
                                         String fulladdress = "";
-                                        if (!ValidationUtil.isEmpty(useInfo.getProvinceName()))
+                                        if (!ValidationUtil.isEmpty(useInfo.getProvinceName())) {
                                             fulladdress += useInfo.getProvinceName();
-                                        if (!ValidationUtil.isEmpty(useInfo.getCityName()))
+                                        }
+                                        if (!ValidationUtil.isEmpty(useInfo.getCityName())) {
                                             fulladdress += useInfo.getCityName();
-                                        if (!ValidationUtil.isEmpty(useInfo.getCountyName()))
+                                        }
+                                        if (!ValidationUtil.isEmpty(useInfo.getCountyName())) {
                                             fulladdress += useInfo.getCountyName();
-                                        if (!ValidationUtil.isEmpty(useInfo.getStreetName()))
+                                        }
+                                        if (!ValidationUtil.isEmpty(useInfo.getStreetName())) {
                                             fulladdress += useInfo.getStreetName();
-                                        if (!ValidationUtil.isEmpty(useInfo.getAddress())) fulladdress += useInfo.getAddress();
+                                        }
+                                        if (!ValidationUtil.isEmpty(useInfo.getAddress())) {
+                                            fulladdress += useInfo.getAddress();
+                                        }
                                         return fulladdress;
                                     }
                             )