Skip to content

Y
YeeAmosFireAutoSysRoot
Commit c728e111 authored by zhengjiawei's avatar zhengjiawei
Browse files
Options

sql修改

parent c7195ea0
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 110 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/mq/WebMqttSubscribe.java
View file @ c728e111
package com.yeejoin.amos.fas.business.action.mq; package com.yeejoin.amos.fas.business.action.mq;
import com.yeejoin.amos.fas.business.service.intfc.IEquipmentHandlerService; import com.yeejoin.amos.fas.business.service.intfc.IEquipmentHandlerService;
import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.context.annotation.Lazy;
import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.annotation.IntegrationComponentScan;
import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.integration.core.MessageProducer; import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory; import org.springframework.integration.core.MessageProducer;
import org.springframework.integration.mqtt.core.MqttPahoClientFactory; import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter; import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter; import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
import org.springframework.messaging.Message; import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
import org.springframework.messaging.MessageChannel; import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
/**
* @author keyong /**
* @title: WebMqttSubscribe * @author keyong
* <pre> * @title: WebMqttSubscribe
* @description: Mqtt订阅消息类 * <pre>
* </pre> * @description: Mqtt订阅消息类
* @date 2020/11/9 17:50 * </pre>
*/ * @date 2020/11/9 17:50
@Configuration */
@IntegrationComponentScan @Configuration
public class WebMqttSubscribe { @IntegrationComponentScan
public class WebMqttSubscribe {
@Value("${emqx.user-name}")
private String userName; @Value("${emqx.user-name}")
private String userName;
@Value("${emqx.password}")
private String password; @Value("${emqx.password}")
private String password;
@Value("${emqx.broker}")
private String hostUrl; @Value("${emqx.broker}")
private String hostUrl;
@Value("${emqx.client-id}")
private String clientId; @Value("${emqx.client-id}")
private String clientId;
@Value("${emqx.defaultTopic}")
private String defaultTopic; @Value("${emqx.defaultTopic}")
private String defaultTopic;
public MqttPahoMessageDrivenChannelAdapter adapter;
public MqttPahoMessageDrivenChannelAdapter adapter;
@Autowired
IEquipmentHandlerService equipmentHandlerService; @Autowired @Lazy
IEquipmentHandlerService equipmentHandlerService;
@Bean
public MqttConnectOptions getMqttConnectOptions() { @Bean
MqttConnectOptions mqttConnectOptions = new MqttConnectOptions(); public MqttConnectOptions getMqttConnectOptions() {
mqttConnectOptions.setUserName(userName); MqttConnectOptions mqttConnectOptions = new MqttConnectOptions();
mqttConnectOptions.setPassword(password.toCharArray()); mqttConnectOptions.setUserName(userName);
mqttConnectOptions.setServerURIs(new String[]{hostUrl}); mqttConnectOptions.setPassword(password.toCharArray());
mqttConnectOptions.setKeepAliveInterval(2); mqttConnectOptions.setServerURIs(new String[]{hostUrl});
mqttConnectOptions.setAutomaticReconnect(true); mqttConnectOptions.setKeepAliveInterval(2);
return mqttConnectOptions; mqttConnectOptions.setAutomaticReconnect(true);
} return mqttConnectOptions;
}
@Bean
public MqttPahoClientFactory mqttPahoClientFactory() { @Bean
DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory(); public MqttPahoClientFactory mqttPahoClientFactory() {
factory.setConnectionOptions(getMqttConnectOptions()); DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
return factory; factory.setConnectionOptions(getMqttConnectOptions());
} return factory;
}
@Bean
public MessageChannel mqttInputChannel() { @Bean
return new DirectChannel(); public MessageChannel mqttInputChannel() {
} return new DirectChannel();
}
@Bean
public MessageProducer inbound() { @Bean
adapter = new MqttPahoMessageDrivenChannelAdapter(clientId, mqttPahoClientFactory(), defaultTopic); public MessageProducer inbound() {
adapter.setConverter(new DefaultPahoMessageConverter()); adapter = new MqttPahoMessageDrivenChannelAdapter(clientId, mqttPahoClientFactory(), defaultTopic);
adapter.setQos(0); adapter.setConverter(new DefaultPahoMessageConverter());
adapter.setOutputChannel(mqttInputChannel()); adapter.setQos(0);
return adapter; adapter.setOutputChannel(mqttInputChannel());
} return adapter;
}
@Bean
@ServiceActivator(inputChannel = "mqttInputChannel") @Bean
public MessageHandler handler() { @ServiceActivator(inputChannel = "mqttInputChannel")
return new MessageHandler() { public MessageHandler handler() {
@Override return new MessageHandler() {
public void handleMessage(Message<?> message) { @Override
String topic = message.getHeaders().get("mqtt_receivedTopic").toString(); public void handleMessage(Message<?> message) {
String msg = message.getPayload().toString(); String topic = message.getHeaders().get("mqtt_receivedTopic").toString();
// 订阅之后的处理逻辑 String msg = message.getPayload().toString();
equipmentHandlerService.handlerMqttMessage(topic, msg); // 订阅之后的处理逻辑
} equipmentHandlerService.handlerMqttMessage(topic, msg);
}; }
} };
}
}
}
YeeAmosFireAutoSysStart/src/main/resources/application.properties
View file @ c728e111
...@@ -53,12 +53,10 @@ equipManage.fegin.isSyn=false ...@@ -53,12 +53,10 @@ equipManage.fegin.isSyn=false
#jpush 服务名称 #jpush 服务名称
Push.fegin.name=APPMESSAGEPUSHSERVICE Push.fegin.name=APPMESSAGEPUSHSERVICE
#值班系统服务名
dutyMode.fegin.name=AMOSDUTYMODE
spring.http.multipart.maxFileSize = 10480000 spring.http.multipart.maxFileSize = 10480000
spring.http.multipart.MaxRequestSize = 50480000 spring.http.multipart.MaxRequestSize = 50480000
windows.img.path = F:\\ windows.img.path = E:\\
linux.img.path = / linux.img.path = /
param.safetyIndexChange.cron = 0 0 2 * * ? param.safetyIndexChange.cron = 0 0 2 * * ?
......
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml
View file @ c728e111
...@@ -1235,7 +1235,7 @@ ...@@ -1235,7 +1235,7 @@
-- 消防车 -- 消防车
select select
car.name , car.name ,
substr(cat.code ,1,4) as code, car_num as code,
'fireEquipment' as typeCode, 'fireEquipment' as typeCode,
car.org_code as orgCode, car.org_code as orgCode,
#{riskSourceId} as riskSourceId #{riskSourceId} as riskSourceId
...@@ -1247,7 +1247,7 @@ ...@@ -1247,7 +1247,7 @@
UNION all UNION all
select select
vi.name, vi.name,
'xfsp' as code, vi.code as code,
'video' as typeCode, 'video' as typeCode,
vi.org_code as orgCode, vi.org_code as orgCode,
visou.source_id as risk_source_id visou.source_id as risk_source_id
...@@ -1260,7 +1260,7 @@ ...@@ -1260,7 +1260,7 @@
UNION all UNION all
select select
bu.name, bu.name,
substr(cat.code ,1,4) as code , bu.code as code ,
'fireEquipment' as typeCode, 'fireEquipment' as typeCode,
bu.org_code as orgCode, bu.org_code as orgCode,
bu.region_id as risk_source_id bu.region_id as risk_source_id
...@@ -1272,7 +1272,7 @@ ...@@ -1272,7 +1272,7 @@
UNION all UNION all
select select
det.name, det.name,
substr(cat.code ,1,4) as code, spe.code as code,
'monitorEquipment' as typeCode, 'monitorEquipment' as typeCode,
spe.org_code as orgCode, spe.org_code as orgCode,
str.source_id as risk_source_id str.source_id as risk_source_id
...@@ -1291,7 +1291,7 @@ ...@@ -1291,7 +1291,7 @@
UNION all UNION all
select select
det.name, det.name,
substr(cat.code ,1,4) as code, spe.code as code,
'fireEquipment' as typeCode, 'fireEquipment' as typeCode,
spe.org_code as orgCode, spe.org_code as orgCode,
str.source_id as risk_source_id str.source_id as risk_source_id
...@@ -1428,7 +1428,7 @@ ...@@ -1428,7 +1428,7 @@
e.risk_source_id as riskSourceId e.risk_source_id as riskSourceId
from f_equipment e from f_equipment e
UNION all UNION all
select concat('monitorEquipment-',m.id) as id,m.id as originId,det.name,substr(cat.code ,1,4),'' as ue4Location,'' as ue4Rotation ,'monitorEquipment' as type,m.org_code as orgCode, select concat('monitorEquipment-',m.id) as id,m.id as originId,det.name,m.code as code,'' as ue4Location,'' as ue4Rotation ,'monitorEquipment' as type,m.org_code as orgCode,
null as level , concat('level_',null) as levelStr,null as isIndoor,'探测器' as typeName,'monitorEquipment' as typeCode, null as level , concat('level_',null) as levelStr,null as isIndoor,'探测器' as typeName,'monitorEquipment' as typeCode,
CASE CASE
WHEN ( WHEN (
...@@ -1505,7 +1505,7 @@ ...@@ -1505,7 +1505,7 @@
left join f_risk_source as sou on sou.id = vis.source_id left join f_risk_source as sou on sou.id = vis.source_id
UNION all UNION all
select concat('hydrant-',spe.id) as id,spe.id as originId,det.name,substr(cat.code ,1,4) as code,null as ue4Location,null as ue4Rotation ,'hydrant' as type,spe.org_code as orgCode, select concat('hydrant-',spe.id) as id,spe.id as originId,det.name,spe.code as code,null as ue4Location,null as ue4Rotation ,'hydrant' as type,spe.org_code as orgCode,
0 as level , 'level_0' as levelStr,null as isIndoor,'消防栓' as typeName,'fireEquipment' as typeCode, 0 as level , 'level_0' as levelStr,null as isIndoor,'消防栓' as typeName,'fireEquipment' as typeCode,
CASE CASE
WHEN ( WHEN (
...@@ -1609,7 +1609,7 @@ ...@@ -1609,7 +1609,7 @@
left join wl_equipment as equ on car.equipment_id = equ.id left join wl_equipment as equ on car.equipment_id = equ.id
left join wl_equipment_category as cat on equ.category_id = cat.id left join wl_equipment_category as cat on equ.category_id = cat.id
UNION all UNION all
select concat('fireEquipment-',spe.id) as id,spe.id as originId,det.name,substr(cat.code ,1,4) as code,null as ue4Location,null as ue4Rotation,'fireEquipment' as type,spe.org_code as orgCode, select concat('fireEquipment-',spe.id) as id,spe.id as originId,det.name,spe.code as code,null as ue4Location,null as ue4Rotation,'fireEquipment' as type,spe.org_code as orgCode,
null as level , concat('level_',null) as levelStr,null as isIndoor,'灭火器' as typeName,'fireEquipment' as typeCode, null as level , concat('level_',null) as levelStr,null as isIndoor,'灭火器' as typeName,'fireEquipment' as typeCode,
CASE CASE
WHEN ( WHEN (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment