修改es

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ESEquipmentCategoryDto.java

@@ -9,6 +9,8 @@ import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 
+import java.util.Date;
+
 /**
  * @Author cpp
  * @Description
@@ -69,6 +71,9 @@ public class ESEquipmentCategoryDto {
     @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
     private String STATUS;
 
+    @Field(type = FieldType.Date, format = DateFormat.basic_date_time, index = false)
+    private Date REC_DATE;
+
 
 
 }

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

@@ -329,7 +329,7 @@ public class EquipmentCategoryController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/viewJgAll")
 	@ApiOperation(httpMethod = "GET", value = "viewJgAll", notes = "viewJgAll")
-	public ResponseModel<Page<ESEquipmentCategoryDto>> viewJgAll( @RequestParam Map<String,Object> map) {
+	public ResponseModel<Page<JSONObject>> viewJgAll( @RequestParam Map<String,Object> map) {
 		JSONObject jsonObject = new JSONObject(map);
 		return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.queryByKeys(jsonObject));
 	}

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

@@ -891,7 +891,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     }
 
 
-    public Page<ESEquipmentCategoryDto> queryByKeys(JSONObject map) {
+
+
+    public Page<JSONObject> queryByKeys(JSONObject map) {
         //根据当前登录人查询
         if (!ValidationUtil.isEmpty(map.get(EQUSTATE))) {
             map.put(EQUSTATE, EquimentEnum.getCode.get(map.get(EQUSTATE).toString()).toString());
@@ -909,81 +911,141 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             } else {
                 //监管单位
                 map.put("ORG_BRANCH_CODE", code);
-
             }
         }
-            Page<ESEquipmentCategoryDto> result = new Page<ESEquipmentCategoryDto>(map.getInteger("number"), map.getInteger("size"));
+        Page<JSONObject> result = new Page<>(map.getInteger("number"), map.getInteger("size"));
         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);
+
                     }
+
                 })
+
         );
 
         SearchRequest request = new SearchRequest();
+
         request.indices("idx_biz_view_jg_all");
-            //通用匹配规则，条件构建
-            boolean flag = true;
 
         SearchSourceBuilder builder = new SearchSourceBuilder();
+
+        builder.trackTotalHits(true);
+
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
 
+        //通用匹配规则，条件构建
+
+
+
         //SEQUENCE_NBR
+
         if (!ObjectUtils.isEmpty(map.getString("SEQUENCE_NBR"))) {
+
+
+
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
+
             meBuilder.must(QueryBuilders.matchQuery("SEQUENCE_NBR", map.getString("SEQUENCE_NBR")));
+
             boolMust.must(meBuilder);
+
         }
+
         if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_NAME"))) {
+
+
+
             BoolQueryBuilder query = QueryBuilders.boolQuery();
+
             query.must(QueryBuilders.matchQuery("ORG_BRANCH_NAME", "*" + map.getString("ORG_BRANCH_NAME") + "*"));
+
             boolMust.must(query);
+
         }
+
         if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
+
+
+
             BoolQueryBuilder query = QueryBuilders.boolQuery();
+
             query.must(QueryBuilders.matchQuery("ORG_BRANCH_CODE", "*" + map.getString("ORG_BRANCH_CODE") + "*"));
+
             boolMust.must(query);
+
         }
+
         if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_NAME"))) {
+
+
+
             BoolQueryBuilder query = QueryBuilders.boolQuery();
+
             query.must(QueryBuilders.matchQuery("USE_UNIT_NAME", "*" + map.getString("USE_UNIT_NAME") + "*"));
+
             boolMust.must(query);
+
         }
+
         if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE"))) {
+
+
+
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
+
             meBuilder.must(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", map.getString("USE_UNIT_CREDIT_CODE")));
+
             boolMust.must(meBuilder);
 
+
+
         }
 
+
+
         if (!ObjectUtils.isEmpty(map.getString("EQU_LIST_CODE"))) {
+
+
+
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-                meBuilder.must(QueryBuilders.matchQuery("EQU_LIST_CODE", map.getString("EQU_LIST_CODE")));
+
+            meBuilder.must(QueryBuilders.matchQuery("EQU_LIST_CODE", "*"+map.getString("EQU_LIST_CODE")+"*"));
+
             boolMust.must(meBuilder);
 
+
+
         }
 
+
+
         if (!ObjectUtils.isEmpty(map.getString("EQU_LIST"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
             meBuilder.must(QueryBuilders.matchQuery("EQU_LIST", map.getString("EQU_LIST")));
             boolMust.must(meBuilder);
-
         }
-
         if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
             meBuilder.must(QueryBuilders.matchQuery("EQU_CATEGORY", map.getString("EQU_CATEGORY")));
             boolMust.must(meBuilder);
 
         }
-
         if (!ObjectUtils.isEmpty(map.getString("USE_ORG_CODE"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
             meBuilder.must(QueryBuilders.matchQuery("USE_ORG_CODE", map.getString("USE_ORG_CODE")));
@@ -993,74 +1055,104 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
 
         if (!ObjectUtils.isEmpty(map.getString("CODE96333"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
+
             meBuilder.must(QueryBuilders.matchQuery("CODE96333", map.getString("CODE96333")));
             boolMust.must(meBuilder);
-
         }
-
         if (!ObjectUtils.isEmpty(map.getString("EQU_CODE"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-                meBuilder.must(QueryBuilders.matchQuery("EQU_CODE", map.getString("EQU_CODE")));
+            meBuilder.must(QueryBuilders.matchQuery("EQU_CODE", "*"+map.getString("EQU_CODE")+"*"));
             boolMust.must(meBuilder);
-
         }
 
         if (!ObjectUtils.isEmpty(map.getString("SUPERVISORY_CODE"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
             meBuilder.must(QueryBuilders.matchQuery("SUPERVISORY_CODE", map.getString("SUPERVISORY_CODE")));
             boolMust.must(meBuilder);
-
         }
-
         if (!ObjectUtils.isEmpty(map.getString("USE_PLACE"))) {
             BoolQueryBuilder query = QueryBuilders.boolQuery();
             query.must(QueryBuilders.matchQuery("USE_PLACE", "*" + map.getString("USE_PLACE") + "*"));
             boolMust.must(query);
         }
-
         if (!ObjectUtils.isEmpty(map.getString("ADDRESS"))) {
             BoolQueryBuilder query = QueryBuilders.boolQuery();
             query.must(QueryBuilders.matchQuery("ADDRESS", "*" + map.getString("ADDRESS") + "*"));
             boolMust.must(query);
         }
-
         if (!ObjectUtils.isEmpty(map.getString("EQU_STATE"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
             meBuilder.must(QueryBuilders.matchQuery("EQU_STATE", map.getString("EQU_STATE")));
             boolMust.must(meBuilder);
-
         }
-
         if (!ObjectUtils.isEmpty(map.getString("STATUS"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
             meBuilder.must(QueryBuilders.matchQuery("STATUS", map.getString("STATUS")));
             boolMust.must(meBuilder);
-
         }
         builder.query(boolMust);
         builder.from((map.getInteger("number") - 1) * map.getInteger("size"));
         builder.size(map.getInteger("size"));
         request.source(builder);
-            List<ESEquipmentCategoryDto> list = new LinkedList<>();
+        List<JSONObject> list = new LinkedList<>();
         long totle = 0;
         try {
             SearchResponse response = esClient.search(request, RequestOptions.DEFAULT);
-                for (org.elasticsearch.search.SearchHit hit : response.getHits()) {
+            for (org.elasticsearch.search.SearchHit hit : response.getHits().getHits()) {
                 System.out.println(hit);
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
-                    ESEquipmentCategoryDto dto2 = JSONObject.toJavaObject(jsonObject.getJSONObject("sourceAsMap"), ESEquipmentCategoryDto.class);
+                JSONObject dto2 = jsonObject.getJSONObject("sourceAsMap");
                 list.add(dto2);
             }
-                totle = response.getInternalResponse().hits().getTotalHits().value;
+            totle = getCount("idx_biz_view_jg_all",esClient);
             result.setRecords(list);
             result.setTotal(totle);
         } catch (IOException e) {
             throw new RuntimeException(e);
+        }finally {
+            try {
+                esClient.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
             }
+        }
+
         return result;
 
     }
 
+    //es统计总记录数
+
+    public Long getCount(String indexs ,RestHighLevelClient esClient){
+
+        Long totle=0L;
+
+        SearchRequest searchRequest = new SearchRequest(indexs);
+
+        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+
+        searchSourceBuilder.query(QueryBuilders.matchAllQuery());
+
+        searchSourceBuilder.trackTotalHits(true);
+
+        searchRequest.source(searchSourceBuilder);
+
+        try {
+
+            SearchResponse searchResponse = esClient.search(searchRequest, RequestOptions.DEFAULT);
+
+            totle=searchResponse.getInternalResponse().hits().getTotalHits().value;
+
+        } catch (IOException e) {
+
+            throw new RuntimeException(e);
+
+        }
+
+        return totle;
+
+    }
+
 
 
 

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application.properties

-spring.application.name=TZS-cpp
+spring.application.name=TZS
 server.servlet.context-path=/tzs
 server.port=11000
 spring.profiles.active=dev3
@@ -10,7 +10,7 @@ mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 ##liquibase
 spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
-spring.liquibase.enabled= false
+spring.liquibase.enabled= true