diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index 8c09726..7efefff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -101,6 +101,12 @@ */ private String owner; + /** + * 井类型 + */ + private String wellType; + + public Long getAlarmId() { return alarmId; @@ -255,6 +261,14 @@ this.owner = owner; } + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + @Override public String toString() { return "AlarmNowView{" +