1、添加es链接账号密码

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

@@ -280,13 +280,16 @@
             d2.name AS cylinder_variety_name,
             d3.name AS cylinder_status_str,
             ct.qrCode,
-            ct.electronic_label_code
+            ct.electronic_label_code,
+            cu.region_code
         FROM
             tz_cylinder_info AS ci
                 LEFT JOIN cb_data_dictionary AS d1 ON d1.type = 'CZJZMC' AND d1.code = ci.filling_media
                 LEFT JOIN cb_data_dictionary AS d2 ON d2.sequence_nbr = ci.cylinder_variety
                 LEFT JOIN cb_data_dictionary AS d3 ON d3.sequence_nbr = ci.cylinder_status
                 LEFT JOIN tz_cylinder_tags AS ct ON ct.sequence_code = ci.sequence_code
+                LEFT JOIN tz_cylinder_unit AS cu ON ci.app_id = cu.app_id
         where ci.is_not_es IS NULL
+        AND region_code is not null
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderInfoController.java

@@ -612,7 +612,7 @@ public class CylinderInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getEsCyinderInfoList")
     @ApiOperation(httpMethod = "GET", value = "获取登陆人所在气瓶基本信息", notes = "获取登陆人所在气瓶基本信息")
-    public ResponseModel<IPage<ESCylinderInfoDto>> getEsCyinderInfoList(@RequestParam(value = "pageNum") int pageNum,
+    public ResponseModel<Page<ESCylinderInfoDto>> getEsCyinderInfoList(@RequestParam(value = "pageNum") int pageNum,
                                                                         @RequestParam(value = "pageSize") int pageSize,
                                                                         CylinderInfoDto cylinderInfoDto) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
@@ -624,7 +624,7 @@ public class CylinderInfoController extends BaseController {
             cylinderInfoDto.setCreditCode(companyCode);
         }
         if (ValidationUtil.isEmpty(cylinderInfoDto.getRegionCode()) && ValidationUtil.isEmpty(cylinderInfoDto.getCreditCode()) && cylinderInfoDto.getIsWarn() == 0) {
-            return null;
+			return ResponseHelper.buildResponse(new Page<ESCylinderInfoDto>());
         }
         Page<ESCylinderInfoDto> pageResult = cylinderInfoServiceImpl.queryByKeys(cylinderInfoDto, pageNum, pageSize);
         return ResponseHelper.buildResponse(pageResult);

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

@@ -11,10 +11,16 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingRecord;
 import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingRecordMapper;
 import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderFillingRecordService;
 import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -54,6 +60,12 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
     @Value("${biz.elasticsearch.port}")
     private Integer esPort;
 
+    @Value("${elasticsearch.username}")
+    private String esUserName;
+
+    @Value("${elasticsearch.password}")
+    private String esPwd;
+
     /**
      * 分页查询
      */
@@ -184,10 +196,25 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
 
         Page<ESCylinderFillingRecordDto> result = new Page<ESCylinderFillingRecordDto>(pageNum, pageSize);
 
-        RestHighLevelClient esClient = new RestHighLevelClient(
-                RestClient.builder(new HttpHost(esAddress, esPort, "http"))
+        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(AuthScope.ANY,
+                new UsernamePasswordCredentials(esUserName, esPwd));  //es账号密码
+        RestHighLevelClient esClient =new RestHighLevelClient(
+                RestClient.builder(
+                        new HttpHost(esAddress,esPort)
+                ).setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
+                    public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
+                        httpClientBuilder.disableAuthCaching();
+                        return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                    }
+                })
         );
 
+
+//        RestHighLevelClient esClient = new RestHighLevelClient(
+//                RestClient.builder(new HttpHost(esAddress, esPort, "http"))
+//        );
+
         SearchRequest request = new SearchRequest();
         request.indices("cylinder_info");
 

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

@@ -26,10 +26,16 @@ import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -135,6 +141,13 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
 	@Value("${biz.elasticsearch.port}")
 	private Integer esPort;
 
+	@Value("${elasticsearch.username}")
+	private String esUserName;
+
+	@Value("${elasticsearch.password}")
+	private String esPwd;
+
+
 	@Autowired
 	StartPlatformTokenService startPlatformTokenService;
 
@@ -715,11 +728,27 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
 	public Page<ESCylinderInfoDto> queryByKeys(CylinderInfoDto cylinderInfoDto, int pageNum, int pageSize) {
 
 		Page<ESCylinderInfoDto> result = new Page<ESCylinderInfoDto>(pageNum, pageSize);
-
-		RestHighLevelClient esClient = new RestHighLevelClient(
-				RestClient.builder(new HttpHost(esAddress, esPort, "http"))
+		final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+		credentialsProvider.setCredentials(AuthScope.ANY,
+				new UsernamePasswordCredentials(esUserName, esPwd));  //es账号密码
+		RestHighLevelClient esClient =new RestHighLevelClient(
+				RestClient.builder(
+						new HttpHost(esAddress,esPort)
+				).setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
+					public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
+						httpClientBuilder.disableAuthCaching();
+						return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+					}
+				})
 		);
 
+
+
+//		RestHighLevelClient esClient = new RestHighLevelClient(
+//				RestClient.builder(new HttpHost(esAddress, esPort, "http"))
+//		);
+
+
 		SearchRequest request = new SearchRequest();
 		request.indices("cylinder_info");