Skip to content

A
amos-boot-biz
Commit f2e3fbad authored by tianyiming's avatar tianyiming
Browse files
Options

refactor: 综合统计分析bug修改

parent 37035857
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 17 deletions
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ElevatorTechParamDefine.java
View file @ f2e3fbad
......@@ -45,7 +45,7 @@ public class ElevatorTechParamDefine implements ITechParamDefine {
private BigDecimal numberDoors;
@TechnicalParameter(key = "controlMode", label = "控制方式", equCategory = {"3100", "3200", "3400"}, type = TechnicalParameter.ParamType.STRING, dictCode = "DSXS")
@TechnicalParameter(key = "controlMode", label = "控制方式", equCategory = {"3100", "3200", "3400"}, type = TechnicalParameter.ParamType.STRING, dictCode = "KZFS")
private String controlMode;
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java
View file @ f2e3fbad
......@@ -425,7 +425,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
// 获取许可状态统计
List<Map<String, Object>> staticMap = new ArrayList<>();
if (!"".equals(licensesStatusStr)) {
getFilterCompanyOrPersonPermitStatusStatic(staticMap, StatisticalAnalysisEnum.company.getKey(), licensesStatusStr, totle);
getFilterCompanyOrPersonPermitStatusStatic(staticMap, StatisticalAnalysisEnum.person.getKey(), licensesStatusStr, totle);
} else {
getCompanyOrPersonPermitStatusStatic(boolMust, staticMap, StatisticalAnalysisEnum.person.getKey());
}
......@@ -562,11 +562,11 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
String fuzzyValue = String.valueOf(v);
BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
queryBuilder.should(QueryBuilders.wildcardQuery("name", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.matchQuery("postName", fuzzyValue));
queryBuilder.should(QueryBuilders.matchQuery("subPostName", fuzzyValue));
queryBuilder.should(QueryBuilders.wildcardQuery("postName.keyword", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("subPostName.keyword", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("unitName", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("equipCategoryName", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("superviseOrgName", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("equipTypeName.keyword", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("superviseOrgName.keyword", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("address", "*" + fuzzyValue + "*"));
queryBuilder.minimumShouldMatch(1);
boolMust.must(queryBuilder);
......@@ -1077,7 +1077,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
if ("1".equals(item)) {
queryBuilder.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", Boolean.TRUE))
.must(existsQuery("USE_ORG_CODE"));
.must(existsQuery("USE_ORG_CODE"))
.mustNot(QueryBuilders.termQuery("USE_ORG_CODE",""));
} else {
queryBuilder.should(QueryBuilders.boolQuery().mustNot(existsQuery("IS_INTO_MANAGEMENT")))
.should(QueryBuilders.matchQuery("IS_INTO_MANAGEMENT", Boolean.FALSE))
......@@ -1092,7 +1093,9 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
JSONArray dates = (JSONArray) v;
String startDate = dates.getString(0);
String endDate = dates.getString(1);
boolMust.filter(QueryBuilders.rangeQuery(field).gte(startDate).lte(endDate));
if(!"".equals(startDate) && !"".equals(endDate)){
boolMust.filter(QueryBuilders.rangeQuery(field).gte(startDate).lte(endDate));
}
} else if (k.equals("EQU_LIST") || k.equals("EQU_CATEGORY") || k.equals("EQU_DEFINE") || k.equals("DATA_QUALITY_SCORE")) {
if (k.equals("EQU_LIST")) {
field = "EQU_LIST_CODE";
......@@ -1136,8 +1139,10 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
QueryBuilders.rangeQuery(dateField).gte(startDate).lte(endDate),
ScoreMode.None
);
boolMust.must(fieldQuery);
boolMust.filter(dateQuery);
if(!"".equals(startDate) && !"".equals(endDate)){
boolMust.must(fieldQuery);
boolMust.filter(dateQuery);
}
} else if (k.equals("QZ_OR_TANK")) {
EnhancedDynamicQueryBuilder queryBuilder = new EnhancedDynamicQueryBuilder();
((JSONArray) v).forEach(item -> {
......@@ -1152,13 +1157,13 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
if (k.equals("fuzzyInput")) {
String fuzzyValue = String.valueOf(v);
BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
queryBuilder.should(QueryBuilders.wildcardQuery("EQU_LIST", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("EQU_CATEGORY", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("EQU_DEFINE", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("EQU_LIST.keyword", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("EQU_CATEGORY.keyword", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("EQU_DEFINE.keyword", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("PRODUCT_NAME", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("USE_UNIT_NAME", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("SAFETY_MANAGER", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("SAFETY_MANAGER.keyword", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("ORG_BRANCH_NAME", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("MAINTAIN_UNIT_NAME", "*" + fuzzyValue + "*"));
queryBuilder.minimumShouldMatch(1);
......@@ -1254,11 +1259,11 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
BoolQueryBuilder nearBoolQuery = QueryBuilderUtils.copyBoolQuery(boolMust);
NestedQueryBuilder nearNestedQuery = QueryBuilders.nestedQuery(
path,
QueryBuilders.boolQuery().must(QueryBuilders.rangeQuery(nestedField).lte(LocalDate.now().plusDays(30).format(formatter)).gte(LocalDate.now().format(formatter))),
QueryBuilders.boolQuery().must(QueryBuilders.rangeQuery(nestedField).lt(LocalDate.now().plusDays(30).format(formatter)).gte(LocalDate.now().format(formatter))),
ScoreMode.None
);
nearBoolQuery.must(nearNestedQuery);
Long nearCount = getStatisticCount(nearBoolQuery, StatisticalAnalysisEnum.company.getKey());
Long nearCount = getStatisticCount(nearBoolQuery, index);
Map<String, Object> normalMap = new HashMap<>();
normalMap.put("name", index.equals(StatisticalAnalysisEnum.company.getKey()) ? "许可正常" : "资质正常");
......@@ -1309,7 +1314,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
Boolean result = false;
if (v instanceof JSONArray) {
JSONArray jsonArray = (JSONArray) v;
result = jsonArray.size() != 0 && !jsonArray.get(0).equals("all");
result = jsonArray.size() != 0 && null != jsonArray.get(0) && !"all".equals(jsonArray.get(0));
} else if (v instanceof String) {
if ("null".equals(v) || "".equals(v) || null == v) {
result = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment