diff --git a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java index 9911338..d9a35d5 100644 --- a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java +++ b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java @@ -136,10 +136,16 @@ } - public void should(JSONObject BoolMust) { - this.boolShould.add(BoolMust); + /** + * 条件入口，打开接口 + */ + public void should(JSONObject boolMust) { + this.boolShould.add(boolMust); } + /** + * 条件关闭口,将bool中的元素添加到must集合中 + */ public void endShould() { this.filterBoolMust.add(this.boolBuild); } @@ -151,6 +157,9 @@ return boolBuild.getJSONObject(BOOL).getJSONArray(SHOULD); } + /** + * 构建起点，创建JSONOBJECT对象，初始化结构{filter{ bool{must{ }}}} + */ public ElasticSearchQuery build() { boolBuild = new JSONObject(); boolBuild.put(BOOL, new JSONObject()); @@ -159,6 +168,10 @@ return this; } + public JSONObject builder() { + return this.boolBuild; + } + public ElasticSearchQuery termBool(String filed, Serializable value) { JSONObject filedJson = new JSONObject(); filedJson.put(filed, value); @@ -187,9 +200,7 @@ return this; } - public JSONObject builder() { - return this.boolBuild; - } + public void match(String filed, Serializable value) { JSONArray boolMust = this.boolMust; diff --git a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java index 9911338..d9a35d5 100644 --- a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java +++ b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java @@ -136,10 +136,16 @@ } - public void should(JSONObject BoolMust) { - this.boolShould.add(BoolMust); + /** + * 条件入口，打开接口 + */ + public void should(JSONObject boolMust) { + this.boolShould.add(boolMust); } + /** + * 条件关闭口,将bool中的元素添加到must集合中 + */ public void endShould() { this.filterBoolMust.add(this.boolBuild); } @@ -151,6 +157,9 @@ return boolBuild.getJSONObject(BOOL).getJSONArray(SHOULD); } + /** + * 构建起点，创建JSONOBJECT对象，初始化结构{filter{ bool{must{ }}}} + */ public ElasticSearchQuery build() { boolBuild = new JSONObject(); boolBuild.put(BOOL, new JSONObject()); @@ -159,6 +168,10 @@ return this; } + public JSONObject builder() { + return this.boolBuild; + } + public ElasticSearchQuery termBool(String filed, Serializable value) { JSONObject filedJson = new JSONObject(); filedJson.put(filed, value); @@ -187,9 +200,7 @@ return this; } - public JSONObject builder() { - return this.boolBuild; - } + public void match(String filed, Serializable value) { JSONArray boolMust = this.boolMust; diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java index 03ab3ca..85e68d6 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java @@ -45,9 +45,10 @@ List emptyDataList = new ArrayList<>(); emptyDataList.add(new DataGasEs()); return ResponseData.success(emptyDataList); - } else { - return ResponseData.success(dataGasList); } + return ResponseData.success(dataGasList); + + } } diff --git a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java index 9911338..d9a35d5 100644 --- a/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java +++ b/casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java @@ -136,10 +136,16 @@ } - public void should(JSONObject BoolMust) { - this.boolShould.add(BoolMust); + /** + * 条件入口，打开接口 + */ + public void should(JSONObject boolMust) { + this.boolShould.add(boolMust); } + /** + * 条件关闭口,将bool中的元素添加到must集合中 + */ public void endShould() { this.filterBoolMust.add(this.boolBuild); } @@ -151,6 +157,9 @@ return boolBuild.getJSONObject(BOOL).getJSONArray(SHOULD); } + /** + * 构建起点，创建JSONOBJECT对象，初始化结构{filter{ bool{must{ }}}} + */ public ElasticSearchQuery build() { boolBuild = new JSONObject(); boolBuild.put(BOOL, new JSONObject()); @@ -159,6 +168,10 @@ return this; } + public JSONObject builder() { + return this.boolBuild; + } + public ElasticSearchQuery termBool(String filed, Serializable value) { JSONObject filedJson = new JSONObject(); filedJson.put(filed, value); @@ -187,9 +200,7 @@ return this; } - public JSONObject builder() { - return this.boolBuild; - } + public void match(String filed, Serializable value) { JSONArray boolMust = this.boolMust; diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java index 03ab3ca..85e68d6 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java @@ -45,9 +45,10 @@ List emptyDataList = new ArrayList<>(); emptyDataList.add(new DataGasEs()); return ResponseData.success(emptyDataList); - } else { - return ResponseData.success(dataGasList); } + return ResponseData.success(dataGasList); + + } } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java index c3c880d..ef6e380 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java @@ -52,7 +52,42 @@ private final IBaseExportService iBaseExportService; @Override - public Page patrolLogListPage(Page page, Long monitorId, String startTime, String endTime) throws IOException { + public Page patrolLogListPage(Page page, Long monitorId, String startTime, String endTime) throws IOException { + ElasticSearchQuery elasticSearchQuery = initParam(monitorId, startTime, endTime); + elasticSearchQuery.size(Integer.valueOf(String.valueOf(page.getSize()))); + page = ElasticSearchUtil.searchQueryPage(page, DataConst.DATA_GAS_ES_INDEX, DataConst.DATA_GAS_ES_TYPE, elasticSearchQuery); + return page; + } + + @Override + public void export(BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response) { + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(10000); + try { + ElasticSearchQuery elasticSearchQuery = initParam(busPatrolLogDTO.getMonitorId(), busPatrolLogDTO.getStartTime(), busPatrolLogDTO.getEndTime()); + elasticSearchQuery.size(1000); + List responseList = ElasticSearchUtil.searchQueryScroll(DataConst.DATA_GAS_ES_INDEX, DataConst.DATA_GAS_ES_TYPE, elasticSearchQuery); + List expResponseList = new ArrayList<>(); + responseList.forEach(busPatrolLogResponse -> { + BusPatrolLogResponse busPatrolLogResponse1 = new BusPatrolLogResponse(); + busPatrolLogResponse1.setStationName(busPatrolLogResponse.getString("stationName")); + busPatrolLogResponse1.setMonitorName(busPatrolLogResponse.getString("monitorName")); + busPatrolLogResponse1.setConcentration(busPatrolLogResponse.getString("concentration")); + busPatrolLogResponse1.setDirection(busPatrolLogResponse.getString("direction")); + busPatrolLogResponse1.setPitch(busPatrolLogResponse.getString("pitch")); + busPatrolLogResponse1.setThreshold(busPatrolLogResponse.getString("threshold")); + busPatrolLogResponse1.setLogTime(busPatrolLogResponse.getString("logTime")); + expResponseList.add(busPatrolLogResponse1); + }); + iBaseExportService.exportExcel(response, BusPatrolLogResponse.class, expResponseList, ExportEnum.BUSPATROL_LOG_EXPORT.getSheetName()); + } catch (Exception e) { + log.error("巡检日志导出异常，异常信息为{}", e); + } + } + + private ElasticSearchQuery initParam(Long monitorId, String startTime, String endTime) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); List obserpoiInfoList = getObserpoiList(monitorId); @@ -70,36 +105,7 @@ elasticSearchQuery.term("monitorId", monitorId); elasticSearchQuery.range("logTime", startTime, endTime); elasticSearchQuery.sort("logTime", "DESC"); - elasticSearchQuery.size(Integer.valueOf(String.valueOf(page.getSize()))); - page = ElasticSearchUtil.searchQueryPage(page, DataConst.DATA_GAS_ES_INDEX, DataConst.DATA_GAS_ES_TYPE, elasticSearchQuery); - return page; - } - - @Override - public void export(BusPatrolLogDTO busPatrolLogDTO, HttpServletResponse response) { - Page page = PageFactory.defaultPage(); - page.setCurrent(1); - page.setSearchCount(false); - page.setSize(10000); - try { - page = patrolLogListPage(page, busPatrolLogDTO.getMonitorId(), busPatrolLogDTO.getStartTime(), busPatrolLogDTO.getEndTime()); - List expResponseList = new ArrayList<>(); - List responseList = page.getRecords(); - responseList.forEach(busPatrolLogResponse->{ - BusPatrolLogResponse busPatrolLogResponse1 = new BusPatrolLogResponse(); - busPatrolLogResponse1.setStationName(busPatrolLogResponse.getString("stationName")); - busPatrolLogResponse1.setMonitorName(busPatrolLogResponse.getString("monitorName")); - busPatrolLogResponse1.setConcentration(busPatrolLogResponse.getString("concentration")); - busPatrolLogResponse1.setDirection(busPatrolLogResponse.getString("direction")); - busPatrolLogResponse1.setPitch(busPatrolLogResponse.getString("pitch")); - busPatrolLogResponse1.setThreshold(busPatrolLogResponse.getString("threshold")); - busPatrolLogResponse1.setLogTime(busPatrolLogResponse.getString("logTime")); - expResponseList.add(busPatrolLogResponse1); - }); - iBaseExportService.exportExcel(response, BusPatrolLogResponse.class, expResponseList, ExportEnum.BUSPATROL_LOG_EXPORT.getSheetName()); - } catch (Exception e) { - log.error("巡检日志导出异常，异常信息为{}", e); - } + return elasticSearchQuery; } @Override