Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/VideoVO.java

 package com.yeejoin.equipmanage.common.entity.vo;
 
+import org.springframework.beans.factory.annotation.Value;
+
 import lombok.Data;
 
 /**
@@ -23,4 +25,6 @@ public class VideoVO {
     private String code;
     
     private String presetPosition;
+    
+    private String vedioFormat;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -93,6 +93,9 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     
     @Autowired
     private IVideoService videoService;
+    
+    @Value("${window.vedioFormat}")
+    String vedioFormat;
 
     @Override
     public void handleExport(HttpServletResponse response, List<Long> ids, String alarmType) {
@@ -273,6 +276,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
             video.setName(x.getName());
             video.setTokens(x.getToken());
             video.setUrl(x.getUrl());
+            video.setVedioFormat(vedioFormat);
             video.setUrl(videoService.getVideoUrl(x.getName(), x.getPresetPosition(), x.getUrl(), x.getCode()));
             video.setIp(x.getIp());
             video.setPort(x.getPort());

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -137,6 +137,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
 
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
+    
+    @Value("${window.vedioFormat}")
+    String vedioFormat;
 
 
     private final String injection = "{\n" +
@@ -993,6 +996,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             if (!ObjectUtils.isEmpty(video)) {
                 video.setUrl(videoService.getVideoUrl(video.getName().toString(), video.getPresetPosition(), video.getUrl(), video.getCode()));
                 video.setId(id);
+                video.setVedioFormat(vedioFormat);
             }
             return video;
         } else {

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

@@ -163,7 +163,7 @@ public class ESAlertCalledService {
 			AlertStatusEnum alertStatusEnum = AlertStatusEnum.getEnum(status);
 			if (!ValidationUtil.isEmpty(alertStatusEnum))
 			{
-				qbstatus.should(QueryBuilders.termQuery("alertStatusStr.keyword", alertStatusEnum.getCode()));
+				qbstatus.should(QueryBuilders.termQuery("alertStatusStr", alertStatusEnum.getCode()));
 			}
 		}
 		boolMust.must(qbstatus);
@@ -247,7 +247,7 @@ public class ESAlertCalledService {
         /**
          * 困人救援,故障报修,投诉咨询 条件构造
          */
-
+		System.out.println(boolMust);
         // 创建查询构造器
         NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder()
                 // 分页

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

@@ -15,7 +15,7 @@ eureka.instance.status-page-url=http://192.168.0.204:${server.port}${server.serv
 eureka.instance.metadata-map.management.api-docs=http://192.168.0.204:${server.port}${server.servlet.context-path}/swagger-ui.html
 
 ## ES properties:
-biz.elasticsearch.address=192.168.0.204
+biz.elasticsearch.address=113.134.211.174
 spring.data.elasticsearch.cluster-name=elasticsearch
 spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
 spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200