diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java index 661c5d3..b80fda1 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java @@ -78,8 +78,6 @@ save(newAlarmRule); } } - - @Override public AlarmRule selectByMonitor(Long monitorId) { return this.getById(monitorId); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java index 661c5d3..b80fda1 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java @@ -78,8 +78,6 @@ save(newAlarmRule); } } - - @Override public AlarmRule selectByMonitor(Long monitorId) { return this.getById(monitorId); diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index ae9ae62..e60720c 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -53,10 +53,10 @@ SELECT - + ,stationName FROM bus_monipoi_info JOIN ( - SELECT id as idd,DEPT_ID + SELECT id as idd,DEPT_ID,STATION_NAME AS stationName FROM bus_station_info WHERE valid=0 )bsi ON bsi.idd=station_id diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index bc6d094..76500b7 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -40,6 +40,9 @@ */ @TableField("STATION_ID") private Long stationId; + + @TableField(exist = false) + private String stationName; /** * 精确位置信息 */