Merge branch 'dev_upgrade-1225' of…

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -992,6 +992,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @javax.transaction.Transactional
     public String processFireEqumtData(AlarmParam deviceData) throws Exception {
     	EquipmentSpecificIndexVo equipmentSpecificIndexVo = impAndFireEquipMapper.findFireEqupmentByCode(deviceData.getPointCode());
+        Optional.ofNullable(equipmentSpecificIndexVo).orElseThrow(() -> new Exception("未查询到相关装备"));
     	TopicEntityVo topicEntity = new TopicEntityVo();
     	topicEntity.setMessage(JSON.toJSONString(equipmentSpecificIndexVo));
     	String data = JSON.toJSONString(topicEntity);

YeeAmosFireAutoSysStart/src/main/resources/application.properties

@@ -3,7 +3,7 @@ server.port = 8083
 spring.profiles.active=dev
 #应用product appkey
 security.productWeb=STUDIO_APP_WEB
-security.appKeyWeb=studio_normalapp_2668446
+security.appKeyWeb=studio_normalapp_2681691
 
 #spring.freemarker.cache=false 
 spring.devtools.restart.enabled=true