Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 6a109a14 authored by maoying's avatar maoying
Browse files
Options

删除alarm相关代码

parent 858dafb7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 246 deletions
YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Alarm.java deleted 100644 → 0
View file @ 858dafb7
package com.yeejoin.amos.fas.dao.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import java.util.Date;
/**
* The persistent class for the alarm database table.
*/
@Entity
@Table(name = "f_alarm")
@NamedQuery(name = "Alarm.findAll", query = "SELECT a FROM Alarm a")
public class Alarm extends BasicEntity {
private static final long serialVersionUID = 1L;
/**
* 消防设备id
*/
@Column(name = "fire_equipment_id")
private Long fireEquipmentId;
/**
* 消防设备名称
*/
@Column(name = "fire_equipment_name")
private String fireEquipmentName;
/**
* 消防设备编码
*/
@Column(name = "fire_equipment_code")
private String fireEquipmentCode;
/**
* 消防点位id
*/
@Column(name = "fire_equipment_point_id")
private Long fireEquipmentPointId;
/**
* 消防点位名称
*/
@Column(name = "fire_equipment_point_name")
private String fireEquipmentPointName;
/**
* 消防点位编码
*/
@Column(name = "fire_equipment_point_code")
private String fireEquipmentPointCode;
/**
* 消防点位上传值
*/
@Column(name = "fire_equipment_point_value")
private String fireEquipmentPointValue;
/**
* 发生频率
*/
@Column(name = "frequency")
private int frequency = 1;
/**
* 告警状态
*/
@Column(name = "status")
private Boolean status = true;
/**
* 报警类型:alarm_type_fire（火灾报警）/alarm_type_trouble（故障告警）
*/
@Column(name = "type")
private String type;
/**
* 创建时间
*/
@Column(name = "create_date")
private Date createDate = new Date();
/**
* 更新时间
*/
@Column(name = "update_date")
private Date updateDate = new Date();
/**
* 告警恢复时间
*/
@Column(name = "recovery_date")
private Date recoveryDate;
@Column(name = "org_code")
private String orgCode;
public Alarm() {
}
public Long getFireEquipmentId() {
return this.fireEquipmentId;
}
public void setFireEquipmentId(Long fireEquipmentId) {
this.fireEquipmentId = fireEquipmentId;
}
public String getOrgCode() {
return this.orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public String getFireEquipmentName() {
return fireEquipmentName;
}
public void setFireEquipmentName(String fireEquipmentName) {
this.fireEquipmentName = fireEquipmentName;
}
public String getFireEquipmentCode() {
return fireEquipmentCode;
}
public void setFireEquipmentCode(String fireEquipmentCode) {
this.fireEquipmentCode = fireEquipmentCode;
}
public Long getFireEquipmentPointId() {
return fireEquipmentPointId;
}
public void setFireEquipmentPointId(Long fireEquipmentPointId) {
this.fireEquipmentPointId = fireEquipmentPointId;
}
public String getFireEquipmentPointName() {
return fireEquipmentPointName;
}
public void setFireEquipmentPointName(String fireEquipmentPointName) {
this.fireEquipmentPointName = fireEquipmentPointName;
}
public String getFireEquipmentPointCode() {
return fireEquipmentPointCode;
}
public void setFireEquipmentPointCode(String fireEquipmentPointCode) {
this.fireEquipmentPointCode = fireEquipmentPointCode;
}
public String getFireEquipmentPointValue() {
return fireEquipmentPointValue;
}
public void setFireEquipmentPointValue(String fireEquipmentPointValue) {
this.fireEquipmentPointValue = fireEquipmentPointValue;
}
public int getFrequency() {
return frequency;
}
public void setFrequency(int frequency) {
this.frequency = frequency;
}
public Boolean getStatus() {
return status;
}
public void setStatus(Boolean status) {
this.status = status;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public Date getUpdateDate() {
return updateDate;
}
public void setUpdateDate(Date updateDate) {
this.updateDate = updateDate;
}
public Date getRecoveryDate() {
return recoveryDate;
}
public void setRecoveryDate(Date recoveryDate) {
this.recoveryDate = recoveryDate;
}
}
\ No newline at end of file
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IAlarmDao.java deleted 100644 → 0
View file @ 858dafb7
package com.yeejoin.amos.fas.business.dao.repository;
import org.springframework.stereotype.Repository;
import com.yeejoin.amos.fas.dao.entity.Alarm;
@Repository("iAlarmDao")
public interface IAlarmDao extends BaseDao<Alarm, Long> {
Alarm findByStatusTrueAndFireEquipmentPointCode(String code);
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/IEquipManageFeign.java
View file @ 6a109a14
...@@ -13,6 +13,6 @@ public interface IEquipManageFeign { ...@@ -13,6 +13,6 @@ public interface IEquipManageFeign {
* 解除区域与建筑绑定 * 解除区域与建筑绑定
* @param instanceId 建筑id * @param instanceId 建筑id
*/ */
@PutMapping(value = "/equip-1225/building/unbind/region") @PutMapping(value = "/equip/building/unbind/region")
void unbindRelation(@RequestParam Long instanceId); void unbindRelation(@RequestParam(value ="instanceId") Long instanceId);
} }
YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml
View file @ 6a109a14
...@@ -246,33 +246,6 @@ ...@@ -246,33 +246,6 @@
add COLUMN `flicker_frequency` int(11) DEFAULT 0 COMMENT '闪烁频率' after `status`; add COLUMN `flicker_frequency` int(11) DEFAULT 0 COMMENT '闪烁频率' after `status`;
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="maoying" id="1589444792914-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="f_alarm"/>
</preConditions>
<comment>create table f_alarm</comment>
<sql>
DROP TABLE IF EXISTS f_alarm;
CREATE TABLE `f_alarm` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`org_code` varchar(100) NOT NULL COMMENT '机构编号',
`fire_equipment_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '消防设备id',
`fire_equipment_code` varchar(255) NOT NULL COMMENT '设备编码',
`fire_equipment_name` varchar(255) NOT NULL COMMENT '设备名称',
`fire_equipment_point_id` bigint(20) NOT NULL COMMENT '消防点位id',
`fire_equipment_point_code` varchar(255) NOT NULL COMMENT '消防点位名称',
`fire_equipment_point_name` varchar(255) NOT NULL,
`fire_equipment_point_value` varchar(500) DEFAULT NULL COMMENT '报警值',
`frequency` int(10) NOT NULL DEFAULT '1' COMMENT '发生频次',
`status` bit(1) DEFAULT b'1' COMMENT '报警状态：1报警0恢复',
`type` varchar(50) NOT NULL COMMENT '报警类型:alarm_type_fire（火灾报警）/alarm_type_trouble（故障告警）',
`create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
`recovery_date` datetime DEFAULT NULL COMMENT '告警恢复时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='报警信息表';
</sql>
</changeSet>
<changeSet author="zhouyi" id="1589444792916-1"> <changeSet author="zhouyi" id="1589444792916-1">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="f_station_info"/> <tableExists tableName="f_station_info"/>
......
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