修改bug

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/DemoController.java

@@ -371,8 +371,8 @@ public class DemoController extends BaseController {
     public Map demoTest11() {
 
         List<QueryDto> queryDto=new ArrayList<>();
-        QueryDto ff1=new QueryDto("gatewayId","1668801435891929089");
-        QueryDto ff2=new QueryDto("equipmentIndexName","有功功率");
+        QueryDto ff1=new QueryDto("gatewayId.keyword","1668801435891929089");
+        QueryDto ff2=new QueryDto("equipmentIndexName.keyword","有功功率");
         queryDto.add(ff1);
         queryDto.add(ff2);
         Double avg= commonServiceImpl.getavg(queryDto,"valueDouble",ESEquipments.class);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/scheduled/PowerGeneration.java

@@ -39,7 +39,7 @@ public class PowerGeneration {
     private final  String yearType="year";
 
     //定时更新日发电量
-    @Scheduled(cron = "${daily.power.generation.cron}")
+   // @Scheduled(cron = "${daily.power.generation.cron}")
     public void addESDailyPowerGeneration(){
         List<StationCacheInfoDto>  list =new ArrayList<>();
         for (StationCacheInfoDto stationCacheInfoDto : list) {
@@ -52,7 +52,7 @@ public class PowerGeneration {
 
     }
     //定时更新月发电量
-    @Scheduled(cron = "${moon.power.generation.cron}")
+   // @Scheduled(cron = "${moon.power.generation.cron}")
     public void addESMoonPowerGeneration(){
 
         List<StationCacheInfoDto>  list =new ArrayList<>();
@@ -67,7 +67,7 @@ public class PowerGeneration {
 
     }
     //定时更新年发电量
-    @Scheduled(cron = "${year.power.generation.cron}")
+    //@Scheduled(cron = "${year.power.generation.cron}")
     public void addESYearPowerGeneration(){
 
         List<StationCacheInfoDto>  list =new ArrayList<>();

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -67,7 +67,7 @@ public class CommonServiceImpl {
         Double value=null;
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
         for (QueryDto dto : queryDto) {
-            queryBuilder.must( QueryBuilders.matchQuery(dto.getKey(), dto.getValue()));
+            queryBuilder.must( QueryBuilders.termQuery(dto.getKey(), dto.getValue()));
         }
         AvgAggregationBuilder buyCountAvg = AggregationBuilders.avg("buyCountAvg").field(keyavg);
         Query query = new NativeSearchQueryBuilder()
@@ -99,7 +99,7 @@ public class CommonServiceImpl {
         Double value=null;
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
         for (QueryDto dto : queryDto) {
-            queryBuilder.must( QueryBuilders.matchQuery(dto.getKey(), dto.getValue()));
+            queryBuilder.must( QueryBuilders.termQuery(dto.getKey(), dto.getValue()));
         }
         SumAggregationBuilder buyCountSum = AggregationBuilders.sum("buyCountSum").field(keysum);
         Query query = new NativeSearchQueryBuilder()