|
@@ -71,36 +71,36 @@ public class VisualController extends BaseESController {
|
|
|
List<String> orderRegulation = null;// 指定的排序规则
|
|
|
switch (visualBO.getType()) {
|
|
|
case "linye":
|
|
|
- visualBO.setIndexNames(FORESTRY_INDEXNAMES);
|
|
|
- orderRegulation = Arrays.asList(FORESTRY_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(FORESTRY_INDEXNAMES_TZ);
|
|
|
+ orderRegulation = Arrays.asList(FORESTRY_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "nongye":
|
|
|
- visualBO.setIndexNames(AGRICULTURE_INDEXNAMES);
|
|
|
- orderRegulation = Arrays.asList(AGRICULTURE_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(AGRICULTURE_INDEXNAMES_TZ);
|
|
|
+ orderRegulation = Arrays.asList(AGRICULTURE_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "shuili":
|
|
|
- visualBO.setIndexNames(WATER_INDEXNAMES);
|
|
|
- orderRegulation = Arrays.asList(WATER_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(WATER_INDEXNAMES_TZ);
|
|
|
+ orderRegulation = Arrays.asList(WATER_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "huanbao":
|
|
|
- visualBO.setIndexNames(ENVIRONMENT_INDEXNAMES);
|
|
|
- orderRegulation = Arrays.asList(ENVIRONMENT_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(ENVIRONMENT_INDEXNAMES_TZ);
|
|
|
+ orderRegulation = Arrays.asList(ENVIRONMENT_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "yingji":
|
|
|
- visualBO.setIndexNames(EMERGENCY_INDEXNAMES);
|
|
|
- orderRegulation = Arrays.asList(EMERGENCY_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(EMERGENCY_INDEXNAMES_TZ);
|
|
|
+ orderRegulation = Arrays.asList(EMERGENCY_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "jiaotong":
|
|
|
- visualBO.setIndexNames(TRAFFIC_INDEXNAMES);
|
|
|
- orderRegulation = Arrays.asList(TRAFFIC_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(TRAFFIC_INDEXNAMES_TZ);
|
|
|
+ orderRegulation = Arrays.asList(TRAFFIC_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "ziyuan":
|
|
|
- visualBO.setIndexNames(RESOURCES_INDEXNAMES);
|
|
|
- orderRegulation = Arrays.asList(RESOURCES_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(RESOURCES_INDEXNAMES_TZ);
|
|
|
+ orderRegulation = Arrays.asList(RESOURCES_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "xiaofang":
|
|
|
- visualBO.setIndexNames(FIRECONTROL_INDEXNAMES);
|
|
|
- orderRegulation = Arrays.asList(FIRECONTROL_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(FIRECONTROL_INDEXNAMES_TZ);
|
|
|
+ orderRegulation = Arrays.asList(FIRECONTROL_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
default:
|
|
|
visualBO.setIndexNames(visualBO.getType().split(","));
|
|
@@ -117,7 +117,7 @@ public class VisualController extends BaseESController {
|
|
|
List<ResourceListVO> resultList = orderRegulation.stream().map(index -> {
|
|
|
ResourceListVO vo = new ResourceListVO();
|
|
|
vo.setType(index);
|
|
|
- vo.setName(RESOURCEMAP.get(index));
|
|
|
+ vo.setName(RESOURCEMAP_TZ.get(index));
|
|
|
terms.getBuckets().forEach(item -> {
|
|
|
if (index.equals(item.getKeyAsString())) {
|
|
|
vo.setNum(item.getDocCount());
|
|
@@ -175,28 +175,28 @@ public class VisualController extends BaseESController {
|
|
|
visualBO.setIncludeFields(RETURN_FIELDS);
|
|
|
switch (visualBO.getType()) {
|
|
|
case "linye":
|
|
|
- visualBO.setIndexNames(FORESTRY_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(FORESTRY_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "nongye":
|
|
|
- visualBO.setIndexNames(AGRICULTURE_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(AGRICULTURE_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "shuili":
|
|
|
- visualBO.setIndexNames(WATER_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(WATER_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "huanbao":
|
|
|
- visualBO.setIndexNames(ENVIRONMENT_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(ENVIRONMENT_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "yingji":
|
|
|
- visualBO.setIndexNames(EMERGENCY_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(EMERGENCY_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "jiaotong":
|
|
|
- visualBO.setIndexNames(TRAFFIC_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(TRAFFIC_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "ziyuan":
|
|
|
- visualBO.setIndexNames(RESOURCES_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(RESOURCES_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
case "xiaofang":
|
|
|
- visualBO.setIndexNames(FIRECONTROL_INDEXNAMES);
|
|
|
+ visualBO.setIndexNames(FIRECONTROL_INDEXNAMES_TZ);
|
|
|
break;
|
|
|
default:
|
|
|
visualBO.setIndexNames(visualBO.getType().split(","));
|