Skip to content

A
amos-boot-biz
Commit d1442973 authored by KeYong's avatar KeYong
Browse files
Options

更新配置

parent 3cf990ef
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 97 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @ d1442973
...@@ -196,6 +196,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -196,6 +196,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
private String emergencyDisposalIndicators; private String emergencyDisposalIndicators;
@Value("classpath:/json/systemStateIndex.json") @Value("classpath:/json/systemStateIndex.json")
private Resource systemStateIndex; private Resource systemStateIndex;
@Value("${dcs.send.message}")
private Boolean NRMsgSend;
public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey, public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey,
String traceId, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService, String traceId, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService,
...@@ -1595,11 +1597,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1595,11 +1597,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
equipmentSpecificAlarm.setStationName(mapd.get("station_name").toString()); equipmentSpecificAlarm.setStationName(mapd.get("station_name").toString());
} }
// equipmentSpecificAlarm.setStationCode(stationCode);
// equipmentSpecificAlarm.setStationName(stationName);
equipmentSpecificAlarms.add(equipmentSpecificAlarm); equipmentSpecificAlarms.add(equipmentSpecificAlarm);
return equipmentSpecificAlarms; return equipmentSpecificAlarms;
} }
...@@ -1811,10 +1808,11 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1811,10 +1808,11 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
} }
} }
// 向南瑞平台推送报警消息 }
if (!bool) {
syncDataService.syncCreatedSendAlarm(equipmentAlarmLogs); // 向南瑞平台推送报警消息
} if (!bool && NRMsgSend) {
syncDataService.syncCreatedSendAlarm(equipmentAlarmLogs);
} }
} }
......
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @ d1442973
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.10.215:3307/dl_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai spring.datasource.url = jdbc:mysql://172.16.11.201:3306/dl_business?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=Yeejoin@2020 spring.datasource.password=Yeejoin@2020
spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
...@@ -12,30 +12,26 @@ spring.datasource.hikari.max-lifetime= 1800000 ...@@ -12,30 +12,26 @@ spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout= 60000 spring.datasource.hikari.connection-timeout= 60000
spring.datasource.hikari.connection-test-query= SELECT 1 spring.datasource.hikari.connection-test-query= SELECT 1
# ???????
# \u6587\u4EF6\u670D\u52A1\u5668\u5730\u5740 fileserver_domain=http://172.16.11.201:9000/
fileserver_domain=http://172.16.10.215:9000/
#eureka.instance.ip-address= 172.16.3.135 #eureka.instance.ip-address= 172.16.3.135
eureka.instance.hostname= 172.16.10.215 eureka.instance.hostname= 172.16.11.201
eureka.instance.prefer-ip-address = true eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.10.215:10001/eureka/ eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.11.201:10001/eureka/
spring.security.user.name=admin spring.security.user.name=admin
spring.security.user.password=a1234560 spring.security.user.password=a1234560
security.productApp=STUDIO_APP_MOBILE security.productApp=STUDIO_APP_MOBILE
amos.system.user.user-name=fas_system amos.system.user.user-name=fas_system
amos.system.user.password=a1234560 amos.system.user.password=a1234560
amos.system.user.app-key=studio_normalapp_3056965 amos.system.user.app-key=studio_normalapp_3056965
amos.system.user.product=STUDIO_APP_WEB amos.system.user.product=STUDIO_APP_WEB
#redis
#redis
spring.redis.database=1 spring.redis.database=1
spring.redis.host=172.16.10.215 spring.redis.host=172.16.11.201
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=yeejoin@2020 spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200 spring.redis.lettuce.pool.max-active=200
...@@ -47,93 +43,101 @@ spring.redis.expire.time=30000 ...@@ -47,93 +43,101 @@ spring.redis.expire.time=30000
## emqx ## emqx
emqx.clean-session=true emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]} emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.215:1883 emqx.broker=tcp://172.16.11.201:1883
emqx.user-name=admin emqx.user-name=admin
emqx.password=public emqx.password=public
mqtt.scene.host=mqtt://172.16.10.215:8083/mqtt mqtt.scene.host=mqtt://172.16.11.201:8083/mqtt
mqtt.client.product.id=mqtt mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000 spring.mqtt.completionTimeout=3000
#定时任务 #????
##物联报表定时任务 ##????????
jobs.month.cron = 0 50 0 1 * ? jobs.month.cron = 0 50 0 1 * ?
jobs.day.cron = 0 5 0 * * ? jobs.day.cron = 0 5 0 * * ?
jobs.week.cron = 0 25 0 ? * 1 jobs.week.cron = 0 25 0 ? * 1
jobs.day.cron.old = 0 25 0 * * ? jobs.day.cron.old = 0 25 0 * * ?
#数据同步开关 #??????
systemctl.sync.switch=false systemctl.sync.switch=false
#数据JCS开关 #??JCS??
systemctl.jcs.switch=false systemctl.jcs.switch=false
#平台数据开关 #??????
systemctl.amos.switch=false systemctl.amos.switch=false
isSendApp=false isSendApp=false
#报表数据地址 #??????
equip.report.url=/fire-fighting-system/ureport/preview?_u=file: equip.report.url=/fire-fighting-system/ureport/preview?_u=file:
#数字化南瑞平台接口 #?????????
dcs.send.message=true
dcs.client-id=fire_system
dcs.grant-type=client_credentials
dcs.scope=all
dcs.token-key=dcs_token_key
dcs.client.secret=fire_system
dcs.x.hw.id=io.cs
dcs.x.hw.appKey=i!YmnHgJ=Ysz8V+O@ZG237inQKfixkQ.-#-P3IlR8fO%.#F!g%35Z#@tp$6G+52v
dcs.url.token=http://198.87.103.158:8001/auth-service/oauth/token dcs.url.token=http://198.87.103.158:8001/auth-service/oauth/token
dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
#系统上线时间 #??????
param.system.online.date = 2019-02-12 param.system.online.date = 2019-02-12
# 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启 # ???????? hls(?)/flv(?),???????????????
window.vedioFormat = hls window.vedioFormat = hls
window.vedioFormat.video = flv window.vedioFormat.video = flv
# 航天视频服务地址 # ????????
param.htvideo.url=http://192.168.4.174:9001; param.htvideo.url=http://192.168.4.174:9001;
# 南瑞视频转码服务地址 # ??????????
param.nrvideo.url=http://198.87.103.158:8001; param.nrvideo.url=http://198.87.103.158:8001;
#南瑞视频平台通过视频id获取flv格式视频播放地址 #??????????id??flv????????
param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live
# 预案消防炮、消防泵设备维度类型 # ???????????????
equipment.plan.monitor=92030200,92032200 equipment.plan.monitor=92030200,92032200
equipment.plan.pump=92010600,92030600,92130400,92140200,92150300 equipment.plan.pump=92010600,92030600,92130400,92140200,92150300
# 机场使用特殊配置iotCode前缀，装备、车辆及导入使用到 # ????????iotCode??????????????
# 机场使用 # ????
#iot.code.prefix.have.used=20210003,20210004,20210005 #iot.code.prefix.have.used=20210003,20210004,20210005
# 电力使用 # ????
iot.code.prefix.have.used= iot.code.prefix.have.used=
#装备服务在接收到站端iot推送的装备数据后进行influxdb存库 #??????????iot??????????influxdb??
#1.在装备接口消息处向influxdb/{productKey}/{deviceName} 消息地址推送数据，iot负责存库 #1.?????????influxdb/{productKey}/{deviceName} ?????????iot????
#2.配置文件添加配置项开关，默认为关闭，该功能只使用于中心及系统 #2.??????????????????????????????
#是否向iot推送消息 #???iot????
isSendIot=false isSendIot=false
#报废前30日 发起提醒 #???30? ????
equipment.scrap.day=30 equipment.scrap.day=30
#提醒时间 #????
equipment.scrap.cron=0 0 9 * * ? equipment.scrap.cron=0 0 9 * * ?
#????????????? #?????????????
equipment.pressurepump.start.cron=0 0 0 * * ? equipment.pressurepump.start.cron=0 0 0 * * ?
# 稳压泵启动信号 # ???????
equipment.pressurepump.start=FHS_PressurePump_Start equipment.pressurepump.start=FHS_PressurePump_Start
# 稳压泵管网压力信号 # ?????????
equipment.pressurepump.pipepressure=FHS_PipePressureDetector_PipePressure equipment.pressurepump.pipepressure=FHS_PipePressureDetector_PipePressure
# 站端标识 # ????
state.code=GW190301 state.code=GW190301
state.name=\u9526\u5c4f\u6362\u6d41\u7ad9 state.name=?????
#用于总部系统与站端系统逻辑区分，站端写zd总部默认为空 #???????????????????zd??????
system.type=zd system.type=zd
# 是否开启遥测数据上报 # ??????????
is.open.telemetering=false is.open.telemetering=false
# 水池液位相关信号 # ????????
water.level.indexKey=FHS_FirePoolDevice_WaterLevel,FHS_LevelDetector_WaterLevel,FHS_WirelessliquidDetector_WaterLevel,CAFS_FoamTank_FoamTankLevel,CAFS_WaterTank_WaterTankLevel water.level.indexKey=FHS_FirePoolDevice_WaterLevel,FHS_LevelDetector_WaterLevel,FHS_WirelessliquidDetector_WaterLevel,CAFS_FoamTank_FoamTankLevel,CAFS_WaterTank_WaterTankLevel
# 江西电建-车辆里程过滤参数(单位KM) # ????-????????(??KM)
mileage.parameter=0.5 mileage.parameter=0.5
# 江西电建-车辆里程跨天记录切分(每日0点执行) # ????-??????????(??0???)
mileage.segmentation.cron=0 0 0 * * ? mileage.segmentation.cron=0 0 0 * * ?
# influxDB # influxDB
......
amos-boot-system-equip/src/main/resources/application.properties
View file @ d1442973
...@@ -15,22 +15,22 @@ mybatis.type-aliases-package=com.yeejoin.equipmanage.common.entity ...@@ -15,22 +15,22 @@ mybatis.type-aliases-package=com.yeejoin.equipmanage.common.entity
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
#分页 #??
pagehelper.helper-dialect=mysql pagehelper.helper-dialect=mysql
pagehelper.params=count=countSql pagehelper.params=count=countSql
pagehelper.reasonable=false pagehelper.reasonable=false
pagehelper.support-methods-arguments=true pagehelper.support-methods-arguments=true
#覆盖相同名称bean #??????bean
spring.main.allow-bean-definition-overriding=true spring.main.allow-bean-definition-overriding=true
#liquibase #liquibase
spring.liquibase.change-log=classpath:/changelog/changelog-master.xml spring.liquibase.change-log=classpath:/changelog/changelog-master.xml
spring.liquibase.enabled=true spring.liquibase.enabled=true
#上传文件设置 #??????
spring.servlet.multipart.maxFileSize=100MB spring.servlet.multipart.maxFileSize=100MB
spring.servlet.multipart.maxRequestSize=100MB spring.servlet.multipart.maxRequestSize=100MB
#fegin调用服务名称 #fegin??????
patrol.fegin.name=AMOS-PATROL patrol.fegin.name=AMOS-PATROL
maintenance.feign.name=AMOS-MAINTENANCE-API maintenance.feign.name=AMOS-MAINTENANCE-API
precontrol.feign.name=JEPCC-PRECONTROL-SERVER precontrol.feign.name=JEPCC-PRECONTROL-SERVER
...@@ -45,21 +45,21 @@ iot.vehicle.track=AMOS-API-IOT ...@@ -45,21 +45,21 @@ iot.vehicle.track=AMOS-API-IOT
jcs.fegin.name=JCS jcs.fegin.name=JCS
video.fegin.name=VIDEO video.fegin.name=VIDEO
idx.feign.name=AMOS-IDX idx.feign.name=AMOS-IDX
#项目初始化画布id #???????id
morphic.projectSeq=1390314016458514433 morphic.projectSeq=1390314016458514433
#wl_equipment_category 表id （取火灾报警系统id） #wl_equipment_category ?id ????????id?
equipment.fire.systemid=1302870628873932802 equipment.fire.systemid=1302870628873932802
equipment.type=2 equipment.type=2
equipment.hierarchy=1,2,4,6 equipment.hierarchy=1,2,4,6
#装备查询根据装备类型编码过滤，4为过滤掉车相关数据，多个的话，添加方式为4,5 #???????????????4????????????????????4,5
equipment.filter.code=4 equipment.filter.code=4
#wl_equipment_category 编码 92040000 为消防行业 火灾系统分类编码 #wl_equipment_category ?? 92040000 ????? ????????
equip.system.alarm.code=92040000 equip.system.alarm.code=92040000
#wl_equipment_category 编码 50000000 为安防行业 摄像头分类编码 #wl_equipment_category ?? 50000000 ????? ???????
equip.security.code=50000000 equip.security.code=50000000
## redis失效时间 ## redis????
redis.cache.failure.time=10800 redis.cache.failure.time=10800
#平台字典配置项 #???????
systemctl.dict.iot-core-param=IOT_CORE_PARAM systemctl.dict.iot-core-param=IOT_CORE_PARAM
systemctl.dict.area-type=AREA_TYPE systemctl.dict.area-type=AREA_TYPE
systemctl.dict.allow-operation=ALLOW_OPERATION systemctl.dict.allow-operation=ALLOW_OPERATION
...@@ -75,33 +75,27 @@ mqtt.vehicle.topic=${equipManage.name}.vehicle.state ...@@ -75,33 +75,27 @@ mqtt.vehicle.topic=${equipManage.name}.vehicle.state
equip.point.equipmentdata.topic=${equipManage.name}.equipment.state equip.point.equipmentdata.topic=${equipManage.name}.equipment.state
equip.index.topic=${equipManage.name}.equipment.index.state equip.index.topic=${equipManage.name}.equipment.index.state
equip.iot.monitor.topic=team/station/monitor/matrix equip.iot.monitor.topic=team/station/monitor/matrix
# 接口地址 # ????
equip.scene.detail.url=${server.servlet.context-path}/scene/%s/detail/list equip.scene.detail.url=${server.servlet.context-path}/scene/%s/detail/list
equip.point.equipmentdata.url=${server.servlet.context-path}/equipSpecific/getAll?id= equip.point.equipmentdata.url=${server.servlet.context-path}/equipSpecific/getAll?id=
equip.point.speindex.url=${server.servlet.context-path}/fire-fighting-system/getSpeIndex?id= equip.point.speindex.url=${server.servlet.context-path}/fire-fighting-system/getSpeIndex?id=
equip.point.equipmentDetail.url=${server.servlet.context-path}/equipSpecific/getOneCard?id= equip.point.equipmentDetail.url=${server.servlet.context-path}/equipSpecific/getOneCard?id=
#组态获取系统详情接口地址 #????????????
firefightingsystem.detail.url=${server.servlet.context-path}/fire-fighting-system/getSystemById?id= firefightingsystem.detail.url=${server.servlet.context-path}/fire-fighting-system/getSystemById?id=
#组态获取分页接口地址 #??????????
firefightingsystem.equip.alarms.url=${server.servlet.context-path}/fire-fighting-system/getEquipmentAlarmBySystemIdOrSourceIdVO firefightingsystem.equip.alarms.url=${server.servlet.context-path}/fire-fighting-system/getEquipmentAlarmBySystemIdOrSourceIdVO
building.detail=${server.servlet.context-path}/building/findByInstanceId building.detail=${server.servlet.context-path}/building/findByInstanceId
building.floor.detail=${server.servlet.context-path}/building/getBuildDetaliByFloorId?instanceId= building.floor.detail=${server.servlet.context-path}/building/getBuildDetaliByFloorId?instanceId=
dcs.client-id=fire_system
dcs.grant-type=client_credentials # ????/????/??????? true ?? / false ??
dcs.scope=all
dcs.token-key=dcs_token_key
dcs.client.secret=fire_system
dcs.x.hw.id=NR_REST_APP
dcs.x.hw.appKey=s+YkvQhwilx91TRJHhNDmw==
# 故障告警/消防告警/跑马灯权限标识 true 机场 / false 电力
equip.enabled =false equip.enabled =false
#es储存物联日志是否删除开关 #es????????????
es.ESEquiplistSpecific.flag= true es.ESEquiplistSpecific.flag= true
#es储存数据时间年 #es???????
es.ESEquiplistSpecific.year= 1 es.ESEquiplistSpecific.year= 1
#es储存物联日志定时删除 #es??????????
es.ESEquiplistSpecific.time= 0 0 2 1 * ? es.ESEquiplistSpecific.time= 0 0 2 1 * ?
## ES properties: ## ES properties:
biz.elasticsearch.address=172.16.11.201 biz.elasticsearch.address=172.16.11.201
...@@ -114,21 +108,21 @@ elasticsearch.password= Yeejoin@2020 ...@@ -114,21 +108,21 @@ elasticsearch.password= Yeejoin@2020
# 权限标识-物联区域 # ????-????
auth-key-area=area_info auth-key-area=area_info
# 权限标识-消防系统 # ????-????
auth-key-fire-system=fire_system_info auth-key-fire-system=fire_system_info
# 权限标识-消防系统和建筑 # ????-???????
auth-key-fire-system-build=fire_system_build_info auth-key-fire-system-build=fire_system_build_info
# 权限标识-消防装备 # ????-????
auth-key-fire-equip=fire_equip_info auth-key-fire-equip=fire_equip_info
# 权限标识-消防视频 # ????-????
auth-key-fire-video=fire_video_info auth-key-fire-video=fire_video_info
# 权限标识-消防建筑视频 # ????-??????
auth-key-fire-build-video=fire_build_video_info auth-key-fire-build-video=fire_build_video_info
# 权限标识-消防车辆 # ????-????
auth-key-fire-car=fire_car_info auth-key-fire-car=fire_car_info
# 权限标识-消防建筑 # ????-????
auth-key-fire-building=fire_building_info auth-key-fire-building=fire_building_info
redis_car_type_count = carTypeAndCount redis_car_type_count = carTypeAndCount
...@@ -136,10 +130,10 @@ redis_car_type_count = carTypeAndCount ...@@ -136,10 +130,10 @@ redis_car_type_count = carTypeAndCount
redis_equip_type_count = equipTypeAndCount redis_equip_type_count = equipTypeAndCount
emergency.disposal.indicators=emergencyDisposalIndicators emergency.disposal.indicators=emergencyDisposalIndicators
# 权限标识-物联装备 # ????-????
auth-key-fire-iot-equip=fire_iot-equip_info auth-key-fire-iot-equip=fire_iot-equip_info
# app离线同步装备数据开关 # app??????????
auth-open-fire-equip=false auth-open-fire-equip=false
fxkgtId=1522051112935387138 fxkgtId=1522051112935387138
...@@ -148,7 +142,7 @@ management.security.enabled=true ...@@ -148,7 +142,7 @@ management.security.enabled=true
management.endpoint.health.show-details=always management.endpoint.health.show-details=always
spring.security.user.name=admin spring.security.user.name=admin
spring.security.user.password=a1234560 spring.security.user.password=a1234560
#每個站表示 #?????
stationCode=LSHLZ1bZAJU645Pgl7 stationCode=LSHLZ1bZAJU645Pgl7
##代码中有部分逻辑冲突需要处理 为区分机场和电力逻辑 增加开关 若为true 则为机场逻辑 为false 则为电力逻辑 ##?????????????? ?????????? ???? ??true ?????? ?false ??????
logic=false logic=false
\ No newline at end of file
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml
View file @ d1442973
...@@ -36,14 +36,14 @@ ...@@ -36,14 +36,14 @@
CONCAT( '位于', a.`name`, '的', sal.equipment_specific_name, '(', sal.equipment_specific_code, ')在', sal.create_date, '发生', sal.equipment_specific_index_name, '，请相关人员进行核实确认现场情况！') AS eventdesc, CONCAT( '位于', a.`name`, '的', sal.equipment_specific_name, '(', sal.equipment_specific_code, ')在', sal.create_date, '发生', sal.equipment_specific_index_name, '，请相关人员进行核实确认现场情况！') AS eventdesc,
sal.equipment_specific_index_name AS eventaction, sal.equipment_specific_index_name AS eventaction,
IF IF
( sal.confirm_date IS NULL, FALSE, TRUE ) AS isreport , ( sal.confirm_date IS NULL, FALSE, TRUE ) AS isreport,
CONCAT(sal.confirm_date) AS confirmtime, CONCAT(sal.confirm_date) AS confirmtime,
sal.alarm_reason AS eventreason sal.alarm_reason AS eventreason
FROM FROM
wl_equipment_specific_alarm_log sal wl_equipment_specific_alarm_log sal
LEFT JOIN wl_form_instance i ON sal.build_id = i.instance_id LEFT JOIN wl_form_instance i ON sal.build_id = i.instance_id
LEFT JOIN wl_area a ON a.id = i.field_value LEFT JOIN wl_area a ON a.id = i.field_value
LEFT JOIN f_fire_fighting_system s ON s.id = IF(LOCATE(',' , sal.system_ids) > 0,SUBSTRING(sal.system_ids,1,LOCATE(',' , sal.system_ids)-1),sal.system_ids), LEFT JOIN f_fire_fighting_system s ON FIND_IN_SET(s.id, sal.system_ids),
f_station_info f f_station_info f
WHERE WHERE
i.field_name = "belongAreaId" i.field_name = "belongAreaId"
...@@ -79,8 +79,7 @@ ...@@ -79,8 +79,7 @@
sal.alarm_reason AS eventreason sal.alarm_reason AS eventreason
FROM FROM
wl_equipment_specific_alarm_log sal wl_equipment_specific_alarm_log sal
LEFT JOIN wl_equipment_specific_alarm sa ON sa.id = sal.equipment_specific_alarm_id LEFT JOIN f_fire_fighting_system s ON FIND_IN_SET(s.id, sal.system_ids),
LEFT JOIN f_fire_fighting_system s ON s.id = IF(LOCATE(',' , sal.system_ids) > 0,SUBSTRING(sal.system_ids,1,LOCATE(',' , sal.system_ids)-1),sal.system_ids),
f_station_info f f_station_info f
<where> <where>
<if test="list != null and list.size() >0"> <if test="list != null and list.size() >0">
......
pom.xml
View file @ d1442973
...@@ -301,12 +301,12 @@ ...@@ -301,12 +301,12 @@
<repository> <repository>
<id>Releases</id> <id>Releases</id>
<name>Releases</name> <name>Releases</name>
<url>http://36.46.149.14:8081/nexus/content/repositories/releases/</url> <url>http://113.142.68.105:8081/nexus/content/repositories/releases/</url>
</repository> </repository>
<repository> <repository>
<id>Snapshots</id> <id>Snapshots</id>
<name>Snapshots</name> <name>Snapshots</name>
<url>http://36.46.149.14:8081/nexus/content/repositories/snapshots/</url> <url>http://113.142.68.105:8081/nexus/content/repositories/snapshots/</url>
</repository> </repository>
<repository> <repository>
<id>com.e-iceblue</id> <id>com.e-iceblue</id>
...@@ -316,7 +316,7 @@ ...@@ -316,7 +316,7 @@
<repository> <repository>
<id>thirdparty</id> <id>thirdparty</id>
<name>thirdparty</name> <name>thirdparty</name>
<url>http://36.46.149.14:8081/nexus/content/repositories/thirdparty/</url> <url>http://113.142.68.105:8081/nexus/content/repositories/thirdparty/</url>
</repository> </repository>
</repositories> </repositories>
......
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